dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
gimp/app/core/gimplayer-new.c

303 lines
9.9 KiB
C
Raw Normal View History

app: move functions to create layers to new files gimplayer-new.[ch]
2015-06-17 19:21:01 +08:00
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
Bug 723392 - Pasting an image replaces color profile with default one In gimplayer-new.c, convert new layers to the image's profile if color management is not disabled in prefs. This should convert pixels from whatever source if they have a profile attached. If they don't have a profile, no conversion is done. I'm not entirely sure if this automatic conversion is always the right thing to do, please test.
2015-08-14 06:08:51 +08:00
#include <lcms2.h>
app: move functions to create layers to new files gimplayer-new.[ch]
2015-06-17 19:21:01 +08:00
#include <cairo.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpcolor/gimpcolor.h"
Bug 723392 - Pasting an image replaces color profile with default one In gimplayer-new.c, convert new layers to the image's profile if color management is not disabled in prefs. This should convert pixels from whatever source if they have a profile attached. If they don't have a profile, no conversion is done. I'm not entirely sure if this automatic conversion is always the right thing to do, please test.
2015-08-14 06:08:51 +08:00
#include "libgimpconfig/gimpconfig.h"
app: move functions to create layers to new files gimplayer-new.[ch]
2015-06-17 19:21:01 +08:00
#include "core-types.h"
Bug 723392 - Pasting an image replaces color profile with default one In gimplayer-new.c, convert new layers to the image's profile if color management is not disabled in prefs. This should convert pixels from whatever source if they have a profile attached. If they don't have a profile, no conversion is done. I'm not entirely sure if this automatic conversion is always the right thing to do, please test.
2015-08-14 06:08:51 +08:00
#include "config/gimpcoreconfig.h"
#include "gimp.h"
app: rename gimp_layer_new_from_buffer() to gimp_layer_new_from_gegl_buffer() and add new function gimp_layer_new_from_buffer() which takes a GimpBuffer. This will make sense soon :)
2015-06-20 06:02:11 +08:00
#include "gimpbuffer.h"
app: move functions to create layers to new files gimplayer-new.[ch]
2015-06-17 19:21:01 +08:00
#include "gimpimage.h"
#include "gimplayer.h"
#include "gimplayer-new.h"
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
/* local function prototypes */
Bug 723392 - Pasting an image replaces color profile with default one In gimplayer-new.c, convert new layers to the image's profile if color management is not disabled in prefs. This should convert pixels from whatever source if they have a profile attached. If they don't have a profile, no conversion is done. I'm not entirely sure if this automatic conversion is always the right thing to do, please test.
2015-08-14 06:08:51 +08:00
static gboolean gimp_layer_new_convert_profile (GimpLayer *layer,
const guint8 *icc_data,
gsize icc_length,
GError **error);
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
/* public functions */
app: move functions to create layers to new files gimplayer-new.[ch]
2015-06-17 19:21:01 +08:00
GimpLayer *
gimp_layer_new (GimpImage *image,
gint width,
gint height,
const Babl *format,
const gchar *name,
gdouble opacity,
GimpLayerModeEffects mode)
{
GimpLayer *layer;
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
g_return_val_if_fail (width > 0, NULL);
g_return_val_if_fail (height > 0, NULL);
g_return_val_if_fail (format != NULL, NULL);
layer = GIMP_LAYER (gimp_drawable_new (GIMP_TYPE_LAYER,
image, name,
0, 0, width, height,
format));
opacity = CLAMP (opacity, GIMP_OPACITY_TRANSPARENT, GIMP_OPACITY_OPAQUE);
layer->opacity = opacity;
layer->mode = mode;
return layer;
}
/**
* gimp_layer_new_from_buffer:
* @buffer: The buffer to make the new layer from.
* @dest_image: The image the new layer will be added to.
* @format: The #Babl format of the new layer.
* @name: The new layer's name.
* @opacity: The new layer's opacity.
* @mode: The new layer's mode.
*
* Copies %buffer to a layer taking into consideration the
* possibility of transforming the contents to meet the requirements
* of the target image type
*
* Return value: The new layer.
**/
GimpLayer *
app: rename gimp_layer_new_from_buffer() to gimp_layer_new_from_gegl_buffer() and add new function gimp_layer_new_from_buffer() which takes a GimpBuffer. This will make sense soon :)
2015-06-20 06:02:11 +08:00
gimp_layer_new_from_buffer (GimpBuffer *buffer,
app: move functions to create layers to new files gimplayer-new.[ch]
2015-06-17 19:21:01 +08:00
GimpImage *dest_image,
const Babl *format,
const gchar *name,
gdouble opacity,
GimpLayerModeEffects mode)
app: rename gimp_layer_new_from_buffer() to gimp_layer_new_from_gegl_buffer() and add new function gimp_layer_new_from_buffer() which takes a GimpBuffer. This will make sense soon :)
2015-06-20 06:02:11 +08:00
{
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
const guint8 *icc_data;
gsize icc_len;
app: rename gimp_layer_new_from_buffer() to gimp_layer_new_from_gegl_buffer() and add new function gimp_layer_new_from_buffer() which takes a GimpBuffer. This will make sense soon :)
2015-06-20 06:02:11 +08:00
g_return_val_if_fail (GIMP_IS_BUFFER (buffer), NULL);
g_return_val_if_fail (GIMP_IS_IMAGE (dest_image), NULL);
g_return_val_if_fail (format != NULL, NULL);
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
icc_data = gimp_buffer_get_icc_profile (buffer, &icc_len);
app: rename gimp_layer_new_from_buffer() to gimp_layer_new_from_gegl_buffer() and add new function gimp_layer_new_from_buffer() which takes a GimpBuffer. This will make sense soon :)
2015-06-20 06:02:11 +08:00
return gimp_layer_new_from_gegl_buffer (gimp_buffer_get_buffer (buffer),
dest_image, format,
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
name, opacity, mode,
icc_data, icc_len);
app: rename gimp_layer_new_from_buffer() to gimp_layer_new_from_gegl_buffer() and add new function gimp_layer_new_from_buffer() which takes a GimpBuffer. This will make sense soon :)
2015-06-20 06:02:11 +08:00
}
/**
* gimp_layer_new_from_gegl_buffer:
* @buffer: The buffer to make the new layer from.
* @dest_image: The image the new layer will be added to.
* @format: The #Babl format of the new layer.
* @name: The new layer's name.
* @opacity: The new layer's opacity.
* @mode: The new layer's mode.
*
* Copies %buffer to a layer taking into consideration the
* possibility of transforming the contents to meet the requirements
* of the target image type
*
* Return value: The new layer.
**/
GimpLayer *
gimp_layer_new_from_gegl_buffer (GeglBuffer *buffer,
GimpImage *dest_image,
const Babl *format,
const gchar *name,
gdouble opacity,
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
GimpLayerModeEffects mode,
const guint8 *buffer_icc_data,
gsize buffer_icc_length)
app: move functions to create layers to new files gimplayer-new.[ch]
2015-06-17 19:21:01 +08:00
{
GimpLayer *layer;
GeglBuffer *dest;
g_return_val_if_fail (GEGL_IS_BUFFER (buffer), NULL);
g_return_val_if_fail (GIMP_IS_IMAGE (dest_image), NULL);
g_return_val_if_fail (format != NULL, NULL);
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
g_return_val_if_fail (buffer_icc_data != NULL || buffer_icc_length == 0, NULL);
app: move functions to create layers to new files gimplayer-new.[ch]
2015-06-17 19:21:01 +08:00
/* do *not* use the buffer's format because this function gets
* buffers of any format passed, and converts them
*/
layer = gimp_layer_new (dest_image,
gegl_buffer_get_width (buffer),
gegl_buffer_get_height (buffer),
format,
name, opacity, mode);
dest = gimp_drawable_get_buffer (GIMP_DRAWABLE (layer));
gegl_buffer_copy (buffer, NULL, GEGL_ABYSS_NONE, dest, NULL);
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
if (buffer_icc_data)
Bug 723392 - Pasting an image replaces color profile with default one In gimplayer-new.c, convert new layers to the image's profile if color management is not disabled in prefs. This should convert pixels from whatever source if they have a profile attached. If they don't have a profile, no conversion is done. I'm not entirely sure if this automatic conversion is always the right thing to do, please test.
2015-08-14 06:08:51 +08:00
gimp_layer_new_convert_profile (layer, buffer_icc_data, buffer_icc_length,
NULL);
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
app: move functions to create layers to new files gimplayer-new.[ch]
2015-06-17 19:21:01 +08:00
return layer;
}
/**
* gimp_layer_new_from_pixbuf:
* @pixbuf: The pixbuf to make the new layer from.
* @dest_image: The image the new layer will be added to.
* @format: The #Babl format of the new layer.
* @name: The new layer's name.
* @opacity: The new layer's opacity.
* @mode: The new layer's mode.
*
* Copies %pixbuf to a layer taking into consideration the
* possibility of transforming the contents to meet the requirements
* of the target image type
*
* Return value: The new layer.
**/
GimpLayer *
gimp_layer_new_from_pixbuf (GdkPixbuf *pixbuf,
GimpImage *dest_image,
const Babl *format,
const gchar *name,
gdouble opacity,
GimpLayerModeEffects mode)
{
GeglBuffer *buffer;
GimpLayer *layer;
gint width;
gint height;
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
guint8 *icc_data;
gsize icc_len;
app: move functions to create layers to new files gimplayer-new.[ch]
2015-06-17 19:21:01 +08:00
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
g_return_val_if_fail (GIMP_IS_IMAGE (dest_image), NULL);
g_return_val_if_fail (format != NULL, NULL);
width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf);
layer = gimp_layer_new (dest_image, width, height,
format, name, opacity, mode);
buffer = gimp_drawable_get_buffer (GIMP_DRAWABLE (layer));
gegl_buffer_set (buffer, GEGL_RECTANGLE (0, 0, width, height), 0,
gimp_pixbuf_get_format (pixbuf),
gdk_pixbuf_get_pixels (pixbuf),
gdk_pixbuf_get_rowstride (pixbuf));
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
icc_data = gimp_pixbuf_get_icc_profile (pixbuf, &icc_len);
if (icc_data)
{
Bug 723392 - Pasting an image replaces color profile with default one In gimplayer-new.c, convert new layers to the image's profile if color management is not disabled in prefs. This should convert pixels from whatever source if they have a profile attached. If they don't have a profile, no conversion is done. I'm not entirely sure if this automatic conversion is always the right thing to do, please test.
2015-08-14 06:08:51 +08:00
gimp_layer_new_convert_profile (layer, icc_data, icc_len, NULL);
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
g_free (icc_data);
}
app: move functions to create layers to new files gimplayer-new.[ch]
2015-06-17 19:21:01 +08:00
return layer;
}
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
/* private functions */
Bug 723392 - Pasting an image replaces color profile with default one In gimplayer-new.c, convert new layers to the image's profile if color management is not disabled in prefs. This should convert pixels from whatever source if they have a profile attached. If they don't have a profile, no conversion is done. I'm not entirely sure if this automatic conversion is always the right thing to do, please test.
2015-08-14 06:08:51 +08:00
static gboolean
gimp_layer_new_convert_profile (GimpLayer *layer,
const guint8 *icc_data,
gsize icc_length,
GError **error)
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
{
Bug 723392 - Pasting an image replaces color profile with default one In gimplayer-new.c, convert new layers to the image's profile if color management is not disabled in prefs. This should convert pixels from whatever source if they have a profile attached. If they don't have a profile, no conversion is done. I'm not entirely sure if this automatic conversion is always the right thing to do, please test.
2015-08-14 06:08:51 +08:00
GimpDrawable *drawable = GIMP_DRAWABLE (layer);
GimpImage *image = gimp_item_get_image (GIMP_ITEM (layer));
GimpColorConfig *config = image->gimp->config->color_management;
GimpColorProfile *src_profile;
GimpColorProfile *dest_profile;
cmsHPROFILE src_lcms;
cmsHPROFILE dest_lcms;
const Babl *iter_format;
cmsUInt32Number lcms_format;
cmsHTRANSFORM transform;
if (! gimp_drawable_is_rgb (drawable))
return TRUE;
if (config->mode == GIMP_COLOR_MANAGEMENT_OFF)
return TRUE;
src_profile = gimp_color_profile_new_from_icc_profile (icc_data, icc_length,
error);
if (! src_profile)
return FALSE;
dest_profile = gimp_color_managed_get_color_profile (GIMP_COLOR_MANAGED (image));
if (gimp_color_profile_is_equal (src_profile, dest_profile))
{
g_object_unref (src_profile);
g_object_unref (dest_profile);
return TRUE;
}
src_lcms = gimp_color_profile_get_lcms_profile (src_profile);
dest_lcms = gimp_color_profile_get_lcms_profile (dest_profile);
iter_format =
gimp_color_profile_get_format (gimp_drawable_get_format (drawable),
&lcms_format);
transform = cmsCreateTransform (src_lcms, lcms_format,
dest_lcms, lcms_format,
GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
cmsFLAGS_NOOPTIMIZE);
if (transform)
{
GeglBuffer *buffer = gimp_drawable_get_buffer (drawable);
GeglBufferIterator *iter;
iter = gegl_buffer_iterator_new (buffer, NULL, 0,
iter_format,
GEGL_ACCESS_READWRITE,
GEGL_ABYSS_NONE);
while (gegl_buffer_iterator_next (iter))
{
cmsDoTransform (transform,
iter->data[0], iter->data[0], iter->length);
}
cmsDeleteTransform (transform);
}
g_object_unref (src_profile);
g_object_unref (dest_profile);
return TRUE;
app: add ICC data/length parameters to gimp_layer_new_from_gegl_buffer() and pass them where we know the buffer could be from another image. Pass "NULL, 0" if we know it's the same image. Add gimp_layer_new_convert_profile() which takes the newly created layer and the ICC data/length; call it from both gimp_layer_new_from_gegl_buffer() and gimp_layer_new_from_pixbuf(). gimp_layer_new_convert_profile() is empty, this is just infrastructure.
2015-06-20 06:33:22 +08:00
}