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

use G_STRUCT_OFFSET() instead of a hand-made macro which caused a compiler 

2008-05-14  Sven Neumann  <sven@gimp.org>

	* plug-ins/gradient-flare/gradient-flare.c
	(calc_sample_one_gradient): use G_STRUCT_OFFSET() instead of a
	hand-made macro which caused a compiler warning (spotted by 
gymp,
	bug #532853).


svn path=/trunk/; revision=25659
This commit is contained in:
Sven Neumann 2008-05-14 06:41:55 +00:00 committed by Sven Neumann
parent 9ca46cca70
commit e312aee2d8
2 changed files with 67 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-05-14 Sven Neumann <sven@gimp.org>
* plug-ins/gradient-flare/gradient-flare.c
(calc_sample_one_gradient): use G_STRUCT_OFFSET() instead of a
hand-made macro which caused a compiler warning (spotted by gymp,
bug #532853).
2008-05-14 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpsessioninfo-book.[ch]: remove widget member from

75
plug-ins/gradient-flare/gradient-flare.c
View File

@ -59,7 +59,6 @@
#endif
#define LUMINOSITY(PIX) (GIMP_RGB_LUMINANCE (PIX[0], PIX[1], PIX[2]) + 0.5)
#define OFFSETOF(t,f) ((int) ((char*) &((t*) 0)->f))
#define RESPONSE_RESCAN 1
@ -1763,21 +1762,67 @@ calc_init_progress (void)
static int
calc_sample_one_gradient (void)
{
static struct {
guchar **values;
gint name_offset;
gint hue_offset;
gint gray;
static struct
{
guchar **values;
gint name_offset;
gint hue_offset;
gint gray;
} table[] = {
{ &calc.glow_radial, OFFSETOF (GFlare, glow_radial), OFFSETOF (GFlare, glow_hue), FALSE },
{ &calc.glow_angular, OFFSETOF (GFlare, glow_angular), 0, FALSE },
{ &calc.glow_angular_size, OFFSETOF (GFlare, glow_angular_size), 0, TRUE },
{ &calc.rays_radial, OFFSETOF (GFlare, rays_radial), OFFSETOF (GFlare, rays_hue), FALSE },
{ &calc.rays_angular, OFFSETOF (GFlare, rays_angular), 0, FALSE },
{ &calc.rays_angular_size, OFFSETOF (GFlare, rays_angular_size), 0, TRUE },
{ &calc.sflare_radial, OFFSETOF (GFlare, sflare_radial), OFFSETOF (GFlare, sflare_hue), FALSE },
{ &calc.sflare_sizefac, OFFSETOF (GFlare, sflare_sizefac), 0, TRUE },
{ &calc.sflare_probability, OFFSETOF (GFlare, sflare_probability), 0, TRUE },
{
&calc.glow_radial,
G_STRUCT_OFFSET (GFlare, glow_radial),
G_STRUCT_OFFSET (GFlare, glow_hue),
FALSE
},
{
&calc.glow_angular,
G_STRUCT_OFFSET (GFlare, glow_angular),
0,
FALSE
},
{
&calc.glow_angular_size,
G_STRUCT_OFFSET (GFlare, glow_angular_size),
0,
TRUE
},
{
&calc.rays_radial,
G_STRUCT_OFFSET (GFlare, rays_radial),
G_STRUCT_OFFSET (GFlare, rays_hue),
FALSE
},
{
&calc.rays_angular,
G_STRUCT_OFFSET (GFlare, rays_angular),
0,
FALSE
},
{
&calc.rays_angular_size,
G_STRUCT_OFFSET (GFlare, rays_angular_size),
0,
TRUE
},
{
&calc.sflare_radial,
G_STRUCT_OFFSET (GFlare, sflare_radial),
G_STRUCT_OFFSET (GFlare, sflare_hue),
FALSE
},
{
&calc.sflare_sizefac,
G_STRUCT_OFFSET (GFlare, sflare_sizefac),
0,
TRUE
},
{
&calc.sflare_probability,
G_STRUCT_OFFSET (GFlare, sflare_probability),
0,
TRUE
}
};
GFlare *gflare = calc.gflare;
GradientName *grad_name;