gegl r2990 - in trunk: . gegl/property-types operations/common operations/external operations/workshop/external

[martinn svn gnome org]

Author: martinn
Date: Thu Mar 26 18:06:43 2009
New Revision: 2990
URL: http://svn.gnome.org/viewvc/gegl?rev=2990&view=rev

Log:
Some vendor C compilers choke on C++ comments

Patch from Gary V. Vaughan.

Modified:
   trunk/ChangeLog
   trunk/gegl/property-types/gegl-path.c
   trunk/operations/common/remap.c
   trunk/operations/external/display.c
   trunk/operations/external/jpg-load.c
   trunk/operations/external/png-load.c
   trunk/operations/external/svg-load.c
   trunk/operations/workshop/external/ff-save.c

Modified: trunk/gegl/property-types/gegl-path.c
==============================================================================
--- trunk/gegl/property-types/gegl-path.c	(original)
+++ trunk/gegl/property-types/gegl-path.c	Thu Mar 26 18:06:43 2009
@@ -403,7 +403,7 @@
 
   while (iter)
     {
-      //fprintf (stderr, "%c, %i %i\n", iter->d.type, iter->d.point[0].x, iter->d.point[0].y);
+      /*fprintf (stderr, "%c, %i %i\n", iter->d.type, iter->d.point[0].x, iter->d.point[0].y);*/
       switch (iter->d.type)
         {
           case 'M':
@@ -493,7 +493,7 @@
   iter = path;
   while (iter)
     {
-      //fprintf (stderr, "%c, %i %i\n", iter->d.type, iter->d.point[0].x, iter->d.point[0].y);
+      /*fprintf (stderr, "%c, %i %i\n", iter->d.type, iter->d.point[0].x, iter->d.point[0].y);*/
       switch (iter->d.type)
         {
           case 'M':
@@ -2082,7 +2082,7 @@
 
   while (iter)
     {
-      //fprintf (stderr, "%c, %i %i\n", iter->d.type, iter->d.point[0].x, iter->d.point[0].y);
+      /*fprintf (stderr, "%c, %i %i\n", iter->d.type, iter->d.point[0].x, iter->d.point[0].y);*/
       switch (iter->d.type)
         {
           case 'M':

Modified: trunk/operations/common/remap.c
==============================================================================
--- trunk/operations/common/remap.c	(original)
+++ trunk/operations/common/remap.c	Thu Mar 26 18:06:43 2009
@@ -24,8 +24,8 @@
 #ifdef GEGL_CHANT_PROPERTIES
 
 #if 0
-//gegl_chant_string ("xlow",  "hm", _("low description"))
-//gegl_chant_string ("xhigh", "hm", _("high description"))
+gegl_chant_string ("xlow",  "hm", _("low description"))
+gegl_chant_string ("xhigh", "hm", _("high description"))
 #endif
 
 #else

Modified: trunk/operations/external/display.c
==============================================================================
--- trunk/operations/external/display.c	(original)
+++ trunk/operations/external/display.c	Thu Mar 26 18:06:43 2009
@@ -102,7 +102,7 @@
 {
   GeglChantO   *o = GEGL_CHANT_PROPERTIES (operation);
   GeglBuffer   *source;
-  SDL_Surface **sdl_outwin = NULL;      //op_sym (op, "sdl_outwin");
+  SDL_Surface **sdl_outwin = NULL;      /*op_sym (op, "sdl_outwin");*/
 
   init_sdl ();
   if (!handle)

Modified: trunk/operations/external/jpg-load.c
==============================================================================
--- trunk/operations/external/jpg-load.c	(original)
+++ trunk/operations/external/jpg-load.c	Thu Mar 26 18:06:43 2009
@@ -209,13 +209,13 @@
   operation_class->categories  = "hidden";
   operation_class->description = _("JPG image loader");
 
-//  static gboolean done=FALSE;
-//  if (done)
-//    return;
+/*  static gboolean done=FALSE;
+    if (done)
+      return; */
   gegl_extension_handler_register (".jpg", "gegl:jpg-load");
   gegl_extension_handler_register (".JPG", "gegl:jpg-load");
   gegl_extension_handler_register (".jpeg", "gegl:jpg-load");
   gegl_extension_handler_register (".JPEG", "gegl:jpg-load");
-//  done = TRUE;
+/*  done = TRUE; */
 }
 #endif

Modified: trunk/operations/external/png-load.c
==============================================================================
--- trunk/operations/external/png-load.c	(original)
+++ trunk/operations/external/png-load.c	Thu Mar 26 18:06:43 2009
@@ -55,7 +55,7 @@
   png_infop      load_info_ptr;
   unsigned char  header[8];
   guchar        *pixels;
-  //png_bytep     *rows;
+  /*png_bytep     *rows;*/
 
 
   unsigned   int i;
@@ -431,12 +431,12 @@
   operation_class->categories  = "hidden";
   operation_class->description = _("PNG image loader.");
 
-//  static gboolean done=FALSE;
-//  if (done)
-//    return;
+/*  static gboolean done=FALSE;
+    if (done)
+      return; */
   gegl_extension_handler_register (".png", "gegl:png-load");
   gegl_extension_handler_register (".PNG", "gegl:png-load");
-//  done = TRUE;
+/*  done = TRUE; */
 }
 
 #endif

Modified: trunk/operations/external/svg-load.c
==============================================================================
--- trunk/operations/external/svg-load.c	(original)
+++ trunk/operations/external/svg-load.c	Thu Mar 26 18:06:43 2009
@@ -238,14 +238,14 @@
   operation_class->categories  = "input";   /* not hidden because it has extra API */
   operation_class->description = _("Load an SVG file using librsvg");
 
-//  static gboolean done=FALSE;
-//  if (done)
-//    return;
+/*  static gboolean done=FALSE;
+    if (done)
+      return; */
   gegl_extension_handler_register (".svg", "gegl:svg-load");
   gegl_extension_handler_register (".SVG", "gegl:svg-load");
   gegl_extension_handler_register (".svgz", "gegl:svg-load");
   gegl_extension_handler_register (".SVGZ", "gegl:svg-load");
-//  done = TRUE;
+/*  done = TRUE; */
 }
 
 #endif

Modified: trunk/operations/workshop/external/ff-save.c
==============================================================================
--- trunk/operations/workshop/external/ff-save.c	(original)
+++ trunk/operations/workshop/external/ff-save.c	Thu Mar 26 18:06:43 2009
@@ -422,7 +422,7 @@
     {
       p->audio_input_frame_size = c->frame_size;
     }
-  //audio_input_frame_size = 44100/25;
+  /*audio_input_frame_size = 44100/25;*/
   p->samples = malloc (p->audio_input_frame_size * 2 * c->channels);
 }
 
@@ -437,7 +437,7 @@
 
   c = st->codec;
 
-  //fprintf (stderr, "going to grab %i\n", p->fragment_size);
+  /*fprintf (stderr, "going to grab %i\n", p->fragment_size);*/
   if (p->oxide_audio_get_fragment (p->oxide_audio_instance,
                                    p->fragment) == (signed) p->fragment_size)
     {
@@ -465,7 +465,7 @@
     }
 }
 
-//p->audio_get_frame (samples, audio_input_frame_size, c->channels);
+/*p->audio_get_frame (samples, audio_input_frame_size, c->channels);*/
 
 void
 close_audio (Priv * p, AVFormatContext * oc, AVStream * st)
@@ -747,7 +747,7 @@
     }
   if (p->oxide_audio_query && p->fmt->audio_codec != CODEC_ID_NONE)
     {
-     //XXX: FOO p->audio_st = add_audio_stream (op, p->oc, p->fmt->audio_codec);
+     /*XXX: FOO p->audio_st = add_audio_stream (op, p->oc, p->fmt->audio_codec);*/
     }
 
   if (av_set_parameters (p->oc, NULL) < 0)