[Libreoffice-commits] core.git: filter/source

[Björgvin Ragnarsson]

 filter/source/graphicfilter/ieps/ieps.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f5c3f5601a3739dead635f9abc446951b385018f
Author: Björgvin Ragnarsson <nifgraup at gmail.com>
Date:   Fri Sep 20 02:37:02 2013 +0000

    Improves fdo#41407: Make gs a higher priority than convert for EPS rendering.
    
    This speeds up EPS loading on systems where convert is configured to execute
    gs for conversion instead of using libgs. This seems to be how convert is compiled
    on most linux distos.
    
    Change-Id: Ibfc95bff11076d286b6ba210d2db2129ac0bb45b
    Reviewed-on: https://gerrit.libreoffice.org/6009
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index bc14952..3f3ba2e 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -342,10 +342,10 @@ static bool RenderAsPNGThroughGS(const sal_uInt8* pBuf, sal_uInt32 nBytesRead,
 
 static bool RenderAsPNG(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &rGraphic)
 {
-    if (RenderAsPNGThroughConvert(pBuf, nBytesRead, rGraphic))
+    if (RenderAsPNGThroughGS(pBuf, nBytesRead, rGraphic))
         return true;
     else
-        return RenderAsPNGThroughGS(pBuf, nBytesRead, rGraphic);
+        return RenderAsPNGThroughConvert(pBuf, nBytesRead, rGraphic);
 }
 
 // this method adds a replacement action containing the original wmf or tiff replacement,