[cutter-commit 02397] SF.net SVN: cutter:[2401] cutter/trunk

[<kt...@us...>]

Revision: 2401
          http://cutter.svn.sourceforge.net/cutter/?rev=2401&view=rev
Author:   ktou
Date:     2008-09-15 12:43:01 +0000 (Mon, 15 Sep 2008)

Log Message:
-----------
* test/test-gdkcut-pixbuf.c (test_equal_content_threshold),
  test/fixtures/pixbuf/max-3-pixel-value-different-dark-circle.png,
  gdkcutter-pixbuf/gdkcut-pixbuf-assertions.h: implement
  gdkcut_pixbuf_equal_content() with threshold support.

Modified Paths:
--------------
    cutter/trunk/ChangeLog
    cutter/trunk/gdkcutter-pixbuf/gdkcut-pixbuf-assertions.h
    cutter/trunk/test/fixtures/pixbuf/Makefile.am
    cutter/trunk/test/test-gdkcut-pixbuf.c

Added Paths:
-----------
    cutter/trunk/test/fixtures/pixbuf/max-3-pixel-value-different-dark-circle.png

Modified: cutter/trunk/ChangeLog
===================================================================
--- cutter/trunk/ChangeLog	2008-09-15 12:24:18 UTC (rev 2400)
+++ cutter/trunk/ChangeLog	2008-09-15 12:43:01 UTC (rev 2401)
@@ -1,8 +1,13 @@
 2008-09-15  Kouhei Sutou  <ko...@co...>
 
+	* test/test-gdkcut-pixbuf.c (test_equal_content_threshold),
+	test/fixtures/pixbuf/max-3-pixel-value-different-dark-circle.png,
+	gdkcutter-pixbuf/gdkcut-pixbuf-assertions.h: implement
+	gdkcut_pixbuf_equal_content() with threshold support.
+
 	* gdkcutter-pixbuf/gdkcut-pixbuf.c (pixels_equal),
 	test/test-gdkcut-pixbuf.c (test_equal_content): implement
-	gdkcut_pixbuf_equal_content() without threshold.
+	gdkcut_pixbuf_equal_content() without threshold support.
 
 	* configure.ac, Makefile.am, gdkcutter-pixbuf/,
 	gdkcutter-pixbuf.pc.in, test/fixtures/pixbuf/,

Modified: cutter/trunk/gdkcutter-pixbuf/gdkcut-pixbuf-assertions.h
===================================================================
--- cutter/trunk/gdkcutter-pixbuf/gdkcut-pixbuf-assertions.h	2008-09-15 12:24:18 UTC (rev 2400)
+++ cutter/trunk/gdkcutter-pixbuf/gdkcut-pixbuf-assertions.h	2008-09-15 12:43:01 UTC (rev 2401)
@@ -42,8 +42,17 @@
  * @...: optional format string, followed by parameters to insert
  *       into the format string (as with printf())
  *
- * Passes if @expected == @actual within threshold difference.
+ * Passes if @expected == @actual. If difference of each
+ * corresponding pixel value is within threshold, @expected
+ * and @actual are treated as equal image.
  *
+ * If threshold is 3, pixel value of @expected at (1, 1) is
+ * 127 and pixel value of @actual at (1, 1) is 131, @actual
+ * doesn't equals to @expected. If pixel value of @actual at
+ * (1, 1) is 130, @actual may equal to @expected. (All other
+ * corresponding pixel values are needed to fill this
+ * condition.)
+ *
  * Since: 1.0.5
  */
 #define gdkcut_pixbuf_assert_equal(expected, actual, threshold, ...) do \

Modified: cutter/trunk/test/fixtures/pixbuf/Makefile.am
===================================================================
--- cutter/trunk/test/fixtures/pixbuf/Makefile.am	2008-09-15 12:24:18 UTC (rev 2400)
+++ cutter/trunk/test/fixtures/pixbuf/Makefile.am	2008-09-15 12:43:01 UTC (rev 2401)
@@ -1,4 +1,5 @@
-EXTRA_DIST =			\
-	dark-circle.png		\
-	nested-circle.png	\
-	small-circle.png
+EXTRA_DIST =						\
+	dark-circle.png					\
+	nested-circle.png				\
+	small-circle.png				\
+	max-3-pixel-value-different-dark-circle.png


Property changes on: cutter/trunk/test/fixtures/pixbuf/max-3-pixel-value-different-dark-circle.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Modified: cutter/trunk/test/test-gdkcut-pixbuf.c
===================================================================
--- cutter/trunk/test/test-gdkcut-pixbuf.c	2008-09-15 12:24:18 UTC (rev 2400)
+++ cutter/trunk/test/test-gdkcut-pixbuf.c	2008-09-15 12:43:01 UTC (rev 2401)
@@ -5,6 +5,7 @@
 
 void test_equal_property(void);
 void test_equal_content(void);
+void test_equal_content_threshold(void);
 
 static GdkPixbuf *pixbuf1, *pixbuf2;
 
@@ -75,6 +76,17 @@
     cut_assert_false(gdkcut_pixbuf_equal_content(pixbuf1, pixbuf2, 0));
 }
 
+void
+test_equal_content_threshold (void)
+{
+    pixbuf1 = load_pixbuf("dark-circle.png");
+    pixbuf2 = load_pixbuf("max-3-pixel-value-different-dark-circle.png");
+
+    cut_assert_false(gdkcut_pixbuf_equal_content(pixbuf1, pixbuf2, 0));
+    cut_assert_true(gdkcut_pixbuf_equal_content(pixbuf1, pixbuf1, 3));
+    cut_assert_false(gdkcut_pixbuf_equal_content(pixbuf1, pixbuf2, 2));
+}
+
 /*
 vi:nowrap:ai:expandtab:sw=4:ts=4
 */


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