GNOME.org
 

[gegl/gsoc2009-gpu: 13/15] Fix some compiler errors and warnings

commit 485a2fd7cf2f93cce0307121c508b1ca9be204ca
Author: Jerson Michael Perpetua <jersonperpetua gmail com>
Date:   Mon Jun 22 05:18:10 2009 +0800

    Fix some compiler errors and warnings
    
    * Return a pointer to guchar instead of a pointer to void in gegl_tile_data
      to allow pointer arithmetic
    * Rename gegl_tile_index() to gegl_tile_indice() (apparently, I screwed
      up my previous commit)
    * Return a pointer to the babl format instead of a pointer to void
    * Include gegl/gpu to all Makefile.ams that also include gegl/buffer

 bin/Makefile.am                 |    4 +++-
 examples/Makefile.am            |    6 +++---
 gegl/buffer/gegl-tile.c         |    6 +++---
 gegl/buffer/gegl-tile.h         |    6 +++---
 gegl/gpu/Makefile.am            |    4 +++-
 gegl/graph/Makefile.am          |    4 +++-
 gegl/module/Makefile.am         |    4 +++-
 gegl/operation/Makefile.am      |    4 +++-
 gegl/process/Makefile.am        |    4 +++-
 gegl/property-types/Makefile.am |    4 +++-
 operations/Makefile-common.am   |    4 +++-
 tests/Makefile.am               |    4 +++-
 tests/buffer/Makefile.am        |    4 +++-
 tools/Makefile.am               |    4 +++-
 14 files changed, 42 insertions(+), 20 deletions(-)
---
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 22b972d..a792aea 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -13,7 +13,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/operation \
 	-I$(top_srcdir)/gegl/operation \
 	-I$(top_builddir)/gegl/module \
-	-I$(top_srcdir)/gegl/module
+	-I$(top_srcdir)/gegl/module \
+	-I$(top_builddir)/gegl/gpu \
+	-I$(top_srcdir)/gegl/gpu
 
 AM_CFLAGS = \
 	$(DEP_CFLAGS) $(BABL_CFLAGS) $(PNG_CFLAGS)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index b0251e5..e4b440c 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -22,12 +22,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/gegl/buffer \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
-	-I$(top_builddir)/gegl/buffer \
-	-I$(top_srcdir)/gegl/buffer \
 	-I$(top_builddir)/gegl/operation \
 	-I$(top_srcdir)/gegl/operation \
 	-I$(top_builddir)/gegl/module \
-	-I$(top_srcdir)/gegl/module
+	-I$(top_srcdir)/gegl/module \
+	-I$(top_builddir)/gegl/gpu \
+	-I$(top_srcdir)/gegl/gpu
 
 AM_CFLAGS = $(DEP_CFLAGS) $(GTK_CFLAGS) $(BABL_CFLAGS) $(PNG_CFLAGS)
 
diff --git a/gegl/buffer/gegl-tile.c b/gegl/buffer/gegl-tile.c
index 9793ae5..6d68ab5 100644
--- a/gegl/buffer/gegl-tile.c
+++ b/gegl/buffer/gegl-tile.c
@@ -254,10 +254,10 @@ gegl_tile_new (gint width, gint height, const Babl *format)
   return tile;
 }
 
-void *
+Babl *
 gegl_tile_get_format (GeglTile *tile)
 {
-  return (void *) tile->tile_storage->format;
+  return tile->tile_storage->format;
 }
 
 gint
@@ -272,7 +272,7 @@ gegl_tile_get_height (GeglTile *tile)
   return tile->tile_storage->tile_height;
 }
 
-void *
+guchar *
 gegl_tile_get_data (GeglTile *tile)
 {
   return tile->data;
diff --git a/gegl/buffer/gegl-tile.h b/gegl/buffer/gegl-tile.h
index 997213a..54dd177 100644
--- a/gegl/buffer/gegl-tile.h
+++ b/gegl/buffer/gegl-tile.h
@@ -113,7 +113,7 @@ GeglTile       *gegl_tile_new          (gint width,
                                         gint height,
                                         const Babl *format);
 
-void           *gegl_tile_get_format   (GeglTile *tile);
+Babl           *gegl_tile_get_format   (GeglTile *tile);
 gint            gegl_tile_get_width    (GeglTile *tile);
 gint            gegl_tile_get_height   (GeglTile *tile);
 
@@ -124,7 +124,7 @@ void            gegl_tile_lock         (GeglTile *tile,
                                         GeglTileLockMode lock_mode);
 
 /* get a pointer to the linear buffer of the tile */
-void           *gegl_tile_get_data     (GeglTile *tile);
+guchar         *gegl_tile_get_data     (GeglTile *tile);
 
 /* get a pointer to the GPU data of the tile */
 GeglGpuTexture *gegl_tile_get_gpu_data (GeglTile *tile);
@@ -151,7 +151,7 @@ GeglTile       *gegl_tile_dup          (GeglTile *tile);
 /* helper function to compute tile indices and offsets for coordinates
  * based on a tile stride (tile_width or tile_height)
  */
-#define gegl_tile_indice(coordinate, stride) \
+#define gegl_tile_index(coordinate, stride) \
                    (((coordinate) >= 0) ? \
                      (coordinate) / (stride) : \
                      ((((coordinate) + 1) / (stride)) - 1))
diff --git a/gegl/gpu/Makefile.am b/gegl/gpu/Makefile.am
index d6d66f9..680b963 100644
--- a/gegl/gpu/Makefile.am
+++ b/gegl/gpu/Makefile.am
@@ -5,7 +5,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/buffer \
-	-I$(top_srcdir)/gegl/buffer
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/gpu \
+	-I$(top_srcdir)/gegl/gpu
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS) $(GPU_CFLAGS)
 
diff --git a/gegl/graph/Makefile.am b/gegl/graph/Makefile.am
index 66cdf66..d8333fb 100644
--- a/gegl/graph/Makefile.am
+++ b/gegl/graph/Makefile.am
@@ -5,7 +5,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/buffer \
-	-I$(top_srcdir)/gegl/buffer
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/gpu \
+	-I$(top_srcdir)/gegl/gpu
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/gegl/module/Makefile.am b/gegl/module/Makefile.am
index b975094..3615fd7 100644
--- a/gegl/module/Makefile.am
+++ b/gegl/module/Makefile.am
@@ -5,7 +5,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/buffer \
 	-I$(top_srcdir)/gegl/buffer \
 	-I$(top_builddir)/gegl/property-types \
-	-I$(top_srcdir)/gegl/property-types
+	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_builddir)/gegl/gpu \
+	-I$(top_srcdir)/gegl/gpu
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/gegl/operation/Makefile.am b/gegl/operation/Makefile.am
index 3c7af66..43d4d68 100644
--- a/gegl/operation/Makefile.am
+++ b/gegl/operation/Makefile.am
@@ -5,7 +5,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/buffer \
-	-I$(top_srcdir)/gegl/buffer
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/gpu \
+	-I$(top_srcdir)/gegl/gpu
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/gegl/process/Makefile.am b/gegl/process/Makefile.am
index 8ad6f91..91deb8b 100644
--- a/gegl/process/Makefile.am
+++ b/gegl/process/Makefile.am
@@ -5,7 +5,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/buffer \
-	-I$(top_srcdir)/gegl/buffer
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/gpu \
+	-I$(top_srcdir)/gegl/gpu
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/gegl/property-types/Makefile.am b/gegl/property-types/Makefile.am
index 4d71c4a..5274637 100644
--- a/gegl/property-types/Makefile.am
+++ b/gegl/property-types/Makefile.am
@@ -3,7 +3,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl \
 	-I$(top_srcdir)/gegl \
 	-I$(top_builddir)/gegl/buffer \
-	-I$(top_srcdir)/gegl/buffer
+	-I$(top_srcdir)/gegl/buffer \
+	-I$(top_builddir)/gegl/gpu \
+	-I$(top_srcdir)/gegl/gpu
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/operations/Makefile-common.am b/operations/Makefile-common.am
index 319ba5e..a439887 100644
--- a/operations/Makefile-common.am
+++ b/operations/Makefile-common.am
@@ -19,7 +19,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/module \
-	-I$(top_srcdir)/gegl/module
+	-I$(top_srcdir)/gegl/module \
+	-I$(top_builddir)/gegl/gpu \
+	-I$(top_srcdir)/gegl/gpu
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4f37afe..4358dcb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,7 +21,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/operation \
-	-I$(top_srcdir)/gegl/operation
+	-I$(top_srcdir)/gegl/operation \
+	-I$(top_builddir)/gegl/gpu \
+	-I$(top_srcdir)/gegl/gpu
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
diff --git a/tests/buffer/Makefile.am b/tests/buffer/Makefile.am
index 4aef7e2..d9ced85 100644
--- a/tests/buffer/Makefile.am
+++ b/tests/buffer/Makefile.am
@@ -16,7 +16,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/property-types \
 	-I$(top_srcdir)/gegl/property-types \
 	-I$(top_builddir)/gegl/operation \
-	-I$(top_srcdir)/gegl/operation
+	-I$(top_srcdir)/gegl/operation \
+	-I$(top_builddir)/gegl/gpu \
+	-I$(top_srcdir)/gegl/gpu
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
 
 buffer_test_LDADD = 						\
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 778a7ce..c9d79d9 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -11,7 +11,9 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/gegl/module \
 	-I$(top_srcdir)/gegl/module \
 	-I$(top_builddir)/gegl/property-types \
-	-I$(top_srcdir)/gegl/property-types
+	-I$(top_srcdir)/gegl/property-types \
+	-I$(top_builddir)/gegl/gpu \
+	-I$(top_srcdir)/gegl/gpu
 
 AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]