diff options
69 files changed, 0 insertions, 113 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fa86ea22..f8131eb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -575,7 +575,6 @@ if(ENABLE_XPDF_HEADERS) goo/GooList.h goo/GooTimer.h goo/GooString.h - goo/gtypes.h goo/gmem.h goo/gdir.h goo/gfile.h diff --git a/fofi/FoFiBase.h b/fofi/FoFiBase.h index bd472c2e..745bc928 100644 --- a/fofi/FoFiBase.h +++ b/fofi/FoFiBase.h @@ -23,8 +23,6 @@ #ifndef FOFIBASE_H #define FOFIBASE_H -#include "goo/gtypes.h" - //------------------------------------------------------------------------ typedef void (*FoFiOutputFunc)(void *stream, const char *data, int len); diff --git a/fofi/FoFiEncodings.h b/fofi/FoFiEncodings.h index bd01a5f9..c4fbf48d 100644 --- a/fofi/FoFiEncodings.h +++ b/fofi/FoFiEncodings.h @@ -23,8 +23,6 @@ #ifndef FOFIENCODINGS_H #define FOFIENCODINGS_H -#include "goo/gtypes.h" - //------------------------------------------------------------------------ // Type 1 and 1C font data //------------------------------------------------------------------------ diff --git a/fofi/FoFiIdentifier.cc b/fofi/FoFiIdentifier.cc index 7632ac35..e557e92a 100644 --- a/fofi/FoFiIdentifier.cc +++ b/fofi/FoFiIdentifier.cc @@ -24,7 +24,6 @@ #include <stdio.h> #include <string.h> #include <limits.h> -#include "goo/gtypes.h" #include "FoFiIdentifier.h" //------------------------------------------------------------------------ diff --git a/fofi/FoFiTrueType.cc b/fofi/FoFiTrueType.cc index 35a4aae7..c9c353c6 100644 --- a/fofi/FoFiTrueType.cc +++ b/fofi/FoFiTrueType.cc @@ -36,7 +36,6 @@ #include <string.h> #include <limits.h> #include <algorithm> -#include "goo/gtypes.h" #include "goo/gmem.h" #include "goo/GooLikely.h" #include "goo/GooString.h" diff --git a/fofi/FoFiTrueType.h b/fofi/FoFiTrueType.h index b63e3b6c..ee35e4f3 100644 --- a/fofi/FoFiTrueType.h +++ b/fofi/FoFiTrueType.h @@ -31,7 +31,6 @@ #include "stddef.h" #include <unordered_map> #include <string> -#include "goo/gtypes.h" #include "FoFiBase.h" class GooString; diff --git a/fofi/FoFiType1.h b/fofi/FoFiType1.h index 313b2981..b8d3a439 100644 --- a/fofi/FoFiType1.h +++ b/fofi/FoFiType1.h @@ -23,7 +23,6 @@ #ifndef FOFITYPE1_H #define FOFITYPE1_H -#include "goo/gtypes.h" #include "FoFiBase.h" //------------------------------------------------------------------------ diff --git a/fofi/FoFiType1C.h b/fofi/FoFiType1C.h index 3717c15e..920abdd6 100644 --- a/fofi/FoFiType1C.h +++ b/fofi/FoFiType1C.h @@ -25,7 +25,6 @@ #ifndef FOFITYPE1C_H #define FOFITYPE1C_H -#include "goo/gtypes.h" #include "FoFiBase.h" class GooString; diff --git a/goo/FixedPoint.h b/goo/FixedPoint.h index 9ba5ed7a..960c5bd0 100644 --- a/goo/FixedPoint.h +++ b/goo/FixedPoint.h @@ -32,7 +32,6 @@ #include <stdio.h> #include <stdlib.h> -#include "gtypes.h" #define fixptShift 16 #define fixptMaskL ((1 << fixptShift) - 1) diff --git a/goo/GooString.h b/goo/GooString.h index 5d0986f2..bae3a180 100644 --- a/goo/GooString.h +++ b/goo/GooString.h @@ -36,8 +36,6 @@ #include <cstdarg> #include <string> -#include "gtypes.h" - #ifdef __clang__ # define GOOSTRING_FORMAT __attribute__((__annotate__("gooformat"))) #else diff --git a/goo/GooTimer.h b/goo/GooTimer.h index 9df747b7..6e8e5b57 100644 --- a/goo/GooTimer.h +++ b/goo/GooTimer.h @@ -18,7 +18,6 @@ #define GOOTIMER_H #include "poppler-config.h" -#include "gtypes.h" #ifdef HAVE_GETTIMEOFDAY #include <sys/time.h> #endif @@ -35,7 +35,6 @@ #define GDIR_H #include "poppler-config.h" -#include "gtypes.h" class GooString; diff --git a/goo/gfile.h b/goo/gfile.h index 2bbf98d2..bd58e6c0 100644 --- a/goo/gfile.h +++ b/goo/gfile.h @@ -76,7 +76,6 @@ extern "C" { # endif #endif } -#include "gtypes.h" class GooString; diff --git a/goo/grandom.h b/goo/grandom.h index eccb972f..81532728 100644 --- a/goo/grandom.h +++ b/goo/grandom.h @@ -12,8 +12,6 @@ #ifndef GRANDOM_H #define GRANDOM_H -#include "gtypes.h" - /// Fills the given buffer with random bytes void grandom_fill(unsigned char *buff, int size); diff --git a/goo/gtypes.h b/goo/gtypes.h deleted file mode 100644 index be166a61..00000000 --- a/goo/gtypes.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * gtypes.h - * - * Some useful simple types. - * - * Copyright 1996-2003 Glyph & Cog, LLC - */ - -//======================================================================== -// -// Modified under the Poppler project - http://poppler.freedesktop.org -// -// All changes made under the Poppler project to this file are licensed -// under GPL version 2 or later -// -// Copyright (C) 2010 Patrick Spendrin <ps_ml@gmx.de> -// Copyright (C) 2010 Albert Astals Cid <aacid@kde.org> -// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.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 -// -//======================================================================== - -#ifndef GTYPES_H -#define GTYPES_H - -#include "poppler-config.h" - - -#endif diff --git a/poppler/BuiltinFont.h b/poppler/BuiltinFont.h index 1c7dbb5a..f755a9c7 100644 --- a/poppler/BuiltinFont.h +++ b/poppler/BuiltinFont.h @@ -23,8 +23,6 @@ #ifndef BUILTINFONT_H #define BUILTINFONT_H -#include "goo/gtypes.h" - struct BuiltinFont; class BuiltinFontWidths; diff --git a/poppler/CMap.h b/poppler/CMap.h index a2130a80..c02a8a0a 100644 --- a/poppler/CMap.h +++ b/poppler/CMap.h @@ -29,7 +29,6 @@ #include <atomic> #include "poppler-config.h" -#include "goo/gtypes.h" #include "CharTypes.h" class GooString; diff --git a/poppler/CachedFile.h b/poppler/CachedFile.h index 8c6262f6..2a8eb7c5 100644 --- a/poppler/CachedFile.h +++ b/poppler/CachedFile.h @@ -17,7 +17,6 @@ #include "poppler-config.h" -#include "goo/gtypes.h" #include "Object.h" #include "Stream.h" diff --git a/poppler/CairoFontEngine.h b/poppler/CairoFontEngine.h index 867d9c64..2a55af15 100644 --- a/poppler/CairoFontEngine.h +++ b/poppler/CairoFontEngine.h @@ -33,7 +33,6 @@ #include <mutex> #include "poppler-config.h" -#include "goo/gtypes.h" #include <cairo-ft.h> #include "GfxFont.h" diff --git a/poppler/CairoOutputDev.h b/poppler/CairoOutputDev.h index 00b0d7d1..b59a9e2e 100644 --- a/poppler/CairoOutputDev.h +++ b/poppler/CairoOutputDev.h @@ -34,7 +34,6 @@ #ifndef CAIROOUTPUTDEV_H #define CAIROOUTPUTDEV_H -#include "goo/gtypes.h" #include <cairo-ft.h> #include "OutputDev.h" #include "TextOutputDev.h" diff --git a/poppler/CairoRescaleBox.h b/poppler/CairoRescaleBox.h index 3c94724a..b00ad6ab 100644 --- a/poppler/CairoRescaleBox.h +++ b/poppler/CairoRescaleBox.h @@ -40,7 +40,6 @@ #ifndef CAIRO_RESCALE_BOX_H #define CAIRO_RESCALE_BOX_H -#include "goo/gtypes.h" #include <cairo.h> class CairoRescaleBox { diff --git a/poppler/CharCodeToUnicode.h b/poppler/CharCodeToUnicode.h index 0f998b1d..9c57fb23 100644 --- a/poppler/CharCodeToUnicode.h +++ b/poppler/CharCodeToUnicode.h @@ -34,7 +34,6 @@ #include "poppler-config.h" #include "CharTypes.h" -#include "goo/gtypes.h" struct CharCodeToUnicodeString; class GooString; diff --git a/poppler/CompactFontTables.h b/poppler/CompactFontTables.h index c451d9e4..303e536f 100644 --- a/poppler/CompactFontTables.h +++ b/poppler/CompactFontTables.h @@ -23,8 +23,6 @@ #ifndef COMPACTFONTINFO_H #define COMPACTFONTINFO_H -#include "goo/gtypes.h" - static char *type1CStdStrings[391] = { ".notdef", "space", diff --git a/poppler/DateInfo.h b/poppler/DateInfo.h index 653e677c..4fb03c3e 100644 --- a/poppler/DateInfo.h +++ b/poppler/DateInfo.h @@ -24,7 +24,6 @@ #ifndef DATE_INFO_H #define DATE_INFO_H -#include "goo/gtypes.h" #include "goo/GooString.h" #include <time.h> diff --git a/poppler/Decrypt.h b/poppler/Decrypt.h index 34368358..d4667c8c 100644 --- a/poppler/Decrypt.h +++ b/poppler/Decrypt.h @@ -28,7 +28,6 @@ #ifndef DECRYPT_H #define DECRYPT_H -#include "goo/gtypes.h" #include "goo/GooString.h" #include "Object.h" #include "Stream.h" diff --git a/poppler/FontInfo.h b/poppler/FontInfo.h index 48eaefd6..7d6af0c8 100644 --- a/poppler/FontInfo.h +++ b/poppler/FontInfo.h @@ -26,7 +26,6 @@ #define FONT_INFO_H #include "Object.h" -#include "goo/gtypes.h" #include "goo/GooList.h" class GfxFont; diff --git a/poppler/Function.h b/poppler/Function.h index 16d91401..da9caad1 100644 --- a/poppler/Function.h +++ b/poppler/Function.h @@ -27,7 +27,6 @@ #ifndef FUNCTION_H #define FUNCTION_H -#include "goo/gtypes.h" #include "Object.h" #include <set> diff --git a/poppler/Gfx.h b/poppler/Gfx.h index f966e8f6..47ae0153 100644 --- a/poppler/Gfx.h +++ b/poppler/Gfx.h @@ -34,7 +34,6 @@ #define GFX_H #include "poppler-config.h" -#include "goo/gtypes.h" #include "goo/GooList.h" #include "GfxState.h" #include "Object.h" diff --git a/poppler/GfxFont.h b/poppler/GfxFont.h index 0af2da6b..de99e298 100644 --- a/poppler/GfxFont.h +++ b/poppler/GfxFont.h @@ -33,7 +33,6 @@ #ifndef GFXFONT_H #define GFXFONT_H -#include "goo/gtypes.h" #include "goo/GooString.h" #include "Object.h" #include "CharTypes.h" diff --git a/poppler/GfxState.h b/poppler/GfxState.h index 8b92ba2b..8986a838 100644 --- a/poppler/GfxState.h +++ b/poppler/GfxState.h @@ -36,7 +36,6 @@ #include "poppler-config.h" -#include "goo/gtypes.h" #include "Object.h" #include "Function.h" diff --git a/poppler/GlobalParams.h b/poppler/GlobalParams.h index 4c0b28d9..365c4895 100644 --- a/poppler/GlobalParams.h +++ b/poppler/GlobalParams.h @@ -39,7 +39,6 @@ #include <assert.h> #include "poppler-config.h" #include <stdio.h> -#include "goo/gtypes.h" #include "CharTypes.h" #include "UnicodeMap.h" #include <unordered_map> diff --git a/poppler/Hints.h b/poppler/Hints.h index f5f247ca..d6a28072 100644 --- a/poppler/Hints.h +++ b/poppler/Hints.h @@ -14,7 +14,6 @@ #define HINTS_H #include <string.h> -#include "goo/gtypes.h" #include <vector> #include "PDFDoc.h" diff --git a/poppler/JArithmeticDecoder.h b/poppler/JArithmeticDecoder.h index 92c398e3..993901a9 100644 --- a/poppler/JArithmeticDecoder.h +++ b/poppler/JArithmeticDecoder.h @@ -25,8 +25,6 @@ #ifndef JARITHMETICDECODER_H #define JARITHMETICDECODER_H -#include "goo/gtypes.h" - class Stream; //------------------------------------------------------------------------ diff --git a/poppler/JBIG2Stream.h b/poppler/JBIG2Stream.h index 5748b3db..ab746c95 100644 --- a/poppler/JBIG2Stream.h +++ b/poppler/JBIG2Stream.h @@ -25,7 +25,6 @@ #ifndef JBIG2STREAM_H #define JBIG2STREAM_H -#include "goo/gtypes.h" #include "Object.h" #include "Stream.h" diff --git a/poppler/JPEG2000Stream.h b/poppler/JPEG2000Stream.h index 5d0b04e3..06461e80 100644 --- a/poppler/JPEG2000Stream.h +++ b/poppler/JPEG2000Stream.h @@ -18,7 +18,6 @@ #define JPEG2000STREAM_H #include "config.h" -#include "goo/gtypes.h" #include "Object.h" #include "Stream.h" diff --git a/poppler/JPXStream.h b/poppler/JPXStream.h index 38426afe..775af916 100644 --- a/poppler/JPXStream.h +++ b/poppler/JPXStream.h @@ -9,7 +9,6 @@ #ifndef JPXSTREAM_H #define JPXSTREAM_H -#include "goo/gtypes.h" #include "Object.h" #include "Stream.h" diff --git a/poppler/Linearization.h b/poppler/Linearization.h index 69a527cb..6db33b3d 100644 --- a/poppler/Linearization.h +++ b/poppler/Linearization.h @@ -11,7 +11,6 @@ #ifndef LINEARIZATION_H #define LINEARIZATION_H -#include "goo/gtypes.h" #include "Object.h" class BaseStream; diff --git a/poppler/MarkedContentOutputDev.h b/poppler/MarkedContentOutputDev.h index 84f15b9e..0e1d9ce2 100644 --- a/poppler/MarkedContentOutputDev.h +++ b/poppler/MarkedContentOutputDev.h @@ -12,7 +12,6 @@ #ifndef MARKEDCONTENTOUTPUTDEV_H #define MARKEDCONTENTOUTPUTDEV_H -#include "goo/gtypes.h" #include "goo/gmem.h" #include "OutputDev.h" #include "GfxState.h" diff --git a/poppler/Object.h b/poppler/Object.h index 1bc8e360..5c7058a5 100644 --- a/poppler/Object.h +++ b/poppler/Object.h @@ -38,7 +38,6 @@ #include <stdio.h> #include <string.h> #include <limits.h> -#include "goo/gtypes.h" #include "goo/gmem.h" #include "goo/GooString.h" #include "goo/GooLikely.h" diff --git a/poppler/OutputDev.h b/poppler/OutputDev.h index 8195a257..2445bcc9 100644 --- a/poppler/OutputDev.h +++ b/poppler/OutputDev.h @@ -36,7 +36,6 @@ #define OUTPUTDEV_H #include "poppler-config.h" -#include "goo/gtypes.h" #include "CharTypes.h" #include "Object.h" #include "PopplerCache.h" diff --git a/poppler/PSTokenizer.h b/poppler/PSTokenizer.h index 0cd8e231..c63ccbe5 100644 --- a/poppler/PSTokenizer.h +++ b/poppler/PSTokenizer.h @@ -23,8 +23,6 @@ #ifndef PSTOKENIZER_H #define PSTOKENIZER_H -#include "goo/gtypes.h" - //------------------------------------------------------------------------ class PSTokenizer { diff --git a/poppler/PageLabelInfo.h b/poppler/PageLabelInfo.h index 8c36ae87..b5ad57ca 100644 --- a/poppler/PageLabelInfo.h +++ b/poppler/PageLabelInfo.h @@ -19,7 +19,6 @@ #include <string> #include <vector> -#include "goo/gtypes.h" #include "Object.h" class PageLabelInfo { diff --git a/poppler/PreScanOutputDev.h b/poppler/PreScanOutputDev.h index a53aa13c..cd62479c 100644 --- a/poppler/PreScanOutputDev.h +++ b/poppler/PreScanOutputDev.h @@ -27,7 +27,6 @@ #ifndef PRESCANOUTPUTDEV_H #define PRESCANOUTPUTDEV_H -#include "goo/gtypes.h" #include "Object.h" #include "GfxState.h" #include "GlobalParams.h" diff --git a/poppler/SecurityHandler.h b/poppler/SecurityHandler.h index 8ddc01e6..c8a4cafa 100644 --- a/poppler/SecurityHandler.h +++ b/poppler/SecurityHandler.h @@ -25,7 +25,6 @@ #include "poppler-config.h" -#include "goo/gtypes.h" #include "Object.h" class GooString; diff --git a/poppler/SplashOutputDev.h b/poppler/SplashOutputDev.h index f0802008..72f524ab 100644 --- a/poppler/SplashOutputDev.h +++ b/poppler/SplashOutputDev.h @@ -32,7 +32,6 @@ #ifndef SPLASHOUTPUTDEV_H #define SPLASHOUTPUTDEV_H -#include "goo/gtypes.h" #include "splash/SplashTypes.h" #include "splash/SplashPattern.h" #include "poppler-config.h" diff --git a/poppler/Stream.h b/poppler/Stream.h index 1e01719c..f6aa41cd 100644 --- a/poppler/Stream.h +++ b/poppler/Stream.h @@ -39,7 +39,6 @@ #include <cstdio> #include "poppler-config.h" -#include "goo/gtypes.h" #include "Object.h" class GooFile; diff --git a/poppler/StructElement.h b/poppler/StructElement.h index 800f9bb5..7c232a94 100644 --- a/poppler/StructElement.h +++ b/poppler/StructElement.h @@ -14,7 +14,6 @@ #ifndef STRUCTELEMENT_H #define STRUCTELEMENT_H -#include "goo/gtypes.h" #include "goo/GooString.h" #include "MarkedContentOutputDev.h" #include "Object.h" diff --git a/poppler/StructTreeRoot.h b/poppler/StructTreeRoot.h index 1b7a560e..41b1cd85 100644 --- a/poppler/StructTreeRoot.h +++ b/poppler/StructTreeRoot.h @@ -14,7 +14,6 @@ #ifndef STRUCTTREEROOT_H #define STRUCTTREEROOT_H -#include "goo/gtypes.h" #include "Object.h" #include "StructElement.h" #include <map> diff --git a/poppler/TextOutputDev.h b/poppler/TextOutputDev.h index 1daf9641..28e7c304 100644 --- a/poppler/TextOutputDev.h +++ b/poppler/TextOutputDev.h @@ -34,7 +34,6 @@ #include "poppler-config.h" #include <stdio.h> -#include "goo/gtypes.h" #include "GfxFont.h" #include "GfxState.h" #include "OutputDev.h" diff --git a/poppler/UnicodeMap.h b/poppler/UnicodeMap.h index 91c5701c..383a6933 100644 --- a/poppler/UnicodeMap.h +++ b/poppler/UnicodeMap.h @@ -28,7 +28,6 @@ #define UNICODEMAP_H #include "poppler-config.h" -#include "goo/gtypes.h" #include "CharTypes.h" #include <atomic> diff --git a/poppler/UnicodeTypeTable.h b/poppler/UnicodeTypeTable.h index ca843387..5468051c 100644 --- a/poppler/UnicodeTypeTable.h +++ b/poppler/UnicodeTypeTable.h @@ -25,8 +25,6 @@ #ifndef UNICODETYPETABLE_H #define UNICODETYPETABLE_H -#include "goo/gtypes.h" - extern bool unicodeTypeL(Unicode c); extern bool unicodeTypeR(Unicode c); diff --git a/poppler/ViewerPreferences.h b/poppler/ViewerPreferences.h index b9b813a6..fead9921 100644 --- a/poppler/ViewerPreferences.h +++ b/poppler/ViewerPreferences.h @@ -11,8 +11,6 @@ #ifndef VIEWERPREFERENCES_H #define VIEWERPREFERENCES_H -#include "goo/gtypes.h" - class Dict; //------------------------------------------------------------------------ diff --git a/poppler/XRef.h b/poppler/XRef.h index 38e04da2..14b03089 100644 --- a/poppler/XRef.h +++ b/poppler/XRef.h @@ -35,7 +35,6 @@ #define XREF_H #include "poppler-config.h" -#include "goo/gtypes.h" #include "Object.h" #include "Stream.h" #include "PopplerCache.h" diff --git a/qt5/src/ArthurOutputDev.h b/qt5/src/ArthurOutputDev.h index 47972b63..dae55637 100644 --- a/qt5/src/ArthurOutputDev.h +++ b/qt5/src/ArthurOutputDev.h @@ -34,7 +34,6 @@ #include <map> #include <stack> -#include "goo/gtypes.h" #include "OutputDev.h" #include "GfxState.h" diff --git a/splash/SplashFTFontEngine.h b/splash/SplashFTFontEngine.h index ec1ad4df..5e1d595d 100644 --- a/splash/SplashFTFontEngine.h +++ b/splash/SplashFTFontEngine.h @@ -28,7 +28,6 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include "goo/gtypes.h" class SplashFontFile; class SplashFontFileID; diff --git a/splash/SplashFont.h b/splash/SplashFont.h index 5d7b64d8..45875c9f 100644 --- a/splash/SplashFont.h +++ b/splash/SplashFont.h @@ -22,7 +22,6 @@ #ifndef SPLASHFONT_H #define SPLASHFONT_H -#include "goo/gtypes.h" #include "SplashTypes.h" #include "SplashClip.h" diff --git a/splash/SplashFontEngine.h b/splash/SplashFontEngine.h index 84334f55..44396af1 100644 --- a/splash/SplashFontEngine.h +++ b/splash/SplashFontEngine.h @@ -29,7 +29,6 @@ #include <array> -#include "goo/gtypes.h" #include "SplashTypes.h" class SplashT1FontEngine; diff --git a/splash/SplashFontFile.h b/splash/SplashFontFile.h index aa1c2677..133a1441 100644 --- a/splash/SplashFontFile.h +++ b/splash/SplashFontFile.h @@ -22,7 +22,6 @@ #ifndef SPLASHFONTFILE_H #define SPLASHFONTFILE_H -#include "goo/gtypes.h" #include "SplashTypes.h" class GooString; diff --git a/splash/SplashFontFileID.h b/splash/SplashFontFileID.h index e3fc5992..35487f24 100644 --- a/splash/SplashFontFileID.h +++ b/splash/SplashFontFileID.h @@ -21,8 +21,6 @@ #ifndef SPLASHFONTFILEID_H #define SPLASHFONTFILEID_H -#include "goo/gtypes.h" - //------------------------------------------------------------------------ // SplashFontFileID //------------------------------------------------------------------------ diff --git a/splash/SplashGlyphBitmap.h b/splash/SplashGlyphBitmap.h index def6f911..d9ef9070 100644 --- a/splash/SplashGlyphBitmap.h +++ b/splash/SplashGlyphBitmap.h @@ -7,8 +7,6 @@ #ifndef SPLASHGLYPHBITMAP_H #define SPLASHGLYPHBITMAP_H -#include "goo/gtypes.h" - //------------------------------------------------------------------------ // SplashGlyphBitmap //------------------------------------------------------------------------ diff --git a/splash/SplashTypes.h b/splash/SplashTypes.h index 573ec4bc..812225a1 100644 --- a/splash/SplashTypes.h +++ b/splash/SplashTypes.h @@ -27,8 +27,6 @@ #ifndef SPLASHTYPES_H #define SPLASHTYPES_H -#include "goo/gtypes.h" - //------------------------------------------------------------------------ // coordinates //------------------------------------------------------------------------ diff --git a/utils/HtmlOutputDev.h b/utils/HtmlOutputDev.h index bd0e7ceb..631090e0 100644 --- a/utils/HtmlOutputDev.h +++ b/utils/HtmlOutputDev.h @@ -35,7 +35,6 @@ #define HTMLOUTPUTDEV_H #include <stdio.h> -#include "goo/gtypes.h" #include "goo/GooList.h" #include "GfxFont.h" #include "OutputDev.h" diff --git a/utils/HtmlUtils.h b/utils/HtmlUtils.h index 2c0c4240..46a4a1b2 100644 --- a/utils/HtmlUtils.h +++ b/utils/HtmlUtils.h @@ -19,7 +19,6 @@ #define HTMLUTILS_H_ #include <math.h> // fabs -#include "goo/gtypes.h" // bool // Returns true iff the difference between a and b is less than the threshold // We always use fuzzy math when comparing decimal numbers due to imprecision diff --git a/utils/ImageOutputDev.h b/utils/ImageOutputDev.h index 6f07b041..d13bfe17 100644 --- a/utils/ImageOutputDev.h +++ b/utils/ImageOutputDev.h @@ -32,7 +32,6 @@ #include "poppler/poppler-config.h" #include <stdio.h> -#include "goo/gtypes.h" #include "goo/ImgWriter.h" #include "OutputDev.h" diff --git a/utils/JSInfo.h b/utils/JSInfo.h index c685c6df..e8eb4a33 100644 --- a/utils/JSInfo.h +++ b/utils/JSInfo.h @@ -19,7 +19,6 @@ #include <stdio.h> #include "Object.h" #include "PDFDoc.h" -#include "goo/gtypes.h" #include "Link.h" #include "UnicodeMap.h" diff --git a/utils/parseargs.h b/utils/parseargs.h index 2b83222c..c3ebb7cd 100644 --- a/utils/parseargs.h +++ b/utils/parseargs.h @@ -28,8 +28,6 @@ extern "C" { #endif -#include "goo/gtypes.h" - /* * Argument kinds. */ diff --git a/utils/pdfdetach.cc b/utils/pdfdetach.cc index 71fa8608..faa1e04f 100644 --- a/utils/pdfdetach.cc +++ b/utils/pdfdetach.cc @@ -27,7 +27,6 @@ #include "config.h" #include <poppler-config.h> #include <stdio.h> -#include "goo/gtypes.h" #include "goo/gmem.h" #include "goo/GooList.h" #include "parseargs.h" diff --git a/utils/pdftocairo-win32.h b/utils/pdftocairo-win32.h index 412c95ae..1c859bcf 100644 --- a/utils/pdftocairo-win32.h +++ b/utils/pdftocairo-win32.h @@ -13,7 +13,6 @@ #include <cstdint> #include <cairo.h> #include "goo/gmem.h" -#include "goo/gtypes.h" #include "goo/GooString.h" #ifdef CAIRO_HAS_WIN32_SURFACE diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc index ac7f162d..614cd0b7 100644 --- a/utils/pdftocairo.cc +++ b/utils/pdftocairo.cc @@ -46,7 +46,6 @@ #include <string.h> #include "parseargs.h" #include "goo/gmem.h" -#include "goo/gtypes.h" #include "goo/GooString.h" #include "goo/ImgWriter.h" #include "goo/JpegWriter.h" |