diff options
| author | Kris De Gussem <kris.degussem@gmail.com> | 2013-02-11 17:57:49 +0000 |
|---|---|---|
| committer | Kris <Kris.De.Gussem@hotmail.com> | 2013-02-11 17:57:49 +0000 |
| commit | e8377a78c88424dd76f8fc47c61f436efd5470e7 (patch) | |
| tree | 6fc8e7f96e4dea82d3b781a8813401c3522e0938 /src/extension/internal/image-resolution.cpp | |
| parent | Move cell_data_func and separator_func from text-toolbar to font-lister. (diff) | |
| download | inkscape-e8377a78c88424dd76f8fc47c61f436efd5470e7.tar.gz inkscape-e8377a78c88424dd76f8fc47c61f436efd5470e7.zip | |
cppcheck
(bzr r12117)
Diffstat (limited to 'src/extension/internal/image-resolution.cpp')
| -rw-r--r-- | src/extension/internal/image-resolution.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp index a17a2bb30..3b3b85d06 100644 --- a/src/extension/internal/image-resolution.cpp +++ b/src/extension/internal/image-resolution.cpp @@ -286,13 +286,10 @@ void ImageResolution::readjfif(char const *fn) { struct jpeg_decompress_struct cinfo; jmp_buf jbuf; struct jpeg_error_mgr jerr; - bool constr = false; if (setjmp(jbuf)) { fclose(ifd); - if (constr) { - jpeg_destroy_decompress(&cinfo); - } + jpeg_destroy_decompress(&cinfo); return; } @@ -305,8 +302,6 @@ void ImageResolution::readjfif(char const *fn) { jerr.reset_error_mgr = &irjfif_reset; cinfo.client_data = (void*)&jbuf; - constr = true; - jpeg_stdio_src(&cinfo, ifd); jpeg_read_header(&cinfo, TRUE); @@ -321,7 +316,6 @@ void ImageResolution::readjfif(char const *fn) { ok_ = true; } } - constr = false; jpeg_destroy_decompress(&cinfo); fclose(ifd); } |