[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/kfontinst/kfontinst
From:       Craig Drummond <craig () kde ! org>
Date:       2004-11-17 21:51:46
Message-ID: 20041117215146.C08FD16CA4 () office ! kde ! org
[Download RAW message or body]

CVS commit by craig: 

Fix for when #ifndef HAVE_FONT_ENC


  M +18 -23    FontEngine.cpp   1.41
  M +1 -1      FontEngine.h   1.15


--- kdebase/kcontrol/kfontinst/kfontinst/FontEngine.cpp  #1.40:1.41
@@ -980,10 +980,6 @@ void CFontEngine::setPsNameFt()
 
 #ifndef HAVE_FONT_ENC
-bool CFontEngine::has8BitEncodingFt(CEncodings::T8Bit *data)
+bool CFontEngine::has8BitEncodingFt(const CEncodings::T8Bit &data)
 {
-    if(data)
-    {
-        if(data->load())
-        {
             int cm;
 
@@ -998,5 +994,5 @@ bool CFontEngine::has8BitEncodingFt(CEnc
 
                 for(ch=0; ch<CEncodings::T8Bit::NUM_MAP_ENTRIES && \
                missing<=constMaxMissing; ch++)
-                    if(data->map[ch]>-1 && FT_Get_Char_Index(itsFt.face, \
data->map[ch])==0) +            if(data.map[ch]>-1 && FT_Get_Char_Index(itsFt.face, \
data.map[ch])==0)  missing++;
 
@@ -1004,6 +1000,4 @@ bool CFontEngine::has8BitEncodingFt(CEnc
                     return true;
             }
-        }
-    }
 
     return false;
@@ -1016,5 +1010,5 @@ QStringList CFontEngine::get8BitEncoding
     for(int i=0; CEncodings::eightBit()[i].map; i++)
         if(has8BitEncodingFt(CEncodings::eightBit()[i]))
-            enc.append(enc8->name);
+            enc.append(CEncodings::eightBit()[i].name);
 
     return enc;
@@ -1249,9 +1243,10 @@ QStringList CFontEngine::getEncodingsFt(
                 enc.append("jisx0201.1976-0");
             }
-            if(FT_Err_Ok==FT_Select_Charmap(ft_encoding_gb2312))
+            if(FT_Err_Ok==FT_Select_Charmap(itsFt.face, ft_encoding_gb2312))
                 enc.append("gb2312.1980-0");
-            if(FT_Err_Ok==FT_Select_Charmap(ft_encoding_big5))
+            if(FT_Err_Ok==FT_Select_Charmap(itsFt.face, ft_encoding_big5))
                 enc.append("big5.et-0");
-            if(FT_Err_Ok==FT_Select_Charmap(ft_encoding_wansung) || \
(FT_Err_Ok==FT_Select_Charmap(ft_encoding_johab))) +            \
if(FT_Err_Ok==FT_Select_Charmap(itsFt.face, ft_encoding_wansung) || +               \
FT_Err_Ok==FT_Select_Charmap(itsFt.face, ft_encoding_johab) )  \
enc.append("ksc5601.1987-0");  }

--- kdebase/kcontrol/kfontinst/kfontinst/FontEngine.h  #1.14:1.15
@@ -219,5 +219,5 @@ class CFontEngine
     bool            checkExtraEncodingFt(const QString &enc, bool found);
 #else
-    bool            has8BitEncodingFt(CEncodings::T8Bit *data);
+    bool            has8BitEncodingFt(const CEncodings::T8Bit &data);
     QStringList     get8BitEncodingsFt();
 #endif


[prev in list] [next in list] [prev in thread] [next in thread]