From: sgunderson@bigfoot.com <>
Date: Mon, 4 Feb 2008 00:22:53 +0000 (+0100)
Subject: Make it a bit clearer what's user-adjustable and what's not.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=816a55d3ca539f8592574fc8416d28bf98d66ded;p=qscale

Make it a bit clearer what's user-adjustable and what's not.
---

diff --git a/qscale.c b/qscale.c
index ee70208..336e8c2 100644
--- a/qscale.c
+++ b/qscale.c
@@ -336,13 +336,27 @@ void vscale(unsigned char *pix, float *npix, unsigned w, unsigned h, unsigned nh
 
 int main(int argc, char **argv)
 {
+	/* user-settable parameters */
 	unsigned nominal_w = atoi(argv[1]);
 	unsigned nominal_h = atoi(argv[2]);
-
 	unsigned samp_h0 = 2, samp_v0 = 2;
 	unsigned samp_h1 = 1, samp_v1 = 1;
 	unsigned samp_h2 = 1, samp_v2 = 1;
-	unsigned max_samp_h = 2, max_samp_v = 2;
+	unsigned jpeg_quality = 85;
+	/* end */
+
+	unsigned max_samp_h, max_samp_v;
+	max_samp_h = samp_h0;
+	if (samp_h1 > max_samp_h)
+		max_samp_h = samp_h1;
+	if (samp_h2 > max_samp_h)
+		max_samp_h = samp_h2;
+	
+	max_samp_v = samp_v0;
+	if (samp_v1 > max_samp_v)
+		max_samp_v = samp_v1;
+	if (samp_v2 > max_samp_v)
+		max_samp_v = samp_v2;
 
 	unsigned nw0 = nominal_w * samp_h0 / max_samp_h, nh0 = nominal_h * samp_v0 / max_samp_v;
 	unsigned nw1 = nominal_w * samp_h1 / max_samp_h, nh1 = nominal_h * samp_v1 / max_samp_v;