ICU-511.35.tar.gz

[apple/icu.git] / icuSources / samples / layout / FontMap.cpp

diff --git a/icuSources/samples/layout/FontMap.cpp b/icuSources/samples/layout/FontMap.cpp
index 00e3c4dcc9695296938e4e8893e0b92851821891..1510b29b2da1ee163081f733244c8e6793f666c0 100644 (file)
--- a/icuSources/samples/layout/FontMap.cpp
+++ b/icuSources/samples/layout/FontMap.cpp
@@ -1,6 +1,6 @@
 /*
  ******************************************************************************
 /*
  ******************************************************************************

- * Copyright (C) 1998-2003, International Business Machines Corporation and   *
+ * Copyright (C) 1998-2006, International Business Machines Corporation and   *

  * others. All Rights Reserved.                                               *
  ******************************************************************************
  */
  * others. All Rights Reserved.                                               *
  ******************************************************************************
  */


@@ -23,12 +23,15 @@ FontMap::FontMap(const char *fileName, le_int16 pointSize, GUISupport *guiSuppor
     : fPointSize(pointSize), fFontCount(0), fAscent(0), fDescent(0), fLeading(0), fGUISupport(guiSupport)
 {
     le_int32 defaultFont = -1, i, script;
     : fPointSize(pointSize), fFontCount(0), fAscent(0), fDescent(0), fLeading(0), fGUISupport(guiSupport)
 {
     le_int32 defaultFont = -1, i, script;

+    le_bool haveFonts = FALSE;

 
 

+/**/

     for (i = 0; i < scriptCodeCount; i += 1) {
         fFontIndices[i] = -1;
         fFontNames[i] = NULL;
         fFontInstances[i] = NULL;
     }
     for (i = 0; i < scriptCodeCount; i += 1) {
         fFontIndices[i] = -1;
         fFontNames[i] = NULL;
         fFontInstances[i] = NULL;
     }

+ /**/

 
     if (LE_FAILURE(status)) {
         return;
 
     if (LE_FAILURE(status)) {
         return;


@@ -63,18 +66,17 @@ FontMap::FontMap(const char *fileName, le_int16 pointSize, GUISupport *guiSuppor
 
         if (strcmp(scriptName, "DEFAULT") == 0) {
             defaultFont = getFontIndex(fontName);
 
         if (strcmp(scriptName, "DEFAULT") == 0) {
             defaultFont = getFontIndex(fontName);

+            haveFonts = TRUE;

             continue;
         }
 
             continue;
         }
 

-        uscript_getCode(scriptName, &scriptCode, 1, &scriptStatus);
+        le_int32 fillCount = uscript_getCode(scriptName, &scriptCode, 1, &scriptStatus);

 
 

-        if (U_FAILURE(scriptStatus) || scriptStatus == U_USING_FALLBACK_WARNING ||
-            scriptStatus == U_USING_DEFAULT_WARNING) {
+        if (U_FAILURE(scriptStatus) || fillCount <= 0 ||
+            scriptStatus == U_USING_FALLBACK_WARNING || scriptStatus == U_USING_DEFAULT_WARNING) {

             sprintf(errorMessage, "The script name %s is invalid.", line);
             fGUISupport->postErrorMessage(errorMessage, "Font Map Error");
             sprintf(errorMessage, "The script name %s is invalid.", line);
             fGUISupport->postErrorMessage(errorMessage, "Font Map Error");

-            status = LE_ILLEGAL_ARGUMENT_ERROR;
-            fclose(file);
-            return;
+            continue;

         }
 
         script = (le_int32) scriptCode;
         }
 
         script = (le_int32) scriptCode;


@@ -85,6 +87,7 @@ FontMap::FontMap(const char *fileName, le_int16 pointSize, GUISupport *guiSuppor
         }
 
         fFontIndices[script] = getFontIndex(fontName);
         }
 
         fFontIndices[script] = getFontIndex(fontName);

+        haveFonts = TRUE;

     }
 
     if (defaultFont >= 0) {
     }
 
     if (defaultFont >= 0) {


@@ -95,6 +98,12 @@ FontMap::FontMap(const char *fileName, le_int16 pointSize, GUISupport *guiSuppor
         }
     }
 
         }
     }
 

+    if (! haveFonts) {
+        sprintf(errorMessage, "The font map file %s does not contain any valid scripts.", fileName);
+        fGUISupport->postErrorMessage(errorMessage, "Font Map Error");
+        status = LE_ILLEGAL_ARGUMENT_ERROR;
+    }
+

     fclose(file);
 }
 
     fclose(file);
 }