callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added a check button to control the "display-profile-from-gdk" option.

Browse Source 
2005-06-24  Sven Neumann  <sven@gimp.org>

	* app/dialogs/preferences-dialog.c: added a check button to control
	the "display-profile-from-gdk" option.

	* modules/cdisplay_lcms.c (cdisplay_lcms_get_display_profile):
	fixed use of gdk_property_get(). Return NULL if no display profile
	can be obtained.
This commit is contained in:
Sven Neumann
2005-06-24 09:41:16 +00:00
committed by Sven Neumann
parent 3490c49252
commit 87e8c925bc
3 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/cdisplay_lcms.c
View File

@ -344,23 +344,23 @@ static cmsHPROFILE
cdisplay_lcms_get_display_profile (CdisplayLcms *lcms,
GimpColorConfig *config)
{
#if defined (GDK_WINDOWING_X11)
if (config->display_profile_from_gdk)
{
/* FIXME: need to access the display's screen here */
GdkScreen *screen = gdk_screen_get_default ();
GdkAtom type;
gint format;
gint nitems;
guchar *data;
GdkAtom type = GDK_NONE;
gint format = 0;
gint nitems = 0;
guchar *data = NULL;
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
if (gdk_property_get (gdk_screen_get_root_window (screen),
gdk_atom_intern ("_ICC_PROFILE", FALSE),
GDK_NONE,
0, G_MAXLONG,
FALSE,
&type, &format, &nitems, &data) && nitems)
0, 256 * 1024, FALSE,
&type, &format, &nitems, &data) && nitems > 0)
{
cmsHPROFILE *profile = cmsOpenProfileFromMem (data, nitems);
@ -369,7 +369,10 @@ cdisplay_lcms_get_display_profile (CdisplayLcms *lcms,
return profile;
}
}
#endif
if (config->display_profile)
return cmsOpenProfileFromFile (config->display_profile, "r");
return NULL;
}