diff options
Diffstat (limited to 'poppler')
| -rw-r--r-- | poppler/Makefile.am | 19 | ||||
| -rw-r--r-- | poppler/TextOutputDev.h | 7 |
2 files changed, 13 insertions, 13 deletions
diff --git a/poppler/Makefile.am b/poppler/Makefile.am index de1c691f..abb0dd24 100644 --- a/poppler/Makefile.am +++ b/poppler/Makefile.am @@ -34,19 +34,16 @@ endif if BUILD_CAIRO_OUTPUT -cairo_sources = \ - CairoFontEngine.cc \ - CairoOutputDev.cc - -cairo_headers = \ - CairoFontEngine.h \ - CairoOutputDev.h +poppler_cairo = libpoppler-cairo.la cairo_includes = \ $(CAIRO_CFLAGS) -cairo_libs = \ - $(CAIRO_LIBS) +libpoppler_cairo_la_SOURCES = \ + CairoFontEngine.cc \ + CairoFontEngine.h \ + CairoOutputDev.cc \ + CairoOutputDev.h endif @@ -82,11 +79,12 @@ INCLUDES = \ lib_LTLIBRARIES = libpoppler.la +noinst_LTLIBRARIES = $(poppler_cairo) + libpoppler_la_LIBADD = \ $(top_builddir)/goo/libgoo.la \ $(top_builddir)/fofi/libfofi.la \ $(splash_libs) \ - $(cairo_libs) \ $(arthur_libs) \ $(libjpeg_libs) \ $(zlib_libs) \ @@ -99,7 +97,6 @@ if ENABLE_XPDF_HEADERS poppler_includedir = $(includedir)/poppler poppler_include_HEADERS = \ $(splash_headers) \ - $(cairo_headers) \ $(arthur_headers) \ Annot.h \ Array.h \ diff --git a/poppler/TextOutputDev.h b/poppler/TextOutputDev.h index ba9146fa..fd052df8 100644 --- a/poppler/TextOutputDev.h +++ b/poppler/TextOutputDev.h @@ -101,7 +101,7 @@ public: #if TEXTOUT_WORD_LIST int getLength() { return len; } - Unicode getChar(int idx) { return text[idx]; } + const Unicode *getChar(int idx) { return &text[idx]; } GooString *getText(); GooString *getFontName() { return font->fontName; } void getColor(double *r, double *g, double *b) @@ -113,7 +113,10 @@ public: int getCharPos() { return charPos; } int getCharLen() { return charLen; } #endif - + double getEdge(int i) { return edge[i]; } + double getBaseline () { return base; } + GBool hasSpaceAfter () { return spaceAfter; } + TextWord* nextWord () { return next; }; private: int rot; // rotation, multiple of 90 degrees |