ICU-57132.0.1.tar.gz

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

diff --git a/icuSources/layout/ExtensionSubtables.cpp b/icuSources/layout/ExtensionSubtables.cpp
index 6011154bf68abcc54a56c0239c59b2c6192da8d0..8ac03a2bb845f2ef1f6ec5ca8a8f3fe7edfa639d 100644 (file)
--- a/icuSources/layout/ExtensionSubtables.cpp
+++ b/icuSources/layout/ExtensionSubtables.cpp
@@ -1,7 +1,7 @@
 /*
  * %W% %E%
  *
- * (C) Copyright IBM Corp. 2008-2010 - All Rights Reserved
+ * (C) Copyright IBM Corp. 2008-2013 - All Rights Reserved
  *
  */
 
@@ -16,23 +16,31 @@
 U_NAMESPACE_BEGIN
 
 // read a 32-bit value that might only be 16-bit-aligned in memory
-#define READ_LONG(code) (le_uint32)((SWAPW(*(le_uint16*)&code) << 16) + SWAPW(*(((le_uint16*)&code) + 1)))
+static inline le_uint32 READ_LONG(le_uint32 code) {
+    le_uint16* first = ((le_uint16*)&code);
+    le_uint16* second = (((le_uint16*)&code) + 1);
+    return (le_uint32)((SWAPW(*first) << 16) + SWAPW(*second));
+}
 
 // FIXME: should look at the format too... maybe have a sub-class for it?
 le_uint32 ExtensionSubtable::process(const LookupProcessor *lookupProcessor, le_uint16 lookupType,
                                       GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const
 {
+    const LEReferenceTo<ExtensionSubtable> thisRef(lookupProcessor->getReference(), success); // create a reference to this
+
     if (LE_FAILURE(success)) {
         return 0;
     }
 
     le_uint16 elt = SWAPW(extensionLookupType);
 
-    if (elt != lookupType) {
+    if (elt != lookupType) {      
         le_uint32 extOffset = READ_LONG(extensionOffset);
-        LookupSubtable *subtable = (LookupSubtable *) ((char *) this + extOffset);
+        LEReferenceTo<LookupSubtable> subtable(thisRef, success, extOffset);
 
-        return lookupProcessor->applySubtable(subtable, elt, glyphIterator, fontInstance, success);
+        if(LE_SUCCESS(success)) {
+          return lookupProcessor->applySubtable(subtable, elt, glyphIterator, fontInstance, success);
+        }
     }
 
     return 0;