[gimp/goat-invasion] === squash me two commits down ===

[Michael Natterer <mitch src gnome org>]

commit d80bd126eaf45b22ef60b719813755947fb5f8b2
Author: Michael Natterer <mitch gimp org>
Date:   Wed Mar 21 21:25:06 2012 +0100

    === squash me two commits down ===

 tools/pdbgen/pdb/layer.pdb |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/tools/pdbgen/pdb/layer.pdb b/tools/pdbgen/pdb/layer.pdb
index 0e85104..9cac746 100644
--- a/tools/pdbgen/pdb/layer.pdb
+++ b/tools/pdbgen/pdb/layer.pdb
@@ -55,8 +55,9 @@ HELP
     %invoke = (
 	code => <<'CODE'
 {
-  layer = gimp_layer_new (image, width, height, type, name,
-			  opacity / 100.0, mode);
+  layer = gimp_layer_new (image, width, height,
+                          gimp_image_get_format (image, type),
+                          name, opacity / 100.0, mode);
 
   if (! layer)
     success = FALSE;
@@ -95,13 +96,16 @@ HELP
     %invoke = (
 	code => <<'CODE'
 {
-  GimpPickable *pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+  GimpPickable  *pickable = GIMP_PICKABLE (gimp_image_get_projection (image));
+  GimpImageType  type;
 
   gimp_pickable_flush (pickable);
 
+  type = gimp_image_base_type_with_alpha (dest_image);
+
   layer = gimp_layer_new_from_buffer (gimp_pickable_get_buffer (pickable),
                                       dest_image,
-                                      gimp_image_base_type_with_alpha (dest_image),
+                                      gimp_image_get_format (dest_image, type),
                                       name,
                                       GIMP_OPACITY_OPAQUE, GIMP_NORMAL_MODE);
 }