From 769274a562afed24b17ef47bca73694d3eb84960 Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Mon, 8 Dec 1997 00:22:45 +0000 Subject: [PATCH] Removed a dangling parenthesis from the alien-glow-* scripts fixed refract.c to look for megawidget.h in the properplace fixed the plugins/script-fu/scripts/Makefile.am to instlal the texture files --- plug-ins/common/gif.c | 25 ++++++++----------- plug-ins/gif/gif.c | 25 ++++++++----------- plug-ins/refract/refract.c | 3 ++- plug-ins/script-fu/scripts/Makefile.am | 5 ++++ .../script-fu/scripts/alien-glow-arrow.scm | 2 +- plug-ins/script-fu/scripts/alien-glow-bar.scm | 2 +- .../script-fu/scripts/alien-glow-bullet.scm | 2 +- .../script-fu/scripts/alien-glow-button.scm | 2 +- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/plug-ins/common/gif.c b/plug-ins/common/gif.c index 164cfcbaf0..8b6e2918d8 100644 --- a/plug-ins/common/gif.c +++ b/plug-ins/common/gif.c @@ -3,7 +3,7 @@ * Based around original GIF code by David Koblas. * * - * Version 1.99.16 - 97/09/29 + * Version 1.99.17 - 97/11/30 * * Adam D. Moss - * @@ -22,6 +22,11 @@ /* * REVISION HISTORY * + * 97/11/30 + * 1.99.17 - No more bogus transparency indices in animated GIFs, + * hopefully. Saved files are better-behaved, sometimes + * smaller. [Adam] + * * 97/09/29 * 1.99.16 - Added a dialog for the user to choose what to do if * one of the layers of the image extends beyond the image @@ -1402,9 +1407,6 @@ special_flatten_indexed_alpha (guchar *pixels, { guint32 i; - if ((*colors) < 256) - *transparent = *colors; - /* Each transparent pixel in the image is mapped to a uniform value for encoding, if image already has <=255 colours */ @@ -1713,17 +1715,12 @@ save_image (char *filename, /* sort out whether we need to do transparency jiggery-pokery */ if ((drawable_type == INDEXEDA_IMAGE)||(drawable_type == GRAYA_IMAGE)) { - /* If there appear to be no entries left in the colourmap in - which to put the transparent index, try to find an entry which - isn't actually used in the image. */ - - if (colors > 255) - { - transparent = - find_unused_ia_colour(pixels, - drawable->width * drawable->height); - } + /* Try to find an entry which isn't actually used in the + image, for a transparency index. */ + transparent = + find_unused_ia_colour(pixels, + drawable->width * drawable->height); special_flatten_indexed_alpha (pixels, &transparent, diff --git a/plug-ins/gif/gif.c b/plug-ins/gif/gif.c index 164cfcbaf0..8b6e2918d8 100644 --- a/plug-ins/gif/gif.c +++ b/plug-ins/gif/gif.c @@ -3,7 +3,7 @@ * Based around original GIF code by David Koblas. * * - * Version 1.99.16 - 97/09/29 + * Version 1.99.17 - 97/11/30 * * Adam D. Moss - * @@ -22,6 +22,11 @@ /* * REVISION HISTORY * + * 97/11/30 + * 1.99.17 - No more bogus transparency indices in animated GIFs, + * hopefully. Saved files are better-behaved, sometimes + * smaller. [Adam] + * * 97/09/29 * 1.99.16 - Added a dialog for the user to choose what to do if * one of the layers of the image extends beyond the image @@ -1402,9 +1407,6 @@ special_flatten_indexed_alpha (guchar *pixels, { guint32 i; - if ((*colors) < 256) - *transparent = *colors; - /* Each transparent pixel in the image is mapped to a uniform value for encoding, if image already has <=255 colours */ @@ -1713,17 +1715,12 @@ save_image (char *filename, /* sort out whether we need to do transparency jiggery-pokery */ if ((drawable_type == INDEXEDA_IMAGE)||(drawable_type == GRAYA_IMAGE)) { - /* If there appear to be no entries left in the colourmap in - which to put the transparent index, try to find an entry which - isn't actually used in the image. */ - - if (colors > 255) - { - transparent = - find_unused_ia_colour(pixels, - drawable->width * drawable->height); - } + /* Try to find an entry which isn't actually used in the + image, for a transparency index. */ + transparent = + find_unused_ia_colour(pixels, + drawable->width * drawable->height); special_flatten_indexed_alpha (pixels, &transparent, diff --git a/plug-ins/refract/refract.c b/plug-ins/refract/refract.c index 16fa8d2f9b..ec8df92165 100644 --- a/plug-ins/refract/refract.c +++ b/plug-ins/refract/refract.c @@ -104,7 +104,8 @@ #include "libgimp/gimp.h" #include "libgimp/gimpui.h" -#include "../megawidget.h" /* For entry/scale pairs. */ +#include "../megawidget/megawidget.h" /* For entry/scale pairs. */ +/* changed by adrian likins to reflect the new location of megawidget */ #ifndef REFRACT_DEBUG #define REFRACT_TITLE "Refract 0.1.0-Alpha" diff --git a/plug-ins/script-fu/scripts/Makefile.am b/plug-ins/script-fu/scripts/Makefile.am index ad499e580a..fd87957c21 100644 --- a/plug-ins/script-fu/scripts/Makefile.am +++ b/plug-ins/script-fu/scripts/Makefile.am @@ -13,6 +13,7 @@ scriptdata_DATA = \ alien-glow-logo.scm \ basic1-logo.scm \ basic2-logo.scm \ + beavis.jpg \ beveled-button.scm \ beveled-pattern-arrow.scm \ beveled-pattern-bullet.scm \ @@ -69,6 +70,10 @@ scriptdata_DATA = \ swirly-pattern.scm \ t-o-p-logo.scm \ text-circle.scm \ + texture.jpg \ + texture1.jpg \ + texture2.jpg \ + texture3.jpg \ textured-logo.scm \ title-header.scm \ trochoid.scm \ diff --git a/plug-ins/script-fu/scripts/alien-glow-arrow.scm b/plug-ins/script-fu/scripts/alien-glow-arrow.scm index 684afe17f5..69d2c3cef4 100644 --- a/plug-ins/script-fu/scripts/alien-glow-arrow.scm +++ b/plug-ins/script-fu/scripts/alien-glow-arrow.scm @@ -131,7 +131,7 @@ SF-VALUE "Orientation" "'right" SF-COLOR "Glow Color" '(63 252 0) SF-COLOR "Background Color" '(0 0 0) - SF-TOGGLE "Flatten Image" TRUE)) + SF-TOGGLE "Flatten Image" TRUE) diff --git a/plug-ins/script-fu/scripts/alien-glow-bar.scm b/plug-ins/script-fu/scripts/alien-glow-bar.scm index 643052f0a1..a0e0d86fc8 100644 --- a/plug-ins/script-fu/scripts/alien-glow-bar.scm +++ b/plug-ins/script-fu/scripts/alien-glow-bar.scm @@ -74,7 +74,7 @@ SF-VALUE "Bar Height" "16" SF-COLOR "Glow Color" '(63 252 0) SF-COLOR "Background Color" '(0 0 0) - SF-TOGGLE "Flatten Image" TRUE)) + SF-TOGGLE "Flatten Image" TRUE) diff --git a/plug-ins/script-fu/scripts/alien-glow-bullet.scm b/plug-ins/script-fu/scripts/alien-glow-bullet.scm index f314dbc81f..41977e3cb7 100644 --- a/plug-ins/script-fu/scripts/alien-glow-bullet.scm +++ b/plug-ins/script-fu/scripts/alien-glow-bullet.scm @@ -84,7 +84,7 @@ SF-VALUE "Radius" "16" SF-COLOR "Glow Color" '(63 252 0) SF-COLOR "Background Color" '(0 0 0) - SF-TOGGLE "Flatten Image?" TRUE)) + SF-TOGGLE "Flatten Image?" TRUE) diff --git a/plug-ins/script-fu/scripts/alien-glow-button.scm b/plug-ins/script-fu/scripts/alien-glow-button.scm index 4a97ed8e8b..24fa01a1a2 100644 --- a/plug-ins/script-fu/scripts/alien-glow-button.scm +++ b/plug-ins/script-fu/scripts/alien-glow-button.scm @@ -164,7 +164,7 @@ SF-COLOR "Background Color" '(0 0 0) SF-VALUE "Padding" "6" SF-VALUE "Glow Radius" "10" - SF-TOGGLE "Flatten Image?" TRUE)) + SF-TOGGLE "Flatten Image?" TRUE)