CMakeLists.txt | 4 ++-- NEWS | 13 +++++++++++++ configure.ac | 2 +- cpp/Doxyfile | 2 +- goo/TiffWriter.cc | 1 + goo/TiffWriter.h | 1 + poppler/CairoRescaleBox.cc | 1 + poppler/CairoRescaleBox.h | 38 ++++++++++++++++++++++++++++++++++++++ poppler/Makefile.am | 2 +- qt4/src/Doxyfile | 2 +- splash/SplashBitmap.cc | 2 +- 11 files changed, 61 insertions(+), 7 deletions(-)
New commits: commit c7ae96b162e8a05269a54c31f8e7c411edc84553 Merge: 1f279c3... b1dacd1... Author: Albert Astals Cid <[email protected]> Date: Sat Dec 1 21:26:24 2012 +0100 Merge commit 'b1dacd1e6ab00eb1976491eb2b45c76671011b38' commit b1dacd1e6ab00eb1976491eb2b45c76671011b38 Author: Albert Astals Cid <[email protected]> Date: Fri Nov 23 00:12:24 2012 +0100 0.21.2 diff --git a/CMakeLists.txt b/CMakeLists.txt index d1de3c2..1114485 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 3955431..2f4fc73 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 762aa6b..d3612f8 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 fbcd472..a495f0f 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 e210a1d..870fca6 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 dcb8bf0..ebd6bce 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. commit 2d2a3af7159945c3fd54f22878e2eb09e019bbc6 Author: Albert Astals Cid <[email protected]> Date: Fri Nov 23 00:06:39 2012 +0100 Update copyrights diff --git a/goo/TiffWriter.cc b/goo/TiffWriter.cc index 660764c..d01cb5a 100644 --- a/goo/TiffWriter.cc +++ b/goo/TiffWriter.cc @@ -6,6 +6,7 @@ // // Copyright (C) 2010, 2012 William Bader <[email protected]> // Copyright (C) 2012 Albert Astals Cid <[email protected]> +// Copyright (C) 2012 Adrian Johnson <[email protected]> // //======================================================================== diff --git a/goo/TiffWriter.h b/goo/TiffWriter.h index 831b03b..26d0b76 100644 --- a/goo/TiffWriter.h +++ b/goo/TiffWriter.h @@ -6,6 +6,7 @@ // // Copyright (C) 2010, 2012 William Bader <[email protected]> // Copyright (C) 2011 Albert Astals Cid <[email protected]> +// Copyright (C) 2012 Adrian Johnson <[email protected]> // //======================================================================== diff --git a/poppler/CairoRescaleBox.cc b/poppler/CairoRescaleBox.cc index e2682a4..3c96f45 100644 --- a/poppler/CairoRescaleBox.cc +++ b/poppler/CairoRescaleBox.cc @@ -31,6 +31,7 @@ // under GPL version 2 or later // // Copyright (C) 2012 Hib Eris <[email protected]> +// Copyright (C) 2012 Adrian Johnson <[email protected]> // // 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/poppler/CairoRescaleBox.h b/poppler/CairoRescaleBox.h index 6187d68..072e8a9 100644 --- a/poppler/CairoRescaleBox.h +++ b/poppler/CairoRescaleBox.h @@ -1,3 +1,41 @@ +/* + * Copyright © 2009 Mozilla Corporation + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Mozilla Corporation not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Mozilla Corporation makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * MOZILLA CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT + * SHALL MOZILLA CORPORATION BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + * + * Author: Jeff Muizelaar, Mozilla Corp. + */ + +//======================================================================== +// +// Modified under the Poppler project - http://poppler.freedesktop.org +// +// All changes made under the Poppler project to this file are licensed +// under GPL version 2 or later +// +// Copyright (C) 2012 Adrian Johnson <[email protected]> +// +// 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 +// +//======================================================================== + #ifndef CAIRO_RESCALE_BOX_H #define CAIRO_RESCALE_BOX_H diff --git a/splash/SplashBitmap.cc b/splash/SplashBitmap.cc index f514dfa..ca1dee7 100644 --- a/splash/SplashBitmap.cc +++ b/splash/SplashBitmap.cc @@ -15,7 +15,7 @@ // Copyright (C) 2007 Ilmari Heikkinen <[email protected]> // Copyright (C) 2009 Shen Liang <[email protected]> // Copyright (C) 2009 Stefan Thomas <[email protected]> -// Copyright (C) 2010 Adrian Johnson <[email protected]> +// Copyright (C) 2010, 2012 Adrian Johnson <[email protected]> // Copyright (C) 2010 Harry Roberts <[email protected]> // Copyright (C) 2010 Christian Feuersänger <[email protected]> // Copyright (C) 2010 William Bader <[email protected]>
_______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
