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/fpdfapi/fpdf_render | |
| 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/fpdfapi/fpdf_render')
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 2 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/render_int.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index 6af3ab4ce6..ea8ceee9d3 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -6,7 +6,6 @@ #include <vector> -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fpdfapi/fpdf_module.h" #include "../../../include/fpdfapi/fpdf_pageobj.h" #include "../../../include/fpdfapi/fpdf_render.h" @@ -15,6 +14,7 @@ #include "../../../include/fxge/fx_ge.h" #include "../fpdf_page/pageint.h" #include "render_int.h" +#include "third_party/base/nonstd_unique_ptr.h" namespace { diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h index c97cb7105d..a0eda2858e 100644 --- a/core/src/fpdfapi/fpdf_render/render_int.h +++ b/core/src/fpdfapi/fpdf_render/render_int.h @@ -9,8 +9,8 @@ #include <map> -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fpdfapi/fpdf_pageobj.h" +#include "third_party/base/nonstd_unique_ptr.h" class CFX_GlyphBitmap; class CPDF_QuickStretcher; |