diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 08:16:52 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 08:16:52 +0000 |
| commit | db0da4c882437f3b76a34308edeaa2c41d8c2833 (patch) | |
| tree | 7f4486279e1f9819d406f1425cab495d5852bf81 /plug-ins | |
| parent | Releasing progress-linux version 2.10.36-3~progress7.99u1. (diff) | |
| download | gimp-db0da4c882437f3b76a34308edeaa2c41d8c2833.tar.xz gimp-db0da4c882437f3b76a34308edeaa2c41d8c2833.zip | |
Merging upstream version 2.10.38.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'plug-ins')
| -rw-r--r-- | plug-ins/common/file-png.c | 2 | ||||
| -rw-r--r-- | plug-ins/file-psd/psd-load.c | 10 | ||||
| -rw-r--r-- | plug-ins/script-fu/scripts/distress-selection.scm | 2 | ||||
| -rw-r--r-- | plug-ins/script-fu/scripts/palette-export.scm | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c index 063f201..3214445 100644 --- a/plug-ins/common/file-png.c +++ b/plug-ins/common/file-png.c @@ -2104,7 +2104,7 @@ save_image (const gchar *filename, /* If we're dealing with a paletted image with * transparency set, write out the remapped palette */ - if (png_get_valid (pp, info, PNG_INFO_tRNS)) + if (pngg.has_trns) { guchar inverse_remap[256]; diff --git a/plug-ins/file-psd/psd-load.c b/plug-ins/file-psd/psd-load.c index b03f8cf..54b72d1 100644 --- a/plug-ins/file-psd/psd-load.c +++ b/plug-ins/file-psd/psd-load.c @@ -1330,7 +1330,15 @@ add_layers (gint32 image_id, */ if (lidx > 0) { - if (gidx == -1) + if (lyr_a[lidx]->group_type != 0) + { + /* Ignoring group layers with clipping set for now. */ + IFDBG(3) g_debug ("Group Layer with clipping: [%d] %s", + lidx, lyr_a[lidx]->name); + use_clipping_group = FALSE; + gidx = -1; + } + else if (gidx == -1) { use_clipping_group = TRUE; diff --git a/plug-ins/script-fu/scripts/distress-selection.scm b/plug-ins/script-fu/scripts/distress-selection.scm index ef87b79..753e325 100644 --- a/plug-ins/script-fu/scripts/distress-selection.scm +++ b/plug-ins/script-fu/scripts/distress-selection.scm @@ -111,7 +111,7 @@ SF-IMAGE "The image" 0 SF-DRAWABLE "The layer" 0 SF-ADJUSTMENT _"_Threshold (bigger 1<-->254 smaller)" '(127 1 254 1 10 0 0) - SF-ADJUSTMENT _"_Spread" '(8 0 1000 1 10 0 1) + SF-ADJUSTMENT _"_Spread" '(8 0 512 1 10 0 1) SF-ADJUSTMENT _"_Granularity (1 is low)" '(4 1 25 1 10 0 1) SF-ADJUSTMENT _"S_mooth" '(2 1 150 1 10 0 1) SF-TOGGLE _"Smooth hor_izontally" TRUE diff --git a/plug-ins/script-fu/scripts/palette-export.scm b/plug-ins/script-fu/scripts/palette-export.scm index ecb16df..d0a51e7 100644 --- a/plug-ins/script-fu/scripts/palette-export.scm +++ b/plug-ins/script-fu/scripts/palette-export.scm @@ -90,7 +90,7 @@ (define (color-rgb-to-css color) (string-append "rgb(" (number->string (color-get-red color)) ", " (number->string (color-get-green color)) - ", " (number->string (color-get-blue color)) ")") + ", " (number->string (color-get-blue color)) ");") ) ; Convert a color to a simple pair of braces with comma separated values |