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

Using "env" instead of "environ" caused a clash. Changed the other one to 

2000-12-18  Michael Natterer  <mitch@gimp.org>

	* plug-ins/common/gee.c: Using "env" instead of "environ" caused
	a clash. Changed the other one to "environment".
This commit is contained in:
Michael Natterer 2000-12-18 03:06:15 +00:00 committed by Michael Natterer
parent 3b88977675
commit 333bfaf5b6
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2000-12-18 Michael Natterer <mitch@gimp.org>
* plug-ins/common/gee.c: Using "env" instead of "environ" caused
a clash. Changed the other one to "environment".
2000-12-17 Tor Lillqvist <tml@iki.fi>
* config.h.win32: Typo.

10
plug-ins/common/gee.c
View File

@ -383,7 +383,7 @@ iterate (void)
gint thisbump;
guchar sx,sy;
guint32 *dest;
guint32 *env;
guint32 *environment;
guchar *basebump;
unsigned int basesx;
unsigned int basesy;
@ -406,7 +406,7 @@ iterate (void)
frame++;
env = (guint32*) env;
environment = (guint32*) env;
dest = (guint32*) disp;
srcbump = (frame&1) ? bump1 : bump2;
destbump = (frame&1) ? bump2 : bump1;
@ -446,7 +446,7 @@ iterate (void)
i = IWIDTH;
while (i--)
{
*dest++ = *env++;
*dest++ = *environment++;
}
}
return;
@ -496,7 +496,7 @@ iterate (void)
casting an aligned long-word search. */
if (thisbump == 0)
{
*(dest++) = *( env + (i | (j<<8) ) );
*(dest++) = *( environment + (i | (j<<8) ) );
/* *(dest++) = 111; */
*(destbump++) = 0;
}
@ -514,7 +514,7 @@ iterate (void)
sx = i + ( ((thisbump) - *(++destbump))<<1); + blah; */
sy = j + ( ((thisbump) - *(destbump+IWIDTH)));
sx = i + ( ((thisbump) - *(++destbump)));
*dest++ = *( env + (sx | (sy<<8) ) );
*dest++ = *( environment + (sx | (sy<<8) ) );
/* sx = ( ((thisbump) - *(destbump+IWIDTH)));
sy = ( ((thisbump) - *(++destbump)));
*dest++ = (sx) | (sy<<8) | (sx<<16); */