X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=pdf2swf%2Fxpdf%2FUnicodeMap.h;h=6fd4ed24fb0f2c9acdccb6cafecf24def21d84a0;hb=c7432833fe3a6469d63fad135151a92e12877b94;hp=274c4472eafa590ab9fb61e24cfe36bfc120e712;hpb=b9ddd4a2ed601bc01ddacc69d2522687a93a94ce;p=swftools.git

diff --git a/pdf2swf/xpdf/UnicodeMap.h b/pdf2swf/xpdf/UnicodeMap.h
index 274c447..6fd4ed2 100644
--- a/pdf2swf/xpdf/UnicodeMap.h
+++ b/pdf2swf/xpdf/UnicodeMap.h
@@ -4,20 +4,26 @@
 //
 // Mapping from Unicode to an encoding.
 //
-// Copyright 2001-2002 Glyph & Cog, LLC
+// Copyright 2001-2003 Glyph & Cog, LLC
 //
 //========================================================================
 
 #ifndef UNICODEMAP_H
 #define UNICODEMAP_H
 
-#ifdef __GNUC__
+#include <aconf.h>
+
+#ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
 
 #include "gtypes.h"
 #include "CharTypes.h"
 
+#if MULTITHREADED
+#include "GMutex.h"
+#endif
+
 class GString;
 
 //------------------------------------------------------------------------
@@ -47,12 +53,13 @@ public:
   static UnicodeMap *parse(GString *encodingNameA);
 
   // Create a resident UnicodeMap.
-  UnicodeMap(char *encodingNameA,
+  UnicodeMap(char *encodingNameA, GBool unicodeOutA,
 	     UnicodeMapRange *rangesA, int lenA);
 
   // Create a resident UnicodeMap that uses a function instead of a
   // list of ranges.
-  UnicodeMap(char *encodingNameA, UnicodeMapFunc funcA);
+  UnicodeMap(char *encodingNameA, GBool unicodeOutA,
+	     UnicodeMapFunc funcA);
 
   ~UnicodeMap();
 
@@ -61,6 +68,8 @@ public:
 
   GString *getEncodingName() { return encodingName; }
 
+  GBool isUnicode() { return unicodeOut; }
+
   // Return true if this UnicodeMap matches the specified
   // <encodingNameA>.
   GBool match(GString *encodingNameA);
@@ -77,6 +86,7 @@ private:
 
   GString *encodingName;
   UnicodeMapKind kind;
+  GBool unicodeOut;
   union {
     UnicodeMapRange *ranges;	// (user, resident)
     UnicodeMapFunc func;	// (func)
@@ -85,6 +95,9 @@ private:
   UnicodeMapExt *eMaps;		// (user)
   int eMapsLen;			// (user)
   int refCnt;
+#ifdef MULTITHREADED
+  GMutex mutex;
+#endif
 };
 
 //------------------------------------------------------------------------