[openMSX-commits] SF.net SVN: openmsx:[10926] openmsx/trunk/src/video

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

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

Log Message:
-----------
Moved formatOffsetsTable() and formatWeightsTable() into hqcommon.

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

Modified: openmsx/trunk/src/video/hq2.py
===================================================================
--- openmsx/trunk/src/video/hq2.py	2009-12-06 15:10:36 UTC (rev 10925)
+++ openmsx/trunk/src/video/hq2.py	2009-12-06 15:15:26 UTC (rev 10926)
@@ -3,6 +3,7 @@
 from hqcommon import (
 	blendWeights, computeLiteWeightCells, computeNeighbours, computeOffsets,
 	computeWeights, computeWeightCells, makeLite as commonMakeLite,
+	formatOffsetsTable, formatWeightsTable,
 	permuteCases, printSubExpr, printText,
 	transformOffsets, transformWeights, writeBinaryFile, writeTextFile
 	)
@@ -60,22 +61,6 @@
 			yield x
 			yield y
 
-def formatOffsetsTable(pixelExpr):
-	for case, expr in enumerate(pixelExpr):
-		yield '// %d\n' % case
-		for weights in expr:
-			for x, y in transformOffsets(weights):
-				yield ' %3d, %3d,' % (x, y)
-			yield '\n'
-
-def formatWeightsTable(pixelExpr, cellFunc):
-	for case, expr in enumerate(pixelExpr):
-		yield '// %d\n' % case
-		for weights in expr:
-			for weight in transformWeights(weights, cellFunc):
-				yield ' %3d,' % weight
-			yield '\n'
-
 def sanityCheck(pixelExpr):
 	'''Check various observed properties.
 	'''

Modified: openmsx/trunk/src/video/hq3.py
===================================================================
--- openmsx/trunk/src/video/hq3.py	2009-12-06 15:10:36 UTC (rev 10925)
+++ openmsx/trunk/src/video/hq3.py	2009-12-06 15:15:26 UTC (rev 10926)
@@ -3,6 +3,7 @@
 from hqcommon import (
 	blendWeights, computeLiteWeightCells, computeNeighbours, computeOffsets,
 	computeWeights, computeWeightCells, makeLite as commonMakeLite,
+	formatOffsetsTable, formatWeightsTable,
 	permuteCases, printSubExpr, printText,
 	transformOffsets, transformWeights, writeBinaryFile, writeTextFile
 	)
@@ -186,22 +187,6 @@
 			yield x
 			yield y
 
-def formatOffsetsTable(pixelExpr):
-	for case, expr in enumerate(pixelExpr):
-		yield '// %d\n' % case
-		for weights in expr:
-			for x, y in transformOffsets(weights):
-				yield ' %3d, %3d,' % (x, y)
-			yield '\n'
-
-def formatWeightsTable(pixelExpr, cellFunc):
-	for case, expr in enumerate(pixelExpr):
-		yield '// %d\n' % case
-		for weights in expr:
-			for weight in transformWeights(weights, cellFunc):
-				yield ' %3d,' % weight
-			yield '\n'
-
 def makeLite(pixelExpr, preferC6subPixels):
 	# TODO: Rewrite hqcommon.makeLite() so it doesn't change its input.
 	liteExpr = deepcopy(pixelExpr)

Modified: openmsx/trunk/src/video/hq4.py
===================================================================
--- openmsx/trunk/src/video/hq4.py	2009-12-06 15:10:36 UTC (rev 10925)
+++ openmsx/trunk/src/video/hq4.py	2009-12-06 15:15:26 UTC (rev 10926)
@@ -3,6 +3,7 @@
 from hqcommon import (
 	computeLiteWeightCells, computeNeighbours,
 	computeWeightCells, makeLite as commonMakeLite,
+	formatOffsetsTable, formatWeightsTable,
 	permuteCases, printSubExpr, printText,
 	transformOffsets, transformWeights, writeBinaryFile
 	)
@@ -156,22 +157,6 @@
 	yield '\tpixelc = pixeld = pixele = pixelf = 0; // avoid warning\n'
 	yield '}\n'
 
-def formatOffsetsTable(pixelExpr):
-	for case, expr in enumerate(pixelExpr):
-		yield '// %d\n' % case
-		for weights in expr:
-			for x, y in transformOffsets(weights):
-				yield ' %3d, %3d,' % (x, y)
-			yield '\n'
-
-def formatWeightsTable(pixelExpr, cellFunc):
-	for case, expr in enumerate(pixelExpr):
-		yield '// %d\n' % case
-		for weights in expr:
-			for weight in transformWeights(weights, cellFunc):
-				yield ' %3d,' % weight
-			yield '\n'
-
 def genHQOffsetsTable(pixelExpr):
 	for expr in pixelExpr:
 		for weights in expr:

Modified: openmsx/trunk/src/video/hqcommon.py
===================================================================
--- openmsx/trunk/src/video/hqcommon.py	2009-12-06 15:10:36 UTC (rev 10925)
+++ openmsx/trunk/src/video/hqcommon.py	2009-12-06 15:15:26 UTC (rev 10926)
@@ -24,6 +24,24 @@
 def writeBinaryFile(fileName, bytes):
 	writeFile(fileName, 'wb', ( chr(byte) for byte in bytes ))
 
+# Table output as text:
+
+def formatOffsetsTable(pixelExpr):
+	for case, expr in enumerate(pixelExpr):
+		yield '// %d\n' % case
+		for weights in expr:
+			for x, y in transformOffsets(weights):
+				yield ' %3d, %3d,' % (x, y)
+			yield '\n'
+
+def formatWeightsTable(pixelExpr, cellFunc):
+	for case, expr in enumerate(pixelExpr):
+		yield '// %d\n' % case
+		for weights in expr:
+			for weight in transformWeights(weights, cellFunc):
+				yield ' %3d,' % weight
+			yield '\n'
+
 # The rest:
 
 def isPow2(num):


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