From fe0bf162c15933b20a0f99cb48d0663e7044a5d5 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 13 May 2002 23:30:23 +0000 Subject: [PATCH] removed FINITE() macro. 2002-05-13 Sven Neumann * libgimpmath/gimpmath.h: removed FINITE() macro. * tools/pdbgen/pdb/image.pdb * app/pdb/image_cmds.c: define FINITE() here, where it is used. * tools/pdbgen/pdb/lib.pl: add "config.h" to all generated libgimp .c files. * libgimp/gimp*_pdb.c: regenerated. * libgimp/gimpbrushmenu.c * libgimp/gimpchannel.c * libgimp/gimpdrawable.c * libgimp/gimpgradientmenu.c * libgimp/gimphelp.c * libgimp/gimpimage.c * libgimp/gimplayer.c * libgimp/gimppatternmenu.c * libgimp/gimppixelrgn.c * libgimp/gimpproceduraldb.c * libgimp/gimpselection.c * libgimp/gimptile.c * libgimp/gimpui.c * libgimpmath/gimpmatrix.c * libgimpmath/gimpvector.c * plug-ins/MapObject/arcball.c * plug-ins/fp/fp_gdk.c * plug-ins/fp/fp_misc.c * plug-ins/ifscompose/ifscompose_storage.c * plug-ins/ifscompose/ifscompose_utils.c * plug-ins/maze/handy.c * plug-ins/rcm/rcm_gdk.c * plug-ins/sel2path/edge.c * plug-ins/xjt/xjpeg.c * plug-ins/xjt/xpdb_calls.c: include "config.h". --- ChangeLog | 38 +++++++++++++++++++ app/pdb/image_cmds.c | 18 +++++++++ devel-docs/ChangeLog | 5 +++ .../libgimpmath/libgimpmath-sections.txt | 1 - devel-docs/libgimpmath/tmpl/gimpmath.sgml | 8 ---- libgimp/gimpbrushes_pdb.c | 2 + libgimp/gimpbrushmenu.c | 3 +- libgimp/gimpbrushselect_pdb.c | 2 + libgimp/gimpchannel.c | 2 + libgimp/gimpchannel_pdb.c | 2 + libgimp/gimpcolor_pdb.c | 2 + libgimp/gimpconvert_pdb.c | 2 + libgimp/gimpdisplay_pdb.c | 2 + libgimp/gimpdrawable.c | 2 +- libgimp/gimpdrawable_pdb.c | 2 + libgimp/gimpedit_pdb.c | 2 + libgimp/gimpfileops_pdb.c | 2 + libgimp/gimpfloatingsel_pdb.c | 2 + libgimp/gimpgimprc_pdb.c | 2 + libgimp/gimpgradientmenu.c | 2 + libgimp/gimpgradients_pdb.c | 2 + libgimp/gimpgradientselect_pdb.c | 2 + libgimp/gimpguides_pdb.c | 2 + libgimp/gimphelp.c | 2 + libgimp/gimphelp_pdb.c | 2 + libgimp/gimpimage.c | 2 + libgimp/gimpimage_pdb.c | 2 + libgimp/gimplayer.c | 3 ++ libgimp/gimplayer_pdb.c | 2 + libgimp/gimpmessage_pdb.c | 2 + libgimp/gimpmisc_pdb.c | 2 + libgimp/gimpmisctools_pdb.c | 2 + libgimp/gimppainttools_pdb.c | 2 + libgimp/gimppalette_pdb.c | 2 + libgimp/gimppalettes_pdb.c | 2 + libgimp/gimppaletteselect_pdb.c | 2 + libgimp/gimpparasite_pdb.c | 2 + libgimp/gimppaths_pdb.c | 2 + libgimp/gimppatternmenu.c | 4 +- libgimp/gimppatterns_pdb.c | 2 + libgimp/gimppatternselect_pdb.c | 2 + libgimp/gimppixelrgn.c | 2 + libgimp/gimpplugin_pdb.c | 2 + libgimp/gimpproceduraldb.c | 2 + libgimp/gimpproceduraldb_pdb.c | 2 + libgimp/gimpselection.c | 2 + libgimp/gimpselection_pdb.c | 2 + libgimp/gimpselectiontools_pdb.c | 2 + libgimp/gimptexttool_pdb.c | 2 + libgimp/gimptile.c | 2 + libgimp/gimptransformtools_pdb.c | 2 + libgimp/gimpui.c | 2 + libgimp/gimpundo_pdb.c | 2 + libgimp/gimpunit_pdb.c | 2 + libgimpmath/gimpmath.h | 21 +--------- libgimpmath/gimpmatrix.c | 2 + libgimpmath/gimpvector.c | 2 + plug-ins/MapObject/arcball.c | 2 +- plug-ins/fp/fp_gdk.c | 3 ++ plug-ins/fp/fp_misc.c | 3 ++ plug-ins/ifscompose/ifscompose_storage.c | 2 + plug-ins/ifscompose/ifscompose_utils.c | 2 + plug-ins/maze/handy.c | 2 + plug-ins/rcm/rcm_gdk.c | 2 + plug-ins/sel2path/edge.c | 2 + plug-ins/xjt/xjpeg.c | 4 ++ plug-ins/xjt/xpdb_calls.c | 6 ++- tools/pdbgen/lib.pl | 1 + tools/pdbgen/pdb/image.pdb | 18 +++++++++ 69 files changed, 210 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9aacd2685d..7e545df5fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +2002-05-13 Sven Neumann + + * libgimpmath/gimpmath.h: removed FINITE() macro. + + * tools/pdbgen/pdb/image.pdb + * app/pdb/image_cmds.c: define FINITE() here, where it is used. + + * tools/pdbgen/pdb/lib.pl: add "config.h" to all generated libgimp + .c files. + + * libgimp/gimp*_pdb.c: regenerated. + + * libgimp/gimpbrushmenu.c + * libgimp/gimpchannel.c + * libgimp/gimpdrawable.c + * libgimp/gimpgradientmenu.c + * libgimp/gimphelp.c + * libgimp/gimpimage.c + * libgimp/gimplayer.c + * libgimp/gimppatternmenu.c + * libgimp/gimppixelrgn.c + * libgimp/gimpproceduraldb.c + * libgimp/gimpselection.c + * libgimp/gimptile.c + * libgimp/gimpui.c + * libgimpmath/gimpmatrix.c + * libgimpmath/gimpvector.c + * plug-ins/MapObject/arcball.c + * plug-ins/fp/fp_gdk.c + * plug-ins/fp/fp_misc.c + * plug-ins/ifscompose/ifscompose_storage.c + * plug-ins/ifscompose/ifscompose_utils.c + * plug-ins/maze/handy.c + * plug-ins/rcm/rcm_gdk.c + * plug-ins/sel2path/edge.c + * plug-ins/xjt/xjpeg.c + * plug-ins/xjt/xpdb_calls.c: include "config.h". + 2002-05-13 Sven Neumann * app/config/gimpconfig.c (gimp_config_serialize): serialize to a diff --git a/app/pdb/image_cmds.c b/app/pdb/image_cmds.c index 670455fbcb..9188e086b4 100644 --- a/app/pdb/image_cmds.c +++ b/app/pdb/image_cmds.c @@ -3752,6 +3752,24 @@ image_set_resolution_invoker (Gimp *gimp, if (success) { + #ifdef HAVE_FINITE + #define FINITE(x) finite(x) + #else + #ifdef HAVE_ISFINITE + #define FINITE(x) isfinite(x) + #else + #ifdef G_OS_WIN32 + #define FINITE(x) _finite(x) + #else + #ifdef __EMX__ + #define FINITE(x) isfinite(x) + #else + #error "no FINITE() implementation available?!" + #endif /* __EMX__ */ + #endif /* G_OS_WIN32 */ + #endif /* HAVE_ISFINITE */ + #endif /* HAVE_FINITE */ + if (!FINITE (xresolution) || xresolution < GIMP_MIN_RESOLUTION || xresolution > GIMP_MAX_RESOLUTION || !FINITE (yresolution) || diff --git a/devel-docs/ChangeLog b/devel-docs/ChangeLog index 89e5eed043..7781b55e32 100644 --- a/devel-docs/ChangeLog +++ b/devel-docs/ChangeLog @@ -1,3 +1,8 @@ +2002-05-14 Sven Neumann + + * libgimpmath/libgimpmath-sections.txt + * libgimpmath/tmpl/gimpmath.sgml: removed FINITE. + 2002-05-13 Sven Neumann * libgimpwidgets/libgimpwidgets-sections.txt diff --git a/devel-docs/libgimpmath/libgimpmath-sections.txt b/devel-docs/libgimpmath/libgimpmath-sections.txt index 8abec12014..8bc96c16be 100644 --- a/devel-docs/libgimpmath/libgimpmath-sections.txt +++ b/devel-docs/libgimpmath/libgimpmath-sections.txt @@ -8,7 +8,6 @@ MAX255 CLAMP0255 gimp_deg_to_rad gimp_rad_to_deg -FINITE
diff --git a/devel-docs/libgimpmath/tmpl/gimpmath.sgml b/devel-docs/libgimpmath/tmpl/gimpmath.sgml index 4ee282d58f..3b63e8a8be 100644 --- a/devel-docs/libgimpmath/tmpl/gimpmath.sgml +++ b/devel-docs/libgimpmath/tmpl/gimpmath.sgml @@ -77,11 +77,3 @@ Mathematical definitions and macros. @angle: - - - - - -@x: - - diff --git a/libgimp/gimpbrushes_pdb.c b/libgimp/gimpbrushes_pdb.c index 5bb5cc5543..9b81b4beb4 100644 --- a/libgimp/gimpbrushes_pdb.c +++ b/libgimp/gimpbrushes_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include #include "gimp.h" diff --git a/libgimp/gimpbrushmenu.c b/libgimp/gimpbrushmenu.c index 33fbdffc59..3a7c74d74c 100644 --- a/libgimp/gimpbrushmenu.c +++ b/libgimp/gimpbrushmenu.c @@ -20,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include #ifdef __GNUC__ @@ -27,7 +29,6 @@ #endif #undef GTK_DISABLE_DEPRECATED - #include "gimp.h" #include "gimpui.h" diff --git a/libgimp/gimpbrushselect_pdb.c b/libgimp/gimpbrushselect_pdb.c index 4959ddf4d0..8d03ba8f32 100644 --- a/libgimp/gimpbrushselect_pdb.c +++ b/libgimp/gimpbrushselect_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpchannel.c b/libgimp/gimpchannel.c index 12c56e06eb..80e0f8f3f3 100644 --- a/libgimp/gimpchannel.c +++ b/libgimp/gimpchannel.c @@ -19,6 +19,8 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include "gimp.h" diff --git a/libgimp/gimpchannel_pdb.c b/libgimp/gimpchannel_pdb.c index a5b8cca247..dff4fa5a46 100644 --- a/libgimp/gimpchannel_pdb.c +++ b/libgimp/gimpchannel_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpcolor_pdb.c b/libgimp/gimpcolor_pdb.c index fe3aeed191..761bbd5771 100644 --- a/libgimp/gimpcolor_pdb.c +++ b/libgimp/gimpcolor_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpconvert_pdb.c b/libgimp/gimpconvert_pdb.c index 7f871a1e8c..6cdeceb5f7 100644 --- a/libgimp/gimpconvert_pdb.c +++ b/libgimp/gimpconvert_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpdisplay_pdb.c b/libgimp/gimpdisplay_pdb.c index 7bde12de74..b9358c86f9 100644 --- a/libgimp/gimpdisplay_pdb.c +++ b/libgimp/gimpdisplay_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpdrawable.c b/libgimp/gimpdrawable.c index 9e694c4048..561198c277 100644 --- a/libgimp/gimpdrawable.c +++ b/libgimp/gimpdrawable.c @@ -19,7 +19,7 @@ * Boston, MA 02111-1307, USA. */ -#include +#include "config.h" #include "gimp.h" diff --git a/libgimp/gimpdrawable_pdb.c b/libgimp/gimpdrawable_pdb.c index c4ac752903..8f5d9e038a 100644 --- a/libgimp/gimpdrawable_pdb.c +++ b/libgimp/gimpdrawable_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include #include "gimp.h" diff --git a/libgimp/gimpedit_pdb.c b/libgimp/gimpedit_pdb.c index 427cac3380..ef2c6aa327 100644 --- a/libgimp/gimpedit_pdb.c +++ b/libgimp/gimpedit_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpfileops_pdb.c b/libgimp/gimpfileops_pdb.c index dd1836e92c..db62616427 100644 --- a/libgimp/gimpfileops_pdb.c +++ b/libgimp/gimpfileops_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpfloatingsel_pdb.c b/libgimp/gimpfloatingsel_pdb.c index 52775c85c6..00337c7031 100644 --- a/libgimp/gimpfloatingsel_pdb.c +++ b/libgimp/gimpfloatingsel_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpgimprc_pdb.c b/libgimp/gimpgimprc_pdb.c index 01b33e4a93..b2c16dfd17 100644 --- a/libgimp/gimpgimprc_pdb.c +++ b/libgimp/gimpgimprc_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpgradientmenu.c b/libgimp/gimpgradientmenu.c index b49c39c8fb..de90a98de0 100644 --- a/libgimp/gimpgradientmenu.c +++ b/libgimp/gimpgradientmenu.c @@ -20,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include #ifdef __GNUC__ diff --git a/libgimp/gimpgradients_pdb.c b/libgimp/gimpgradients_pdb.c index b1881806e1..e41dd0f850 100644 --- a/libgimp/gimpgradients_pdb.c +++ b/libgimp/gimpgradients_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include #include "gimp.h" diff --git a/libgimp/gimpgradientselect_pdb.c b/libgimp/gimpgradientselect_pdb.c index bb2e53b41e..0bc400a0b6 100644 --- a/libgimp/gimpgradientselect_pdb.c +++ b/libgimp/gimpgradientselect_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpguides_pdb.c b/libgimp/gimpguides_pdb.c index 0fcf11f090..9e29911fc3 100644 --- a/libgimp/gimpguides_pdb.c +++ b/libgimp/gimpguides_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimphelp.c b/libgimp/gimphelp.c index ccdf26e53d..23d8ffe755 100644 --- a/libgimp/gimphelp.c +++ b/libgimp/gimphelp.c @@ -20,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include "gimp.h" void diff --git a/libgimp/gimphelp_pdb.c b/libgimp/gimphelp_pdb.c index 29a6697606..6482f7e440 100644 --- a/libgimp/gimphelp_pdb.c +++ b/libgimp/gimphelp_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpimage.c b/libgimp/gimpimage.c index 08c9db4bc3..8973ea24d0 100644 --- a/libgimp/gimpimage.c +++ b/libgimp/gimpimage.c @@ -19,6 +19,8 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include "gimp.h" diff --git a/libgimp/gimpimage_pdb.c b/libgimp/gimpimage_pdb.c index 538808401a..18fe331d9d 100644 --- a/libgimp/gimpimage_pdb.c +++ b/libgimp/gimpimage_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include #include "gimp.h" diff --git a/libgimp/gimplayer.c b/libgimp/gimplayer.c index 3d2879ec91..7723880006 100644 --- a/libgimp/gimplayer.c +++ b/libgimp/gimplayer.c @@ -19,8 +19,11 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include "gimp.h" + /** * gimp_layer_new: * @image_ID: The image to which to add the layer. diff --git a/libgimp/gimplayer_pdb.c b/libgimp/gimplayer_pdb.c index b646171464..a6b98b1be0 100644 --- a/libgimp/gimplayer_pdb.c +++ b/libgimp/gimplayer_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpmessage_pdb.c b/libgimp/gimpmessage_pdb.c index be4184ddc0..b16d11a739 100644 --- a/libgimp/gimpmessage_pdb.c +++ b/libgimp/gimpmessage_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpmisc_pdb.c b/libgimp/gimpmisc_pdb.c index 7caf6f91eb..433785704e 100644 --- a/libgimp/gimpmisc_pdb.c +++ b/libgimp/gimpmisc_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpmisctools_pdb.c b/libgimp/gimpmisctools_pdb.c index 638ef2a6b5..ddcbe2fc91 100644 --- a/libgimp/gimpmisctools_pdb.c +++ b/libgimp/gimpmisctools_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimppainttools_pdb.c b/libgimp/gimppainttools_pdb.c index 99f8e8b7e3..a2664e560c 100644 --- a/libgimp/gimppainttools_pdb.c +++ b/libgimp/gimppainttools_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimppalette_pdb.c b/libgimp/gimppalette_pdb.c index b24987476e..a45cb20112 100644 --- a/libgimp/gimppalette_pdb.c +++ b/libgimp/gimppalette_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimppalettes_pdb.c b/libgimp/gimppalettes_pdb.c index 878af249b2..1ec7f05455 100644 --- a/libgimp/gimppalettes_pdb.c +++ b/libgimp/gimppalettes_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimppaletteselect_pdb.c b/libgimp/gimppaletteselect_pdb.c index 0c9fbae05a..bc570bf3ca 100644 --- a/libgimp/gimppaletteselect_pdb.c +++ b/libgimp/gimppaletteselect_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpparasite_pdb.c b/libgimp/gimpparasite_pdb.c index ee4df78fa5..6efb12e219 100644 --- a/libgimp/gimpparasite_pdb.c +++ b/libgimp/gimpparasite_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimppaths_pdb.c b/libgimp/gimppaths_pdb.c index fd23c49a33..2a528c3779 100644 --- a/libgimp/gimppaths_pdb.c +++ b/libgimp/gimppaths_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include #include "gimp.h" diff --git a/libgimp/gimppatternmenu.c b/libgimp/gimppatternmenu.c index d320846c39..bea7eae97c 100644 --- a/libgimp/gimppatternmenu.c +++ b/libgimp/gimppatternmenu.c @@ -20,7 +20,9 @@ * Boston, MA 02111-1307, USA. */ -#include "string.h" +#include "config.h" + +#include #ifdef __GNUC__ #warning GTK_DISABLE_DEPRECATED diff --git a/libgimp/gimppatterns_pdb.c b/libgimp/gimppatterns_pdb.c index 41fb8c1657..2a7bcf15d6 100644 --- a/libgimp/gimppatterns_pdb.c +++ b/libgimp/gimppatterns_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include #include "gimp.h" diff --git a/libgimp/gimppatternselect_pdb.c b/libgimp/gimppatternselect_pdb.c index e299e07baa..1bf9525f22 100644 --- a/libgimp/gimppatternselect_pdb.c +++ b/libgimp/gimppatternselect_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimppixelrgn.c b/libgimp/gimppixelrgn.c index 4772aa3433..7c4374113c 100644 --- a/libgimp/gimppixelrgn.c +++ b/libgimp/gimppixelrgn.c @@ -19,6 +19,8 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + /* Experimental: comment-out the following #define if a memcpy() call is slower than compiler-optimized memory copies for transfers of approx. 64-256 bytes. diff --git a/libgimp/gimpplugin_pdb.c b/libgimp/gimpplugin_pdb.c index a9bcae63a0..ece18a9dd8 100644 --- a/libgimp/gimpplugin_pdb.c +++ b/libgimp/gimpplugin_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpproceduraldb.c b/libgimp/gimpproceduraldb.c index fa3af86bd7..779f9aa020 100644 --- a/libgimp/gimpproceduraldb.c +++ b/libgimp/gimpproceduraldb.c @@ -19,6 +19,8 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include /* memcmp */ #include "gimp.h" diff --git a/libgimp/gimpproceduraldb_pdb.c b/libgimp/gimpproceduraldb_pdb.c index e0d1573618..1ddf006ae8 100644 --- a/libgimp/gimpproceduraldb_pdb.c +++ b/libgimp/gimpproceduraldb_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include #include "gimp.h" diff --git a/libgimp/gimpselection.c b/libgimp/gimpselection.c index a9b407d484..259ae484e0 100644 --- a/libgimp/gimpselection.c +++ b/libgimp/gimpselection.c @@ -19,6 +19,8 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpselection_pdb.c b/libgimp/gimpselection_pdb.c index 26bddde252..a46a56ccb6 100644 --- a/libgimp/gimpselection_pdb.c +++ b/libgimp/gimpselection_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpselectiontools_pdb.c b/libgimp/gimpselectiontools_pdb.c index e1a418711d..e9d68a9ce1 100644 --- a/libgimp/gimpselectiontools_pdb.c +++ b/libgimp/gimpselectiontools_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimptexttool_pdb.c b/libgimp/gimptexttool_pdb.c index 18646098fc..2918822e81 100644 --- a/libgimp/gimptexttool_pdb.c +++ b/libgimp/gimptexttool_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimptile.c b/libgimp/gimptile.c index 42f49d97f5..cc0af9feda 100644 --- a/libgimp/gimptile.c +++ b/libgimp/gimptile.c @@ -19,6 +19,8 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include #include diff --git a/libgimp/gimptransformtools_pdb.c b/libgimp/gimptransformtools_pdb.c index 1a91feb8a6..5a2fa8d63e 100644 --- a/libgimp/gimptransformtools_pdb.c +++ b/libgimp/gimptransformtools_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpui.c b/libgimp/gimpui.c index ae4948933d..8165ae0046 100644 --- a/libgimp/gimpui.c +++ b/libgimp/gimpui.c @@ -17,6 +17,8 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include "gimp.h" #include "gimpui.h" diff --git a/libgimp/gimpundo_pdb.c b/libgimp/gimpundo_pdb.c index b1d4043714..3115657c53 100644 --- a/libgimp/gimpundo_pdb.c +++ b/libgimp/gimpundo_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimp/gimpunit_pdb.c b/libgimp/gimpunit_pdb.c index 2a1a38c5be..1cededcdc0 100644 --- a/libgimp/gimpunit_pdb.c +++ b/libgimp/gimpunit_pdb.c @@ -21,6 +21,8 @@ /* NOTE: This file is autogenerated by pdbgen.pl */ +#include "config.h" + #include "gimp.h" /** diff --git a/libgimpmath/gimpmath.h b/libgimpmath/gimpmath.h index 40ff223e51..4faedab6a2 100644 --- a/libgimpmath/gimpmath.h +++ b/libgimpmath/gimpmath.h @@ -64,32 +64,15 @@ G_BEGIN_DECLS /* Square */ #define SQR(x) ((x) * (x)) -/* limit a (0->511) int to 255 */ +/* Limit a (0->511) int to 255 */ #define MAX255(a) ((a) | (((a) & 256) - (((a) & 256) >> 8))) -/* clamp a >>int32<<-range int between 0 and 255 inclusive */ -/* broken! -> #define CLAMP0255(a) ((a & 0xFFFFFF00)? (~(a>>31)) : a) */ +/* Clamp a >>int32<<-range int between 0 and 255 inclusive */ #define CLAMP0255(a) CLAMP(a,0,255) #define gimp_deg_to_rad(angle) ((angle) * (2.0 * G_PI) / 360.0) #define gimp_rad_to_deg(angle) ((angle) * 360.0 / (2.0 * G_PI)) -#ifdef HAVE_FINITE -#define FINITE(x) finite(x) -#else -#ifdef HAVE_ISFINITE -#define FINITE(x) isfinite(x) -#else -#ifdef G_OS_WIN32 -#define FINITE(x) _finite(x) -#else -#ifdef __EMX__ -#define FINITE(x) isfinite(x) -#endif /* __EMX__ */ -#endif /* G_OS_WIN32 */ -#endif /* HAVE_ISFINITE */ -#endif /* HAVE_FINITE */ - G_END_DECLS diff --git a/libgimpmath/gimpmatrix.c b/libgimpmath/gimpmatrix.c index 0e399c00cd..427d38aaf6 100644 --- a/libgimpmath/gimpmatrix.c +++ b/libgimpmath/gimpmatrix.c @@ -20,6 +20,8 @@ * Boston, MA 02111-1307, USA. */ +#include "config.h" + #include /* memcmp */ #include diff --git a/libgimpmath/gimpvector.c b/libgimpmath/gimpvector.c index 2f60797c43..b15ae18c62 100644 --- a/libgimpmath/gimpvector.c +++ b/libgimpmath/gimpvector.c @@ -27,6 +27,8 @@ /* A little collection of useful vector stuff */ /**********************************************/ +#include "config.h" + #include #include "gimpmath.h" diff --git a/plug-ins/MapObject/arcball.c b/plug-ins/MapObject/arcball.c index efa95b9533..3181a2f637 100644 --- a/plug-ins/MapObject/arcball.c +++ b/plug-ins/MapObject/arcball.c @@ -3,7 +3,7 @@ /* Modified by Tom Bech, 1996 */ /************************************/ -#include +#include "config.h" #include diff --git a/plug-ins/fp/fp_gdk.c b/plug-ins/fp/fp_gdk.c index 2594ff2b23..1b3b18497b 100644 --- a/plug-ins/fp/fp_gdk.c +++ b/plug-ins/fp/fp_gdk.c @@ -1,3 +1,6 @@ + +#include "config.h" + #include #include diff --git a/plug-ins/fp/fp_misc.c b/plug-ins/fp/fp_misc.c index 0dfcf3e718..10d00eb425 100644 --- a/plug-ins/fp/fp_misc.c +++ b/plug-ins/fp/fp_misc.c @@ -1,3 +1,6 @@ + +#include "config.h" + #include #include diff --git a/plug-ins/ifscompose/ifscompose_storage.c b/plug-ins/ifscompose/ifscompose_storage.c index f1e81eb9d3..0388c4366f 100644 --- a/plug-ins/ifscompose/ifscompose_storage.c +++ b/plug-ins/ifscompose/ifscompose_storage.c @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" + #include /* strlen */ #include diff --git a/plug-ins/ifscompose/ifscompose_utils.c b/plug-ins/ifscompose/ifscompose_utils.c index ec06ca591f..f806ad6de0 100644 --- a/plug-ins/ifscompose/ifscompose_utils.c +++ b/plug-ins/ifscompose/ifscompose_utils.c @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" + #include #include #include diff --git a/plug-ins/maze/handy.c b/plug-ins/maze/handy.c index 615c17f13c..78b6eb859c 100644 --- a/plug-ins/maze/handy.c +++ b/plug-ins/maze/handy.c @@ -23,6 +23,8 @@ * */ +#include "config.h" + #include #include "libgimp/gimp.h" diff --git a/plug-ins/rcm/rcm_gdk.c b/plug-ins/rcm/rcm_gdk.c index fb9970cb3f..1dc50f8dd8 100644 --- a/plug-ins/rcm/rcm_gdk.c +++ b/plug-ins/rcm/rcm_gdk.c @@ -36,6 +36,8 @@ * *-----------------------------------------------------------------------------------*/ +#include "config.h" + #include #include #include diff --git a/plug-ins/sel2path/edge.c b/plug-ins/sel2path/edge.c index 2b8882b57c..3ecaf88b23 100644 --- a/plug-ins/sel2path/edge.c +++ b/plug-ins/sel2path/edge.c @@ -16,6 +16,8 @@ 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. */ +#include "config.h" + #include #include "types.h" diff --git a/plug-ins/xjt/xjpeg.c b/plug-ins/xjt/xjpeg.c index a978a96c06..62c65c358e 100644 --- a/plug-ins/xjt/xjpeg.c +++ b/plug-ins/xjt/xjpeg.c @@ -29,15 +29,19 @@ * version 1.00.00; 1998/10/26 hof: 1.st (pre) release */ +#include "config.h" + #include #include #include #include + /* Include for External Libraries */ #include /* GIMP includes */ #include "libgimp/gimp.h" + #include "xjpeg.h" extern int xjt_debug; diff --git a/plug-ins/xjt/xpdb_calls.c b/plug-ins/xjt/xpdb_calls.c index 1c325ffb7b..9665b456bc 100644 --- a/plug-ins/xjt/xpdb_calls.c +++ b/plug-ins/xjt/xpdb_calls.c @@ -32,15 +32,17 @@ * version 1.01.00; 1998/11/22 hof: PDB-calls to load/save guides under GIMP 1.1 * version 1.00.00; 1998/10/31 hof: 1.st (pre) release */ + +#include "config.h" + #include #include #include /* GIMP includes */ #include "libgimp/gimp.h" -#include "xjpeg.h" -/* #include "cursorutil.h" */ +#include "xjpeg.h" /* XJT includes */ #include "xpdb_calls.h" diff --git a/tools/pdbgen/lib.pl b/tools/pdbgen/lib.pl index 6cac0c8ae7..5817fa0e1a 100644 --- a/tools/pdbgen/lib.pl +++ b/tools/pdbgen/lib.pl @@ -596,6 +596,7 @@ HEADER print CFILE $lgpl_top; print CFILE " * $cname\n"; print CFILE $lgpl_bottom; + print CFILE qq/#include "config.h"\n\n/; print CFILE $out->{headers}, "\n" if exists $out->{headers}; print CFILE qq/#include "gimp.h"\n/; print CFILE qq/#include "gimpprivate.h"\n/ if $privatevars; diff --git a/tools/pdbgen/pdb/image.pdb b/tools/pdbgen/pdb/image.pdb index 768c69583b..dcc05968e5 100644 --- a/tools/pdbgen/pdb/image.pdb +++ b/tools/pdbgen/pdb/image.pdb @@ -1289,6 +1289,24 @@ HELP $invoke{code} = <<'CODE'; { +#ifdef HAVE_FINITE +#define FINITE(x) finite(x) +#else +#ifdef HAVE_ISFINITE +#define FINITE(x) isfinite(x) +#else +#ifdef G_OS_WIN32 +#define FINITE(x) _finite(x) +#else +#ifdef __EMX__ +#define FINITE(x) isfinite(x) +#else +#error "no FINITE() implementation available?!" +#endif /* __EMX__ */ +#endif /* G_OS_WIN32 */ +#endif /* HAVE_ISFINITE */ +#endif /* HAVE_FINITE */ + if (!FINITE (xresolution) || xresolution < GIMP_MIN_RESOLUTION || xresolution > GIMP_MAX_RESOLUTION || !FINITE (yresolution) ||