From 8fe52930776f8803c215c67e22ba558db5e360bb Mon Sep 17 00:00:00 2001 From: obskyr Date: Tue, 20 Feb 2018 09:38:28 +0100 Subject: [PATCH] Allow superfluous height for 1-tile-wide images Currently used here and there for small, icon-like tiles, it seems. Signed-off-by: obskyr --- src/gfx/main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gfx/main.c b/src/gfx/main.c index 0dec5bfa..6171676d 100644 --- a/src/gfx/main.c +++ b/src/gfx/main.c @@ -131,9 +131,12 @@ int main(int argc, char *argv[]) if (png_options.trim) opts.trim = png_options.trim; - - if (raw_image->width % 8 || raw_image->height % 8) { - errx(1, "Input PNG file %s not sized correctly. The image's width and height must be multiples of 8.", + if (raw_image->width % 8) { + errx(1, "Input PNG file %s not sized correctly. The image's width must be a multiple of 8.", + opts.infile); + } + if (raw_image->width / 8 > 1 && raw_image->height % 8) { + errx(1, "Input PNG file %s not sized correctly. If the image is more than 1 tile wide, its height must be a multiple of 8.", opts.infile); }