[poppler] 5 commits - CMakeLists.txt configure.ac cpp/Doxyfile NEWS poppler/Lexer.cc poppler/Lexer.h poppler/Parser.cc poppler/Parser.h qt4/src qt5/src utils/pdfseparate.cc
Albert Astals Cid
aacid at kemper.freedesktop.org
Fri Nov 15 10:50:40 PST 2013
CMakeLists.txt | 2 +-
NEWS | 14 ++++++++++++++
configure.ac | 2 +-
cpp/Doxyfile | 2 +-
poppler/Lexer.cc | 6 +++---
poppler/Lexer.h | 4 ++--
poppler/Parser.cc | 13 +++++--------
poppler/Parser.h | 4 ++--
qt4/src/Doxyfile | 2 +-
qt4/src/poppler-document.cc | 2 +-
qt5/src/Doxyfile | 2 +-
utils/pdfseparate.cc | 2 +-
12 files changed, 33 insertions(+), 22 deletions(-)
New commits:
commit 33e703ac9bb6cf69664d6c6fddd3bebd56336074
Merge: 8294d18 7c74bcc
Author: Albert Astals Cid <aacid at kde.org>
Date: Fri Nov 15 19:50:10 2013 +0100
Merge remote-tracking branch 'origin/poppler-0.24'
diff --cc utils/pdfseparate.cc
index 924e5c7,d7efcf0..dcb59f6
--- a/utils/pdfseparate.cc
+++ b/utils/pdfseparate.cc
@@@ -5,9 -5,8 +5,9 @@@
// This file is licensed under the GPLv2 or later
//
// Copyright (C) 2011, 2012 Thomas Freitag <Thomas.Freitag at alfa.de>
- // Copyright (C) 2012 Albert Astals Cid <aacid at kde.org>
+ // Copyright (C) 2012, 2013 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2013 Pino Toscano <pino at kde.org>
+// Copyright (C) 2013 Daniel Kahn Gillmor <dkg at fifthhorseman.net>
//
//========================================================================
#include "config.h"
commit 7c74bccdf514cce05987dde7fb1cce4ac65ff025
Author: Albert Astals Cid <aacid at kde.org>
Date: Fri Nov 15 19:48:07 2013 +0100
Forgot to update the copyrights
diff --git a/poppler/Lexer.cc b/poppler/Lexer.cc
index 55f8e48..c620529 100644
--- a/poppler/Lexer.cc
+++ b/poppler/Lexer.cc
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2006-2010, 2012 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006-2010, 2012, 2013 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
// Copyright (C) 2010 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2012, 2013 Adrian Johnson <ajohnson at redneon.com>
diff --git a/poppler/Lexer.h b/poppler/Lexer.h
index 8a14c6b..02b6cdc 100644
--- a/poppler/Lexer.h
+++ b/poppler/Lexer.h
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2006, 2007, 2010 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006, 2007, 2010, 2013 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
// Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
diff --git a/poppler/Parser.cc b/poppler/Parser.cc
index 6f83c84..a021994 100644
--- a/poppler/Parser.cc
+++ b/poppler/Parser.cc
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2006, 2009, 201, 2010 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006, 2009, 201, 2010, 2013 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
// Copyright (C) 2009 Ilya Gorenbein <igorenbein at finjan.com>
// Copyright (C) 2012 Hib Eris <hib at hiberis.nl>
diff --git a/poppler/Parser.h b/poppler/Parser.h
index d86e511..1ce9445 100644
--- a/poppler/Parser.h
+++ b/poppler/Parser.h
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2006, 2010 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006, 2010, 2013 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2012 Hib Eris <hib at hiberis.nl>
// Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
commit ebe49d597a62aa94601c2e4595dbad1895ea7ef0
Author: Albert Astals Cid <aacid at kde.org>
Date: Fri Nov 15 19:33:00 2013 +0100
Fix regression in broken endstream detection
Rregression was caused by e1ffa9100cf6b4a444be7ed76b11698a5c5bb441
Fixes bug #70854
diff --git a/poppler/Lexer.cc b/poppler/Lexer.cc
index bd7546f..55f8e48 100644
--- a/poppler/Lexer.cc
+++ b/poppler/Lexer.cc
@@ -581,7 +581,7 @@ Object *Lexer::getObj(Object *obj, int objNum) {
return obj;
}
-Object *Lexer::getObj(Object *obj, const char *cmdA) {
+Object *Lexer::getObj(Object *obj, const char *cmdA, int objNum) {
char *p;
int c;
GBool comment;
@@ -591,7 +591,7 @@ Object *Lexer::getObj(Object *obj, const char *cmdA) {
comment = gFalse;
const char *cmd1 = tokBuf;
*tokBuf = 0;
- while (strcmp(cmdA, cmd1)) {
+ while (strcmp(cmdA, cmd1) && (objNum < 0 || xref->getNumEntry(getPos()) == objNum)) {
while (1) {
if ((c = getChar()) == EOF) {
return obj->initEOF();
diff --git a/poppler/Lexer.h b/poppler/Lexer.h
index d9c23dc..8a14c6b 100644
--- a/poppler/Lexer.h
+++ b/poppler/Lexer.h
@@ -57,7 +57,7 @@ public:
// Get the next object from the input stream.
Object *getObj(Object *obj, int objNum = -1);
- Object *getObj(Object *obj, const char *cmdA);
+ Object *getObj(Object *obj, const char *cmdA, int objNum);
// Skip to the beginning of the next line in the input stream.
void skipToNextLine();
diff --git a/poppler/Parser.cc b/poppler/Parser.cc
index 0370564..6f83c84 100644
--- a/poppler/Parser.cc
+++ b/poppler/Parser.cc
@@ -242,7 +242,7 @@ Stream *Parser::makeStream(Object *dict, Guchar *fileKey,
// refill token buffers and check for 'endstream'
shift(); // kill '>>'
- shift("endstream"); // kill 'stream'
+ shift("endstream", objNum); // kill 'stream'
if (buf1.isCmd("endstream")) {
shift();
} else {
@@ -250,9 +250,6 @@ Stream *Parser::makeStream(Object *dict, Guchar *fileKey,
if (strict) return NULL;
if (xref) {
// shift until we find the proper endstream or we change to another object or reach eof
- while (!buf1.isCmd("endstream") && xref->getNumEntry(lexer->getPos()) == objNum && !buf1.isEOF()) {
- shift("endstream");
- }
length = lexer->getPos() - pos;
if (buf1.isCmd("endstream")) {
obj.initInt64(length);
@@ -303,7 +300,7 @@ void Parser::shift(int objNum) {
lexer->getObj(&buf2, objNum);
}
-void Parser::shift(const char *cmdA) {
+void Parser::shift(const char *cmdA, int objNum) {
if (inlineImg > 0) {
if (inlineImg < 2) {
++inlineImg;
@@ -321,8 +318,8 @@ void Parser::shift(const char *cmdA) {
if (inlineImg > 0) {
buf2.initNull();
} else if (buf1.isCmd(cmdA)) {
- lexer->getObj(&buf2, -1);
+ lexer->getObj(&buf2, objNum);
} else {
- lexer->getObj(&buf2, cmdA);
+ lexer->getObj(&buf2, cmdA, objNum);
}
}
diff --git a/poppler/Parser.h b/poppler/Parser.h
index 9702716..d86e511 100644
--- a/poppler/Parser.h
+++ b/poppler/Parser.h
@@ -75,7 +75,7 @@ private:
int objNum, int objGen, int recursion,
GBool strict);
void shift(int objNum = -1);
- void shift(const char *cmdA);
+ void shift(const char *cmdA, int objNum);
};
#endif
commit f4a72fd3c61091d6b455af9a881c2390da19b506
Author: Albert Astals Cid <aacid at kde.org>
Date: Sat Oct 26 19:06:34 2013 +0200
0.24.3
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e6e2898..d8ee924 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS()
set(POPPLER_MAJOR_VERSION "0")
set(POPPLER_MINOR_VERSION "24")
-set(POPPLER_MICRO_VERSION "2")
+set(POPPLER_MICRO_VERSION "3")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
diff --git a/NEWS b/NEWS
index 8eef665..03a9e68 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Release 0.24.3
+ core:
+ * PSOutputDev: Fix PFB font embedding. Bug #69717
+ * CairoOutputDev: Do not set an invalid matrix in drawImage(). Bug #70085
+
+ qt4:
+ * Don't crash if getXRef()->copy() fails
+
+ qt5:
+ * Don't crash if getXRef()->copy() fails
+
+ utils:
+ * pdfseparate: Allow only one %d in the filename. Bug #69434
+
Release 0.24.2
core:
* Windows: Fix CreateFile fails with ERROR_SHARING_VIOLATION. Bug #69597
diff --git a/configure.ac b/configure.ac
index ee6b37b..88112cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
m4_define([poppler_version_major],[0])
m4_define([poppler_version_minor],[24])
-m4_define([poppler_version_micro],[2])
+m4_define([poppler_version_micro],[3])
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 5903dab..2c67532 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.24.2
+PROJECT_NUMBER = 0.24.3
# 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 c833e01..7cb051a 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.24.2
+PROJECT_NUMBER = 0.24.3
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/qt5/src/Doxyfile b/qt5/src/Doxyfile
index 5e4d8da..8678bc2 100644
--- a/qt5/src/Doxyfile
+++ b/qt5/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt5"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 0.24.2
+PROJECT_NUMBER = 0.24.3
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
commit 33a5af32cd5769cf1b6c6344077ac4a3f407ba21
Author: Albert Astals Cid <aacid at kde.org>
Date: Sat Oct 26 18:48:50 2013 +0200
Update copyrights
diff --git a/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc
index 6a06ab8..de7e36d 100644
--- a/qt4/src/poppler-document.cc
+++ b/qt4/src/poppler-document.cc
@@ -1,7 +1,7 @@
/* poppler-document.cc: qt interface to poppler
* Copyright (C) 2005, Net Integration Technologies, Inc.
* Copyright (C) 2005, 2008, Brad Hards <bradh at frogmouth.net>
- * Copyright (C) 2005-2010, 2012, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2005-2010, 2012, 2013, Albert Astals Cid <aacid at kde.org>
* Copyright (C) 2006-2010, Pino Toscano <pino at kde.org>
* Copyright (C) 2010, 2011 Hib Eris <hib at hiberis.nl>
* Copyright (C) 2012 Koji Otani <sho at bbr.jp>
diff --git a/utils/pdfseparate.cc b/utils/pdfseparate.cc
index 6424d20..d7efcf0 100644
--- a/utils/pdfseparate.cc
+++ b/utils/pdfseparate.cc
@@ -5,7 +5,7 @@
// This file is licensed under the GPLv2 or later
//
// Copyright (C) 2011, 2012 Thomas Freitag <Thomas.Freitag at alfa.de>
-// Copyright (C) 2012 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2012, 2013 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2013 Pino Toscano <pino at kde.org>
//
//========================================================================
More information about the poppler
mailing list