dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use a union instead of separate types to read/write doubles so we don't

Browse source 
2002-11-25  Manish Singh  <yosh@gimp.org>

        * libgimpbase/gimpwire.c: use a union instead of separate types to
        read/write doubles so we don't violate C's aliasing rules. Fixes
        bug #85249.
This commit is contained in:
Manish Singh 2002-11-25 08:02:54 +00:00 committed by Manish Singh
parent 2b16283b32
commit 0c06eda874
2 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,4 +1,10 @@
2002-11-24 Manish Singh <yosh@gimp.org>
2002-11-25 Manish Singh <yosh@gimp.org>
* libgimpbase/gimpwire.c: use a union instead of separate types to
read/write doubles so we don't violate C's aliasing rules. Fixes
bug #85249.
2002-11-24 Manish Singh <yosh@gimp.org>
* tools/pdbgen/pdb/image.pdb: moved FINITE definition to $extra
code. Changed to use #elif, much cleaner.

40
libgimpbase/gimpwire.c
View file

@ -366,27 +366,27 @@ wire_read_double (GIOChannel *channel,
gint count,
gpointer user_data)
{
gdouble *t;
guint32 tmp[2];
gint i;
union {
gdouble d;
guint32 p[2];
} d;
gint i;
#if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
guint32 swap;
guint32 swap;
#endif
t = (gdouble *) tmp;
for (i = 0; i < count; i++)
{
if (! wire_read_int8 (channel, (guint8 *) tmp, 8, user_data))
if (! wire_read_int8 (channel, (guint8 *) &d.d, 8, user_data))
return FALSE;
#if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
swap = g_ntohl (tmp[1]);
tmp[1] = g_ntohl (tmp[0]);
tmp[0] = swap;
swap = g_ntohl (d.p[1]);
d.p[1] = g_ntohl (d.p[0]);
d.p[0] = swap;
#endif
data[i] = *t;
data[i] = d.d;
}
return TRUE;
@ -483,26 +483,26 @@ wire_write_double (GIOChannel *channel,
gint count,
gpointer user_data)
{
gdouble *t;
guint32 tmp[2];
union {
gdouble d;
guint32 p[2];
} d;
gint i;
#if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
guint32 swap;
#endif
t = (gdouble *) tmp;
for (i = 0; i < count; i++)
{
*t = data[i];
d.d = data[i];
#if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
swap = g_htonl (tmp[1]);
tmp[1] = g_htonl (tmp[0]);
tmp[0] = swap;
swap = g_htonl (d.p[1]);
d.p[1] = g_htonl (d.p[0]);
d.p[0] = swap;
#endif
if (! wire_write_int8 (channel, (guint8 *) tmp, 8, user_data))
if (! wire_write_int8 (channel, (guint8 *) &d.d, 8, user_data))
return FALSE;
#if 0