Changeset 27838 for branches/tap_branches/psLib/src/jpeg/psImageJpeg.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• psLib (modified) (1 prop)
• psLib/src/jpeg/psImageJpeg.c (modified) (1 diff)

branches/tap_branches/psLib/src/jpeg/psImageJpeg.c

@@ -202 +202 @@
             if (isfinite(row[i])) {
                 pixel = PS_JPEG_SCALEVALUE(row[i],zero,scale);
-                outPix[0] = Rpix[pixel];
-                outPix[1] = Gpix[pixel];
-                outPix[2] = Bpix[pixel];
+                outPix[0] = Rpix[pixel];
+                outPix[1] = Gpix[pixel];
+                outPix[2] = Bpix[pixel];
             } else {
-                // XXX NAN value should be set per-color map
-                outPix[0] = 0xff;
-                outPix[1] = 0x00;
-                outPix[2] = 0xff;
-            }
-        }
-        jpeg_write_scanlines(&cinfo, jpegLineList, 1);
+                // XXX NAN value should be set per-color map
+                outPix[0] = 0xff;
+                outPix[1] = 0x00;
+                outPix[2] = 0xff;
+            }
+        }
+        if (jpeg_write_scanlines(&cinfo, jpegLineList, 1) == 0) {
+            psError(PS_ERR_IO, true, "Unable to write line %d to JPEG", j);
+            psFree(jpegLine);
+            return false;
+        }
     }
 
     jpeg_finish_compress(&cinfo);
-    fclose(f);
+    if (fclose(f) == EOF) {
+        psError(PS_ERR_IO, true, "Failed to close %s", filename);
+        psFree(jpegLine);
+        return false;
+    }
     jpeg_destroy_compress(&cinfo);