Skip to content

GitLab

GIMP
GIMP
Commit 6ddbb705 authored by Manish Singh's avatar Manish Singh
Browse files
Options

more g_message changes 

* more g_message changes

* CEL plugin update

* INSTALL: info on why plugins don't get built

-Yosh
parent 9bb6ea89
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1179 additions and 1094 deletions
ChangeLog
View file @ 6ddbb705
Fri May 29 23:54:42 PDT 1998 Manish Singh <yosh@gimp.org>
* more changes to use g_message. All of app uses it now, plus
the major file plugins.
* plug-ins/CEL/CEL.c: update from author
* INSTALL: info about why optional plugins won't build
Sat May 30 02:03:19 EDT 1998 Matthew Wilson <msw@gimp.org>
* plug-ins/grid/grid.c: fix by sjburges to fix grid on selections.
......
INSTALL
View file @ 6ddbb705
......@@ -115,6 +115,33 @@ After fixing a problem, it is safest to delete the file 'config.cache'
before re-running ./configure.
When ./configure fails on plug-ins
==================================
There are some GIMP plug-ins that need additional third-party libraries
installed on your system. For example to compile the plug-ins that load
and save JPEG, PNG or TIFF files you need the related libraries and header
files installed, otherwise you'll get a message that plugin xyz will not
be build.
If you are sure that those libraries are correctly installed, but configure
fails to detect them, the following might help:
Set your LDFLAGS environment variable to look for the library in a certain
place, e.g. if you are working in a bash shell you would say:
export LDFLAGS="-L<path_to_library> -L<path_to_another_one>"
before you run configure.
Set your CPPFLAGS environment variable to look for the header file in a
certain place, e.g. if you are working in a bash shell you would say:
export CPPFLAGS="-I<path_to_header_file> -I<path_to_another_one>"
before you run configure.
It's wise to remove the file 'config.cache' before re-running configure.
Generic Instructions for Building Auto-Configured Packages
==========================================================
......
app/about_dialog.c
View file @ 6ddbb705
......@@ -283,7 +283,7 @@ about_dialog_load_logo (GtkWidget *window)
sprintf (buf, "%s/gimp_logo.ppm", DATADIR);
fp = fopen (buf, "r");
fp = fopen (buf, "rb");
if (!fp)
return 0;
......
app/actions/plug-in-commands.c
View file @ 6ddbb705
......@@ -242,13 +242,13 @@ plug_in_init ()
{
shm_ID = shmget (IPC_PRIVATE, TILE_WIDTH * TILE_HEIGHT * 4, IPC_CREAT | 0777);
if (shm_ID == -1)
g_warning ("shmget failed...disabling shared memory tile transport\n");
g_message ("shmget failed...disabling shared memory tile transport\n");
else
{
shm_addr = (guchar*) shmat (shm_ID, 0, 0);
if (shm_addr == (guchar*) -1)
{
g_warning ("shmat failed...disabling shared memory tile transport\n");
g_message ("shmat failed...disabling shared memory tile transport\n");
shm_ID = -1;
}
......@@ -1179,18 +1179,18 @@ plug_in_handle_message (WireMessage *msg)
plug_in_handle_quit ();
break;
case GP_CONFIG:
g_warning ("received a config message (should not happen)\n");
g_message ("plug_in_handle_message(): received a config message (should not happen)\n");
plug_in_close (current_plug_in, TRUE);
break;
case GP_TILE_REQ:
plug_in_handle_tile_req (msg->data);
break;
case GP_TILE_ACK:
g_warning ("received a config message (should not happen)\n");
g_message ("plug_in_handle_message(): received a config message (should not happen)\n");
plug_in_close (current_plug_in, TRUE);
break;
case GP_TILE_DATA:
g_warning ("received a config message (should not happen)\n");
g_message ("plug_in_handle_message(): received a config message (should not happen)\n");
plug_in_close (current_plug_in, TRUE);
break;
case GP_PROC_RUN:
......@@ -1201,7 +1201,7 @@ plug_in_handle_message (WireMessage *msg)
plug_in_close (current_plug_in, FALSE);
break;
case GP_TEMP_PROC_RUN:
g_warning ("received a temp proc run message (should not happen)\n");
g_message ("plug_in_handle_message(): received a temp proc run message (should not happen)\n");
plug_in_close (current_plug_in, TRUE);
break;
case GP_TEMP_PROC_RETURN:
......@@ -1248,21 +1248,21 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!gp_tile_data_write (current_writefd, &tile_data))
{
g_warning ("plug_in_handle_tile_req: ERROR");
g_message ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
if (!wire_read_msg (current_readfd, &msg))
{
g_warning ("plug_in_handle_tile_req: ERROR");
g_message ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
if (msg.type != GP_TILE_DATA)
{
g_warning ("expected tile data and received: %d\n", msg.type);
g_message ("expected tile data and received: %d\n", msg.type);
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1276,7 +1276,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!tm)
{
g_warning ("plug-in requested invalid drawable (killing)\n");
g_message ("plug-in requested invalid drawable (killing)\n");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1284,7 +1284,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
tile = tile_manager_get (tm, tile_info->tile_num, 0);
if (!tile)
{
g_warning ("plug-in requested invalid tile (killing)\n");
g_message ("plug-in requested invalid tile (killing)\n");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1301,7 +1301,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
wire_destroy (&msg);
if (!gp_tile_ack_write (current_writefd))
{
g_warning ("plug_in_handle_tile_req: ERROR");
g_message ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1315,7 +1315,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!tm)
{
g_warning ("plug-in requested invalid drawable (killing)\n");
g_message ("plug-in requested invalid drawable (killing)\n");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1323,7 +1323,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
tile = tile_manager_get (tm, tile_req->tile_num, 0);
if (!tile)
{
g_warning ("plug-in requested invalid tile (killing)\n");
g_message ("plug-in requested invalid tile (killing)\n");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1345,7 +1345,7 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!gp_tile_data_write (current_writefd, &tile_data))
{
g_warning ("plug_in_handle_tile_req: ERROR");
g_message ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1354,14 +1354,14 @@ plug_in_handle_tile_req (GPTileReq *tile_req)
if (!wire_read_msg (current_readfd, &msg))
{
g_warning ("plug_in_handle_tile_req: ERROR");
g_message ("plug_in_handle_tile_req: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
if (msg.type != GP_TILE_ACK)
{
g_warning ("expected tile ack and received: %d\n", msg.type);
g_message ("expected tile ack and received: %d\n", msg.type);
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1385,7 +1385,7 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
if (!proc_rec)
{
/* THIS IS PROBABLY NOT CORRECT -josh */
g_warning ("PDB lookup failed on %s\n", proc_run->name);
g_message ("PDB lookup failed on %s\n", proc_run->name);
plug_in_args_destroy (args, proc_run->nparams, FALSE);
return;
}
......@@ -1409,7 +1409,7 @@ plug_in_handle_proc_run (GPProcRun *proc_run)
if (!gp_proc_return_write (current_writefd, &proc_return))
{
g_warning ("plug_in_handle_proc_run: ERROR");
g_message ("plug_in_handle_proc_run: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1453,7 +1453,7 @@ plug_in_handle_proc_return (GPProcReturn *proc_return)
plug_in_push (blocked->plug_in);
if (!gp_proc_return_write (current_writefd, proc_return))
{
g_warning ("plug_in_handle_proc_run: ERROR");
g_message ("plug_in_handle_proc_run: ERROR");
plug_in_close (current_plug_in, TRUE);
return;
}
......@@ -1492,7 +1492,7 @@ plug_in_handle_proc_install (GPProcInstall *proc_install)
if ((proc_install->nparams < 1) ||
(proc_install->params[0].type != PDB_INT32))
{
g_warning ("plug-in \"%s\" attempted to install procedure \"%s\" which "
g_message ("plug-in \"%s\" attempted to install procedure \"%s\" which "
"does not take the standard plug-in args",
current_plug_in->args[0], proc_install->name);
return;
......@@ -1505,7 +1505,7 @@ plug_in_handle_proc_install (GPProcInstall *proc_install)
(proc_install->params[1].type != PDB_IMAGE) ||
(proc_install->params[2].type != PDB_DRAWABLE))
{
g_warning ("plug-in \"%s\" attempted to install procedure \"%s\" which "
g_message ("plug-in \"%s\" attempted to install procedure \"%s\" which "
"does not take the standard plug-in args",
current_plug_in->args[0], proc_install->name);
return;
......@@ -1518,7 +1518,7 @@ plug_in_handle_proc_install (GPProcInstall *proc_install)
(proc_install->params[1].type != PDB_STRING) ||
(proc_install->params[2].type != PDB_STRING))
{
g_warning ("plug-in \"%s\" attempted to install procedure \"%s\" which "
g_message ("plug-in \"%s\" attempted to install procedure \"%s\" which "
"does not take the standard plug-in args",
current_plug_in->args[0], proc_install->name);
return;
......@@ -1533,7 +1533,7 @@ plug_in_handle_proc_install (GPProcInstall *proc_install)
(proc_install->params[3].type != PDB_STRING) ||
(proc_install->params[4].type != PDB_STRING))
{
g_warning ("plug-in \"%s\" attempted to install procedure \"%s\" which "
g_message ("plug-in \"%s\" attempted to install procedure \"%s\" which "
"does not take the standard plug-in args",
current_plug_in->args[0], proc_install->name);
return;
......@@ -1541,7 +1541,7 @@ plug_in_handle_proc_install (GPProcInstall *proc_install)
}
else
{
g_warning ("plug-in \"%s\" attempted to install procedure \"%s\" in "
g_message ("plug-in \"%s\" attempted to install procedure \"%s\" in "
"an invalid menu location. Use either \"<Toolbox>\", \"<Image>\", "
"\"<Load>\", or \"<Save>\".",
current_plug_in->args[0], proc_install->name);
......@@ -1561,7 +1561,7 @@ plug_in_handle_proc_install (GPProcInstall *proc_install)
proc_install->params[i].type == PDB_STRINGARRAY) &&
proc_install->params[i-1].type != PDB_INT32)
{
g_warning ("plug_in \"%s\" attempted to install procedure \"%s\" "
g_message ("plug_in \"%s\" attempted to install procedure \"%s\" "
"which fails to comply with the array parameter "
"passing standard. Argument %d is noncompliant.",
current_plug_in->args[0], proc_install->name, i);
......@@ -2142,7 +2142,7 @@ plug_in_callback (GtkWidget *widget,
}
else
{
g_warning ("Uh-oh, no active gdisplay for the plug-in!");
g_message ("Uh-oh, no active gdisplay for the plug-in!");
g_free (args);
return;
}
......@@ -2161,7 +2161,7 @@ plug_in_callback (GtkWidget *widget,
}
else
{
g_warning ("Uh-oh, no active gdisplay for the temporary procedure!");
g_message ("Uh-oh, no active gdisplay for the temporary procedure!");
g_free (args);
return;
}
......@@ -2474,7 +2474,7 @@ plug_in_params_to_args (GPParam *params,
colorarray[2] = params[i].data.d_color.blue;
break;
case PDB_REGION:
g_warning ("the \"region\" arg type is not currently supported");
g_message ("the \"region\" arg type is not currently supported");
break;
case PDB_DISPLAY:
args[i].value.pdb_int = params[i].data.d_display;
......@@ -2632,7 +2632,7 @@ plug_in_args_to_params (Argument *args,
}
break;
case PDB_REGION:
g_warning ("the \"region\" arg type is not currently supported");
g_message ("the \"region\" arg type is not currently supported");
break;
case PDB_DISPLAY:
params[i].data.d_display = args[i].value.pdb_int;
......@@ -2716,7 +2716,7 @@ plug_in_params_destroy (GPParam *params,
case PDB_COLOR:
break;
case PDB_REGION:
g_warning ("the \"region\" arg type is not currently supported");
g_message ("the \"region\" arg type is not currently supported");
break;
case PDB_DISPLAY:
case PDB_IMAGE:
......@@ -2790,7 +2790,7 @@ plug_in_args_destroy (Argument *args,
g_free (args[i].value.pdb_pointer);
break;
case PDB_REGION:
g_warning ("the \"region\" arg type is not currently supported");
g_message ("the \"region\" arg type is not currently supported");
break;
case PDB_DISPLAY:
case PDB_IMAGE:
......
app/app_procs.c
View file @ 6ddbb705
......@@ -516,6 +516,7 @@ app_init (void)
render_setup (transparency_type, transparency_size);
tools_options_dialog_new ();
tools_select (RECT_SELECT);
if (console_messages == FALSE)
g_set_message_handler (&message_box_func);
}
......@@ -539,6 +540,8 @@ app_exit_finish (void)
return;
is_app_exit_finish_done = TRUE;
g_set_message_handler (&message_console_func);
lc_dialog_free ();
gdisplays_delete ();
global_edit_free ();
......
app/appenv.h
View file @ 6ddbb705
......@@ -33,5 +33,7 @@ extern int no_splash;
extern int no_splash_image;
extern int no_data;
extern int be_verbose;
extern int use_debug_handler;
extern int console_messages;
#endif /* APPENV_H */
app/base/boundary.c
View file @ 6ddbb705
......@@ -467,7 +467,7 @@ sort_boundary (BoundSeg *segs,
}
if (x != startx || y != starty)
g_warning ("Unconnected boundary group!");
g_message ("sort_boundary(): Unconnected boundary group!");
/* Mark the end of a group */
*num_groups = *num_groups + 1;
......
app/base/color-balance.c
View file @ 6ddbb705
......@@ -621,7 +621,7 @@ static void
color_balance_preview (ColorBalanceDialog *cbd)
{
if (!cbd->image_map)
g_warning ("No image map");
g_message ("color_balance_preview(): No image map");
active_tool->preserve = TRUE;
image_map_apply (cbd->image_map, color_balance, (void *) cbd);
active_tool->preserve = FALSE;
......
app/base/curves.c
View file @ 6ddbb705
......@@ -817,7 +817,7 @@ static void
curves_preview (CurvesDialog *cd)
{
if (!cd->image_map)
g_warning ("No image map");
g_message ("curves_preview(): No image map");
active_tool->preserve = TRUE; /* Going to dirty the display... */
......
app/base/hue-saturation.c
View file @ 6ddbb705
......@@ -734,7 +734,7 @@ static void
hue_saturation_preview (HueSaturationDialog *hsd)
{
if (!hsd->image_map)
g_warning ("No image map");
g_message ("hue_saturation_preview(): No image map");
active_tool->preserve = TRUE;
image_map_apply (hsd->image_map, hue_saturation, (void *) hsd);
active_tool->preserve = FALSE;
......
app/base/threshold.c
View file @ 6ddbb705
......@@ -488,7 +488,7 @@ static void
threshold_preview (ThresholdDialog *td)
{
if (!td->image_map)
g_warning ("No image map");
g_message ("threshold_preview(): No image map");
image_map_apply (td->image_map, threshold, (void *) td);
}
......
app/base/tile-swap.c
View file @ 6ddbb705
......@@ -252,7 +252,7 @@ tile_swap_command (Tile *tile,
swap_file = g_hash_table_lookup (swap_files, &tile->swap_num);
if (!swap_file)
{
g_warning ("could not find swap file for tile");
g_message ("could not find swap file for tile");
return;
}
......@@ -287,7 +287,7 @@ tile_swap_open (SwapFile *swap_file)
swap_file->fd = open (swap_file->filename, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR);
if (swap_file->fd == -1)
{
g_warning ("unable to open swap file...BAD THINGS WILL HAPPEN SOON");
g_message ("unable to open swap file...BAD THINGS WILL HAPPEN SOON");
return;
}
......@@ -326,7 +326,7 @@ tile_swap_default (int fd,
tile_swap_default_delete (def_swap_file, fd, tile);
break;
case SWAP_COMPRESS:
g_warning ("tile_swap_default: SWAP_COMPRESS: UNFINISHED");
g_message ("tile_swap_default: SWAP_COMPRESS: UNFINISHED");
break;
}
......@@ -352,7 +352,7 @@ tile_swap_default_in (DefSwapFile *def_swap_file,
offset = lseek (fd, tile->swap_offset, SEEK_SET);
if (offset == -1)
{
g_warning ("unable to seek to tile location on disk: %d", err);
g_message ("unable to seek to tile location on disk: %d", err);
return;
}
}
......@@ -369,7 +369,7 @@ tile_swap_default_in (DefSwapFile *def_swap_file,
if (err <= 0)
{
g_warning ("unable to read tile data from disk: %d ( %d ) bytes read", err, nleft);
g_message ("unable to read tile data from disk: %d ( %d ) bytes read", err, nleft);
return;
}
......@@ -407,7 +407,7 @@ tile_swap_default_out (DefSwapFile *def_swap_file,
offset = lseek (fd, tile->swap_offset, SEEK_SET);
if (offset == -1)
{
g_warning ("unable to seek to tile location on disk: %d", errno);
g_message ("unable to seek to tile location on disk: %d", errno);
return;
}
}
......@@ -418,7 +418,7 @@ tile_swap_default_out (DefSwapFile *def_swap_file,
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);
g_message ("unable to write tile data to disk: %d ( %d ) bytes written", err, nleft);
return;
}
......
app/boundary.c
View file @ 6ddbb705
......@@ -467,7 +467,7 @@ sort_boundary (BoundSeg *segs,
}
if (x != startx || y != starty)
g_warning ("Unconnected boundary group!");
g_message ("sort_boundary(): Unconnected boundary group!");
/* Mark the end of a group */
*num_groups = *num_groups + 1;
......
app/brightness_contrast.c
View file @ 6ddbb705
......@@ -483,7 +483,7 @@ static void
brightness_contrast_preview (BrightnessContrastDialog *bcd)
{
if (!bcd->image_map)
g_warning ("No image map");
g_message ("brightness_contrast_preview(): No image map");
active_tool->preserve = TRUE;
image_map_apply (bcd->image_map, brightness_contrast, (void *) bcd);
active_tool->preserve = FALSE;
......
app/brush_select.c
View file @ 6ddbb705
......@@ -736,7 +736,7 @@ brush_select_events (GtkWidget *widget,
}
break;
case GDK_DELETE:
g_warning ("test");
/* g_warning ("test"); */
break;
default:
......
app/color_balance.c
View file @ 6ddbb705
......@@ -621,7 +621,7 @@ static void
color_balance_preview (ColorBalanceDialog *cbd)
{
if (!cbd->image_map)
g_warning ("No image map");
g_message ("color_balance_preview(): No image map");
active_tool->preserve = TRUE;
image_map_apply (cbd->image_map, color_balance, (void *) cbd);
active_tool->preserve = FALSE;
......
app/core/gimpimagemap.c
View file @ 6ddbb705
......@@ -278,7 +278,7 @@ image_map_abort (ImageMap image_map)
/* if the user has changed the image depth get out quickly */
if (destPR.bytes != srcPR.bytes)
{
g_warning ("image depth change, unable to restore original image");
g_message ("image depth change, unable to restore original image");
tile_manager_destroy (_image_map->undo_tiles);
g_free (_image_map);
return;
......
app/curves.c
View file @ 6ddbb705
......@@ -817,7 +817,7 @@ static void
curves_preview (CurvesDialog *cd)
{
if (!cd->image_map)
g_warning ("No image map");
g_message ("curves_preview(): No image map");
active_tool->preserve = TRUE; /* Going to dirty the display... */
......
app/dialogs/about-dialog.c
View file @ 6ddbb705
......@@ -283,7 +283,7 @@ about_dialog_load_logo (GtkWidget *window)
sprintf (buf, "%s/gimp_logo.ppm", DATADIR);
fp = fopen (buf, "r");
fp = fopen (buf, "rb");
if (!fp)
return 0;
......
app/dialogs/user-install-dialog.c
View file @ 6ddbb705
......@@ -48,7 +48,7 @@ install_verify (InstallCallback install_callback)
filename = gimp_directory ();
if ('\000' == filename[0])
{
g_warning ("No home directory--skipping GIMP user installation.");
g_message ("No home directory--skipping GIMP user installation.");
(* install_callback) ();
}
......
app/display/gimpdisplay-render.c
View file @ 6ddbb705
......@@ -276,14 +276,14 @@ render_image (GDisplay *gdisp,
image_type = gimage_projection_type (gdisp->gimage);
if ((image_type < 0) || (image_type > 5))
{
g_warning ("unknown gimage projection type: %d",
g_message ("unknown gimage projection type: %d",
gimage_projection_type (gdisp->gimage));
return;
}
if ((info.dest_bpp < 1) || (info.dest_bpp > 4))
{
g_warning ("unsupported destination bytes per pixel: %d", info.dest_bpp);
g_message ("unsupported destination bytes per pixel: %d", info.dest_bpp);
return;
}
......
app/display/gimpdisplayshell-render.c
View file @ 6ddbb705
......@@ -276,14 +276,14 @@ render_image (GDisplay *gdisp,
image_type = gimage_projection_type (gdisp->gimage);
if ((image_type < 0) || (image_type > 5))
{
g_warning ("unknown gimage projection type: %d",
g_message ("unknown gimage projection type: %d",
gimage_projection_type (gdisp->gimage));
return;
}
if ((info.dest_bpp < 1) || (info.dest_bpp > 4))
{
g_warning ("unsupported destination bytes per pixel: %d", info.dest_bpp);
g_message ("unsupported destination bytes per pixel: %d", info.dest_bpp);
return;
}
......
app/errors.c
View file @ 6ddbb705
......@@ -25,17 +25,17 @@
#include <unistd.h>
#include <gtk/gtk.h>
#include "appenv.h"
#include "app_procs.h"
#include "interface.h"
#include "errors.h"
extern char *prog_name;