dc3ac41965
2004-01-26 Michael Natterer <mitch@gimp.org> * plug-ins/script-fu/scripts/unsharp-mask.scm: add the layer to the image before pasting to it. Fixes bug #132504. Fixed the underlying problem: make it impossible to attach floating selections to drawables which are not currently part of the image's layer or channel stacks. Also cleaned up image <-> floating_sel interaction: * app/core/gimplayer-floating-sel.[ch] (floating_sel_attach): added assertion that the drawable is part of the image (see below). Don't call gimp_image_floating_selection_changed(), it's emitted by gimp_image_add_layer() now. (floating_sel_remove) (floating_sel_anchor): don't emit "floating_selection_changed", it's emitted by gimp_image_remove_layer() now. (floating_sel_anchor): removed the fix for bug #132162 because gimp_image_remove_layer() behaves correctly now (see below). Renamed floating_sel_reset() to floating_sel_activate_drawable(). Added g_return_if_fail() all over the place. * app/core/gimpimage.[ch]: added new function gimp_image_owns_item() which return TRUE if the passed item is part of the image. (gimp_image_add_layer): emit "floating_selection_changed" here if needed. (gimp_image_remove_layer): emit "floating_selection_changed" if needed, don't try to activate a layer if we called floating_sel_activate_drawable(). This is the real fix for bug #132162. * app/core/gimpimage-undo-push.c (undo_pop_layer): apply the same fixes as to gimp_image_add,remove_layer(). Don't call gimp_drawable_invalidate_preview() on the previously active layer because that's done by gimp_image_set_active_layer() now. * app/xcf/xcf-load.c: remember the "floating_sel_drawable" in the XcfInfo struct and attach it *after* all layers and channels are loaded to avoid attaching the floating selection to an out-of-image drawable. * app/core/gimp-edit.c (gimp_edit_paste) * app/core/gimpdrawable-transform.c (gimp_drawable_transform_affine, gimp_drawable_transform_flip, gimp_drawable_transform_rotate) * app/core/gimpselection.c (gimp_selection_float) * app/text/gimptext-compat.c (text_render): added checks for gimp_image_owns_item() in all functions which can produce floating selections. * tools/pdbgen/pdb/edit.pdb * tools/pdbgen/pdb/floating_sel.pdb * tools/pdbgen/pdb/selection.pdb * tools/pdbgen/pdb/text_tool.pdb * tools/pdbgen/pdb/transform_tools.pdb: added checks for gimp_item_owns_image() and return an execution error if invoked with a drawable which is not part of the image. * app/pdb/edit_cmds.c * app/pdb/floating_sel_cmds.c * app/pdb/selection_cmds.c * app/pdb/text_tool_cmds.c * app/pdb/transform_tools_cmds.c: regenerated.
79 lines
3.1 KiB
Scheme
79 lines
3.1 KiB
Scheme
;;; unsharp-mask.scm
|
|
;;; Time-stamp: <1998/11/17 13:18:39 narazaki@gimp.org>
|
|
;;; Author: Narazaki Shuji <narazaki@gimp.org>
|
|
;;; Version 0.8
|
|
|
|
(define (script-fu-unsharp-mask img drw mask-size mask-opacity)
|
|
(let* ((drawable-width (car (gimp-drawable-width drw)))
|
|
(drawable-height (car (gimp-drawable-height drw)))
|
|
(new-image (car (gimp-image-new drawable-width drawable-height RGB)))
|
|
(original-layer (car (gimp-layer-new new-image
|
|
drawable-width drawable-height
|
|
RGB-IMAGE "Original"
|
|
100 NORMAL-MODE)))
|
|
(original-layer-for-darker #f)
|
|
(original-layer-for-lighter #f)
|
|
(blured-layer-for-darker #f)
|
|
(blured-layer-for-lighter #f)
|
|
(darker-layer #f)
|
|
(lighter-layer #f))
|
|
|
|
(gimp-selection-all img)
|
|
(gimp-edit-copy drw)
|
|
|
|
(gimp-image-undo-disable new-image)
|
|
|
|
(gimp-image-add-layer new-image original-layer 0)
|
|
(gimp-floating-sel-anchor
|
|
(car (gimp-edit-paste original-layer FALSE)))
|
|
|
|
(set! original-layer-for-darker (car (gimp-layer-copy original-layer TRUE)))
|
|
(set! original-layer-for-lighter (car (gimp-layer-copy original-layer TRUE)))
|
|
(set! blured-layer-for-darker (car (gimp-layer-copy original-layer TRUE)))
|
|
(gimp-drawable-set-visible original-layer FALSE)
|
|
(gimp-display-new new-image)
|
|
|
|
;; make darker mask
|
|
(gimp-image-add-layer new-image blured-layer-for-darker -1)
|
|
(plug-in-gauss-iir TRUE new-image blured-layer-for-darker mask-size
|
|
TRUE TRUE)
|
|
(set! blured-layer-for-lighter
|
|
(car (gimp-layer-copy blured-layer-for-darker TRUE)))
|
|
(gimp-image-add-layer new-image original-layer-for-darker -1)
|
|
(gimp-layer-set-mode original-layer-for-darker SUBTRACT)
|
|
(set! darker-layer
|
|
(car (gimp-image-merge-visible-layers new-image CLIP-TO-IMAGE)))
|
|
(gimp-drawable-set-name darker-layer "darker mask")
|
|
(gimp-drawable-set-visible darker-layer FALSE)
|
|
|
|
;; make lighter mask
|
|
(gimp-image-add-layer new-image original-layer-for-lighter -1)
|
|
(gimp-image-add-layer new-image blured-layer-for-lighter -1)
|
|
(gimp-layer-set-mode blured-layer-for-lighter SUBTRACT)
|
|
(set! lighter-layer
|
|
(car (gimp-image-merge-visible-layers new-image CLIP-TO-IMAGE)))
|
|
(gimp-drawable-set-name lighter-layer "lighter mask")
|
|
|
|
;; combine them
|
|
(gimp-drawable-set-visible original-layer TRUE)
|
|
(gimp-layer-set-mode darker-layer SUBTRACT)
|
|
(gimp-layer-set-opacity darker-layer mask-opacity)
|
|
(gimp-drawable-set-visible darker-layer TRUE)
|
|
(gimp-layer-set-mode lighter-layer ADDITION)
|
|
(gimp-layer-set-opacity lighter-layer mask-opacity)
|
|
(gimp-drawable-set-visible lighter-layer TRUE)
|
|
|
|
(gimp-image-undo-enable new-image)
|
|
(gimp-displays-flush)))
|
|
|
|
(script-fu-register "script-fu-unsharp-mask"
|
|
_"<Image>/Script-Fu/Alchemy/_Unsharp Mask..."
|
|
"Make a sharp image of IMAGE's DRAWABLE by applying unsharp mask method"
|
|
"Shuji Narazaki <narazaki@gimp.org>"
|
|
"Shuji Narazaki"
|
|
"1997,1998"
|
|
""
|
|
SF-IMAGE "Image" 0
|
|
SF-DRAWABLE "Drawable to apply" 0
|
|
SF-ADJUSTMENT _"Mask Size" '(5 1 100 1 1 0 1)
|
|
SF-ADJUSTMENT _"Mask Opacity" '(50 0 100 1 1 0 1))
|