[freetype2-demos] master 23a41ca: [ftinspect] Eliminate compile warnings.

[Werner Lemberg]

branch: master
commit 23a41ca7489b4bc1a3055ce4a9e0f35a502b8a1b
Author: Charlie Jiang <w@chariri.moe>
Commit: Charlie Jiang <w@chariri.moe>

    [ftinspect] Eliminate compile warnings.
    
    * src/ftinspect/engine.hpp: Use `uintptr_t` as type for `faceCounter`
    instead of `int`.
    
    * src/ftinspect/engine.cpp: Changing all casts to use `FTC_IDType` type
    (=`uintptr_t`) we defined.
    
    Fixes #10.
---
 src/ftinspect/engine/engine.cpp | 16 ++++++++--------
 src/ftinspect/engine/engine.hpp |  5 +++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/ftinspect/engine/engine.cpp b/src/ftinspect/engine/engine.cpp
index 17ef9a7..de984b2 100644
--- a/src/ftinspect/engine/engine.cpp
+++ b/src/ftinspect/engine/engine.cpp
@@ -259,7 +259,7 @@ Engine::numberOfFaces(int fontIndex)
   long numFaces = -1;
 
   // search triplet (fontIndex, 0, 0)
-  FTC_FaceID ftcFaceID = reinterpret_cast<void*>
+  FTC_FaceID ftcFaceID = reinterpret_cast<FTC_FaceID>
                            (faceIDMap.value(FaceID(fontIndex,
                                                    0,
                                                    0)));
@@ -272,7 +272,7 @@ Engine::numberOfFaces(int fontIndex)
   else
   {
     // not found; try to load triplet (fontIndex, 0, 0)
-    ftcFaceID = reinterpret_cast<void*>(faceCounter);
+    ftcFaceID = reinterpret_cast<FTC_FaceID>(faceCounter);
     faceIDMap.insert(FaceID(fontIndex, 0, 0),
                      faceCounter++);
 
@@ -299,7 +299,7 @@ Engine::numberOfNamedInstances(int fontIndex,
   int numNamedInstances = -1;
 
   // search triplet (fontIndex, faceIndex, 0)
-  FTC_FaceID ftcFaceID = reinterpret_cast<void*>
+  FTC_FaceID ftcFaceID = reinterpret_cast<FTC_FaceID>
                            (faceIDMap.value(FaceID(fontIndex,
                                                    faceIndex,
                                                    0)));
@@ -312,7 +312,7 @@ Engine::numberOfNamedInstances(int fontIndex,
   else
   {
     // not found; try to load triplet (fontIndex, faceIndex, 0)
-    ftcFaceID = reinterpret_cast<void*>(faceCounter);
+    ftcFaceID = reinterpret_cast<FTC_FaceID>(faceCounter);
     faceIDMap.insert(FaceID(fontIndex, faceIndex, 0),
                      faceCounter++);
 
@@ -340,7 +340,7 @@ Engine::loadFont(int fontIndex,
   update();
 
   // search triplet (fontIndex, faceIndex, namedInstanceIndex)
-  scaler.face_id = reinterpret_cast<void*>
+  scaler.face_id = reinterpret_cast<FTC_FaceID>
                      (faceIDMap.value(FaceID(fontIndex,
                                              faceIndex,
                                              namedInstanceIndex)));
@@ -354,7 +354,7 @@ Engine::loadFont(int fontIndex,
   {
     // not found; try to load triplet
     // (fontIndex, faceIndex, namedInstanceIndex)
-    scaler.face_id = reinterpret_cast<void*>(faceCounter);
+    scaler.face_id = reinterpret_cast<FTC_FaceID>(faceCounter);
     faceIDMap.insert(FaceID(fontIndex,
                             faceIndex,
                             namedInstanceIndex),
@@ -400,7 +400,7 @@ Engine::removeFont(int fontIndex)
 {
   // we iterate over all triplets that contain the given font index
   // and remove them
-  QMap<FaceID, int>::iterator iter
+  QMap<FaceID, FTC_IDType>::iterator iter
     = faceIDMap.lowerBound(FaceID(fontIndex, 0, 0));
 
   for (;;)
@@ -412,7 +412,7 @@ Engine::removeFont(int fontIndex)
     if (faceID.fontIndex != fontIndex)
       break;
 
-    FTC_FaceID ftcFaceID = reinterpret_cast<void*>(iter.value());
+    FTC_FaceID ftcFaceID = reinterpret_cast<FTC_FaceID>(iter.value());
     FTC_Manager_RemoveFaceID(cacheManager, ftcFaceID);
 
     iter = faceIDMap.erase(iter);
diff --git a/src/ftinspect/engine/engine.hpp b/src/ftinspect/engine/engine.hpp
index 3585f31..a11ea0a 100644
--- a/src/ftinspect/engine/engine.hpp
+++ b/src/ftinspect/engine/engine.hpp
@@ -76,8 +76,9 @@ public:
 private:
   MainGUI* gui;
 
-  int faceCounter; // a running number used to initialize `faceIDMap'
-  QMap<FaceID, int> faceIDMap;
+  using FTC_IDType = uintptr_t;
+  FTC_IDType faceCounter; // a running number used to initialize `faceIDMap'
+  QMap<FaceID, FTC_IDType> faceIDMap;
 
   QString curFamilyName;
   QString curStyleName;