(eog_hig_dialog_new): add terminating NULL in g_object_set.

[evince.git] / pdf / xpdf / TTFont.cc

diff --git a/pdf/xpdf/TTFont.cc b/pdf/xpdf/TTFont.cc
index ea3fad2223b4fe66ed4a3dbd9229e808854cbeed..fc6d84905ebcef49b63abd85e5aa7c5c61653d9e 100644 (file)
--- a/pdf/xpdf/TTFont.cc
+++ b/pdf/xpdf/TTFont.cc
@@ -2,18 +2,18 @@
 //
 // TTFont.cc
 //
 //
 // TTFont.cc
 //

-// Copyright 2001-2002 Glyph & Cog, LLC
+// Copyright 2001-2003 Glyph & Cog, LLC

 //
 //========================================================================
 
 //
 //========================================================================
 

-#ifdef __GNUC__
-#pragma implementation
-#endif
-

 #include <aconf.h>
 
 #if !FREETYPE2 && (HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H)
 
 #include <aconf.h>
 
 #if !FREETYPE2 && (HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H)
 

+#ifdef USE_GCC_PRAGMAS
+#pragma implementation
+#endif
+

 #include <string.h>
 #include "gmem.h"
 #include "GlobalParams.h"
 #include <string.h>
 #include "gmem.h"
 #include "GlobalParams.h"


@@ -80,7 +80,7 @@ TTFontFile::TTFontFile(TTFontEngine *engineA, char *fontFileName,
   unicodeCmap = macRomanCmap = msSymbolCmap = 0xffff;
   for (i = 0; i < props.num_CharMaps; ++i) {
     if (!TT_Get_CharMap_ID(face, i, &platform, &encoding)) {
   unicodeCmap = macRomanCmap = msSymbolCmap = 0xffff;
   for (i = 0; i < props.num_CharMaps; ++i) {
     if (!TT_Get_CharMap_ID(face, i, &platform, &encoding)) {

-      if (platform == 3 && encoding == 1) {
+      if ((platform == 3 && encoding == 1) || platform == 0) {

        unicodeCmap = i;
       } else if (platform == 1 && encoding == 0) {
        macRomanCmap = i;
        unicodeCmap = i;
       } else if (platform == 1 && encoding == 0) {
        macRomanCmap = i;