[poppler] poppler/GfxFont.cc poppler/GfxFont.h

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Mar 17 16:04:34 UTC 2022


 poppler/GfxFont.cc |    2 +-
 poppler/GfxFont.h  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 45f43fddfe823170c6d1f0bb92efb3179b8d1feb
Author: Albert Astals Cid <aacid at kde.org>
Date:   Thu Mar 17 16:47:34 2022 +0100

    Make cidToGIDLen unsigned
    
    Ideally we'd make it a vector, but it's all a bit convoluted, so settle
    for unsigned int for now

diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
index 6ae69425..b3408c0d 100644
--- a/poppler/GfxFont.cc
+++ b/poppler/GfxFont.cc
@@ -1835,7 +1835,7 @@ GfxCIDFont::GfxCIDFont(XRef *xref, const char *tagA, Ref idA, GooString *nameA,
     obj1 = desFontDict->lookup("CIDToGIDMap");
     if (obj1.isStream()) {
         cidToGIDLen = 0;
-        int i = 64;
+        unsigned int i = 64;
         cidToGID = (int *)gmallocn(i, sizeof(int));
         obj1.streamReset();
         while ((c1 = obj1.streamGetChar()) != EOF && (c2 = obj1.streamGetChar()) != EOF) {
diff --git a/poppler/GfxFont.h b/poppler/GfxFont.h
index ee70a7af..7d2666c7 100644
--- a/poppler/GfxFont.h
+++ b/poppler/GfxFont.h
@@ -416,7 +416,7 @@ public:
     // Return the CID-to-GID mapping table.  These should only be called
     // if type is fontCIDType2.
     int *getCIDToGID() const { return cidToGID; }
-    int getCIDToGIDLen() const { return cidToGIDLen; }
+    unsigned int getCIDToGIDLen() const { return cidToGIDLen; }
 
     int *getCodeToGIDMap(FoFiTrueType *ff, int *codeToGIDLen);
 
@@ -436,7 +436,7 @@ private:
     GfxFontCIDWidths widths; // character widths
     int *cidToGID; // CID --> GID mapping (for embedded
                    //   TrueType fonts)
-    int cidToGIDLen;
+    unsigned int cidToGIDLen;
 };
 
 //------------------------------------------------------------------------


More information about the poppler mailing list