X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b75a7d8f3b4adbae880cab104ce2c6a50eee4db2..fd0068a84e9996f225edba706498f6ed413d0673:/icuSources/layout/HanLayoutEngine.cpp

diff --git a/icuSources/layout/HanLayoutEngine.cpp b/icuSources/layout/HanLayoutEngine.cpp
index 05b2cb95..37b6cf4b 100644
--- a/icuSources/layout/HanLayoutEngine.cpp
+++ b/icuSources/layout/HanLayoutEngine.cpp
@@ -1,9 +1,7 @@
 /*
  * HanLayoutEngine.cpp: OpenType processing for Han fonts.
  *
- * (C) Copyright IBM Corp. 1998-2003 - All Rights Reserved.
- *
- * $Source: /cvs/root/ICU/icuSources/layout/HanLayoutEngine.cpp,v $ $Date: 2003/07/03 18:13:45 $ $Revision: 1.1.1.1 $
+ * (C) Copyright IBM Corp. 1998-2005 - All Rights Reserved.
  */
 
 #include "LETypes.h"
@@ -14,14 +12,38 @@
 #include "OpenTypeLayoutEngine.h"
 #include "HanLayoutEngine.h"
 #include "ScriptAndLanguageTags.h"
+#include "LEGlyphStorage.h"
+#include "OpenTypeTables.h"
+
+U_NAMESPACE_BEGIN
+
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(HanOpenTypeLayoutEngine)
+
+#define loclFeatureTag LE_LOCL_FEATURE_TAG
+#define smplFeatureTag LE_SMPL_FEATURE_TAG
+#define tradFeatureTag LE_TRAD_FEATURE_TAG
+
+#define loclFeatureMask 0x80000000UL
+#define smplFeatureMask 0x40000000UL
+#define tradFeatureMask 0x20000000UL
+
+static const FeatureMap featureMap[] =
+{
+    {loclFeatureTag, loclFeatureMask},
+    {smplFeatureTag, smplFeatureMask},
+    {tradFeatureTag, tradFeatureMask}
+};
 
-const char HanOpenTypeLayoutEngine::fgClassID=0;
+static const le_int32 featureMapCount = LE_ARRAY_SIZE(featureMap);
+
+#define features (loclFeatureMask)
 
 HanOpenTypeLayoutEngine::HanOpenTypeLayoutEngine(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode,
-                        const GlyphSubstitutionTableHeader *gsubTable)
-    : OpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, gsubTable)
+                        le_int32 typoFlags, const GlyphSubstitutionTableHeader *gsubTable)
+    : OpenTypeLayoutEngine(fontInstance, scriptCode, languageCode, typoFlags, gsubTable)
 {
-    // nothing else to do...
+    fFeatureMap      = featureMap;
+    fFeatureMapCount = featureMapCount;
 }
 
 HanOpenTypeLayoutEngine::~HanOpenTypeLayoutEngine()
@@ -29,16 +51,8 @@ HanOpenTypeLayoutEngine::~HanOpenTypeLayoutEngine()
     // nothing to do
 }
 
-const LETag emptyTag = 0x00000000;
-
-const LETag loclFeatureTag = LE_LOCL_FEATURE_TAG;
-const LETag smplFeatureTag = LE_SMPL_FEATURE_TAG;
-const LETag tradFeatureTag = LE_TRAD_FEATURE_TAG;
-
-const LETag features[] = {loclFeatureTag, emptyTag};
-
 le_int32 HanOpenTypeLayoutEngine::characterProcessing(const LEUnicode chars[], le_int32 offset, le_int32 count, le_int32 max, le_bool /*rightToLeft*/,
-        LEUnicode *&/*outChars*/, le_int32 *&/*charIndices*/, const LETag **&featureTags, LEErrorCode &success)
+        LEUnicode *&/*outChars*/, LEGlyphStorage &glyphStorage, LEErrorCode &success)
 {
     if (LE_FAILURE(success)) {
         return 0;
@@ -49,10 +63,10 @@ le_int32 HanOpenTypeLayoutEngine::characterProcessing(const LEUnicode chars[], l
         return 0;
     }
 
-    featureTags = LE_NEW_ARRAY(const LETag *, count);
+    glyphStorage.allocateGlyphArray(count, FALSE, success);
+    glyphStorage.allocateAuxData(success);
 
-    if (featureTags == NULL) {
-        success = LE_MEMORY_ALLOCATION_ERROR;
+    if (LE_FAILURE(success)) {
         return 0;
     }
 
@@ -61,8 +75,10 @@ le_int32 HanOpenTypeLayoutEngine::characterProcessing(const LEUnicode chars[], l
     // flag from the language tag lookups, so we can use these features
     // with the default LangSys...
     for (le_int32 i = 0; i < count; i += 1) {
-        featureTags[i] = features;
+        glyphStorage.setAuxData(i, features, success);
     }
 
     return count;
 }
+
+U_NAMESPACE_END