diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-06-19 13:56:28 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-06-19 13:56:28 -0700 |
commit | c49828916f5b0766f8d6f0fd5bf0a6cc5bd3c1ec (patch) | |
tree | c8305ef66d7ecad9cad2c1054c71da53bd8e89a6 /core/src/fpdfapi | |
parent | 6f93de501d591a6c2980d38a1ff0a6b5e434b80a (diff) | |
download | pdfium-c49828916f5b0766f8d6f0fd5bf0a6cc5bd3c1ec.tar.xz |
Merge to XF: Disintermediation.
(cherry picked from commit 012ada613a1462f109eb59790f8e5ee91aacdb7e)
Review URL: https://codereview.chromium.org/1199553002.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1197893002.
Diffstat (limited to 'core/src/fpdfapi')
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp index ead5e2474a..ac48dc6c65 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../../../third_party/zlib_v128/zlib.h" #include "../../../include/fpdfapi/fpdf_parser.h" #include "../../../include/fxcodec/fx_codec.h" #include "../../../include/fpdfapi/fpdf_module.h" -#include "../../fxcodec/fx_zlib/include/fx_zlib.h" #include "filters_int.h" CFX_DataFilter::CFX_DataFilter() |