[Piglit] [PATCH 14/19] glean: Remove remnants of image output code.

Kenneth Graunke kenneth at whitecape.org
Mon Dec 31 18:41:03 PST 2012


Jose removed the rgbTriStrip test and TIFF output, which was the only
remaining user of this code.
---
 tests/glean/environ.cpp | 15 ---------------
 tests/glean/environ.h   | 11 -----------
 2 files changed, 26 deletions(-)

diff --git a/tests/glean/environ.cpp b/tests/glean/environ.cpp
index d06a966..c690677 100644
--- a/tests/glean/environ.cpp
+++ b/tests/glean/environ.cpp
@@ -126,19 +126,4 @@ Environment::resultFileName(string& dbName, string& testName) {
 	return fileName;
 } // Environment::resultFileName
 
-string
-Environment::imageFileName(string& dbName, string& testName, int n) {
-	char sn[4];
-	sn[3] = 0;
-	sn[2] = static_cast<char>('0' + n % 10);
-	sn[1] = static_cast<char>('0' + (n / 10) % 10);
-	sn[0] = static_cast<char>('0' + (n / 100) % 10);
-#   if defined(__UNIX__)
-	string fileName(dbName + '/' + testName + "/i" + sn + ".tif");
-#   elif defined(__MS__)
-	string fileName(dbName + '/' + testName + "/i" + sn + ".tif");
-#   endif
-	return fileName;
-} // Environment::imageFileName
-
 } // namespace GLEAN
diff --git a/tests/glean/environ.h b/tests/glean/environ.h
index 30b907d..b8e4a50 100644
--- a/tests/glean/environ.h
+++ b/tests/glean/environ.h
@@ -78,17 +78,6 @@ class Environment {
 	inline string resultFileName(string& testName) {
 		return resultFileName(options.db1Name, testName);
 	}
-
-	string imageFileName(string& dbName, string& testName, int n);
-				// Return name of image file number ``n''
-				// associated with the given test.
-				// XXX Doesn't create results directory,
-				// so resultFileName() must be called before
-				// using this.
-	inline string imageFileName(string& testName, int n) {
-		return imageFileName(options.db1Name, testName, n);
-	}
-
 }; // class Environment
 
 } // namespace GLEAN
-- 
1.8.0.3



More information about the Piglit mailing list