diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-04 19:05:21 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-04 19:05:21 -0700 |
| commit | 6675a80c6afe3652b7bd918b80a16a8effb51b8f (patch) | |
| tree | 869efaae9312c11bb8f2fb7c707690a3fa468708 /core/src/fxcodec | |
| parent | 76510e4127dc938d121ac5026000f3b0d84a2d46 (diff) | |
| download | pdfium-6675a80c6afe3652b7bd918b80a16a8effb51b8f.tar.xz | |
Merge to XFA: Move fx_safe_types.h to include/ directory.
Original Review URL: https://codereview.chromium.org/1147353006
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1152693005
Diffstat (limited to 'core/src/fxcodec')
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpeg.cpp | 3 | ||||
| -rw-r--r-- | core/src/fxcodec/jbig2/JBig2_Image.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index 4ca0219d6f..903d2319fd 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -5,9 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../../include/fxcodec/fx_codec.h" +#include "../../../include/fxcrt/fx_safe_types.h" #include "../../../include/fxge/fx_dib.h" -#include "../../../src/fxcrt/fx_safe_types.h" #include "codec_int.h" + extern "C" { static void _JpegScanSOI(const FX_BYTE*& src_buf, FX_DWORD& src_size) { diff --git a/core/src/fxcodec/jbig2/JBig2_Image.cpp b/core/src/fxcodec/jbig2/JBig2_Image.cpp index 8e27bca80c..f2cea597c1 100644 --- a/core/src/fxcodec/jbig2/JBig2_Image.cpp +++ b/core/src/fxcodec/jbig2/JBig2_Image.cpp @@ -5,9 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include <limits.h> + #include "../../../include/fxcrt/fx_basic.h" #include "../../../include/fxcrt/fx_coordinates.h" -#include "../../../src/fxcrt/fx_safe_types.h" +#include "../../../include/fxcrt/fx_safe_types.h" #include "JBig2_Image.h" CJBig2_Image::CJBig2_Image(FX_INT32 w, FX_INT32 h) |