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

Remove all checks for finite() and isfinite() 

and simply use isfinite() everywhere, it's part of C99.
This commit is contained in:
Michael Natterer 2020-01-05 16:36:18 +01:00
parent 5adde64753
commit 4dfcffe4f7
7 changed files with 6 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/core/gimp-transform-resize.c
View File

@ -31,16 +31,6 @@
#include "gimp-utils.h"
#if defined (HAVE_ISFINITE)
#define FINITE(x) isfinite(x)
#elif defined (HAVE_FINITE)
#define FINITE(x) finite(x)
#elif defined (G_OS_WIN32)
#define FINITE(x) _finite(x)
#else
#error "no FINITE() implementation available?!"
#endif
#define EPSILON 0.00000001
@ -160,7 +150,7 @@ gimp_transform_resize_boundary (const GimpMatrix3 *inv,
/* check if the transformation matrix is valid at all */
for (i = 0; i < n_points && valid; i++)
valid = (FINITE (points[i].x) && FINITE (points[i].y));
valid = (isfinite (points[i].x) && isfinite (points[i].y));
if (! valid)
{

13
app/core/gimpcurve-map.c
View File

@ -30,17 +30,6 @@
#include "gimpcurve-map.h"
#if defined (HAVE_ISFINITE)
#define FINITE(x) isfinite(x)
#elif defined (HAVE_FINITE)
#define FINITE(x) finite(x)
#elif defined (G_OS_WIN32)
#define FINITE(x) _finite(x)
#else
#error "no FINITE() implementation available?!"
#endif
enum
{
CURVE_NONE = 0,
@ -216,7 +205,7 @@ gimp_curve_map_value_inline (GimpCurve *curve,
{
if (curve->identity)
{
if (FINITE (value))
if (isfinite (value))
return CLAMP (value, 0.0, 1.0);
return 0.0;

11
app/core/gimpdrawable-transform.c
View File

@ -51,17 +51,6 @@
#include "gimp-intl.h"
#if defined (HAVE_FINITE)
#define FINITE(x) finite(x)
#elif defined (HAVE_ISFINITE)
#define FINITE(x) isfinite(x)
#elif defined (G_OS_WIN32)
#define FINITE(x) _finite(x)
#else
#error "no FINITE() implementation available?!"
#endif
/* public functions */
GeglBuffer *

14
app/pdb/image-cmds.c
View File

@ -69,16 +69,6 @@
#include "gimp-intl.h"
#if defined (HAVE_ISFINITE)
#define FINITE(x) isfinite(x)
#elif defined (HAVE_FINITE)
#define FINITE(x) finite(x)
#elif defined (G_OS_WIN32)
#define FINITE(x) _finite(x)
#else
#error "no FINITE() implementation available?!"
#endif
static GimpValueArray *
image_id_is_valid_invoker (GimpProcedure *procedure,
Gimp *gimp,
@ -2310,9 +2300,9 @@ image_set_resolution_invoker (GimpProcedure *procedure,
if (success)
{
if (! FINITE (xresolution) ||
if (! isfinite (xresolution) ||
xresolution < GIMP_MIN_RESOLUTION || xresolution > GIMP_MAX_RESOLUTION ||
! FINITE (yresolution) ||
! isfinite (yresolution) ||
yresolution < GIMP_MIN_RESOLUTION || yresolution > GIMP_MAX_RESOLUTION)
{
g_set_error_literal (error, GIMP_PDB_ERROR,

29
configure.ac
View File

@ -1021,35 +1021,6 @@ AC_RUN_IFELSE(
[AC_MSG_RESULT])],
[AC_MSG_RESULT()])
# Check for finite
AC_CHECK_FUNCS(finite, , [
AC_MSG_CHECKING(for finite in <math.h>)
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[#include <math.h>]],
[[double f = 0.0; finite (f)]])],
[AC_DEFINE(HAVE_FINITE, 1)
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)])
]
)
# Check for isfinite
AC_CHECK_FUNCS(isfinite, , [
AC_MSG_CHECKING(for isfinite in <math.h>)
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[[#include <math.h>]],
[[double f = 0.0; isfinite (f)]])],
[AC_DEFINE(HAVE_ISFINITE, 1)
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)])
]
)
AC_SUBST(HAVE_FINITE)
AC_SUBST(HAVE_ISFINITE)
LIBS=$gimp_save_LIBS

2
meson.build
View File

@ -1223,12 +1223,10 @@ foreach fn : [
{ 'm': 'HAVE_ALLOCA', 'v': 'alloca', },
{ 'm': 'HAVE_DCGETTEXT', 'v': 'dcgettext', },
{ 'm': 'HAVE_DIFFTIME', 'v': 'difftime', },
{ 'm': 'HAVE_FINITE', 'v': 'finite', },
{ 'm': 'HAVE_FSYNC', 'v': 'fsync', },
{ 'm': 'HAVE_GETADDRINFO', 'v': 'getaddrinfo', },
{ 'm': 'HAVE_GETNAMEINFO', 'v': 'getnameinfo', },
{ 'm': 'HAVE_GETTEXT', 'v': 'gettext', },
{ 'm': 'HAVE_ISFINITE', 'v': 'isfinite', },
{ 'm': 'HAVE_MMAP', 'v': 'mmap', },
{ 'm': 'HAVE_RINT', 'v': 'rint', },
{ 'm': 'HAVE_THR_SELF', 'v': 'thr_self', },

16
pdb/groups/image.pdb
View File

@ -2372,9 +2372,9 @@ HELP
%invoke = (
code => <<'CODE'
{
if (! FINITE (xresolution) ||
if (! isfinite (xresolution) ||
xresolution < GIMP_MIN_RESOLUTION || xresolution > GIMP_MAX_RESOLUTION ||
! FINITE (yresolution) ||
! isfinite (yresolution) ||
yresolution < GIMP_MIN_RESOLUTION || yresolution > GIMP_MAX_RESOLUTION)
{
g_set_error_literal (error, GIMP_PDB_ERROR,
@ -2887,18 +2887,6 @@ CODE
}
$extra{app}->{code} = <<'CODE';
#if defined (HAVE_ISFINITE)
#define FINITE(x) isfinite(x)
#elif defined (HAVE_FINITE)
#define FINITE(x) finite(x)
#elif defined (G_OS_WIN32)
#define FINITE(x) _finite(x)
#else
#error "no FINITE() implementation available?!"
#endif
CODE
@headers = qw("libgimpmath/gimpmath.h"
"libgimpbase/gimpbase.h"
"gegl/gimp-babl.h"