Commit da5acc39 authored by Adam D. Moss's avatar Adam D. Moss
Browse files

1999-02-22 adam, blah blah

        * app/appenv.h: fixed a macro bug waiting to happen

        * plug-ins/gee/gee.c: some crappy tweaks

        * plug-ins/psd/psd.c: debugging turned off
parent e1ddd41d
1999-02-22 adam, blah blah
* app/appenv.h: fixed a macro bug waiting to happen
* plug-ins/gee/gee.c: some crappy tweaks
* plug-ins/psd/psd.c: debugging turned off
1999-02-22 Jay Cox <jaycox@earthlink.net>
* app/channel.c: fixed bug in channel_bounds
......
......@@ -43,7 +43,7 @@
#define MAXIMUM(x,y) MAX(x,y)
/* limit a (0->511) int to 255 */
#define MAX255(a) (a | ((a & 256) - ((a & 256) >> 8)))
#define MAX255(a) ((a) | (((a) & 256) - (((a) & 256) >> 8)))
/* clamp a >>int32<<-range int between 0 and 255 inclusive */
/* broken! -> #define CLAMP0255(a) ((a & 0xFFFFFF00)? (~(a>>31)) : a) */
......
......@@ -444,6 +444,8 @@ void domap3(unsigned char *src, unsigned char *dest,
unsigned int basesy;
#endif
static unsigned int grrr=0;
if ((cx+bx) == 0)
cx++;
......@@ -464,6 +466,8 @@ void domap3(unsigned char *src, unsigned char *dest,
by2 = ((by)<<19)/bycxmcybx;
cy2 = ((cy)<<19)/bycxmcybx;
grrr++;
for (dy=0;dy<256;dy++)
{
#ifdef __AAARGH_GNUC__
......@@ -473,12 +477,14 @@ void domap3(unsigned char *src, unsigned char *dest,
#else
unsigned int sx;
unsigned int sy;
unsigned int dx;
unsigned int dx;
#endif
sx = (basesx-=bx2);
sy = (basesy+=cx2);
sx = (basesx-=bx2);
sx += ((double)(6<<11))*(sin((double)((((
(basesy)
>>11)+grrr))/(2.0*31.4159265))));
dx = 256;
do
{
......@@ -572,6 +578,8 @@ render_frame(void)
}
#endif
// memcpy(preview_data1, seed_data, 256*256*3);
if (frame != 0)
{
if (feedbacktype)
......@@ -584,7 +592,7 @@ render_frame(void)
(t&256)? (~(t>>10)) : t; /* Quick specialized clamp */
}
}
else
else// if (0)
{
gint pixwords = pixels/sizeof(gint32);
gint32* seedwords = (gint32*) seed_data;
......@@ -595,13 +603,19 @@ render_frame(void)
/*preview_data1[i] = (preview_data1[i]*2 +
seed_data[i]) /3;*/
/* mod'd version of the below for a 'deeper' mix */
prevwords[i] =
((prevwords[i] >> 1) & 0x7f7f7f7f) +
((prevwords[i] >> 2) & 0x3f3f3f3f) +
((seedwords[i] >> 2) & 0x3f3f3f3f);
/* This is from Raph L... it should be a fast 50%/50%
blend, though I don't know if 50%/50% is as nice as
the old ratio. */
prevwords[i] =
((prevwords[i] >> 1) & 0x7f7f7f7f) +
((seedwords[i] >> 1) & 0x7f7f7f7f) +
(prevwords[i] & seedwords[i] & 0x01010101);
/*
prevwords[i] =
((prevwords[i] >> 1) & 0x7f7f7f7f) +
((seedwords[i] >> 1) & 0x7f7f7f7f) +
(prevwords[i] & seedwords[i] & 0x01010101); */
}
}
}
......@@ -649,19 +663,21 @@ render_frame(void)
for (i=0;i<pixwords;i++)
{
/* mod'd version of the below for a 'deeper' mix */
prevwords[i] =
((prevwords[i] >> 1) & 0x7f7f7f7f) +
((prevwords[i] >> 2) & 0x3f3f3f3f) +
((seedwords[i] >> 2) & 0x3f3f3f3f);
/* This is from Raph L... it should be a fast 50%/50%
blend, though I don't know if 50%/50% is as nice as
the old ratio. */
prevwords[i] =
((prevwords[i] >> 1) & 0x7f7f7f7f) +
((seedwords[i] >> 1) & 0x7f7f7f7f) +
(prevwords[i] & seedwords[i] & 0x01010101);
/*
prevwords[i] =
((prevwords[i] >> 1) & 0x7f7f7f7f) +
((seedwords[i] >> 1) & 0x7f7f7f7f) +
(prevwords[i] & seedwords[i] & 0x01010101); */
}
/* for (i=0;i<pixels;i++)
{
preview_data1[i] = (preview_data1[i]*2 + seed_data[i]) /3;
}*/
}
}
}
......
......@@ -113,7 +113,7 @@
/* *** USER DEFINES *** */
/* set to TRUE if you want debugging, FALSE otherwise */
#define PSD_DEBUG TRUE
#define PSD_DEBUG FALSE
/* the max number of layers that this plugin should try to load */
#define MAX_LAYERS 100
......
......@@ -444,6 +444,8 @@ void domap3(unsigned char *src, unsigned char *dest,
unsigned int basesy;
#endif
static unsigned int grrr=0;
if ((cx+bx) == 0)
cx++;
......@@ -464,6 +466,8 @@ void domap3(unsigned char *src, unsigned char *dest,
by2 = ((by)<<19)/bycxmcybx;
cy2 = ((cy)<<19)/bycxmcybx;
grrr++;
for (dy=0;dy<256;dy++)
{
#ifdef __AAARGH_GNUC__
......@@ -473,12 +477,14 @@ void domap3(unsigned char *src, unsigned char *dest,
#else
unsigned int sx;
unsigned int sy;
unsigned int dx;
unsigned int dx;
#endif
sx = (basesx-=bx2);
sy = (basesy+=cx2);
sx = (basesx-=bx2);
sx += ((double)(6<<11))*(sin((double)((((
(basesy)
>>11)+grrr))/(2.0*31.4159265))));
dx = 256;
do
{
......@@ -572,6 +578,8 @@ render_frame(void)
}
#endif
// memcpy(preview_data1, seed_data, 256*256*3);
if (frame != 0)
{
if (feedbacktype)
......@@ -584,7 +592,7 @@ render_frame(void)
(t&256)? (~(t>>10)) : t; /* Quick specialized clamp */
}
}
else
else// if (0)
{
gint pixwords = pixels/sizeof(gint32);
gint32* seedwords = (gint32*) seed_data;
......@@ -595,13 +603,19 @@ render_frame(void)
/*preview_data1[i] = (preview_data1[i]*2 +
seed_data[i]) /3;*/
/* mod'd version of the below for a 'deeper' mix */
prevwords[i] =
((prevwords[i] >> 1) & 0x7f7f7f7f) +
((prevwords[i] >> 2) & 0x3f3f3f3f) +
((seedwords[i] >> 2) & 0x3f3f3f3f);
/* This is from Raph L... it should be a fast 50%/50%
blend, though I don't know if 50%/50% is as nice as
the old ratio. */
prevwords[i] =
((prevwords[i] >> 1) & 0x7f7f7f7f) +
((seedwords[i] >> 1) & 0x7f7f7f7f) +
(prevwords[i] & seedwords[i] & 0x01010101);
/*
prevwords[i] =
((prevwords[i] >> 1) & 0x7f7f7f7f) +
((seedwords[i] >> 1) & 0x7f7f7f7f) +
(prevwords[i] & seedwords[i] & 0x01010101); */
}
}
}
......@@ -649,19 +663,21 @@ render_frame(void)
for (i=0;i<pixwords;i++)
{
/* mod'd version of the below for a 'deeper' mix */
prevwords[i] =
((prevwords[i] >> 1) & 0x7f7f7f7f) +
((prevwords[i] >> 2) & 0x3f3f3f3f) +
((seedwords[i] >> 2) & 0x3f3f3f3f);
/* This is from Raph L... it should be a fast 50%/50%
blend, though I don't know if 50%/50% is as nice as
the old ratio. */
prevwords[i] =
((prevwords[i] >> 1) & 0x7f7f7f7f) +
((seedwords[i] >> 1) & 0x7f7f7f7f) +
(prevwords[i] & seedwords[i] & 0x01010101);
/*
prevwords[i] =
((prevwords[i] >> 1) & 0x7f7f7f7f) +
((seedwords[i] >> 1) & 0x7f7f7f7f) +
(prevwords[i] & seedwords[i] & 0x01010101); */
}
/* for (i=0;i<pixels;i++)
{
preview_data1[i] = (preview_data1[i]*2 + seed_data[i]) /3;
}*/
}
}
}
......
......@@ -113,7 +113,7 @@
/* *** USER DEFINES *** */
/* set to TRUE if you want debugging, FALSE otherwise */
#define PSD_DEBUG TRUE
#define PSD_DEBUG FALSE
/* the max number of layers that this plugin should try to load */
#define MAX_LAYERS 100
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment