From: DRC <dcommander@users.sourceforge.net>
Date: Fri, 4 Mar 2011 04:14:47 +0000 (+0000)
Subject: Modify filename of decompressed output files to indicate that scaling was used
X-Git-Tag: 1.1.90~167
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8ebb6b65497a55c0cd424b0edc45dcbe23b2548;p=libjpeg-turbo

Modify filename of decompressed output files to indicate that scaling was used


git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@497 632fc199-4ca6-4c93-a231-07263d6284db
---

diff --git a/jpgtest.c b/jpgtest.c
index b0961aa..e62625a 100644
--- a/jpgtest.c
+++ b/jpgtest.c
@@ -72,7 +72,7 @@ int decomptest(unsigned char *srcbuf, unsigned char **jpegbuf,
 	unsigned long *comptilesize, unsigned char *rgbbuf, int w, int h,
 	int jpegsub, int qual, char *filename, int tilesizex, int tilesizey)
 {
-	char tempstr[1024], qualstr[5]="\0", *ptr;
+	char tempstr[1024], sizestr[20]="\0", qualstr[5]="\0", *ptr;
 	FILE *outfile=NULL;  tjhandle hnd=NULL;
 	int flags=(forcemmx?TJ_FORCEMMX:0)|(forcesse?TJ_FORCESSE:0)
 		|(forcesse2?TJ_FORCESSE2:0)|(forcesse3?TJ_FORCESSE3:0)
@@ -164,22 +164,17 @@ int decomptest(unsigned char *srcbuf, unsigned char **jpegbuf,
 	}
 	else
 	{
-		if(tilesizex==w && tilesizey==h)
-		{
-			if(decomponly)
-				snprintf(tempstr, 1024, "%s_full.%s", filename, useppm?"ppm":"bmp");
-			else
-				snprintf(tempstr, 1024, "%s_%s%s_full.%s", filename,
-					_subnames[jpegsub], qualstr, useppm?"ppm":"bmp");
-		}
+		if(scale_num!=1 || scale_denom!=1)
+			snprintf(sizestr, 20, "%d_%d", scale_num, scale_denom);
+		else if(tilesizex!=w || tilesizey!=h)
+			snprintf(sizestr, 20, "%dx%d", tilesizex, tilesizey);
+		else snprintf(sizestr, 20, "full");
+		if(decomponly)
+			snprintf(tempstr, 1024, "%s_%s.%s", filename, sizestr,
+				useppm?"ppm":"bmp");
 		else
-		{
-			if(decomponly)
-				snprintf(tempstr, 1024, "%s_%dx%d.%s", filename, tilesizex, tilesizey,
-					useppm?"ppm":"bmp");
-			else snprintf(tempstr, 1024, "%s_%s%s_%dx%d.%s", filename,
-				_subnames[jpegsub], qualstr, tilesizex, tilesizey, useppm?"ppm":"bmp");
-		}
+			snprintf(tempstr, 1024, "%s_%s%s_%s.%s", filename,
+				_subnames[jpegsub], qualstr, sizestr, useppm?"ppm":"bmp");
 		if(savebmp(tempstr, rgbbuf, scaledw, scaledh, pf, pitch, bu)==-1)
 			_throwbmp("saving bitmap");
 		ptr=strrchr(tempstr, '.');