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

app: implement GimpColorManaged for GimpImageProxy

Browse Source 
In GimpImageProxy, implement GimpColorManaged by forwarding the
functions to the underlying GimpImage, and forwarding the signals
in the other direction.  This fixes color-managed view in the
Navigation dockable.

(cherry picked from commit 258c8454d5)
This commit is contained in:
Ell
2020-05-22 16:28:02 +03:00
parent b742cc0a0d
commit efb97fa7bd
1 changed files with 140 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/core/gimpimageproxy.c
View File

@ -62,6 +62,7 @@ struct _GimpImageProxyPrivate
/* local function prototypes */ /* local function prototypes */
static void gimp_image_proxy_pickable_iface_init (GimpPickableInterface *iface); static void gimp_image_proxy_pickable_iface_init (GimpPickableInterface *iface);
static void gimp_image_proxy_color_managed_iface_init (GimpColorManagedInterface *iface);
static void gimp_image_proxy_finalize (GObject *object); static void gimp_image_proxy_finalize (GObject *object);
static void gimp_image_proxy_set_property (GObject *object, static void gimp_image_proxy_set_property (GObject *object,
@ -124,6 +125,11 @@ static void gimp_image_proxy_srgb_to_pixel (GimpPickable
const Babl *format, const Babl *format,
gpointer pixel); gpointer pixel);
static const guint8 * gimp_image_proxy_get_icc_profile (GimpColorManaged *managed,
gsize *len);
static GimpColorProfile * gimp_image_proxy_get_color_profile (GimpColorManaged *managed);
static void gimp_image_proxy_profile_changed (GimpColorManaged *managed);
static void gimp_image_proxy_image_frozen_notify (GimpImage *image, static void gimp_image_proxy_image_frozen_notify (GimpImage *image,
const GParamSpec *pspec, const GParamSpec *pspec,
GimpImageProxy *image_proxy); GimpImageProxy *image_proxy);
@ -135,6 +141,8 @@ static void gimp_image_proxy_image_bounds_changed (GimpImage
gint old_x, gint old_x,
gint old_y, gint old_y,
GimpImageProxy *image_proxy); GimpImageProxy *image_proxy);
static void gimp_image_proxy_image_profile_changed (GimpImage *image,
GimpImageProxy *image_proxy);
static void gimp_image_proxy_set_image (GimpImageProxy *image_proxy, static void gimp_image_proxy_set_image (GimpImageProxy *image_proxy,
GimpImage *image); GimpImage *image);
@ -146,7 +154,9 @@ static void gimp_image_proxy_update_frozen (GimpImageProxy
G_DEFINE_TYPE_WITH_CODE (GimpImageProxy, gimp_image_proxy, GIMP_TYPE_VIEWABLE, G_DEFINE_TYPE_WITH_CODE (GimpImageProxy, gimp_image_proxy, GIMP_TYPE_VIEWABLE,
G_ADD_PRIVATE (GimpImageProxy) G_ADD_PRIVATE (GimpImageProxy)
G_IMPLEMENT_INTERFACE (GIMP_TYPE_PICKABLE, G_IMPLEMENT_INTERFACE (GIMP_TYPE_PICKABLE,
gimp_image_proxy_pickable_iface_init)) gimp_image_proxy_pickable_iface_init)
G_IMPLEMENT_INTERFACE (GIMP_TYPE_COLOR_MANAGED,
gimp_image_proxy_color_managed_iface_init))
#define parent_class gimp_image_proxy_parent_class #define parent_class gimp_image_proxy_parent_class
@ -204,6 +214,14 @@ gimp_image_proxy_pickable_iface_init (GimpPickableInterface *iface)
iface->srgb_to_pixel = gimp_image_proxy_srgb_to_pixel; iface->srgb_to_pixel = gimp_image_proxy_srgb_to_pixel;
} }
static void
gimp_image_proxy_color_managed_iface_init (GimpColorManagedInterface *iface)
{
iface->get_icc_profile = gimp_image_proxy_get_icc_profile;
iface->get_color_profile = gimp_image_proxy_get_color_profile;
iface->profile_changed = gimp_image_proxy_profile_changed;
}
static void static void
gimp_image_proxy_init (GimpImageProxy *image_proxy) gimp_image_proxy_init (GimpImageProxy *image_proxy)
{ {
@ -610,6 +628,32 @@ gimp_image_proxy_srgb_to_pixel (GimpPickable *pickable,
gimp_pickable_srgb_to_pixel (proxy_pickable, color, format, pixel); gimp_pickable_srgb_to_pixel (proxy_pickable, color, format, pixel);
} }
static const guint8 *
gimp_image_proxy_get_icc_profile (GimpColorManaged *managed,
gsize *len)
{
GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (managed);
return gimp_color_managed_get_icc_profile (
GIMP_COLOR_MANAGED (image_proxy->priv->image),
len);
}
static GimpColorProfile *
gimp_image_proxy_get_color_profile (GimpColorManaged *managed)
{
GimpImageProxy *image_proxy = GIMP_IMAGE_PROXY (managed);
return gimp_color_managed_get_color_profile (
GIMP_COLOR_MANAGED (image_proxy->priv->image));
}
static void
gimp_image_proxy_profile_changed (GimpColorManaged *managed)
{
gimp_viewable_invalidate_preview (GIMP_VIEWABLE (managed));
}
static void static void
gimp_image_proxy_image_frozen_notify (GimpImage *image, gimp_image_proxy_image_frozen_notify (GimpImage *image,
const GParamSpec *pspec, const GParamSpec *pspec,
@ -641,6 +685,13 @@ gimp_image_proxy_image_bounds_changed (GimpImage *image,
gimp_image_proxy_update_bounding_box (image_proxy); gimp_image_proxy_update_bounding_box (image_proxy);
} }
static void
gimp_image_proxy_image_profile_changed (GimpImage *image,
GimpImageProxy *image_proxy)
{
gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (image_proxy));
}
static void static void
gimp_image_proxy_set_image (GimpImageProxy *image_proxy, gimp_image_proxy_set_image (GimpImageProxy *image_proxy,
GimpImage *image) GimpImage *image)
@ -663,6 +714,10 @@ gimp_image_proxy_set_image (GimpImageProxy *image_proxy,
image_proxy->priv->image, image_proxy->priv->image,
gimp_image_proxy_image_bounds_changed, gimp_image_proxy_image_bounds_changed,
image_proxy); image_proxy);
g_signal_handlers_disconnect_by_func (
image_proxy->priv->image,
gimp_image_proxy_image_profile_changed,
image_proxy);
g_object_unref (image_proxy->priv->image); g_object_unref (image_proxy->priv->image);
} }
@ -689,6 +744,10 @@ gimp_image_proxy_set_image (GimpImageProxy *image_proxy,
image_proxy->priv->image, "bounds-changed", image_proxy->priv->image, "bounds-changed",
G_CALLBACK (gimp_image_proxy_image_bounds_changed), G_CALLBACK (gimp_image_proxy_image_bounds_changed),
image_proxy); image_proxy);
g_signal_connect (
image_proxy->priv->image, "profile-changed",
G_CALLBACK (gimp_image_proxy_image_profile_changed),
image_proxy);
gimp_image_proxy_update_bounding_box (image_proxy); gimp_image_proxy_update_bounding_box (image_proxy);
gimp_image_proxy_update_frozen (image_proxy); gimp_image_proxy_update_frozen (image_proxy);