summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2012-11-23 00:12:24 +0100
committerAlbert Astals Cid <aacid@kde.org>2012-11-23 00:12:24 +0100
commitb1dacd1e6ab00eb1976491eb2b45c76671011b38 (patch)
treefe68a4889f93a7bbf39d9343deb4c9d0a8ae8a11
parent2d2a3af7159945c3fd54f22878e2eb09e019bbc6 (diff)
-rw-r--r--CMakeLists.txt4
-rw-r--r--NEWS13
-rw-r--r--configure.ac2
-rw-r--r--cpp/Doxyfile2
-rw-r--r--poppler/Makefile.am2
-rw-r--r--qt4/src/Doxyfile2
6 files changed, 19 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1de3c2d..1114485f 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 "1")
+set(POPPLER_MICRO_VERSION "2")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
@@ -394,7 +394,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 30.0.0 SOVERSION 30)
+set_target_properties(poppler PROPERTIES VERSION 31.0.0 SOVERSION 31)
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/NEWS b/NEWS
index 3955431d..2f4fc730 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Release 0.21.2
+ core:
+ * CairoOutputDev: make drawImage work with images > 32767 in width/height (Bug #56858)
+ * CairoOutputDev: Fix soft mask when image resolution != smask resolution (Bug #57070)
+ * CairoOutputDev: Fix crash in CairoImageOutputDev with setSoftMaskFromImageMask (Bug #57067)
+ * Remove a check on fonts that we don't need (Bug #56753)
+ * Misc code cleanups
+
+ utils:
+ * pdftocairo: Add tiff output support (Bug #57006)
+ * pdfunite: Fix -v (Bug #56817)
+ * Misc code cleanups
+
Release 0.21.1
core:
* Annotation improvements
diff --git a/configure.ac b/configure.ac
index 762aa6b2..d3612f88 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],[1])
+m4_define([poppler_version_micro],[2])
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 fbcd4724..a495f0fc 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.1
+PROJECT_NUMBER = 0.21.2
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index e210a1d6..870fca6b 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 30:0:0 @create_shared_lib@ @auto_import_flags@
+libpoppler_la_LDFLAGS = -version-info 31:0:0 @create_shared_lib@ @auto_import_flags@
if ENABLE_XPDF_HEADERS
diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile
index dcb8bf01..ebd6bced 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.1
+PROJECT_NUMBER = 0.21.2
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.