GNOME.org
 

gimp r25472 - in trunk: . plug-ins/script-fu/scripts

Author: martinn
Date: Sat Apr 12 11:45:42 2008
New Revision: 25472
URL: http://svn.gnome.org/viewvc/gimp?rev=25472&view=rev

Log:
2008-04-12  Martin Nordholts  <martinn svn gnome org>

	* plug-ins/script-fu/scripts/3d-outline.scm
	* plug-ins/script-fu/scripts/alien-glow-logo.scm
	* plug-ins/script-fu/scripts/alien-neon-logo.scm
	* plug-ins/script-fu/scripts/basic1-logo.scm
	* plug-ins/script-fu/scripts/basic2-logo.scm
	* plug-ins/script-fu/scripts/blended-logo.scm
	* plug-ins/script-fu/scripts/bovinated-logo.scm
	* plug-ins/script-fu/scripts/chalk.scm
	* plug-ins/script-fu/scripts/chip-away.scm
	* plug-ins/script-fu/scripts/chrome-logo.scm
	* plug-ins/script-fu/scripts/comic-logo.scm
	* plug-ins/script-fu/scripts/coolmetal-logo.scm
	* plug-ins/script-fu/scripts/frosty-logo.scm
	* plug-ins/script-fu/scripts/glossy.scm
	* plug-ins/script-fu/scripts/glowing-logo.scm
	* plug-ins/script-fu/scripts/gradient-bevel-logo.scm
	* plug-ins/script-fu/scripts/neon-logo.scm
	* plug-ins/script-fu/scripts/script-fu-util.scm
	* plug-ins/script-fu/scripts/starburst-logo.scm
	* plug-ins/script-fu/scripts/starscape-logo.scm
	* plug-ins/script-fu/scripts/t-o-p-logo.scm
	* plug-ins/script-fu/scripts/textured-logo.scm: Applied patch from
	Ulf-D. Ehlert that makes the Alpha to Logo-filters more gracefully
	handle images with many layers (bug #498480).


Modified:
   trunk/ChangeLog
   trunk/plug-ins/script-fu/scripts/3d-outline.scm
   trunk/plug-ins/script-fu/scripts/alien-glow-logo.scm
   trunk/plug-ins/script-fu/scripts/alien-neon-logo.scm
   trunk/plug-ins/script-fu/scripts/basic1-logo.scm
   trunk/plug-ins/script-fu/scripts/basic2-logo.scm
   trunk/plug-ins/script-fu/scripts/blended-logo.scm
   trunk/plug-ins/script-fu/scripts/bovinated-logo.scm
   trunk/plug-ins/script-fu/scripts/chalk.scm
   trunk/plug-ins/script-fu/scripts/chip-away.scm
   trunk/plug-ins/script-fu/scripts/chrome-logo.scm
   trunk/plug-ins/script-fu/scripts/comic-logo.scm
   trunk/plug-ins/script-fu/scripts/coolmetal-logo.scm
   trunk/plug-ins/script-fu/scripts/frosty-logo.scm
   trunk/plug-ins/script-fu/scripts/glossy.scm
   trunk/plug-ins/script-fu/scripts/glowing-logo.scm
   trunk/plug-ins/script-fu/scripts/gradient-bevel-logo.scm
   trunk/plug-ins/script-fu/scripts/neon-logo.scm
   trunk/plug-ins/script-fu/scripts/script-fu-util.scm
   trunk/plug-ins/script-fu/scripts/starburst-logo.scm
   trunk/plug-ins/script-fu/scripts/starscape-logo.scm
   trunk/plug-ins/script-fu/scripts/t-o-p-logo.scm
   trunk/plug-ins/script-fu/scripts/textured-logo.scm

Modified: trunk/plug-ins/script-fu/scripts/3d-outline.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/3d-outline.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/3d-outline.scm	Sat Apr 12 11:45:42 2008
@@ -47,8 +47,7 @@
 
     (gimp-selection-none img)
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img pattern 1)
-    (gimp-image-add-layer img bg-layer 2)
+    (script-fu-util-image-add-layers img pattern bg-layer)
     (gimp-context-set-background '(255 255 255))
     (gimp-edit-fill bg-layer BACKGROUND-FILL)
     (gimp-edit-clear pattern)
@@ -62,7 +61,7 @@
     (set! layer2 (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE)))
     (plug-in-edge RUN-NONINTERACTIVE img layer2 2 1 0)
     (set! layer3 (car (gimp-layer-copy layer2 TRUE)))
-    (gimp-image-add-layer img layer3 2)
+    (script-fu-util-image-add-layers img layer3)
     (plug-in-gauss-iir RUN-NONINTERACTIVE img layer2 bump-map-blur-radius TRUE TRUE)
 
     (gimp-selection-all img)

Modified: trunk/plug-ins/script-fu/scripts/alien-glow-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/alien-glow-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/alien-glow-logo.scm	Sat Apr 12 11:45:42 2008
@@ -23,8 +23,7 @@
 
     (gimp-selection-none img)
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-image-add-layer img glow-layer 1)
+    (script-fu-util-image-add-layers img glow-layer bg-layer)
     (gimp-layer-set-lock-alpha logo-layer TRUE)
     (gimp-context-set-background '(0 0 0))
     (gimp-edit-fill bg-layer BACKGROUND-FILL)

Modified: trunk/plug-ins/script-fu/scripts/alien-neon-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/alien-neon-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/alien-neon-logo.scm	Sat Apr 12 11:45:42 2008
@@ -48,8 +48,7 @@
     (gimp-context-push)
 
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-image-add-layer img bands-layer 1)
+    (script-fu-util-image-add-layers img bands-layer bg-layer)
     (gimp-selection-none img)
     (gimp-context-set-background bg-color)
     (gimp-edit-fill bg-layer BACKGROUND-FILL)

Modified: trunk/plug-ins/script-fu/scripts/basic1-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/basic1-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/basic1-logo.scm	Sat Apr 12 11:45:42 2008
@@ -16,8 +16,7 @@
 
     (gimp-selection-none img)
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img shadow-layer 1)
-    (gimp-image-add-layer img bg-layer 2)
+    (script-fu-util-image-add-layers img shadow-layer bg-layer)
     (gimp-context-set-foreground text-color)
     (gimp-layer-set-lock-alpha logo-layer TRUE)
     (gimp-edit-fill logo-layer FOREGROUND-FILL)

Modified: trunk/plug-ins/script-fu/scripts/basic2-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/basic2-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/basic2-logo.scm	Sat Apr 12 11:45:42 2008
@@ -34,9 +34,7 @@
 
     (gimp-selection-none img)
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-image-add-layer img shadow-layer 1)
-    (gimp-image-add-layer img highlight-layer 1)
+    (script-fu-util-image-add-layers img highlight-layer shadow-layer bg-layer)
     (gimp-context-set-foreground text-color)
     (gimp-layer-set-lock-alpha logo-layer TRUE)
     (gimp-edit-fill logo-layer FOREGROUND-FILL)

Modified: trunk/plug-ins/script-fu/scripts/blended-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/blended-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/blended-logo.scm	Sat Apr 12 11:45:42 2008
@@ -44,10 +44,8 @@
         )
 
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img shadow-layer 1)
-    (gimp-image-add-layer img blend-layer 1)
-    (gimp-image-add-layer img drop-shadow-layer 1)
-    (gimp-image-add-layer img text-shadow-layer 0)
+    (script-fu-util-image-add-layers img text-shadow-layer drop-shadow-layer blend-layer shadow-layer)
+    (gimp-image-raise-layer img text-shadow-layer)
     (gimp-selection-none img)
     (gimp-edit-clear text-shadow-layer)
     (gimp-edit-clear drop-shadow-layer)

Modified: trunk/plug-ins/script-fu/scripts/bovinated-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/bovinated-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/bovinated-logo.scm	Sat Apr 12 11:45:42 2008
@@ -38,8 +38,7 @@
     (gimp-context-push)
 
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-image-add-layer img blur-layer 1)
+    (script-fu-util-image-add-layers img blur-layer bg-layer)
 
     (gimp-selection-all img)
     (gimp-context-set-background bg-color)

Modified: trunk/plug-ins/script-fu/scripts/chalk.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/chalk.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/chalk.scm	Sat Apr 12 11:45:42 2008
@@ -36,7 +36,7 @@
 
     (gimp-selection-none img)
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img bg-layer 1)
+    (script-fu-util-image-add-layers img bg-layer)
     (gimp-context-set-background bg-color)
     (gimp-edit-fill bg-layer BACKGROUND-FILL)
 

Modified: trunk/plug-ins/script-fu/scripts/chip-away.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/chip-away.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/chip-away.scm	Sat Apr 12 11:45:42 2008
@@ -56,7 +56,7 @@
     (gimp-context-push)
 
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img bg-layer 1)
+    (script-fu-util-image-add-layers img bump-layer bg-layer)
     (gimp-layer-set-lock-alpha logo-layer TRUE)
     (gimp-context-set-pattern pattern)
 
@@ -70,8 +70,6 @@
         (gimp-edit-fill bg-layer BACKGROUND-FILL)
     )
 
-    (gimp-image-add-layer img bump-layer 1)
-
     (gimp-selection-all img)
     (gimp-edit-clear bump-layer)
     (gimp-selection-none img)
@@ -96,7 +94,8 @@
      (if (= drop-shadow TRUE)
         (begin
           (let* ((shadow-layer (car (gimp-layer-new img width height RGBA-IMAGE "Shadow layer" 100 NORMAL-MODE))))
-            (gimp-image-add-layer img shadow-layer 1)
+            (gimp-image-set-active-layer img logo-layer)
+            (script-fu-util-image-add-layers img shadow-layer)
             (gimp-selection-all img)
             (gimp-edit-clear shadow-layer)
             (gimp-selection-none img)

Modified: trunk/plug-ins/script-fu/scripts/chrome-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/chrome-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/chrome-logo.scm	Sat Apr 12 11:45:42 2008
@@ -23,11 +23,7 @@
     (gimp-context-push)
 
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img background 1)
-    (gimp-image-add-layer img shadow 1)
-    (gimp-image-add-layer img layer3 1)
-    (gimp-image-add-layer img layer2 1)
-    (gimp-image-add-layer img layer1 1)
+    (script-fu-util-image-add-layers img layer1 layer2 layer3 shadow background)
     (gimp-context-set-background '(255 255 255))
     (gimp-selection-none img)
     (gimp-edit-fill layer1 BACKGROUND-FILL)
@@ -47,6 +43,11 @@
     (gimp-edit-fill layer3 BACKGROUND-FILL)
     (gimp-selection-none img)
     (set! layer1 (car (gimp-image-merge-visible-layers img CLIP-TO-IMAGE)))
+    ; if the original image contained more than one visible layer:
+    (while (> (car (gimp-image-get-layer-position img layer1)) 
+              (car (gimp-image-get-layer-position img shadow)))
+      (gimp-image-raise-layer img layer1)
+    )
     (gimp-invert layer1)
     (gimp-layer-add-mask layer1 layer-mask)
     (gimp-selection-layer-alpha logo-layer)

Modified: trunk/plug-ins/script-fu/scripts/comic-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/comic-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/comic-logo.scm	Sat Apr 12 11:45:42 2008
@@ -40,11 +40,9 @@
     (gimp-context-push)
 
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-image-add-layer img white-layer 1)
+    (script-fu-util-image-add-layers img black-layer white-layer bg-layer)
     (gimp-layer-translate white-layer posx posy)
     (gimp-drawable-set-name white-layer "White")
-    (gimp-image-add-layer img black-layer 1)
     (gimp-layer-translate black-layer posx posy)
     (gimp-drawable-set-name black-layer "Black")
 

Modified: trunk/plug-ins/script-fu/scripts/coolmetal-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/coolmetal-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/coolmetal-logo.scm	Sat Apr 12 11:45:42 2008
@@ -35,9 +35,7 @@
 
     (gimp-selection-none img)
     (gimp-image-resize img img-width img-height posx posy)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-image-add-layer img reflect-layer 1)
-    (gimp-image-add-layer img shadow-layer 1)
+    (script-fu-util-image-add-layers img shadow-layer reflect-layer bg-layer)
     (gimp-layer-set-lock-alpha logo-layer TRUE)
 
     (gimp-context-set-background bg-color)

Modified: trunk/plug-ins/script-fu/scripts/frosty-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/frosty-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/frosty-logo.scm	Sat Apr 12 11:45:42 2008
@@ -27,10 +27,7 @@
 
     (gimp-layer-add-mask logo-layer logo-layer-mask)
     (script-fu-util-image-resize-from-layer img shadow-layer)
-    (gimp-image-add-layer img sparkle-layer 2)
-    (gimp-image-add-layer img matte-layer 3)
-    (gimp-image-add-layer img shadow-layer 4)
-    (gimp-image-add-layer img bg-layer 5)
+    (script-fu-util-image-add-layers img sparkle-layer matte-layer shadow-layer bg-layer)
     (gimp-selection-none img)
     (gimp-edit-clear sparkle-layer)
     (gimp-edit-clear matte-layer)

Modified: trunk/plug-ins/script-fu/scripts/glossy.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/glossy.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/glossy.scm	Sat Apr 12 11:45:42 2008
@@ -53,10 +53,9 @@
     (gimp-context-push)
 
     (script-fu-util-image-resize-from-layer img logo-layer)
+    (script-fu-util-image-add-layers img grow-me bg-layer)
     (gimp-drawable-set-name grow-me "Grow-me")
-    (gimp-image-add-layer img grow-me 1)
     (gimp-layer-translate grow-me posx posy)
-    (gimp-image-add-layer img bg-layer 2)
 
     (gimp-context-set-background bg-color)
     (gimp-selection-all img)

Modified: trunk/plug-ins/script-fu/scripts/glowing-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/glowing-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/glowing-logo.scm	Sat Apr 12 11:45:42 2008
@@ -21,8 +21,7 @@
     (gimp-context-push)
 
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-image-add-layer img glow-layer 1)
+    (script-fu-util-image-add-layers img glow-layer bg-layer)
     (gimp-layer-translate glow-layer posx posy)
 
     (gimp-selection-none img)

Modified: trunk/plug-ins/script-fu/scripts/gradient-bevel-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/gradient-bevel-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/gradient-bevel-logo.scm	Sat Apr 12 11:45:42 2008
@@ -37,8 +37,7 @@
     (gimp-context-push)
 
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-image-add-layer img blur-layer 1)
+    (script-fu-util-image-add-layers img blur-layer bg-layer)
 
     (gimp-selection-all img)
     (gimp-context-set-background bg-color)

Modified: trunk/plug-ins/script-fu/scripts/neon-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/neon-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/neon-logo.scm	Sat Apr 12 11:45:42 2008
@@ -143,12 +143,11 @@
 	(set! shadow-shrink max_shrink))
 
     (script-fu-util-image-resize-from-layer img tube-layer)
-    (gimp-image-add-layer img bg-layer 1)
+    (script-fu-util-image-add-layers img glow-layer bg-layer)
     (if (not (= shadow 0))
         (begin
-          (gimp-image-add-layer img shadow-layer 1)
+          (gimp-image-add-layer img shadow-layer -1)
           (gimp-edit-clear shadow-layer)))
-    (gimp-image-add-layer img glow-layer 1)
 
     (gimp-context-set-background '(0 0 0))
     (gimp-selection-layer-alpha tube-layer)

Modified: trunk/plug-ins/script-fu/scripts/script-fu-util.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/script-fu-util.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/script-fu-util.scm	Sat Apr 12 11:45:42 2008
@@ -31,3 +31,17 @@
   )
 )
 
+; Add the specified layers to the image.
+; The layers will be added in the given order below the
+; active layer.
+;
+(define (script-fu-util-image-add-layers image . layers)
+  (while (not (null? layers))
+    (let ((layer (car layers)))
+      (set! layers (cdr layers))
+      (gimp-image-add-layer image layer -1)
+      (gimp-image-lower-layer image layer)
+    )
+  )
+)
+

Modified: trunk/plug-ins/script-fu/scripts/starburst-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/starburst-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/starburst-logo.scm	Sat Apr 12 11:45:42 2008
@@ -22,9 +22,8 @@
 
     (gimp-selection-none img)
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-image-add-layer img shadow-layer 1)
-    (gimp-image-add-layer img burst-layer 0)
+    (script-fu-util-image-add-layers img burst-layer shadow-layer bg-layer)
+    (gimp-image-raise-layer img burst-layer)
     (gimp-layer-add-mask burst-layer layer-mask)
     (gimp-layer-set-lock-alpha logo-layer TRUE)
 

Modified: trunk/plug-ins/script-fu/scripts/starscape-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/starscape-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/starscape-logo.scm	Sat Apr 12 11:45:42 2008
@@ -75,9 +75,7 @@
 
     (gimp-selection-none img)
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img bg-layer 1)
-    (gimp-image-add-layer img glow-layer 1)
-    (gimp-image-add-layer img shadow-layer 1)
+    (script-fu-util-image-add-layers img shadow-layer glow-layer bg-layer)
     (gimp-image-add-channel img bump-channel 0)
     (gimp-layer-set-lock-alpha logo-layer TRUE)
 

Modified: trunk/plug-ins/script-fu/scripts/t-o-p-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/t-o-p-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/t-o-p-logo.scm	Sat Apr 12 11:45:42 2008
@@ -25,9 +25,7 @@
     (gimp-context-push)
 
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img sparkle-layer 2)
-    (gimp-image-add-layer img shadow-layer 3)
-    (gimp-image-add-layer img bg-layer 4)
+    (script-fu-util-image-add-layers img sparkle-layer shadow-layer bg-layer)
     (gimp-selection-none img)
     (gimp-edit-clear shadow-layer)
     (gimp-edit-clear sparkle-layer)

Modified: trunk/plug-ins/script-fu/scripts/textured-logo.scm
==============================================================================
--- trunk/plug-ins/script-fu/scripts/textured-logo.scm	(original)
+++ trunk/plug-ins/script-fu/scripts/textured-logo.scm	Sat Apr 12 11:45:42 2008
@@ -39,10 +39,8 @@
     (gimp-context-push)
 
     (script-fu-util-image-resize-from-layer img logo-layer)
-    (gimp-image-add-layer img shadow-layer 1)
-    (gimp-image-add-layer img blend-layer 1)
-    (gimp-image-add-layer img drop-shadow-layer 1)
-    (gimp-image-add-layer img text-shadow-layer 0)
+    (script-fu-util-image-add-layers img text-shadow-layer drop-shadow-layer blend-layer shadow-layer)
+    (gimp-image-raise-layer img text-shadow-layer)
     (gimp-selection-all img)
     (gimp-context-set-pattern text-pattern)
     (gimp-layer-set-lock-alpha logo-layer TRUE)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]