ICU-62141.0.1.tar.gz

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

diff --git a/icuSources/layout/SinglePositioningSubtables.cpp b/icuSources/layout/SinglePositioningSubtables.cpp
index 42b6b44afc070a0e2de0468209c24e89d1ae64f0..b49d81d533c37bec58d90ad138c28e7fd9c501a0 100644 (file)
--- a/icuSources/layout/SinglePositioningSubtables.cpp
+++ b/icuSources/layout/SinglePositioningSubtables.cpp
@@ -1,6 +1,6 @@
 /*
  *
 /*
  *

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

  *
  */
 
  *
  */
 


@@ -11,12 +11,11 @@
 #include "SinglePositioningSubtables.h"
 #include "ValueRecords.h"
 #include "GlyphIterator.h"
 #include "SinglePositioningSubtables.h"
 #include "ValueRecords.h"
 #include "GlyphIterator.h"

-#include "GlyphPositionAdjustments.h"

 #include "LESwaps.h"
 
 U_NAMESPACE_BEGIN
 
 #include "LESwaps.h"
 
 U_NAMESPACE_BEGIN
 

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

 {
     switch(SWAPW(subtableFormat))
     {
 {
     switch(SWAPW(subtableFormat))
     {


@@ -25,16 +24,16 @@ le_uint32 SinglePositioningSubtable::process(GlyphIterator *glyphIterator, const
 
     case 1:
     {
 
     case 1:
     {

-        const SinglePositioningFormat1Subtable *subtable = (const SinglePositioningFormat1Subtable *) this;
+      const LEReferenceTo<SinglePositioningFormat1Subtable> subtable(base, success, (const SinglePositioningFormat1Subtable *) this);

 
 

-        return subtable->process(glyphIterator, fontInstance);
+      return subtable->process(subtable, glyphIterator, fontInstance, success);

     }
 
     case 2:
     {
     }
 
     case 2:
     {

-        const SinglePositioningFormat2Subtable *subtable = (const SinglePositioningFormat2Subtable *) this;
+      const LEReferenceTo<SinglePositioningFormat2Subtable> subtable(base, success, (const SinglePositioningFormat2Subtable *) this);

 
 

-        return subtable->process(glyphIterator, fontInstance);
+      return subtable->process(subtable, glyphIterator, fontInstance, success);

     }
 
     default:
     }
 
     default:


@@ -42,19 +41,13 @@ le_uint32 SinglePositioningSubtable::process(GlyphIterator *glyphIterator, const
     }
 }
 
     }
 }
 

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

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

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

 
     if (coverageIndex >= 0) {
 
     if (coverageIndex >= 0) {

-        GlyphPositionAdjustment adjustment;
-
-        glyphIterator->getCurrGlyphPositionAdjustment(adjustment);
-
-        valueRecord.adjustPosition(SWAPW(valueFormat), (const char *) this, adjustment, fontInstance);
-
-        glyphIterator->setCurrGlyphPositionAdjustment(&adjustment);
+        valueRecord.adjustPosition(SWAPW(valueFormat), (const char *) this, *glyphIterator, fontInstance);

 
         return 1;
     }
 
         return 1;
     }


@@ -62,19 +55,13 @@ le_uint32 SinglePositioningFormat1Subtable::process(GlyphIterator *glyphIterator
     return 0;
 }
 
     return 0;
 }
 

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

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

-    le_int16 coverageIndex = (le_int16) getGlyphCoverage(glyph);
+    le_int16 coverageIndex = (le_int16) getGlyphCoverage(base, glyph, success);

 
     if (coverageIndex >= 0) {
 
     if (coverageIndex >= 0) {

-        GlyphPositionAdjustment adjustment;
-
-        glyphIterator->getCurrGlyphPositionAdjustment(adjustment);
-
-        valueRecordArray[0].adjustPosition(coverageIndex, SWAPW(valueFormat), (const char *) this, adjustment, fontInstance);
-
-        glyphIterator->setCurrGlyphPositionAdjustment(&adjustment);
+        valueRecordArray[0].adjustPosition(coverageIndex, SWAPW(valueFormat), (const char *) this, *glyphIterator, fontInstance);

 
         return 1;
     }
 
         return 1;
     }