Fix / simplify CFX_FolderFontInfo::GetFontData() behavior.

core/include/fxcrt/fx_system.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
 #define CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
 
 #include <assert.h>
@@ skipping 240 matching lines @@
 #define FXSYS_acos(a) (FX_FLOAT) acos(a)
 #define FXSYS_sin(a) (FX_FLOAT) sin(a)
 #define FXSYS_log(a) (FX_FLOAT) log(a)
 #define FXSYS_log10(a) (FX_FLOAT) log10(a)
 #define FXSYS_fmod(a, b) (FX_FLOAT) fmod(a, b)
 #define FXSYS_abs abs
 #define FXDWORD_FROM_LSBFIRST(i) (i)
 #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))
 #define FXSYS_LOWORD(dword) ((FX_WORD)(dword))
 int32_t FXSYS_atoi(const FX_CHAR* str);
 int32_t FXSYS_wtoi(const FX_WCHAR* str);
 int64_t FXSYS_atoi64(const FX_CHAR* str);
 int64_t FXSYS_wtoi64(const FX_WCHAR* str);
 const FX_CHAR* FXSYS_i64toa(int64_t value, FX_CHAR* str, int radix);
 int FXSYS_round(FX_FLOAT f);
@@ skipping 37 matching lines @@
 
 // Prevent a function from ever being inlined, typically because we'd
 // like it to appear in stack traces.
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #define NEVER_INLINE __declspec(noinline)
 #else  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #define NEVER_INLINE __attribute__((__noinline__))
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 
 #endif  // CORE_INCLUDE_FXCRT_FX_SYSTEM_H_