Commit 0f074b16 authored by Pino Toscano's avatar Pino Toscano

Merge remote-tracking branch 'origin/poppler-0.24'

Conflicts:
	utils/pdfimages.1
parents d2774325 b8682d86
......@@ -18,7 +18,7 @@ CHECK_FILE_OFFSET_BITS()
set(POPPLER_MAJOR_VERSION "0")
set(POPPLER_MINOR_VERSION "24")
set(POPPLER_MICRO_VERSION "0")
set(POPPLER_MICRO_VERSION "1")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
# command line switches
......
Release 0.24.1
core:
* SplashOutputDev: use getRGBLine images if available. Bug #66928
* SplashOutputDev: Don't copy bitmap if we don't need to.
* PSOutputDev: Fix regression in -eps -level1sep rendering. Bug #68321
* Fix crash in malformed file 1026.asan.0.42.pdf
* use copyString instead of strdup where memory is freed with gfree. Bug #67666
utils:
* pdfdetach: don't mention xpdfrc
* pdftotext: Fix -bbox with stdin as input. Bug #45163
* pdftohtml: Fix jpeg image export. Bug #48270
* pdfimages: Fix typos in man page
glib:
* demo: Remove GTK_DISABLE_DEPRECATED compilation flag
qt4:
* Fix small typo in documentation
qt5:
* Fix small typo in documentation
Release 0.24.0
core:
* TextOutputDev: Do not draw ligatures more than once when selected. Bug #9001
......
m4_define([poppler_version_major],[0])
m4_define([poppler_version_minor],[24])
m4_define([poppler_version_micro],[0])
m4_define([poppler_version_micro],[1])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
AC_PREREQ(2.59)
......
......@@ -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.0
PROJECT_NUMBER = 0.24.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
......
......@@ -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.0
PROJECT_NUMBER = 0.24.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
......
......@@ -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.0
PROJECT_NUMBER = 0.24.1
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
......
......@@ -104,7 +104,7 @@ namespace Poppler {
public:
/**
The default constructor sets the \p text and the rectangle that
contains the text. Coordinated for the \p bBox are in points =
contains the text. Coordinates for the \p bBox are in points =
1/72 of an inch.
*/
TextBox(const QString& text, const QRectF &bBox);
......
......@@ -44,7 +44,7 @@ static const ArgDesc argDesc[] = {
};
bool extractPages (const char *srcFileName, const char *destFileName) {
char pathName[1024];
char pathName[4096];
GooString *gfileName = new GooString (srcFileName);
PDFDoc *doc = new PDFDoc (gfileName, NULL, NULL, NULL);
......@@ -66,7 +66,7 @@ bool extractPages (const char *srcFileName, const char *destFileName) {
return false;
}
for (int pageNo = firstPage; pageNo <= lastPage; pageNo++) {
sprintf (pathName, destFileName, pageNo);
snprintf (pathName, sizeof (pathName) - 1, destFileName, pageNo);
GooString *gpageName = new GooString (pathName);
int errCode = doc->savePageAs(gpageName, pageNo);
if ( errCode != errNone) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment