callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disabled display filters code, since it is unfinished

Browse Source 
-Yosh
This commit is contained in:
Manish Singh
2000-12-24 20:27:04 +00:00
parent 8e8b5ab46f
commit a7aca4cb97
32 changed files with 174 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
Sun Dec 24 12:24:01 PST 2000 Manish Singh <yosh@gimp.org>
* app/Makefile.am
* app/app_procs.c
* app/color_area.[ch]
* app/commands.[ch]
* app/gdisplay.[ch]
* app/makefile.mingw.in
* app/menus.c
* modules/Makefile.am
* modules/makefile.mingw.in: disabled display filters code, since
it is unfinished
2000-12-24 Michael Natterer <mitch@gimp.org>
* app/color_cmds.c

4
app/Makefile.am
View File

@ -161,10 +161,6 @@ gimp_SOURCES = \
gdisplay.h \
gdisplayP.h \
gdisplayF.h \
gdisplay_color.c \
gdisplay_color.h \
gdisplay_color_ui.c \
gdisplay_color_ui.h \
gdisplay_ops.c \
gdisplay_ops.h \
general.c \

7
app/actions/help-commands.c
View File

@ -40,7 +40,6 @@
#include "fileops.h"
#include "floating_sel.h"
#include "gdisplay_ops.h"
#include "gdisplay_color_ui.h"
#include "gimage_mask.h"
#include "gimphelp.h"
#include "gimprc.h"
@ -63,6 +62,10 @@
#include "tools.h"
#include "undo.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color_ui.h"
#endif /* DISPLAY_FILTERS */
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
@ -1218,6 +1221,7 @@ dialogs_error_console_cmd_callback (GtkWidget *widget,
error_console_add (NULL);
}
#ifdef DISPLAY_FILTERS
void
dialogs_display_filters_cmd_callback (GtkWidget *widget,
gpointer client_data)
@ -1236,6 +1240,7 @@ dialogs_display_filters_cmd_callback (GtkWidget *widget,
else
gdk_window_raise (gdisp->cd_ui->window);
}
#endif /* DISPLAY_FILTERS */
void
dialogs_undo_history_cmd_callback (GtkWidget *widget,

5
app/actions/help-commands.h
View File

@ -124,7 +124,6 @@ void dialogs_input_devices_cmd_callback (GtkWidget *, gpointer);
void dialogs_device_status_cmd_callback (GtkWidget *, gpointer);
void dialogs_document_index_cmd_callback (GtkWidget *, gpointer);
void dialogs_error_console_cmd_callback (GtkWidget *, gpointer);
void dialogs_display_filters_cmd_callback (GtkWidget *, gpointer);
void dialogs_undo_history_cmd_callback (GtkWidget *, gpointer);
void dialogs_module_browser_cmd_callback (GtkWidget *, gpointer);
@ -134,4 +133,8 @@ void help_context_help_cmd_callback (GtkWidget *, gpointer);
void help_tips_cmd_callback (GtkWidget *, gpointer);
void help_about_cmd_callback (GtkWidget *, gpointer);
#ifdef DISPLAY_FILTERS
void dialogs_display_filters_cmd_callback (GtkWidget *, gpointer);
#endif /* DISPLAY_FILTERS */
#endif /* __COMMANDS_H__ */

7
app/app_procs.c
View File

@ -55,7 +55,6 @@
#include "errorconsole.h"
#include "fileops.h"
#include "gdisplay.h"
#include "gdisplay_color.h"
#include "gdisplay_ops.h"
#include "gimpbrushlist.h"
#include "gimprc.h"
@ -92,6 +91,10 @@
#include "docindex.h"
#include "colormap_dialog.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color.h"
#endif /* DISPLAY_FILTERS */
#include "color_notebook.h"
#include "color_select.h"
#include "gimpparasite.h"
@ -531,7 +534,9 @@ app_init (void)
RESET_BAR();
internal_procs_init ();
#ifdef DISPLAY_FILTERS
color_display_init ();
#endif /* DISPLAY_FILTERS */
RESET_BAR();
if (always_restore_session)

10
app/color_area.c
View File

@ -30,10 +30,12 @@
#include "color_area.h"
#include "color_notebook.h"
#include "gdisplay.h"
#include "gdisplay_color.h"
#include "gimpcontext.h"
#include "gimpdnd.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color.h"
#endif /* DISPLAY_FILTERS */
typedef enum
{
@ -138,7 +140,9 @@ color_area_draw_rect (GdkDrawable *drawable,
static gint rowstride;
gint xx, yy;
guchar *bp;
#ifdef DISPLAY_FILTERS
GList *list;
#endif /* DISPLAY_FILTERS */
rowstride = 3 * ((width + 3) & -4);
@ -160,12 +164,14 @@ color_area_draw_rect (GdkDrawable *drawable,
bp = color_area_rgb_buf;
#ifdef DISPLAY_FILTERS
for (list = color_area_gdisp->cd_list; list; list = g_list_next (list))
{
ColorDisplayNode *node = (ColorDisplayNode *) list->data;
node->cd_convert (node->cd_ID, bp, width, 1, 3, rowstride);
}
#endif /* DISPLAY_FILTERS */
for (yy = 1; yy < height; yy++)
{
@ -511,12 +517,14 @@ color_area_create (gint width,
GTK_SIGNAL_FUNC (color_area_color_changed),
color_area);
#ifdef DISPLAY_FILTERS
/* display filter dummy gdisplay */
color_area_gdisp = g_new (GDisplay, 1);
color_area_gdisp->cd_list = NULL;
color_area_gdisp->cd_ui = NULL;
color_area_gdisp->gimage = g_new (GimpImage, 1);
color_area_gdisp->gimage->base_type = RGB;
#endif /* DISPLAY_FILTERS */
return color_area;
}

3
app/color_area.h
View File

@ -29,7 +29,10 @@
* Global variables
*/
extern gint active_color; /* foreground (= 0) or background (= 1) */
#ifdef DISPLAY_FILTERS
extern GDisplay *color_area_gdisp; /* hack for color displays */
#endif /* DISPLAY_FILTERS */
/*
* Functions

7
app/commands.c
View File

@ -40,7 +40,6 @@
#include "fileops.h"
#include "floating_sel.h"
#include "gdisplay_ops.h"
#include "gdisplay_color_ui.h"
#include "gimage_mask.h"
#include "gimphelp.h"
#include "gimprc.h"
@ -63,6 +62,10 @@
#include "tools.h"
#include "undo.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color_ui.h"
#endif /* DISPLAY_FILTERS */
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
@ -1218,6 +1221,7 @@ dialogs_error_console_cmd_callback (GtkWidget *widget,
error_console_add (NULL);
}
#ifdef DISPLAY_FILTERS
void
dialogs_display_filters_cmd_callback (GtkWidget *widget,
gpointer client_data)
@ -1236,6 +1240,7 @@ dialogs_display_filters_cmd_callback (GtkWidget *widget,
else
gdk_window_raise (gdisp->cd_ui->window);
}
#endif /* DISPLAY_FILTERS */
void
dialogs_undo_history_cmd_callback (GtkWidget *widget,

5
app/commands.h
View File

@ -124,7 +124,6 @@ void dialogs_input_devices_cmd_callback (GtkWidget *, gpointer);
void dialogs_device_status_cmd_callback (GtkWidget *, gpointer);
void dialogs_document_index_cmd_callback (GtkWidget *, gpointer);
void dialogs_error_console_cmd_callback (GtkWidget *, gpointer);
void dialogs_display_filters_cmd_callback (GtkWidget *, gpointer);
void dialogs_undo_history_cmd_callback (GtkWidget *, gpointer);
void dialogs_module_browser_cmd_callback (GtkWidget *, gpointer);
@ -134,4 +133,8 @@ void help_context_help_cmd_callback (GtkWidget *, gpointer);
void help_tips_cmd_callback (GtkWidget *, gpointer);
void help_about_cmd_callback (GtkWidget *, gpointer);
#ifdef DISPLAY_FILTERS
void dialogs_display_filters_cmd_callback (GtkWidget *, gpointer);
#endif /* DISPLAY_FILTERS */
#endif /* __COMMANDS_H__ */

15
app/core/gimpprojection.c
View File

@ -33,7 +33,6 @@
#include "draw_core.h"
#include "gdisplay.h"
#include "gdisplayP.h"
#include "gdisplay_color.h"
#include "gdisplay_ops.h"
#include "gimage_mask.h"
#include "gimpcontext.h"
@ -52,6 +51,10 @@
#include "tools.h"
#include "undo.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color.h"
#endif /* DISPLAY_FILTERS */
#include "bezier_selectP.h"
#include "layer_pvt.h" /* ick. (not alone either) */
@ -139,8 +142,10 @@ gdisplay_new (GimpImage *gimage,
gdisp->idle_render.update_areas = NULL;
gdisp->idle_render.active = FALSE;
#ifdef DISPLAY_FILTERS
gdisp->cd_list = NULL;
gdisp->cd_ui = NULL;
#endif /* DISPLAY_FILTERS */
gdisp->warning_dialog = NULL;
@ -355,8 +360,10 @@ gdisplay_delete (GDisplay *gdisp)
gdisp->idle_render.active = FALSE;
}
#ifdef DISPLAY_FILTERS
/* detach any color displays */
gdisplay_color_detach_all (gdisp);
#endif /* DISPLAY_FILTERS */
/* get rid of signals handled by this display */
gtk_signal_disconnect_by_data (GTK_OBJECT (gdisp->gimage), gdisp);
@ -1270,9 +1277,11 @@ gdisplay_display_area (GDisplay *gdisp,
gint x2, y2;
gint dx, dy;
gint i, j;
GList *list;
guchar *buf;
gint bpp, bpl;
#ifdef DISPLAY_FILTERS
GList *list;
#endif /* DISPLAY_FILTERS */
buf = gximage_get_data ();
bpp = gximage_get_bpp ();
@ -1355,6 +1364,7 @@ gdisplay_display_area (GDisplay *gdisp,
0, 0, 0, 0);
#endif
#ifdef DISPLAY_FILTERS
list = gdisp->cd_list;
while (list)
{
@ -1362,6 +1372,7 @@ gdisplay_display_area (GDisplay *gdisp,
node->cd_convert (node->cd_ID, buf, dx, dy, bpp, bpl);
list = list->next;
}
#endif /* DISPLAY_FILTERS */
gximage_put (gdisp->canvas->window,
j, i, dx, dy,

2
app/core/gimpprojection.h
View File

@ -159,8 +159,10 @@ struct _GDisplay
IdleRenderStruct idle_render; /* state of this gdisplay's render thread */
#ifdef DISPLAY_FILTERS
GList *cd_list; /* color display conversion stuff */
GtkWidget *cd_ui; /* color display filter dialog */
#endif /* DISPLAY_FILTERS */
GtkWidget *warning_dialog; /* "Changes were made to %s. Close anyway?" */
};

15
app/display/gimpdisplay.c
View File

@ -33,7 +33,6 @@
#include "draw_core.h"
#include "gdisplay.h"
#include "gdisplayP.h"
#include "gdisplay_color.h"
#include "gdisplay_ops.h"
#include "gimage_mask.h"
#include "gimpcontext.h"
@ -52,6 +51,10 @@
#include "tools.h"
#include "undo.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color.h"
#endif /* DISPLAY_FILTERS */
#include "bezier_selectP.h"
#include "layer_pvt.h" /* ick. (not alone either) */
@ -139,8 +142,10 @@ gdisplay_new (GimpImage *gimage,
gdisp->idle_render.update_areas = NULL;
gdisp->idle_render.active = FALSE;
#ifdef DISPLAY_FILTERS
gdisp->cd_list = NULL;
gdisp->cd_ui = NULL;
#endif /* DISPLAY_FILTERS */
gdisp->warning_dialog = NULL;
@ -355,8 +360,10 @@ gdisplay_delete (GDisplay *gdisp)
gdisp->idle_render.active = FALSE;
}
#ifdef DISPLAY_FILTERS
/* detach any color displays */
gdisplay_color_detach_all (gdisp);
#endif /* DISPLAY_FILTERS */
/* get rid of signals handled by this display */
gtk_signal_disconnect_by_data (GTK_OBJECT (gdisp->gimage), gdisp);
@ -1270,9 +1277,11 @@ gdisplay_display_area (GDisplay *gdisp,
gint x2, y2;
gint dx, dy;
gint i, j;
GList *list;
guchar *buf;
gint bpp, bpl;
#ifdef DISPLAY_FILTERS
GList *list;
#endif /* DISPLAY_FILTERS */
buf = gximage_get_data ();
bpp = gximage_get_bpp ();
@ -1355,6 +1364,7 @@ gdisplay_display_area (GDisplay *gdisp,
0, 0, 0, 0);
#endif
#ifdef DISPLAY_FILTERS
list = gdisp->cd_list;
while (list)
{
@ -1362,6 +1372,7 @@ gdisplay_display_area (GDisplay *gdisp,
node->cd_convert (node->cd_ID, buf, dx, dy, bpp, bpl);
list = list->next;
}
#endif /* DISPLAY_FILTERS */
gximage_put (gdisp->canvas->window,
j, i, dx, dy,

2
app/display/gimpdisplay.h
View File

@ -159,8 +159,10 @@ struct _GDisplay
IdleRenderStruct idle_render; /* state of this gdisplay's render thread */
#ifdef DISPLAY_FILTERS
GList *cd_list; /* color display conversion stuff */
GtkWidget *cd_ui; /* color display filter dialog */
#endif /* DISPLAY_FILTERS */
GtkWidget *warning_dialog; /* "Changes were made to %s. Close anyway?" */
};

15
app/gdisplay.c
View File

@ -33,7 +33,6 @@
#include "draw_core.h"
#include "gdisplay.h"
#include "gdisplayP.h"
#include "gdisplay_color.h"
#include "gdisplay_ops.h"
#include "gimage_mask.h"
#include "gimpcontext.h"
@ -52,6 +51,10 @@
#include "tools.h"
#include "undo.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color.h"
#endif /* DISPLAY_FILTERS */
#include "bezier_selectP.h"
#include "layer_pvt.h" /* ick. (not alone either) */
@ -139,8 +142,10 @@ gdisplay_new (GimpImage *gimage,
gdisp->idle_render.update_areas = NULL;
gdisp->idle_render.active = FALSE;
#ifdef DISPLAY_FILTERS
gdisp->cd_list = NULL;
gdisp->cd_ui = NULL;
#endif /* DISPLAY_FILTERS */
gdisp->warning_dialog = NULL;
@ -355,8 +360,10 @@ gdisplay_delete (GDisplay *gdisp)
gdisp->idle_render.active = FALSE;
}
#ifdef DISPLAY_FILTERS
/* detach any color displays */
gdisplay_color_detach_all (gdisp);
#endif /* DISPLAY_FILTERS */
/* get rid of signals handled by this display */
gtk_signal_disconnect_by_data (GTK_OBJECT (gdisp->gimage), gdisp);
@ -1270,9 +1277,11 @@ gdisplay_display_area (GDisplay *gdisp,
gint x2, y2;
gint dx, dy;
gint i, j;
GList *list;
guchar *buf;
gint bpp, bpl;
#ifdef DISPLAY_FILTERS
GList *list;
#endif /* DISPLAY_FILTERS */
buf = gximage_get_data ();
bpp = gximage_get_bpp ();
@ -1355,6 +1364,7 @@ gdisplay_display_area (GDisplay *gdisp,
0, 0, 0, 0);
#endif
#ifdef DISPLAY_FILTERS
list = gdisp->cd_list;
while (list)
{
@ -1362,6 +1372,7 @@ gdisplay_display_area (GDisplay *gdisp,
node->cd_convert (node->cd_ID, buf, dx, dy, bpp, bpl);
list = list->next;
}
#endif /* DISPLAY_FILTERS */
gximage_put (gdisp->canvas->window,
j, i, dx, dy,

2
app/gdisplay.h
View File

@ -159,8 +159,10 @@ struct _GDisplay
IdleRenderStruct idle_render; /* state of this gdisplay's render thread */
#ifdef DISPLAY_FILTERS
GList *cd_list; /* color display conversion stuff */
GtkWidget *cd_ui; /* color display filter dialog */
#endif /* DISPLAY_FILTERS */
GtkWidget *warning_dialog; /* "Changes were made to %s. Close anyway?" */
};

10
app/gui/color-area.c
View File

@ -30,10 +30,12 @@
#include "color_area.h"
#include "color_notebook.h"
#include "gdisplay.h"
#include "gdisplay_color.h"
#include "gimpcontext.h"
#include "gimpdnd.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color.h"
#endif /* DISPLAY_FILTERS */
typedef enum
{
@ -138,7 +140,9 @@ color_area_draw_rect (GdkDrawable *drawable,
static gint rowstride;
gint xx, yy;
guchar *bp;
#ifdef DISPLAY_FILTERS
GList *list;
#endif /* DISPLAY_FILTERS */
rowstride = 3 * ((width + 3) & -4);
@ -160,12 +164,14 @@ color_area_draw_rect (GdkDrawable *drawable,
bp = color_area_rgb_buf;
#ifdef DISPLAY_FILTERS
for (list = color_area_gdisp->cd_list; list; list = g_list_next (list))
{
ColorDisplayNode *node = (ColorDisplayNode *) list->data;
node->cd_convert (node->cd_ID, bp, width, 1, 3, rowstride);
}
#endif /* DISPLAY_FILTERS */
for (yy = 1; yy < height; yy++)
{
@ -511,12 +517,14 @@ color_area_create (gint width,
GTK_SIGNAL_FUNC (color_area_color_changed),
color_area);
#ifdef DISPLAY_FILTERS
/* display filter dummy gdisplay */
color_area_gdisp = g_new (GDisplay, 1);
color_area_gdisp->cd_list = NULL;
color_area_gdisp->cd_ui = NULL;
color_area_gdisp->gimage = g_new (GimpImage, 1);
color_area_gdisp->gimage->base_type = RGB;
#endif /* DISPLAY_FILTERS */
return color_area;
}

3
app/gui/color-area.h
View File

@ -29,7 +29,10 @@
* Global variables
*/
extern gint active_color; /* foreground (= 0) or background (= 1) */
#ifdef DISPLAY_FILTERS
extern GDisplay *color_area_gdisp; /* hack for color displays */
#endif /* DISPLAY_FILTERS */
/*
* Functions

7
app/gui/commands.c
View File

@ -40,7 +40,6 @@
#include "fileops.h"
#include "floating_sel.h"
#include "gdisplay_ops.h"
#include "gdisplay_color_ui.h"
#include "gimage_mask.h"
#include "gimphelp.h"
#include "gimprc.h"
@ -63,6 +62,10 @@
#include "tools.h"
#include "undo.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color_ui.h"
#endif /* DISPLAY_FILTERS */
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
@ -1218,6 +1221,7 @@ dialogs_error_console_cmd_callback (GtkWidget *widget,
error_console_add (NULL);
}
#ifdef DISPLAY_FILTERS
void
dialogs_display_filters_cmd_callback (GtkWidget *widget,
gpointer client_data)
@ -1236,6 +1240,7 @@ dialogs_display_filters_cmd_callback (GtkWidget *widget,
else
gdk_window_raise (gdisp->cd_ui->window);
}
#endif /* DISPLAY_FILTERS */
void
dialogs_undo_history_cmd_callback (GtkWidget *widget,

5
app/gui/commands.h
View File

@ -124,7 +124,6 @@ void dialogs_input_devices_cmd_callback (GtkWidget *, gpointer);
void dialogs_device_status_cmd_callback (GtkWidget *, gpointer);
void dialogs_document_index_cmd_callback (GtkWidget *, gpointer);
void dialogs_error_console_cmd_callback (GtkWidget *, gpointer);
void dialogs_display_filters_cmd_callback (GtkWidget *, gpointer);
void dialogs_undo_history_cmd_callback (GtkWidget *, gpointer);
void dialogs_module_browser_cmd_callback (GtkWidget *, gpointer);
@ -134,4 +133,8 @@ void help_context_help_cmd_callback (GtkWidget *, gpointer);
void help_tips_cmd_callback (GtkWidget *, gpointer);
void help_about_cmd_callback (GtkWidget *, gpointer);
#ifdef DISPLAY_FILTERS
void dialogs_display_filters_cmd_callback (GtkWidget *, gpointer);
#endif /* DISPLAY_FILTERS */
#endif /* __COMMANDS_H__ */

7
app/gui/help-commands.c
View File

@ -40,7 +40,6 @@
#include "fileops.h"
#include "floating_sel.h"
#include "gdisplay_ops.h"
#include "gdisplay_color_ui.h"
#include "gimage_mask.h"
#include "gimphelp.h"
#include "gimprc.h"
@ -63,6 +62,10 @@
#include "tools.h"
#include "undo.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color_ui.h"
#endif /* DISPLAY_FILTERS */
#include "libgimp/gimpmath.h"
#include "libgimp/gimpintl.h"
@ -1218,6 +1221,7 @@ dialogs_error_console_cmd_callback (GtkWidget *widget,
error_console_add (NULL);
}
#ifdef DISPLAY_FILTERS
void
dialogs_display_filters_cmd_callback (GtkWidget *widget,
gpointer client_data)
@ -1236,6 +1240,7 @@ dialogs_display_filters_cmd_callback (GtkWidget *widget,
else
gdk_window_raise (gdisp->cd_ui->window);
}
#endif /* DISPLAY_FILTERS */
void
dialogs_undo_history_cmd_callback (GtkWidget *widget,

5
app/gui/help-commands.h
View File

@ -124,7 +124,6 @@ void dialogs_input_devices_cmd_callback (GtkWidget *, gpointer);
void dialogs_device_status_cmd_callback (GtkWidget *, gpointer);
void dialogs_document_index_cmd_callback (GtkWidget *, gpointer);
void dialogs_error_console_cmd_callback (GtkWidget *, gpointer);
void dialogs_display_filters_cmd_callback (GtkWidget *, gpointer);
void dialogs_undo_history_cmd_callback (GtkWidget *, gpointer);
void dialogs_module_browser_cmd_callback (GtkWidget *, gpointer);
@ -134,4 +133,8 @@ void help_context_help_cmd_callback (GtkWidget *, gpointer);
void help_tips_cmd_callback (GtkWidget *, gpointer);
void help_about_cmd_callback (GtkWidget *, gpointer);
#ifdef DISPLAY_FILTERS
void dialogs_display_filters_cmd_callback (GtkWidget *, gpointer);
#endif /* DISPLAY_FILTERS */
#endif /* __COMMANDS_H__ */

4
app/gui/menus.c
View File

@ -150,8 +150,10 @@ static GimpItemFactoryEntry toolbox_entries[] =
"file/dialogs/document_index.html", NULL },
{ { N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
"file/dialogs/error_console.html", NULL },
#ifdef DISPLAY_FILTERS
{ { N_("/File/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 },
"file/dialogs/display_filters/display_filters.html", NULL },
#endif /* DISPLAY_FILTERS */
{ { "/File/---", NULL, NULL, 0, "<Separator>" },
NULL, NULL },
@ -512,8 +514,10 @@ static GimpItemFactoryEntry image_entries[] =
"dialogs/document_index.html", NULL },
{ { N_("/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
"dialogs/error_console.html", NULL },
#ifdef DISPLAY_FILTERS
{ { N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 },
"dialogs/display_filters/display_filters.html", NULL },
#endif /* DISPLAY_FILTERS */
{ { N_("/Dialogs/Undo History..."), NULL, dialogs_undo_history_cmd_callback, 0},
"dialogs/undo_history.html", NULL },

2
app/makefile.mingw.in
View File

@ -113,8 +113,6 @@ gimp_OBJECTS = \
free_select.o \
fuzzy_select.o \
gdisplay.o \
gdisplay_color.o \
gdisplay_color_ui.o \
gdisplay_ops.o \
general.o \
gimage.o \

4
app/makefile.msc
View File

@ -28,7 +28,7 @@ CC = cl -GA -G5 -GF $(OPTIMIZE) -W3 -nologo
LDFLAGS = /link /subsystem:console /machine:ix86 $(LINKDEBUG)
INSTALL = copy
GIMP_VER = 1.1
GIMP_VER = 1.2
GTK_VER = 1.3
GLIB_VER = 1.3
@ -132,8 +132,6 @@ gimp_OBJECTS = \
fuzzy_select.obj \
gdisplay.obj \
gdisplay_cmds.obj \
gdisplay_color.obj \
gdisplay_color_ui.obj \
gdisplay_ops.obj \
general.obj \
gimage.obj \

4
app/menus.c
View File

@ -150,8 +150,10 @@ static GimpItemFactoryEntry toolbox_entries[] =
"file/dialogs/document_index.html", NULL },
{ { N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
"file/dialogs/error_console.html", NULL },
#ifdef DISPLAY_FILTERS
{ { N_("/File/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 },
"file/dialogs/display_filters/display_filters.html", NULL },
#endif /* DISPLAY_FILTERS */
{ { "/File/---", NULL, NULL, 0, "<Separator>" },
NULL, NULL },
@ -512,8 +514,10 @@ static GimpItemFactoryEntry image_entries[] =
"dialogs/document_index.html", NULL },
{ { N_("/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
"dialogs/error_console.html", NULL },
#ifdef DISPLAY_FILTERS
{ { N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 },
"dialogs/display_filters/display_filters.html", NULL },
#endif /* DISPLAY_FILTERS */
{ { N_("/Dialogs/Undo History..."), NULL, dialogs_undo_history_cmd_callback, 0},
"dialogs/undo_history.html", NULL },

4
app/menus/menus.c
View File

@ -150,8 +150,10 @@ static GimpItemFactoryEntry toolbox_entries[] =
"file/dialogs/document_index.html", NULL },
{ { N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
"file/dialogs/error_console.html", NULL },
#ifdef DISPLAY_FILTERS
{ { N_("/File/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 },
"file/dialogs/display_filters/display_filters.html", NULL },
#endif /* DISPLAY_FILTERS */
{ { "/File/---", NULL, NULL, 0, "<Separator>" },
NULL, NULL },
@ -512,8 +514,10 @@ static GimpItemFactoryEntry image_entries[] =
"dialogs/document_index.html", NULL },
{ { N_("/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
"dialogs/error_console.html", NULL },
#ifdef DISPLAY_FILTERS
{ { N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 },
"dialogs/display_filters/display_filters.html", NULL },
#endif /* DISPLAY_FILTERS */
{ { N_("/Dialogs/Undo History..."), NULL, dialogs_undo_history_cmd_callback, 0},
"dialogs/undo_history.html", NULL },

4
app/widgets/gimpitemfactory.c
View File

@ -150,8 +150,10 @@ static GimpItemFactoryEntry toolbox_entries[] =
"file/dialogs/document_index.html", NULL },
{ { N_("/File/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
"file/dialogs/error_console.html", NULL },
#ifdef DISPLAY_FILTERS
{ { N_("/File/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 },
"file/dialogs/display_filters/display_filters.html", NULL },
#endif /* DISPLAY_FILTERS */
{ { "/File/---", NULL, NULL, 0, "<Separator>" },
NULL, NULL },
@ -512,8 +514,10 @@ static GimpItemFactoryEntry image_entries[] =
"dialogs/document_index.html", NULL },
{ { N_("/Dialogs/Error Console..."), NULL, dialogs_error_console_cmd_callback, 0 },
"dialogs/error_console.html", NULL },
#ifdef DISPLAY_FILTERS
{ { N_("/Dialogs/Display Filters..."), NULL, dialogs_display_filters_cmd_callback, 0 },
"dialogs/display_filters/display_filters.html", NULL },
#endif /* DISPLAY_FILTERS */
{ { N_("/Dialogs/Undo History..."), NULL, dialogs_undo_history_cmd_callback, 0},
"dialogs/undo_history.html", NULL },

10
app/widgets/gimptoolbox-color-area.c
View File

@ -30,10 +30,12 @@
#include "color_area.h"
#include "color_notebook.h"
#include "gdisplay.h"
#include "gdisplay_color.h"
#include "gimpcontext.h"
#include "gimpdnd.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color.h"
#endif /* DISPLAY_FILTERS */
typedef enum
{
@ -138,7 +140,9 @@ color_area_draw_rect (GdkDrawable *drawable,
static gint rowstride;
gint xx, yy;
guchar *bp;
#ifdef DISPLAY_FILTERS
GList *list;
#endif /* DISPLAY_FILTERS */
rowstride = 3 * ((width + 3) & -4);
@ -160,12 +164,14 @@ color_area_draw_rect (GdkDrawable *drawable,
bp = color_area_rgb_buf;
#ifdef DISPLAY_FILTERS
for (list = color_area_gdisp->cd_list; list; list = g_list_next (list))
{
ColorDisplayNode *node = (ColorDisplayNode *) list->data;
node->cd_convert (node->cd_ID, bp, width, 1, 3, rowstride);
}
#endif /* DISPLAY_FILTERS */
for (yy = 1; yy < height; yy++)
{
@ -511,12 +517,14 @@ color_area_create (gint width,
GTK_SIGNAL_FUNC (color_area_color_changed),
color_area);
#ifdef DISPLAY_FILTERS
/* display filter dummy gdisplay */
color_area_gdisp = g_new (GDisplay, 1);
color_area_gdisp->cd_list = NULL;
color_area_gdisp->cd_ui = NULL;
color_area_gdisp->gimage = g_new (GimpImage, 1);
color_area_gdisp->gimage->base_type = RGB;
#endif /* DISPLAY_FILTERS */
return color_area;
}

3
app/widgets/gimptoolbox-color-area.h
View File

@ -29,7 +29,10 @@
* Global variables
*/
extern gint active_color; /* foreground (= 0) or background (= 1) */
#ifdef DISPLAY_FILTERS
extern GDisplay *color_area_gdisp; /* hack for color displays */
#endif /* DISPLAY_FILTERS */
/*
* Functions

16
modules/Makefile.am
View File

@ -22,9 +22,7 @@ EXTRA_DIST = \
libexec_LTLIBRARIES = \
libcolorsel_gtk.la \
libcolorsel_triangle.la \
libcolorsel_water.la \
libcdisplay_gamma.la \
libcdisplay_highcontrast.la
libcolorsel_water.la
libcolorsel_gtk_la_SOURCES = colorsel_gtk.c
libcolorsel_gtk_la_LDFLAGS = -avoid-version -module
@ -38,10 +36,10 @@ libcolorsel_water_la_SOURCES = colorsel_water.c
libcolorsel_water_la_LDFLAGS = -avoid-version -module
libcolorsel_water_la_LIBADD = $(GTK_LIBS)
libcdisplay_gamma_la_SOURCES = cdisplay_gamma.c
libcdisplay_gamma_la_LDFLAGS = -avoid-version -module
libcdisplay_gamma_la_LIBADD = $(GTK_LIBS)
## libcdisplay_gamma_la_SOURCES = cdisplay_gamma.c
## libcdisplay_gamma_la_LDFLAGS = -avoid-version -module
## libcdisplay_gamma_la_LIBADD = $(GTK_LIBS)
libcdisplay_highcontrast_la_SOURCES = cdisplay_highcontrast.c
libcdisplay_highcontrast_la_LDFLAGS = -avoid-version -module
libcdisplay_highcontrast_la_LIBADD = $(GTK_LIBS)
## libcdisplay_highcontrast_la_SOURCES = cdisplay_highcontrast.c
## libcdisplay_highcontrast_la_LDFLAGS = -avoid-version -module
## libcdisplay_highcontrast_la_LIBADD = $(GTK_LIBS)

12
modules/makefile.mingw.in
View File

@ -25,9 +25,7 @@ LDFLAGS = -s
MODULES = \
colorsel_gtk-$(GIMP_VER).dll \
colorsel_triangle-$(GIMP_VER).dll \
colorsel_water-$(GIMP_VER).dll \
cdisplay_gamma-$(GIMP_VER).dll \
cdisplay_highcontrast-$(GIMP_VER).dll
colorsel_water-$(GIMP_VER).dll
all : \
$(MODULES)
@ -47,11 +45,11 @@ colorsel_triangle-$(GIMP_VER).dll : colorsel_triangle.o module.def
colorsel_water-$(GIMP_VER).dll : colorsel_water.o module.def
$(GLIB)/build-dll colorsel_water $(GIMP_VER) module.def colorsel_water.o $(LDFLAGS) -L ../app -lgimp $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS)
cdisplay_gamma-$(GIMP_VER).dll : cdisplay_gamma.o module.def
$(GLIB)/build-dll cdisplay_gamma $(GIMP_VER) module.def cdisplay_gamma.o $(LDFLAGS) -L ../app -lgimp -L ../libgimp -lgimp-$(GIMP_VER) -lgimpui-$(GIMP_VER) $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS)
## cdisplay_gamma-$(GIMP_VER).dll : cdisplay_gamma.o module.def
## $(GLIB)/build-dll cdisplay_gamma $(GIMP_VER) module.def cdisplay_gamma.o $(LDFLAGS) -L ../app -lgimp -L ../libgimp -lgimp-$(GIMP_VER) -lgimpui-$(GIMP_VER) $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS)
cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.o module.def
$(GLIB)/build-dll cdisplay_highcontrast $(GIMP_VER) module.def cdisplay_highcontrast.o $(LDFLAGS) -L ../app -lgimp -L ../libgimp -lgimp-$(GIMP_VER) -lgimpui-$(GIMP_VER) $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS)
## cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.o module.def
## $(GLIB)/build-dll cdisplay_highcontrast $(GIMP_VER) module.def cdisplay_highcontrast.o $(LDFLAGS) -L ../app -lgimp -L ../libgimp -lgimp-$(GIMP_VER) -lgimpui-$(GIMP_VER) $(GTK_LIBS) $(INTL_LIBS) $(GLIB_LIBS)
# Hack to get an updated makefile.mingw automatically after updating
# makefile.mingw.in. Only for developer use.

10
modules/makefile.msc
View File

@ -28,7 +28,7 @@ CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo
LDFLAGS = /link $(LINKDEBUG)
INSTALL = copy
GIMP_VER = 1.1
GIMP_VER = 1.2
GTK_VER = 1.3
GLIB_VER = 1.3
@ -67,11 +67,11 @@ colorsel_triangle-$(GIMP_VER).dll : colorsel_triangle.obj module.def
colorsel_water-$(GIMP_VER).dll : colorsel_water.obj module.def
$(CC) $(CFLAGS) -LD -Fe$@ colorsel_water.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
cdisplay_gamma-$(GIMP_VER).dll : cdisplay_gamma.obj module.def
$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_gamma.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
# cdisplay_gamma-$(GIMP_VER).dll : cdisplay_gamma.obj module.def
# $(CC) $(CFLAGS) -LD -Fe$@ cdisplay_gamma.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.obj module.def
$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_highcontrast.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
# cdisplay_highcontrast-$(GIMP_VER).dll : cdisplay_highcontrast.obj module.def
# $(CC) $(CFLAGS) -LD -Fe$@ cdisplay_highcontrast.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def
# General rule for building
.c.obj: