gegl r2153 - in trunk: . gegl gegl/operation operations/common operations/external

[ok svn gnome org]

Author: ok
Date: Sun Apr  6 23:23:56 2008
New Revision: 2153
URL: http://svn.gnome.org/viewvc/gegl?rev=2153&view=rev

Log:
* gegl/gegl-chant.h: modified to not generate as many warnings about
not priorly declared function prototypes.
* gegl/gegl-dot.c: add function prototype.
* gegl/gegl-init.c: do not add an erronious pkg-config
lineto the makefile.
* gegl/operation/gegl-operation.h: added protoype for
gegl_list_properties()
* operations/common/gaussian-blur.c:
* operations/common/mblur.c:
* operations/external/ff-load.c:
* operations/external/png-load.c:
* operations/external/png-save.c:
* operations/external/svg-load.c: Fixed lack off function
declarations/made functions static.


Modified:
   trunk/ChangeLog
   trunk/gegl/gegl-chant.h
   trunk/gegl/gegl-dot.c
   trunk/gegl/gegl-init.c
   trunk/gegl/operation/gegl-operation.h
   trunk/operations/common/gaussian-blur.c
   trunk/operations/common/mblur.c
   trunk/operations/external/ff-load.c
   trunk/operations/external/png-load.c
   trunk/operations/external/png-save.c
   trunk/operations/external/svg-load.c

Modified: trunk/gegl/gegl-chant.h
==============================================================================
--- trunk/gegl/gegl-chant.h	(original)
+++ trunk/gegl/gegl-chant.h	Sun Apr  6 23:23:56 2008
@@ -29,7 +29,7 @@
 #include <gegl-plugin.h>
 
 
-GType gegl_chant_get_type ();
+GType gegl_chant_get_type (void);
 typedef struct _GeglChantO  GeglChantO;
 typedef struct _GeglChant   GeglChant;
 
@@ -256,6 +256,10 @@
   GEGL_MODULE_ABI_VERSION
 };
 
+/* prototypes added to silence warnings from gcc for -Wmissing-prototypes*/
+gboolean                gegl_module_register (GTypeModule *module);
+const GeglModuleInfo  * gegl_module_query    (GTypeModule *module);
+
 G_MODULE_EXPORT const GeglModuleInfo *
 gegl_module_query (GTypeModule *module)
 {

Modified: trunk/gegl/gegl-dot.c
==============================================================================
--- trunk/gegl/gegl-dot.c	(original)
+++ trunk/gegl/gegl-dot.c	Sun Apr  6 23:23:56 2008
@@ -28,6 +28,10 @@
 #include "graph/gegl-connection.h"
 #include "gegl.h"
 
+gchar * gegl_to_dot (GeglNode *node); /* this should be in a gegl-dot.h header
+                                       * for consistency?
+                                       */
+
 static void
 gegl_add_graph (GString     *string,
                 GeglNode    *node,

Modified: trunk/gegl/gegl-init.c
==============================================================================
--- trunk/gegl/gegl-init.c	(original)
+++ trunk/gegl/gegl-init.c	Sun Apr  6 23:23:56 2008
@@ -327,7 +327,7 @@
     "# add a dedicated target with the extra bits linked in.\n"
     "\n\n"
     "CFLAGS  += `pkg-config gegl --cflags`  -I. -fPIC\n"
-    "LDFLAGS += `pkg-config --libs` -shared\n"
+    /*"LDFLAGS += `pkg-config --libs` -shared\n"*/
     "SHREXT=.so\n"
     "CFILES = $(wildcard ./*.c)\n"
     "SOBJS  = $(subst ./,,$(CFILES:.c=$(SHREXT)))\n"

Modified: trunk/gegl/operation/gegl-operation.h
==============================================================================
--- trunk/gegl/operation/gegl-operation.h	(original)
+++ trunk/gegl/operation/gegl-operation.h	Sun Apr  6 23:23:56 2008
@@ -201,6 +201,9 @@
 GeglNode      * gegl_operation_get_source_node (GeglOperation *operation,
                                                 const gchar   *pad_name);
 
+GParamSpec ** gegl_list_properties (const gchar *operation_type,
+                                    guint       *n_properties_p);
+
 G_END_DECLS
 
 /***

Modified: trunk/operations/common/gaussian-blur.c
==============================================================================
--- trunk/operations/common/gaussian-blur.c	(original)
+++ trunk/operations/common/gaussian-blur.c	Sun Apr  6 23:23:56 2008
@@ -415,12 +415,14 @@
   gdouble     B, b[4];
   gdouble    *cmatrix;
   gint        cmatrix_len;
+  gboolean    force_iir;
+  gboolean    force_fir;
 
   temp  = gegl_buffer_new (gegl_buffer_get_extent (input),
                            babl_format ("RaGaBaA float"));
 
-  gboolean force_iir = o->filter && !strcmp (o->filter, "iir");
-  gboolean force_fir = o->filter && !strcmp (o->filter, "fir");
+  force_iir = o->filter && !strcmp (o->filter, "iir");
+  force_fir = o->filter && !strcmp (o->filter, "fir");
 
   if ((force_iir || o->std_dev_x > 1.0) && !force_fir)
     {

Modified: trunk/operations/common/mblur.c
==============================================================================
--- trunk/operations/common/mblur.c	(original)
+++ trunk/operations/common/mblur.c	Sun Apr  6 23:23:56 2008
@@ -35,15 +35,15 @@
 static void
 init (GeglChantO *operation)
 {
-  GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
-  Priv       *priv = (Priv*)o->chant_data;
+  GeglChantO   *o = GEGL_CHANT_PROPERTIES (operation);
+  Priv         *priv = (Priv*)o->chant_data;
+  GeglRectangle extent = {0,0,1024,1024};
 
   g_assert (priv == NULL);
 
   priv = g_new0 (Priv, 1);
   o->chant_data = (void*) priv;
 
-  GeglRectangle extent = {0,0,1024,1024};
   priv->acc = gegl_buffer_new (&extent, babl_format ("RGBA float"));
 }
 

Modified: trunk/operations/external/ff-load.c
==============================================================================
--- trunk/operations/external/ff-load.c	(original)
+++ trunk/operations/external/ff-load.c	Sun Apr  6 23:23:56 2008
@@ -17,7 +17,7 @@
  */
 #ifdef GEGL_CHANT_PROPERTIES
 
-gegl_chant_path (path, "File", "", "Path of file to load.")
+gegl_chant_path (path, "File", "/home/pippin/input.avi", "Path of file to load.")
 gegl_chant_int (frame, "Frame", 0, 1000000, 0, "frame number")
 
 #else

Modified: trunk/operations/external/png-load.c
==============================================================================
--- trunk/operations/external/png-load.c	(original)
+++ trunk/operations/external/png-load.c	Sun Apr  6 23:23:56 2008
@@ -224,10 +224,10 @@
   return 0;
 }
 
-gint query_png (const gchar *path,
-                gint        *width,
-                gint        *height,
-                gpointer    *format)
+static gint query_png (const gchar *path,
+                       gint        *width,
+                       gint        *height,
+                       gpointer    *format)
 {
   png_uint_32   w;
   png_uint_32   h;

Modified: trunk/operations/external/png-save.c
==============================================================================
--- trunk/operations/external/png-save.c	(original)
+++ trunk/operations/external/png-save.c	Sun Apr  6 23:23:56 2008
@@ -32,6 +32,18 @@
 #include <png.h>
 #include <stdio.h>
 
+/* this call is available when the png-save plug-in is loaded,
+ * it might have to be dlsymed to be used?
+ */
+gint
+gegl_buffer_export_png (GeglBuffer  *gegl_buffer,
+                        const gchar *path,
+                        gint         compression,
+                        gint         src_x,
+                        gint         src_y,
+                        gint         width,
+                        gint         height);
+
 gint
 gegl_buffer_export_png (GeglBuffer  *gegl_buffer,
                         const gchar *path,

Modified: trunk/operations/external/svg-load.c
==============================================================================
--- trunk/operations/external/svg-load.c	(original)
+++ trunk/operations/external/svg-load.c	Sun Apr  6 23:23:56 2008
@@ -118,7 +118,7 @@
   vals->resolution = 0.0;
 }
 
-gint
+static gint
 query_svg (const gchar *path,
            gint        *width,
            gint        *height)