gegl r2481 - in trunk: . tests/buffer tests/buffer/reference

[ok svn gnome org]

Author: ok
Date: Tue Jun 17 20:51:21 2008
New Revision: 2481
URL: http://svn.gnome.org/viewvc/gegl?rev=2481&view=rev

Log:
* tests/buffer/buffer-test.c: (linear_modify), (linear_from_data),
(linear_from_data_rows), (linear_proxy_modify): updated tests
according to API.
* tests/buffer/reference/linear_from_data_rows:
* tests/buffer/reference/linear_proxy_modify:
* tests/buffer/reference/test_gegl_buffer_iterator1:
* tests/buffer/reference/test_gegl_buffer_iterator1sub: added
reference images.


Added:
   trunk/tests/buffer/reference/linear_from_data_rows
   trunk/tests/buffer/reference/linear_proxy_modify   (contents, props changed)
   trunk/tests/buffer/reference/test_gegl_buffer_iterator1   (contents, props changed)
   trunk/tests/buffer/reference/test_gegl_buffer_iterator1sub   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/tests/buffer/buffer-test.c

Modified: trunk/tests/buffer/buffer-test.c
==============================================================================
--- trunk/tests/buffer/buffer-test.c	(original)
+++ trunk/tests/buffer/buffer-test.c	Tue Jun 17 20:51:21 2008
@@ -784,20 +784,18 @@
   roi.x+=20;
 
   {
-    gint    width;
-    gint    height;
     gint    rowstride;
     gfloat *buf;
     gint    x, y, i;
 
-    buf = (gpointer)gegl_buffer_linear_open (buffer, &width, &height, &rowstride, NULL);
+    buf = (gpointer)gegl_buffer_linear_open (buffer, &extent, &rowstride, NULL);
     g_assert (buf);
 
     i=0;
-    for (y=0;y<height;y++)
-      for (x=0;x<width;x++)
+    for (y=0;y<extent.height;y++)
+      for (x=0;x<extent.width;x++)
         {
-          buf[i++]= ((x+y)*1.0) / width;
+          buf[i++]= ((x+y)*1.0) / extent.width;
         }
     gegl_buffer_linear_close (buffer, buf);
   }
@@ -811,6 +809,7 @@
 static gchar * linear_from_data ()
 {
   GeglBuffer   *buffer;
+  GeglRectangle extent = {0,0, 10, 10};
   gfloat       *buf;
   test_start();
 
@@ -820,8 +819,7 @@
     buf[i]=i/100.0;
 
   buffer = gegl_buffer_linear_new_from_data (buf, babl_format ("Y float"),
-                                             10, /* width */
-                                             10, /* height */
+                                             &extent,
                                              10 * 4,
                                              G_CALLBACK(g_free), /* destroy_notify */
                                              NULL   /* destroy_notify_data */);
@@ -833,6 +831,7 @@
 static gchar * linear_from_data_rows ()
 {
   GeglBuffer   *buffer;
+  GeglRectangle extent = {0,0, 10, 10};
   gfloat       *buf;
   test_start();
 
@@ -842,8 +841,7 @@
     buf[i]=i%12==5?0.5:0.0;
 
   buffer = gegl_buffer_linear_new_from_data (buf, babl_format ("Y float"),
-                                             10, /* width */
-                                             10, /* height */
+                                             &extent,
                                              12 * 4,
                                              G_CALLBACK(g_free), /* destroy_notify */
                                              NULL   /* destroy_notify_data */);
@@ -865,20 +863,18 @@
   roi.x+=20;
 
   {
-    gint    width;
-    gint    height;
     gint    rowstride;
     gfloat *buf;
     gint    x, y, i;
 
-    buf = (gpointer)gegl_buffer_linear_open (buffer, &width, &height, &rowstride, NULL);
+    buf = (gpointer)gegl_buffer_linear_open (buffer, &extent, &rowstride, NULL);
     g_assert (buf);
 
     i=0;
-    for (y=0;y<height;y++)
-      for (x=0;x<width;x++)
+    for (y=0;y<extent.height;y++)
+      for (x=0;x<extent.width;x++)
         {
-          buf[i++]= ((x+y)*1.0) / width;
+          buf[i++]= ((x+y)*1.0) / extent.width;
         }
     gegl_buffer_linear_close (buffer, buf);
   }

Added: trunk/tests/buffer/reference/linear_from_data_rows
==============================================================================
--- (empty file)
+++ trunk/tests/buffer/reference/linear_from_data_rows	Tue Jun 17 20:51:21 2008
@@ -0,0 +1,13 @@
+Test: linear_from_data_rows
+ââââââââââââ
+â     â    â
+â     â    â
+â     â    â
+â     â    â
+â     â    â
+â     â    â
+â     â    â
+â     â    â
+â     â    â
+â     â    â
+ââââââââââââ

Added: trunk/tests/buffer/reference/linear_proxy_modify
==============================================================================
Binary file. No diff available.

Added: trunk/tests/buffer/reference/test_gegl_buffer_iterator1
==============================================================================
Binary file. No diff available.

Added: trunk/tests/buffer/reference/test_gegl_buffer_iterator1sub
==============================================================================
Binary file. No diff available.