"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "splash/SplashFontEngine.cc" between
xpdf-4.01.01.tar.gz and xpdf-4.02.tar.gz

About: Xpdf is a PDF viewer for X.

SplashFontEngine.cc  (xpdf-4.01.01):SplashFontEngine.cc  (xpdf-4.02)
skipping to change at line 135 skipping to change at line 135
return fontFile; return fontFile;
} }
SplashFontFile *SplashFontEngine::loadType1CFont(SplashFontFileID *idA, SplashFontFile *SplashFontEngine::loadType1CFont(SplashFontFileID *idA,
#if LOAD_FONTS_FROM_MEM #if LOAD_FONTS_FROM_MEM
GString *fontBuf, GString *fontBuf,
#else #else
char *fileName, char *fileName,
GBool deleteFile, GBool deleteFile,
#endif #endif
int *codeToGID,
const char **enc) { const char **enc) {
SplashFontFile *fontFile; SplashFontFile *fontFile;
fontFile = NULL; fontFile = NULL;
if (!fontFile) {
gfree(codeToGID);
}
#if HAVE_FREETYPE_H #if HAVE_FREETYPE_H
if (!fontFile && ftEngine) { if (!fontFile && ftEngine) {
fontFile = ftEngine->loadType1CFont(idA, fontFile = ftEngine->loadType1CFont(idA,
#if LOAD_FONTS_FROM_MEM #if LOAD_FONTS_FROM_MEM
fontBuf, fontBuf,
#else #else
fileName, deleteFile, fileName, deleteFile,
#endif #endif
enc); enc);
} }
skipping to change at line 171 skipping to change at line 175
return fontFile; return fontFile;
} }
SplashFontFile *SplashFontEngine::loadOpenTypeT1CFont(SplashFontFileID *idA, SplashFontFile *SplashFontEngine::loadOpenTypeT1CFont(SplashFontFileID *idA,
#if LOAD_FONTS_FROM_MEM #if LOAD_FONTS_FROM_MEM
GString *fontBuf, GString *fontBuf,
#else #else
char *fileName, char *fileName,
GBool deleteFile, GBool deleteFile,
#endif #endif
int *codeToGID,
const char **enc) { const char **enc) {
SplashFontFile *fontFile; SplashFontFile *fontFile;
fontFile = NULL; fontFile = NULL;
if (!fontFile) {
gfree(codeToGID);
}
#if HAVE_FREETYPE_H #if HAVE_FREETYPE_H
if (!fontFile && ftEngine) { if (!fontFile && ftEngine) {
fontFile = ftEngine->loadOpenTypeT1CFont(idA, fontFile = ftEngine->loadOpenTypeT1CFont(idA,
#if LOAD_FONTS_FROM_MEM #if LOAD_FONTS_FROM_MEM
fontBuf, fontBuf,
#else #else
fileName, deleteFile, fileName, deleteFile,
#endif #endif
enc); enc);
} }
skipping to change at line 224 skipping to change at line 232
fontFile = ftEngine->loadCIDFont(idA, fontFile = ftEngine->loadCIDFont(idA,
#if LOAD_FONTS_FROM_MEM #if LOAD_FONTS_FROM_MEM
fontBuf, fontBuf,
#else #else
fileName, deleteFile, fileName, deleteFile,
#endif #endif
codeToGID, codeToGIDLen); codeToGID, codeToGIDLen);
} }
#endif #endif
if (!fontFile) {
gfree(codeToGID);
}
#if !LOAD_FONTS_FROM_MEM && !defined(_WIN32) && !defined(__ANDROID__) #if !LOAD_FONTS_FROM_MEM && !defined(_WIN32) && !defined(__ANDROID__)
// delete the (temporary) font file -- with Unix hard link // delete the (temporary) font file -- with Unix hard link
// semantics, this will remove the last link; otherwise it will // semantics, this will remove the last link; otherwise it will
// return an error, leaving the file to be deleted later (if // return an error, leaving the file to be deleted later (if
// loadXYZFont failed, the file will always be deleted) // loadXYZFont failed, the file will always be deleted)
if (deleteFile) { if (deleteFile) {
unlink(fontFile ? fontFile->fileName->getCString() : fileName); unlink(fontFile ? fontFile->fileName->getCString() : fileName);
} }
#endif #endif
skipping to change at line 261 skipping to change at line 273
fontFile = ftEngine->loadOpenTypeCFFFont(idA, fontFile = ftEngine->loadOpenTypeCFFFont(idA,
#if LOAD_FONTS_FROM_MEM #if LOAD_FONTS_FROM_MEM
fontBuf, fontBuf,
#else #else
fileName, deleteFile, fileName, deleteFile,
#endif #endif
codeToGID, codeToGIDLen); codeToGID, codeToGIDLen);
} }
#endif #endif
if (!fontFile) {
gfree(codeToGID);
}
#if !LOAD_FONTS_FROM_MEM && !defined(_WIN32) && !defined(__ANDROID__) #if !LOAD_FONTS_FROM_MEM && !defined(_WIN32) && !defined(__ANDROID__)
// delete the (temporary) font file -- with Unix hard link // delete the (temporary) font file -- with Unix hard link
// semantics, this will remove the last link; otherwise it will // semantics, this will remove the last link; otherwise it will
// return an error, leaving the file to be deleted later (if // return an error, leaving the file to be deleted later (if
// loadXYZFont failed, the file will always be deleted) // loadXYZFont failed, the file will always be deleted)
if (deleteFile) { if (deleteFile) {
unlink(fontFile ? fontFile->fileName->getCString() : fileName); unlink(fontFile ? fontFile->fileName->getCString() : fileName);
} }
#endif #endif
 End of changes. 6 change blocks. 
0 lines changed or deleted 16 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)