diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-06 15:37:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-06 15:37:54 +0100 |
| commit | 697e84f5deebe60a4ebbcf3820c1b50bf5e9d271 (patch) | |
| tree | a59d768b5dd682842873f0ed92c1abfaca177c8a /vcl | |
| parent | fdo#33852 do not remove too much from the path (diff) | |
| download | core-697e84f5deebe60a4ebbcf3820c1b50bf5e9d271.tar.gz core-697e84f5deebe60a4ebbcf3820c1b50bf5e9d271.zip | |
Blind fix for spurious -Werror=clobbered
Change-Id: I724713927f181251e8f4a5be7887c49e6dc6edda
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/jpeg/jpegc.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx index 841a5e3e295d..d16932ebd3bd 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; |