still unacceptable patched to compile without FT2, see bug #113681
2003-11-16 Hans Breuer <hans@breuer.org> * app/text/*.c : still unacceptable patched to compile without FT2, see bug #113681 * **makefile.msc : updated * app/config/gimpconfig-dump.c : include gimpwin32-io.h * app/plug-in/plug-ins.c : don't depend on g_print handling %s with NULL pointers, it doesn't anymore with glib cvs at least not on win32 * app/widgets/gimppropwidgets.c libgimpbase/gimputils.c libgimpwidgets/gimpmemsizeentry.c : sorry about the mess, need to work-around a stupi not able to cast from guint64 to double * app/widgets/gimppropwidgets.c (gimp_prop_memsize_entry_new) : avoid 'overflow in floating-point constant arithmetic' by disabling an imho alays questionable g_return_val_if_fail() for _MSC_VER only * libgimpmodule/gimpmodule.def : sorted * libgimpwidgets/gimpfileselection.c : removed unused S_ISDIR definition * app/gui/themes.c : filenames in rc files need to be escaped
This commit is contained in:
@ -932,7 +932,11 @@ gimp_prop_adjustment_notify (GObject *config,
|
||||
|
||||
g_object_get (config, param_spec->name, &uint64_value, NULL);
|
||||
|
||||
#if defined _MSC_VER && (_MSC_VER < 1200)
|
||||
value = (gint64) uint64_value;
|
||||
#else
|
||||
value = uint64_value;
|
||||
#endif
|
||||
}
|
||||
else if (G_IS_PARAM_SPEC_DOUBLE (param_spec))
|
||||
{
|
||||
@ -992,8 +996,14 @@ gimp_prop_memsize_entry_new (GObject *config,
|
||||
|
||||
uint64_spec = G_PARAM_SPEC_UINT64 (param_spec);
|
||||
|
||||
#ifndef _MSC_VER
|
||||
/* avoid getting gimppropwidgets.c(999) : warning C4056:
|
||||
* overflow in floating-point constant arithmetic
|
||||
* and runtime failing (the check seems not the useful to me anyway)
|
||||
*/
|
||||
g_return_val_if_fail (uint64_spec->minimum <= (guint64) G_MAXDOUBLE, NULL);
|
||||
g_return_val_if_fail (uint64_spec->maximum <= (guint64) G_MAXDOUBLE, NULL);
|
||||
#endif
|
||||
|
||||
entry = gimp_memsize_entry_new (value,
|
||||
uint64_spec->minimum,
|
||||
|
||||
Reference in New Issue
Block a user