diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-03-19 12:51:04 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-03-19 12:51:04 -0700 |
commit | d1f792ac1ba25494b44e664d4a427127299d05e6 (patch) | |
tree | 0cdfa5e28c1c7df416b1cd531f9a4450668f5a91 /core/src/fxcodec/codec/codec_int.h | |
parent | 74b81d9ff8b4c4c5306b8c4611ee780ea0628c52 (diff) | |
download | pdfium-d1f792ac1ba25494b44e664d4a427127299d05e6.tar.xz |
Fix subtle issues in opj_skip_from_memory and add unit tests.
Follow on to https://codereview.chromium.org/990683002/.
This more closely mimics what fseek() actually does, so as
to avoid subtle bugs down the road.
Move the DecodeData struct into a header so the test can
use it, and provide a constructor for it.
Along the way, I added include guards, removed the p_
prefix from some non-pointer vars, fixed some IWYU, and
resolved some signed/unsigned comparison warnings with
careful casting.
BUG=452671
R=jun_fang@foxitsoftware.com, thestig@chromium.org
Review URL: https://codereview.chromium.org/1016203002
Diffstat (limited to 'core/src/fxcodec/codec/codec_int.h')
-rw-r--r-- | core/src/fxcodec/codec/codec_int.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h index b95871b4e1..d79f7ceaf1 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -4,9 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#ifndef CORE_SRC_FXCODEC_CODEC_CODEC_INT_H_ +#define CORE_SRC_FXCODEC_CODEC_CODEC_INT_H_ + #include <limits.h> #include <list> + +#include "../../../include/fxcodec/fx_codec.h" #include "../jbig2/JBig2_Context.h" +#include "../fx_libopenjpeg/libopenjpeg20/openjpeg.h" // For OPJ_SIZE_T. + class CCodec_BasicModule : public ICodec_BasicModule { public: @@ -272,3 +279,21 @@ public: std::list<CJBig2_CachePair> m_SymbolDictCache; private: }; + +struct DecodeData { +public: + DecodeData(unsigned char* src_data, OPJ_SIZE_T src_size) : + src_data(src_data), src_size(src_size), offset(0) { + } + unsigned char* src_data; + OPJ_SIZE_T src_size; + OPJ_SIZE_T offset; +}; + +/* Wrappers for C-style callbacks. */ +OPJ_SIZE_T opj_read_from_memory (void* p_buffer, OPJ_SIZE_T nb_bytes, void* p_user_data); +OPJ_SIZE_T opj_write_from_memory (void* p_buffer, OPJ_SIZE_T nb_bytes, void* p_user_data); +OPJ_OFF_T opj_skip_from_memory (OPJ_OFF_T nb_bytes, void* p_user_data); +OPJ_BOOL opj_seek_from_memory (OPJ_OFF_T nb_bytes, void* p_user_data); + +#endif // CORE_SRC_FXCODEC_CODEC_CODEC_INT_H_ |