dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: drop workaround for bug #785521 

We now hard depend on a fresher release of GEGL that already has this fix in
it.
This commit is contained in:
Øyvind Kolås 2017-09-09 23:54:08 +02:00
parent 9b4382614b
commit 415f869f20
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/gegl/gimp-gegl.c
View File

@ -69,27 +69,6 @@ gimp_gegl_init (Gimp *gimp)
gimp_babl_init ();
gimp_operations_init (gimp);
if (GEGL_MAJOR_VERSION == 0 &&
GEGL_MINOR_VERSION == 3 &&
GEGL_MICRO_VERSION <= 21)
{
/* XXX:
*
* hot-fix for bug #785521 and duplicates, this code to
* be removed after GIMP 2.9.6 is released and GIMP depends
* on 0.3.21 or newer again, we do it also for GEGL 0.3.21
* since setting it to FALSE when it already is FALSE
* is no harm.
*/
GType op_type = g_type_from_name ("GeglOpcopy-buffer_c");
if (op_type)
{
GeglOperationClass *op_class = g_type_class_ref (op_type);
if (op_class)
op_class->threaded = FALSE;
}
}
}
static void

5
libgimpcolor/gimpcolorprofile.c
View File

@ -1470,8 +1470,8 @@ gimp_color_profile_get_format (GimpColorProfile *profile,
const Babl *format,
GError **error)
{
const Babl *space;
gchar *babl_error = NULL;
const Babl *space;
const gchar *babl_error = NULL;
g_return_val_if_fail (GIMP_IS_COLOR_PROFILE (profile), NULL);
g_return_val_if_fail (format != NULL, NULL);
@ -1479,6 +1479,7 @@ gimp_color_profile_get_format (GimpColorProfile *profile,
space = babl_space_from_icc ((const gchar *) profile->priv->data,
profile->priv->length,
BABL_ICC_INTENT_RELATIVE_COLORIMETRIC,
&babl_error);
if (! space)