ICU-511.35.tar.gz

[apple/icu.git] / icuSources / layout / GlyphPositioningTables.cpp

diff --git a/icuSources/layout/GlyphPositioningTables.cpp b/icuSources/layout/GlyphPositioningTables.cpp
index ead6d1e8e871123ddd35a80e49bc82a7ea8f83e7..b973fb7ae9907e4f88b3e751b79b3d0a2a51db02 100644 (file)
--- a/icuSources/layout/GlyphPositioningTables.cpp
+++ b/icuSources/layout/GlyphPositioningTables.cpp
@@ -1,7 +1,5 @@
 /*
 /*

- * @(#)GlyphPositioningTables.cpp      1.7 00/03/15
- *
- * (C) Copyright IBM Corp. 1998, 1999, 2000, 2001 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998-2008 - All Rights Reserved

  *
  */
 
  *
  */
 


@@ -10,22 +8,31 @@
 #include "OpenTypeTables.h"
 #include "Lookups.h"
 #include "GlyphDefinitionTables.h"
 #include "OpenTypeTables.h"
 #include "Lookups.h"
 #include "GlyphDefinitionTables.h"

-#include "GlyphPositionAdjustments.h"

 #include "GlyphPositioningTables.h"
 #include "GlyphPosnLookupProc.h"
 #include "GlyphPositioningTables.h"
 #include "GlyphPosnLookupProc.h"

+#include "CursiveAttachmentSubtables.h"
+#include "LEGlyphStorage.h"
+#include "GlyphPositionAdjustments.h"

 
 U_NAMESPACE_BEGIN
 
 
 U_NAMESPACE_BEGIN
 

-void GlyphPositioningTableHeader::process(LEGlyphID *glyphs, GlyphPositionAdjustment *glyphPositionAdjustments,
-                                          const LETag **glyphTags, le_int32 glyphCount, le_bool rightToLeft,
+void GlyphPositioningTableHeader::process(LEGlyphStorage &glyphStorage, GlyphPositionAdjustments *glyphPositionAdjustments, le_bool rightToLeft,

                                           LETag scriptTag, LETag languageTag,
                                           LETag scriptTag, LETag languageTag,

-                                          const GlyphDefinitionTableHeader *glyphDefinitionTableHeader,
-                                          const LEFontInstance *fontInstance, const LETag *featureOrder) const
+                                          const GlyphDefinitionTableHeader *glyphDefinitionTableHeader, LEErrorCode &success,
+                                          const LEFontInstance *fontInstance, const FeatureMap *featureMap, le_int32 featureMapCount, le_bool featureOrder) const

 {
 {

-    GlyphPositioningLookupProcessor processor(this, scriptTag, languageTag, featureOrder);
+    if (LE_FAILURE(success)) {
+        return;
+    } 
+
+    GlyphPositioningLookupProcessor processor(this, scriptTag, languageTag, featureMap, featureMapCount, featureOrder, success);
+    if (LE_FAILURE(success)) {
+        return;
+    } 
+
+    processor.process(glyphStorage, glyphPositionAdjustments, rightToLeft, glyphDefinitionTableHeader, fontInstance, success);

 
 

-    processor.process(glyphs, glyphPositionAdjustments, glyphTags, glyphCount, rightToLeft,
-        glyphDefinitionTableHeader, fontInstance);
+    glyphPositionAdjustments->applyCursiveAdjustments(glyphStorage, rightToLeft, fontInstance);

 }
 
 U_NAMESPACE_END
 }
 
 U_NAMESPACE_END