ICU-57132.0.1.tar.gz

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

diff --git a/icuSources/layout/LookupTables.cpp b/icuSources/layout/LookupTables.cpp
index 19ebf57ceaf4023e787b69f33488cfa7d29b5a9b..93c93c954a5926c1eca7c0485dbd8d16eaa867f4 100644 (file)
--- a/icuSources/layout/LookupTables.cpp
+++ b/icuSources/layout/LookupTables.cpp
@@ -1,7 +1,6 @@
 /*
 /*

- * @(#)LookupTables.cpp        1.5 00/03/15

  *
  *

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

  *
  */
 
  *
  */
 


@@ -25,22 +24,26 @@ U_NAMESPACE_BEGIN
     of the derived classes, and implement it in the others by casting
     the "this" pointer to the type that has the implementation.
 */ 
     of the derived classes, and implement it in the others by casting
     the "this" pointer to the type that has the implementation.
 */ 

-const LookupSegment *BinarySearchLookupTable::lookupSegment(const LookupSegment *segments, LEGlyphID glyph) const
+const LookupSegment *BinarySearchLookupTable::lookupSegment(const LETableReference &base, const LookupSegment *segments, LEGlyphID glyph, LEErrorCode &success) const

 {
 {

+    

     le_int16  unity = SWAPW(unitSize);
     le_int16  probe = SWAPW(searchRange);
     le_int16  extra = SWAPW(rangeShift);
     TTGlyphID ttGlyph = (TTGlyphID) LE_GET_GLYPH(glyph);
     le_int16  unity = SWAPW(unitSize);
     le_int16  probe = SWAPW(searchRange);
     le_int16  extra = SWAPW(rangeShift);
     TTGlyphID ttGlyph = (TTGlyphID) LE_GET_GLYPH(glyph);

-    const LookupSegment *entry = segments;
-    const LookupSegment *trial = (const LookupSegment *) ((char *) entry + extra);
+    LEReferenceTo<LookupSegment> entry(base, success, segments);
+    LEReferenceTo<LookupSegment> trial(entry, success, extra);
+
+    if(LE_FAILURE(success)) return NULL;

 
     if (SWAPW(trial->lastGlyph) <= ttGlyph) {
         entry = trial;
     }
 
 
     if (SWAPW(trial->lastGlyph) <= ttGlyph) {
         entry = trial;
     }
 

-    while (probe > unity) {
+    while (probe > unity && LE_SUCCESS(success)) {

         probe >>= 1;
         probe >>= 1;

-        trial = (const LookupSegment *) ((char *) entry + probe);
+        trial = entry; // copy
+        trial.addOffset(probe, success);

 
         if (SWAPW(trial->lastGlyph) <= ttGlyph) {
             entry = trial;
 
         if (SWAPW(trial->lastGlyph) <= ttGlyph) {
             entry = trial;


@@ -48,28 +51,29 @@ const LookupSegment *BinarySearchLookupTable::lookupSegment(const LookupSegment
     }
 
     if (SWAPW(entry->firstGlyph) <= ttGlyph) {
     }
 
     if (SWAPW(entry->firstGlyph) <= ttGlyph) {

-        return entry;
+      return entry.getAlias();

     }
 
     return NULL;
 }
 
     }
 
     return NULL;
 }
 

-const LookupSingle *BinarySearchLookupTable::lookupSingle(const LookupSingle *entries, LEGlyphID glyph) const
+const LookupSingle *BinarySearchLookupTable::lookupSingle(const LETableReference &base, const LookupSingle *entries, LEGlyphID glyph, LEErrorCode &success) const

 {
     le_int16  unity = SWAPW(unitSize);
     le_int16  probe = SWAPW(searchRange);
     le_int16  extra = SWAPW(rangeShift);
     TTGlyphID ttGlyph = (TTGlyphID) LE_GET_GLYPH(glyph);
 {
     le_int16  unity = SWAPW(unitSize);
     le_int16  probe = SWAPW(searchRange);
     le_int16  extra = SWAPW(rangeShift);
     TTGlyphID ttGlyph = (TTGlyphID) LE_GET_GLYPH(glyph);

-    const LookupSingle *entry = entries;
-    const LookupSingle *trial = (const LookupSingle *) ((char *) entry + extra);
+    LEReferenceTo<LookupSingle> entry(base, success, entries);
+    LEReferenceTo<LookupSingle> trial(entry, success, extra);

 
     if (SWAPW(trial->glyph) <= ttGlyph) {
         entry = trial;
     }
 
 
     if (SWAPW(trial->glyph) <= ttGlyph) {
         entry = trial;
     }
 

-    while (probe > unity) {
+    while (probe > unity && LE_SUCCESS(success)) {

         probe >>= 1;
         probe >>= 1;

-        trial = (const LookupSingle *) ((char *) entry + probe);
+        trial = entry;
+        trial.addOffset(probe, success);

 
         if (SWAPW(trial->glyph) <= ttGlyph) {
             entry = trial;
 
         if (SWAPW(trial->glyph) <= ttGlyph) {
             entry = trial;


@@ -77,7 +81,7 @@ const LookupSingle *BinarySearchLookupTable::lookupSingle(const LookupSingle *en
     }
 
     if (SWAPW(entry->glyph) == ttGlyph) {
     }
 
     if (SWAPW(entry->glyph) == ttGlyph) {

-        return entry;
+      return entry.getAlias();

     }
 
     return NULL;
     }
 
     return NULL;