X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpdf%2FInfoOutputDev.h;h=93451f88465a213852d5c1784267af1d7ff83981;hb=7c45653cc0504bc02a837a2e8050ca8f42705b09;hp=532e2edc6bb9a600c0980247571bf8409ae63b5e;hpb=5f1e7e9ebbac00effaae0545c32fe9060215d125;p=swftools.git

diff --git a/lib/pdf/InfoOutputDev.h b/lib/pdf/InfoOutputDev.h
index 532e2ed..93451f8 100644
--- a/lib/pdf/InfoOutputDev.h
+++ b/lib/pdf/InfoOutputDev.h
@@ -21,19 +21,23 @@
 #ifndef __infooutputdev_h__
 #define __infooutputdev_h__
 
+#include "popplercompat.h"
 #include "GfxFont.h"
 #include "OutputDev.h"
 #include "SplashOutputDev.h"
+#include "Page.h"
+
 #ifdef HAVE_POPPLER
-#include <splash/SplashTypes.h>
-#include <splash/SplashPath.h>
-#include <splash/SplashFont.h>
-#include <splash/SplashFontFile.h>
+  #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"
+  #include "xpdf/config.h"
+  #include "SplashTypes.h"
+  #include "SplashPath.h"
+  #include "SplashFont.h"
+  #include "SplashFontFile.h"
 #endif
 
 #ifdef HAVE_POPPLER
@@ -44,8 +48,10 @@
 #include "../gfxdevice.h"
 #include "../gfxtools.h"
 #include "../gfxfont.h"
+#include "../q.h"
 
 #define INTERNAL_FONT_SIZE 1024.0
+#define GLYPH_IS_SPACE(g) ((!(g)->line || ((g)->line->type==gfx_moveTo && !(g)->line->next)) && (g)->advance)
 
 struct GlyphInfo
 {
@@ -58,26 +64,35 @@ struct GlyphInfo
     double advance_max;
 };
 
-struct FontInfo
+class FontInfo
 {
-    FontInfo();
+    gfxfont_t*gfxfont;
+
+    char*id;
+public:
+    FontInfo(char*id);
     ~FontInfo();
 
+    gfxfont_t* getGfxFont();
+
     double lastx,lasty;
     int lastchar;
+    int lastadvance;
 
     double ascender,descender;
 
     void grow(int size);
 
-    gfxfont_t*gfxfont;
     GfxFont*font;
     double max_size;
     int num_glyphs;
     GlyphInfo**glyphs;
-    int*charid2glyph;
+    dict_t**kerning;
+
     SplashFont*splash_font;
     char seen;
+    int space_char;
+    float average_advance;
 };
 
 extern char*getFontID(GfxFont*font);
@@ -88,8 +103,7 @@ class InfoOutputDev: public OutputDev
     FontInfo* currentfont;
     GlyphInfo* currentglyph;
     SplashOutputDev*splash;
-
-    gfxfont_t* createGfxFont(GfxFont*xpdffont, FontInfo*src);
+    Page *page;
 
     public:
     int x1,y1,x2,y2;
@@ -100,7 +114,7 @@ class InfoOutputDev: public OutputDev
     int num_polygons;
     int num_textfields;
 
-    gfxfontlist_t*fonts;
+    void dumpfonts(gfxdevice_t*dev);
 
     InfoOutputDev(XRef*xref);
     virtual ~InfoOutputDev(); 
@@ -108,11 +122,20 @@ class InfoOutputDev: public OutputDev
     virtual GBool upsideDown();
     virtual GBool useDrawChar();
     virtual GBool interpretType3Chars();
-    virtual void startPage(int pageNum, GfxState *state, double crop_x1, double crop_y1, double crop_x2, double crop_y2);
+    virtual GBool 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) = NULL,
+			       void *abortCheckCbkData = NULL);
+    virtual void startPage(int pageNum, GfxState *state);
     virtual void endPage();
     virtual void drawLink(Link *link, Catalog *catalog);
     virtual double getMaximumFontSize(char*id);
     virtual void updateFont(GfxState *state);
+  
+    virtual void saveState(GfxState *state);
+    virtual void restoreState(GfxState *state);
 
     virtual GBool beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen);
     virtual void type3D0(GfxState *state, double wx, double wy);
@@ -126,24 +149,32 @@ class InfoOutputDev: public OutputDev
 			  double dx, double dy,
 			  double originX, double originY,
 			  CharCode code, int nBytes, Unicode *u, int uLen);
+
     virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
 			       int width, int height, GBool invert,
+			       POPPLER_INTERPOLATE
 			       GBool inlineImg);
     virtual void drawImage(GfxState *state, Object *ref, Stream *str,
 			   int width, int height, GfxImageColorMap *colorMap,
+			   POPPLER_INTERPOLATE
 			   int *maskColors, GBool inlineImg);
     virtual void 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);
     virtual void 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);
+
     virtual FontInfo* getFont(char*id);
 };