dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for minor typo in error message. 

2006-11-24  Kevin Cozens  <kcozens@cvs.gnome.org>

	* app/pdb/gimpprocedure.c: Fix for minor typo in error message.

	* plug-ins/Lighting/lighting_main.c (check_drawables): Only validate
	ID's for drawables that will be used. Disable use of env map (and not
	bump map) if env drawable is of wrong type.

	* plug-ins/script-fu/ftx/ftx.c: Eliminated some compiler warnings.
This commit is contained in:
Kevin Cozens 2006-11-25 07:27:57 +00:00 committed by Kevin Cozens
parent 223a578b35
commit 3c7cca9faf
4 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2006-11-24 Kevin Cozens <kcozens@cvs.gnome.org>
* app/pdb/gimpprocedure.c: Fix for minor typo in error message.
* plug-ins/Lighting/lighting_main.c (check_drawables): Only validate
ID's for drawables that will be used. Disable use of env map (and not
bump map) if env drawable is of wrong type.
* plug-ins/script-fu/ftx/ftx.c: Eliminated some compiler warnings.
2006-11-25 Simon Budig <simon@gimp.org>
* libgimpwidgets/gimpresolutionentry.c

2
app/pdb/gimpprocedure.c
View File

@ -564,7 +564,7 @@ gimp_procedure_validate_args (GimpProcedure *procedure,
gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
_("Procedure '%s' has been called with an "
"invalid ID for argument '%s'. "
"Most likely a plug-in is trying"
"Most likely a plug-in is trying "
"to work on a layer that doesn't "
"exist any longer."),
gimp_object_get_name (GIMP_OBJECT (procedure)),

32
plug-ins/Lighting/lighting_main.c
View File

@ -122,22 +122,15 @@ set_default_settings (void)
static void
check_drawables (void)
{
if (mapvals.bumpmap_id != -1 &&
gimp_drawable_get_image (mapvals.bumpmap_id) == -1)
{
mapvals.bump_mapped = FALSE;
mapvals.bumpmap_id = -1;
}
if (mapvals.envmap_id != -1 &&
gimp_drawable_get_image (mapvals.envmap_id) == -1)
{
mapvals.env_mapped = FALSE;
mapvals.envmap_id = -1;
}
if (mapvals.bump_mapped)
{
if (mapvals.bumpmap_id != -1 &&
gimp_drawable_get_image (mapvals.bumpmap_id) == -1)
{
mapvals.bump_mapped = FALSE;
mapvals.bumpmap_id = -1;
}
if (gimp_drawable_is_indexed (mapvals.bumpmap_id) ||
(gimp_drawable_width (mapvals.drawable_id) !=
gimp_drawable_width (mapvals.bumpmap_id)) ||
@ -151,11 +144,18 @@ check_drawables (void)
if (mapvals.env_mapped)
{
if (mapvals.envmap_id != -1 &&
gimp_drawable_get_image (mapvals.envmap_id) == -1)
{
mapvals.env_mapped = FALSE;
mapvals.envmap_id = -1;
}
if (gimp_drawable_is_gray (mapvals.envmap_id) ||
gimp_drawable_has_alpha (mapvals.envmap_id))
{
mapvals.bump_mapped = FALSE;
mapvals.bumpmap_id = -1;
mapvals.env_mapped = FALSE;
mapvals.envmap_id = -1;
}
}
}

15
plug-ins/script-fu/ftx/ftx.c
View File

@ -40,6 +40,19 @@ file_type_constants[] = {
{ NULL, 0 }
};
pointer foreign_fileexists(scheme *sc, pointer args);
pointer foreign_filetype(scheme *sc, pointer args);
pointer foreign_filesize(scheme *sc, pointer args);
pointer foreign_filedelete(scheme *sc, pointer args);
pointer foreign_diropenstream(scheme *sc, pointer args);
pointer foreign_dirreadentry(scheme *sc, pointer args);
pointer foreign_dirrewind(scheme *sc, pointer args);
pointer foreign_dirclosestream(scheme *sc, pointer args);
pointer foreign_time(scheme *sc, pointer args);
pointer foreign_gettimeofday(scheme *sc, pointer args);
pointer foreign_usleep(scheme *sc, pointer args);
void init_ftx (scheme *sc);
pointer foreign_fileexists(scheme *sc, pointer args)
{
@ -238,7 +251,7 @@ pointer foreign_time(scheme *sc, pointer args)
if (args != sc->NIL)
return sc->F;
#if 1
#if 1
time(&now);
now_tm = localtime(&now);
#else