[openMSX-commits] SF.net SVN: openmsx:[10917] openmsx/trunk/src/video/hq4.py

[<mth...@us...>]

Revision: 10917
          http://openmsx.svn.sourceforge.net/openmsx/?rev=10917&view=rev
Author:   mthuurne
Date:     2009-12-06 14:12:53 +0000 (Sun, 06 Dec 2009)

Log Message:
-----------
In "xy", use None instead of -1 to represent the absence of a value.

Modified Paths:
--------------
    openmsx/trunk/src/video/hq4.py

Modified: openmsx/trunk/src/video/hq4.py
===================================================================
--- openmsx/trunk/src/video/hq4.py	2009-12-06 14:06:56 UTC (rev 10916)
+++ openmsx/trunk/src/video/hq4.py	2009-12-06 14:12:53 UTC (rev 10917)
@@ -170,10 +170,8 @@
 		for subPixel in range(16):
 			for i in range(2):
 				t = xy[case][subPixel][i]
-				if t == -1:
-					t = 4
-				x = min(255, (t % 3) * 128)
-				y = min(255, (t / 3) * 128)
+				x = min(255, (1 if t is None else (t % 3)) * 128)
+				y = min(255, (1 if t is None else (t / 3)) * 128)
 				yield ' %3d, %3d,' % (x, y)
 			yield '\n'
 
@@ -184,14 +182,11 @@
 		for subPixel in range(16):
 			factor = 256 / sum(pixelExpr[case][subPixel])
 			for c in (xy[case][subPixel][0], xy[case][subPixel][1], 4):
-				t = 0
-				if c != -1:
-					t = pixelExpr[case][subPixel][c]
-				yield ' %3d,' % min(255, factor * t)
+				yield ' %3d,' % min(255, 0 if c is None else factor * pixelExpr[case][subPixel][c])
 			yield '\n'
 
 def computeXY(pixelExpr):
-	xy = [[[-1] * 2 for _ in range(16)] for _ in range(1 << 12)]
+	xy = [[[None] * 2 for _ in range(16)] for _ in range(1 << 12)]
 	for case in range(1 << 12):
 		for subPixel in range(16):
 			j = 0
@@ -208,10 +203,8 @@
 		for subPixel in range(16):
 			for i in range(2):
 				t = xy[case][subPixel][i]
-				if t == -1:
-					t = 4
-				x = min(255, (t % 3) * 128)
-				y = min(255, (t / 3) * 128)
+				x = min(255, (1 if t is None else (t % 3)) * 128)
+				y = min(255, (1 if t is None else (t / 3)) * 128)
 				yield x
 				yield y
 
@@ -221,10 +214,7 @@
 		for subPixel in range(16):
 			factor = 256 / sum(pixelExpr[case][subPixel])
 			for c in (xy[case][subPixel][0], xy[case][subPixel][1], 4):
-				t = 0
-				if c != -1:
-					t = pixelExpr[case][subPixel][c]
-				yield min(255, factor * t)
+				yield min(255, 0 if c is None else factor * pixelExpr[case][subPixel][c])
 
 def genHQLiteOffsetsTable(pixelExpr):
 	offset_x = ( 48,  16, -16, -48,  48,  16, -16, -48,  48,  16, -16, -48,  48,  16, -16, -48)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.