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

create empty layers of image size instead of skipping empty layers in PSD

Browse Source 
2006-03-09  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/psd.c: create empty layers of image size instead
	of skipping empty layers in PSD files (bug #317044).
This commit is contained in:
Sven Neumann
2006-03-09 11:17:02 +00:00
committed by Sven Neumann
parent 28944ec183
commit 37848a53ec
2 changed files with 118 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-03-09 Sven Neumann <sven@gimp.org>
* plug-ins/common/psd.c: create empty layers of image size instead
of skipping empty layers in PSD files (bug #317044).
2006-03-09 Sven Neumann <sven@gimp.org>
* libgimp/gimpexport.c (gimp_export_image): offer the choice to

41
plug-ins/common/psd.c
View File

@ -1924,18 +1924,24 @@ load_image (const gchar *name)
gint numc;
guchar *merged_data = NULL;
PSDlayer *layer = psd_image.layer + lnum;
gboolean empty = FALSE;
/*
* since ps supports sloppy bounding boxes it is possible to
* Since PS supports sloppy bounding boxes it is possible to
* have a 0x0 or Xx0 or 0xY layer. Gimp doesn't support a
* 0x0 layer so we will just skip these. We might be able
* to do something better here.
* 0x0 layer so we insert an empty layer of image size
* instead.
*/
if ((layer->width == 0) || (layer->height == 0))
{
IFDBG printf ("(bad layer dimensions -- skipping)");
continue;
empty = TRUE;
layer->x = 0;
layer->y = 0;
layer->width = gimp_image_width (image_ID);
layer->height = gimp_image_height (image_ID);
}
numc = layer->num_channels;
IFDBG printf ("Hey, it's a LAYER with %d channels!\n", numc);
@ -1945,6 +1951,8 @@ load_image (const gchar *name)
case GIMP_GRAY:
{
IFDBG printf("It's GRAY.\n");
if (! empty)
{
if (!psd_layer_has_alpha (layer))
{
merged_data = g_malloc (layer->width * layer->height);
@ -1958,14 +1966,15 @@ load_image (const gchar *name)
{
seek_to_and_unpack_pixeldata (fd, lnum, 0);
seek_to_and_unpack_pixeldata (fd, lnum, 1);
merged_data =
chans_to_GRAYA (layer->channel[1].data,
merged_data = chans_to_GRAYA (layer->channel[1].data,
layer->channel[0].data,
layer->width * layer->height);
layer->width *
layer->height);
g_free (layer->channel[0].data);
g_free (layer->channel[1].data);
}
}
layer_ID = gimp_layer_new (image_ID,
layer->name,
@ -1982,13 +1991,15 @@ load_image (const gchar *name)
{
IFDBG printf ("It's RGB, %dx%d.\n", layer->width,
layer->height);
if (! empty)
{
if (!psd_layer_has_alpha (layer))
{
seek_to_and_unpack_pixeldata (fd, lnum, 0);
seek_to_and_unpack_pixeldata (fd, lnum, 1);
seek_to_and_unpack_pixeldata (fd, lnum, 2);
merged_data =
chans_to_RGB (layer->channel[0].data,
merged_data = chans_to_RGB (layer->channel[0].data,
layer->channel[1].data,
layer->channel[2].data,
layer->width *
@ -2050,6 +2061,7 @@ load_image (const gchar *name)
IFDBG fprintf (stderr, "YAH0b\n");
}
}
IFDBG fprintf (stderr, "YAH1\n");
@ -2077,7 +2089,7 @@ load_image (const gchar *name)
IFDBG fprintf (stderr, "YAH3\n");
/* Do a layer mask if it exists */
for (iter = 0; iter < layer->num_channels; iter++)
for (iter = 0; !empty && iter < layer->num_channels; iter++)
{
if (layer->channel[iter].type == -2) /* is mask */
{
@ -2157,6 +2169,12 @@ load_image (const gchar *name)
drawable->height,
drawable->bpp);
if (empty)
{
gimp_drawable_fill (layer_ID, GIMP_TRANSPARENT_FILL);
}
else
{
gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0,
layer->width, layer->height,
TRUE, FALSE);
@ -2164,6 +2182,7 @@ load_image (const gchar *name)
layer->width, layer->height);
IFDBG fprintf(stderr, "YAH6\n");
}
gimp_drawable_flush (drawable);
gimp_drawable_detach (drawable);