diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-02-08 12:46:54 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-02-08 12:46:54 -0800 |
| commit | 1d95d654dde9380265be8d412141e03f7ba12da3 (patch) | |
| tree | 54b0f2ced4b1b317fd720d67664c20488e9b156d /core/src/fxge/apple | |
| parent | ddf2f339f603246107451931d16245c8b7d1d7c4 (diff) | |
| download | pdfium-1d95d654dde9380265be8d412141e03f7ba12da3.tar.xz | |
CPDF_TextStream::m_pObjArray is always NULL
Also, use full path to include "text_int.h", as there are
two of them; I suspect that fpdf_text_search was including
the wrong one as the compiler didn't complain about a
signature mismatch I had overlooked.
In fact, rename the fxge file to avoid collision completely.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1679743003 .
Diffstat (limited to 'core/src/fxge/apple')
| -rw-r--r-- | core/src/fxge/apple/fx_apple_platform.cpp | 2 | ||||
| -rw-r--r-- | core/src/fxge/apple/fx_quartz_device.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxge/apple/fx_apple_platform.cpp b/core/src/fxge/apple/fx_apple_platform.cpp index f0a23825b9..a448ae5050 100644 --- a/core/src/fxge/apple/fx_apple_platform.cpp +++ b/core/src/fxge/apple/fx_apple_platform.cpp @@ -14,7 +14,7 @@ #include "core/include/fxge/fx_ge_apple.h" #include "core/src/fxge/agg/include/fx_agg_driver.h" #include "core/src/fxge/dib/dib_int.h" -#include "core/src/fxge/ge/text_int.h" +#include "core/src/fxge/ge/fx_text_int.h" void CFX_AggDeviceDriver::InitPlatform() { CQuartz2D& quartz2d = diff --git a/core/src/fxge/apple/fx_quartz_device.cpp b/core/src/fxge/apple/fx_quartz_device.cpp index 0b19438230..a7b0a9e082 100644 --- a/core/src/fxge/apple/fx_quartz_device.cpp +++ b/core/src/fxge/apple/fx_quartz_device.cpp @@ -9,7 +9,7 @@ #include "core/include/fxge/fx_ge.h" #include "core/src/fxge/agg/include/fx_agg_driver.h" #include "core/src/fxge/dib/dib_int.h" -#include "core/src/fxge/ge/text_int.h" +#include "core/src/fxge/ge/fx_text_int.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ #include "apple_int.h" |