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

[Eike Rathke]

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

New commits:
commit d389216038d874c0d99a8168649a7f5f4db970d3
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jan 6 20:18:48 2015 +0100

    grml.. nScanLineBufferComponents still needs to be on jmp stack
    
    A follow-up on 09a5910c96a822c6e7fc4b82d89c00c22e905eba
    move nScanLineBufferComponents to where it is used [-Werror=clobbered]
    
    If pScanLineBuffer is used, nScanLineBufferComponents is the
    corresponding counter so it needs to be preserved as well in case of a
    longjmp.
    
    Change-Id: If9c6f148cd47b98dee2418fb61eebe2c829869f1

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index 411b17b..b4cd995 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -69,6 +69,7 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
     long                            nAlignedWidth;
     JSAMPLE*                        aRangeLimit;
     boost::scoped_array<unsigned char> pScanLineBuffer;
+    long                            nScanLineBufferComponents;
 
     if ( setjmp( jerr.setjmp_buffer ) )
     {
@@ -149,7 +150,7 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
     nAlignedWidth = aCreateBitmapParam.nAlignedWidth;
     aRangeLimit = cinfo.sample_range_limit;
 
-    long nScanLineBufferComponents = 0;
+    nScanLineBufferComponents = 0;
     if ( cinfo.out_color_space == JCS_CMYK )
     {
         nScanLineBufferComponents = cinfo.output_width * 4;