diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-10-30 15:51:13 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-10-30 15:51:13 -0700 |
commit | ba9d4655ca39c3a4620acb8e6252defb87a758ad (patch) | |
tree | 01e40f507e62e37c93d2ed5d8bab4a794caf9aab /pdfium.gyp | |
parent | 80e039bfc4108591c9783ab531b916ab98a8414c (diff) | |
download | pdfium-ba9d4655ca39c3a4620acb8e6252defb87a758ad.tar.xz |
Merge to XFA: Remove external jpeg provider interface.
(cherry picked from commit 3d59bd9d66d01eb39c30742bce67fa0376cb4ea8)
Review URL: https://codereview.chromium.org/1407903005 .
Conflicts:
core/include/fxcodec/fx_codec_provider.h
core/src/fxcodec/codec/codec_int.h
core/src/fxcodec/codec/fx_codec_jpeg.cpp
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1412713009 .
Diffstat (limited to 'pdfium.gyp')
-rw-r--r-- | pdfium.gyp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/pdfium.gyp b/pdfium.gyp index 10f0cffda5..48ed36de42 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -332,7 +332,6 @@ 'core/include/fxcodec/fx_codec.h', 'core/include/fxcodec/fx_codec_def.h', 'core/include/fxcodec/fx_codec_flate.h', - 'core/include/fxcodec/fx_codec_provider.h', 'core/src/fxcodec/codec/codec_int.h', 'core/src/fxcodec/codec/fx_codec.cpp', 'core/src/fxcodec/codec/fx_codec_bmp.cpp', |