Use poppler instead of including xpdf source code. Poppler is a fork of

2005-03-01  Kristian Høgsberg  <krh@redhat.com>

        Use poppler instead of including xpdf source code.  Poppler is a
        fork of xpdf to build it as a shared library. See
        http://freedesktop.org/wiki/Software/poppler.

        * pdf/xpdf/*, pdf/goo/*, pdf/splash/*, pdf/fofi/*: Remove included
        xpdf fork.

        * pdf/Makefile.am: Build libpdfdocument.a here.

        * pdf/GDKSplashOutputDev.cc:
        * pdf/GDKSplashOutputDev.h:
        * pdf/GnomeVFSStream.cc:
        * pdf/GnomeVFSStream.h:
        * pdf-document.cc:
        * pdf-document.h:
        * test-gdk-output-dev.cc
        * Thumb.cc:
        * Thumb.h: Pull these files out of pdf/xpdf and adjust to compile
        against poppler.

1 files changed, 0 insertions, 76 deletions

diff --git a/pdf/goo/GHash.h b/pdf/goo/GHash.h
deleted file mode 100644
index 4a6e08d..0000000
--- a/pdf/goo/GHash.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//========================================================================
-//
-// GHash.h
-//
-// Copyright 2001-2003 Glyph & Cog, LLC
-//
-//========================================================================
-
-#ifndef GHASH_H
-#define GHASH_H
-
-#include <aconf.h>
-
-#ifdef USE_GCC_PRAGMAS
-#pragma interface
-#endif
-
-#include "gtypes.h"
-
-class GString;
-struct GHashBucket;
-struct GHashIter;
-
-//------------------------------------------------------------------------
-
-class GHash {
-public:
-
-  GHash(GBool deleteKeysA = gFalse);
-  ~GHash();
-  void add(GString *key, void *val);
-  void add(GString *key, int val);
-  void *lookup(GString *key);
-  int lookupInt(GString *key);
-  void *lookup(char *key);
-  int lookupInt(char *key);
-  void *remove(GString *key);
-  int removeInt(GString *key);
-  void *remove(char *key);
-  int removeInt(char *key);
-  int getLength() { return len; }
-  void startIter(GHashIter **iter);
-  GBool getNext(GHashIter **iter, GString **key, void **val);
-  GBool getNext(GHashIter **iter, GString **key, int *val);
-  void killIter(GHashIter **iter);
-
-private:
-
-  void expand();
-  GHashBucket *find(GString *key, int *h);
-  GHashBucket *find(char *key, int *h);
-  int hash(GString *key);
-  int hash(char *key);
-
-  GBool deleteKeys;		// set if key strings should be deleted
-  int size;			// number of buckets
-  int len;			// number of entries
-  GHashBucket **tab;
-};
-
-#define deleteGHash(hash, T)                       \
-  do {                                             \
-    GHash *_hash = (hash);                         \
-    {                                              \
-      GHashIter *_iter;                            \
-      GString *_key;                               \
-      void *_p;                                    \
-      _hash->startIter(&_iter);                    \
-      while (_hash->getNext(&_iter, &_key, &_p)) { \
-        delete (T*)_p;                             \
-      }                                            \
-      delete _hash;                                \
-    }                                              \
-  } while(0)
-
-#endif