diff options
| author | Richard Hughes <richard@hughsie.com> | 2011-04-09 16:06:03 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2011-04-09 16:06:03 +0100 |
| commit | b4ed5d8cf58bb86c28c7aab1e02645cd022aa4de (patch) | |
| tree | 3486abc2b1918ad8b2aa2fb0da6020f0f4bea4cc /src | |
| parent | 450cb945e26fa89a077373ecc57449d94d03696a (diff) | |
| download | colord-b4ed5d8cf58bb86c28c7aab1e02645cd022aa4de.tar.gz | |
trivial: get rid of some C++ style comments to fix the compile for older compilers
Diffstat (limited to 'src')
| -rw-r--r-- | src/cd-config.h | 2 | ||||
| -rw-r--r-- | src/cd-huey-calculate-fudge.c | 6 | ||||
| -rw-r--r-- | src/cd-huey-dump-values.c | 1 | ||||
| -rw-r--r-- | src/cd-huey-parse.c | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/cd-config.h b/src/cd-config.h index 0e9dd29..8343c91 100644 --- a/src/cd-config.h +++ b/src/cd-config.h @@ -30,8 +30,6 @@ G_BEGIN_DECLS #define CD_CONFIG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CD_TYPE_CONFIG, CdConfig)) #define CD_CONFIG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CD_TYPE_CONFIG, CdConfigClass)) #define CD_IS_CONFIG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CD_TYPE_CONFIG)) -//#define CD_IS_CONFIG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CD_TYPE_CONFIG)) -//#define CD_CONFIG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CD_TYPE_CONFIG, CdConfigClass)) typedef struct _CdConfigPrivate CdConfigPrivate; typedef struct _CdConfig CdConfig; diff --git a/src/cd-huey-calculate-fudge.c b/src/cd-huey-calculate-fudge.c index 4ff9865..f4b2419 100644 --- a/src/cd-huey-calculate-fudge.c +++ b/src/cd-huey-calculate-fudge.c @@ -175,8 +175,10 @@ main (gint argc, gchar *argv[]) &dark_offset, pre_scalar, post_scalar); -// g_debug ("gcolor-XYZ = %f,\t%f,\t%f", cd_xyz.X, cd_xyz.Y, cd_xyz.Z); -// g_debug ("argyll-XYZ = %f,\t%f,\t%f", actual_xyz[i].X, actual_xyz[i].Y, actual_xyz[i].Z); + g_debug ("gcolor-XYZ = %f,\t%f,\t%f", + cd_xyz.X, cd_xyz.Y, cd_xyz.Z); + g_debug ("argyll-XYZ = %f,\t%f,\t%f", + actual_xyz[i].X, actual_xyz[i].Y, actual_xyz[i].Z); error += get_error (&actual_xyz[i], &cd_xyz); } if (error < min_error) { diff --git a/src/cd-huey-dump-values.c b/src/cd-huey-dump-values.c index 7087149..286b227 100644 --- a/src/cd-huey-dump-values.c +++ b/src/cd-huey-dump-values.c @@ -47,7 +47,6 @@ main (gint argc, gchar *argv[]) for (i=0; i<0xff; i++) buffer[i] = 0; - //g_error ("argv[1]=%s", argv[1]); ret = g_file_get_contents (argv[1], &data, NULL, &error); if (!ret) { g_warning ("failed to open: %s", error->message); diff --git a/src/cd-huey-parse.c b/src/cd-huey-parse.c index 4ae8bc3..b633612 100644 --- a/src/cd-huey-parse.c +++ b/src/cd-huey-parse.c @@ -84,7 +84,7 @@ static void parse_line_argyll (GString *output, gchar *line, gboolean *reply) { if (g_str_has_prefix (line, "huey: Sending cmd")) { -// g_string_append (output, " ---> "); + g_string_append (output, " ---> "); *reply = FALSE; } if (g_str_has_prefix (line, "huey: Reading response")) { |