babl r398 - in trunk: . babl babl/base tests

[martinn svn gnome org]

Author: martinn
Date: Wed Mar 25 19:02:28 2009
New Revision: 398
URL: http://svn.gnome.org/viewvc/babl?rev=398&view=rev

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

Patch from Gary V. Vaughan

Modified:
   trunk/ChangeLog
   trunk/babl/babl-fish-path.c
   trunk/babl/babl-fish-stats.c
   trunk/babl/base/model-rgb.c
   trunk/babl/base/rgb-constants.h
   trunk/tests/babl_fish_path_fitness.c

Modified: trunk/babl/babl-fish-path.c
==============================================================================
--- trunk/babl/babl-fish-path.c	(original)
+++ trunk/babl/babl-fish-path.c	Wed Mar 25 19:02:28 2009
@@ -373,7 +373,7 @@
   return test;
 }
 
-// FishPath instrumentation
+/* FishPath instrumentation */
 
 static Babl   *fmt_rgba_double = NULL;
 static double *test = NULL;

Modified: trunk/babl/babl-fish-stats.c
==============================================================================
--- trunk/babl/babl-fish-stats.c	(original)
+++ trunk/babl/babl-fish-stats.c	Wed Mar 25 19:02:28 2009
@@ -23,9 +23,11 @@
 static int   qux         = 0;
 
 static char *utf8_bar[] = { " ", "Â", "â", "â", "â", "â", "â", "â", "â", "â" };
-//static char *utf8_bar[]=  {"!","â","â","â","â","â","!","!","!"};
-//static char *utf8_bar[]={"Â", "â", "â", "â", "â", "â", "â", "â", "â", };
-//static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"};
+/*
+static char *utf8_bar[]=  {"!","â","â","â","â","â","!","!","!"};
+static char *utf8_bar[]={"Â", "â", "â", "â", "â", "â", "â", "â", "â", };
+static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"};
+*/
 
 static int
 table_destination_each (Babl *babl,

Modified: trunk/babl/base/model-rgb.c
==============================================================================
--- trunk/babl/base/model-rgb.c	(original)
+++ trunk/babl/base/model-rgb.c	Wed Mar 25 19:02:28 2009
@@ -478,7 +478,7 @@
 formats (void)
 {
   babl_format_new (
-    //"name", "srgb",
+    /*"name", "srgb",*/
     "id", BABL_SRGB,
     babl_model_from_id (BABL_RGB_GAMMA_2_2),
     babl_type_from_id (BABL_U8),

Modified: trunk/babl/base/rgb-constants.h
==============================================================================
--- trunk/babl/base/rgb-constants.h	(original)
+++ trunk/babl/base/rgb-constants.h	Wed Mar 25 19:02:28 2009
@@ -16,7 +16,9 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-//#define CONTEMPORARY_MONITOR
+#if 0
+#define CONTEMPORARY_MONITOR
+#endif
 
 #ifdef CONTEMPORARY_MONITOR
   /* source: http://www.poynton.com/ColorFAQ.html */

Modified: trunk/tests/babl_fish_path_fitness.c
==============================================================================
--- trunk/tests/babl_fish_path_fitness.c	(original)
+++ trunk/tests/babl_fish_path_fitness.c	Wed Mar 25 19:02:28 2009
@@ -26,9 +26,11 @@
 static int   qux = 0;
 
 static char *utf8_bar[] = { " ", "Â", "â", "â", "â", "â", "â", "â", "â", "â" };
-//static char *utf8_bar[]=  {"!","â","â","â","â","â","!","!","!"};
-//static char *utf8_bar[]={"Â", "â", "â", "â", "â", "â", "â", "â", "â", };
-//static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"};
+/*
+static char *utf8_bar[]=  {"!","â","â","â","â","â","!","!","!"};
+static char *utf8_bar[]={"Â", "â", "â", "â", "â", "â", "â", "â", "â", };
+static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"};
+*/
 
 static int destination_each (Babl *babl,
                              void *userdata)