X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=pdf%2Fxpdf%2FCharCodeToUnicode.cc;h=e2fecbc04d87b55a959bf7350f19561411ea3d9b;hb=bfd0b848c8c81ab10698f74b77f9f0904c3161e1;hp=912981e99e96f6562ad9a53c77aef56e043457a5;hpb=2a393c134fe3fe8eb85bf818cb7ad6ae4396322a;p=evince.git

diff --git a/pdf/xpdf/CharCodeToUnicode.cc b/pdf/xpdf/CharCodeToUnicode.cc
index 912981e9..e2fecbc0 100644
--- a/pdf/xpdf/CharCodeToUnicode.cc
+++ b/pdf/xpdf/CharCodeToUnicode.cc
@@ -6,11 +6,12 @@
 //
 //========================================================================
 
-#ifdef __GNUC__
+#include <aconf.h>
+
+#ifdef USE_GCC_PRAGMAS
 #pragma implementation
 #endif
 
-#include <aconf.h>
 #include <stdio.h>
 #include <string.h>
 #include "gmem.h"
@@ -85,6 +86,7 @@ CharCodeToUnicode *CharCodeToUnicode::parseCIDToUnicode(GString *collectionA) {
     }
     ++mapLenA;
   }
+  fclose(f);
 
   ctu = new CharCodeToUnicode(collectionA->copy(), mapA, mapLenA, gTrue,
 			      NULL, 0);
@@ -222,7 +224,7 @@ void CharCodeToUnicode::parseCMap1(int (*getCharFunc)(void *), void *data,
 	    map[i] = 0;
 	  }
 	}
-	if (n3 == 6) {
+	if (n3 <= 6) {
 	  if (sscanf(tok3 + 1, "%x", &u) != 1) {
 	    error(-1, "Illegal entry in bfrange block in ToUnicode CMap");
 	    continue;