[poppler] 4 commits - CMakeLists.txt configure.ac cpp/Doxyfile glib/CMakeLists.txt glib/Makefile.am goo/JpegWriter.h goo/PNGWriter.cc goo/PNGWriter.h goo/TiffWriter.cc goo/TiffWriter.h NEWS poppler/GlobalParams.cc poppler/Makefile.am poppler/TextOutputDev.cc qt4/src splash/Splash.cc utils/HtmlOutputDev.cc
Albert Astals Cid
aacid at kemper.freedesktop.org
Sun Dec 16 05:31:26 PST 2012
CMakeLists.txt | 4 ++--
NEWS | 18 ++++++++++++++++++
configure.ac | 2 +-
cpp/Doxyfile | 2 +-
glib/CMakeLists.txt | 2 +-
glib/Makefile.am | 2 +-
goo/JpegWriter.h | 2 +-
goo/PNGWriter.cc | 1 +
goo/PNGWriter.h | 1 +
goo/TiffWriter.cc | 1 +
goo/TiffWriter.h | 1 +
poppler/GlobalParams.cc | 2 +-
poppler/Makefile.am | 2 +-
poppler/TextOutputDev.cc | 1 +
qt4/src/Doxyfile | 2 +-
splash/Splash.cc | 1 +
utils/HtmlOutputDev.cc | 1 +
17 files changed, 35 insertions(+), 10 deletions(-)
New commits:
commit 1dd6280d79ad22461208702b3c929377887c99ff
Author: Albert Astals Cid <aacid at kde.org>
Date: Sat Dec 15 16:39:23 2012 +0100
0.21.4 soversion increases
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce88a51..69aceae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -396,7 +396,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 32.0.0 SOVERSION 32)
+set_target_properties(poppler PROPERTIES VERSION 33.0.0 SOVERSION 33)
target_link_libraries(poppler ${poppler_LIBS})
target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index b07b358..bab5838 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -79,7 +79,7 @@ set(poppler_glib_generated_SRCS
${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
)
add_library(poppler-glib SHARED ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS})
-set_target_properties(poppler-glib PROPERTIES VERSION 8.5.0 SOVERSION 8)
+set_target_properties(poppler-glib PROPERTIES VERSION 8.6.0 SOVERSION 8)
target_link_libraries(poppler-glib poppler ${GLIB2_LIBRARIES} ${CAIRO_LIBRARIES} ${FREETYPE_LIBRARIES})
install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 4346c62..a38e052 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -76,7 +76,7 @@ libpoppler_glib_la_LIBADD = \
$(POPPLER_GLIB_LIBS) \
$(FREETYPE_LIBS)
-libpoppler_glib_la_LDFLAGS = -version-info 13:0:5 @create_shared_lib@ @auto_import_flags@
+libpoppler_glib_la_LDFLAGS = -version-info 14:0:6 @create_shared_lib@ @auto_import_flags@
BUILT_SOURCES = \
poppler-enums.c \
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index 71a6142..34d0ce4 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -177,7 +177,7 @@ libpoppler_la_LIBADD = \
$(PTHREAD_LIBS) \
$(win32_libs)
-libpoppler_la_LDFLAGS = -version-info 32:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 33:0:0 @create_shared_lib@ @auto_import_flags@
if ENABLE_XPDF_HEADERS
commit 99d0288bb0b6879ae5414d174939bbd9c1e90bd3
Author: Albert Astals Cid <aacid at kde.org>
Date: Sat Dec 15 16:37:19 2012 +0100
0.21.4 version increase
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e8ad51..ce88a51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ test_big_endian(WORDS_BIGENDIAN)
set(POPPLER_MAJOR_VERSION "0")
set(POPPLER_MINOR_VERSION "21")
-set(POPPLER_MICRO_VERSION "3")
+set(POPPLER_MICRO_VERSION "4")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
diff --git a/configure.ac b/configure.ac
index 504f450..399ece7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([poppler_version_major],[0])
m4_define([poppler_version_minor],[21])
-m4_define([poppler_version_micro],[3])
+m4_define([poppler_version_micro],[4])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
AC_PREREQ(2.59)
diff --git a/cpp/Doxyfile b/cpp/Doxyfile
index 7e0099f..580c5ae 100644
--- a/cpp/Doxyfile
+++ b/cpp/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler CPP"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.21.3
+PROJECT_NUMBER = 0.21.4
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index 9e11bac..9547cd5 100644
--- a/qt4/src/Doxyfile
+++ b/qt4/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt4 "
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.21.3
+PROJECT_NUMBER = 0.21.4
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
commit 2bc48d5369f1dbecfc4db2878f33bdeb80d8d90f
Author: Albert Astals Cid <aacid at kde.org>
Date: Sat Dec 15 16:36:38 2012 +0100
0.21.4 NEWS
diff --git a/NEWS b/NEWS
index d6e0537..b7adb3b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+Release 0.21.4
+ core:
+ * SplashOutputDev: Fix crash when rendering in monochrome mode
+ * SplashOutputDev: Fix line widths in monochrome mode (Bug #57294)
+ * PSOutputDev: Fix crop on EPS conversion (Bug #30692)
+ * TextOutputDev: Fix minor logic mistake
+ * Fix assert on some malformed files (Bug #58257)
+ * Move #include "jpeglib.h" into .cc file (Bug #57687)
+ * Filter text that may end up being written to the shell
+ * Fix windows compile warnings
+
+ glib:
+ * Add poppler_annot_set_flags (Bug #58015)
+ * Demo fixes and improvements
+
+ qt4:
+ * Fix check_lexer on 32-bit systems
+
Release 0.21.3
core:
* Splash: Implement bilinear image scaling (Bug #22138)
commit b3423d54b1254597d7ca953872211fa3aa83e29c
Author: Albert Astals Cid <aacid at kde.org>
Date: Sat Dec 15 16:29:54 2012 +0100
Updated copyrights
diff --git a/goo/JpegWriter.h b/goo/JpegWriter.h
index 66b8959..d69bbbb 100644
--- a/goo/JpegWriter.h
+++ b/goo/JpegWriter.h
@@ -5,7 +5,7 @@
// This file is licensed under the GPLv2 or later
//
// Copyright (C) 2009 Stefan Thomas <thomas at eload24.com>
-// Copyright (C) 2010 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2010, 2012 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2010 Jürg Billeter <j at bitron.ch>
// Copyright (C) 2010 Harry Roberts <harry.roberts at midnight-labs.org>
// Copyright (C) 2010 Brian Cameron <brian.cameron at oracle.com>
diff --git a/goo/PNGWriter.cc b/goo/PNGWriter.cc
index 1f35d8e..b775600 100644
--- a/goo/PNGWriter.cc
+++ b/goo/PNGWriter.cc
@@ -10,6 +10,7 @@
// Copyright (C) 2009 Stefan Thomas <thomas at eload24.com>
// Copyright (C) 2010, 2011 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2011 Thomas Klausner <wiz at danbala.tuwien.ac.at>
+// Copyright (C) 2012 Pino Toscano <pino at kde.org>
//
//========================================================================
diff --git a/goo/PNGWriter.h b/goo/PNGWriter.h
index 67cd31e..c73c964 100644
--- a/goo/PNGWriter.h
+++ b/goo/PNGWriter.h
@@ -9,6 +9,7 @@
// Copyright (C) 2009, 2011, 2012 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2009 Stefan Thomas <thomas at eload24.com>
// Copyright (C) 2010, 2011 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2012 Pino Toscano <pino at kde.org>
//
//========================================================================
diff --git a/goo/TiffWriter.cc b/goo/TiffWriter.cc
index 3e8af0d..d372a5b 100644
--- a/goo/TiffWriter.cc
+++ b/goo/TiffWriter.cc
@@ -7,6 +7,7 @@
// Copyright (C) 2010, 2012 William Bader <williambader at hotmail.com>
// Copyright (C) 2012 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2012 Pino Toscano <pino at kde.org>
//
//========================================================================
diff --git a/goo/TiffWriter.h b/goo/TiffWriter.h
index 14b5e7a..52fdd53 100644
--- a/goo/TiffWriter.h
+++ b/goo/TiffWriter.h
@@ -7,6 +7,7 @@
// Copyright (C) 2010, 2012 William Bader <williambader at hotmail.com>
// Copyright (C) 2011, 2012 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2012 Pino Toscano <pino at kde.org>
//
//========================================================================
diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
index 02b9332..6efdd0c 100644
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
@@ -25,7 +25,7 @@
// Copyright (C) 2009 Petr Gajdos <pgajdos at novell.com>
// Copyright (C) 2009, 2011, 2012 William Bader <williambader at hotmail.com>
// Copyright (C) 2009 Kovid Goyal <kovid at kovidgoyal.net>
-// Copyright (C) 2010 Hib Eris <hib at hiberis.nl>
+// Copyright (C) 2010, 2012 Hib Eris <hib at hiberis.nl>
// Copyright (C) 2010 Patrick Spendrin <ps_ml at gmx.de>
// Copyright (C) 2010 Jakub Wilk <ubanus at users.sf.net>
// Copyright (C) 2011 Pino Toscano <pino at kde.org>
diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
index 97253b4..64a0848 100644
--- a/poppler/TextOutputDev.cc
+++ b/poppler/TextOutputDev.cc
@@ -31,6 +31,7 @@
// Copyright (C) 2011 Sam Liao <phyomh at gmail.com>
// Copyright (C) 2012 Horst Prote <prote at fmi.uni-stuttgart.de>
// Copyright (C) 2012 Jason Crain <jason at aquaticape.us>
+// Copyright (C) 2012 Peter Breitenlohner <peb at mppmu.mpg.de>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
diff --git a/splash/Splash.cc b/splash/Splash.cc
index 549fae5..336872b 100644
--- a/splash/Splash.cc
+++ b/splash/Splash.cc
@@ -18,6 +18,7 @@
// Copyright (C) 2011, 2012 William Bader <williambader at hotmail.com>
// Copyright (C) 2012 Markus Trippelsdorf <markus at trippelsdorf.de>
// Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2012 Matthias Kramm <kramm at quiss.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc
index 565c932..a718380 100644
--- a/utils/HtmlOutputDev.cc
+++ b/utils/HtmlOutputDev.cc
@@ -33,6 +33,7 @@
// Copyright (C) 2011, 2012 Igor Slepchin <igor.slepchin at gmail.com>
// Copyright (C) 2012 Ihar Filipau <thephilips at gmail.com>
// Copyright (C) 2012 Gerald Schmidt <solahcin at gmail.com>
+// Copyright (C) 2012 Pino Toscano <pino at kde.org>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
More information about the poppler
mailing list