Set supporting writingSystem correctly
authorJiang Jiang <jiang.jiang@nokia.com>
Wed, 30 Nov 2011 15:41:11 +0000 (16:41 +0100)
committerQt by Nokia <qt-info@nokia.com>
Thu, 1 Dec 2011 09:51:10 +0000 (10:51 +0100)
Change-Id: I963aa7b69a48441619c5885c443ae2620fcc4e57
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm

index 5c60249..9533301 100644 (file)
@@ -213,11 +213,12 @@ void QCoreTextFontDatabase::populateFontDatabase()
 
         QSupportedWritingSystems writingSystems;
         if (QCFType<CFArrayRef> languages = (CFArrayRef) CTFontDescriptorCopyAttribute(font, kCTFontLanguagesAttribute)) {
+            CFIndex length = CFArrayGetCount(languages);
             for (int i = 1; i < LanguageCount; ++i) {
                 if (!languageForWritingSystem[i])
                     continue;
                 QCFString lang = CFStringCreateWithCString(NULL, languageForWritingSystem[i], kCFStringEncodingASCII);
-                if (CFArrayContainsValue(languages, CFRangeMake(0, 0), lang))
+                if (CFArrayContainsValue(languages, CFRangeMake(0, length), lang))
                     writingSystems.setSupported(QFontDatabase::WritingSystem(i));
             }
         }