[gnome-color-manager] bugfix: do not generate an error if a display profile does not have CLUT data
- From: Richard Hughes <rhughes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] bugfix: do not generate an error if a display profile does not have CLUT data
- Date: Wed, 6 Jan 2010 08:52:28 +0000 (UTC)
commit d26041cd260ae0fcc9f6677d5a382bb7a86aa792
Author: Richard Hughes <richard hughsie com>
Date: Tue Jan 5 23:16:02 2010 +0000
bugfix: do not generate an error if a display profile does not have CLUT data
src/gcm-utils.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/gcm-utils.c b/src/gcm-utils.c
index e2029ce..3686a2a 100644
--- a/src/gcm-utils.c
+++ b/src/gcm-utils.c
@@ -517,7 +517,7 @@ gcm_utils_set_gamma_for_device (GcmDevice *device, GError **error)
/* only set the CLUT if we're not seting the atom */
use_global = gconf_client_get_bool (gconf_client, GCM_SETTINGS_GLOBAL_DISPLAY_CORRECTION, NULL);
if (use_global && filename != NULL) {
- /* create dummy CLUT */
+ /* create CLUT */
profile = gcm_profile_default_new ();
ret = gcm_profile_parse (profile, filename, error);
if (!ret)
@@ -525,8 +525,10 @@ gcm_utils_set_gamma_for_device (GcmDevice *device, GError **error)
/* create a CLUT from the profile */
clut = gcm_profile_generate_vcgt (profile, size);
- } else {
- /* create dummy CLUT */
+ }
+
+ /* create dummy CLUT if we failed */
+ if (clut == NULL) {
clut = gcm_clut_new ();
g_object_set (clut,
"size", size,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]