diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-02-12 19:47:42 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-02-12 19:47:42 +0000 |
| commit | cedc47b4fecef50c74c9e5fc56922450f81a53cf (patch) | |
| tree | f23ffee6f812b562cec7ef52d7d000ee1614dd6d /src/extension/internal/image-resolution.cpp | |
| parent | Fix po files (diff) | |
| parent | Translations. Russian translation update by Alexandre Prokoudine. (diff) | |
| download | inkscape-cedc47b4fecef50c74c9e5fc56922450f81a53cf.tar.gz inkscape-cedc47b4fecef50c74c9e5fc56922450f81a53cf.zip | |
Update from trunk
(bzr r11950.2.1)
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); } |