From 982e8905f4af77348af14fae0116fecc71f856c8 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 11 Nov 2015 16:59:19 -0800 Subject: Merge to XFA: Fix / simplify CFX_FolderFontInfo::GetFontData() behavior. The GetFontData() behavior in FPDF_SYSFONTINFO seems reasonable. Also do some code cleanup. TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1425023003 . (cherry picked from commit e0c16d7461ca8317433d93835e4c36a84157cbef) Review URL: https://codereview.chromium.org/1438943002 . --- core/include/fxcrt/fx_system.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'core/include') diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h index 5fe3453626..e0412a0349 100644 --- a/core/include/fxcrt/fx_system.h +++ b/core/include/fxcrt/fx_system.h @@ -258,12 +258,10 @@ wchar_t* FXSYS_wcsupr(wchar_t* str); #define FXDWORD_FROM_MSBFIRST(i) \ (((uint8_t)(i) << 24) | ((uint8_t)((i) >> 8) << 16) | \ ((uint8_t)((i) >> 16) << 8) | (uint8_t)((i) >> 24)) -#define FXDWORD_GET_LSBFIRST(p) \ - ((((uint8_t*)(p))[3] << 24) | (((uint8_t*)(p))[2] << 16) | \ - (((uint8_t*)(p))[1] << 8) | (((uint8_t*)(p))[0])) -#define FXDWORD_GET_MSBFIRST(p) \ - ((((uint8_t*)(p))[0] << 24) | (((uint8_t*)(p))[1] << 16) | \ - (((uint8_t*)(p))[2] << 8) | (((uint8_t*)(p))[3])) +#define FXDWORD_GET_LSBFIRST(p) \ + ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | (p[0])) +#define FXDWORD_GET_MSBFIRST(p) \ + ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | (p[3])) #define FXSYS_HIBYTE(word) ((uint8_t)((word) >> 8)) #define FXSYS_LOBYTE(word) ((uint8_t)(word)) #define FXSYS_HIWORD(dword) ((FX_WORD)((dword) >> 16)) -- cgit v1.2.3