[gs-cvs] gs/lib

[Igor Melichev]

Update of /cvs/ghostscript/gs/lib
In directory casper2:/tmp/cvs-serv30499/gs/lib

Modified Files:
	opdfread.ps 
Log Message:
Fix (ps2write) : Don't replace Encoding for standard fonts.

DETAILS :

This is the second partial fix for the bug 688169 "ps2write : text dissappears",
related to the file aaon97_p7.pdf .

When a standard font is being loaded, the old code replaced Encoding with StandardEncoding.
However the Dingbats font has a different Encoding.

EXPECTED DIFFERENCES :

None.


Index: opdfread.ps
===================================================================
RCS file: /cvs/ghostscript/gs/lib/opdfread.ps,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- opdfread.ps	5 Jul 2005 17:56:55 -0000	1.77
+++ opdfread.ps	14 Jul 2005 13:20:33 -0000	1.78
@@ -1234,8 +1234,6 @@
     {
       dup /Subtype get dup dup /Type1 eq exch /TrueType eq or exch /MMType1 eq or {
 							% s rn fr
-	//ObtainEncoding exec
-	//ObtainMetrics exec
         exch pop					% s fr
         dup /BaseFont get 				% s fr n
         //RemoveFontNamePrefix exec			% s fr n
@@ -1259,6 +1257,13 @@
 	} {
           //GetInstalledFont exec			% s fr f
 	} ifelse
+	exch                                            % s f fr
+	dup /Encoding known not {
+	  1 index /Encoding get 1 index exch /Encoding exch put
+	} if
+	//ObtainEncoding exec
+	//ObtainMetrics exec
+	exch
         dup length dict copy				% s fr f
         dup 2 index /Encoding get 			% s fr f f e
         /Encoding exch put				% s fr f