Check for div-by-zero in by_color_select.c when threshold is 0

The text tool handles the no fonts case better
Minor bug in tile saving squashed
updated png plugin
added flarefx plugin

-Yosh

ChangeLog

+Sun Jan  4 17:43:32 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* app/by_color_select.c: Prevent divide-by-zero error when
+	fuzzy threshold in select by color is 0
+
+	* app/tile_swap.c: Minor bugfix for tile saves
+
+	* app/text_tool.c: better handling when there are no fonts
+
+	* Updated PNG plugin from registry
+
+	* Added the FlareFX plugin
+
 Sun Jan  4 14:24:05 1998  Scott Goehring  <scott@poverty.bloomington.in.us>
 
 	* plug-ins/despeckle/despeckle.c: realloc buffers when the radius

app/base/tile-swap.c

@@ -415,7 +415,7 @@ tile_swap_default_out (DefSwapFile *def_swap_file,
   nleft = rbytes;
   while (nleft > 0)
     {
-      err = write (fd, tile->data + rbytes - nleft, rbytes);
+      err = write (fd, tile->data + rbytes - nleft, nleft);
       if (err <= 0)
 	{
 	  g_warning ("unable to write tile data to disk: %d ( %d ) bytes written", err, nleft);

app/by_color_select.c

@@ -117,7 +117,7 @@ is_pixel_sufficiently_different (unsigned char *col1,
 	max = diff;
     }
 
-  if (antialias)
+  if (antialias && threshold > 0)
     {
       float aa;
 

app/text_tool.c

@@ -259,6 +259,18 @@ text_button_press (Tool           *tool,
 	return;
       }
 
+  if (nfonts == -1)
+    {
+      text_get_fonts ();
+      if (nfonts == 0)
+       {
+         message_box ("Note: No fonts found.  Text tool not available.",
+                      NULL, NULL);
+         nfonts = -1;
+         return;
+       }
+    }
+
   if (!text_tool->shell)
     text_create_dialog (text_tool);
 
@@ -330,7 +342,7 @@ text_control (Tool     *tool,
     case RESUME :
       break;
     case HALT :
-      if (GTK_WIDGET_VISIBLE (the_text_tool->shell))
+      if (the_text_tool->shell != NULL && GTK_WIDGET_VISIBLE (the_text_tool->shell))
 	gtk_widget_hide (the_text_tool->shell);
       break;
     }
@@ -395,8 +407,6 @@ text_create_dialog (TextTool *text_tool)
   gtk_container_add (GTK_CONTAINER (list_box), text_tool->font_list);
   gtk_list_set_selection_mode (GTK_LIST (text_tool->font_list), GTK_SELECTION_BROWSE);
 
-  if (nfonts == -1)
-    text_get_fonts ();
   for (i = 0; i < nfonts; i++)
     {
       list_item = gtk_list_item_new_with_label (font_info[i]->family);

app/tile_swap.c

@@ -415,7 +415,7 @@ tile_swap_default_out (DefSwapFile *def_swap_file,
   nleft = rbytes;
   while (nleft > 0)
     {
-      err = write (fd, tile->data + rbytes - nleft, rbytes);
+      err = write (fd, tile->data + rbytes - nleft, nleft);
       if (err <= 0)
 	{
 	  g_warning ("unable to write tile data to disk: %d ( %d ) bytes written", err, nleft);

app/tools/by_color_select.c

@@ -117,7 +117,7 @@ is_pixel_sufficiently_different (unsigned char *col1,
 	max = diff;
     }
 
-  if (antialias)
+  if (antialias && threshold > 0)
     {
       float aa;
 

app/tools/gimpbycolorselecttool.c

@@ -117,7 +117,7 @@ is_pixel_sufficiently_different (unsigned char *col1,
 	max = diff;
     }
 
-  if (antialias)
+  if (antialias && threshold > 0)
     {
       float aa;
 

app/tools/gimptexttool.c

@@ -259,6 +259,18 @@ text_button_press (Tool           *tool,
 	return;
       }
 
+  if (nfonts == -1)
+    {
+      text_get_fonts ();
+      if (nfonts == 0)
+       {
+         message_box ("Note: No fonts found.  Text tool not available.",
+                      NULL, NULL);
+         nfonts = -1;
+         return;
+       }
+    }
+
   if (!text_tool->shell)
     text_create_dialog (text_tool);
 
@@ -330,7 +342,7 @@ text_control (Tool     *tool,
     case RESUME :
       break;
     case HALT :
-      if (GTK_WIDGET_VISIBLE (the_text_tool->shell))
+      if (the_text_tool->shell != NULL && GTK_WIDGET_VISIBLE (the_text_tool->shell))
 	gtk_widget_hide (the_text_tool->shell);
       break;
     }
@@ -395,8 +407,6 @@ text_create_dialog (TextTool *text_tool)
   gtk_container_add (GTK_CONTAINER (list_box), text_tool->font_list);
   gtk_list_set_selection_mode (GTK_LIST (text_tool->font_list), GTK_SELECTION_BROWSE);
 
-  if (nfonts == -1)
-    text_get_fonts ();
   for (i = 0; i < nfonts; i++)
     {
       list_item = gtk_list_item_new_with_label (font_info[i]->family);

app/tools/text_tool.c

@@ -259,6 +259,18 @@ text_button_press (Tool           *tool,
 	return;
       }
 
+  if (nfonts == -1)
+    {
+      text_get_fonts ();
+      if (nfonts == 0)
+       {
+         message_box ("Note: No fonts found.  Text tool not available.",
+                      NULL, NULL);
+         nfonts = -1;
+         return;
+       }
+    }
+
   if (!text_tool->shell)
     text_create_dialog (text_tool);
 
@@ -330,7 +342,7 @@ text_control (Tool     *tool,
     case RESUME :
       break;
     case HALT :
-      if (GTK_WIDGET_VISIBLE (the_text_tool->shell))
+      if (the_text_tool->shell != NULL && GTK_WIDGET_VISIBLE (the_text_tool->shell))
 	gtk_widget_hide (the_text_tool->shell);
       break;
     }
@@ -395,8 +407,6 @@ text_create_dialog (TextTool *text_tool)
   gtk_container_add (GTK_CONTAINER (list_box), text_tool->font_list);
   gtk_list_set_selection_mode (GTK_LIST (text_tool->font_list), GTK_SELECTION_BROWSE);
 
-  if (nfonts == -1)
-    text_get_fonts ();
   for (i = 0; i < nfonts; i++)
     {
       list_item = gtk_list_item_new_with_label (font_info[i]->family);

configure.in

@@ -421,6 +421,7 @@ plug-ins/DigitalSignature/Makefile
 plug-ins/FractalExplorer/Makefile
 plug-ins/stegano/Makefile
 plug-ins/fs/Makefile
+plug-ins/flarefx/Makefile
 app/Makefile
 docs/Makefile
 )

plug-ins/Makefile.am

@@ -63,6 +63,7 @@ SUBDIRS = 			\
 	film			\
 	fits			\
 	flame			\
+	flarefx			\
 	fp			\
 	fractaltrace		\
 	gauss_iir		\

plug-ins/common/flarefx.c

+/*
+ * This is the FlareFX plug-in for the GIMP 0.99
+ * Version 1.04
+ *
+ * Copyright (C) 1997-1998 Karl-Johan Andersson (t96kja@student.tdb.uu.se)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+/* 
+ * Please send any comments or suggestions to me,
+ * Karl-Johan Andersson (t96kja@student.tdb.uu.se)
+ * 
+ * TODO:
+ * - add "streaks" from lightsource
+ * - improve the user interface
+ * - speed it up
+ * - more flare types, more control (color, size, intensity...)
+ *
+ * Missing something? - please contact me!
+ *  
+ */ 
+
+
+#include <stdlib.h>
+#include <math.h>
+#include "libgimp/gimp.h"
+#include "gtk/gtk.h"
+
+/* --- Defines --- */
+#define ENTRY_WIDTH 75
+
+/* --- Typedefs --- */
+typedef struct {
+    gint posx;
+    gint posy;
+} FlareValues;
+
+typedef struct {
+    gint run;
+} FlareInterface;
+
+typedef struct RGBFLOAT {
+  gfloat r;
+  gfloat g;
+  gfloat b;
+} RGBfloat;
+
+typedef struct REFLECT {
+  RGBfloat ccol;
+  gfloat size;
+  gint   xp;
+  gint   yp;
+  gint   type;
+} Reflect;
+
+/* --- Declare local functions --- */
+static void query (void);
+static void run (char      *name,
+	         int        nparams,
+       	         GParam    *param,
+		 int       *nreturn_vals,
+	         GParam   **return_vals);
+static gint flare_dialog (void);
+static void flare_close_callback (GtkWidget *widget, gpointer data);
+static void flare_ok_callback (GtkWidget *widget, gpointer data);
+static void flare_entry_callback (GtkWidget *widget, gpointer data);
+static void FlareFX (GDrawable *drawable);
+void mcolor (guchar *s, gfloat h);
+void mglow (guchar *s, gfloat h);
+void minner (guchar *s, gfloat h);
+void mouter (guchar *s, gfloat h);
+void mhalo (guchar *s, gfloat h);
+void initref (gint sx, gint sy, gint width, gint height, gint matt);
+void fixpix (guchar *data, float procent, RGBfloat colpro);
+void mrt1 (guchar *s, gint i, gint col, gint row);
+void mrt2 (guchar *s, gint i, gint col, gint row);
+void mrt3 (guchar *s, gint i, gint col, gint row);
+void mrt4 (guchar *s, gint i, gint col, gint row);
+
+/* --- Variables --- */
+GPlugInInfo PLUG_IN_INFO =
+{
+  NULL,    /* init_proc */
+  NULL,    /* quit_proc */
+  query,   /* query_proc */
+  run,     /* run_proc */
+};
+
+static FlareValues fvals =
+{
+    50,    /* posx */
+    50     /* posy */
+};
+
+static FlareInterface fint =
+{
+  FALSE     /* run */
+};
+
+gfloat scolor, sglow, sinner, souter; /* size     */
+gfloat shalo;
+gint   xs, ys;     
+gint   numref;
+RGBfloat color, glow, inner, outer, halo;
+Reflect ref1[19];
+
+/* --- Functions --- */
+MAIN ()
+
+static void query () 
+{
+  static GParamDef args[] =
+  {
+    { PARAM_INT32, "run_mode", "Interactive, non-interactive" },
+    { PARAM_IMAGE, "image", "Input image (unused)" },
+    { PARAM_DRAWABLE, "drawable", "Input drawable" },
+    { PARAM_INT32, "posx", "X-position" },
+    { PARAM_INT32, "posy", "Y-position" }
+  };
+  static GParamDef *return_vals = NULL;
+  static int nargs = sizeof (args) / sizeof (args[0]);
+  static int nreturn_vals = 0; 
+
+  gimp_install_procedure ("plug_in_flarefx",
+			  "Add lens flare effetcs",
+			  "More here later",
+			  "Karl-Johan Andersson", /* Author */
+			  "Karl-Johan Andersson", /* Copyright */
+			  "1998",
+			  "<Image>/Filters/Effects/FlareFX",
+			  "RGB*",
+			  PROC_PLUG_IN,
+			  nargs, nreturn_vals,
+			  args, return_vals);
+}
+
+static void run (gchar   *name,
+                 gint     nparams,
+                 GParam  *param,
+                 gint    *nreturn_vals,
+                 GParam **return_vals)
+{
+  static GParam values[1];
+  GDrawable *drawable;
+  GRunModeType run_mode;
+  GStatusType status = STATUS_SUCCESS;
+  
+  run_mode = param[0].data.d_int32;
+
+  *nreturn_vals = 1;
+  *return_vals = values;
+  
+  values[0].type = PARAM_STATUS;
+  values[0].data.d_status = status;
+  
+  /*  Get the specified drawable  */
+  drawable = gimp_drawable_get (param[2].data.d_drawable);
+
+  switch (run_mode)
+    {
+    case RUN_INTERACTIVE:
+      /*  Possibly retrieve data  */
+      gimp_get_data ("plug_in_flarefx", &fvals);
+
+      /*  First acquire information with a dialog  */
+      if (! flare_dialog ())
+	{
+	  gimp_drawable_detach (drawable);
+	  return;
+	}
+      break;
+
+    case RUN_NONINTERACTIVE:
+      /*  Make sure all the arguments are there!  */
+      if (nparams != 5)
+	status = STATUS_CALLING_ERROR;
+      if (status == STATUS_SUCCESS)
+	{
+	  fvals.posx = (gint) param[3].data.d_int32;
+	  fvals.posy = (gint) param[4].data.d_int32;
+	}
+      break;
+
+    case RUN_WITH_LAST_VALS:
+      /*  Possibly retrieve data  */
+      gimp_get_data ("plug_in_flarefx", &fvals);
+      break;
+
+    default:
+      break;
+    }
+  
+  if (status == STATUS_SUCCESS)
+    {
+      /*  Make sure that the drawable is gray or RGB color  */
+      if (gimp_drawable_color (drawable->id) || gimp_drawable_gray (drawable->id))
+	{
+	  gimp_progress_init ("Render flare...");
+	  gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1));
+	  
+	  FlareFX (drawable);
+	  
+	  if (run_mode != RUN_NONINTERACTIVE)
+	    gimp_displays_flush (); 
+
+	  /*  Store data  */
+	  if (run_mode == RUN_INTERACTIVE)
+	    gimp_set_data ("plug_in_flarefx", &fvals, sizeof (FlareValues));
+	}
+      else
+	{
+	  /* gimp_message ("FlareFX: cannot operate on indexed color images"); */
+	  status = STATUS_EXECUTION_ERROR;
+	}
+    }
+
+  values[0].data.d_status = status;
+  
+  gimp_drawable_detach (drawable);
+}
+
+static gint flare_dialog()
+{
+  GtkWidget *dlg;
+  GtkWidget *frame;
+  GtkWidget *table;
+  GtkWidget *button;
+  GtkWidget *label;
+  GtkWidget *entry;
+  gchar **argv;
+  gint  argc;
+  guchar buffer[32];
+
+  argc = 1;
+  argv = g_new (gchar *, 1);
+  argv[0] = g_strdup ("flarefx");
+
+  gtk_init (&argc, &argv);
+  gtk_rc_parse (gimp_gtkrc ());
+
+  dlg = gtk_dialog_new ();
+  gtk_window_set_title (GTK_WINDOW (dlg), "FlareFX");
+  gtk_window_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE);
+  gtk_signal_connect (GTK_OBJECT (dlg), "destroy",
+		      (GtkSignalFunc) flare_close_callback,
+		      NULL);
+
+  /*  Action area  */
+  button = gtk_button_new_with_label ("OK");
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_signal_connect (GTK_OBJECT (button), "clicked",
+                      (GtkSignalFunc) flare_ok_callback,
+                      dlg);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_widget_grab_default (button);
+  gtk_widget_show (button);
+
+  button = gtk_button_new_with_label ("Cancel");
+  GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+  gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
+			     (GtkSignalFunc) gtk_widget_destroy,
+			     GTK_OBJECT (dlg));
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_widget_show (button);
+
+  /*  parameter settings  */
+  frame = gtk_frame_new ("Parameter Settings");
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
+  gtk_container_border_width (GTK_CONTAINER (frame), 10);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0);
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_container_border_width (GTK_CONTAINER (table), 10);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+
+  label = gtk_label_new ("X-position");
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 5, 0 );
+  gtk_widget_show (label);
+
+  entry = gtk_entry_new ();
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0 );
+  gtk_widget_set_usize( entry, ENTRY_WIDTH, 0 );
+  sprintf( buffer, "%d", fvals.posx );
+  gtk_entry_set_text (GTK_ENTRY (entry), buffer );
+  gtk_signal_connect (GTK_OBJECT (entry), "changed",
+		      (GtkSignalFunc) flare_entry_callback,
+		      &fvals.posx);
+  gtk_widget_show (entry);
+
+  label = gtk_label_new ("Y-position");
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, 0, 5, 0 );
+  gtk_widget_show (label);
+
+  entry = gtk_entry_new ();
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0 );
+  gtk_widget_set_usize( entry, ENTRY_WIDTH, 0 );
+  sprintf( buffer, "%d", fvals.posy );
+  gtk_entry_set_text (GTK_ENTRY (entry), buffer );
+  gtk_signal_connect (GTK_OBJECT (entry), "changed",
+		      (GtkSignalFunc) flare_entry_callback,
+		      &fvals.posy);
+  gtk_widget_show (entry);
+
+  /*  label = gtk_label_new ("Turbulence");
+  gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, 0, 5, 0);
+  gtk_widget_show (label);
+
+  scale_data = gtk_adjustment_new (pvals.turbulence, 0.1, 7.0, 0.1, 0.1, 0.0);
+  scale = gtk_hscale_new (GTK_ADJUSTMENT (scale_data));
+  gtk_widget_set_usize (scale, SCALE_WIDTH, 0);
+  gtk_table_attach (GTK_TABLE (table), scale, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
+  gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
+  gtk_scale_set_digits (GTK_SCALE (scale), 1);
+  gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
+  gtk_signal_connect (GTK_OBJECT (scale_data), "value_changed",
+		      (GtkSignalFunc) plasma_scale_update,
+			  &pvals.turbulence);
+  gtk_widget_show (scale); */
+
+  gtk_widget_show (frame);
+  gtk_widget_show (table);
+  gtk_widget_show (dlg);
+
+  gtk_main ();
+  gdk_flush ();
+
+  return fint.run;
+}
+
+/* --- Interface functions --- */
+static void flare_close_callback (GtkWidget *widget, gpointer data)
+{
+  gtk_main_quit ();
+}
+
+static void flare_ok_callback (GtkWidget *widget, gpointer data)
+{
+  fint.run = TRUE;
+  gtk_widget_destroy (GTK_WIDGET (data));
+}
+
+static void flare_entry_callback (GtkWidget *widget, gpointer data)
+{
+  gint *text_val;
+
+  text_val = (gint*)data;
+  *text_val = atoi (gtk_entry_get_text (GTK_ENTRY (widget)));
+}
+
+/* --- Filter functions --- */
+static void FlareFX (GDrawable *drawable)
+{
+  GPixelRgn srcPR, destPR;
+  gint width, height;
+  gint bytes;
+  guchar *dest, *d;
+  guchar *cur_row, *s;
+  gint row, col, i;
+  gint x1, y1, x2, y2;
+  gint matt;
+  gfloat hyp;
+
+  /* Get the input area. This is the bounding box of the selection in
+   *  the image (or the entire image if there is no selection). Only
+   *  operating on the input area is simply an optimization. It doesn't
+   *  need to be done for correct operation. (It simply makes it go
+   *  faster, since fewer pixels need to be operated on).
+   */
+  gimp_drawable_mask_bounds (drawable->id, &x1, &y1, &x2, &y2);
+
+  /* Get the size of the input image. (This will/must be the same
+   *  as the size of the output image.
+   */
+  width = drawable->width;
+  height = drawable->height;
+  bytes = drawable->bpp;
+  matt = width;
+  
+  /*  allocate row buffers  */
+  cur_row  = (guchar *) malloc ((x2 - x1) * bytes);
+  dest = (guchar *) malloc ((x2 - x1) * bytes);
+
+  /*  initialize the pixel regions  */
+  gimp_pixel_rgn_init (&srcPR, drawable, 0, 0, width, height, FALSE, FALSE);
+  gimp_pixel_rgn_init (&destPR, drawable, 0, 0, width, height, TRUE, TRUE);
+
+  xs = fvals.posx;
+  ys = fvals.posy;
+
+  scolor = (gfloat)matt * 0.0375;
+  sglow  = (gfloat)matt * 0.078125;
+  sinner = (gfloat)matt * 0.1796875;
+  souter = (gfloat)matt * 0.3359375;
+  shalo  = (gfloat)matt * 0.084375;
+
+  color.r = 239.0/255.0; color.g = 239.0/255.0; color.b = 239.0/255.0;
+  glow.r  = 245.0/255.0; glow.g  = 245.0/255.0; glow.b  = 245.0/255.0;
+  inner.r = 255.0/255.0; inner.g = 38.0/255.0;  inner.b = 43.0/255.0;
+  outer.r = 69.0/255.0;  outer.g = 59.0/255.0;  outer.b = 64.0/255.0;
+  halo.r  = 80.0/255.0;  halo.g  = 15.0/255.0;  halo.b  = 4.0/255.0;
+ 
+  initref (xs, ys, width, height, matt);
+
+  /*  Loop through the rows */
+  for (row = y1; row < y2; row++) /* y-coord */
+    {
+      gimp_pixel_rgn_get_row (&srcPR, cur_row, x1, row, x2-x1);
+      d = dest;