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

[Stephan Bergmann]

 vcl/source/filter/jpeg/jpegc.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 697e84f5deebe60a4ebbcf3820c1b50bf5e9d271
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Thu Feb 6 15:37:54 2014 +0100

    Blind fix for spurious -Werror=clobbered
    
    Change-Id: I724713927f181251e8f4a5be7887c49e6dc6edda

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index 841a5e3..d16932e 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -56,7 +56,7 @@ extern "C" void outputMessage (j_common_ptr cinfo)
 }
 
 void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
-               int nPreviewWidth, int nPreviewHeight )
+               int thePreviewWidth, int thePreviewHeight )
 {
     jpeg_decompress_struct          cinfo;
     ErrorManagerStruct              jerr;
@@ -76,6 +76,9 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, 
long* pLines,
         return;
     }
 
+    int nPreviewWidth = thePreviewWidth;
+    int nPreviewHeight = thePreviewHeight;
+
     cinfo.err = jpeg_std_error( &jerr.pub );
     jerr.pub.error_exit = errorExit;
     jerr.pub.output_message = outputMessage;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits