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

app: salvage XCF with broken filters.

Browse Source 
This is not a fix for #12359 yet, but an improvement to XCF loading.
When filters fail to load for any reason, we should still load the
layer. Only drop the broken filter.
This commit is contained in:
Jehan
2024-12-22 14:31:55 +01:00
parent 59d65818ce
commit d20cfa1124
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/xcf/xcf-load.c
View File

@ -146,7 +146,8 @@ static gboolean xcf_load_prop (XcfInfo *info,
guint32 *prop_size); guint32 *prop_size);
static GimpLayer * xcf_load_layer (XcfInfo *info, static GimpLayer * xcf_load_layer (XcfInfo *info,
GimpImage *image, GimpImage *image,
GList **item_path); GList **item_path,
gint *n_broken_effects);
static GimpChannel * xcf_load_channel (XcfInfo *info, static GimpChannel * xcf_load_channel (XcfInfo *info,
GimpImage *image); GimpImage *image);
static FilterData * xcf_load_effect (XcfInfo *info, static FilterData * xcf_load_effect (XcfInfo *info,
@ -220,6 +221,7 @@ xcf_load_image (Gimp *gimp,
gint n_broken_layers = 0; gint n_broken_layers = 0;
gint n_broken_channels = 0; gint n_broken_channels = 0;
gint n_broken_paths = 0; gint n_broken_paths = 0;
gint n_broken_effects = 0;
GList *broken_paths = NULL; GList *broken_paths = NULL;
GList *group_layers = NULL; GList *group_layers = NULL;
GList *syms; GList *syms;
@ -627,7 +629,7 @@ xcf_load_image (Gimp *gimp,
goto error; goto error;
/* read in the layer */ /* read in the layer */
layer = xcf_load_layer (info, image, &item_path); layer = xcf_load_layer (info, image, &item_path, &n_broken_effects);
if (! layer) if (! layer)
{ {
n_broken_layers++; n_broken_layers++;
@ -965,7 +967,7 @@ xcf_load_image (Gimp *gimp,
if (info->tattoo_state > 0) if (info->tattoo_state > 0)
gimp_image_set_tattoo_state (image, info->tattoo_state); gimp_image_set_tattoo_state (image, info->tattoo_state);
if (n_broken_layers > 0 || n_broken_channels > 0 || n_broken_paths > 0) if (n_broken_layers > 0 || n_broken_channels > 0 || n_broken_paths > 0 || n_broken_effects)
goto error; goto error;
gimp_image_undo_enable (image); gimp_image_undo_enable (image);
@ -2993,7 +2995,8 @@ xcf_load_prop (XcfInfo *info,
static GimpLayer * static GimpLayer *
xcf_load_layer (XcfInfo *info, xcf_load_layer (XcfInfo *info,
GimpImage *image, GimpImage *image,
GList **item_path) GList **item_path,
gint *n_broken_effects)
{ {
GimpLayer *layer; GimpLayer *layer;
GimpLayerMask *layer_mask; GimpLayerMask *layer_mask;
@ -3258,13 +3261,14 @@ xcf_load_layer (XcfInfo *info,
filter_data = xcf_load_effect (info, image, GIMP_DRAWABLE (layer)); filter_data = xcf_load_effect (info, image, GIMP_DRAWABLE (layer));
if (! filter_data) if (! filter_data)
goto error; {
(*n_broken_effects)++;
xcf_progress_update (info); }
else
{
filter_data_list = g_list_prepend (filter_data_list, filter_data); filter_data_list = g_list_prepend (filter_data_list, filter_data);
filter_count++; filter_count++;
}
xcf_progress_update (info); xcf_progress_update (info);
/* restore the saved position so we'll be ready to /* restore the saved position so we'll be ready to