f08eff5cda
Resolves #15833 When we copied images in gimp_image_duplicate_sample_points (), we only carried over their X & Y position, not their pick mode. This patch adds calls to get the original pick mode and to set it to the new sample point created in the copied image.
593 lines
20 KiB
C
593 lines
20 KiB
C
/* 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 <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gdk-pixbuf/gdk-pixbuf.h>
|
|
#include <gegl.h>
|
|
|
|
#include "libgimpbase/gimpbase.h"
|
|
|
|
#include "core-types.h"
|
|
|
|
#include "gegl/gimp-gegl-loops.h"
|
|
|
|
#include "path/gimppath.h"
|
|
|
|
#include "gimp.h"
|
|
#include "gimpchannel.h"
|
|
#include "gimpguide.h"
|
|
#include "gimpimage.h"
|
|
#include "gimpimage-color-profile.h"
|
|
#include "gimpimage-colormap.h"
|
|
#include "gimpimage-duplicate.h"
|
|
#include "gimpimage-grid.h"
|
|
#include "gimpimage-guides.h"
|
|
#include "gimpimage-metadata.h"
|
|
#include "gimpimage-private.h"
|
|
#include "gimpimage-undo.h"
|
|
#include "gimpimage-sample-points.h"
|
|
#include "gimpitemstack.h"
|
|
#include "gimplayer.h"
|
|
#include "gimplayermask.h"
|
|
#include "gimplayer-floating-selection.h"
|
|
#include "gimpparasitelist.h"
|
|
#include "gimpsamplepoint.h"
|
|
|
|
|
|
static void gimp_image_duplicate_resolution (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static void gimp_image_duplicate_save_source_file (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static void gimp_image_duplicate_colormap (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static GimpItem * gimp_image_duplicate_item (GimpItem *item,
|
|
GimpImage *new_image);
|
|
static GList * gimp_image_duplicate_layers (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static GList * gimp_image_duplicate_channels (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static GList * gimp_image_duplicate_paths (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static void gimp_image_duplicate_floating_sel (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static void gimp_image_duplicate_mask (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static void gimp_image_duplicate_components (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static void gimp_image_duplicate_guides (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static void gimp_image_duplicate_sample_points (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static void gimp_image_duplicate_grid (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static void gimp_image_duplicate_metadata (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static void gimp_image_duplicate_quick_mask (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static void gimp_image_duplicate_parasites (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static void gimp_image_duplicate_color_profile (GimpImage *image,
|
|
GimpImage *new_image);
|
|
static void gimp_image_duplicate_simulation_profile
|
|
(GimpImage *image,
|
|
GimpImage *new_image);
|
|
|
|
|
|
GimpImage *
|
|
gimp_image_duplicate (GimpImage *image)
|
|
{
|
|
GimpImage *new_image;
|
|
GList *active_layers;
|
|
GList *active_channels;
|
|
GList *active_path;
|
|
|
|
g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
|
|
|
|
gimp_set_busy_until_idle (image->gimp);
|
|
|
|
/* Create a new image */
|
|
new_image = gimp_create_image (image->gimp,
|
|
gimp_image_get_width (image),
|
|
gimp_image_get_height (image),
|
|
gimp_image_get_base_type (image),
|
|
gimp_image_get_precision (image),
|
|
FALSE);
|
|
gimp_image_undo_disable (new_image);
|
|
|
|
/* Store the source uri to be used by the save dialog */
|
|
gimp_image_duplicate_save_source_file (image, new_image);
|
|
|
|
/* Copy resolution information */
|
|
gimp_image_duplicate_resolution (image, new_image);
|
|
|
|
/* Copy parasites first so we have a color profile */
|
|
gimp_image_duplicate_parasites (image, new_image);
|
|
gimp_image_duplicate_color_profile (image, new_image);
|
|
|
|
/* Copy the simulation profile settings */
|
|
gimp_image_duplicate_simulation_profile (image, new_image);
|
|
|
|
/* Copy the colormap if necessary */
|
|
gimp_image_duplicate_colormap (image, new_image);
|
|
|
|
/* Copy the layers */
|
|
active_layers = gimp_image_duplicate_layers (image, new_image);
|
|
|
|
/* Copy the channels */
|
|
active_channels = gimp_image_duplicate_channels (image, new_image);
|
|
|
|
/* Copy any path */
|
|
active_path = gimp_image_duplicate_paths (image, new_image);
|
|
|
|
/* Copy floating layer */
|
|
gimp_image_duplicate_floating_sel (image, new_image);
|
|
|
|
/* Copy the selection mask */
|
|
gimp_image_duplicate_mask (image, new_image);
|
|
|
|
/* Set active layer, active channel, active path */
|
|
if (active_layers)
|
|
gimp_image_set_selected_layers (new_image, active_layers);
|
|
|
|
if (active_channels)
|
|
gimp_image_set_selected_channels (new_image, active_channels);
|
|
|
|
if (active_path)
|
|
gimp_image_set_selected_paths (new_image, active_path);
|
|
|
|
/* Copy state of all color components */
|
|
gimp_image_duplicate_components (image, new_image);
|
|
|
|
/* Copy any guides */
|
|
gimp_image_duplicate_guides (image, new_image);
|
|
|
|
/* Copy any sample points */
|
|
gimp_image_duplicate_sample_points (image, new_image);
|
|
|
|
/* Copy the grid */
|
|
gimp_image_duplicate_grid (image, new_image);
|
|
|
|
/* Copy the metadata */
|
|
gimp_image_duplicate_metadata (image, new_image);
|
|
|
|
/* Copy the quick mask info */
|
|
gimp_image_duplicate_quick_mask (image, new_image);
|
|
|
|
gimp_image_undo_enable (new_image);
|
|
|
|
/* Explicitly mark image as dirty, so that its dirty time is set */
|
|
gimp_image_dirty (new_image, GIMP_DIRTY_ALL);
|
|
|
|
/* XXX Without flushing the duplicated image, we had at least one case
|
|
* where it wouldn't properly render the image (with empty
|
|
* pass-through groups with layer effects, which I think is because we
|
|
* have code believing the group is smaller that it really is, because
|
|
* of the specificity of pass-through groups). See #13057.
|
|
* So I'm not entirely happy of calling this here, which feels more
|
|
* like a workaround than a real fix. But it will do for now.
|
|
*/
|
|
gimp_image_flush (new_image);
|
|
|
|
return new_image;
|
|
}
|
|
|
|
static void
|
|
gimp_image_duplicate_resolution (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
gdouble xres;
|
|
gdouble yres;
|
|
|
|
gimp_image_get_resolution (image, &xres, &yres);
|
|
gimp_image_set_resolution (new_image, xres, yres);
|
|
gimp_image_set_unit (new_image, gimp_image_get_unit (image));
|
|
}
|
|
|
|
static void
|
|
gimp_image_duplicate_save_source_file (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
GFile *file = gimp_image_get_file (image);
|
|
|
|
if (file)
|
|
g_object_set_data_full (G_OBJECT (new_image), "gimp-image-source-file",
|
|
g_object_ref (file),
|
|
(GDestroyNotify) g_object_unref);
|
|
}
|
|
|
|
static void
|
|
gimp_image_duplicate_colormap (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
if (gimp_image_get_base_type (new_image) == GIMP_INDEXED)
|
|
gimp_image_set_colormap_palette (new_image,
|
|
gimp_image_get_colormap_palette (image),
|
|
FALSE);
|
|
}
|
|
|
|
static GimpItem *
|
|
gimp_image_duplicate_item (GimpItem *item,
|
|
GimpImage *new_image)
|
|
{
|
|
GimpItem *new_item;
|
|
|
|
new_item = gimp_item_convert (item, new_image,
|
|
G_TYPE_FROM_INSTANCE (item));
|
|
|
|
/* Make sure the copied item doesn't say: "<old item> copy" */
|
|
gimp_object_set_name (GIMP_OBJECT (new_item),
|
|
gimp_object_get_name (item));
|
|
|
|
return new_item;
|
|
}
|
|
|
|
static GList *
|
|
gimp_image_duplicate_layers (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
GList *new_selected_layers = NULL;
|
|
GList *selected_paths = NULL;
|
|
GList *selected_layers;
|
|
GimpItemStack *new_item_stack;
|
|
GList *list;
|
|
gint count;
|
|
|
|
selected_layers = gimp_image_get_selected_layers (image);
|
|
|
|
for (list = selected_layers; list; list = list->next)
|
|
selected_paths = g_list_prepend (selected_paths,
|
|
gimp_item_get_path (list->data));
|
|
|
|
for (list = gimp_image_get_layer_iter (image), count = 0;
|
|
list;
|
|
list = g_list_next (list))
|
|
{
|
|
GimpLayer *layer = list->data;
|
|
GimpLayer *new_layer;
|
|
|
|
if (gimp_layer_is_floating_sel (layer))
|
|
continue;
|
|
|
|
new_layer = GIMP_LAYER (gimp_image_duplicate_item (GIMP_ITEM (layer),
|
|
new_image));
|
|
|
|
/* Make sure that if the layer has a layer mask,
|
|
* its name isn't screwed up
|
|
*/
|
|
if (new_layer->mask)
|
|
gimp_object_set_name (GIMP_OBJECT (new_layer->mask),
|
|
gimp_object_get_name (layer->mask));
|
|
|
|
gimp_image_add_layer (new_image, new_layer,
|
|
NULL, count++, FALSE);
|
|
}
|
|
|
|
new_item_stack = GIMP_ITEM_STACK (gimp_image_get_layers (new_image));
|
|
for (list = selected_paths; list; list = list->next)
|
|
new_selected_layers = g_list_prepend (new_selected_layers,
|
|
gimp_item_stack_get_item_by_path (new_item_stack, list->data));
|
|
|
|
g_list_free_full (selected_paths, (GDestroyNotify) g_list_free);
|
|
|
|
return new_selected_layers;
|
|
}
|
|
|
|
static GList *
|
|
gimp_image_duplicate_channels (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
GList *new_selected_channels = NULL;
|
|
GList *selected_channels;
|
|
GList *list;
|
|
gint count;
|
|
|
|
selected_channels = gimp_image_get_selected_channels (image);
|
|
|
|
for (list = gimp_image_get_channel_iter (image), count = 0;
|
|
list;
|
|
list = g_list_next (list))
|
|
{
|
|
GimpChannel *channel = list->data;
|
|
GimpChannel *new_channel;
|
|
|
|
new_channel = GIMP_CHANNEL (gimp_image_duplicate_item (GIMP_ITEM (channel),
|
|
new_image));
|
|
|
|
if (g_list_find (selected_channels, channel))
|
|
new_selected_channels = g_list_prepend (new_selected_channels, new_channel);
|
|
|
|
gimp_image_add_channel (new_image, new_channel,
|
|
NULL, count++, FALSE);
|
|
}
|
|
|
|
return new_selected_channels;
|
|
}
|
|
|
|
static GList *
|
|
gimp_image_duplicate_paths (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
GList *new_selected_path = NULL;
|
|
GList *selected_path;
|
|
GList *list;
|
|
gint count;
|
|
|
|
selected_path = gimp_image_get_selected_paths (image);
|
|
|
|
for (list = gimp_image_get_path_iter (image), count = 0;
|
|
list;
|
|
list = g_list_next (list))
|
|
{
|
|
GimpPath *path = list->data;
|
|
GimpPath *new_path;
|
|
|
|
new_path = GIMP_PATH (gimp_image_duplicate_item (GIMP_ITEM (path),
|
|
new_image));
|
|
|
|
if (g_list_find (selected_path, path))
|
|
new_selected_path = g_list_prepend (new_selected_path, new_path);
|
|
|
|
|
|
gimp_image_add_path (new_image, new_path,
|
|
NULL, count++, FALSE);
|
|
}
|
|
|
|
return new_selected_path;
|
|
}
|
|
|
|
static void
|
|
gimp_image_duplicate_floating_sel (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
GimpLayer *floating_sel;
|
|
GimpDrawable *floating_sel_drawable;
|
|
GList *floating_sel_path;
|
|
GimpItemStack *new_item_stack;
|
|
GimpLayer *new_floating_sel;
|
|
GimpDrawable *new_floating_sel_drawable;
|
|
|
|
floating_sel = gimp_image_get_floating_selection (image);
|
|
|
|
if (! floating_sel)
|
|
return;
|
|
|
|
floating_sel_drawable = gimp_layer_get_floating_sel_drawable (floating_sel);
|
|
|
|
if (GIMP_IS_LAYER_MASK (floating_sel_drawable))
|
|
{
|
|
GimpLayer *layer;
|
|
|
|
layer = gimp_layer_mask_get_layer (GIMP_LAYER_MASK (floating_sel_drawable));
|
|
|
|
floating_sel_path = gimp_item_get_path (GIMP_ITEM (layer));
|
|
|
|
new_item_stack = GIMP_ITEM_STACK (gimp_image_get_layers (new_image));
|
|
}
|
|
else
|
|
{
|
|
floating_sel_path = gimp_item_get_path (GIMP_ITEM (floating_sel_drawable));
|
|
|
|
if (GIMP_IS_LAYER (floating_sel_drawable))
|
|
new_item_stack = GIMP_ITEM_STACK (gimp_image_get_layers (new_image));
|
|
else
|
|
new_item_stack = GIMP_ITEM_STACK (gimp_image_get_channels (new_image));
|
|
}
|
|
|
|
/* adjust path[0] for the floating layer missing in new_image */
|
|
floating_sel_path->data =
|
|
GUINT_TO_POINTER (GPOINTER_TO_UINT (floating_sel_path->data) - 1);
|
|
|
|
if (GIMP_IS_LAYER (floating_sel_drawable))
|
|
{
|
|
new_floating_sel =
|
|
GIMP_LAYER (gimp_image_duplicate_item (GIMP_ITEM (floating_sel),
|
|
new_image));
|
|
}
|
|
else
|
|
{
|
|
/* can't use gimp_item_convert() for floating selections of channels
|
|
* or layer masks because they maybe don't have a normal layer's type
|
|
*/
|
|
new_floating_sel =
|
|
GIMP_LAYER (gimp_item_duplicate (GIMP_ITEM (floating_sel),
|
|
G_TYPE_FROM_INSTANCE (floating_sel)));
|
|
gimp_item_set_image (GIMP_ITEM (new_floating_sel), new_image);
|
|
|
|
gimp_object_set_name (GIMP_OBJECT (new_floating_sel),
|
|
gimp_object_get_name (floating_sel));
|
|
}
|
|
|
|
/* Make sure the copied layer doesn't say: "<old layer> copy" */
|
|
gimp_object_set_name (GIMP_OBJECT (new_floating_sel),
|
|
gimp_object_get_name (floating_sel));
|
|
|
|
new_floating_sel_drawable =
|
|
GIMP_DRAWABLE (gimp_item_stack_get_item_by_path (new_item_stack,
|
|
floating_sel_path));
|
|
|
|
if (GIMP_IS_LAYER_MASK (floating_sel_drawable))
|
|
new_floating_sel_drawable =
|
|
GIMP_DRAWABLE (gimp_layer_get_mask (GIMP_LAYER (new_floating_sel_drawable)));
|
|
|
|
floating_sel_attach (new_floating_sel, new_floating_sel_drawable);
|
|
|
|
g_list_free (floating_sel_path);
|
|
}
|
|
|
|
static void
|
|
gimp_image_duplicate_mask (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
GimpDrawable *mask;
|
|
GimpDrawable *new_mask;
|
|
|
|
mask = GIMP_DRAWABLE (gimp_image_get_mask (image));
|
|
new_mask = GIMP_DRAWABLE (gimp_image_get_mask (new_image));
|
|
|
|
gimp_gegl_buffer_copy (gimp_drawable_get_buffer (mask), NULL, GEGL_ABYSS_NONE,
|
|
gimp_drawable_get_buffer (new_mask), NULL);
|
|
|
|
GIMP_CHANNEL (new_mask)->bounds_known = FALSE;
|
|
GIMP_CHANNEL (new_mask)->boundary_known = FALSE;
|
|
}
|
|
|
|
static void
|
|
gimp_image_duplicate_components (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
|
|
GimpImagePrivate *new_private = GIMP_IMAGE_GET_PRIVATE (new_image);
|
|
gint count;
|
|
|
|
for (count = 0; count < MAX_CHANNELS; count++)
|
|
{
|
|
new_private->visible[count] = private->visible[count];
|
|
new_private->active[count] = private->active[count];
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_image_duplicate_guides (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
GList *list;
|
|
|
|
for (list = gimp_image_get_guides (image);
|
|
list;
|
|
list = g_list_next (list))
|
|
{
|
|
GimpGuide *guide = list->data;
|
|
gint position = gimp_guide_get_position (guide);
|
|
|
|
switch (gimp_guide_get_orientation (guide))
|
|
{
|
|
case GIMP_ORIENTATION_HORIZONTAL:
|
|
gimp_image_add_hguide (new_image, position, FALSE);
|
|
break;
|
|
|
|
case GIMP_ORIENTATION_VERTICAL:
|
|
gimp_image_add_vguide (new_image, position, FALSE);
|
|
break;
|
|
|
|
default:
|
|
g_error ("Unknown guide orientation.\n");
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_image_duplicate_sample_points (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
GList *list;
|
|
|
|
for (list = gimp_image_get_sample_points (image);
|
|
list;
|
|
list = g_list_next (list))
|
|
{
|
|
GimpSamplePoint *sample_point = list->data;
|
|
GimpSamplePoint *new_sample_point;
|
|
GimpColorPickMode pick_mode;
|
|
gint x;
|
|
gint y;
|
|
|
|
gimp_sample_point_get_position (sample_point, &x, &y);
|
|
pick_mode = gimp_sample_point_get_pick_mode (sample_point);
|
|
|
|
new_sample_point = gimp_image_add_sample_point_at_pos (new_image, x, y,
|
|
FALSE);
|
|
gimp_image_set_sample_point_pick_mode (new_image, new_sample_point,
|
|
pick_mode, FALSE);
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_image_duplicate_grid (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
if (gimp_image_get_grid (image))
|
|
gimp_image_set_grid (new_image, gimp_image_get_grid (image), FALSE);
|
|
}
|
|
|
|
static void
|
|
gimp_image_duplicate_metadata (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
GimpMetadata *metadata = gimp_image_get_metadata (image);
|
|
|
|
if (metadata)
|
|
{
|
|
metadata = gimp_metadata_duplicate (metadata);
|
|
gimp_image_set_metadata (new_image, metadata, FALSE);
|
|
g_object_unref (metadata);
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_image_duplicate_quick_mask (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
|
|
GimpImagePrivate *new_private = GIMP_IMAGE_GET_PRIVATE (new_image);
|
|
|
|
new_private->quick_mask_state = private->quick_mask_state;
|
|
new_private->quick_mask_inverted = private->quick_mask_inverted;
|
|
new_private->quick_mask_color = gegl_color_duplicate (private->quick_mask_color);
|
|
}
|
|
|
|
static void
|
|
gimp_image_duplicate_parasites (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
GimpImagePrivate *private = GIMP_IMAGE_GET_PRIVATE (image);
|
|
GimpImagePrivate *new_private = GIMP_IMAGE_GET_PRIVATE (new_image);
|
|
|
|
if (private->parasites)
|
|
{
|
|
g_object_unref (new_private->parasites);
|
|
new_private->parasites = gimp_parasite_list_copy (private->parasites);
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_image_duplicate_color_profile (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
GimpColorProfile *profile = gimp_image_get_color_profile (image);
|
|
GimpColorProfile *hidden = _gimp_image_get_hidden_profile (image);
|
|
|
|
gimp_image_set_color_profile (new_image, profile, NULL);
|
|
_gimp_image_set_hidden_profile (new_image, hidden, FALSE);
|
|
}
|
|
|
|
static void
|
|
gimp_image_duplicate_simulation_profile (GimpImage *image,
|
|
GimpImage *new_image)
|
|
{
|
|
GimpColorProfile *profile;
|
|
GimpColorRenderingIntent intent;
|
|
gboolean bpc;
|
|
|
|
profile = gimp_image_get_simulation_profile (image);
|
|
intent = gimp_image_get_simulation_intent (image);
|
|
bpc = gimp_image_get_simulation_bpc (image);
|
|
|
|
gimp_image_set_simulation_profile (new_image, profile);
|
|
gimp_image_set_simulation_intent (new_image, intent);
|
|
gimp_image_set_simulation_bpc (new_image, bpc);
|
|
}
|