diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-04 15:32:02 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-04 15:32:02 -0800 |
| commit | 8fec3e42ed57a988ad5e7faae5e6a83847a3267e (patch) | |
| tree | 3ef518c1976775211bbdd2d3feb5c77565565d44 /third_party/agg23 | |
| parent | 67169d36072caf571e165a903570088357577918 (diff) | |
| download | pdfium-8fec3e42ed57a988ad5e7faae5e6a83847a3267e.tar.xz | |
Merge to XFA: Make checkdeps --resolve-dotdot succeed.
This is just a straight-forward, partial merge. It does not
actually make checkdeps succeed.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1419373005 .
(cherry picked from commit 79f5a32175293620abe456554e10efb7c3f4e7c6)
Review URL: https://codereview.chromium.org/1409153007 .
Diffstat (limited to 'third_party/agg23')
| -rw-r--r-- | third_party/agg23/agg_rasterizer_scanline_aa.cpp | 1 | ||||
| -rw-r--r-- | third_party/agg23/agg_rasterizer_scanline_aa.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/agg23/agg_rasterizer_scanline_aa.cpp b/third_party/agg23/agg_rasterizer_scanline_aa.cpp index 8216e60221..46379f6dfd 100644 --- a/third_party/agg23/agg_rasterizer_scanline_aa.cpp +++ b/third_party/agg23/agg_rasterizer_scanline_aa.cpp @@ -46,7 +46,6 @@ // All other code is very different from the original. // //---------------------------------------------------------------------------- -#include "../../core/include/fxcrt/fx_ext.h" #include <limits.h> #include "agg_rasterizer_scanline_aa.h" namespace agg diff --git a/third_party/agg23/agg_rasterizer_scanline_aa.h b/third_party/agg23/agg_rasterizer_scanline_aa.h index da1900d0dd..af31e0f2af 100644 --- a/third_party/agg23/agg_rasterizer_scanline_aa.h +++ b/third_party/agg23/agg_rasterizer_scanline_aa.h @@ -29,7 +29,8 @@ //---------------------------------------------------------------------------- #ifndef AGG_RASTERIZER_SCANLINE_AA_INCLUDED #define AGG_RASTERIZER_SCANLINE_AA_INCLUDED -#include "../../core/include/fxge/fx_ge.h" +#include "../../core/include/fxcrt/fx_coordinates.h" +#include "../../core/include/fxcrt/fx_memory.h" #include "agg_basics.h" #include "agg_math.h" #include "agg_array.h" |