X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b75a7d8f3b4adbae880cab104ce2c6a50eee4db2..b25be06635768807f8f693286fa73bb2297bb06c:/icuSources/layout/SinglePositioningSubtables.cpp diff --git a/icuSources/layout/SinglePositioningSubtables.cpp b/icuSources/layout/SinglePositioningSubtables.cpp index 115c43dc..e8759d21 100644 --- a/icuSources/layout/SinglePositioningSubtables.cpp +++ b/icuSources/layout/SinglePositioningSubtables.cpp @@ -1,7 +1,6 @@ /* - * @(#)SinglePositioningSubtables.cpp 1.8 00/03/15 * - * (C) Copyright IBM Corp. 1998-2003 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2005 - All Rights Reserved * */ @@ -12,7 +11,6 @@ #include "SinglePositioningSubtables.h" #include "ValueRecords.h" #include "GlyphIterator.h" -#include "GlyphPositionAdjustments.h" #include "LESwaps.h" U_NAMESPACE_BEGIN @@ -49,13 +47,7 @@ le_uint32 SinglePositioningFormat1Subtable::process(GlyphIterator *glyphIterator le_int32 coverageIndex = getGlyphCoverage(glyph); 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; } @@ -69,13 +61,7 @@ le_uint32 SinglePositioningFormat2Subtable::process(GlyphIterator *glyphIterator le_int16 coverageIndex = (le_int16) getGlyphCoverage(glyph); 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; }