ICU-461.13.tar.gz

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

diff --git a/icuSources/layout/ExtensionSubtables.cpp b/icuSources/layout/ExtensionSubtables.cpp
index 3453743e4052601340f870cf963d785b2140cca4..6011154bf68abcc54a56c0239c59b2c6192da8d0 100644 (file)
--- a/icuSources/layout/ExtensionSubtables.cpp
+++ b/icuSources/layout/ExtensionSubtables.cpp
@@ -1,7 +1,7 @@
 /*
  * %W% %E%
  *
 /*
  * %W% %E%
  *

- * (C) Copyright IBM Corp. 2002 - All Rights Reserved
+ * (C) Copyright IBM Corp. 2008-2010 - All Rights Reserved

  *
  */
 
  *
  */
 


@@ -15,18 +15,24 @@
 
 U_NAMESPACE_BEGIN
 
 
 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)))

 
 // FIXME: should look at the format too... maybe have a sub-class for it?
 le_uint32 ExtensionSubtable::process(const LookupProcessor *lookupProcessor, le_uint16 lookupType,
 
 // 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) const
+                                      GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const

 {
 {

+    if (LE_FAILURE(success)) {
+        return 0;
+    }
+

     le_uint16 elt = SWAPW(extensionLookupType);
 
     if (elt != lookupType) {
     le_uint16 elt = SWAPW(extensionLookupType);
 
     if (elt != lookupType) {

-        le_uint32 extOffset = SWAPL(extensionOffset);
+        le_uint32 extOffset = READ_LONG(extensionOffset);

         LookupSubtable *subtable = (LookupSubtable *) ((char *) this + extOffset);
 
         LookupSubtable *subtable = (LookupSubtable *) ((char *) this + extOffset);
 

-        return lookupProcessor->applySubtable(subtable, elt, glyphIterator, fontInstance);
+        return lookupProcessor->applySubtable(subtable, elt, glyphIterator, fontInstance, success);

     }
 
     return 0;
     }
 
     return 0;