From c63d812be8de1d54c8889d8d7fc1bb4949e2c88c Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 2 Sep 2017 18:47:04 +0200 Subject: [PATCH] libgimpcolor: rename gimp_color_profile_get_format() to _get_lcms_format() --- app/core/gimpdrawablefilter.c | 4 ++-- .../libgimpcolor/libgimpcolor-sections.txt | 2 +- libgimpcolor/gimpcolor.def | 2 +- libgimpcolor/gimpcolorprofile.c | 6 +++--- libgimpcolor/gimpcolorprofile.h | 2 +- libgimpcolor/gimpcolortransform.c | 16 ++++++++-------- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/core/gimpdrawablefilter.c b/app/core/gimpdrawablefilter.c index 96a88139cf..bf08596506 100644 --- a/app/core/gimpdrawablefilter.c +++ b/app/core/gimpdrawablefilter.c @@ -681,8 +681,8 @@ gimp_drawable_filter_sync_transform (GimpDrawableFilter *filter) * calls below) */ if (has_input) - input_format = gimp_color_profile_get_format (input_format, &dummy); - output_format = gimp_color_profile_get_format (output_format, &dummy); + input_format = gimp_color_profile_get_lcms_format (input_format, &dummy); + output_format = gimp_color_profile_get_lcms_format (output_format, &dummy); g_printerr ("profile transform drawable format: %s\n", babl_get_name (drawable_format)); diff --git a/devel-docs/libgimpcolor/libgimpcolor-sections.txt b/devel-docs/libgimpcolor/libgimpcolor-sections.txt index 82f6523797..b7e4327c68 100644 --- a/devel-docs/libgimpcolor/libgimpcolor-sections.txt +++ b/devel-docs/libgimpcolor/libgimpcolor-sections.txt @@ -162,7 +162,7 @@ gimp_color_profile_is_rgb gimp_color_profile_is_gray gimp_color_profile_is_cmyk gimp_color_profile_is_linear -gimp_color_profile_get_format +gimp_color_profile_get_lcms_format GIMP_COLOR_PROFILE GIMP_COLOR_PROFILE_CLASS diff --git a/libgimpcolor/gimpcolor.def b/libgimpcolor/gimpcolor.def index 9c7cf94f94..3d9a074cc1 100644 --- a/libgimpcolor/gimpcolor.def +++ b/libgimpcolor/gimpcolor.def @@ -27,9 +27,9 @@ EXPORTS gimp_color_managed_profile_changed gimp_color_profile_get_copyright gimp_color_profile_get_description - gimp_color_profile_get_format gimp_color_profile_get_icc_profile gimp_color_profile_get_label + gimp_color_profile_get_lcms_format gimp_color_profile_get_lcms_profile gimp_color_profile_get_manufacturer gimp_color_profile_get_model diff --git a/libgimpcolor/gimpcolorprofile.c b/libgimpcolor/gimpcolorprofile.c index 61600a46ed..5e408d0b8b 100644 --- a/libgimpcolor/gimpcolorprofile.c +++ b/libgimpcolor/gimpcolorprofile.c @@ -1458,7 +1458,7 @@ gimp_color_profile_new_d50_gray_lab_trc (void) } /** - * gimp_color_profile_get_format: + * gimp_color_profile_get_lcms_format: * @format: a #Babl format * @lcms_format: return location for an lcms format * @@ -1476,8 +1476,8 @@ gimp_color_profile_new_d50_gray_lab_trc (void) * Since: 2.10 **/ const Babl * -gimp_color_profile_get_format (const Babl *format, - guint32 *lcms_format) +gimp_color_profile_get_lcms_format (const Babl *format, + guint32 *lcms_format) { const Babl *output_format = NULL; const Babl *type; diff --git a/libgimpcolor/gimpcolorprofile.h b/libgimpcolor/gimpcolorprofile.h index 8d37ac57a9..598b2b101b 100644 --- a/libgimpcolor/gimpcolorprofile.h +++ b/libgimpcolor/gimpcolorprofile.h @@ -111,7 +111,7 @@ gboolean gimp_color_profile_is_cmyk (GimpColorProfile * gboolean gimp_color_profile_is_linear (GimpColorProfile *profile); -const Babl * gimp_color_profile_get_format (const Babl *format, +const Babl * gimp_color_profile_get_lcms_format (const Babl *format, guint32 *lcms_format); diff --git a/libgimpcolor/gimpcolortransform.c b/libgimpcolor/gimpcolortransform.c index 532b05463e..0d059fba48 100644 --- a/libgimpcolor/gimpcolortransform.c +++ b/libgimpcolor/gimpcolortransform.c @@ -214,10 +214,10 @@ gimp_color_transform_new (GimpColorProfile *src_profile, src_lcms = gimp_color_profile_get_lcms_profile (src_profile); dest_lcms = gimp_color_profile_get_lcms_profile (dest_profile); - priv->src_format = gimp_color_profile_get_format (src_format, - &lcms_src_format); - priv->dest_format = gimp_color_profile_get_format (dest_format, - &lcms_dest_format); + priv->src_format = gimp_color_profile_get_lcms_format (src_format, + &lcms_src_format); + priv->dest_format = gimp_color_profile_get_lcms_format (dest_format, + &lcms_dest_format); lcms_error_clear (); @@ -296,10 +296,10 @@ gimp_color_transform_new_proofing (GimpColorProfile *src_profile, dest_lcms = gimp_color_profile_get_lcms_profile (dest_profile); proof_lcms = gimp_color_profile_get_lcms_profile (proof_profile); - priv->src_format = gimp_color_profile_get_format (src_format, - &lcms_src_format); - priv->dest_format = gimp_color_profile_get_format (dest_format, - &lcms_dest_format); + priv->src_format = gimp_color_profile_get_lcms_format (src_format, + &lcms_src_format); + priv->dest_format = gimp_color_profile_get_lcms_format (dest_format, + &lcms_dest_format); lcms_error_clear ();