[poppler] poppler/poppler: SplashOutputDev.cc,1.5,1.6

[Albert Astals Cid]

Update of /cvs/poppler/poppler/poppler
In directory gabe:/tmp/cvs-serv28267/poppler

Modified Files:
	SplashOutputDev.cc 
Log Message:
Remove bug from "do not use an external file to pass fonts to Freetype" patch, patch by Stefan Schweizer


Index: SplashOutputDev.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/SplashOutputDev.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SplashOutputDev.cc	2 Feb 2006 22:50:01 -0000	1.5
+++ SplashOutputDev.cc	4 Feb 2006 20:34:13 -0000	1.6
@@ -1042,8 +1042,11 @@
       }
       break;
     case fontTrueType:
-      if ((ff = FoFiTrueType::load(fileName->getCString())) ||
-      	 (ff = new FoFiTrueType(tmpBuf, tmpBufLen, gFalse))) {
+	if (fileName)
+	 ff = FoFiTrueType::load(fileName->getCString());
+	else
+	 ff = new FoFiTrueType(tmpBuf, tmpBufLen, gFalse);
+	if (ff) {
       codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);
 	n = 256;
       delete ff;
@@ -1077,8 +1080,11 @@
       if (dfp) {
 	// create a CID-to-GID mapping, via Unicode
 	if ((ctu = ((GfxCIDFont *)gfxFont)->getToUnicode())) {
-	  if ((ff = FoFiTrueType::load(fileName->getCString())) ||
-	  	(ff = new FoFiTrueType(tmpBuf, tmpBufLen, gFalse))) {
+		if (fileName)
+		 ff = FoFiTrueType::load(fileName->getCString());
+		else
+		 ff = new FoFiTrueType(tmpBuf, tmpBufLen, gFalse);
+		if (ff) {
 	    // look for a Unicode cmap
 	    for (cmap = 0; cmap < ff->getNumCmaps(); ++cmap) {
 	      if ((ff->getCmapPlatform(cmap) == 3 &&