Attachment 77439 Details for Bug 63067 – Fix use of setjmp

[patch] Fix use of setjmp

setjmp.diff (text/plain), 2.43 KB, created by rodrigo on 2013-04-04 18:28:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rodrigo

Created: 2013-04-04 18:28:50 UTC

Size: 2.43 KB

patch

obsolete

>diff -ur a/DCTStream.cc b/DCTStream.cc
>--- a/DCTStream.cc	2013-04-04 20:25:11.000000000 +0200
>+++ b/DCTStream.cc	2013-04-04 20:26:11.017463396 +0200
>@@ -159,40 +159,43 @@
>     }
>   }
> 
>-  if (!setjmp(err.setjmp_buffer) && jpeg_read_header(&cinfo, TRUE) != JPEG_SUSPENDED)
>+  if (!setjmp(err.setjmp_buffer))
>   {
>-    // figure out color transform
>-    if (colorXform == -1 && !cinfo.saw_Adobe_marker) {
>-      if (cinfo.num_components == 3) {
>-        if (cinfo.saw_JFIF_marker) {
>-	  colorXform = 1;
>-        } else if (cinfo.cur_comp_info[0]->component_id == 82 &&
>-		   cinfo.cur_comp_info[1]->component_id == 71 &&
>-		   cinfo.cur_comp_info[2]->component_id == 66) { // ASCII "RGB"
>-	  colorXform = 0;
>-	} else {
>-	  colorXform = 1;
>-	}
>-      } else {
>-        colorXform = 0;
>+    if (jpeg_read_header(&cinfo, TRUE) != JPEG_SUSPENDED)
>+    {
>+      // figure out color transform
>+      if (colorXform == -1 && !cinfo.saw_Adobe_marker) {
>+        if (cinfo.num_components == 3) {
>+          if (cinfo.saw_JFIF_marker) {
>+            colorXform = 1;
>+          } else if (cinfo.cur_comp_info[0]->component_id == 82 &&
>+              cinfo.cur_comp_info[1]->component_id == 71 &&
>+              cinfo.cur_comp_info[2]->component_id == 66) { // ASCII "RGB"
>+            colorXform = 0;
>+          } else {
>+            colorXform = 1;
>+          }
>+        } else {
>+          colorXform = 0;
>+        }
>+      } else if (cinfo.saw_Adobe_marker) {
>+        colorXform = cinfo.Adobe_transform;
>       }
>-    } else if (cinfo.saw_Adobe_marker) {
>-      colorXform = cinfo.Adobe_transform;
>-    }
> 
>-    switch (cinfo.num_components) {
>-    case 3:
>-	    cinfo.jpeg_color_space = colorXform ? JCS_YCbCr : JCS_RGB;
>-	    break;
>-    case 4:
>-	    cinfo.jpeg_color_space = colorXform ? JCS_YCCK : JCS_CMYK;
>-	    break;
>-    }
>+      switch (cinfo.num_components) {
>+      case 3:
>+        cinfo.jpeg_color_space = colorXform ? JCS_YCbCr : JCS_RGB;
>+        break;
>+      case 4:
>+        cinfo.jpeg_color_space = colorXform ? JCS_YCCK : JCS_CMYK;
>+        break;
>+      }
> 
>-    jpeg_start_decompress(&cinfo);
>+      jpeg_start_decompress(&cinfo);
> 
>-    row_stride = cinfo.output_width * cinfo.output_components;
>-    row_buffer = cinfo.mem->alloc_sarray((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
>+      row_stride = cinfo.output_width * cinfo.output_components;
>+      row_buffer = cinfo.mem->alloc_sarray((j_common_ptr) &cinfo, JPOOL_IMAGE, row_stride, 1);
>+    }
>   }
> }
>

Actions: View | Splinter Review

Attachments on bug 63067: 77439

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.