[poppler] splash/SplashFontEngine.cc
Albert Astals Cid
aacid at kemper.freedesktop.org
Tue Jul 14 15:27:49 PDT 2015
splash/SplashFontEngine.cc | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit ccd780f9504f5b077ea12370fd5380ff7da5cd23
Author: Dmytro Morgun <lztoad at gmail.com>
Date: Wed Jul 15 00:26:55 2015 +0200
[Windows] remove ifndef
diff --git a/splash/SplashFontEngine.cc b/splash/SplashFontEngine.cc
index 968e820..73ef8de 100644
--- a/splash/SplashFontEngine.cc
+++ b/splash/SplashFontEngine.cc
@@ -17,6 +17,7 @@
// Copyright (C) 2009 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2011 Andreas Hartmetz <ahartmetz at gmail.com>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
+// Copyright (C) 2015 Dmytro Morgun <lztoad at gmail.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -149,14 +150,12 @@ 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
// loadXYZFont failed, the file will always be deleted)
if (src->isFile)
src->unref();
-#endif
return fontFile;
}
@@ -178,14 +177,12 @@ 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
// loadXYZFont failed, the file will always be deleted)
if (src->isFile)
src->unref();
-#endif
return fontFile;
}
@@ -223,14 +220,12 @@ 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
// loadXYZFont failed, the file will always be deleted)
if (src->isFile)
src->unref();
-#endif
return fontFile;
}
@@ -277,14 +272,12 @@ 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
// loadXYZFont failed, the file will always be deleted)
if (src->isFile)
src->unref();
-#endif
return fontFile;
}
More information about the poppler
mailing list