ICU-57132.0.1.tar.gz

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

diff --git a/icuSources/layout/MarkToBasePosnSubtables.cpp b/icuSources/layout/MarkToBasePosnSubtables.cpp
index 7711988081ec07a5fc3d97a281fc189779e39e07..cf2ab04a20dcfc93b4b2cc3fac792cc79104c2f4 100644 (file)
--- a/icuSources/layout/MarkToBasePosnSubtables.cpp
+++ b/icuSources/layout/MarkToBasePosnSubtables.cpp
@@ -1,6 +1,6 @@
 /*
  *
 /*
  *

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

  *
  */
 
  *
  */
 


@@ -26,10 +26,10 @@ LEGlyphID MarkToBasePositioningSubtable::findBaseGlyph(GlyphIterator *glyphItera
     return 0xFFFF;
 }
 
     return 0xFFFF;
 }
 

-le_int32 MarkToBasePositioningSubtable::process(GlyphIterator *glyphIterator, const LEFontInstance *fontInstance) const
+le_int32 MarkToBasePositioningSubtable::process(const LETableReference &base, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode &success) const

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

-    le_int32 markCoverage = getGlyphCoverage((LEGlyphID) markGlyph);
+    le_int32 markCoverage = getGlyphCoverage(base, (LEGlyphID) markGlyph, success);

 
     if (markCoverage < 0) {
         // markGlyph isn't a covered mark glyph
 
     if (markCoverage < 0) {
         // markGlyph isn't a covered mark glyph


@@ -50,7 +50,7 @@ le_int32 MarkToBasePositioningSubtable::process(GlyphIterator *glyphIterator, co
     // FIXME: We probably don't want to find a base glyph before a previous ligature... 
     GlyphIterator baseIterator(*glyphIterator, (le_uint16) (lfIgnoreMarks /*| lfIgnoreLigatures*/));
     LEGlyphID baseGlyph = findBaseGlyph(&baseIterator);
     // FIXME: We probably don't want to find a base glyph before a previous ligature... 
     GlyphIterator baseIterator(*glyphIterator, (le_uint16) (lfIgnoreMarks /*| lfIgnoreLigatures*/));
     LEGlyphID baseGlyph = findBaseGlyph(&baseIterator);

-    le_int32 baseCoverage = getBaseCoverage((LEGlyphID) baseGlyph);
+    le_int32 baseCoverage = getBaseCoverage(base, (LEGlyphID) baseGlyph, success);

     const BaseArray *baseArray = (const BaseArray *) ((char *) this + SWAPW(baseArrayOffset));
     le_uint16 baseCount = SWAPW(baseArray->baseRecordCount);
 
     const BaseArray *baseArray = (const BaseArray *) ((char *) this + SWAPW(baseArrayOffset));
     le_uint16 baseCount = SWAPW(baseArray->baseRecordCount);