DenysMedvid/pdf2htmlEX
1
0
Fork 0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-12-21 20:50:07 +00:00
Code

Merge pull request #36 from stephengaito/master

Browse Source 
development changes required for poppler-0.81.0
This commit is contained in:
stephengaito 2019-09-27 13:43:55 +01:00 committed by GitHub
commit b69b800048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3rdparty/poppler/git/CairoOutputDev.cc vendored
View File

@ -31,6 +31,7 @@
// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp> // Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
// Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info@kdab.com>. Work sponsored by the LiMux project of the city of Munich // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info@kdab.com>. Work sponsored by the LiMux project of the city of Munich
// Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de> // Copyright (C) 2018 Adam Reichold <adam.reichold@t-online.de>
// Copyright (C) 2019 Marek Kasik <mkasik@redhat.com>
// //
// To see a description of the changes please see the Changelog file that // 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 // came with your tarball or type make ChangeLog if you are building from git
@ -3134,6 +3135,13 @@ public:
scaledWidth = MAX_PRINT_IMAGE_SIZE * (double)width/height; scaledWidth = MAX_PRINT_IMAGE_SIZE * (double)width/height;
} }
needsCustomDownscaling = true; needsCustomDownscaling = true;
if (scaledWidth == 0) {
scaledWidth = 1;
}
if (scaledHeight == 0) {
scaledHeight = 1;
}
} else { } else {
needsCustomDownscaling = false; needsCustomDownscaling = false;
} }

2
CMakeLists.txt
View File

@ -10,7 +10,7 @@ option(ENABLE_SVG "Enable SVG support, for generating SVG background images and
include_directories(${CMAKE_SOURCE_DIR}/src) include_directories(${CMAKE_SOURCE_DIR}/src)
set(PDF2HTMLEX_VERSION "0.18.6") set(PDF2HTMLEX_VERSION "0.18.7")
set(ARCHIVE_NAME pdf2htmlex-${PDF2HTMLEX_VERSION}) set(ARCHIVE_NAME pdf2htmlex-${PDF2HTMLEX_VERSION})
add_custom_target(dist add_custom_target(dist
COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD

2
PopplerReleases.md
View File

@ -5,7 +5,7 @@ This table lists the (recent) pdf2htmlEX releases which work for a given
| poppler | pdf2htmlEX | | poppler | pdf2htmlEX |
|----------------|------------| |----------------|------------|
| poppler-0.81.0 | unknown | | poppler-0.81.0 | v0.18.7-poppler-0.81.0 |
| poppler-0.80.0 | v0.18.6-poppler-0.80.0 | | poppler-0.80.0 | v0.18.6-poppler-0.80.0 |
| poppler-0.79.0 | v0.18.5-poppler-0.79.0 | | poppler-0.79.0 | v0.18.5-poppler-0.79.0 |
| poppler-0.78.0 | v0.18.4-poppler-0.78.0 | | poppler-0.78.0 | v0.18.4-poppler-0.78.0 |