Index: openexr-1.7.0/IlmImfTest/Makefile.am
===================================================================
--- openexr-1.7.0.orig/IlmImfTest/Makefile.am	2007-11-10 05:59:07.000000000 +0100
+++ openexr-1.7.0/IlmImfTest/Makefile.am	2011-10-31 15:20:40.885580523 +0100
@@ -17,12 +17,12 @@
 		     testPreviewImage.cpp testPreviewImage.h \
 		     testMagic.cpp testMagic.h testStandardAttributes.cpp \
 		     testStandardAttributes.h testExistingStreams.cpp \
-		     testExistingStreams.h testScanLineApi.cpp \
-		     testScanLineApi.h testTiledCompression.cpp \
-		     testTiledCompression.h testTiledCopyPixels.cpp \
-		     testTiledCopyPixels.h testTiledLineOrder.cpp \
-		     testTiledLineOrder.h testTiledRgba.cpp \
-		     testTiledRgba.h compareFloat.h compareFloat.cpp \
+		     testExistingStreams.h  \
+		     testTiledCompression.cpp \
+		     testTiledCompression.h  \
+		     testTiledLineOrder.cpp \
+		     testTiledLineOrder.h \
+		     compareFloat.h compareFloat.cpp \
 		     testTiledYa.cpp testTiledYa.h \
 		     testYca.cpp testYca.h compareB44.h compareB44.cpp \
                      testMultiView.cpp testMultiView.h \
Index: openexr-1.7.0/IlmImfTest/Makefile.in
===================================================================
--- openexr-1.7.0.orig/IlmImfTest/Makefile.in	2010-07-22 23:59:41.000000000 +0200
+++ openexr-1.7.0/IlmImfTest/Makefile.in	2011-10-31 15:20:56.064112139 +0100
@@ -56,9 +56,9 @@
 	testWav.$(OBJEXT) testXdr.$(OBJEXT) testConversion.$(OBJEXT) \
 	testNativeFormat.$(OBJEXT) testPreviewImage.$(OBJEXT) \
 	testMagic.$(OBJEXT) testStandardAttributes.$(OBJEXT) \
-	testExistingStreams.$(OBJEXT) testScanLineApi.$(OBJEXT) \
-	testTiledCompression.$(OBJEXT) testTiledCopyPixels.$(OBJEXT) \
-	testTiledLineOrder.$(OBJEXT) testTiledRgba.$(OBJEXT) \
+	testExistingStreams.$(OBJEXT)  \
+	testTiledCompression.$(OBJEXT)  \
+	testTiledLineOrder.$(OBJEXT) \
 	compareFloat.$(OBJEXT) testTiledYa.$(OBJEXT) testYca.$(OBJEXT) \
 	compareB44.$(OBJEXT) testMultiView.$(OBJEXT) \
 	testIsComplete.$(OBJEXT)
@@ -220,10 +220,10 @@
 		     testPreviewImage.cpp testPreviewImage.h \
 		     testMagic.cpp testMagic.h testStandardAttributes.cpp \
 		     testStandardAttributes.h testExistingStreams.cpp \
-		     testExistingStreams.h testScanLineApi.cpp \
-		     testScanLineApi.h testTiledCompression.cpp \
-		     testTiledCompression.h testTiledCopyPixels.cpp \
-		     testTiledCopyPixels.h testTiledLineOrder.cpp \
+		     testExistingStreams.h  \
+		     testTiledCompression.cpp \
+		     testTiledCompression.h  \
+		     testTiledLineOrder.cpp \
 		     testTiledLineOrder.h testTiledRgba.cpp \
 		     testTiledRgba.h compareFloat.h compareFloat.cpp \
 		     testTiledYa.cpp testTiledYa.h \
Index: openexr-1.7.0/IlmImfTest/main.cpp
===================================================================
--- openexr-1.7.0.orig/IlmImfTest/main.cpp	2007-11-10 05:59:07.000000000 +0100
+++ openexr-1.7.0/IlmImfTest/main.cpp	2011-10-31 15:20:16.090712086 +0100
@@ -52,11 +52,8 @@
 #include <testConversion.h>
 #include <testStandardAttributes.h>
 #include <testNativeFormat.h>
-#include <testTiledRgba.h>
 #include <testTiledCompression.h>
-#include <testTiledCopyPixels.h>
 #include <testTiledLineOrder.h>
-#include <testScanLineApi.h>
 #include <testExistingStreams.h>
 #include <testYca.h>
 #include <testTiledYa.h>
@@ -94,11 +91,8 @@
     TEST (testSampleImages);
     TEST (testPreviewImage);
     TEST (testConversion);
-    TEST (testTiledRgba);
-    TEST (testTiledCopyPixels);
     TEST (testTiledCompression);
     TEST (testTiledLineOrder);
-    TEST (testScanLineApi);
     TEST (testExistingStreams);
     TEST (testStandardAttributes);
     TEST (testYca);