diff --git a/COPYING b/COPYING index a43ea2126f..60549be514 100644 --- a/COPYING +++ b/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -279,7 +279,7 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -305,7 +305,8 @@ the "copyright" line and a pointer to where the full notice is found. 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. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Also add information on how to contact you by electronic and paper mail. diff --git a/ChangeLog b/ChangeLog index edea006b4b..6450c458de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Mar 12 18:51:09 PST 1998 Manish Singh + + * app/gdisplay.c + * app/by_color_select.c: Fix for indexed selection for multiple + layers by Ben Jackson. Reenabled select by color for indexed + images + Thu Mar 12 21:25:51 1998 Scott Goehring * app/undo.c (undo_pop_layer_mod): Fixed a desynch bug when diff --git a/app/by_color_select.c b/app/by_color_select.c index 08cb343515..a18ed7a9a6 100644 --- a/app/by_color_select.c +++ b/app/by_color_select.c @@ -359,6 +359,8 @@ by_color_select_button_release (Tool *tool, tile = tile_manager_get_tile (gimage_composite (gdisp->gimage), x, y, 0); tile_ref (tile); data = tile->data + tile->bpp * (tile->ewidth * (y % TILE_HEIGHT) + (x % TILE_WIDTH)); + gimage_get_color (gdisp->gimage, gimage_composite_type(gdisp->gimage), col, data); + tile_unref (tile, FALSE); } else { @@ -367,11 +369,10 @@ by_color_select_button_release (Tool *tool, tile = tile_manager_get_tile (drawable_data (drawable), x, y, 0); tile_ref (tile); data = tile->data + tile->bpp * (tile->ewidth * (y % TILE_HEIGHT) + (x % TILE_WIDTH)); + gimage_get_color (gdisp->gimage, drawable_type(drawable), col, data); + tile_unref (tile, FALSE); } - gimage_get_color (gdisp->gimage, gimage_composite_type(gdisp->gimage), col, data); - tile_unref (tile, FALSE); - /* select the area */ by_color_select (gdisp->gimage, drawable, col, by_color_dialog->threshold, diff --git a/app/core/gimpprojection.c b/app/core/gimpprojection.c index 8e2d49c883..79d4f1e6dc 100644 --- a/app/core/gimpprojection.c +++ b/app/core/gimpprojection.c @@ -1019,7 +1019,6 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp) menus_set_sensitive ("/Image/Colors/Desaturate", (base_type == RGB)); menus_set_sensitive ("/Select", lp); - menus_set_sensitive ("/Select/By Color...", (base_type != INDEXED)); menus_set_sensitive ("/Edit/Cut", lp); menus_set_sensitive ("/Edit/Copy", lp); menus_set_sensitive ("/Edit/Paste Into", lp); diff --git a/app/disp_callbacks.c b/app/disp_callbacks.c index a5623e637a..87073355b5 100644 --- a/app/disp_callbacks.c +++ b/app/disp_callbacks.c @@ -340,12 +340,13 @@ gdisplay_hruler_button_press (GtkWidget *widget, { GDisplay *gdisp; - if (!active_tool) - active_tool_control (RECREATE, gdisp); - if (event->button == 1) { gdisp = data; + + if (!active_tool) + active_tool_control (RECREATE, gdisp); + gtk_widget_activate (tool_widgets[tool_info[(int) MOVE].toolbar_position]); move_tool_start_hguide (active_tool, gdisp); gtk_grab_add (gdisp->canvas); @@ -361,12 +362,13 @@ gdisplay_vruler_button_press (GtkWidget *widget, { GDisplay *gdisp; - if (!active_tool) - active_tool_control (RECREATE, gdisp); - if (event->button == 1) { gdisp = data; + + if (!active_tool) + active_tool_control (RECREATE, gdisp); + gtk_widget_activate (tool_widgets[tool_info[(int) MOVE].toolbar_position]); move_tool_start_vguide (active_tool, gdisp); gtk_grab_add (gdisp->canvas); diff --git a/app/display/gimpdisplay-callbacks.c b/app/display/gimpdisplay-callbacks.c index a5623e637a..87073355b5 100644 --- a/app/display/gimpdisplay-callbacks.c +++ b/app/display/gimpdisplay-callbacks.c @@ -340,12 +340,13 @@ gdisplay_hruler_button_press (GtkWidget *widget, { GDisplay *gdisp; - if (!active_tool) - active_tool_control (RECREATE, gdisp); - if (event->button == 1) { gdisp = data; + + if (!active_tool) + active_tool_control (RECREATE, gdisp); + gtk_widget_activate (tool_widgets[tool_info[(int) MOVE].toolbar_position]); move_tool_start_hguide (active_tool, gdisp); gtk_grab_add (gdisp->canvas); @@ -361,12 +362,13 @@ gdisplay_vruler_button_press (GtkWidget *widget, { GDisplay *gdisp; - if (!active_tool) - active_tool_control (RECREATE, gdisp); - if (event->button == 1) { gdisp = data; + + if (!active_tool) + active_tool_control (RECREATE, gdisp); + gtk_widget_activate (tool_widgets[tool_info[(int) MOVE].toolbar_position]); move_tool_start_vguide (active_tool, gdisp); gtk_grab_add (gdisp->canvas); diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c index 8e2d49c883..79d4f1e6dc 100644 --- a/app/display/gimpdisplay.c +++ b/app/display/gimpdisplay.c @@ -1019,7 +1019,6 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp) menus_set_sensitive ("/Image/Colors/Desaturate", (base_type == RGB)); menus_set_sensitive ("/Select", lp); - menus_set_sensitive ("/Select/By Color...", (base_type != INDEXED)); menus_set_sensitive ("/Edit/Cut", lp); menus_set_sensitive ("/Edit/Copy", lp); menus_set_sensitive ("/Edit/Paste Into", lp); diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c index a5623e637a..87073355b5 100644 --- a/app/display/gimpdisplayshell-callbacks.c +++ b/app/display/gimpdisplayshell-callbacks.c @@ -340,12 +340,13 @@ gdisplay_hruler_button_press (GtkWidget *widget, { GDisplay *gdisp; - if (!active_tool) - active_tool_control (RECREATE, gdisp); - if (event->button == 1) { gdisp = data; + + if (!active_tool) + active_tool_control (RECREATE, gdisp); + gtk_widget_activate (tool_widgets[tool_info[(int) MOVE].toolbar_position]); move_tool_start_hguide (active_tool, gdisp); gtk_grab_add (gdisp->canvas); @@ -361,12 +362,13 @@ gdisplay_vruler_button_press (GtkWidget *widget, { GDisplay *gdisp; - if (!active_tool) - active_tool_control (RECREATE, gdisp); - if (event->button == 1) { gdisp = data; + + if (!active_tool) + active_tool_control (RECREATE, gdisp); + gtk_widget_activate (tool_widgets[tool_info[(int) MOVE].toolbar_position]); move_tool_start_vguide (active_tool, gdisp); gtk_grab_add (gdisp->canvas); diff --git a/app/gdisplay.c b/app/gdisplay.c index 8e2d49c883..79d4f1e6dc 100644 --- a/app/gdisplay.c +++ b/app/gdisplay.c @@ -1019,7 +1019,6 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp) menus_set_sensitive ("/Image/Colors/Desaturate", (base_type == RGB)); menus_set_sensitive ("/Select", lp); - menus_set_sensitive ("/Select/By Color...", (base_type != INDEXED)); menus_set_sensitive ("/Edit/Cut", lp); menus_set_sensitive ("/Edit/Copy", lp); menus_set_sensitive ("/Edit/Paste Into", lp); diff --git a/app/tools/by_color_select.c b/app/tools/by_color_select.c index 08cb343515..a18ed7a9a6 100644 --- a/app/tools/by_color_select.c +++ b/app/tools/by_color_select.c @@ -359,6 +359,8 @@ by_color_select_button_release (Tool *tool, tile = tile_manager_get_tile (gimage_composite (gdisp->gimage), x, y, 0); tile_ref (tile); data = tile->data + tile->bpp * (tile->ewidth * (y % TILE_HEIGHT) + (x % TILE_WIDTH)); + gimage_get_color (gdisp->gimage, gimage_composite_type(gdisp->gimage), col, data); + tile_unref (tile, FALSE); } else { @@ -367,11 +369,10 @@ by_color_select_button_release (Tool *tool, tile = tile_manager_get_tile (drawable_data (drawable), x, y, 0); tile_ref (tile); data = tile->data + tile->bpp * (tile->ewidth * (y % TILE_HEIGHT) + (x % TILE_WIDTH)); + gimage_get_color (gdisp->gimage, drawable_type(drawable), col, data); + tile_unref (tile, FALSE); } - gimage_get_color (gdisp->gimage, gimage_composite_type(gdisp->gimage), col, data); - tile_unref (tile, FALSE); - /* select the area */ by_color_select (gdisp->gimage, drawable, col, by_color_dialog->threshold, diff --git a/app/tools/gimpbycolorselecttool.c b/app/tools/gimpbycolorselecttool.c index 08cb343515..a18ed7a9a6 100644 --- a/app/tools/gimpbycolorselecttool.c +++ b/app/tools/gimpbycolorselecttool.c @@ -359,6 +359,8 @@ by_color_select_button_release (Tool *tool, tile = tile_manager_get_tile (gimage_composite (gdisp->gimage), x, y, 0); tile_ref (tile); data = tile->data + tile->bpp * (tile->ewidth * (y % TILE_HEIGHT) + (x % TILE_WIDTH)); + gimage_get_color (gdisp->gimage, gimage_composite_type(gdisp->gimage), col, data); + tile_unref (tile, FALSE); } else { @@ -367,11 +369,10 @@ by_color_select_button_release (Tool *tool, tile = tile_manager_get_tile (drawable_data (drawable), x, y, 0); tile_ref (tile); data = tile->data + tile->bpp * (tile->ewidth * (y % TILE_HEIGHT) + (x % TILE_WIDTH)); + gimage_get_color (gdisp->gimage, drawable_type(drawable), col, data); + tile_unref (tile, FALSE); } - gimage_get_color (gdisp->gimage, gimage_composite_type(gdisp->gimage), col, data); - tile_unref (tile, FALSE); - /* select the area */ by_color_select (gdisp->gimage, drawable, col, by_color_dialog->threshold, diff --git a/libgimp/COPYING b/libgimp/COPYING index eb685a5ec9..92b8903ff3 100644 --- a/libgimp/COPYING +++ b/libgimp/COPYING @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -436,7 +436,7 @@ DAMAGES. END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Libraries + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that @@ -464,7 +464,7 @@ convey the exclusion of warranty; and each file should have at least the You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail.