/hg/gfx-test: Added two new kernels and ROPs associated with tho...

[ptisnovs at icedtea.classpath.org]

changeset 8e663e0cfd11 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=8e663e0cfd11
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Fri Apr 26 09:34:20 2013 +0200

	Added two new kernels and ROPs associated with those kernels.


diffstat:

 ChangeLog                                        |   5 ++
 src/org/gfxtest/testsuites/BitBltConvolveOp.java |  42 +++++++++++++++++------
 2 files changed, 35 insertions(+), 12 deletions(-)

diffs (111 lines):

diff -r d366cf824497 -r 8e663e0cfd11 ChangeLog
--- a/ChangeLog	Thu Apr 25 09:59:09 2013 +0200
+++ b/ChangeLog	Fri Apr 26 09:34:20 2013 +0200
@@ -1,3 +1,8 @@
+2013-04-26  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltConvolveOp.java:
+	Added two new kernels and ROPs associated with those kernels.
+
 2013-04-25  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltBasicTests.java:
diff -r d366cf824497 -r 8e663e0cfd11 src/org/gfxtest/testsuites/BitBltConvolveOp.java
--- a/src/org/gfxtest/testsuites/BitBltConvolveOp.java	Thu Apr 25 09:59:09 2013 +0200
+++ b/src/org/gfxtest/testsuites/BitBltConvolveOp.java	Fri Apr 26 09:34:20 2013 +0200
@@ -74,7 +74,22 @@
 @Zoom(1)
 public class BitBltConvolveOp extends GfxTest
 {
-    private static final Kernel NoOpKernel = new Kernel(1, 1, new float[] {1});
+    private static final Kernel NoOpKernel1x1 = new Kernel(1, 1, new float[] {1});
+
+    private static final Kernel NoOpKernel3x3 = new Kernel(3, 3, new float[] {
+                    0.0f, 0.0f, 0.0f,
+                    0.0f, 1.0f, 0.0f,
+                    0.0f, 0.0f, 0.0f
+    });
+
+    private static final Kernel NoOpKernel5x5 = new Kernel(5, 5, new float[] {
+                    0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+                    0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+                    0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
+                    0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+                    0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+                    });
+
     private static final Kernel SmoothingKernel2x2 = new Kernel(2, 2, new float[] {
                     1/4f, 1/4f,
                     1/4f, 1/4f
@@ -94,7 +109,10 @@
                     1/25f, 1/25f, 1/25f, 1/25f, 1/25f,
                     });
 
-    private static final ConvolveOp noopROP = new ConvolveOp(NoOpKernel);
+    private static final ConvolveOp noopKernel1x1ROP = new ConvolveOp(NoOpKernel1x1);
+    private static final ConvolveOp noopKernel3x3ROP = new ConvolveOp(NoOpKernel3x3);
+    private static final ConvolveOp noopKernel5x5ROP = new ConvolveOp(NoOpKernel5x5);
+
     private static final ConvolveOp smoothingKernel2x2ROP = new ConvolveOp(SmoothingKernel2x2);
     private static final ConvolveOp smoothingKernel3x3ROP = new ConvolveOp(SmoothingKernel3x3);
     private static final ConvolveOp smoothingKernel5x5ROP = new ConvolveOp(SmoothingKernel5x5);
@@ -197,9 +215,9 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundNoOpROP(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundNoOpKernel1x1ROP(TestImage image, Graphics2D graphics2d)
     {
-        return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, noopROP);
+        return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, noopKernel1x1ROP);
     }
 
     /**
@@ -253,9 +271,9 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundNoOpROP(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundNoOpKernel1x1ROP(TestImage image, Graphics2D graphics2d)
     {
-        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, noopROP);
+        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, noopKernel1x1ROP);
     }
 
     /**
@@ -309,9 +327,9 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundNoOpROP(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltDiagonalCheckerBufferedImageType3ByteBGRbackgroundNoOpKernel1x1ROP(TestImage image, Graphics2D graphics2d)
     {
-        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, noopROP);
+        return doBitBltDiagonalCheckerBufferedImageType3ByteRGB(image, graphics2d, noopKernel1x1ROP);
     }
 
     /**
@@ -365,9 +383,9 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltGridBufferedImageType3ByteBGRbackgroundNoOpROP(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltGridBufferedImageType3ByteBGRbackgroundNoOpKernel1x1ROP(TestImage image, Graphics2D graphics2d)
     {
-        return doBitBltGridBufferedImageType3ByteRGB(image, graphics2d, noopROP);
+        return doBitBltGridBufferedImageType3ByteRGB(image, graphics2d, noopKernel1x1ROP);
     }
 
     /**
@@ -421,9 +439,9 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundNoOpROP(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltDiagonalGridBufferedImageType3ByteBGRbackgroundNoOpKernel1x1ROP(TestImage image, Graphics2D graphics2d)
     {
-        return doBitBltDiagonalGridBufferedImageType3ByteRGB(image, graphics2d, noopROP);
+        return doBitBltDiagonalGridBufferedImageType3ByteRGB(image, graphics2d, noopKernel1x1ROP);
     }
 
     /**