GNOME.org
 

[gnome-color-manager] Add a simple GcmImage class that makes embedded color profiles 'just work'

commit 76cacb721a62dab6368a23d2b44c995dcfd5bfcb
Author: Richard Hughes <richard hughsie com>
Date:   Mon Dec 28 17:04:34 2009 +0000

    Add a simple GcmImage class that makes embedded color profiles 'just work'
    
    This requires GTK+2 2.29.2 to work, but builds with any version

 data/tests/Makefile.am               |    7 +-
 data/tests/ibm-t61.icc               |  Bin 0 -> 25120 bytes
 data/tests/image-widget-good.png     |  Bin 0 -> 129297 bytes
 data/tests/image-widget-nonembed.png |  Bin 0 -> 148846 bytes
 data/tests/image-widget-output.png   |  Bin 0 -> 155448 bytes
 data/tests/image-widget.png          |  Bin 0 -> 130082 bytes
 src/Makefile.am                      |    3 +
 src/gcm-image.c                      |  531 ++++++++++++++++++++++++++++++++++
 src/gcm-image.h                      |   64 ++++
 src/gcm-self-test.c                  |    2 +
 10 files changed, 606 insertions(+), 1 deletions(-)
---
diff --git a/data/tests/Makefile.am b/data/tests/Makefile.am
index b9d9b76..8373822 100644
--- a/data/tests/Makefile.am
+++ b/data/tests/Makefile.am
@@ -1,7 +1,12 @@
 TEST_FILES =						\
 	cie-widget.png					\
-	trc-widget.png					\
 	gamma-widget.png				\
+	ibm-t61.icc					\
+	image-widget-good.png				\
+	image-widget-nonembed.png			\
+	image-widget-output.png				\
+	image-widget.png				\
+	trc-widget.png					\
 	Lenovo-T61-Internal.bin				\
 	LG-L225W-External.bin
 
diff --git a/data/tests/ibm-t61.icc b/data/tests/ibm-t61.icc
new file mode 100644
index 0000000..93c39f8
Binary files /dev/null and b/data/tests/ibm-t61.icc differ
diff --git a/data/tests/image-widget-good.png b/data/tests/image-widget-good.png
new file mode 100644
index 0000000..2539341
Binary files /dev/null and b/data/tests/image-widget-good.png differ
diff --git a/data/tests/image-widget-nonembed.png b/data/tests/image-widget-nonembed.png
new file mode 100644
index 0000000..dce3d2b
Binary files /dev/null and b/data/tests/image-widget-nonembed.png differ
diff --git a/data/tests/image-widget-output.png b/data/tests/image-widget-output.png
new file mode 100644
index 0000000..43d93d5
Binary files /dev/null and b/data/tests/image-widget-output.png differ
diff --git a/data/tests/image-widget.png b/data/tests/image-widget.png
new file mode 100644
index 0000000..7f8b64b
Binary files /dev/null and b/data/tests/image-widget.png differ
diff --git a/src/Makefile.am b/src/Makefile.am
index 3947dc5..92430aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,6 +21,8 @@ noinst_LIBRARIES = libgcmshared.a
 libgcmshared_a_SOURCES =				\
 	egg-debug.c					\
 	egg-debug.h					\
+	gcm-image.c					\
+	gcm-image.h					\
 	gcm-xyz.c					\
 	gcm-xyz.h					\
 	gcm-utils.c					\
@@ -213,6 +215,7 @@ gcm_self_test_SOURCES =					\
 	gcm-clut.c					\
 	gcm-dmi.c					\
 	gcm-xyz.c					\
+	gcm-image.c					\
 	gcm-cie-widget.c				\
 	gcm-trc-widget.c				\
 	gcm-gamma-widget.c				\
diff --git a/src/gcm-image.c b/src/gcm-image.c
new file mode 100644
index 0000000..2ccb7bd
--- /dev/null
+++ b/src/gcm-image.c
@@ -0,0 +1,531 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2009 Richard Hughes <richard hughsie com>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * SECTION:gcm-image-manual
+ * @short_description: routines to manually create a color profile.
+ *
+ * This object can create an ICC file manually.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+#include <lcms.h>
+
+#include "egg-debug.h"
+
+#include "gcm-image.h"
+
+static void     gcm_image_finalize	(GObject     *object);
+
+#define GCM_IMAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GCM_TYPE_IMAGE, GcmImagePrivate))
+
+/**
+ * GcmImagePrivate:
+ *
+ * Private #GcmImage data
+ **/
+struct _GcmImagePrivate
+{
+	gboolean			 use_embedded_icc_profile;
+	gchar				*output_icc_profile;
+	GdkPixbuf			*original_pixbuf;
+};
+
+enum {
+	PROP_0,
+	PROP_USE_EMBEDDED_ICC_PROFILE,
+	PROP_OUTPUT_ICC_PROFILE,
+	PROP_LAST
+};
+
+G_DEFINE_TYPE (GcmImage, gcm_image, GTK_TYPE_IMAGE)
+
+/**
+ * gcm_image_get_profile_in:
+ **/
+static cmsHPROFILE
+gcm_image_get_profile_in (GcmImage *image, const gchar *icc_profile_base64)
+{
+	cmsHPROFILE profile = NULL;
+	guchar *icc_profile = NULL;
+	gsize icc_profile_size;
+	GcmImagePrivate *priv = image->priv;
+
+	/* ignore built-in */
+	if (priv->use_embedded_icc_profile == FALSE) {
+		egg_debug ("ignoring embedded ICC profile, assume sRGB");
+		profile = cmsCreate_sRGBProfile ();
+		goto out;
+	}
+
+	/* decode */
+	icc_profile = g_base64_decode (icc_profile_base64, &icc_profile_size);
+	if (icc_profile == NULL) {
+		egg_warning ("failed to decode base64");
+		goto out;
+	}
+
+	/* use embedded profile */
+	profile = cmsOpenProfileFromMem (icc_profile, icc_profile_size);
+out:
+	g_free (icc_profile);
+	return profile;
+}
+
+/**
+ * gcm_image_get_profile_out:
+ **/
+static cmsHPROFILE
+gcm_image_get_profile_out (GcmImage *image)
+{
+	cmsHPROFILE profile = NULL;
+	guchar *icc_profile = NULL;
+	gsize icc_profile_size;
+	GcmImagePrivate *priv = image->priv;
+
+	/* not set */
+	if (priv->output_icc_profile == NULL) {
+		egg_debug ("no output ICC profile, assume sRGB");
+		profile = cmsCreate_sRGBProfile ();
+		goto out;
+	}
+
+	/* decode */
+	icc_profile = g_base64_decode (priv->output_icc_profile, &icc_profile_size);
+	if (icc_profile == NULL) {
+		egg_warning ("failed to decode base64");
+		goto out;
+	}
+
+	/* use embedded profile */
+	profile = cmsOpenProfileFromMem (icc_profile, icc_profile_size);
+out:
+	g_free (icc_profile);
+	return profile;
+}
+
+/**
+ * gcm_image_get_format:
+ **/
+static DWORD
+gcm_image_get_format (GcmImage *image)
+{
+	guint bits;
+	guint has_alpha;
+	DWORD format = 0;
+	GcmImagePrivate *priv = image->priv;
+
+	/* get data */
+	has_alpha = gdk_pixbuf_get_has_alpha (priv->original_pixbuf);
+	bits = gdk_pixbuf_get_bits_per_sample (priv->original_pixbuf);
+
+	/* no alpha channel */
+	if (G_LIKELY (!has_alpha)) {
+		if (bits == 8) {
+			format = TYPE_RGB_8;
+			goto out;
+		}
+		if (bits == 16) {
+			format = TYPE_RGB_16;
+			goto out;
+		}
+		goto out;
+	}
+
+	/* alpha channel */
+	if (bits == 8) {
+		format = TYPE_RGBA_8;
+		goto out;
+	}
+	if (bits == 16) {
+		format = TYPE_RGBA_16;
+		goto out;
+	}
+out:
+	return format;
+}
+
+/**
+ * gcm_image_cms_convert_pixbuf:
+ **/
+static void
+gcm_image_cms_convert_pixbuf (GcmImage *image)
+{
+	const gchar *icc_profile_base64;
+	gint i;
+	DWORD format;
+	gint width, height, rowstride;
+	guchar *p_in;
+	guchar *p_out;
+	cmsHPROFILE profile_in;
+	cmsHPROFILE profile_out;
+	cmsHTRANSFORM transform;
+	GdkPixbuf *pixbuf_cms;
+	GcmImagePrivate *priv = image->priv;
+
+	/* not a pixbuf-backed image */
+	if (priv->original_pixbuf == NULL) {
+		egg_warning ("no pixbuf to convert");
+		goto out;
+	}
+
+	/* CMYK not supported */
+	if (gdk_pixbuf_get_colorspace (priv->original_pixbuf) != GDK_COLORSPACE_RGB) {
+		egg_debug ("non-RGB not supported");
+		goto out;
+	}
+
+	/* work out the LCMS format flags */
+	format = gcm_image_get_format (image);
+	if (format == 0) {
+		egg_warning ("format not supported");
+		goto out;
+	}
+
+	/* get profile from pixbuf */
+	pixbuf_cms = gtk_image_get_pixbuf (GTK_IMAGE(image));
+	icc_profile_base64 = gdk_pixbuf_get_option (pixbuf_cms, "icc-profile");
+	if (icc_profile_base64 == NULL) {
+		egg_debug ("not a color managed image");
+		goto out;
+	}
+
+	/* get profiles */
+	profile_in = gcm_image_get_profile_in (image, icc_profile_base64);
+	profile_out = gcm_image_get_profile_out (image);
+
+	/* create transform */
+	transform = cmsCreateTransform (profile_in, format, profile_out, format, INTENT_PERCEPTUAL, 0);
+
+	/* process each row */
+	height = gdk_pixbuf_get_height (priv->original_pixbuf);
+	width = gdk_pixbuf_get_width (priv->original_pixbuf);
+	rowstride = gdk_pixbuf_get_rowstride (priv->original_pixbuf);
+	p_in = gdk_pixbuf_get_pixels (priv->original_pixbuf);
+	p_out = gdk_pixbuf_get_pixels (pixbuf_cms);
+	for (i=0; i<height; ++i) {
+		cmsDoTransform (transform, p_in, p_out, width);
+		p_in += rowstride;
+		p_out += rowstride;
+	}
+
+	/* destroy lcms state */
+	cmsDeleteTransform (transform);
+	cmsCloseProfile (profile_in);
+	cmsCloseProfile (profile_out);
+
+	/* refresh widget */
+	gtk_widget_set_visible (GTK_WIDGET(image), FALSE);
+	gtk_widget_set_visible (GTK_WIDGET(image), TRUE);
+out:
+	return;
+}
+
+/**
+ * gcm_image_notify_pixbuf_cb:
+ **/
+static void
+gcm_image_notify_pixbuf_cb (GObject *object, GParamSpec *pspec, GcmImage *image)
+{
+	GdkPixbuf *pixbuf;
+	gpointer applied;
+	GcmImagePrivate *priv = image->priv;
+
+	/* check */
+	pixbuf = gtk_image_get_pixbuf (GTK_IMAGE(image));
+	applied = g_object_get_data (G_OBJECT(pixbuf), "cms-converted-pixbuf");
+	if (applied != NULL) {
+		egg_debug ("already copied and converted pixbuf, use gcm_image_cms_convert_pixbuf() instead");
+		goto out;
+	}
+
+	/* unref existing */
+	if (priv->original_pixbuf != NULL) {
+		g_object_unref (priv->original_pixbuf);
+		priv->original_pixbuf = NULL;
+	}
+
+	/* get new */
+	if (pixbuf != NULL) {
+		priv->original_pixbuf = gdk_pixbuf_copy (pixbuf);
+		gcm_image_cms_convert_pixbuf (image);
+		g_object_set_data (G_OBJECT(pixbuf), "cms-converted-pixbuf", (gpointer)"true");
+	}
+out:
+	return;
+}
+
+/**
+ * gcm_image_get_property:
+ **/
+static void
+gcm_image_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+	GcmImage *image = GCM_IMAGE (object);
+	GcmImagePrivate *priv = image->priv;
+
+	switch (prop_id) {
+	case PROP_USE_EMBEDDED_ICC_PROFILE:
+		g_value_set_boolean (value, priv->use_embedded_icc_profile);
+		break;
+	case PROP_OUTPUT_ICC_PROFILE:
+		g_value_set_string (value, priv->output_icc_profile);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+/**
+ * gcm_image_set_property:
+ **/
+static void
+gcm_image_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+	GcmImage *image = GCM_IMAGE (object);
+	GcmImagePrivate *priv = image->priv;
+
+	switch (prop_id) {
+	case PROP_USE_EMBEDDED_ICC_PROFILE:
+		priv->use_embedded_icc_profile = g_value_get_boolean (value);
+		gcm_image_cms_convert_pixbuf (image);
+		break;
+	case PROP_OUTPUT_ICC_PROFILE:
+		g_free (priv->output_icc_profile);
+		priv->output_icc_profile = g_strdup (g_value_get_string (value));
+		gcm_image_cms_convert_pixbuf (image);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+/**
+ * gcm_image_class_init:
+ **/
+static void
+gcm_image_class_init (GcmImageClass *klass)
+{
+	GParamSpec *pspec;
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	object_class->finalize = gcm_image_finalize;
+	object_class->get_property = gcm_image_get_property;
+	object_class->set_property = gcm_image_set_property;
+
+	/**
+	 * GcmImage:use-embedded-icc-profile:
+	 */
+	pspec = g_param_spec_boolean ("use-embedded-icc-profile", NULL, NULL,
+				      TRUE,
+				      G_PARAM_READWRITE);
+	g_object_class_install_property (object_class, PROP_USE_EMBEDDED_ICC_PROFILE, pspec);
+
+	/**
+	 * GcmImage:output-icc-profile:
+	 */
+	pspec = g_param_spec_string ("output-icc-profile", NULL, NULL,
+				     NULL,
+				     G_PARAM_READWRITE);
+	g_object_class_install_property (object_class, PROP_OUTPUT_ICC_PROFILE, pspec);
+
+	g_type_class_add_private (klass, sizeof (GcmImagePrivate));
+}
+
+/**
+ * gcm_image_init:
+ **/
+static void
+gcm_image_init (GcmImage *image)
+{
+	GcmImagePrivate *priv;
+
+	priv = image->priv = GCM_IMAGE_GET_PRIVATE (image);
+
+	priv->use_embedded_icc_profile = TRUE;
+	priv->original_pixbuf = NULL;
+
+	/* only convert pixbuf if the size changes */
+	g_signal_connect (GTK_WIDGET(image), "notify::pixbuf",
+			  G_CALLBACK(gcm_image_notify_pixbuf_cb), image);
+}
+
+/**
+ * gcm_image_finalize:
+ **/
+static void
+gcm_image_finalize (GObject *object)
+{
+	GcmImage *image = GCM_IMAGE (object);
+	GcmImagePrivate *priv = image->priv;
+
+	if (priv->original_pixbuf != NULL)
+		g_object_unref (priv->original_pixbuf);
+
+	G_OBJECT_CLASS (gcm_image_parent_class)->finalize (object);
+}
+
+/**
+ * gcm_image_new:
+ *
+ * Return value: a new GcmImage object.
+ **/
+GcmImage *
+gcm_image_new (void)
+{
+	GcmImage *image;
+	image = g_object_new (GCM_TYPE_IMAGE, NULL);
+	return GCM_IMAGE (image);
+}
+
+/***************************************************************************
+ ***                          MAKE CHECK TESTS                           ***
+ ***************************************************************************/
+#ifdef EGG_TEST
+#include "egg-test.h"
+
+static gchar *
+gcm_image_test_get_ibmt61_profile ()
+{
+	gchar *filename;
+	gchar *profile_base64 = NULL;
+	gchar *contents = NULL;
+	gboolean ret;
+	gsize length;
+	GError *error = NULL;
+
+	/* get test file */
+	filename = egg_test_get_data_file ("ibm-t61.icc");
+
+	/* get contents */
+	ret = g_file_get_contents (filename, &contents, &length, &error);
+	if (!ret) {
+		egg_warning ("failed to get contents: %s", error->message);
+		g_error_free (error);
+		goto out;
+	}
+
+	/* encode */
+	profile_base64 = g_base64_encode (contents, length);
+out:
+	g_free (contents);
+	g_free (filename);
+	return profile_base64;
+}
+
+void
+gcm_image_test (EggTest *test)
+{
+	GcmImage *image;
+	GtkWidget *image_test;
+	GtkWidget *dialog;
+	GtkWidget *vbox;
+	gboolean ret;
+	GError *error = NULL;
+	gint response;
+	gchar *filename_widget;
+	gchar *fiename_test;
+	gchar *profile_base64;
+
+	if (!egg_test_start (test, "GcmImage"))
+		return;
+
+	/************************************************************/
+	egg_test_title (test, "get a clever image object");
+	image = gcm_image_new ();
+	egg_test_assert (test, image != NULL);
+
+	/************************************************************/
+	filename_widget = egg_test_get_data_file ("image-widget.png");
+	gtk_image_set_from_file (GTK_IMAGE(image), filename_widget);
+
+	/************************************************************/
+	egg_test_title (test, "get filename of image file");
+	fiename_test = egg_test_get_data_file ("image-widget-good.png");
+	egg_test_assert (test, (fiename_test != NULL));
+
+	/* show in a dialog as an example */
+	dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "Does color-corrected image match\nthe picture below?");
+	image_test = gtk_image_new_from_file (fiename_test);
+	vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	gtk_box_pack_end (GTK_BOX(vbox), GTK_WIDGET(image), TRUE, TRUE, 12);
+	gtk_box_pack_end (GTK_BOX(vbox), image_test, TRUE, TRUE, 12);
+	gtk_widget_set_size_request (GTK_WIDGET(image), 300, 300);
+	gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
+	gtk_widget_show (GTK_WIDGET(image));
+	gtk_widget_show (image_test);
+
+	g_object_set (image,
+		      "use-embedded-icc-profile", TRUE,
+		      "output-icc-profile", NULL,
+		      NULL);
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
+	g_free (fiename_test);
+
+	/************************************************************/
+	egg_test_title (test, "converted as expected?");
+	egg_test_assert (test, (response == GTK_RESPONSE_YES));
+
+	/************************************************************/
+	fiename_test = egg_test_get_data_file ("image-widget-nonembed.png");
+	gtk_image_set_from_file (GTK_IMAGE(image_test), fiename_test);
+	g_object_set (image,
+		      "use-embedded-icc-profile", FALSE,
+		      NULL);
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
+	g_free (fiename_test);
+
+	/************************************************************/
+	egg_test_title (test, "converted as expected?");
+	egg_test_assert (test, (response == GTK_RESPONSE_YES));
+
+	/************************************************************/
+	egg_test_title (test, "get dummy display profile");
+	profile_base64 = gcm_image_test_get_ibmt61_profile ();
+	egg_test_assert (test, (profile_base64 != NULL));
+
+	/************************************************************/
+	fiename_test = egg_test_get_data_file ("image-widget-output.png");
+	gtk_image_set_from_file (GTK_IMAGE(image_test), fiename_test);
+	g_object_set (image,
+		      "use-embedded-icc-profile", TRUE,
+		      "output-icc-profile", profile_base64,
+		      NULL);
+
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
+	g_free (fiename_test);
+
+	/************************************************************/
+	egg_test_title (test, "converted as expected?");
+	egg_test_assert (test, (response == GTK_RESPONSE_YES));
+
+	gtk_widget_destroy (dialog);
+
+	g_free (profile_base64);
+	g_free (filename_widget);
+
+	egg_test_end (test);
+}
+#endif
+
diff --git a/src/gcm-image.h b/src/gcm-image.h
new file mode 100644
index 0000000..a96cd47
--- /dev/null
+++ b/src/gcm-image.h
@@ -0,0 +1,64 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2009 Richard Hughes <richard hughsie com>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more info.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GCM_IMAGE_H
+#define __GCM_IMAGE_H
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GCM_TYPE_IMAGE		(gcm_image_get_type ())
+#define GCM_IMAGE(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GCM_TYPE_IMAGE, GcmImage))
+#define GCM_IMAGE_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GCM_TYPE_IMAGE, GcmImageClass))
+#define GCM_IS_IMAGE(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GCM_TYPE_IMAGE))
+#define GCM_IS_IMAGE_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GCM_TYPE_IMAGE))
+#define GCM_IMAGE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GCM_TYPE_IMAGE, GcmImageClass))
+
+typedef struct _GcmImagePrivate	GcmImagePrivate;
+typedef struct _GcmImage	GcmImage;
+typedef struct _GcmImageClass	GcmImageClass;
+
+struct _GcmImage
+{
+	 GtkImage		 parent;
+	 GcmImagePrivate	*priv;
+};
+
+struct _GcmImageClass
+{
+	GtkImageClass		parent_class;
+	/* padding for future expansion */
+	void (*_gcm_reserved1) (void);
+	void (*_gcm_reserved2) (void);
+	void (*_gcm_reserved3) (void);
+	void (*_gcm_reserved4) (void);
+	void (*_gcm_reserved5) (void);
+};
+
+GType		 gcm_image_get_type		(void);
+GcmImage	*gcm_image_new		 	(void);
+
+G_END_DECLS
+
+#endif /* __GCM_IMAGE_H */
+
diff --git a/src/gcm-self-test.c b/src/gcm-self-test.c
index f4fd42f..abb51bc 100644
--- a/src/gcm-self-test.c
+++ b/src/gcm-self-test.c
@@ -25,6 +25,7 @@
 
 /* prototypes */
 void gcm_edid_test (EggTest *test);
+void gcm_image_test (EggTest *test);
 void gcm_tables_test (EggTest *test);
 void gcm_utils_test (EggTest *test);
 void gcm_device_test (EggTest *test);
@@ -49,6 +50,7 @@ main (int argc, char **argv)
 	egg_debug_init (&argc, &argv);
 
 	/* components */
+	gcm_image_test (test);
 	gcm_edid_test (test);
 	gcm_tables_test (test);
 	gcm_utils_test (test);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]