diff options
| author | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2021-03-23 15:57:20 +0100 |
|---|---|---|
| committer | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2021-03-23 15:57:20 +0100 |
| commit | 894b5865cdfb605391c50a9d8b54bb7eac64c71d (patch) | |
| tree | 27c985246c338d2da3dc07679a5cc5ff09cf0bfe /extensions/imageloader.c | |
| parent | dc617b52fa2f1ee28aff98628479a20690146408 (diff) | |
| parent | fda2a4ec74543dad97cc47f369accf592409d43f (diff) | |
| download | vdr-plugin-skindesigner-894b5865cdfb605391c50a9d8b54bb7eac64c71d.tar.gz vdr-plugin-skindesigner-894b5865cdfb605391c50a9d8b54bb7eac64c71d.tar.bz2 | |
Merge branch 'pbiering/fix-rsvg'
Diffstat (limited to 'extensions/imageloader.c')
| -rw-r--r-- | extensions/imageloader.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/extensions/imageloader.c b/extensions/imageloader.c index bd702ad..59e4c3e 100644 --- a/extensions/imageloader.c +++ b/extensions/imageloader.c @@ -178,14 +178,22 @@ cImageImporterSVG::cImageImporterSVG() { cImageImporterSVG::~cImageImporterSVG() { if (handle) { - rsvg_handle_read_stream_sync(handle, NULL, NULL, NULL); +#if LIBRSVG_CHECK_VERSION (2, 46, 0) + // rsvg_handle_close is deprecated since version 2.46 and looks like even not required if used with rsvg_handle_new_from_file +#else + rsvg_handle_close(handle, NULL); +#endif g_object_unref(handle); } } bool cImageImporterSVG::LoadImage(const char *path) { if (handle) { - rsvg_handle_read_stream_sync(handle, NULL, NULL, NULL); +#if LIBRSVG_CHECK_VERSION (2, 46, 0) + // rsvg_handle_close is deprecated since version 2.46 and looks like even not required if used with rsvg_handle_new_from_file +#else + rsvg_handle_close(handle, NULL); +#endif g_object_unref(handle); } @@ -521,3 +529,5 @@ void cSVGTemplate::ReplaceTokens(string &line, size_t tokenStart, size_t tokenEn std::replace( svgAlpha.begin(), svgAlpha.end(), ',', '.'); line.replace(hitAlpha, hitAlphaEnd - hitAlpha + 2, svgAlpha); } + +// vim: ts=4 sw=4 et |