[gs-cvs] gs/src

[suzuki toshiya]

Update of /cvs/ghostscript/gs/src
In directory casper:/tmp/cvs-serv27706/src

Modified Files:
      Tag: GS_7_0X
	gxchar.c 
Log Message:

gs_cjk project : cshow bug fix for CIDFontType2. Fix by Hideyuki Suzuki.


Index: gxchar.c
===================================================================
RCS file: /cvs/ghostscript/gs/src/gxchar.c,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -d -r1.5.2.2 -r1.5.2.3
--- gxchar.c	22 Feb 2002 19:45:58 -0000	1.5.2.2
+++ gxchar.c	2 Apr 2002 13:33:44 -0000	1.5.2.3
@@ -240,6 +240,8 @@
 
 	if (code < 0)
 	    return code;
+	if (SHOW_IS_ALL_OF(penum, TEXT_DO_NONE | TEXT_INTERVENE)) /* cshow */
+            return code;
 	return set_cache_device(penum, pgs, pw[2], pw[3], pw[4], pw[5]);
     }
     case TEXT_SET_CACHE_DEVICE2: {
@@ -256,6 +258,8 @@
 		return 0;		/* don't cache */
 	    if ((code = set_char_width(penum, pgs, pw[6], pw[7])) < 0)
 		return code;
+	    if (SHOW_IS_ALL_OF(penum, TEXT_DO_NONE | TEXT_INTERVENE))
+		return code;
 	    /* Adjust the origin by (vx, vy). */
 	    gx_translate_to_fixed(pgs, pvxy.x, pvxy.y);
 	    code = set_cache_device(penum, pgs, pw[2], pw[3], pw[4], pw[5]);
@@ -269,6 +273,8 @@
 	    code = set_char_width(penum, pgs, pw[0], pw[1]);
 	    if (code < 0)
 		return code;
+	    if (SHOW_IS_ALL_OF(penum, TEXT_DO_NONE | TEXT_INTERVENE))
+		return code;
 	    code = set_cache_device(penum, pgs, pw[2], pw[3], pw[4], pw[5]);
 	}
 	return code;
@@ -298,6 +304,8 @@
     } else {
 	penum->width_status = sws_no_cache;
     }
+    if (SHOW_IS_ALL_OF(penum, TEXT_DO_NONE | TEXT_INTERVENE)) /* cshow */
+	gs_nulldevice(pgs);
     return !SHOW_IS_DRAWING(penum);
 }