poppler/DCTStream.h | 1 - poppler/Stream.h | 1 - utils/HtmlOutputDev.cc | 7 ++----- utils/ImageOutputDev.cc | 9 +++------ 4 files changed, 5 insertions(+), 13 deletions(-)
New commits: commit baf54c2876edd476ffc68da6518598847bb7ec8a Author: Albert Astals Cid <[email protected]> Date: Mon Sep 26 15:54:46 2011 +0200 Remove getRawStream Since it does exactly the same as getNextStream diff --git a/poppler/DCTStream.h b/poppler/DCTStream.h index 8f1fc85..ad864ca 100644 --- a/poppler/DCTStream.h +++ b/poppler/DCTStream.h @@ -68,7 +68,6 @@ public: virtual int lookChar(); virtual GooString *getPSFilter(int psLevel, char *indent); virtual GBool isBinary(GBool last = gTrue); - Stream *getRawStream() { return str; } private: void init(); diff --git a/poppler/Stream.h b/poppler/Stream.h index 4f2a08b..cb08e3a 100644 --- a/poppler/Stream.h +++ b/poppler/Stream.h @@ -841,7 +841,6 @@ public: virtual int lookChar(); virtual GooString *getPSFilter(int psLevel, char *indent); virtual GBool isBinary(GBool last = gTrue); - Stream *getRawStream() { return str; } virtual void unfilteredReset(); diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc index 615cf5f..43e4ec4 100644 --- a/utils/HtmlOutputDev.cc +++ b/utils/HtmlOutputDev.cc @@ -57,9 +57,6 @@ #include "Page.h" #include "Annot.h" #include "PNGWriter.h" -#ifdef ENABLE_LIBJPEG -#include "DCTStream.h" -#endif #include "GlobalParams.h" #include "HtmlOutputDev.h" #include "HtmlFonts.h" @@ -1266,7 +1263,7 @@ void HtmlOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, } // initialize stream - str = ((DCTStream *)str)->getRawStream(); + str = str->getNextStream(); str->reset(); // copy the stream @@ -1318,7 +1315,7 @@ void HtmlOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, } // initialize stream - str = ((DCTStream *)str)->getRawStream(); + str = str->getNextStream(); str->reset(); // copy the stream diff --git a/utils/ImageOutputDev.cc b/utils/ImageOutputDev.cc index 88305a1..3f490d9 100644 --- a/utils/ImageOutputDev.cc +++ b/utils/ImageOutputDev.cc @@ -13,7 +13,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2005, 2007 Albert Astals Cid <[email protected]> +// Copyright (C) 2005, 2007, 2011 Albert Astals Cid <[email protected]> // Copyright (C) 2006 Rainer Keller <[email protected]> // Copyright (C) 2008 Timothy Lee <[email protected]> // Copyright (C) 2008 Vasile Gaburici <[email protected]> @@ -42,9 +42,6 @@ #include "GfxState.h" #include "Object.h" #include "Stream.h" -#ifdef ENABLE_LIBJPEG -#include "DCTStream.h" -#endif #include "ImageOutputDev.h" ImageOutputDev::ImageOutputDev(char *fileRootA, GBool pageNamesA, GBool dumpJPEGA) { @@ -89,7 +86,7 @@ void ImageOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, } // initialize stream - str = ((DCTStream *)str)->getRawStream(); + str = str->getNextStream(); str->reset(); // copy the stream @@ -156,7 +153,7 @@ void ImageOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, } // initialize stream - str = ((DCTStream *)str)->getRawStream(); + str = str->getNextStream(); str->reset(); // copy the stream _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
