Commit 5516c26b authored by Ari Pollak's avatar Ari Pollak

Imported Upstream version 2.3.19

parent 50ca37e2
......@@ -120,6 +120,7 @@ The following people have contributed code to GIMP:
Vidar Madsen
Ian Main
Kjartan Maraas
John Marshall
Kelly Martin
Torsten Martinsen
Gordon Matzigkeit
......@@ -164,6 +165,7 @@ The following people have contributed code to GIMP:
Daniel Risacher
Clarence Risher
James Robinson
Stefan Röllin
Guillermo S. Romero
Tim Rowley
Mike Schaeffer
......@@ -174,6 +176,7 @@ The following people have contributed code to GIMP:
Michael Schumacher
Tracy Scott
Craig Setera
Ted Shaneyfelt
Aaron Sherman
Jernej Simončič
Manish Singh
......
This diff is collapsed.
......@@ -28,7 +28,7 @@ header files installed.
1. You need to have installed a recent version of pkg-config available
from http://www.freedesktop.org/software/pkgconfig/.
2. You need to have installed GTK+ version 2.10.6 or newer. GIMP
2. You need to have installed GTK+ version 2.10.13 or newer. GIMP
needs an even more recent version of GLib (>= 2.12.3). It also
wants Pango (>= 1.12.2). Sources for these can be grabbed from
ftp://ftp.gtk.org/.
......
......@@ -213,8 +213,6 @@ GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GOBJECT_QUERY = @GOBJECT_QUERY@
GREP = @GREP@
GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
GTHREAD_LIBS = @GTHREAD_LIBS@
GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
GTKHTML2_LIBS = @GTKHTML2_LIBS@
......@@ -370,6 +368,7 @@ RANLIB = @RANLIB@
RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
RT_LIBS = @RT_LIBS@
SCREENSHOT = @SCREENSHOT@
SED = @SED@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
......
......@@ -7,6 +7,22 @@ This is the development branch of GIMP. Here's where all the shiny
new stuff is being done that will one day be released as GIMP 2.4.
Changes in GIMP 2.3.19
======================
- support long layer names in PSD files
- improved EXIF handling in the JPEG file plug-in
- added control for the playback speed in the Animation Playback plug-in
- avoid needless image preview invalidation
- allow to edit the image comment in the Image Properties dialog
- further improved rectangle tools
- made JPEG save parameters user-configurable
- avoid color conversions between identical ICC color profiles
- improved Print plug-in
- improved loading and saving of indexed TGA images
- bug fixes and code cleanup
Changes in GIMP 2.3.18
======================
......
......@@ -95,13 +95,13 @@ servers are:
The look of GIMP's interface can be customized like any other GTK app
by editing the ~/.gtkrc-2.0 file or by using "themes" (ready-made
customizations). For downloadable themes and further details, see
http://gtk.themes.org. Additionally, GIMP reads ~/.gimp-2.2/gtkrc so
http://gtk.themes.org. Additionally, GIMP reads ~/.gimp-2.3/gtkrc so
you can have settings that only apply to GIMP.
Included is a set of keybindings similar to those in Adobe Photoshop.
You can find them in the ps-menurc file. To use them, copy this file
to ~/.gimp-2.2/menurc. You can also manually change the keybindings to
any of your choice by editing ~/.gimp-2.2/menurc.
to ~/.gimp-2.3/menurc. You can also manually change the keybindings to
any of your choice by editing ~/.gimp-2.3/menurc.
Have fun,
......
This diff is collapsed.
......@@ -82,8 +82,7 @@ endif
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp\" \
-DGIMP_APP_GLUE_COMPILATION \
@GTHREAD_CFLAGS@
-DGIMP_APP_GLUE_COMPILATION
INCLUDES = \
-I$(top_srcdir) \
......@@ -133,7 +132,6 @@ gimp_2_3_LDADD = \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
$(DBUS_GLIB_LIBS) \
$(GTHREAD_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
$(GIMPICONRC)
......@@ -176,7 +174,7 @@ gimp_console_2_3_LDADD = \
$(PANGOFT2_LIBS) \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
$(GTHREAD_LIBS) \
$(GLIB_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
$(GIMPICONRC)
......
......@@ -88,7 +88,7 @@ gimp_2_3_DEPENDENCIES = gui/libappgui.a actions/libappactions.a \
$(am__DEPENDENCIES_9) $(am__DEPENDENCIES_9) \
$(am__DEPENDENCIES_9) $(am__DEPENDENCIES_9) \
$(am__DEPENDENCIES_9) $(am__DEPENDENCIES_9) \
$(am__DEPENDENCIES_9) $(am__DEPENDENCIES_10)
$(am__DEPENDENCIES_10)
am__gimp_console_2_3_SOURCES_DIST = about.h app.c app.h batch.c \
batch.h errors.c errors.h main.c sanity.c sanity.h units.c \
units.h gimp-intl.h
......@@ -274,8 +274,6 @@ GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GOBJECT_QUERY = @GOBJECT_QUERY@
GREP = @GREP@
GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
GTHREAD_LIBS = @GTHREAD_LIBS@
GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
GTKHTML2_LIBS = @GTKHTML2_LIBS@
......@@ -431,6 +429,7 @@ RANLIB = @RANLIB@
RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
RT_LIBS = @RT_LIBS@
SCREENSHOT = @SCREENSHOT@
SED = @SED@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
......@@ -583,8 +582,7 @@ EXTRA_DIST = \
@HAVE_WINDRES_TRUE@GIMPICONRC = gimprc.o
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp\" \
-DGIMP_APP_GLUE_COMPILATION \
@GTHREAD_CFLAGS@
-DGIMP_APP_GLUE_COMPILATION
INCLUDES = \
-I$(top_srcdir) \
......@@ -634,7 +632,6 @@ gimp_2_3_LDADD = \
$(FONTCONFIG_LIBS) \
$(FREETYPE_LIBS) \
$(DBUS_GLIB_LIBS) \
$(GTHREAD_LIBS) \
$(RT_LIBS) \
$(INTLLIBS) \
$(GIMPICONRC)
......@@ -673,7 +670,7 @@ gimp_2_3_LDADD = \
@ENABLE_GIMP_CONSOLE_TRUE@ $(PANGOFT2_LIBS) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(FONTCONFIG_LIBS) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(FREETYPE_LIBS) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(GTHREAD_LIBS) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(GLIB_LIBS) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(RT_LIBS) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(INTLLIBS) \
@ENABLE_GIMP_CONSOLE_TRUE@ $(GIMPICONRC)
......
......@@ -159,8 +159,7 @@ EXTRA_DIST = \
makefile.msc
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Actions\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Actions\"
INCLUDES = \
-I$(top_builddir) \
......
......@@ -229,8 +229,6 @@ GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GOBJECT_QUERY = @GOBJECT_QUERY@
GREP = @GREP@
GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
GTHREAD_LIBS = @GTHREAD_LIBS@
GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
GTKHTML2_LIBS = @GTKHTML2_LIBS@
......@@ -386,6 +384,7 @@ RANLIB = @RANLIB@
RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
RT_LIBS = @RT_LIBS@
SCREENSHOT = @SCREENSHOT@
SED = @SED@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
......@@ -638,8 +637,7 @@ EXTRA_DIST = \
makefile.msc
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Actions\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Actions\"
INCLUDES = \
-I$(top_builddir) \
......
......@@ -81,7 +81,7 @@ GimpObject * action_select_object (GimpActionSelectType select_type,
#define return_if_no_drawable(image,drawable,data) \
return_if_no_image (image,data); \
drawable = gimp_image_active_drawable (image); \
drawable = gimp_image_get_active_drawable (image); \
if (! drawable) \
return
......
......@@ -148,7 +148,7 @@ buffers_paste (GimpBufferView *view,
if (image)
{
gimp_edit_paste (image, gimp_image_active_drawable (image),
gimp_edit_paste (image, gimp_image_get_active_drawable (image),
buffer, paste_into, x, y, width, height);
gimp_image_flush (image);
......
......@@ -164,7 +164,7 @@ drawable_actions_update (GimpActionGroup *group,
if (image)
{
drawable = gimp_image_active_drawable (image);
drawable = gimp_image_get_active_drawable (image);
if (drawable)
{
......
......@@ -261,7 +261,7 @@ edit_actions_update (GimpActionGroup *group,
GimpUndo *undo;
GimpUndo *redo;
drawable = gimp_image_active_drawable (image);
drawable = gimp_image_get_active_drawable (image);
undo_enabled = gimp_image_undo_is_enabled (image);
......
......@@ -439,7 +439,7 @@ edit_paste (GimpDisplay *display,
&x, &y, &width, &height);
if (gimp_edit_paste (display->image,
gimp_image_active_drawable (display->image),
gimp_image_get_active_drawable (display->image),
buffer, paste_into, x, y, width, height))
{
gimp_image_flush (display->image);
......@@ -461,10 +461,8 @@ cut_named_buffer_callback (GtkWidget *widget,
const gchar *name,
gpointer data)
{
GimpImage *image = GIMP_IMAGE (data);
GimpDrawable *drawable;
drawable = gimp_image_active_drawable (image);
GimpImage *image = GIMP_IMAGE (data);
GimpDrawable *drawable = gimp_image_get_active_drawable (image);
if (! drawable)
{
......@@ -488,10 +486,8 @@ copy_named_buffer_callback (GtkWidget *widget,
const gchar *name,
gpointer data)
{
GimpImage *image = GIMP_IMAGE (data);
GimpDrawable *drawable;
drawable = gimp_image_active_drawable (image);
GimpImage *image = GIMP_IMAGE (data);
GimpDrawable *drawable = gimp_image_get_active_drawable (image);
if (! drawable)
{
......
......@@ -226,7 +226,7 @@ file_actions_update (GimpActionGroup *group,
GimpDrawable *drawable = NULL;
if (image)
drawable = gimp_image_active_drawable (image);
drawable = gimp_image_get_active_drawable (image);
#define SET_SENSITIVE(action,condition) \
gimp_action_group_set_action_sensitive (group, action, (condition) != 0)
......
......@@ -193,7 +193,7 @@ file_save_cmd_callback (GtkAction *action,
save_mode = (GimpSaveMode) value;
if (! gimp_image_active_drawable (image))
if (! gimp_image_get_active_drawable (image))
return;
switch (save_mode)
......
......@@ -141,7 +141,7 @@ static const GimpActionEntry image_actions[] =
GIMP_HELP_IMAGE_GRID },
{ "image-properties", GTK_STOCK_INFO,
N_("Image Pr_operties"), NULL,
N_("Image Pr_operties"), "<alt>Return",
N_("Display information about this image"),
G_CALLBACK (image_properties_cmd_callback),
GIMP_HELP_IMAGE_PROPERTIES }
......
......@@ -225,7 +225,7 @@ plug_in_actions_update (GimpActionGroup *group,
if (image)
{
GimpDrawable *drawable = gimp_image_active_drawable (image);
GimpDrawable *drawable = gimp_image_get_active_drawable (image);
if (drawable)
type = gimp_drawable_type (drawable);
......
......@@ -434,7 +434,7 @@ plug_in_collect_display_args (GtkAction *action,
if (args->n_values > n_args &&
GIMP_IS_PARAM_SPEC_DRAWABLE_ID (pspecs[n_args]))
{
GimpDrawable *drawable = gimp_image_active_drawable (image);
GimpDrawable *drawable = gimp_image_get_active_drawable (image);
if (drawable)
{
......
......@@ -40,7 +40,7 @@
static const GimpActionEntry select_actions[] =
{
{ "selection-editor-popup", GIMP_STOCK_TOOL_RECT_SELECT,
{ "selection-popup", GIMP_STOCK_TOOL_RECT_SELECT,
N_("Selection Editor Menu"), NULL, NULL, NULL,
GIMP_HELP_SELECTION_DIALOG },
......@@ -139,7 +139,7 @@ select_actions_update (GimpActionGroup *group,
if (image)
{
drawable = gimp_image_active_drawable (image);
drawable = gimp_image_get_active_drawable (image);
fs = (gimp_image_floating_sel (image) != NULL);
sel = ! gimp_channel_is_empty (gimp_image_get_mask (image));
......
......@@ -121,7 +121,7 @@ select_float_cmd_callback (GtkAction *action,
return_if_no_image (image, data);
gimp_selection_float (gimp_image_get_mask (image),
gimp_image_active_drawable (image),
gimp_image_get_active_drawable (image),
action_data_get_context (data),
TRUE, 0, 0);
gimp_image_flush (image);
......@@ -299,7 +299,7 @@ select_stroke_cmd_callback (GtkAction *action,
return_if_no_image (image, data);
return_if_no_widget (widget, data);
drawable = gimp_image_active_drawable (image);
drawable = gimp_image_get_active_drawable (image);
if (! drawable)
{
......@@ -330,7 +330,7 @@ select_stroke_last_vals_cmd_callback (GtkAction *action,
return_if_no_context (context, data);
return_if_no_widget (widget, data);
drawable = gimp_image_active_drawable (image);
drawable = gimp_image_get_active_drawable (image);
if (! drawable)
{
......
......@@ -355,7 +355,7 @@ vectors_stroke_cmd_callback (GtkAction *action,
return_if_no_vectors (image, vectors, data);
return_if_no_widget (widget, data);
drawable = gimp_image_active_drawable (image);
drawable = gimp_image_get_active_drawable (image);
if (! drawable)
{
......@@ -387,7 +387,7 @@ vectors_stroke_last_vals_cmd_callback (GtkAction *action,
return_if_no_context (context, data);
return_if_no_widget (widget, data);
drawable = gimp_image_active_drawable (image);
drawable = gimp_image_get_active_drawable (image);
if (! drawable)
{
......
......@@ -601,14 +601,28 @@ view_actions_update (GimpActionGroup *group,
SET_ACTIVE ("view-show-selection", display && options->show_selection);
SET_SENSITIVE ("view-show-layer-boundary", display);
SET_ACTIVE ("view-show-layer-boundary", display && options->show_layer_boundary);
SET_SENSITIVE ("view-show-guides", display);
SET_ACTIVE ("view-show-guides", display && options->show_guides);
SET_SENSITIVE ("view-show-grid", display);
SET_ACTIVE ("view-show-grid", display && options->show_grid);
SET_SENSITIVE ("view-show-sample-points", display);
SET_ACTIVE ("view-show-sample-points", display && options->show_sample_points);
SET_SENSITIVE ("view-snap-to-guides", display);
SET_ACTIVE ("view-snap-to-guides", display && shell->snap_to_guides);
SET_SENSITIVE ("view-snap-to-grid", display);
SET_ACTIVE ("view-snap-to-grid", display && shell->snap_to_grid);
SET_SENSITIVE ("view-snap-to-canvas", display);
SET_ACTIVE ("view-snap-to-canvas", display && shell->snap_to_canvas);
SET_SENSITIVE ("view-snap-to-vectors", display);
SET_ACTIVE ("view-snap-to-vectors", display && shell->snap_to_vectors);
SET_SENSITIVE ("view-padding-color-theme", display);
SET_SENSITIVE ("view-padding-color-light-check", display);
SET_SENSITIVE ("view-padding-color-dark-check", display);
SET_SENSITIVE ("view-padding-color-custom", display);
SET_SENSITIVE ("view-padding-color-prefs", display);
if (display)
{
SET_COLOR ("view-padding-color-menu", &options->padding_color);
......
......@@ -40,6 +40,7 @@
#include "config/gimprc.h"
#include "base/base.h"
#include "base/tile-swap.h"
#include "core/gimp.h"
#include "core/gimp-user-install.h"
......@@ -248,6 +249,7 @@ app_run (const gchar *full_prog_name,
g_main_loop_unref (loop);
g_object_unref (gimp);
errors_exit ();
base_exit ();
}
......@@ -282,7 +284,7 @@ app_exit_after_callback (Gimp *gimp,
g_main_loop_quit (loop);
#else
/* make sure that the swap file is removed before we quit */
base_exit ();
tile_swap_exit ();
exit (EXIT_SUCCESS);
#endif
......
......@@ -47,15 +47,18 @@ libappbase_a_SOURCES = \
tile-cache.h \
tile-manager.c \
tile-manager.h \
tile-manager-private.h \
tile-manager-crop.c \
tile-manager-crop.h \
tile-manager-preview.c \
tile-manager-preview.h \
tile-manager-private.h \
tile-pyramid.c \
tile-pyramid.h \
tile-swap.c \
tile-swap.h
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Base\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Base\"
INCLUDES = \
-I$(top_builddir) \
......
......@@ -63,7 +63,8 @@ am_libappbase_a_OBJECTS = base.$(OBJEXT) base-enums.$(OBJEXT) \
pixel-region.$(OBJEXT) pixel-surround.$(OBJEXT) siox.$(OBJEXT) \
temp-buf.$(OBJEXT) threshold.$(OBJEXT) tile.$(OBJEXT) \
tile-cache.$(OBJEXT) tile-manager.$(OBJEXT) \
tile-manager-crop.$(OBJEXT) tile-swap.$(OBJEXT)
tile-manager-crop.$(OBJEXT) tile-manager-preview.$(OBJEXT) \
tile-pyramid.$(OBJEXT) tile-swap.$(OBJEXT)
libappbase_a_OBJECTS = $(am_libappbase_a_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
......@@ -199,8 +200,6 @@ GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GOBJECT_QUERY = @GOBJECT_QUERY@
GREP = @GREP@
GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
GTHREAD_LIBS = @GTHREAD_LIBS@
GTKDOC_REQUIRED_VERSION = @GTKDOC_REQUIRED_VERSION@
GTKHTML2_CFLAGS = @GTKHTML2_CFLAGS@
GTKHTML2_LIBS = @GTKHTML2_LIBS@
......@@ -356,6 +355,7 @@ RANLIB = @RANLIB@
RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
RT_LIBS = @RT_LIBS@
SCREENSHOT = @SCREENSHOT@
SED = @SED@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
......@@ -497,15 +497,18 @@ libappbase_a_SOURCES = \
tile-cache.h \
tile-manager.c \
tile-manager.h \
tile-manager-private.h \
tile-manager-crop.c \
tile-manager-crop.h \
tile-manager-preview.c \
tile-manager-preview.h \
tile-manager-private.h \
tile-pyramid.c \
tile-pyramid.h \
tile-swap.c \
tile-swap.h
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-Base\" \
@GTHREAD_CFLAGS@
-DG_LOG_DOMAIN=\"Gimp-Base\"
INCLUDES = \
-I$(top_builddir) \
......@@ -590,7 +593,9 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threshold.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tile-cache.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tile-manager-crop.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tile-manager-preview.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tile-manager.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tile-pyramid.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tile-swap.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tile.Po@am__quote@
......
......@@ -71,12 +71,14 @@ typedef struct _TempBuf TempBuf;
typedef struct _Tile Tile;
typedef struct _TileManager TileManager;
typedef struct _TilePyramid TilePyramid;
/* functions */