Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #242 - Image with CSS max-width and max-height incorrectly scaled up #243

Merged
merged 2 commits into from
Jul 7, 2018
Merged

Fix #242 - Image with CSS max-width and max-height incorrectly scaled up #243

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34f7425
Fix #242 - Image with CSS max-width and max-height incorrectly scaled…
Jul 6, 2018
af20742
Fix whitespace
Jul 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions ...ltopdf-pdfbox/src/main/java/com/openhtmltopdf/pdfboxout/PdfBoxReplacedElementFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,15 @@ public ReplacedElement createReplacedElement(LayoutContext c, BlockBox box,
int intrinsicWidth = fsImage.getWidth();

if (hasMaxWidth && hasMaxHeight) {
double rw = (double) intrinsicWidth / (double) maxWidth;
double rh = (double) intrinsicHeight / (double) maxHeight;
if (intrinsicWidth > maxWidth || intrinsicHeight > maxHeight) {
double rw = (double) intrinsicWidth / (double) maxWidth;
double rh = (double) intrinsicHeight / (double) maxHeight;

if (rw > rh) {
fsImage.scale((int) maxWidth, -1);
} else {
fsImage.scale(-1, (int) maxHeight);
if (rw > rh) {
fsImage.scale((int) maxWidth, -1);
} else {
fsImage.scale(-1, (int) maxHeight);
}
}
} else if (hasMaxWidth && intrinsicWidth > maxWidth) {
fsImage.scale((int) maxWidth, -1);
Expand Down