shithub: imgtools

Info  •  Files  •  Log  •  Branches

preserve aspect if either -x or -y was specified

--- a/resample.c

+++ b/resample.c

@@ -96,9 +96,15 @@

 	}

 	w = Dx(a->r);

 	h = Dy(a->r);

-	ow = wp ? w*ow/100.0 : w;

-	oh = hp ? h*oh/100.0 : h;

-	if(w < 1 || h < 1)

+	if(wp)

+		ow = w*ow/100.0;

+	if(hp)

+		oh = h*oh/100.0;

+	if(oh == 0)

+		oh = ow*h/w;

+	if(ow == 0)

+		ow = oh*w/h;

+	if(ow < 1 || oh < 1)

 		sysfatal("invalid size: %dx%d", ow, oh);

 	bp = 3;

 	n = w*h*bp;