summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-01-06 21:33:56 +0100
committerEike Rathke <erack@redhat.com>2015-01-06 21:34:31 +0100
commit105e2611032ebc8ad777deb19b8cea62ad2279e2 (patch)
treef80bc3aa4bcb51f2632f8ccd051ec2ceabdc03e4 /vcl
parenta989d6f5bd6ad9c301259f93ab1fc62a4fcebb93 (diff)
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?
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/filter/jpeg/jpegc.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx
index b4cd99538328..411b17bd1644 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;