Commit ef3ef702 authored by Oliver Sander's avatar Oliver Sander Committed by Albert Astals Cid

Remove the file gtypes.h completely

parent cc51c218
Pipeline #11342 passed with stage
in 14 minutes and 15 seconds
......@@ -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
......
......@@ -23,8 +23,6 @@
#ifndef FOFIBASE_H
#define FOFIBASE_H
#include "goo/gtypes.h"
//------------------------------------------------------------------------
typedef void (*FoFiOutputFunc)(void *stream, const char *data, int len);
......
......@@ -23,8 +23,6 @@
#ifndef FOFIENCODINGS_H
#define FOFIENCODINGS_H
#include "goo/gtypes.h"
//------------------------------------------------------------------------
// Type 1 and 1C font data
//------------------------------------------------------------------------
......
......@@ -24,7 +24,6 @@
#include <stdio.h>
#include <string.h>
#include <limits.h>
#include "goo/gtypes.h"
#include "FoFiIdentifier.h"
//------------------------------------------------------------------------
......
......@@ -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"
......
......@@ -31,7 +31,6 @@
#include "stddef.h"
#include <unordered_map>
#include <string>
#include "goo/gtypes.h"
#include "FoFiBase.h"
class GooString;
......
......@@ -23,7 +23,6 @@
#ifndef FOFITYPE1_H
#define FOFITYPE1_H
#include "goo/gtypes.h"
#include "FoFiBase.h"
//------------------------------------------------------------------------
......
......@@ -25,7 +25,6 @@
#ifndef FOFITYPE1C_H
#define FOFITYPE1C_H
#include "goo/gtypes.h"
#include "FoFiBase.h"
class GooString;
......
......@@ -32,7 +32,6 @@
#include <stdio.h>
#include <stdlib.h>
#include "gtypes.h"
#define fixptShift 16
#define fixptMaskL ((1 << fixptShift) - 1)
......
......@@ -36,8 +36,6 @@
#include <cstdarg>
#include <string>
#include "gtypes.h"
#ifdef __clang__
# define GOOSTRING_FORMAT __attribute__((__annotate__("gooformat")))
#else
......
......@@ -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;
......
......@@ -76,7 +76,6 @@ extern "C" {
# endif
#endif
}
#include "gtypes.h"
class GooString;
......
......@@ -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);
......
/*
* 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
......@@ -23,8 +23,6 @@
#ifndef BUILTINFONT_H
#define BUILTINFONT_H
#include "goo/gtypes.h"
struct BuiltinFont;
class BuiltinFontWidths;
......
......@@ -29,7 +29,6 @@
#include <atomic>
#include "poppler-config.h"
#include "goo/gtypes.h"
#include "CharTypes.h"
class GooString;
......
......@@ -17,7 +17,6 @@
#include "poppler-config.h"
#include "goo/gtypes.h"
#include "Object.h"
#include "Stream.h"
......
......@@ -33,7 +33,6 @@
#include <mutex>
#include "poppler-config.h"
#include "goo/gtypes.h"
#include <cairo-ft.h>
#include "GfxFont.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"
......
......@@ -40,7 +40,6 @@
#ifndef CAIRO_RESCALE_BOX_H
#define CAIRO_RESCALE_BOX_H
#include "goo/gtypes.h"
#include <cairo.h>
class CairoRescaleBox {
......
......@@ -34,7 +34,6 @@
#include "poppler-config.h"
#include "CharTypes.h"
#include "goo/gtypes.h"
struct CharCodeToUnicodeString;
class GooString;
......
......@@ -23,8 +23,6 @@
#ifndef COMPACTFONTINFO_H
#define COMPACTFONTINFO_H
#include "goo/gtypes.h"
static char *type1CStdStrings[391] = {
".notdef",
"space",
......
......@@ -24,7 +24,6 @@
#ifndef DATE_INFO_H
#define DATE_INFO_H
#include "goo/gtypes.h"
#include "goo/GooString.h"
#include <time.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"
......
......@@ -26,7 +26,6 @@
#define FONT_INFO_H
#include "Object.h"
#include "goo/gtypes.h"
#include "goo/GooList.h"
class GfxFont;
......
......@@ -27,7 +27,6 @@
#ifndef FUNCTION_H
#define FUNCTION_H
#include "goo/gtypes.h"
#include "Object.h"
#include <set>
......
......@@ -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"
......
......@@ -33,7 +33,6 @@
#ifndef GFXFONT_H
#define GFXFONT_H
#include "goo/gtypes.h"
#include "goo/GooString.h"
#include "Object.h"
#include "CharTypes.h"
......
......@@ -36,7 +36,6 @@
#include "poppler-config.h"
#include "goo/gtypes.h"
#include "Object.h"
#include "Function.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>
......
......@@ -14,7 +14,6 @@
#define HINTS_H
#include <string.h>
#include "goo/gtypes.h"
#include <vector>
#include "PDFDoc.h"
......
......@@ -25,8 +25,6 @@
#ifndef JARITHMETICDECODER_H
#define JARITHMETICDECODER_H
#include "goo/gtypes.h"
class Stream;
//------------------------------------------------------------------------
......
......@@ -25,7 +25,6 @@
#ifndef JBIG2STREAM_H
#define JBIG2STREAM_H
#include "goo/gtypes.h"
#include "Object.h"
#include "Stream.h"
......
......@@ -18,7 +18,6 @@
#define JPEG2000STREAM_H
#include "config.h"
#include "goo/gtypes.h"
#include "Object.h"
#include "Stream.h"
......
......@@ -9,7 +9,6 @@
#ifndef JPXSTREAM_H
#define JPXSTREAM_H
#include "goo/gtypes.h"
#include "Object.h"
#include "Stream.h"
......
......@@ -11,7 +11,6 @@
#ifndef LINEARIZATION_H
#define LINEARIZATION_H
#include "goo/gtypes.h"
#include "Object.h"
class BaseStream;
......
......@@ -12,7 +12,6 @@
#ifndef MARKEDCONTENTOUTPUTDEV_H
#define MARKEDCONTENTOUTPUTDEV_H
#include "goo/gtypes.h"
#include "goo/gmem.h"
#include "OutputDev.h"
#include "GfxState.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"
......
......@@ -36,7 +36,6 @@
#define OUTPUTDEV_H
#include "poppler-config.h"
#include "goo/gtypes.h"
#include "CharTypes.h"
#include "Object.h"
#include "PopplerCache.h"
......
......@@ -23,8 +23,6 @@
#ifndef PSTOKENIZER_H
#define PSTOKENIZER_H
#include "goo/gtypes.h"
//------------------------------------------------------------------------
class PSTokenizer {
......
......@@ -19,7 +19,6 @@
#include <string>
#include <vector>
#include "goo/gtypes.h"
#include "Object.h"
class PageLabelInfo {
......
......@@ -27,7 +27,6 @@
#ifndef PRESCANOUTPUTDEV_H
#define PRESCANOUTPUTDEV_H
#include "goo/gtypes.h"
#include "Object.h"
#include "GfxState.h"
#include "GlobalParams.h"
......
......@@ -25,7 +25,6 @@
#include "poppler-config.h"
#include "goo/gtypes.h"
#include "Object.h"
class GooString;
......
......@@ -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"
......
......@@ -39,7 +39,6 @@
#include <cstdio>
#include "poppler-config.h"
#include "goo/gtypes.h"
#include "Object.h"
class GooFile;
......
......@@ -14,7 +14,6 @@
#ifndef STRUCTELEMENT_H
#define STRUCTELEMENT_H
#include "goo/gtypes.h"
#include "goo/GooString.h"
#include "MarkedContentOutputDev.h"
#include "Object.h"
......
......@@ -14,7 +14,6 @@
#ifndef STRUCTTREEROOT_H
#define STRUCTTREEROOT_H
#include "goo/gtypes.h"
#include "Object.h"
#include "StructElement.h"
#include <map>
......
......@@ -34,7 +34,6 @@
#include "poppler-config.h"
#include <stdio.h>
#include "goo/gtypes.h"
#include "GfxFont.h"
#include "GfxState.h"
#include "OutputDev.h"
......
......@@ -28,7 +28,6 @@
#define UNICODEMAP_H
#include "poppler-config.h"
#include "goo/gtypes.h"
#include "CharTypes.h"
#include <atomic>
......
......@@ -25,8 +25,6 @@
#ifndef UNICODETYPETABLE_H
#define UNICODETYPETABLE_H
#include "goo/gtypes.h"
extern bool unicodeTypeL(Unicode c);
extern bool unicodeTypeR(Unicode c);
......
......@@ -11,8 +11,6 @@
#ifndef VIEWERPREFERENCES_H
#define VIEWERPREFERENCES_H
#include "goo/gtypes.h"
class Dict;
//------------------------------------------------------------------------
......
......@@ -35,7 +35,6 @@
#define XREF_H
#include "poppler-config.h"
#include "goo/gtypes.h"
#include "Object.h"
#include "Stream.h"
#include "PopplerCache.h"
......
......@@ -34,7 +34,6 @@
#include <map>
#include <stack>
#include "goo/gtypes.h"
#include "OutputDev.h"
#include "GfxState.h"
......
......@@ -28,7 +28,6 @@
#include <ft2build.h>
#include FT_FREETYPE_H
#include "goo/gtypes.h"
class SplashFontFile;
class SplashFontFileID;
......
......@@ -22,7 +22,6 @@
#ifndef SPLASHFONT_H
#define SPLASHFONT_H
#include "goo/gtypes.h"
#include "SplashTypes.h"
#include "SplashClip.h"
......
......@@ -29,7 +29,6 @@
#include <array>
#include "goo/gtypes.h"
#include "SplashTypes.h"
class SplashT1FontEngine;
......
......@@ -22,7 +22,6 @@
#ifndef SPLASHFONTFILE_H
#define SPLASHFONTFILE_H
#include "goo/gtypes.h"
#include "SplashTypes.h"
class GooString;
......
......@@ -21,8 +21,6 @@
#ifndef SPLASHFONTFILEID_H
#define SPLASHFONTFILEID_H
#include "goo/gtypes.h"
//------------------------------------------------------------------------
// SplashFontFileID
//------------------------------------------------------------------------
......
......@@ -7,8 +7,6 @@
#ifndef SPLASHGLYPHBITMAP_H
#define SPLASHGLYPHBITMAP_H
#include "goo/gtypes.h"
//------------------------------------------------------------------------
// SplashGlyphBitmap
//------------------------------------------------------------------------
......
......@@ -27,8 +27,6 @@
#ifndef SPLASHTYPES_H
#define SPLASHTYPES_H
#include "goo/gtypes.h"
//------------------------------------------------------------------------
// coordinates
//------------------------------------------------------------------------
......
......@@ -35,7 +35,6 @@
#define HTMLOUTPUTDEV_H
#include <stdio.h>
#include "goo/gtypes.h"
#include "goo/GooList.h"
#include "GfxFont.h"
#include "OutputDev.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
......
......@@ -32,7 +32,6 @@
#include "poppler/poppler-config.h"
#include <stdio.h>
#include "goo/gtypes.h"
#include "goo/ImgWriter.h"
#include "OutputDev.h"
......
......@@ -19,7 +19,6 @@
#include <stdio.h>
#include "Object.h"
#include "PDFDoc.h"
#include "goo/gtypes.h"
#include "Link.h"
#include "UnicodeMap.h"
......
......@@ -28,8 +28,6 @@
extern "C" {
#endif
#include "goo/gtypes.h"
/*
* Argument kinds.
*/
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment