[Libreoffice-commits] core.git: 2 commits - vcl/source vcl/workben

[Caolán McNamara]

 vcl/source/filter/jpeg/jpeg.h    |    2 +-
 vcl/source/filter/jpeg/jpegc.cxx |    4 +---
 vcl/workben/commonfuzzer.hxx     |    1 +
 vcl/workben/fftester.cxx         |    1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4154b710ae4f4e0ee221042e3905469f3014f50b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Mar 18 21:40:44 2017 +0000

    use SAL_NO_FONT_LOOPUP for consistent results
    
    Change-Id: Ibdc0df66325b49fb24c8e59c86beb2875b0e200e

diff --git a/vcl/workben/commonfuzzer.hxx b/vcl/workben/commonfuzzer.hxx
index ee8df4b79e12..a4cb5d33f664 100644
--- a/vcl/workben/commonfuzzer.hxx
+++ b/vcl/workben/commonfuzzer.hxx
@@ -81,6 +81,7 @@ extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv)
     setenv("JPEGMEM", "1024M", 1);
     setenv("SAL_WMF_COMPLEXCLIP_VIA_REGION", "1", 1);
     setenv("SAL_DISABLE_PRINTERLIST", "1", 1);
+    setenv("SAL_NO_FONT_LOOPUP", "1", 1);
 
     osl_setCommandArgs(*argc, *argv);
 
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index 50e8995b25d1..d5938725872a 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -105,6 +105,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         setenv("JPEGMEM", "1024M", 1);
         setenv("SAL_WMF_COMPLEXCLIP_VIA_REGION", "1", 1);
         setenv("SAL_DISABLE_PRINTERLIST", "1", 1);
+        setenv("SAL_NO_FONT_LOOPUP", "1", 1);
 
 try_again:
 
commit cfd749370465ca25ffe8cd776a3bde8aae75260c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Mar 18 20:23:59 2017 +0000

    noone cares about the return value
    
    Change-Id: I1f5e0ea481c39b92726812722d3f6f782f3cec9d

diff --git a/vcl/source/filter/jpeg/jpeg.h b/vcl/source/filter/jpeg/jpeg.h
index 19276635aa0d..bb6c73fc5834 100644
--- a/vcl/source/filter/jpeg/jpeg.h
+++ b/vcl/source/filter/jpeg/jpeg.h
@@ -48,7 +48,7 @@ bool    WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream,
 void    ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
                   Size const & previewSize );
 
-long    Transform( void* pInputStream, void* pOutputStream, long nAngle );
+void    Transform(void* pInputStream, void* pOutputStream, long nAngle);
 
 /* Expanded data source object for stdio input */
 
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index c47bb126d65e..c49c42fd5c7b 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -371,7 +371,7 @@ bool WriteJPEG( JPEGWriter* pJPEGWriter, void* pOutputStream,
     return true;
 }
 
-long Transform(void* pInputStream, void* pOutputStream, long nAngle)
+void Transform(void* pInputStream, void* pOutputStream, long nAngle)
 {
     try
     {
@@ -449,9 +449,7 @@ long Transform(void* pInputStream, void* pOutputStream, long nAngle)
     }
     catch (const css::uno::RuntimeException&)
     {
-        return 0;
     }
-    return 1;
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */