summaryrefslogtreecommitdiff
path: root/splash
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2005-09-16 17:42:56 +0000
committerAlbert Astals Cid <aacid@kde.org>2005-09-16 17:42:56 +0000
commit0555ba861d3b84d88c80da4fa247274338ff7817 (patch)
tree847bfa8ce58f4a64e2ff4c20de2584f5a52d8899 /splash
parentddc72bd8354168d992631d1ef8cd0939b428966c (diff)
SplashFontEngine.cc merge from xpdf 3.00 -> 3.01
Diffstat (limited to 'splash')
-rw-r--r--splash/SplashFontEngine.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/splash/SplashFontEngine.cc b/splash/SplashFontEngine.cc
index 9e093142..53e4469f 100644
--- a/splash/SplashFontEngine.cc
+++ b/splash/SplashFontEngine.cc
@@ -121,6 +121,7 @@ SplashFontFile *SplashFontEngine::loadType1Font(SplashFontFileID *idA,
}
#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 @@ SplashFontFile *SplashFontEngine::loadType1Font(SplashFontFileID *idA,
if (deleteFile) {
unlink(fontFile ? fontFile->fileName->getCString() : fileName);
}
+#endif
return fontFile;
}
@@ -150,6 +152,7 @@ SplashFontFile *SplashFontEngine::loadType1CFont(SplashFontFileID *idA,
}
#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 @@ SplashFontFile *SplashFontEngine::loadType1CFont(SplashFontFileID *idA,
if (deleteFile) {
unlink(fontFile ? fontFile->fileName->getCString() : fileName);
}
+#endif
return fontFile;
}
@@ -173,6 +177,7 @@ SplashFontFile *SplashFontEngine::loadCIDFont(SplashFontFileID *idA,
}
#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 @@ SplashFontFile *SplashFontEngine::loadCIDFont(SplashFontFileID *idA,
if (deleteFile) {
unlink(fontFile ? fontFile->fileName->getCString() : fileName);
}
+#endif
return fontFile;
}
@@ -203,6 +209,7 @@ SplashFontFile *SplashFontEngine::loadTrueTypeFont(SplashFontFileID *idA,
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 @@ SplashFontFile *SplashFontEngine::loadTrueTypeFont(SplashFontFileID *idA,
if (deleteFile) {
unlink(fontFile ? fontFile->fileName->getCString() : fileName);
}
+#endif
return fontFile;
}