Kaydet (Commit) 36d1d9c8 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Fix "external" graphic filter code for the DISABLE_DYNLOADING case

The DISABLE_DYNLOADING case in ImpFilterLibCacheEntry::GetImportFunction()
had apparently been broken from the start, but nobody never noticed as
the common formats (PNG, JPEG, GIF etc) use a more "internal"code
path. The problem was noticed now with a TIFF image in a presentation.

The fix for the import case seems to work, but I could not test the
fix for the export case.

Change-Id: Icbd33c7cb654136a562f18b06d5b0896e701bf3d
Reviewed-on: https://gerrit.libreoffice.org/73468
Tested-by: Jenkins
Reviewed-by: 's avatarTor Lillqvist <tml@collabora.com>
üst 66a5ab79
...@@ -721,27 +721,27 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction() ...@@ -721,27 +721,27 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction()
else if (maFormatName == "iti") else if (maFormatName == "iti")
mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("itiGraphicImport")); mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("itiGraphicImport"));
#else #else
if (maFiltername == "icd") if (maFormatName == "icd")
mpfnImport = icdGraphicImport; mpfnImport = icdGraphicImport;
else if (maFiltername == "idx") else if (maFormatName == "idx")
mpfnImport = idxGraphicImport; mpfnImport = idxGraphicImport;
else if (maFiltername == "ime") else if (maFormatName == "ime")
mpfnImport = imeGraphicImport; mpfnImport = imeGraphicImport;
else if (maFiltername == "ipb") else if (maFormatName == "ipb")
mpfnImport = ipbGraphicImport; mpfnImport = ipbGraphicImport;
else if (maFiltername == "ipd") else if (maFormatName == "ipd")
mpfnImport = ipdGraphicImport; mpfnImport = ipdGraphicImport;
else if (maFiltername == "ips") else if (maFormatName == "ips")
mpfnImport = ipsGraphicImport; mpfnImport = ipsGraphicImport;
else if (maFiltername == "ipt") else if (maFormatName == "ipt")
mpfnImport = iptGraphicImport; mpfnImport = iptGraphicImport;
else if (maFiltername == "ipx") else if (maFormatName == "ipx")
mpfnImport = ipxGraphicImport; mpfnImport = ipxGraphicImport;
else if (maFiltername == "ira") else if (maFormatName == "ira")
mpfnImport = iraGraphicImport; mpfnImport = iraGraphicImport;
else if (maFiltername == "itg") else if (maFormatName == "itg")
mpfnImport = itgGraphicImport; mpfnImport = itgGraphicImport;
else if (maFiltername == "iti") else if (maFormatName == "iti")
mpfnImport = itiGraphicImport; mpfnImport = itiGraphicImport;
#endif #endif
} }
...@@ -1893,9 +1893,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r ...@@ -1893,9 +1893,7 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r
FilterConfigItem aConfigItem( pFilterData ); FilterConfigItem aConfigItem( pFilterData );
OUString aFilterName( pConfig->GetExportFilterName( nFormat ) ); OUString aFilterName( pConfig->GetExportFilterName( nFormat ) );
#ifndef DISABLE_DYNLOADING
OUString aExternalFilterName(pConfig->GetExternalFilterName(nFormat, true)); OUString aExternalFilterName(pConfig->GetExternalFilterName(nFormat, true));
#endif
ErrCode nStatus = ERRCODE_NONE; ErrCode nStatus = ERRCODE_NONE;
GraphicType eType; GraphicType eType;
Graphic aGraphic = ImpGetScaledGraphic( rGraphic, aConfigItem ); Graphic aGraphic = ImpGetScaledGraphic( rGraphic, aConfigItem );
...@@ -2187,11 +2185,11 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r ...@@ -2187,11 +2185,11 @@ ErrCode GraphicFilter::ExportGraphic( const Graphic& rGraphic, const OUString& r
#else #else
--nIdx; // Just one iteration --nIdx; // Just one iteration
PFilterCall pFunc = NULL; PFilterCall pFunc = NULL;
if (aFilterName == "egi") if (aExternalFilterName == "egi")
pFunc = egiGraphicExport; pFunc = egiGraphicExport;
else if (aFilterName == "eps") else if (aExternalFilterName == "eps")
pFunc = epsGraphicExport; pFunc = epsGraphicExport;
else if (aFilterName == "eti") else if (aExternalFilterName == "eti")
pFunc = etiGraphicExport; pFunc = etiGraphicExport;
#endif #endif
if( pFunc ) if( pFunc )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment