[NaCl] Don't cache font size

cocos2dx/platform/nacl/CCImage.cpp

 /****************************************************************************
 Copyright (c) 2013 The Chromium Authors
 
 http://www.cocos2d-x.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
@@ skipping 39 matching lines @@
 struct TextLine {
     int iLineWidth;
     wchar_t* text;
 };
 
 NS_CC_BEGIN
 
 class BitmapDC
 {
 public:
-    BitmapDC() : m_pData(NULL), m_cachedSize(0), m_cachedFont(NULL)
+    BitmapDC() : m_pData(NULL), m_cachedFont(NULL)
     {
         libError = FT_Init_FreeType(&m_library);
         iInterval = szFont_kenning;
         reset();
     }
 
     ~BitmapDC()
     {
         if (m_cachedFont)
             FT_Done_Face(m_cachedFont);
@@ skipping 265 matching lines @@
 
         std::string fontfile = pFontName;
         std::string fontfileOrig = std::string(fontfile);
 
         std::string ext = fileNameExtension(fontfile);
         if (ext.empty() || (ext != "ttf" && ext != "TTF"))
         {
             fontfile += ".ttf" ;
         }
 
-        iError = openFont(fontfile, fontSize, fontfileOrig);
+        iError = openFont(fontfile, fontfileOrig);
         // try with fonts prefixed
         if (iError && !startsWith(fontfile,"fonts/") )
         {
             fontfile = std::string("fonts/") + fontfile;
-            iError = openFont(fontfile, fontSize, fontfileOrig);
+            iError = openFont(fontfile, fontfileOrig);
         }
 
         if (iError)
         {
             // try lowercase version
             std::transform(fontfile.begin(), fontfile.end(), fontfile.begin(), ::tolower);
-            iError = openFont(fontfile, fontSize, fontfileOrig);
+            iError = openFont(fontfile, fontfileOrig);
             if (iError)
             {
                 // try default font
                 CCLOG("font missing (%s) falling back to default font", fontfileOrig.c_str());
-                iError = openFont("fonts/Marker Felt.ttf", fontSize, fontfileOrig);
+                iError = openFont("fonts/Marker Felt.ttf", fontfileOrig);
                 if (iError)
                     CCLOG("default font missing (fonts/Marker Felt.ttf)");
             }
         }
         if (iError)
             return false;
 
         FT_Face face = m_cachedFont;
 
         //select utf8 charmap
@@ skipping 42 matching lines @@
     int libError;
     vector<TextLine> vLines;
     int iInterval;
     int iMaxLineWidth;
     int iMaxLineHeight;
 private:
     bool startsWith(const std::string& str, const std::string& what);
     /**
      * Attempt to open font file, and cache it if successful.
      */
-    int openFont(const std::string& fontName, uint fontSize, const std::string& fontNameOrig);
+    int openFont(const std::string& fontName, const std::string& fontNameOrig);
     std::string fileNameExtension(const std::string& pathName);
 
-    uint m_cachedSize;
     FT_Face m_cachedFont;
     std::string m_cachedFontname;
     std::string m_cachedFontnameOrig;
 };
 
 static BitmapDC& sharedBitmapDC()
 {
     static BitmapDC s_BmpDC;
     return s_BmpDC;
 }
@@ skipping 54 matching lines @@
 bool BitmapDC::startsWith(const std::string& str, const std::string& what)
 {
     bool result = false ;
     if (what.size() <= str.size())
     {
         result = (str.substr(0, what.size()) == what);
     }
     return result ;
 }
 
-int BitmapDC::openFont(const std::string& fontName, uint fontSize, const std::string& fontNameOrig)
+int BitmapDC::openFont(const std::string& fontName, const std::string& fontNameOrig)
 {
     // try to satisfy request based on currently cached font.
-    if (m_cachedSize == fontSize)
-    {
-        if (fontNameOrig == m_cachedFontnameOrig)
-          return 0;
+    if (fontNameOrig == m_cachedFontnameOrig)
+      return 0;
 
-        if (fontName == m_cachedFontname)
-          return 0;
-    }
+    if (fontName == m_cachedFontname)
+      return 0;
 
     FT_Face face;
     int iError = FT_New_Face(m_library, fontName.c_str(), 0, &face);
     if (iError)
       return iError;
 
     // free existing cached font
     if (m_cachedFont)
       FT_Done_Face(m_cachedFont);
 
     // cache newly loaded font
     m_cachedFontnameOrig = fontNameOrig;
     m_cachedFontname = fontName;
     m_cachedFont = face;
-    m_cachedSize = fontSize;
     return 0;
 }
 
 NS_CC_END