/hg/gfx-test: Added new Rescale operators and two new tests into...

[ptisnovs at icedtea.classpath.org]

changeset ff7895f8ac1a in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=ff7895f8ac1a
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Thu Mar 07 10:04:26 2013 +0100

	Added new Rescale operators and two new tests into the test suite
	BitBltRescaleOp.


diffstat:

 ChangeLog                                       |   6 ++
 src/org/gfxtest/testsuites/BitBltRescaleOp.java |  59 ++++++++++++++++++++----
 2 files changed, 55 insertions(+), 10 deletions(-)

diffs (121 lines):

diff -r 1aa1b200b9d7 -r ff7895f8ac1a ChangeLog
--- a/ChangeLog	Wed Mar 06 10:58:59 2013 +0100
+++ b/ChangeLog	Thu Mar 07 10:04:26 2013 +0100
@@ -1,3 +1,9 @@
+2013-03-07  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* src/org/gfxtest/testsuites/BitBltRescaleOp.java:
+	Added new Rescale operators and two new tests into the test suite
+	BitBltRescaleOp.
+
 2013-03-06  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java:
diff -r 1aa1b200b9d7 -r ff7895f8ac1a src/org/gfxtest/testsuites/BitBltRescaleOp.java
--- a/src/org/gfxtest/testsuites/BitBltRescaleOp.java	Wed Mar 06 10:58:59 2013 +0100
+++ b/src/org/gfxtest/testsuites/BitBltRescaleOp.java	Thu Mar 07 10:04:26 2013 +0100
@@ -72,6 +72,10 @@
 public class BitBltRescaleOp extends GfxTest
 {
     private static final float NoFilterScale = 1.0f;
+    private static final float BlackImageScale = 0.0f;
+    private static final float DarkenScale = 0.5f;
+    private static final float LightenScale = 2.0f;
+
     private static final float ZeroOffset = 0.0f;
     private static final float DarkeningOffset = -128;
     private static final float LighteningOffset =  127f;
@@ -80,8 +84,15 @@
     private static final float BlackImageOffset = -255f;
 
     private static final RescaleOp noOpROP = new RescaleOp(NoFilterScale, ZeroOffset, null);
-    private static final RescaleOp darkenROP = new RescaleOp(NoFilterScale, DarkeningOffset, null);
-    private static final RescaleOp lightenROP = new RescaleOp(NoFilterScale, LighteningOffset, null);
+
+    private static final RescaleOp darkenOffsetROP = new RescaleOp(NoFilterScale, DarkeningOffset, null);
+    private static final RescaleOp lightenOffsetROP = new RescaleOp(NoFilterScale, LighteningOffset, null);
+    private static final RescaleOp whiteImageOffsetROP = new RescaleOp(NoFilterScale, WhiteImageOffset, null);
+    private static final RescaleOp blackImageOffsetROP = new RescaleOp(NoFilterScale, BlackImageOffset, null);
+
+    private static final RescaleOp darkenScaleROP = new RescaleOp(DarkenScale, ZeroOffset, null);
+    private static final RescaleOp lightenScaleROP = new RescaleOp(LightenScale, ZeroOffset, null);
+    private static final RescaleOp blackImageScaleROP = new RescaleOp(BlackImageScale, ZeroOffset, null);
 
     /**
      * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR
@@ -141,9 +152,9 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundDarkenROP(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundDarkenOffsetROP(TestImage image, Graphics2D graphics2d)
     {
-        return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, darkenROP);
+        return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, darkenOffsetROP);
     }
 
     /**
@@ -155,9 +166,37 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundLightenROP(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundLightenOffsetROP(TestImage image, Graphics2D graphics2d)
     {
-        return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, lightenROP);
+        return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, lightenOffsetROP);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundWhiteImageOffsetROP(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, whiteImageOffsetROP);
+    }
+
+    /**
+     * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR.
+     *
+     * @param image
+     *            image used as a destination for BitBlt-type operations
+     * @param graphics2d
+     *            graphics canvas
+     * @return test result status - PASSED, FAILED or ERROR
+     */
+    public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundBlackImageOffsetROP(TestImage image, Graphics2D graphics2d)
+    {
+        return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, blackImageOffsetROP);
     }
 
     /**
@@ -183,9 +222,9 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundDarkenROP(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundDarkenOffsetROP(TestImage image, Graphics2D graphics2d)
     {
-        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, darkenROP);
+        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, darkenOffsetROP);
     }
 
     /**
@@ -197,9 +236,9 @@
      *            graphics canvas
      * @return test result status - PASSED, FAILED or ERROR
      */
-    public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundLightenROP(TestImage image, Graphics2D graphics2d)
+    public TestResult testBitBltCheckerBufferedImageType3ByteBGRbackgroundLightenOffsetROP(TestImage image, Graphics2D graphics2d)
     {
-        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, lightenROP);
+        return doBitBltCheckerBufferedImageType3ByteRGB(image, graphics2d, lightenOffsetROP);
     }
 
     /**