diff options
author | Lei Zhang <thestig@chromium.org> | 2015-11-05 18:39:40 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-11-05 18:39:40 -0800 |
commit | 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c (patch) | |
tree | 422e979cbfdeab9781c07a4040aee94a9dd0a7f6 /core/src/fpdftext | |
parent | ba2d95fb6d7b6eb3b27ca8e6eb41d9aae1a8b691 (diff) | |
download | pdfium-34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c.tar.xz |
Fix all relative includes to third_party.chromium/2560chromium/2559chromium/2558chromium/2557
- In non-standalone builds, use the provided jpeg library.
- Run gn format over all the GN files.
- Also roll DEPS for buildtools to c2f2598.
BUG=541704
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1425153006 .
Diffstat (limited to 'core/src/fpdftext')
-rw-r--r-- | core/src/fpdftext/fpdf_text.cpp | 2 | ||||
-rw-r--r-- | core/src/fpdftext/fpdf_text_int.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fpdftext/fpdf_text.cpp b/core/src/fpdftext/fpdf_text.cpp index 9ecbc21bda..d5ea24f25c 100644 --- a/core/src/fpdftext/fpdf_text.cpp +++ b/core/src/fpdftext/fpdf_text.cpp @@ -4,7 +4,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../../include/fpdfapi/fpdf_page.h" #include "../../include/fpdfapi/fpdf_pageobj.h" #include "../../include/fpdfapi/fpdf_resource.h" @@ -12,6 +11,7 @@ #include "../../include/fxcrt/fx_bidi.h" #include "../../include/fxcrt/fx_ucd.h" #include "text_int.h" +#include "third_party/base/nonstd_unique_ptr.h" #include "txtproc.h" CFX_ByteString CharFromUnicodeAlt(FX_WCHAR unicode, diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index 9ab09e19e4..1b25993f37 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -7,7 +7,6 @@ #include <ctype.h> #include <algorithm> -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../../include/fpdfapi/fpdf_module.h" #include "../../include/fpdfapi/fpdf_page.h" #include "../../include/fpdfapi/fpdf_pageobj.h" @@ -16,6 +15,7 @@ #include "../../include/fxcrt/fx_bidi.h" #include "../../include/fxcrt/fx_ucd.h" #include "text_int.h" +#include "third_party/base/nonstd_unique_ptr.h" namespace { |