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;
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,
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);
}
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);
}
i->pages[t-1].yMax = i->info->y2;
i->pages[t-1].width = i->info->x2 - i->info->x1;
i->pages[t-1].height = i->info->y2 - i->info->y1;
- i->pages[t-1].number_of_images = i->info->num_images;
+ i->pages[t-1].number_of_images = i->info->num_ppm_images + i->info->num_jpeg_images;
i->pages[t-1].number_of_links = i->info->num_links;
i->pages[t-1].number_of_fonts = i->info->num_fonts;
i->pages[t-1].has_info = 1;