gegl_buffer_linear_open should return a gpointer, not a gpointer*

zongwave · Apr 1, 2015 · beed174 · beed174
1 parent 9b14848
commit beed174
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/gegl/buffer/gegl-buffer-linear.c b/gegl/buffer/gegl-buffer-linear.c
@@ -134,7 +134,7 @@ typedef struct {
 /* FIXME: make this use direct data access in more cases than the
  * case of the base buffer.
  */
-gpointer *
+gpointer
 gegl_buffer_linear_open (GeglBuffer          *buffer,
                          const GeglRectangle *extent,   /* if NULL, use buf  */
                          gint                *rowstride,/* returns rowstride */

diff --git a/gegl/buffer/gegl-buffer.h b/gegl/buffer/gegl-buffer.h
@@ -631,7 +631,7 @@ GeglBuffer * gegl_buffer_linear_new_from_data (const gpointer       data,
  * request is compatible with the underlying data storage direct access
  * to the underlying data is provided. Otherwise, it returns a copy of the data.
  */
-gpointer *      gegl_buffer_linear_open       (GeglBuffer          *buffer,
+gpointer        gegl_buffer_linear_open       (GeglBuffer          *buffer,
                                                const GeglRectangle *extent,
                                                gint                *rowstride,
                                                const Babl          *format);

diff --git a/operations/external/path.c b/operations/external/path.c
@@ -382,7 +382,7 @@ process (GeglOperation       *operation,
           guchar *data;
 
           g_mutex_lock (&mutex);
-          data = (void*)gegl_buffer_linear_open (output, result, NULL, babl_format ("B'aG'aR'aA u8"));
+          data = gegl_buffer_linear_open (output, result, NULL, babl_format ("B'aG'aR'aA u8"));
           surface = cairo_image_surface_create_for_data (data,
                                                          CAIRO_FORMAT_ARGB32,
                                                          result->width,

diff --git a/operations/external/vector-fill.c b/operations/external/vector-fill.c
@@ -151,7 +151,7 @@ process (GeglOperation       *operation,
       guchar *data;
 
       g_mutex_lock (&mutex);
-      data = (void*)gegl_buffer_linear_open (output, result, NULL, babl_format ("cairo-ARGB32"));
+      data = gegl_buffer_linear_open (output, result, NULL, babl_format ("cairo-ARGB32"));
       surface = cairo_image_surface_create_for_data (data,
                                                      CAIRO_FORMAT_ARGB32,
                                                      result->width,

diff --git a/operations/external/vector-stroke.c b/operations/external/vector-stroke.c
@@ -178,7 +178,7 @@ process (GeglOperation       *operation,
       guchar *data;
 
       g_mutex_lock (&mutex);
-      data = (void*)gegl_buffer_linear_open (output, result, NULL, babl_format ("cairo-ARGB32"));
+      data = gegl_buffer_linear_open (output, result, NULL, babl_format ("cairo-ARGB32"));
       surface = cairo_image_surface_create_for_data (data,
                                                      CAIRO_FORMAT_ARGB32,
                                                      result->width,

diff --git a/tests/buffer/tests/linear_modify.c b/tests/buffer/tests/linear_modify.c
@@ -14,7 +14,7 @@ TEST ()
     gfloat *buf;
     gint    x, y, i;
 
-    buf = (gpointer)gegl_buffer_linear_open (buffer, &extent, &rowstride, NULL);
+    buf = gegl_buffer_linear_open (buffer, &extent, &rowstride, NULL);
     g_assert (buf);
 
     i=0;

diff --git a/tests/buffer/tests/linear_proxy_modify.c b/tests/buffer/tests/linear_proxy_modify.c
@@ -14,7 +14,7 @@ TEST ()
     gfloat *buf;
     gint    x, y, i;
 
-    buf = (gpointer)gegl_buffer_linear_open (buffer, &extent, &rowstride, NULL);
+    buf = gegl_buffer_linear_open (buffer, &extent, &rowstride, NULL);
     g_assert (buf);
 
     i=0;