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/win32 | |
| 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/win32')
| -rw-r--r-- | core/src/fxge/win32/fx_win32_device.cpp | 2 | ||||
| -rw-r--r-- | core/src/fxge/win32/fx_win32_print.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp index c346d1bbc1..a7dd22f612 100644 --- a/core/src/fxge/win32/fx_win32_device.cpp +++ b/core/src/fxge/win32/fx_win32_device.cpp @@ -14,7 +14,7 @@ #include "core/include/fxge/fx_ge_win32.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" #include "dwrite_int.h" #include "win32_int.h" diff --git a/core/src/fxge/win32/fx_win32_print.cpp b/core/src/fxge/win32/fx_win32_print.cpp index 0c00a7b3d9..fc7cd790a7 100644 --- a/core/src/fxge/win32/fx_win32_print.cpp +++ b/core/src/fxge/win32/fx_win32_print.cpp @@ -13,7 +13,7 @@ #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge_win32.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" #include "win32_int.h" #define SIZETHRESHOLD 1000 |