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/fpdftext/fpdf_text.cpp | |
| 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/fpdftext/fpdf_text.cpp')
| -rw-r--r-- | core/src/fpdftext/fpdf_text.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/fpdftext/fpdf_text.cpp b/core/src/fpdftext/fpdf_text.cpp index 3871d25177..4653fa63fa 100644 --- a/core/src/fpdftext/fpdf_text.cpp +++ b/core/src/fpdftext/fpdf_text.cpp @@ -14,8 +14,8 @@ #include "core/include/fpdftext/fpdf_text.h" #include "core/include/fxcrt/fx_bidi.h" #include "core/include/fxcrt/fx_ucd.h" -#include "text_int.h" -#include "txtproc.h" +#include "core/src/fpdftext/text_int.h" +#include "core/src/fpdftext/txtproc.h" CFX_ByteString CharFromUnicodeAlt(FX_WCHAR unicode, int destcp, @@ -785,5 +785,5 @@ void PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer, options.m_bTextOnly = TRUE; options.m_bSeparateForm = FALSE; page.ParseContent(&options); - GetTextStream_Unicode(buffer, &page, TRUE, NULL); + GetTextStream_Unicode(buffer, &page, TRUE); } |