From e25816160302b61f60870f790286467354f4e9be Mon Sep 17 00:00:00 2001 From: Michael Ow Date: Fri, 22 Jul 2011 22:02:57 +0000 Subject: [PATCH] ICU-8310 Use inline function to avoid dereferencing type-punned pointer warning X-SVN-Rev: 30410 --- icu4c/source/layout/ExtensionSubtables.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/icu4c/source/layout/ExtensionSubtables.cpp b/icu4c/source/layout/ExtensionSubtables.cpp index 6011154bf68..5da918daa3e 100644 --- a/icu4c/source/layout/ExtensionSubtables.cpp +++ b/icu4c/source/layout/ExtensionSubtables.cpp @@ -1,7 +1,7 @@ /* * %W% %E% * - * (C) Copyright IBM Corp. 2008-2010 - All Rights Reserved + * (C) Copyright IBM Corp. 2008-2011 - All Rights Reserved * */ @@ -16,7 +16,11 @@ 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, @@ -28,7 +32,7 @@ le_uint32 ExtensionSubtable::process(const LookupProcessor *lookupProcessor, le_ le_uint16 elt = SWAPW(extensionLookupType); - if (elt != lookupType) { + if (elt != lookupType) { le_uint32 extOffset = READ_LONG(extensionOffset); LookupSubtable *subtable = (LookupSubtable *) ((char *) this + extOffset);