[gs-cvs] rev 7801 - trunk/gs/src

[alexcher at ghostscript.com]

Author: alexcher
Date: 2007-03-25 10:47:16 -0700 (Sun, 25 Mar 2007)
New Revision: 7801

Modified:
   trunk/gs/src/gximag3x.c
Log:
Don't check current row position in the mask of the image type 3x
when the mask is not defined. Fix an infinite loop.
Fix the bug 688912, and a part of the bug 689138.

DIFFERENCES:
No CET or Comparefiles differences.


Modified: trunk/gs/src/gximag3x.c
===================================================================
--- trunk/gs/src/gximag3x.c	2007-03-25 14:48:19 UTC (rev 7800)
+++ trunk/gs/src/gximag3x.c	2007-03-25 17:47:16 UTC (rev 7801)
@@ -741,10 +741,13 @@
 	      h, (mask_plane[0].data ? "+" : ""), penum->mask[0].y,
 	      (mask_plane[1].data ? "+" : ""), penum->mask[1].y,
 	      (pixel_planes[0].data ? "+" : ""), penum->pixel.y);
-    if (penum->mask[0].y >= penum->mask[0].height &&
-	penum->mask[1].y >= penum->mask[1].height &&
-	penum->pixel.y >= penum->pixel.height)
-	return 1;
+    if (penum->mask[0].depth == 0 || penum->mask[0].y >= penum->mask[0].height) {
+        if (penum->mask[1].depth == 0 || penum->mask[1].y >= penum->mask[1].height) {
+	    if (penum->pixel.y >= penum->pixel.height) {
+	        return 1;
+            }
+        }
+    }
     /*
      * The mask may be complete (gx_image_plane_data_rows returned 1),
      * but there may still be pixel rows to go, so don't return 1 here.