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

[Eike Rathke]

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

New commits:
commit 105e2611032ebc8ad777deb19b8cea62ad2279e2
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Jan 6 21:33:56 2015 +0100

    Revert "grml.. nScanLineBufferComponents still needs to be on jmp stack"
    
    This reverts commit d389216038d874c0d99a8168649a7f5f4db970d3.
    
    Author is obviously too dumb for this. It's alright, isn't it?

diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index b4cd995..411b17b 100644
--- a/vcl/source/filter/jpeg/jpegc.cxx
+++ b/vcl/source/filter/jpeg/jpegc.cxx
@@ -69,7 +69,6 @@ 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 ) )
     {
@@ -150,7 +149,7 @@ void ReadJPEG( JPEGReader* pJPEGReader, void* pInputStream, long* pLines,
     nAlignedWidth = aCreateBitmapParam.nAlignedWidth;
     aRangeLimit = cinfo.sample_range_limit;
 
-    nScanLineBufferComponents = 0;
+    long nScanLineBufferComponents = 0;
     if ( cinfo.out_color_space == JCS_CMYK )
     {
         nScanLineBufferComponents = cinfo.output_width * 4;