[gegl] gegl_buffer_linear_open should return a gpointer, not a gpointer*



commit beed174b06bd8ab7f94dfa79ceae625bd520431b
Author: Michael Henning <drawoc darkrefraction com>
Date:   Wed Apr 1 14:02:35 2015 -0400

    gegl_buffer_linear_open should return a gpointer, not a gpointer*

 gegl/buffer/gegl-buffer-linear.c         |    2 +-
 gegl/buffer/gegl-buffer.h                |    2 +-
 operations/external/path.c               |    2 +-
 operations/external/vector-fill.c        |    2 +-
 operations/external/vector-stroke.c      |    2 +-
 tests/buffer/tests/linear_modify.c       |    2 +-
 tests/buffer/tests/linear_proxy_modify.c |    2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gegl/buffer/gegl-buffer-linear.c b/gegl/buffer/gegl-buffer-linear.c
index 267593b..91b2918 100644
--- 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
index 37c9560..3a78ead 100644
--- 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
index 5e1ab3f..ba708a0 100644
--- 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
index 21ec271..aa58efa 100644
--- 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
index 8e677ee..86b9f6f 100644
--- 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
index 21f0956..eaba30a 100644
--- 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
index 2b5435a..d34a8aa 100644
--- 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;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]