poppler/DCTStream.cc | 6 +++--- poppler/DCTStream.h | 2 +- poppler/Stream.cc | 4 ++-- poppler/Stream.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 73ff5ad58cfe7ec9415cc1459b6ca083fee608f4 Author: Albert Astals Cid <[email protected]> Date: Sat Apr 6 18:19:28 2013 +0200 Pass the recursion flag diff --git a/poppler/DCTStream.cc b/poppler/DCTStream.cc index d2dbba1..bfdb0ea 100644 --- a/poppler/DCTStream.cc +++ b/poppler/DCTStream.cc @@ -60,16 +60,16 @@ static void str_term_source(j_decompress_ptr cinfo) { } -DCTStream::DCTStream(Stream *strA, int colorXformA, Object *dict) : +DCTStream::DCTStream(Stream *strA, int colorXformA, Object *dict, int recursion) : FilterStream(strA) { colorXform = colorXformA; if (dict != NULL) { Object obj; - dict->dictLookup("Width", &obj); + dict->dictLookup("Width", &obj, recursion); err.width = (obj.isInt() && obj.getInt() <= JPEG_MAX_DIMENSION) ? obj.getInt() : 0; obj.free(); - dict->dictLookup("Height", &obj); + dict->dictLookup("Height", &obj, recursion); err.height = (obj.isInt() && obj.getInt() <= JPEG_MAX_DIMENSION) ? obj.getInt() : 0; obj.free(); } else diff --git a/poppler/DCTStream.h b/poppler/DCTStream.h index 7a566ce..bc20a7a 100644 --- a/poppler/DCTStream.h +++ b/poppler/DCTStream.h @@ -64,7 +64,7 @@ struct str_error_mgr { class DCTStream: public FilterStream { public: - DCTStream(Stream *strA, int colorXformA, Object *dict); + DCTStream(Stream *strA, int colorXformA, Object *dict, int recursion); virtual ~DCTStream(); virtual StreamKind getKind() { return strDCT; } virtual void reset(); diff --git a/poppler/Stream.cc b/poppler/Stream.cc index d5d26ec..5053344 100644 --- a/poppler/Stream.cc +++ b/poppler/Stream.cc @@ -309,7 +309,7 @@ Stream *Stream::makeFilter(char *name, Stream *str, Object *params, int recursio } obj.free(); } - str = new DCTStream(str, colorXform, dict); + str = new DCTStream(str, colorXform, dict, recursion); } else if (!strcmp(name, "FlateDecode") || !strcmp(name, "Fl")) { pred = 1; columns = 1; @@ -2416,7 +2416,7 @@ static const int dctZigZag[64] = { 63 }; -DCTStream::DCTStream(Stream *strA, int colorXformA, Object *dict): +DCTStream::DCTStream(Stream *strA, int colorXformA, Object *dict, int recursion): FilterStream(strA) { int i, j; diff --git a/poppler/Stream.h b/poppler/Stream.h index 5347d66..d0d6ea8 100644 --- a/poppler/Stream.h +++ b/poppler/Stream.h @@ -862,7 +862,7 @@ struct DCTHuffTable { class DCTStream: public FilterStream { public: - DCTStream(Stream *strA, int colorXformA, Object *dict); + DCTStream(Stream *strA, int colorXformA, Object *dict, int recursion); virtual ~DCTStream(); virtual StreamKind getKind() { return strDCT; } virtual void reset(); _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
