[poppler] poppler/CairoFontEngine.cc poppler/CairoFontEngine.h

[Carlos Garcia Campos]

 poppler/CairoFontEngine.cc |   12 ++++++------
 poppler/CairoFontEngine.h  |    8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit bedc88225c948ad1288b69c6c106adce36233442
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Wed Jul 7 11:55:47 2010 +0200

    [cairo] Fix warning on signed/unsigned comparison

diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
index 0a627aa..0d8c905 100644
--- a/poppler/CairoFontEngine.cc
+++ b/poppler/CairoFontEngine.cc
@@ -66,7 +66,7 @@
 CairoFont::CairoFont(Ref ref,
 		     cairo_font_face_t *cairo_font_face,
 		     Gushort *codeToGID,
-		     int codeToGIDLen,
+		     Guint codeToGIDLen,
 		     GBool substitute,
 		     GBool printing) : ref(ref),
 				       cairo_font_face(cairo_font_face),
@@ -369,7 +369,7 @@ _ft_new_face (FT_Library lib,
 CairoFreeTypeFont::CairoFreeTypeFont(Ref ref,
 				     cairo_font_face_t *cairo_font_face,
 				     Gushort *codeToGID,
-				     int codeToGIDLen,
+				     Guint codeToGIDLen,
 				     GBool substitute) : CairoFont(ref,
 								   cairo_font_face,
 								   codeToGID,
@@ -399,7 +399,7 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
   cairo_font_face_t *font_face;
 
   Gushort *codeToGID;
-  int codeToGIDLen;
+  Guint codeToGIDLen;
   
   dfp = NULL;
   codeToGID = NULL;
@@ -527,7 +527,7 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
         ff1c = FoFiType1C::load(fileNameC);
       }
       if (ff1c) {
-        codeToGID = ff1c->getCIDToGIDMap(&codeToGIDLen);
+        codeToGID = ff1c->getCIDToGIDMap((int *)&codeToGIDLen);
         delete ff1c;
       }
     }
@@ -668,7 +668,7 @@ CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, XRef *xref,
   cairo_font_face_t *font_face;
   Ref ref;
   Gushort *codeToGID;
-  int codeToGIDLen;
+  Guint codeToGIDLen;
   int i, j;
   char **enc;
   Dict *charProcs;
@@ -710,7 +710,7 @@ CairoType3Font::CairoType3Font(Ref ref,
 			       Catalog *cat,
 			       cairo_font_face_t *cairo_font_face,
 			       Gushort *codeToGID,
-			       int codeToGIDLen,
+			       Guint codeToGIDLen,
 			       GBool printing) : CairoFont(ref,
 							   cairo_font_face,
 							   codeToGID,
diff --git a/poppler/CairoFontEngine.h b/poppler/CairoFontEngine.h
index 9cb0ce7..552b5e6 100644
--- a/poppler/CairoFontEngine.h
+++ b/poppler/CairoFontEngine.h
@@ -45,7 +45,7 @@ public:
   CairoFont(Ref ref,
 	    cairo_font_face_t *face,
 	    Gushort *codeToGID,
-	    int codeToGIDLen,
+	    Guint codeToGIDLen,
 	    GBool substitute,
 	    GBool printing);
   virtual ~CairoFont();
@@ -61,7 +61,7 @@ protected:
   cairo_font_face_t *cairo_font_face;
 
   Gushort *codeToGID;
-  int codeToGIDLen;
+  Guint codeToGIDLen;
 
   GBool substitute;
   GBool printing;
@@ -76,7 +76,7 @@ public:
 
 private:
   CairoFreeTypeFont(Ref ref, cairo_font_face_t *cairo_font_face,
-	    Gushort *codeToGID, int codeToGIDLen, GBool substitute);
+	    Gushort *codeToGID, Guint codeToGIDLen, GBool substitute);
 };
 
 //------------------------------------------------------------------------
@@ -93,7 +93,7 @@ public:
 private:
   CairoType3Font(Ref ref, XRef *xref, Catalog *catalog,
 		 cairo_font_face_t *cairo_font_face,
-		 Gushort *codeToGID, int codeToGIDLen,
+		 Gushort *codeToGID, Guint codeToGIDLen,
 		 GBool printing);
   XRef *xref;
   Catalog *catalog;