diff options
| author | Eike Rathke <erack@redhat.com> | 2015-01-06 20:18:48 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-01-06 20:24:28 +0100 |
| commit | d389216038d874c0d99a8168649a7f5f4db970d3 (patch) | |
| tree | b8da081b50fb179e7b668394d36e2ff6be50f829 /vcl/source | |
| parent | 9dbac35b1e55c49b2f1e595f4dfe3437c3fedb58 (diff) | |
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
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/filter/jpeg/jpegc.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx index 411b17bd1644..b4cd99538328 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; |