-#include "config.h"
+#include "../../config.h"
#include "Object.h"
#include "InfoOutputDev.h"
#include "SplashOutputDev.h"
-#ifdef HAVE_POPPLER
-#include <splash/SplashTypes.h>
-#include <splash/SplashPath.h>
-#include <splash/SplashFont.h>
-#include <splash/SplashFontFile.h>
-#else
-#include "SplashTypes.h"
-#include "SplashPath.h"
-#include "SplashFont.h"
-#include "SplashFontFile.h"
-#endif
#include "GfxState.h"
#include "../log.h"
#include "../types.h"
for(t=0;t<font->num_glyphs;t++) {
gfxglyph_t*g = &font->glyphs[t];
if(GLYPH_IS_SPACE(g)) {
- if(g->unicode == 32) return t;
+ if(g->unicode == 32) {
+ /* now that we have found a space char, make sure it's unique */
+ int s;
+ for(s=0;s<font->num_glyphs;s++) {
+ if(s!=t && font->glyphs[s].unicode==32)
+ font->glyphs[s].unicode=0;
+ }
+ return t;
+ }
}
}
return -1;
GBool InfoOutputDev::interpretType3Chars() {return gTrue;}
GBool InfoOutputDev::useTilingPatternFill() {return gTrue;}
-void InfoOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, double crop_y1, double crop_x2, double crop_y2)
+GBool InfoOutputDev::checkPageSlice(Page *page, double hDPI, double vDPI,
+ int rotate, GBool useMediaBox, GBool crop,
+ int sliceX, int sliceY, int sliceW, int sliceH,
+ GBool printing, Catalog *catalog,
+ GBool (*abortCheckCbk)(void *data),
+ void *abortCheckCbkData)
+{
+ this->page = page;
+ return gTrue;
+}
+
+void InfoOutputDev::startPage(int pageNum, GfxState *state)
{
+ PDFRectangle *r = this->page->getCropBox();
double x1,y1,x2,y2;
- state->transform(crop_x1,crop_y1,&x1,&y1);
- state->transform(crop_x2,crop_y2,&x2,&y2);
+ state->transform(r->x1,r->y1,&x1,&y1);
+ state->transform(r->x2,r->y2,&x2,&y2);
if(x2<x1) {double x3=x1;x1=x2;x2=x3;}
if(y2<y1) {double y3=y1;y1=y2;y2=y3;}
this->x1 = (int)x1;
currentglyph->path->lineTo(x1,y2);
currentglyph->path->close();
}
+
+void InfoOutputDev::saveState(GfxState *state)
+{
+ updateAll(state);
+}
+
+void InfoOutputDev::restoreState(GfxState *state)
+{
+ updateAll(state);
+}
void InfoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
int width, int height, GBool invert,
+ POPPLER_INTERPOLATE
GBool inlineImg)
{
if(str->getKind()==strDCT) num_jpeg_images++; else num_ppm_images++;
- OutputDev::drawImageMask(state,ref,str,width,height,invert,inlineImg);
+ OutputDev::drawImageMask(state,ref,str,width,height,invert, POPPLER_INTERPOLATE_ARG inlineImg);
}
void InfoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
int width, int height, GfxImageColorMap *colorMap,
+ POPPLER_INTERPOLATE
int *maskColors, GBool inlineImg)
{
if(str->getKind()==strDCT) num_jpeg_images++; else num_ppm_images++;
- OutputDev::drawImage(state,ref,str,width,height,colorMap,maskColors,inlineImg);
+ OutputDev::drawImage(state,ref,str,width,height,colorMap, POPPLER_INTERPOLATE_ARG maskColors,inlineImg);
}
void InfoOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
GfxImageColorMap *colorMap,
+ POPPLER_INTERPOLATE
Stream *maskStr,
int maskWidth, int maskHeight,
- GBool maskInvert)
+ GBool maskInvert
+ POPPLER_MASK_INTERPOLATE)
{
if(str->getKind()==strDCT) num_jpeg_images++; else num_ppm_images++;
- OutputDev::drawMaskedImage(state,ref,str,width,height,colorMap,maskStr,maskWidth,maskHeight,maskInvert);
+ OutputDev::drawMaskedImage(state,ref,str,width,height,colorMap, POPPLER_INTERPOLATE_ARG maskStr,maskWidth,maskHeight,maskInvert POPPLER_MASK_INTERPOLATE_ARG);
}
void InfoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
int width, int height,
GfxImageColorMap *colorMap,
+ POPPLER_INTERPOLATE
Stream *maskStr,
int maskWidth, int maskHeight,
- GfxImageColorMap *maskColorMap)
+ GfxImageColorMap *maskColorMap
+ POPPLER_MASK_INTERPOLATE)
{
if(str->getKind()==strDCT) num_jpeg_images++; else num_ppm_images++;
- OutputDev::drawSoftMaskedImage(state,ref,str,width,height,colorMap,maskStr,maskWidth,maskHeight,maskColorMap);
+ OutputDev::drawSoftMaskedImage(state,ref,str,width,height,colorMap, POPPLER_INTERPOLATE_ARG maskStr,maskWidth,maskHeight,maskColorMap POPPLER_MASK_INTERPOLATE_ARG);
}
void InfoOutputDev::dumpfonts(gfxdevice_t*dev)