Update image.TGA.1.sg

 - even more sanity checks, one fixed; modernised return result()

Author: Kaens

db/Binary/image.TGA.1.sg

@@ -30,13 +30,14 @@ function detect(bShowType,bShowVersion,bShowOptions) {
 	var sus = 0, cmin = File.read_uint16(3), cmlen = File.read_uint16(5), cmsz = File.read_uint8(7),
 	  x0 = File.read_uint16(8), y0 = File.read_uint16(0xA),
 	  w = File.read_uint16(0xC), h = File.read_uint16(0xE), attr = File.read_uint8(0x11);
-	if(!w || !h || w > 4096 || h > 2048 || x0 > 1600 || y0 > 1200 || cmsz > 32) return false;
+	if(!w || !h || w > 4096 || h > 2048 || x0 > 1600 || y0 > 1200 || cmsz > 32 || (attr&0xC0)) return false;
 	// suspiciousness is probably the only way to filter out all the FPs, so let's measure that
 	if(x0) sus++; if(y0) sus++; if(w < 4) sus++; if(h < 4) sus++; if(w > 1600) sus++; if(h > 1200) sus++;
+	if(attr&0x10) sus++; // that's right-to-left
 	if(!cmsz && cmlen) return false;
 	if(cmt == 1 && (it == 2 || it == 10)) sus++; //shouldn't have colour maps with True-color
 	if(cmsz < 15 || isWithin(cmsz,17,23) || isWithin(cmsz,25,31)) sus++; if(cmlen > 256) sus++; if(cmin) sus++;
-	if(it == 0) { if(cmin) sus++; if(cmlen) sus++; if(cmsz) sus++ }
+	if(it == 2 || it == 10) { if(cmin) sus++; if(cmlen) sus++; if(cmsz) sus++ }
 	if(it != 1 && it != 9 && it != 32 && it != 33) depth = bpp <= 8 ? 8 : (bpp <= 16 ? 5 : 8);
 	else depth = cmsz <= 8 ? 8 : (cmsz <= 16 ? 5 : 8);
 	var col = 1 << depth;
@@ -141,9 +142,7 @@ function detect(bShowType,bShowVersion,bShowOptions) {
 		if(co != "rle" || File.isDeepScan()) sOption(outSz(p),"sz:")
 	}
 	if(bad != "") sVersion += "/malformed"+bad;
-
 	bDetected = true;
-	return result(bShowType,bShowVersion,bShowOptions);
-
-    return result();
+
+    return result();
 }