diff options
Diffstat (limited to 'kpdf/xpdf')
-rw-r--r-- | kpdf/xpdf/ConfigureChecks.cmake | 14 | ||||
-rw-r--r-- | kpdf/xpdf/fofi/CMakeLists.txt | 4 | ||||
-rw-r--r-- | kpdf/xpdf/fofi/FoFiBase.cpp (renamed from kpdf/xpdf/fofi/FoFiBase.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/fofi/FoFiEncodings.cpp (renamed from kpdf/xpdf/fofi/FoFiEncodings.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/fofi/FoFiTrueType.cpp (renamed from kpdf/xpdf/fofi/FoFiTrueType.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/fofi/FoFiType1.cpp (renamed from kpdf/xpdf/fofi/FoFiType1.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/fofi/FoFiType1C.cpp (renamed from kpdf/xpdf/fofi/FoFiType1C.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/fofi/Makefile.am | 4 | ||||
-rw-r--r-- | kpdf/xpdf/goo/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kpdf/xpdf/goo/GHash.cpp (renamed from kpdf/xpdf/goo/GHash.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/goo/GList.cpp (renamed from kpdf/xpdf/goo/GList.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/goo/GString.cpp (renamed from kpdf/xpdf/goo/GString.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/goo/Makefile.am | 2 | ||||
-rw-r--r-- | kpdf/xpdf/goo/gfile.cpp (renamed from kpdf/xpdf/goo/gfile.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/goo/gmem.cpp (renamed from kpdf/xpdf/goo/gmem.cc) | 0 | ||||
-rw-r--r-- | kpdf/xpdf/goo/gmempp.cpp (renamed from kpdf/xpdf/goo/gmempp.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/CMakeLists.txt | 11 | ||||
-rw-r--r-- | kpdf/xpdf/splash/Makefile.am | 8 | ||||
-rw-r--r-- | kpdf/xpdf/splash/Splash.cpp (renamed from kpdf/xpdf/splash/Splash.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashBitmap.cpp (renamed from kpdf/xpdf/splash/SplashBitmap.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashClip.cpp (renamed from kpdf/xpdf/splash/SplashClip.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashFTFont.cpp (renamed from kpdf/xpdf/splash/SplashFTFont.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashFTFontEngine.cpp (renamed from kpdf/xpdf/splash/SplashFTFontEngine.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashFTFontFile.cpp (renamed from kpdf/xpdf/splash/SplashFTFontFile.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashFont.cpp (renamed from kpdf/xpdf/splash/SplashFont.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashFontEngine.cpp (renamed from kpdf/xpdf/splash/SplashFontEngine.cc) | 32 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashFontEngine.h | 7 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashFontFile.cpp (renamed from kpdf/xpdf/splash/SplashFontFile.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashFontFileID.cpp (renamed from kpdf/xpdf/splash/SplashFontFileID.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashPath.cpp (renamed from kpdf/xpdf/splash/SplashPath.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashPattern.cpp (renamed from kpdf/xpdf/splash/SplashPattern.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashScreen.cpp (renamed from kpdf/xpdf/splash/SplashScreen.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashState.cpp (renamed from kpdf/xpdf/splash/SplashState.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashT1Font.cc | 292 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashT1Font.h | 57 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashT1FontEngine.cc | 122 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashT1FontEngine.h | 53 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashT1FontFile.cc | 117 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashT1FontFile.h | 58 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashTypes.h | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashXPath.cpp (renamed from kpdf/xpdf/splash/SplashXPath.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/splash/SplashXPathScanner.cpp (renamed from kpdf/xpdf/splash/SplashXPathScanner.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Annot.cpp (renamed from kpdf/xpdf/xpdf/Annot.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Array.cpp (renamed from kpdf/xpdf/xpdf/Array.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/BuiltinFont.cpp (renamed from kpdf/xpdf/xpdf/BuiltinFont.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/BuiltinFontTables.cpp (renamed from kpdf/xpdf/xpdf/BuiltinFontTables.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/CMakeLists.txt | 18 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/CMap.cpp (renamed from kpdf/xpdf/xpdf/CMap.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Catalog.cpp (renamed from kpdf/xpdf/xpdf/Catalog.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/CharCodeToUnicode.cpp (renamed from kpdf/xpdf/xpdf/CharCodeToUnicode.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Decrypt.cpp (renamed from kpdf/xpdf/xpdf/Decrypt.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Dict.cpp (renamed from kpdf/xpdf/xpdf/Dict.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/FontEncodingTables.cpp (renamed from kpdf/xpdf/xpdf/FontEncodingTables.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Function.cpp (renamed from kpdf/xpdf/xpdf/Function.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Gfx.cpp (renamed from kpdf/xpdf/xpdf/Gfx.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/GfxFont.cpp (renamed from kpdf/xpdf/xpdf/GfxFont.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/GfxState.cpp (renamed from kpdf/xpdf/xpdf/GfxState.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/GfxState.h | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/GlobalParams.cpp (renamed from kpdf/xpdf/xpdf/GlobalParams.cc) | 31 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/GlobalParams.h | 3 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/JArithmeticDecoder.cpp (renamed from kpdf/xpdf/xpdf/JArithmeticDecoder.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/JBIG2Stream.cpp (renamed from kpdf/xpdf/xpdf/JBIG2Stream.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/JPXStream.cpp (renamed from kpdf/xpdf/xpdf/JPXStream.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Lexer.cpp (renamed from kpdf/xpdf/xpdf/Lexer.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Link.cpp (renamed from kpdf/xpdf/xpdf/Link.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Makefile.am | 16 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/NameToCharCode.cpp (renamed from kpdf/xpdf/xpdf/NameToCharCode.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Object.cpp (renamed from kpdf/xpdf/xpdf/Object.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Outline.cpp (renamed from kpdf/xpdf/xpdf/Outline.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/OutputDev.cpp (renamed from kpdf/xpdf/xpdf/OutputDev.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/PDFDoc.cpp (renamed from kpdf/xpdf/xpdf/PDFDoc.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/PDFDocEncoding.cpp (renamed from kpdf/xpdf/xpdf/PDFDocEncoding.cc) | 0 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/PSOutputDev.cpp (renamed from kpdf/xpdf/xpdf/PSOutputDev.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/PSTokenizer.cpp (renamed from kpdf/xpdf/xpdf/PSTokenizer.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Page.cpp (renamed from kpdf/xpdf/xpdf/Page.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Parser.cpp (renamed from kpdf/xpdf/xpdf/Parser.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/PreScanOutputDev.cpp (renamed from kpdf/xpdf/xpdf/PreScanOutputDev.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/SecurityHandler.cpp (renamed from kpdf/xpdf/xpdf/SecurityHandler.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/SplashOutputDev.cpp (renamed from kpdf/xpdf/xpdf/SplashOutputDev.cc) | 5 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/Stream.cpp (renamed from kpdf/xpdf/xpdf/Stream.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/TextOutputDev.cpp (renamed from kpdf/xpdf/xpdf/TextOutputDev.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/UnicodeMap.cpp (renamed from kpdf/xpdf/xpdf/UnicodeMap.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/UnicodeTypeTable.cpp (renamed from kpdf/xpdf/xpdf/UnicodeTypeTable.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/XRef.cpp (renamed from kpdf/xpdf/xpdf/XRef.cc) | 2 | ||||
-rw-r--r-- | kpdf/xpdf/xpdf/xpdf_config.h | 2 |
85 files changed, 102 insertions, 880 deletions
diff --git a/kpdf/xpdf/ConfigureChecks.cmake b/kpdf/xpdf/ConfigureChecks.cmake index 6c4b5614..b15a82ef 100644 --- a/kpdf/xpdf/ConfigureChecks.cmake +++ b/kpdf/xpdf/ConfigureChecks.cmake @@ -21,20 +21,6 @@ if( NOT JPEG_FOUND ) endif( ) -# check for t1lib -if( WITH_T1LIB ) - check_include_file( t1lib.h HAVE_T1LIB_H ) - if( HAVE_T1LIB_H ) - check_library_exists( t1 T1_InitLib "" HAVE_T1LIB ) - endif( ) - if( HAVE_T1LIB_H AND HAVE_T1LIB ) - set( T1_LIBRARY t1 CACHE INTERNAL "" FORCE ) - else( ) - tde_message_fatal( "t1lib is required, but was not found on your system" ) - endif( ) -endif( ) - - # check for libpaper if( WITH_PAPER ) check_include_file( paper.h HAVE_PAPER_H ) diff --git a/kpdf/xpdf/fofi/CMakeLists.txt b/kpdf/xpdf/fofi/CMakeLists.txt index e98957f3..2f983315 100644 --- a/kpdf/xpdf/fofi/CMakeLists.txt +++ b/kpdf/xpdf/fofi/CMakeLists.txt @@ -21,6 +21,6 @@ include_directories( tde_add_library( fofi STATIC_PIC SOURCES - FoFiBase.cc FoFiEncodings.cc FoFiTrueType.cc FoFiType1.cc - FoFiType1C.cc + FoFiBase.cpp FoFiEncodings.cpp FoFiTrueType.cpp FoFiType1.cpp + FoFiType1C.cpp ) diff --git a/kpdf/xpdf/fofi/FoFiBase.cc b/kpdf/xpdf/fofi/FoFiBase.cpp index 28d0b8ca..af6fe112 100644 --- a/kpdf/xpdf/fofi/FoFiBase.cc +++ b/kpdf/xpdf/fofi/FoFiBase.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// FoFiBase.cc +// FoFiBase.cpp // // Copyright 1999-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/fofi/FoFiEncodings.cc b/kpdf/xpdf/fofi/FoFiEncodings.cpp index 37a17f5d..3c0d39a3 100644 --- a/kpdf/xpdf/fofi/FoFiEncodings.cc +++ b/kpdf/xpdf/fofi/FoFiEncodings.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// FoFiEncodings.cc +// FoFiEncodings.cpp // // Copyright 1999-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/fofi/FoFiTrueType.cc b/kpdf/xpdf/fofi/FoFiTrueType.cpp index a205a068..18253335 100644 --- a/kpdf/xpdf/fofi/FoFiTrueType.cc +++ b/kpdf/xpdf/fofi/FoFiTrueType.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// FoFiTrueType.cc +// FoFiTrueType.cpp // // Copyright 1999-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/fofi/FoFiType1.cc b/kpdf/xpdf/fofi/FoFiType1.cpp index 88b35ecc..f6e676a2 100644 --- a/kpdf/xpdf/fofi/FoFiType1.cc +++ b/kpdf/xpdf/fofi/FoFiType1.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// FoFiType1.cc +// FoFiType1.cpp // // Copyright 1999-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/fofi/FoFiType1C.cc b/kpdf/xpdf/fofi/FoFiType1C.cpp index 3b28f321..f2ca88dc 100644 --- a/kpdf/xpdf/fofi/FoFiType1C.cc +++ b/kpdf/xpdf/fofi/FoFiType1C.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// FoFiType1C.cc +// FoFiType1C.cpp // // Copyright 1999-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/fofi/Makefile.am b/kpdf/xpdf/fofi/Makefile.am index 7ca93922..9a1ec4aa 100644 --- a/kpdf/xpdf/fofi/Makefile.am +++ b/kpdf/xpdf/fofi/Makefile.am @@ -1,8 +1,8 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../goo $(all_includes) libfofi_la_LDFLAGS = $(all_libraries) -libfofi_la_SOURCES = FoFiBase.cc FoFiEncodings.cc FoFiTrueType.cc \ - FoFiType1.cc FoFiType1C.cc +libfofi_la_SOURCES = FoFiBase.cpp FoFiEncodings.cpp FoFiTrueType.cpp \ + FoFiType1.cpp FoFiType1C.cpp METASOURCES = AUTO diff --git a/kpdf/xpdf/goo/CMakeLists.txt b/kpdf/xpdf/goo/CMakeLists.txt index 5a5a0ac8..dd6dc2d1 100644 --- a/kpdf/xpdf/goo/CMakeLists.txt +++ b/kpdf/xpdf/goo/CMakeLists.txt @@ -22,5 +22,5 @@ include_directories( tde_add_library( goo STATIC_PIC SOURCES - GHash.cc GList.cc GString.cc gfile.cc gmem.cc gmempp.cc + GHash.cpp GList.cpp GString.cpp gfile.cpp gmem.cpp gmempp.cpp ) diff --git a/kpdf/xpdf/goo/GHash.cc b/kpdf/xpdf/goo/GHash.cpp index b51a7643..f642a261 100644 --- a/kpdf/xpdf/goo/GHash.cc +++ b/kpdf/xpdf/goo/GHash.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// GHash.cc +// GHash.cpp // // Copyright 2001-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/goo/GList.cc b/kpdf/xpdf/goo/GList.cpp index fb5fd628..2a4e4695 100644 --- a/kpdf/xpdf/goo/GList.cc +++ b/kpdf/xpdf/goo/GList.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// GList.cc +// GList.cpp // // Copyright 2001-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/goo/GString.cc b/kpdf/xpdf/goo/GString.cpp index e21fd3ea..89f122e1 100644 --- a/kpdf/xpdf/goo/GString.cc +++ b/kpdf/xpdf/goo/GString.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// GString.cc +// GString.cpp // // Simple variable-length string type. // diff --git a/kpdf/xpdf/goo/Makefile.am b/kpdf/xpdf/goo/Makefile.am index 04933cee..00ffad0d 100644 --- a/kpdf/xpdf/goo/Makefile.am +++ b/kpdf/xpdf/goo/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(srcdir)/.. -libgoo_la_SOURCES = GHash.cc GList.cc GString.cc gfile.cc gmem.cc gmempp.cc +libgoo_la_SOURCES = GHash.cpp GList.cpp GString.cpp gfile.cpp gmem.cpp gmempp.cpp noinst_LTLIBRARIES = libgoo.la diff --git a/kpdf/xpdf/goo/gfile.cc b/kpdf/xpdf/goo/gfile.cpp index 54a7be3d..bb75b855 100644 --- a/kpdf/xpdf/goo/gfile.cc +++ b/kpdf/xpdf/goo/gfile.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// gfile.cc +// gfile.cpp // // Miscellaneous file and directory name manipulation. // diff --git a/kpdf/xpdf/goo/gmem.cc b/kpdf/xpdf/goo/gmem.cpp index d8962aba..d8962aba 100644 --- a/kpdf/xpdf/goo/gmem.cc +++ b/kpdf/xpdf/goo/gmem.cpp diff --git a/kpdf/xpdf/goo/gmempp.cc b/kpdf/xpdf/goo/gmempp.cpp index b1ee970d..4804889b 100644 --- a/kpdf/xpdf/goo/gmempp.cc +++ b/kpdf/xpdf/goo/gmempp.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// gmempp.cc +// gmempp.cpp // // Use gmalloc/gfree for C++ new/delete operators. // diff --git a/kpdf/xpdf/splash/CMakeLists.txt b/kpdf/xpdf/splash/CMakeLists.txt index 650debba..a99ceeb2 100644 --- a/kpdf/xpdf/splash/CMakeLists.txt +++ b/kpdf/xpdf/splash/CMakeLists.txt @@ -23,11 +23,10 @@ include_directories( tde_add_library( splash STATIC_PIC SOURCES - Splash.cc SplashBitmap.cc SplashClip.cc SplashFTFont.cc - SplashFTFontEngine.cc SplashFTFontFile.cc SplashFont.cc - SplashFontEngine.cc SplashFontFile.cc SplashFontFileID.cc - SplashPath.cc SplashPattern.cc SplashScreen.cc SplashState.cc - SplashT1Font.cc SplashT1FontEngine.cc SplashT1FontFile.cc - SplashXPath.cc SplashXPathScanner.cc + Splash.cpp SplashBitmap.cpp SplashClip.cpp SplashFTFont.cpp + SplashFTFontEngine.cpp SplashFTFontFile.cpp SplashFont.cpp + SplashFontEngine.cpp SplashFontFile.cpp SplashFontFileID.cpp + SplashPath.cpp SplashPattern.cpp SplashScreen.cpp SplashState.cpp + SplashXPath.cpp SplashXPathScanner.cpp LINK ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ) diff --git a/kpdf/xpdf/splash/Makefile.am b/kpdf/xpdf/splash/Makefile.am index 34d41419..5bf50df6 100644 --- a/kpdf/xpdf/splash/Makefile.am +++ b/kpdf/xpdf/splash/Makefile.am @@ -1,8 +1,8 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../goo $(LIBFREETYPE_CFLAGS) $(USER_INCLUDES) -libsplash_la_SOURCES = Splash.cc SplashBitmap.cc SplashClip.cc SplashFTFont.cc SplashFTFontEngine.cc \ - SplashFTFontFile.cc SplashFont.cc SplashFontEngine.cc SplashFontFile.cc SplashFontFileID.cc \ - SplashPath.cc SplashPattern.cc SplashScreen.cc SplashState.cc SplashT1Font.cc \ - SplashT1FontEngine.cc SplashT1FontFile.cc SplashXPath.cc SplashXPathScanner.cc +libsplash_la_SOURCES = Splash.cpp SplashBitmap.cpp SplashClip.cpp SplashFTFont.cpp SplashFTFontEngine.cpp \ + SplashFTFontFile.cpp SplashFont.cpp SplashFontEngine.cpp SplashFontFile.cpp SplashFontFileID.cpp \ + SplashPath.cpp SplashPattern.cpp SplashScreen.cpp SplashState.cpp \ + SplashXPath.cpp SplashXPathScanner.cpp noinst_LTLIBRARIES = libsplash.la diff --git a/kpdf/xpdf/splash/Splash.cc b/kpdf/xpdf/splash/Splash.cpp index 2b91e4e7..2cfc1ee2 100644 --- a/kpdf/xpdf/splash/Splash.cc +++ b/kpdf/xpdf/splash/Splash.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Splash.cc +// Splash.cpp // //======================================================================== diff --git a/kpdf/xpdf/splash/SplashBitmap.cc b/kpdf/xpdf/splash/SplashBitmap.cpp index 62bbd8e8..5b5d28d1 100644 --- a/kpdf/xpdf/splash/SplashBitmap.cc +++ b/kpdf/xpdf/splash/SplashBitmap.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashBitmap.cc +// SplashBitmap.cpp // //======================================================================== diff --git a/kpdf/xpdf/splash/SplashClip.cc b/kpdf/xpdf/splash/SplashClip.cpp index ef8acbab..ba03b7a4 100644 --- a/kpdf/xpdf/splash/SplashClip.cc +++ b/kpdf/xpdf/splash/SplashClip.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashClip.cc +// SplashClip.cpp // //======================================================================== diff --git a/kpdf/xpdf/splash/SplashFTFont.cc b/kpdf/xpdf/splash/SplashFTFont.cpp index 42d92af4..4bc31210 100644 --- a/kpdf/xpdf/splash/SplashFTFont.cc +++ b/kpdf/xpdf/splash/SplashFTFont.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashFTFont.cc +// SplashFTFont.cpp // //======================================================================== diff --git a/kpdf/xpdf/splash/SplashFTFontEngine.cc b/kpdf/xpdf/splash/SplashFTFontEngine.cpp index 02996de7..36cf32e6 100644 --- a/kpdf/xpdf/splash/SplashFTFontEngine.cc +++ b/kpdf/xpdf/splash/SplashFTFontEngine.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashFTFontEngine.cc +// SplashFTFontEngine.cpp // //======================================================================== diff --git a/kpdf/xpdf/splash/SplashFTFontFile.cc b/kpdf/xpdf/splash/SplashFTFontFile.cpp index 12725497..697c3ed8 100644 --- a/kpdf/xpdf/splash/SplashFTFontFile.cc +++ b/kpdf/xpdf/splash/SplashFTFontFile.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashFTFontFile.cc +// SplashFTFontFile.cpp // //======================================================================== diff --git a/kpdf/xpdf/splash/SplashFont.cc b/kpdf/xpdf/splash/SplashFont.cpp index 4a91d5e8..42c9e999 100644 --- a/kpdf/xpdf/splash/SplashFont.cc +++ b/kpdf/xpdf/splash/SplashFont.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashFont.cc +// SplashFont.cpp // //======================================================================== diff --git a/kpdf/xpdf/splash/SplashFontEngine.cc b/kpdf/xpdf/splash/SplashFontEngine.cpp index 4dc1b35b..c3eb33a7 100644 --- a/kpdf/xpdf/splash/SplashFontEngine.cc +++ b/kpdf/xpdf/splash/SplashFontEngine.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashFontEngine.cc +// SplashFontEngine.cpp // //======================================================================== @@ -10,10 +10,6 @@ #pragma implementation #endif -#if HAVE_T1LIB_H -#include <t1lib.h> -#endif - #include <stdlib.h> #include <stdio.h> #ifndef WIN32 @@ -22,7 +18,6 @@ #include "gmem.h" #include "GString.h" #include "SplashMath.h" -#include "SplashT1FontEngine.h" #include "SplashFTFontEngine.h" #include "SplashFontFile.h" #include "SplashFontFileID.h" @@ -40,9 +35,6 @@ extern "C" int unlink(char *filename); //------------------------------------------------------------------------ SplashFontEngine::SplashFontEngine( -#if HAVE_T1LIB_H - GBool enableT1lib, -#endif #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H GBool enableFreeType, #endif @@ -53,13 +45,6 @@ SplashFontEngine::SplashFontEngine( fontCache[i] = NULL; } -#if HAVE_T1LIB_H - if (enableT1lib) { - t1Engine = SplashT1FontEngine::init(aa); - } else { - t1Engine = NULL; - } -#endif #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H if (enableFreeType) { ftEngine = SplashFTFontEngine::init(aa); @@ -78,11 +63,6 @@ SplashFontEngine::~SplashFontEngine() { } } -#if HAVE_T1LIB_H - if (t1Engine) { - delete t1Engine; - } -#endif #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H if (ftEngine) { delete ftEngine; @@ -111,11 +91,6 @@ SplashFontFile *SplashFontEngine::loadType1Font(SplashFontFileID *idA, SplashFontFile *fontFile; fontFile = NULL; -#if HAVE_T1LIB_H - if (!fontFile && t1Engine) { - fontFile = t1Engine->loadType1Font(idA, src, enc); - } -#endif #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H if (!fontFile && ftEngine) { fontFile = ftEngine->loadType1Font(idA, src, enc); @@ -138,11 +113,6 @@ SplashFontFile *SplashFontEngine::loadType1CFont(SplashFontFileID *idA, SplashFontFile *fontFile; fontFile = NULL; -#if HAVE_T1LIB_H - if (!fontFile && t1Engine) { - fontFile = t1Engine->loadType1CFont(idA, sec, enc); - } -#endif #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H if (!fontFile && ftEngine) { fontFile = ftEngine->loadType1CFont(idA, src, enc); diff --git a/kpdf/xpdf/splash/SplashFontEngine.h b/kpdf/xpdf/splash/SplashFontEngine.h index ace5e9ae..4718a208 100644 --- a/kpdf/xpdf/splash/SplashFontEngine.h +++ b/kpdf/xpdf/splash/SplashFontEngine.h @@ -15,7 +15,6 @@ #include "gtypes.h" -class SplashT1FontEngine; class SplashFTFontEngine; class SplashDTFontEngine; class SplashDT4FontEngine; @@ -37,9 +36,6 @@ public: // Create a font engine. SplashFontEngine( -#if HAVE_T1LIB_H - GBool enableT1lib, -#endif #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H GBool enableFreeType, #endif @@ -75,9 +71,6 @@ private: SplashFont *fontCache[splashFontCacheSize]; -#if HAVE_T1LIB_H - SplashT1FontEngine *t1Engine; -#endif #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H SplashFTFontEngine *ftEngine; #endif diff --git a/kpdf/xpdf/splash/SplashFontFile.cc b/kpdf/xpdf/splash/SplashFontFile.cpp index ad58c22d..c66447bb 100644 --- a/kpdf/xpdf/splash/SplashFontFile.cc +++ b/kpdf/xpdf/splash/SplashFontFile.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashFontFile.cc +// SplashFontFile.cpp // //======================================================================== diff --git a/kpdf/xpdf/splash/SplashFontFileID.cc b/kpdf/xpdf/splash/SplashFontFileID.cpp index af37cb2f..9182d4d8 100644 --- a/kpdf/xpdf/splash/SplashFontFileID.cc +++ b/kpdf/xpdf/splash/SplashFontFileID.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashFontFileID.cc +// SplashFontFileID.cpp // //======================================================================== diff --git a/kpdf/xpdf/splash/SplashPath.cc b/kpdf/xpdf/splash/SplashPath.cpp index e3a89271..4a3c334c 100644 --- a/kpdf/xpdf/splash/SplashPath.cc +++ b/kpdf/xpdf/splash/SplashPath.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashPath.cc +// SplashPath.cpp // //======================================================================== diff --git a/kpdf/xpdf/splash/SplashPattern.cc b/kpdf/xpdf/splash/SplashPattern.cpp index e6a37852..2aa4f70f 100644 --- a/kpdf/xpdf/splash/SplashPattern.cc +++ b/kpdf/xpdf/splash/SplashPattern.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashPattern.cc +// SplashPattern.cpp // //======================================================================== diff --git a/kpdf/xpdf/splash/SplashScreen.cc b/kpdf/xpdf/splash/SplashScreen.cpp index 3e8d36ca..a1f50c0a 100644 --- a/kpdf/xpdf/splash/SplashScreen.cc +++ b/kpdf/xpdf/splash/SplashScreen.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashScreen.cc +// SplashScreen.cpp // //======================================================================== diff --git a/kpdf/xpdf/splash/SplashState.cc b/kpdf/xpdf/splash/SplashState.cpp index e2c34c44..17445ad7 100644 --- a/kpdf/xpdf/splash/SplashState.cc +++ b/kpdf/xpdf/splash/SplashState.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashState.cc +// SplashState.cpp // //======================================================================== diff --git a/kpdf/xpdf/splash/SplashT1Font.cc b/kpdf/xpdf/splash/SplashT1Font.cc deleted file mode 100644 index 19237e1d..00000000 --- a/kpdf/xpdf/splash/SplashT1Font.cc +++ /dev/null @@ -1,292 +0,0 @@ -//======================================================================== -// -// SplashT1Font.cc -// -//======================================================================== - -#include <aconf.h> - -#if HAVE_T1LIB_H - -#ifdef USE_GCC_PRAGMAS -#pragma implementation -#endif - -#include <stdlib.h> -#include <t1lib.h> -#include "gmem.h" -#include "SplashMath.h" -#include "SplashGlyphBitmap.h" -#include "SplashPath.h" -#include "SplashT1FontEngine.h" -#include "SplashT1FontFile.h" -#include "SplashT1Font.h" - -//------------------------------------------------------------------------ - -static Guchar bitReverse[256] = { - 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, - 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, - 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, - 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, - 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, - 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, - 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, - 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, - 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, - 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2, - 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, - 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa, - 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, - 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, - 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, - 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, - 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, - 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1, - 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, - 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9, - 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, - 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, - 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, - 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, - 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, - 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, - 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, - 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb, - 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, - 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, - 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, - 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff -}; - -//------------------------------------------------------------------------ -// SplashT1Font -//------------------------------------------------------------------------ - -SplashT1Font::SplashT1Font(SplashT1FontFile *fontFileA, SplashCoord *matA, - SplashCoord *textMatA): - SplashFont(fontFileA, matA, textMatA, fontFileA->engine->aa) -{ - T1_TMATRIX matrix; - BBox bbox; - SplashCoord bbx0, bby0, bbx1, bby1; - int x, y; - - t1libID = T1_CopyFont(fontFileA->t1libID); - outlineID = -1; - - // compute font size - size = (float)splashSqrt(mat[2]*mat[2] + mat[3]*mat[3]); - - // transform the four corners of the font bounding box -- the min - // and max values form the bounding box of the transformed font - bbox = T1_GetFontBBox(t1libID); - bbx0 = 0.001 * bbox.llx; - bby0 = 0.001 * bbox.lly; - bbx1 = 0.001 * bbox.urx; - bby1 = 0.001 * bbox.ury; - // some fonts are completely broken, so we fake it (with values - // large enough that most glyphs should fit) - if (bbx0 == 0 && bby0 == 0 && bbx1 == 0 && bby1 == 0) { - bbx0 = bby0 = -0.5; - bbx1 = bby1 = 1.5; - } - x = (int)(mat[0] * bbx0 + mat[2] * bby0); - xMin = xMax = x; - y = (int)(mat[1] * bbx0 + mat[3] * bby0); - yMin = yMax = y; - x = (int)(mat[0] * bbx0 + mat[2] * bby1); - if (x < xMin) { - xMin = x; - } else if (x > xMax) { - xMax = x; - } - y = (int)(mat[1] * bbx0 + mat[3] * bby1); - if (y < yMin) { - yMin = y; - } else if (y > yMax) { - yMax = y; - } - x = (int)(mat[0] * bbx1 + mat[2] * bby0); - if (x < xMin) { - xMin = x; - } else if (x > xMax) { - xMax = x; - } - y = (int)(mat[1] * bbx1 + mat[3] * bby0); - if (y < yMin) { - yMin = y; - } else if (y > yMax) { - yMax = y; - } - x = (int)(mat[0] * bbx1 + mat[2] * bby1); - if (x < xMin) { - xMin = x; - } else if (x > xMax) { - xMax = x; - } - y = (int)(mat[1] * bbx1 + mat[3] * bby1); - if (y < yMin) { - yMin = y; - } else if (y > yMax) { - yMax = y; - } - // This is a kludge: some buggy PDF generators embed fonts with - // zero bounding boxes. - if (xMax == xMin) { - xMin = 0; - xMax = (int)size; - } - if (yMax == yMin) { - yMin = 0; - yMax = (int)(1.2 * size); - } - // Another kludge: an unusually large xMin or yMin coordinate is - // probably wrong. - if (xMin > 0) { - xMin = 0; - } - if (yMin > 0) { - yMin = 0; - } - // Another kludge: t1lib doesn't correctly handle fonts with - // real (non-integer) bounding box coordinates. - if (xMax - xMin > 5000) { - xMin = 0; - xMax = (int)size; - } - if (yMax - yMin > 5000) { - yMin = 0; - yMax = (int)(1.2 * size); - } - - // transform the font - matrix.cxx = (double)mat[0] / size; - matrix.cxy = (double)mat[1] / size; - matrix.cyx = (double)mat[2] / size; - matrix.cyy = (double)mat[3] / size; - T1_TransformFont(t1libID, &matrix); -} - -SplashT1Font::~SplashT1Font() { - T1_DeleteFont(t1libID); - if (outlineID >= 0) { - T1_DeleteFont(outlineID); - } -} - -GBool SplashT1Font::getGlyph(int c, int xFrac, int yFrac, - SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes) { - return SplashFont::getGlyph(c, 0, 0, bitmap, x0, y0, clip, clipRes); -} - -GBool SplashT1Font::makeGlyph(int c, int xFrac, int yFrac, - SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes) { - GLYPH *glyph; - int n, i; - - if (aa) { - glyph = T1_AASetChar(t1libID, c, size, NULL); - } else { - glyph = T1_SetChar(t1libID, c, size, NULL); - } - if (!glyph) { - return gFalse; - } - - bitmap->x = -glyph->metrics.leftSideBearing; - bitmap->y = glyph->metrics.ascent; - bitmap->w = glyph->metrics.rightSideBearing - glyph->metrics.leftSideBearing; - bitmap->h = glyph->metrics.ascent - glyph->metrics.descent; - bitmap->aa = aa; - if (aa) { - bitmap->data = (Guchar *)glyph->bits; - bitmap->freeData = gFalse; - } else { - n = bitmap->h * ((bitmap->w + 7) >> 3); - bitmap->data = (Guchar *)gmalloc(n); - for (i = 0; i < n; ++i) { - bitmap->data[i] = bitReverse[glyph->bits[i] & 0xff]; - } - bitmap->freeData = gTrue; - } - - *clipRes = clip->testRect(x0 - bitmap->x, - y0 - bitmap->y, - x0 - bitmap->x + bitmap->w - 1, - y0 - bitmap->y + bitmap->h - 1); - - return gTrue; -} - -SplashPath *SplashT1Font::getGlyphPath(int c) { - T1_TMATRIX matrix; - SplashPath *path; - T1_OUTLINE *outline; - T1_PATHSEGMENT *seg; - T1_BEZIERSEGMENT *bez; - SplashCoord x, y, x1, y1; - GBool needClose; - - if (outlineID < 0) { - outlineID = T1_CopyFont(((SplashT1FontFile *)fontFile)->t1libID); - outlineSize = (float)splashSqrt(textMat[2]*textMat[2] + - textMat[3]*textMat[3]); - matrix.cxx = (double)textMat[0] / outlineSize; - matrix.cxy = (double)textMat[1] / outlineSize; - matrix.cyx = (double)textMat[2] / outlineSize; - matrix.cyy = (double)textMat[3] / outlineSize; - // t1lib doesn't seem to handle small sizes correctly here, so set - // the size to 1000, and scale the resulting coordinates later - outlineMul = (float)(outlineSize / 65536000.0); - outlineSize = 1000; - T1_TransformFont(outlineID, &matrix); - } - - path = new SplashPath(); - if ((outline = T1_GetCharOutline(outlineID, c, outlineSize, NULL))) { - x = 0; - y = 0; - needClose = gFalse; - for (seg = outline; seg; seg = seg->link) { - switch (seg->type) { - case T1_PATHTYPE_MOVE: - if (needClose) { - path->close(); - needClose = gFalse; - } - x += seg->dest.x * outlineMul; - y += seg->dest.y * outlineMul; - path->moveTo(x, -y); - break; - case T1_PATHTYPE_LINE: - x += seg->dest.x * outlineMul; - y += seg->dest.y * outlineMul; - path->lineTo(x, -y); - needClose = gTrue; - break; - case T1_PATHTYPE_BEZIER: - bez = (T1_BEZIERSEGMENT *)seg; - x1 = x + (SplashCoord)(bez->dest.x * outlineMul); - y1 = y + (SplashCoord)(bez->dest.y * outlineMul); - path->curveTo(x + (SplashCoord)(bez->B.x * outlineMul), - -(y + (SplashCoord)(bez->B.y * outlineMul)), - x + (SplashCoord)(bez->C.x * outlineMul), - -(y + (SplashCoord)(bez->C.y * outlineMul)), - x1, -y1); - x = x1; - y = y1; - needClose = gTrue; - break; - } - } - if (needClose) { - path->close(); - } - T1_FreeOutline(outline); - } - - return path; -} - -#endif // HAVE_T1LIB_H diff --git a/kpdf/xpdf/splash/SplashT1Font.h b/kpdf/xpdf/splash/SplashT1Font.h deleted file mode 100644 index 129c6ad5..00000000 --- a/kpdf/xpdf/splash/SplashT1Font.h +++ /dev/null @@ -1,57 +0,0 @@ -//======================================================================== -// -// SplashT1Font.h -// -//======================================================================== - -#ifndef SPLASHT1FONT_H -#define SPLASHT1FONT_H - -#include <aconf.h> - -#if HAVE_T1LIB_H - -#ifdef USE_GCC_PRAGMAS -#pragma interface -#endif - -#include "SplashFont.h" - -class SplashT1FontFile; - -//------------------------------------------------------------------------ -// SplashT1Font -//------------------------------------------------------------------------ - -class SplashT1Font: public SplashFont { -public: - - SplashT1Font(SplashT1FontFile *fontFileA, SplashCoord *matA, - SplashCoord *textMatA); - - virtual ~SplashT1Font(); - - // Munge xFrac and yFrac before calling SplashFont::getGlyph. - virtual GBool getGlyph(int c, int xFrac, int yFrac, - SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes); - - // Rasterize a glyph. The <xFrac> and <yFrac> values are the same - // as described for getGlyph. - virtual GBool makeGlyph(int c, int xFrac, int yFrac, - SplashGlyphBitmap *bitmap, int x0, int y0, SplashClip *clip, SplashClipResult *clipRes); - - // Return the path for a glyph. - virtual SplashPath *getGlyphPath(int c); - -private: - - int t1libID; // t1lib font ID - int outlineID; // t1lib font ID for glyph outlines - float size; - float outlineSize; // size for glyph outlines - float outlineMul; -}; - -#endif // HAVE_T1LIB_H - -#endif diff --git a/kpdf/xpdf/splash/SplashT1FontEngine.cc b/kpdf/xpdf/splash/SplashT1FontEngine.cc deleted file mode 100644 index 68530e88..00000000 --- a/kpdf/xpdf/splash/SplashT1FontEngine.cc +++ /dev/null @@ -1,122 +0,0 @@ -//======================================================================== -// -// SplashT1FontEngine.cc -// -//======================================================================== - -#include <aconf.h> - -#if HAVE_T1LIB_H - -#ifdef USE_GCC_PRAGMAS -#pragma implementation -#endif - -#include <stdlib.h> -#include <stdio.h> -#ifndef WIN32 -# include <unistd.h> -#endif -#include <t1lib.h> -#include "GString.h" -#include "gfile.h" -#include "FoFiType1C.h" -#include "SplashT1FontFile.h" -#include "SplashT1FontEngine.h" - -#ifdef VMS -#if (__VMS_VER < 70000000) -extern "C" int unlink(char *filename); -#endif -#endif - -//------------------------------------------------------------------------ - -int SplashT1FontEngine::t1libInitCount = 0; - -//------------------------------------------------------------------------ - -static void fileWrite(void *stream, char *data, int len) { - fwrite(data, 1, len, (FILE *)stream); -} - -//------------------------------------------------------------------------ -// SplashT1FontEngine -//------------------------------------------------------------------------ - -SplashT1FontEngine::SplashT1FontEngine(GBool aaA) { - aa = aaA; -} - -SplashT1FontEngine *SplashT1FontEngine::init(GBool aaA) { - // grayVals[i] = round(i * 255 / 16) - static unsigned long grayVals[17] = { - 0, 16, 32, 48, 64, 80, 96, 112, 128, 143, 159, 175, 191, 207, 223, 239, 255 - }; - - //~ for multithreading: need a mutex here - if (t1libInitCount == 0) { - T1_SetBitmapPad(8); - if (!T1_InitLib(NO_LOGFILE | IGNORE_CONFIGFILE | IGNORE_FONTDATABASE | - T1_NO_AFM)) { - return NULL; - } - if (aaA) { - T1_AASetBitsPerPixel(8); - T1_AASetLevel(T1_AA_HIGH); - T1_AAHSetGrayValues(grayVals); - } else { - T1_AANSetGrayValues(0, 1); - } - } - ++t1libInitCount; - - return new SplashT1FontEngine(aaA); -} - -SplashT1FontEngine::~SplashT1FontEngine() { - //~ for multithreading: need a mutex here - if (--t1libInitCount == 0) { - T1_CloseLib(); - } -} - -SplashFontFile *SplashT1FontEngine::loadType1Font(SplashFontFileID *idA, - SplashFontSrc *src, - char **enc) { - return SplashT1FontFile::loadType1Font(this, idA, fileName, deleteFile, enc); -} - -SplashFontFile *SplashT1FontEngine::loadType1CFont(SplashFontFileID *idA, - SplashFontSrc *src, - char **enc) { - FoFiType1C *ff; - GString *tmpFileName; - FILE *tmpFile; - SplashFontFile *ret; - SplashFontSrc *newsrc; - - if (src->isFile) - ff = FoFiType1C::load(src->fileName); - else - ff = new FoFiType1C(src->buf, src->bufLen, gFalse); - if (! ff) - return NULL; - } - tmpFileName = NULL; - if (!openTempFile(&tmpFileName, &tmpFile, "wb", NULL)) { - delete ff; - return NULL; - } - ff->convertToType1(NULL, NULL, gTrue, &fileWrite, tmpFile); - delete ff; - fclose(tmpFile); - newsrc = new SplashFontSrc; - newsrc->setFile(tmpFileName, gTrue); - delete tmpFileName; - ret = SplashT1FontFile::loadType1Font(this, idA, newsrc, enc); - newsrc->unref(); - return ret; -} - -#endif // HAVE_T1LIB_H diff --git a/kpdf/xpdf/splash/SplashT1FontEngine.h b/kpdf/xpdf/splash/SplashT1FontEngine.h deleted file mode 100644 index 57a04487..00000000 --- a/kpdf/xpdf/splash/SplashT1FontEngine.h +++ /dev/null @@ -1,53 +0,0 @@ -//======================================================================== -// -// SplashT1FontEngine.h -// -//======================================================================== - -#ifndef SPLASHT1FONTENGINE_H -#define SPLASHT1FONTENGINE_H - -#include <aconf.h> - -#if HAVE_T1LIB_H - -#ifdef USE_GCC_PRAGMAS -#pragma interface -#endif - -#include "gtypes.h" - -class SplashFontFile; -class SplashFontFileID; - -//------------------------------------------------------------------------ -// SplashT1FontEngine -//------------------------------------------------------------------------ - -class SplashT1FontEngine { -public: - - static SplashT1FontEngine *init(GBool aaA); - - ~SplashT1FontEngine(); - - // Load fonts. - SplashFontFile *loadType1Font(SplashFontFileID *idA, char *fileName, - GBool deleteFile, char **enc); - SplashFontFile *loadType1CFont(SplashFontFileID *idA, char *fileName, - GBool deleteFile, char **enc); - -private: - - SplashT1FontEngine(GBool aaA); - - static int t1libInitCount; - GBool aa; - - friend class SplashT1FontFile; - friend class SplashT1Font; -}; - -#endif // HAVE_T1LIB_H - -#endif diff --git a/kpdf/xpdf/splash/SplashT1FontFile.cc b/kpdf/xpdf/splash/SplashT1FontFile.cc deleted file mode 100644 index 54312055..00000000 --- a/kpdf/xpdf/splash/SplashT1FontFile.cc +++ /dev/null @@ -1,117 +0,0 @@ -//======================================================================== -// -// SplashT1FontFile.cc -// -//======================================================================== - -#include <aconf.h> - -#if HAVE_T1LIB_H - -#ifdef USE_GCC_PRAGMAS -#pragma implementation -#endif - -#include <string.h> -#include <t1lib.h> -#include "gmem.h" -#include "SplashT1FontEngine.h" -#include "SplashT1Font.h" -#include "SplashT1FontFile.h" - -//------------------------------------------------------------------------ -// SplashT1FontFile -//------------------------------------------------------------------------ - -SplashFontFile *SplashT1FontFile::loadType1Font(SplashT1FontEngine *engineA, - SplashFontFileID *idA, - SplashFontSrc *src, - char **encA) { - int t1libIDA; - char **encTmp; - char *encStrTmp; - int encStrSize; - char *encPtr; - int i; - - GString *fileNameA; - SplashFontSrc *newsrc = NULL; - SplashFontFile *ff; - - if (! src->isFile) { - GString *tmpFileName; - FILE *tmpFile; - if (!openTempFile(&tmpFileName, &tmpFile, "wb", NULL)) - return NULL; - fwrite(src->buf, 1, src->bufLen, tmpFile); - fclose(tmpFile); - newsrc = new SplashFontSrc; - newsrc->setFile(tmpFileName, gTrue); - src = newsrc; - delete tmpFileName; - } - fileNameA = src->fileName; - // load the font file - if ((t1libIDA = T1_AddFont(fileNameA)) < 0) { - delete newsrc; - return NULL; - } - T1_LoadFont(t1libIDA); - - // reencode it - encStrSize = 0; - for (i = 0; i < 256; ++i) { - if (encA[i]) { - encStrSize += strlen(encA[i]) + 1; - } - } - encTmp = (char **)gmallocn(257, sizeof(char *)); - encStrTmp = (char *)gmallocn(encStrSize, sizeof(char)); - encPtr = encStrTmp; - for (i = 0; i < 256; ++i) { - if (encA[i]) { - strcpy(encPtr, encA[i]); - encTmp[i] = encPtr; - encPtr += strlen(encPtr) + 1; - } else { - encTmp[i] = ".notdef"; - } - } - encTmp[256] = "custom"; - T1_ReencodeFont(t1libIDA, encTmp); - - ff = new SplashT1FontFile(engineA, idA, src, - t1libIDA, encTmp, encStrTmp); - if (newsrc) - newsrc->unref(); - return ff; -} - -SplashT1FontFile::SplashT1FontFile(SplashT1FontEngine *engineA, - SplashFontFileID *idA, - SplashFontSrc *srcA, - int t1libIDA, char **encA, char *encStrA): - SplashFontFile(idA, srcA) -{ - engine = engineA; - t1libID = t1libIDA; - enc = encA; - encStr = encStrA; -} - -SplashT1FontFile::~SplashT1FontFile() { - gfree(encStr); - gfree(enc); - T1_DeleteFont(t1libID); -} - -SplashFont *SplashT1FontFile::makeFont(SplashCoord *mat, - SplashCoord *textMat) { - SplashFont *font; - - font = new SplashT1Font(this, mat, textMat); - font->initCache(); - return font; -} - -#endif // HAVE_T1LIB_H diff --git a/kpdf/xpdf/splash/SplashT1FontFile.h b/kpdf/xpdf/splash/SplashT1FontFile.h deleted file mode 100644 index 4dc93cbf..00000000 --- a/kpdf/xpdf/splash/SplashT1FontFile.h +++ /dev/null @@ -1,58 +0,0 @@ -//======================================================================== -// -// SplashT1FontFile.h -// -//======================================================================== - -#ifndef SPLASHT1FONTFILE_H -#define SPLASHT1FONTFILE_H - -#include <aconf.h> - -#if HAVE_T1LIB_H - -#ifdef USE_GCC_PRAGMAS -#pragma interface -#endif - -#include "SplashFontFile.h" - -class SplashT1FontEngine; - -//------------------------------------------------------------------------ -// SplashT1FontFile -//------------------------------------------------------------------------ - -class SplashT1FontFile: public SplashFontFile { -public: - - static SplashFontFile *loadType1Font(SplashT1FontEngine *engineA, - SplashFontFileID *idA, - char *fileNameA, - char **encA); - - virtual ~SplashT1FontFile(); - - // Create a new SplashT1Font, i.e., a scaled instance of this font - // file. - virtual SplashFont *makeFont(SplashCoord *mat, - SplashCoord *textMat); - -private: - - SplashT1FontFile(SplashT1FontEngine *engineA, - SplashFontFileID *idA, - char *fileNameA, - int t1libIDA, char **encA, char *encStrA); - - SplashT1FontEngine *engine; - int t1libID; // t1lib font ID - char **enc; - char *encStr; - - friend class SplashT1Font; -}; - -#endif // HAVE_T1LIB_H - -#endif diff --git a/kpdf/xpdf/splash/SplashTypes.h b/kpdf/xpdf/splash/SplashTypes.h index 35551b90..aa431b78 100644 --- a/kpdf/xpdf/splash/SplashTypes.h +++ b/kpdf/xpdf/splash/SplashTypes.h @@ -48,7 +48,7 @@ enum SplashColorMode { }; // number of components in each color mode -// (defined in SplashState.cc) +// (defined in SplashState.cpp) extern int splashColorModeNComps[]; // max number of components in any SplashColor diff --git a/kpdf/xpdf/splash/SplashXPath.cc b/kpdf/xpdf/splash/SplashXPath.cpp index 71481eff..267643bb 100644 --- a/kpdf/xpdf/splash/SplashXPath.cc +++ b/kpdf/xpdf/splash/SplashXPath.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashXPath.cc +// SplashXPath.cpp // //======================================================================== diff --git a/kpdf/xpdf/splash/SplashXPathScanner.cc b/kpdf/xpdf/splash/SplashXPathScanner.cpp index 97e5a9bc..8c7d505a 100644 --- a/kpdf/xpdf/splash/SplashXPathScanner.cc +++ b/kpdf/xpdf/splash/SplashXPathScanner.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashXPathScanner.cc +// SplashXPathScanner.cpp // //======================================================================== diff --git a/kpdf/xpdf/xpdf/Annot.cc b/kpdf/xpdf/xpdf/Annot.cpp index 23df25df..10d3ce73 100644 --- a/kpdf/xpdf/xpdf/Annot.cc +++ b/kpdf/xpdf/xpdf/Annot.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Annot.cc +// Annot.cpp // // Copyright 2000-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/Array.cc b/kpdf/xpdf/xpdf/Array.cpp index 8232037b..7c54605a 100644 --- a/kpdf/xpdf/xpdf/Array.cc +++ b/kpdf/xpdf/xpdf/Array.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Array.cc +// Array.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/BuiltinFont.cc b/kpdf/xpdf/xpdf/BuiltinFont.cpp index ce989571..6e9d2375 100644 --- a/kpdf/xpdf/xpdf/BuiltinFont.cc +++ b/kpdf/xpdf/xpdf/BuiltinFont.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// BuiltinFont.cc +// BuiltinFont.cpp // // Copyright 2001-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/BuiltinFontTables.cc b/kpdf/xpdf/xpdf/BuiltinFontTables.cpp index 9c362389..9779946f 100644 --- a/kpdf/xpdf/xpdf/BuiltinFontTables.cc +++ b/kpdf/xpdf/xpdf/BuiltinFontTables.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// BuiltinFontTables.cc +// BuiltinFontTables.cpp // // Copyright 2001-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/CMakeLists.txt b/kpdf/xpdf/xpdf/CMakeLists.txt index db01bb97..bf9f329c 100644 --- a/kpdf/xpdf/xpdf/CMakeLists.txt +++ b/kpdf/xpdf/xpdf/CMakeLists.txt @@ -24,14 +24,14 @@ include_directories( tde_add_library( xpdf STATIC_PIC SOURCES - Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc - Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc - FontEncodingTables.cc Function.cc Gfx.cc GfxFont.cc GfxState.cc - GlobalParams.cc JArithmeticDecoder.cc JBIG2Stream.cc Lexer.cc Link.cc - NameToCharCode.cc Object.cc Outline.cc OutputDev.cc PDFDoc.cc - PDFDocEncoding.cc PreScanOutputDev.cc PSTokenizer.cc Page.cc - Parser.cc PSOutputDev.cc SecurityHandler.cc SplashOutputDev.cc - Stream.cc JPXStream.cc TextOutputDev.cc UnicodeMap.cc - UnicodeTypeTable.cc XRef.cc + Annot.cpp Array.cpp BuiltinFont.cpp BuiltinFontTables.cpp + Catalog.cpp CharCodeToUnicode.cpp CMap.cpp Decrypt.cpp Dict.cpp + FontEncodingTables.cpp Function.cpp Gfx.cpp GfxFont.cpp GfxState.cpp + GlobalParams.cpp JArithmeticDecoder.cpp JBIG2Stream.cpp Lexer.cpp Link.cpp + NameToCharCode.cpp Object.cpp Outline.cpp OutputDev.cpp PDFDoc.cpp + PDFDocEncoding.cpp PreScanOutputDev.cpp PSTokenizer.cpp Page.cpp + Parser.cpp PSOutputDev.cpp SecurityHandler.cpp SplashOutputDev.cpp + Stream.cpp JPXStream.cpp TextOutputDev.cpp UnicodeMap.cpp + UnicodeTypeTable.cpp XRef.cpp LINK ${FONTCONFIG_LIBRARIES} ) diff --git a/kpdf/xpdf/xpdf/CMap.cc b/kpdf/xpdf/xpdf/CMap.cpp index 89905a8c..dfad915f 100644 --- a/kpdf/xpdf/xpdf/CMap.cc +++ b/kpdf/xpdf/xpdf/CMap.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// CMap.cc +// CMap.cpp // // Copyright 2001-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/Catalog.cc b/kpdf/xpdf/xpdf/Catalog.cpp index 198703a4..ce64af09 100644 --- a/kpdf/xpdf/xpdf/Catalog.cc +++ b/kpdf/xpdf/xpdf/Catalog.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Catalog.cc +// Catalog.cpp // // Copyright 1996-2007 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/CharCodeToUnicode.cc b/kpdf/xpdf/xpdf/CharCodeToUnicode.cpp index 3702a16d..1144caec 100644 --- a/kpdf/xpdf/xpdf/CharCodeToUnicode.cc +++ b/kpdf/xpdf/xpdf/CharCodeToUnicode.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// CharCodeToUnicode.cc +// CharCodeToUnicode.cpp // // Copyright 2001-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/Decrypt.cc b/kpdf/xpdf/xpdf/Decrypt.cpp index 51e56fb1..97fa0bd6 100644 --- a/kpdf/xpdf/xpdf/Decrypt.cc +++ b/kpdf/xpdf/xpdf/Decrypt.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Decrypt.cc +// Decrypt.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/Dict.cc b/kpdf/xpdf/xpdf/Dict.cpp index dd1517f0..593e9a11 100644 --- a/kpdf/xpdf/xpdf/Dict.cc +++ b/kpdf/xpdf/xpdf/Dict.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Dict.cc +// Dict.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/FontEncodingTables.cc b/kpdf/xpdf/xpdf/FontEncodingTables.cpp index f3b9280a..4cd1affe 100644 --- a/kpdf/xpdf/xpdf/FontEncodingTables.cc +++ b/kpdf/xpdf/xpdf/FontEncodingTables.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// FontEncodingTables.cc +// FontEncodingTables.cpp // // Copyright 2001-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/Function.cc b/kpdf/xpdf/xpdf/Function.cpp index eaf8e974..f36c8f6c 100644 --- a/kpdf/xpdf/xpdf/Function.cc +++ b/kpdf/xpdf/xpdf/Function.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Function.cc +// Function.cpp // // Copyright 2001-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/Gfx.cc b/kpdf/xpdf/xpdf/Gfx.cpp index e3df8384..2a4fdb6e 100644 --- a/kpdf/xpdf/xpdf/Gfx.cc +++ b/kpdf/xpdf/xpdf/Gfx.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Gfx.cc +// Gfx.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/GfxFont.cc b/kpdf/xpdf/xpdf/GfxFont.cpp index 8694be47..4298b41c 100644 --- a/kpdf/xpdf/xpdf/GfxFont.cc +++ b/kpdf/xpdf/xpdf/GfxFont.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// GfxFont.cc +// GfxFont.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/GfxState.cc b/kpdf/xpdf/xpdf/GfxState.cpp index a00dabe1..f7cb1ce9 100644 --- a/kpdf/xpdf/xpdf/GfxState.cc +++ b/kpdf/xpdf/xpdf/GfxState.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// GfxState.cc +// GfxState.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/GfxState.h b/kpdf/xpdf/xpdf/GfxState.h index f85643dc..52c5c93c 100644 --- a/kpdf/xpdf/xpdf/GfxState.h +++ b/kpdf/xpdf/xpdf/GfxState.h @@ -114,7 +114,7 @@ struct GfxCMYK { //------------------------------------------------------------------------ // NB: The nGfxColorSpaceModes constant and the gfxColorSpaceModeNames -// array defined in GfxState.cc must match this enum. +// array defined in GfxState.cpp must match this enum. enum GfxColorSpaceMode { csDeviceGray, csCalGray, diff --git a/kpdf/xpdf/xpdf/GlobalParams.cc b/kpdf/xpdf/xpdf/GlobalParams.cpp index 6212f42e..d98a0ce5 100644 --- a/kpdf/xpdf/xpdf/GlobalParams.cc +++ b/kpdf/xpdf/xpdf/GlobalParams.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// GlobalParams.cc +// GlobalParams.cpp // // Copyright 2001-2003 Glyph & Cog, LLC // @@ -713,7 +713,6 @@ GlobalParams::GlobalParams(char *cfgFileName) { fontDirs = new GList(); initialZoom = new GString("125"); continuousView = gFalse; - enableT1lib = gTrue; enableFreeType = gTrue; antialias = gTrue; vectorAntialias = gTrue; @@ -1073,8 +1072,6 @@ void GlobalParams::parseLine(char *buf, GString *fileName, int line) { parseInitialZoom(tokens, fileName, line); } else if (!cmd->cmp("continuousView")) { parseYesNo("continuousView", &continuousView, tokens, fileName, line); - } else if (!cmd->cmp("enableT1lib")) { - parseYesNo("enableT1lib", &enableT1lib, tokens, fileName, line); } else if (!cmd->cmp("enableFreeType")) { parseYesNo("enableFreeType", &enableFreeType, tokens, fileName, line); } else if (!cmd->cmp("antialias")) { @@ -1125,9 +1122,9 @@ void GlobalParams::parseLine(char *buf, GString *fileName, int line) { !cmd->cmp("displayNamedCIDFontX") || !cmd->cmp("displayCIDFontX")) { error(-1, "-- Xpdf no longer supports X fonts"); - } else if (!cmd->cmp("t1libControl") || !cmd->cmp("freetypeControl")) { - error(-1, "-- The t1libControl and freetypeControl options have been replaced"); - error(-1, " by the enableT1lib, enableFreeType, and antialias options"); + } else if (!cmd->cmp("freetypeControl")) { + error(-1, "-- The freetypeControl option has been replaced"); + error(-1, " by the enableFreeType, and antialias options"); } else if (!cmd->cmp("fontpath") || !cmd->cmp("fontmap")) { error(-1, "-- the config file format has changed since Xpdf 0.9x"); } @@ -2094,7 +2091,7 @@ DisplayFontParam *GlobalParams::getDisplayFont(GString *fontName) { if (res != FcResultMatch || !s) goto fin; ext = rindex((char*)s,'.'); if (!ext) goto fin; - if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext,".ttc",4)) { + if (!strncasecmp(ext,".ttf",4) || !strncasecmp(ext,".ttc",4) || !strncasecmp(ext,".otf",4)) { dfp = new DisplayFontParam(fontName->copy(), displayFontTT); dfp->tt.fileName = new GString((char*)s); FcPatternGetInteger(m, FC_INDEX, 0, &(dfp->tt.faceIndex)); @@ -2395,15 +2392,6 @@ GBool GlobalParams::getContinuousView() { return f; } -GBool GlobalParams::getEnableT1lib() { - GBool f; - - lockGlobalParams; - f = enableT1lib; - unlockGlobalParams; - return f; -} - GBool GlobalParams::getEnableFreeType() { GBool f; @@ -2827,15 +2815,6 @@ void GlobalParams::setContinuousView(GBool cont) { unlockGlobalParams; } -GBool GlobalParams::setEnableT1lib(char *s) { - GBool ok; - - lockGlobalParams; - ok = parseYesNo2(s, &enableT1lib); - unlockGlobalParams; - return ok; -} - GBool GlobalParams::setEnableFreeType(char *s) { GBool ok; diff --git a/kpdf/xpdf/xpdf/GlobalParams.h b/kpdf/xpdf/xpdf/GlobalParams.h index c0543eda..85b3c27d 100644 --- a/kpdf/xpdf/xpdf/GlobalParams.h +++ b/kpdf/xpdf/xpdf/GlobalParams.h @@ -242,7 +242,6 @@ public: GString *findFontFile(GString *fontName, char **exts); GString *getInitialZoom(); GBool getContinuousView(); - GBool getEnableT1lib(); GBool getEnableFreeType(); GBool getAntialias(); GBool getVectorAntialias(); @@ -294,7 +293,6 @@ public: void setTextKeepTinyChars(GBool keep); void setInitialZoom(char *s); void setContinuousView(GBool cont); - GBool setEnableT1lib(char *s); GBool setEnableFreeType(char *s); GBool setAntialias(char *s); GBool setVectorAntialias(char *s); @@ -424,7 +422,6 @@ private: GList *fontDirs; // list of font dirs [GString] GString *initialZoom; // initial zoom level GBool continuousView; // continuous view mode - GBool enableT1lib; // t1lib enable flag GBool enableFreeType; // FreeType enable flag GBool antialias; // font anti-aliasing enable flag GBool vectorAntialias; // vector anti-aliasing enable flag diff --git a/kpdf/xpdf/xpdf/JArithmeticDecoder.cc b/kpdf/xpdf/xpdf/JArithmeticDecoder.cpp index 195b73e1..7f7c7685 100644 --- a/kpdf/xpdf/xpdf/JArithmeticDecoder.cc +++ b/kpdf/xpdf/xpdf/JArithmeticDecoder.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// JArithmeticDecoder.cc +// JArithmeticDecoder.cpp // // Copyright 2002-2004 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/JBIG2Stream.cc b/kpdf/xpdf/xpdf/JBIG2Stream.cpp index 43f17712..1a4058f8 100644 --- a/kpdf/xpdf/xpdf/JBIG2Stream.cc +++ b/kpdf/xpdf/xpdf/JBIG2Stream.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// JBIG2Stream.cc +// JBIG2Stream.cpp // // Copyright 2002-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/JPXStream.cc b/kpdf/xpdf/xpdf/JPXStream.cpp index 54a9e103..93b46471 100644 --- a/kpdf/xpdf/xpdf/JPXStream.cc +++ b/kpdf/xpdf/xpdf/JPXStream.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// JPXStream.cc +// JPXStream.cpp // // Copyright 2002-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/Lexer.cc b/kpdf/xpdf/xpdf/Lexer.cpp index 1ef37175..04eadef2 100644 --- a/kpdf/xpdf/xpdf/Lexer.cc +++ b/kpdf/xpdf/xpdf/Lexer.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Lexer.cc +// Lexer.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/Link.cc b/kpdf/xpdf/xpdf/Link.cpp index ae2de537..69106e13 100644 --- a/kpdf/xpdf/xpdf/Link.cc +++ b/kpdf/xpdf/xpdf/Link.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Link.cc +// Link.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/Makefile.am b/kpdf/xpdf/xpdf/Makefile.am index 4c0593ad..b86e26b8 100644 --- a/kpdf/xpdf/xpdf/Makefile.am +++ b/kpdf/xpdf/xpdf/Makefile.am @@ -2,14 +2,14 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/ libxpdf_la_LDFLAGS = $(all_libraries) libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(XFT_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la -libxpdf_la_SOURCES = Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc \ - Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc \ - FontEncodingTables.cc Function.cc Gfx.cc \ - GfxFont.cc GfxState.cc GlobalParams.cc JArithmeticDecoder.cc \ - JBIG2Stream.cc Lexer.cc Link.cc NameToCharCode.cc Object.cc Outline.cc \ - OutputDev.cc PDFDoc.cc PDFDocEncoding.cc PreScanOutputDev.cc PSTokenizer.cc \ - Page.cc Parser.cc PSOutputDev.cc SecurityHandler.cc SplashOutputDev.cc Stream.cc JPXStream.cc \ - TextOutputDev.cc UnicodeMap.cc UnicodeTypeTable.cc XRef.cc +libxpdf_la_SOURCES = Annot.cpp Array.cpp BuiltinFont.cpp BuiltinFontTables.cpp \ + Catalog.cpp CharCodeToUnicode.cpp CMap.cpp Decrypt.cpp Dict.cpp \ + FontEncodingTables.cpp Function.cpp Gfx.cpp \ + GfxFont.cpp GfxState.cpp GlobalParams.cpp JArithmeticDecoder.cpp \ + JBIG2Stream.cpp Lexer.cpp Link.cpp NameToCharCode.cpp Object.cpp Outline.cpp \ + OutputDev.cpp PDFDoc.cpp PDFDocEncoding.cpp PreScanOutputDev.cpp PSTokenizer.cpp \ + Page.cpp Parser.cpp PSOutputDev.cpp SecurityHandler.cpp SplashOutputDev.cpp Stream.cpp JPXStream.cpp \ + TextOutputDev.cpp UnicodeMap.cpp UnicodeTypeTable.cpp XRef.cpp noinst_LTLIBRARIES = libxpdf.la diff --git a/kpdf/xpdf/xpdf/NameToCharCode.cc b/kpdf/xpdf/xpdf/NameToCharCode.cpp index 7ebf4e16..23779f05 100644 --- a/kpdf/xpdf/xpdf/NameToCharCode.cc +++ b/kpdf/xpdf/xpdf/NameToCharCode.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// NameToCharCode.cc +// NameToCharCode.cpp // // Copyright 2001-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/Object.cc b/kpdf/xpdf/xpdf/Object.cpp index f0a3a092..81760b44 100644 --- a/kpdf/xpdf/xpdf/Object.cc +++ b/kpdf/xpdf/xpdf/Object.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Object.cc +// Object.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/Outline.cc b/kpdf/xpdf/xpdf/Outline.cpp index 39e89a3c..f5aba636 100644 --- a/kpdf/xpdf/xpdf/Outline.cc +++ b/kpdf/xpdf/xpdf/Outline.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Outline.cc +// Outline.cpp // // Copyright 2002-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/OutputDev.cc b/kpdf/xpdf/xpdf/OutputDev.cpp index 3ba19973..1b394ad4 100644 --- a/kpdf/xpdf/xpdf/OutputDev.cc +++ b/kpdf/xpdf/xpdf/OutputDev.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// OutputDev.cc +// OutputDev.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/PDFDoc.cc b/kpdf/xpdf/xpdf/PDFDoc.cpp index dc24d97e..ee2bc4df 100644 --- a/kpdf/xpdf/xpdf/PDFDoc.cc +++ b/kpdf/xpdf/xpdf/PDFDoc.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// PDFDoc.cc +// PDFDoc.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/PDFDocEncoding.cc b/kpdf/xpdf/xpdf/PDFDocEncoding.cpp index 89dc3828..89dc3828 100644 --- a/kpdf/xpdf/xpdf/PDFDocEncoding.cc +++ b/kpdf/xpdf/xpdf/PDFDocEncoding.cpp diff --git a/kpdf/xpdf/xpdf/PSOutputDev.cc b/kpdf/xpdf/xpdf/PSOutputDev.cpp index 4fb2cbfd..9d1d7648 100644 --- a/kpdf/xpdf/xpdf/PSOutputDev.cc +++ b/kpdf/xpdf/xpdf/PSOutputDev.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// PSOutputDev.cc +// PSOutputDev.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/PSTokenizer.cc b/kpdf/xpdf/xpdf/PSTokenizer.cpp index a959cc73..4898fe42 100644 --- a/kpdf/xpdf/xpdf/PSTokenizer.cc +++ b/kpdf/xpdf/xpdf/PSTokenizer.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// PSTokenizer.cc +// PSTokenizer.cpp // // Copyright 2002-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/Page.cc b/kpdf/xpdf/xpdf/Page.cpp index cfeab88b..de2fe6c0 100644 --- a/kpdf/xpdf/xpdf/Page.cc +++ b/kpdf/xpdf/xpdf/Page.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Page.cc +// Page.cpp // // Copyright 1996-2007 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/Parser.cc b/kpdf/xpdf/xpdf/Parser.cpp index 65a43d94..95475b85 100644 --- a/kpdf/xpdf/xpdf/Parser.cc +++ b/kpdf/xpdf/xpdf/Parser.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Parser.cc +// Parser.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/PreScanOutputDev.cc b/kpdf/xpdf/xpdf/PreScanOutputDev.cpp index 52ffeb7f..e05cdc34 100644 --- a/kpdf/xpdf/xpdf/PreScanOutputDev.cc +++ b/kpdf/xpdf/xpdf/PreScanOutputDev.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// PreScanOutputDev.cc +// PreScanOutputDev.cpp // // Copyright 2005 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/SecurityHandler.cc b/kpdf/xpdf/xpdf/SecurityHandler.cpp index ea0f9341..6c2abba0 100644 --- a/kpdf/xpdf/xpdf/SecurityHandler.cc +++ b/kpdf/xpdf/xpdf/SecurityHandler.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SecurityHandler.cc +// SecurityHandler.cpp // // Copyright 2004 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/SplashOutputDev.cc b/kpdf/xpdf/xpdf/SplashOutputDev.cpp index fe235fb8..20898701 100644 --- a/kpdf/xpdf/xpdf/SplashOutputDev.cc +++ b/kpdf/xpdf/xpdf/SplashOutputDev.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// SplashOutputDev.cc +// SplashOutputDev.cpp // // Copyright 2003 Glyph & Cog, LLC // @@ -694,9 +694,6 @@ void SplashOutputDev::startDoc(XRef *xrefA) { delete fontEngine; } fontEngine = new SplashFontEngine( -#if HAVE_T1LIB_H - globalParams->getEnableT1lib(), -#endif #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H globalParams->getEnableFreeType(), #endif diff --git a/kpdf/xpdf/xpdf/Stream.cc b/kpdf/xpdf/xpdf/Stream.cpp index 2c1db5b4..0d85a766 100644 --- a/kpdf/xpdf/xpdf/Stream.cc +++ b/kpdf/xpdf/xpdf/Stream.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// Stream.cc +// Stream.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/TextOutputDev.cc b/kpdf/xpdf/xpdf/TextOutputDev.cpp index d2bfaf63..3387a31a 100644 --- a/kpdf/xpdf/xpdf/TextOutputDev.cc +++ b/kpdf/xpdf/xpdf/TextOutputDev.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// TextOutputDev.cc +// TextOutputDev.cpp // // Copyright 1997-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/UnicodeMap.cc b/kpdf/xpdf/xpdf/UnicodeMap.cpp index 2b8cb1f7..f3d18715 100644 --- a/kpdf/xpdf/xpdf/UnicodeMap.cc +++ b/kpdf/xpdf/xpdf/UnicodeMap.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// UnicodeMap.cc +// UnicodeMap.cpp // // Copyright 2001-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/UnicodeTypeTable.cc b/kpdf/xpdf/xpdf/UnicodeTypeTable.cpp index b8960403..39b9d842 100644 --- a/kpdf/xpdf/xpdf/UnicodeTypeTable.cc +++ b/kpdf/xpdf/xpdf/UnicodeTypeTable.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// UnicodeTypeTable.cc +// UnicodeTypeTable.cpp // // Copyright 2004 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/XRef.cc b/kpdf/xpdf/xpdf/XRef.cpp index 2e0d1cef..06a1c4e1 100644 --- a/kpdf/xpdf/xpdf/XRef.cc +++ b/kpdf/xpdf/xpdf/XRef.cpp @@ -1,6 +1,6 @@ //======================================================================== // -// XRef.cc +// XRef.cpp // // Copyright 1996-2003 Glyph & Cog, LLC // diff --git a/kpdf/xpdf/xpdf/xpdf_config.h b/kpdf/xpdf/xpdf/xpdf_config.h index 81d4dd07..f00a6381 100644 --- a/kpdf/xpdf/xpdf/xpdf_config.h +++ b/kpdf/xpdf/xpdf/xpdf_config.h @@ -74,7 +74,7 @@ // default maximum size of color cube to allocate #define defaultRGBCube 5 -// number of fonts (combined t1lib, FreeType, X server) to cache +// number of fonts (combined FreeType, X server) to cache #define xOutFontCacheSize 64 // number of Type 3 fonts to cache |