ICU-531.31.tar.gz

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

diff --git a/icuSources/layout/CursiveAttachmentSubtables.cpp b/icuSources/layout/CursiveAttachmentSubtables.cpp
index 40c38fa49ce1802a44bdef8a64f41006e7ccd62c..875c1b1d7ef30801805d655a053254e5fcc0765d 100644 (file)
--- a/icuSources/layout/CursiveAttachmentSubtables.cpp
+++ b/icuSources/layout/CursiveAttachmentSubtables.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * (C) Copyright IBM Corp. 1998 - 2005 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998 - 2013 - All Rights Reserved

  *
  */
 
  *
  */
 


@@ -14,10 +14,10 @@
 
 U_NAMESPACE_BEGIN
 
 
 U_NAMESPACE_BEGIN
 

-le_uint32 CursiveAttachmentSubtable::process(GlyphIterator *glyphIterator, const LEFontInstance *fontInstance) const
+le_uint32 CursiveAttachmentSubtable::process(const LEReferenceTo<CursiveAttachmentSubtable> &base, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode &success) const

 {
     LEGlyphID glyphID       = glyphIterator->getCurrGlyphID();
 {
     LEGlyphID glyphID       = glyphIterator->getCurrGlyphID();

-    le_int32  coverageIndex = getGlyphCoverage(glyphID);
+    le_int32  coverageIndex = getGlyphCoverage(base, glyphID, success);

     le_uint16 eeCount       = SWAPW(entryExitCount);
 
     if (coverageIndex < 0 || coverageIndex >= eeCount) {
     le_uint16 eeCount       = SWAPW(entryExitCount);
 
     if (coverageIndex < 0 || coverageIndex >= eeCount) {


@@ -34,6 +34,8 @@ le_uint32 CursiveAttachmentSubtable::process(GlyphIterator *glyphIterator, const
 
         entryAnchorTable->getAnchor(glyphID, fontInstance, entryAnchor);
         glyphIterator->setCursiveEntryPoint(entryAnchor);
 
         entryAnchorTable->getAnchor(glyphID, fontInstance, entryAnchor);
         glyphIterator->setCursiveEntryPoint(entryAnchor);

+    } else {
+        //glyphIterator->clearCursiveEntryPoint();

     }
 
     if (exitOffset != 0) {
     }
 
     if (exitOffset != 0) {


@@ -41,6 +43,8 @@ le_uint32 CursiveAttachmentSubtable::process(GlyphIterator *glyphIterator, const
 
         exitAnchorTable->getAnchor(glyphID, fontInstance, exitAnchor);
         glyphIterator->setCursiveExitPoint(exitAnchor);
 
         exitAnchorTable->getAnchor(glyphID, fontInstance, exitAnchor);
         glyphIterator->setCursiveExitPoint(exitAnchor);

+    } else {
+        //glyphIterator->clearCursiveExitPoint();

     }
 
     return 1;
     }
 
     return 1;