git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added class members, expression lefthands
[swftools.git]
/
lib
/
pdf
/
InfoOutputDev.h
diff --git
a/lib/pdf/InfoOutputDev.h
b/lib/pdf/InfoOutputDev.h
index
13ba1e4
..
07b2b67
100644
(file)
--- a/
lib/pdf/InfoOutputDev.h
+++ b/
lib/pdf/InfoOutputDev.h
@@
-23,24
+23,46
@@
#include "GfxFont.h"
#include "OutputDev.h"
#include "GfxFont.h"
#include "OutputDev.h"
-#include "SplashFont.h"
#include "SplashOutputDev.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 "SplashPath.h"
+#include "SplashFont.h"
#include "SplashFontFile.h"
#include "SplashFontFile.h"
+#endif
+
+#ifdef HAVE_POPPLER
+#include <goo/GooHash.h>
+#else
#include "GHash.h"
#include "GHash.h"
+#endif
struct GlyphInfo
{
SplashPath*path;
int unicode;
int glyphid;
struct GlyphInfo
{
SplashPath*path;
int unicode;
int glyphid;
+ double advance;
double x1,y1,x2,y2;
double x1,y1,x2,y2;
+
+ double advance_max;
};
struct FontInfo
{
FontInfo();
~FontInfo();
};
struct FontInfo
{
FontInfo();
~FontInfo();
+
+ double lastx,lasty;
+ int lastchar;
+
+ double ascender,descender;
+
void grow(int size);
GfxFont*font;
void grow(int size);
GfxFont*font;