Merge to XFA: Fix / simplify CFX_FolderFontInfo::GetFontData() behavior.

core/include/fxcrt/fx_system.h

Index: core/include/fxcrt/fx_system.h
diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h
index 5fe3453626d7106c4e033f129815069fc1606cde..e0412a03496d1150555d005fba09bc1125a0869e 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))