From 42f0bf8e7f1ff88000a3584c265e6f1631662ec4 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Tue, 26 Dec 2023 19:10:37 +0000 Subject: Release 11.04.06 git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4821 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- doc/HISTORY | 6 ++++++ editor/pnmpad.c | 4 ++-- version.mk | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/HISTORY b/doc/HISTORY index afb58838..d1a52d14 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,12 @@ Netpbm. CHANGE HISTORY -------------- +23.12.26 BJH Release 11.04.06 + + pnmpad: fix behavior with -left, -right, and -width together or + -top, -bottom, -height together: ignores -width where it should + fail. Broken in Netpbm 10.72 (September 2015). + 23.12.05 BJH Release 11.04.05 pnmconvol: Restore ability of convolution matrix to be a diff --git a/editor/pnmpad.c b/editor/pnmpad.c index 0fff88d0..10b69d03 100644 --- a/editor/pnmpad.c +++ b/editor/pnmpad.c @@ -304,8 +304,8 @@ computePadSizeBeforeMult(unsigned int const unpaddedSize, -----------------------------------------------------------------------------*/ if (sizeSpec) { if (begPadSpec && endPadSpec) { - if (begPadReq + unpaddedSize + endPadReq < unpaddedSize) { - pm_error("Beginning adding (%u), and end " + if (begPadReq + unpaddedSize + endPadReq < sizeReq) { + pm_error("Beginning padding (%u), and end " "padding (%u) are insufficient to bring the " "image size of %u up to %u.", begPadReq, endPadReq, unpaddedSize, sizeReq); diff --git a/version.mk b/version.mk index 67b46cf7..c4ac21c3 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 11 NETPBM_MINOR_RELEASE = 4 -NETPBM_POINT_RELEASE = 5 +NETPBM_POINT_RELEASE = 6 -- cgit 1.4.1