From 50ecfadab36a9769b09e4c2c1670d86448a0e1ee Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Tue, 28 Feb 2006 23:24:59 +0000 Subject: 2006-02-28 Kristian Høgsberg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * configure.ac: Bump release to 0.5.1. * NEWS: Sum up 0.5.1 changes so far. * TextOutputDev.h: add getters for a couple of attributes. * glib/Makefile.am: * poppler/Makefile.am: Move cairo link dependency to glib bindings. --- ChangeLog | 11 +++++++++++ NEWS | 10 ++++++++++ configure.ac | 2 +- glib/Makefile.am | 11 ++++++----- poppler/Makefile.am | 19 ++++++++----------- poppler/TextOutputDev.h | 7 +++++-- qt/Makefile.am | 1 + test/Makefile.am | 16 +++++++++------- utils/Makefile.am | 29 +++++++++++++++++------------ 9 files changed, 68 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa34d0f6..13fe6caa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-02-28 Kristian Høgsberg + + * configure.ac: Bump release to 0.5.1. + + * NEWS: Sum up 0.5.1 changes so far. + + * TextOutputDev.h: add getters for a couple of attributes. + + * glib/Makefile.am: + * poppler/Makefile.am: Move cairo link dependency to glib bindings. + 2006-02-28 Kristian Høgsberg * goo/gmem.c: (gmalloc), (grealloc): diff --git a/NEWS b/NEWS index 7132586f..065c644d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,13 @@ +Release 0.5.1 + + - Support for embedded files. + - Handle 0-width lines correctly. + - Avoid external file use when opening fonts. + - Only use vector fonts returned from fontconfig (#5758). + - Fix scaled 1x1 pixmaps use for drawing lines (#3387). + - drawSoftMaskedImage support in cairo backend. + - Misc bug fixes: #5922, #5946, #5749, #5952, #4030, #5420. + Release 0.5.0 - Font matching code for non embedded fonts now use fontconfig diff --git a/configure.ac b/configure.ac index deb1703b..0686a531 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT(poppler, 0.5.0) +AC_INIT(poppler, 0.5.1) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(poppler/poppler-config.h) diff --git a/glib/Makefile.am b/glib/Makefile.am index 443d48b4..b4113209 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -8,7 +8,7 @@ cairo_libs = \ endif -SUBDIRS=. reference +SUBDIRS = . reference INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/poppler \ @@ -77,10 +77,11 @@ libpoppler_glib_la_SOURCES = \ poppler.cc \ poppler-private.h -libpoppler_glib_la_LIBADD = \ - $(top_builddir)/poppler/libpoppler.la \ - $(POPPLER_GLIB_LIBS) \ - $(FREETYPE_LIBS) \ +libpoppler_glib_la_LIBADD = \ + $(top_builddir)/poppler/libpoppler.la \ + $(top_builddir)/poppler/libpoppler-cairo.la \ + $(POPPLER_GLIB_LIBS) \ + $(FREETYPE_LIBS) \ $(cairo_libs) libpoppler_glib_la_LDFLAGS = -version-info 1:0:0 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 diff --git a/qt/Makefile.am b/qt/Makefile.am index 08ccdbda..30e35878 100644 --- a/qt/Makefile.am +++ b/qt/Makefile.am @@ -18,6 +18,7 @@ libpoppler_qt_la_SOURCES = \ poppler-fontinfo.cc \ poppler-page.cc \ poppler-page-transition.cc \ + poppler-page-transition-private.h \ poppler-private.h libpoppler_qt_la_LIBADD = \ diff --git a/test/Makefile.am b/test/Makefile.am index 1c631dea..744d8519 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -45,18 +45,20 @@ gtk_splash_test_LDADD = \ gtk_cairo_test_SOURCES = \ gtk-cairo-test.cc -gtk_cairo_test_LDADD = \ - $(top_builddir)/poppler/libpoppler.la \ - $(CAIRO_LIBS) \ +gtk_cairo_test_LDADD = \ + $(top_builddir)/poppler/libpoppler.la \ + $(top_builddir)/poppler/libpoppler-cairo.la \ + $(CAIRO_LIBS) \ $(GTK_TEST_LIBS) pdf_inspector_SOURCES = \ pdf-inspector.cc -pdf_inspector_LDADD = \ - $(top_builddir)/poppler/libpoppler.la \ - $(CAIRO_LIBS) \ - $(FREETYPE_LIBS) \ +pdf_inspector_LDADD = \ + $(top_builddir)/poppler/libpoppler.la \ + $(top_builddir)/poppler/libpoppler-cairo.la \ + $(CAIRO_LIBS) \ + $(FREETYPE_LIBS) \ $(GTK_TEST_LIBS) EXTRA_DIST = \ diff --git a/utils/Makefile.am b/utils/Makefile.am index c54e83b9..3b502342 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -1,3 +1,15 @@ +if BUILD_SPLASH_OUTPUT + +pdftoppm_SOURCES = \ + pdftoppm.cc \ + $(common) + +pdftoppm_binary = pdftoppm + +pdftoppm_manpage = pdftoppm.1 + +endif + INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/utils \ @@ -5,7 +17,8 @@ INCLUDES = \ $(UTILS_CFLAGS) LDADD = \ - $(top_builddir)/poppler/libpoppler.la + $(top_builddir)/poppler/libpoppler.la \ + $(UTILS_LIBS) bin_PROGRAMS = \ pdffonts \ @@ -26,7 +39,6 @@ dist_man1_MANS = \ pdftotext.1 \ pdftohtml.1 \ $(pdftoppm_manpage) - common = parseargs.c parseargs.h @@ -62,14 +74,7 @@ pdftohtml_SOURCES = \ HtmlOutputDev.h \ $(common) -if BUILD_SPLASH_OUTPUT - -pdftoppm_SOURCES = \ - pdftoppm.cc \ - $(common) - -pdftoppm_binary = pdftoppm - -pdftoppm_manpage =pdftoppm.1 +# Yay, automake! It should be able to figure out that it has to dist +# this file, but nooo. So we just add it here. -endif \ No newline at end of file +EXTRA_DIST = pdftoppm.1 -- cgit v1.2.3