[gimp] libgimpconfig: rename the new GimpColorConfig profile accessor functions
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimpconfig: rename the new GimpColorConfig profile accessor functions
- Date: Wed, 3 Jun 2015 07:58:54 +0000 (UTC)
commit 3565b330190e6b6b50c89eb3c9fc6aea26df3e25
Author: Michael Natterer <mitch gimp org>
Date: Wed Jun 3 09:57:34 2015 +0200
libgimpconfig: rename the new GimpColorConfig profile accessor functions
gimp_color_config_get_foo_profile() -> get_foo_color_profile()
because the old names clash with possible future accessors for the raw
filename properties.
app/core/gimpimage.c | 2 +-
.../libgimpconfig/libgimpconfig-sections.txt | 6 +++++-
libgimpconfig/gimpcolorconfig.c | 16 ++++++++--------
libgimpconfig/gimpcolorconfig.h | 20 ++++++++++----------
libgimpconfig/gimpconfig.def | 8 ++++----
libgimpwidgets/gimpwidgetsutils.c | 4 ++--
modules/color-selector-cmyk.c | 4 ++--
modules/display-filter-lcms.c | 4 ++--
plug-ins/common/lcms.c | 4 ++--
plug-ins/file-jpeg/jpeg-load.c | 4 ++--
10 files changed, 38 insertions(+), 34 deletions(-)
---
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index 521a177..33b6da4 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -1397,7 +1397,7 @@ gimp_image_color_managed_get_color_profile (GimpColorManaged *managed)
{
GimpColorConfig *config = image->gimp->config->color_management;
- profile = gimp_color_config_get_rgb_profile (config, NULL);
+ profile = gimp_color_config_get_rgb_color_profile (config, NULL);
}
if (! profile)
diff --git a/devel-docs/libgimpconfig/libgimpconfig-sections.txt
b/devel-docs/libgimpconfig/libgimpconfig-sections.txt
index 24cdb86..6591f08 100644
--- a/devel-docs/libgimpconfig/libgimpconfig-sections.txt
+++ b/devel-docs/libgimpconfig/libgimpconfig-sections.txt
@@ -152,10 +152,14 @@ gimp_scanner_parse_matrix2
<SECTION>
<FILE>gimpcolorconfig</FILE>
<TITLE>GimpColorConfig</TITLE>
-GimpColorConfig
GimpColorManagementMode
GimpColorRenderingIntent
+gimp_color_config_get_rgb_color_profile
+gimp_color_config_get_cmyk_color_profile
+gimp_color_config_get_display_color_profile
+gimp_color_config_get_printer_color_profile
<SUBSECTION Standard>
+GimpColorConfig
GimpColorConfigClass
GIMP_COLOR_CONFIG
GIMP_IS_COLOR_CONFIG
diff --git a/libgimpconfig/gimpcolorconfig.c b/libgimpconfig/gimpcolorconfig.c
index b0b27bb..ef61114 100644
--- a/libgimpconfig/gimpcolorconfig.c
+++ b/libgimpconfig/gimpcolorconfig.c
@@ -371,8 +371,8 @@ gimp_color_config_get_property (GObject *object,
}
GimpColorProfile
-gimp_color_config_get_rgb_profile (GimpColorConfig *config,
- GError **error)
+gimp_color_config_get_rgb_color_profile (GimpColorConfig *config,
+ GError **error)
{
GimpColorProfile profile = NULL;
@@ -402,8 +402,8 @@ gimp_color_config_get_rgb_profile (GimpColorConfig *config,
}
GimpColorProfile
-gimp_color_config_get_cmyk_profile (GimpColorConfig *config,
- GError **error)
+gimp_color_config_get_cmyk_color_profile (GimpColorConfig *config,
+ GError **error)
{
GimpColorProfile profile = NULL;
@@ -433,8 +433,8 @@ gimp_color_config_get_cmyk_profile (GimpColorConfig *config,
}
GimpColorProfile
-gimp_color_config_get_display_profile (GimpColorConfig *config,
- GError **error)
+gimp_color_config_get_display_color_profile (GimpColorConfig *config,
+ GError **error)
{
GimpColorProfile profile = NULL;
@@ -453,8 +453,8 @@ gimp_color_config_get_display_profile (GimpColorConfig *config,
}
GimpColorProfile
-gimp_color_config_get_printer_profile (GimpColorConfig *config,
- GError **error)
+gimp_color_config_get_printer_color_profile (GimpColorConfig *config,
+ GError **error)
{
GimpColorProfile profile = NULL;
diff --git a/libgimpconfig/gimpcolorconfig.h b/libgimpconfig/gimpcolorconfig.h
index fbd6cce..7b68df1 100644
--- a/libgimpconfig/gimpcolorconfig.h
+++ b/libgimpconfig/gimpcolorconfig.h
@@ -77,16 +77,16 @@ struct _GimpColorConfigClass
};
-GType gimp_color_config_get_type (void) G_GNUC_CONST;
-
-GimpColorProfile gimp_color_config_get_rgb_profile (GimpColorConfig *config,
- GError **error);
-GimpColorProfile gimp_color_config_get_cmyk_profile (GimpColorConfig *config,
- GError **error);
-GimpColorProfile gimp_color_config_get_display_profile (GimpColorConfig *config,
- GError **error);
-GimpColorProfile gimp_color_config_get_printer_profile (GimpColorConfig *config,
- GError **error);
+GType gimp_color_config_get_type (void) G_GNUC_CONST;
+
+GimpColorProfile gimp_color_config_get_rgb_color_profile (GimpColorConfig *config,
+ GError **error);
+GimpColorProfile gimp_color_config_get_cmyk_color_profile (GimpColorConfig *config,
+ GError **error);
+GimpColorProfile gimp_color_config_get_display_color_profile (GimpColorConfig *config,
+ GError **error);
+GimpColorProfile gimp_color_config_get_printer_color_profile (GimpColorConfig *config,
+ GError **error);
#endif /* GIMP_COLOR_CONFIG_H__ */
diff --git a/libgimpconfig/gimpconfig.def b/libgimpconfig/gimpconfig.def
index 35b2d76..ec92574 100644
--- a/libgimpconfig/gimpconfig.def
+++ b/libgimpconfig/gimpconfig.def
@@ -1,8 +1,8 @@
EXPORTS
- gimp_color_config_get_cmyk_profile
- gimp_color_config_get_display_profile
- gimp_color_config_get_printer_profile
- gimp_color_config_get_rgb_profile
+ gimp_color_config_get_cmyk_color_profile
+ gimp_color_config_get_display_color_profile
+ gimp_color_config_get_printer_color_profile
+ gimp_color_config_get_rgb_color_profile
gimp_color_config_get_type
gimp_color_management_mode_get_type
gimp_color_rendering_intent_get_type
diff --git a/libgimpwidgets/gimpwidgetsutils.c b/libgimpwidgets/gimpwidgetsutils.c
index 0f21451..6b53b2d 100644
--- a/libgimpwidgets/gimpwidgetsutils.c
+++ b/libgimpwidgets/gimpwidgetsutils.c
@@ -469,7 +469,7 @@ get_display_profile (GtkWidget *widget,
profile = gimp_widget_get_color_profile (widget);
if (! profile)
- profile = gimp_color_config_get_display_profile (config, NULL);
+ profile = gimp_color_config_get_display_color_profile (config, NULL);
if (! profile)
profile = gimp_color_profile_new_srgb ();
@@ -504,7 +504,7 @@ gimp_widget_get_color_transform (GtkWidget *widget,
return NULL;
case GIMP_COLOR_MANAGEMENT_SOFTPROOF:
- proof_profile = gimp_color_config_get_printer_profile (config, NULL);
+ proof_profile = gimp_color_config_get_printer_color_profile (config, NULL);
/* fallthru */
case GIMP_COLOR_MANAGEMENT_DISPLAY:
diff --git a/modules/color-selector-cmyk.c b/modules/color-selector-cmyk.c
index 68330be..7aa1e5a 100644
--- a/modules/color-selector-cmyk.c
+++ b/modules/color-selector-cmyk.c
@@ -377,8 +377,8 @@ colorsel_cmyk_config_changed (ColorselCmyk *module)
if (! config)
goto out;
- rgb_profile = gimp_color_config_get_rgb_profile (config, NULL);
- cmyk_profile = gimp_color_config_get_cmyk_profile (config, NULL);
+ rgb_profile = gimp_color_config_get_rgb_color_profile (config, NULL);
+ cmyk_profile = gimp_color_config_get_cmyk_color_profile (config, NULL);
if (! rgb_profile)
rgb_profile = gimp_color_profile_new_srgb ();
diff --git a/modules/display-filter-lcms.c b/modules/display-filter-lcms.c
index 17a8238..ce05195 100644
--- a/modules/display-filter-lcms.c
+++ b/modules/display-filter-lcms.c
@@ -302,7 +302,7 @@ cdisplay_lcms_get_display_profile (CdisplayLcms *lcms)
profile = gimp_widget_get_color_profile (widget);
if (! profile)
- profile = gimp_color_config_get_display_profile (config, NULL);
+ profile = gimp_color_config_get_display_color_profile (config, NULL);
return profile;
}
@@ -364,7 +364,7 @@ cdisplay_lcms_update_profile_label (CdisplayLcms *lcms,
}
else if (strcmp (name, "printer-profile") == 0)
{
- profile = gimp_color_config_get_printer_profile (config, NULL);
+ profile = gimp_color_config_get_printer_color_profile (config, NULL);
}
else
{
diff --git a/plug-ins/common/lcms.c b/plug-ins/common/lcms.c
index 90d888f..d2dd7bd 100644
--- a/plug-ins/common/lcms.c
+++ b/plug-ins/common/lcms.c
@@ -709,7 +709,7 @@ lcms_image_get_profile (GimpColorConfig *config,
}
else
{
- profile = gimp_color_config_get_rgb_profile (config, error);
+ profile = gimp_color_config_get_rgb_color_profile (config, error);
}
return profile;
@@ -1165,7 +1165,7 @@ lcms_icc_combo_box_new (GimpColorConfig *config,
combo = gimp_color_profile_combo_box_new (dialog, history);
g_free (history);
- profile = gimp_color_config_get_rgb_profile (config, &error);
+ profile = gimp_color_config_get_rgb_color_profile (config, &error);
if (profile)
{
diff --git a/plug-ins/file-jpeg/jpeg-load.c b/plug-ins/file-jpeg/jpeg-load.c
index 0cfa632..a24d571 100644
--- a/plug-ins/file-jpeg/jpeg-load.c
+++ b/plug-ins/file-jpeg/jpeg-load.c
@@ -617,7 +617,7 @@ jpeg_load_cmyk_transform (guint8 *profile_data,
/* if that fails, try to load the CMYK profile configured in the prefs */
if (! cmyk_profile)
- cmyk_profile = gimp_color_config_get_cmyk_profile (config, NULL);
+ cmyk_profile = gimp_color_config_get_cmyk_color_profile (config, NULL);
/* bail out if we can't load any CMYK profile */
if (! cmyk_profile)
@@ -627,7 +627,7 @@ jpeg_load_cmyk_transform (guint8 *profile_data,
}
/* try to load the RGB profile configured in the prefs */
- rgb_profile = gimp_color_config_get_rgb_profile (config, NULL);
+ rgb_profile = gimp_color_config_get_rgb_color_profile (config, NULL);
/* make the real sRGB profile as a fallback */
if (! rgb_profile)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]