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

pdb: same fix as for XCF loading below

Browse Source
This commit is contained in:
Michael Natterer
2012-05-11 14:30:38 +02:00
parent ce1179410b
commit 3867731b03
2 changed files with 88 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/pdb/layer-cmds.c
View File

@ -79,13 +79,52 @@ layer_new_invoker (GimpProcedure *procedure,
if (success) if (success)
{ {
gboolean has_alpha = (type == GIMP_RGBA_IMAGE || GimpImageBaseType base_type = GIMP_RGB;
type == GIMP_GRAYA_IMAGE || gboolean has_alpha = FALSE;
type == GIMP_INDEXEDA_IMAGE); const Babl *format;
switch (type)
{
case GIMP_RGB_IMAGE:
base_type = GIMP_RGB;
has_alpha = FALSE;
break;
case GIMP_RGBA_IMAGE:
base_type = GIMP_RGB;
has_alpha = TRUE;
break;
case GIMP_GRAY_IMAGE:
base_type = GIMP_GRAY;
has_alpha = FALSE;
break;
case GIMP_GRAYA_IMAGE:
base_type = GIMP_GRAY;
has_alpha = TRUE;
break;
case GIMP_INDEXED_IMAGE:
base_type = GIMP_INDEXED;
has_alpha = FALSE;
break;
case GIMP_INDEXEDA_IMAGE:
base_type = GIMP_INDEXED;
has_alpha = TRUE;
break;
}
/* do not use gimp_image_get_layer_format() because it might
* be the floating selection of a channel or mask
*/
format = gimp_image_get_format (image, base_type,
gimp_image_get_precision (image),
has_alpha);
layer = gimp_layer_new (image, width, height, layer = gimp_layer_new (image, width, height,
gimp_image_get_layer_format (image, has_alpha), format, name, opacity / 100.0, mode);
name, opacity / 100.0, mode);
if (! layer) if (! layer)
success = FALSE; success = FALSE;

49
tools/pdbgen/pdb/layer.pdb
View File

@ -55,13 +55,52 @@ HELP
%invoke = ( %invoke = (
code => <<'CODE' code => <<'CODE'
{ {
gboolean has_alpha = (type == GIMP_RGBA_IMAGE || GimpImageBaseType base_type = GIMP_RGB;
type == GIMP_GRAYA_IMAGE || gboolean has_alpha = FALSE;
type == GIMP_INDEXEDA_IMAGE); const Babl *format;
switch (type)
{
case GIMP_RGB_IMAGE:
base_type = GIMP_RGB;
has_alpha = FALSE;
break;
case GIMP_RGBA_IMAGE:
base_type = GIMP_RGB;
has_alpha = TRUE;
break;
case GIMP_GRAY_IMAGE:
base_type = GIMP_GRAY;
has_alpha = FALSE;
break;
case GIMP_GRAYA_IMAGE:
base_type = GIMP_GRAY;
has_alpha = TRUE;
break;
case GIMP_INDEXED_IMAGE:
base_type = GIMP_INDEXED;
has_alpha = FALSE;
break;
case GIMP_INDEXEDA_IMAGE:
base_type = GIMP_INDEXED;
has_alpha = TRUE;
break;
}
/* do not use gimp_image_get_layer_format() because it might
* be the floating selection of a channel or mask
*/
format = gimp_image_get_format (image, base_type,
gimp_image_get_precision (image),
has_alpha);
layer = gimp_layer_new (image, width, height, layer = gimp_layer_new (image, width, height,
gimp_image_get_layer_format (image, has_alpha), format, name, opacity / 100.0, mode);
name, opacity / 100.0, mode);
if (! layer) if (! layer)
success = FALSE; success = FALSE;