X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpdf%2FInfoOutputDev.cc;h=a20eac236957a59bd47804fab48bccb79de98331;hb=0ac72a559b20eaae037928bca1e26ae10b067101;hp=627ab0a186f412607cd9fbf1e5a6e827a4bda886;hpb=bc72a7c813526292dcd439b9a3c008080c08fbdc;p=swftools.git diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc index 627ab0a..a20eac2 100644 --- a/lib/pdf/InfoOutputDev.cc +++ b/lib/pdf/InfoOutputDev.cc @@ -20,7 +20,8 @@ InfoOutputDev::InfoOutputDev(XRef*xref) { num_links = 0; - num_images = 0; + num_jpeg_images = 0; + num_ppm_images = 0; num_fonts = 0; num_polygons= 0; fonts = 0; @@ -205,7 +206,7 @@ gfxfont_t* InfoOutputDev::createGfxFont(GfxFont*xpdffont, FontInfo*src) } } - msg(" %d glyphs.", t, font->num_glyphs); + //msg(" %d glyphs.", t, font->num_glyphs); return font; } @@ -409,14 +410,16 @@ void InfoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool inlineImg) { - num_images++; + if(str->getKind()==strDCT) num_jpeg_images++; else num_ppm_images++; + OutputDev::drawImageMask(state,ref,str,width,height,invert,inlineImg); } void InfoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, int *maskColors, GBool inlineImg) { - num_images++; + if(str->getKind()==strDCT) num_jpeg_images++; else num_ppm_images++; + OutputDev::drawImage(state,ref,str,width,height,colorMap,maskColors,inlineImg); } void InfoOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, @@ -426,6 +429,8 @@ void InfoOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, int maskWidth, int maskHeight, GBool maskInvert) { + if(str->getKind()==strDCT) num_jpeg_images++; else num_ppm_images++; + OutputDev::drawMaskedImage(state,ref,str,width,height,colorMap,maskStr,maskWidth,maskHeight,maskInvert); } @@ -436,5 +441,7 @@ void InfoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *st int maskWidth, int maskHeight, GfxImageColorMap *maskColorMap) { + if(str->getKind()==strDCT) num_jpeg_images++; else num_ppm_images++; + OutputDev::drawSoftMaskedImage(state,ref,str,width,height,colorMap,maskStr,maskWidth,maskHeight,maskColorMap); }