[poppler] poppler/splash: SplashFontEngine.cc,1.1.1.1,1.2

[Albert Astals Cid]

Update of /cvs/poppler/poppler/splash
In directory gabe:/tmp/cvs-serv30685

Modified Files:
	SplashFontEngine.cc 
Log Message:
SplashFontEngine.cc merge from xpdf 3.00 -> 3.01


Index: SplashFontEngine.cc
===================================================================
RCS file: /cvs/poppler/poppler/splash/SplashFontEngine.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- SplashFontEngine.cc	3 Mar 2005 19:45:59 -0000	1.1.1.1
+++ SplashFontEngine.cc	16 Sep 2005 17:42:56 -0000	1.2
@@ -121,6 +121,7 @@
   }
 #endif
 
+#ifndef WIN32
   // delete the (temporary) font file -- with Unix hard link
   // semantics, this will remove the last link; otherwise it will
   // return an error, leaving the file to be deleted later (if
@@ -128,6 +129,7 @@
   if (deleteFile) {
     unlink(fontFile ? fontFile->fileName->getCString() : fileName);
   }
+#endif
 
   return fontFile;
 }
@@ -150,6 +152,7 @@
   }
 #endif
 
+#ifndef WIN32
   // delete the (temporary) font file -- with Unix hard link
   // semantics, this will remove the last link; otherwise it will
   // return an error, leaving the file to be deleted later (if
@@ -157,6 +160,7 @@
   if (deleteFile) {
     unlink(fontFile ? fontFile->fileName->getCString() : fileName);
   }
+#endif
 
   return fontFile;
 }
@@ -173,6 +177,7 @@
   }
 #endif
 
+#ifndef WIN32
   // delete the (temporary) font file -- with Unix hard link
   // semantics, this will remove the last link; otherwise it will
   // return an error, leaving the file to be deleted later (if
@@ -180,6 +185,7 @@
   if (deleteFile) {
     unlink(fontFile ? fontFile->fileName->getCString() : fileName);
   }
+#endif
 
   return fontFile;
 }
@@ -203,6 +209,7 @@
     gfree(codeToGID);
   }
 
+#ifndef WIN32
   // delete the (temporary) font file -- with Unix hard link
   // semantics, this will remove the last link; otherwise it will
   // return an error, leaving the file to be deleted later (if
@@ -210,6 +217,7 @@
   if (deleteFile) {
     unlink(fontFile ? fontFile->fileName->getCString() : fileName);
   }
+#endif
 
   return fontFile;
 }