From bda1ac7f7ee2bb9174f58fce4260b92c8b95d464 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 17 Dec 2000 20:07:15 +0000 Subject: [PATCH] Typo. Use GLib random functions. 2000-12-17 Tor Lillqvist * config.h.win32: Typo. Use GLib random functions. * plug-ins/makefile.mingw.in (COMMON): Add gee_zoom. * plug-ins/common/animationplay.c: Win32-specific #include and #define stuff not needed any longer. * plug-ins/FractalExplorer/FractalExplorer.c * plug-ins/common/gz.c * plug-ins/common/hrz.c: No use trying to use G_OS_WIN32 to decide whether to include glib.h, as glib.h is where G_OS_WIN32 gets defined... * plug-ins/common/gee.c: Can't use "environ" as variable name, it's in the C library.h on various systems. Use the name "env" instead. --- ChangeLog | 20 ++++ config.h.win32 | 6 +- plug-ins/FractalExplorer/FractalExplorer.c | 22 ++--- plug-ins/common/animationplay.c | 10 -- plug-ins/common/compressor.c | 16 ++- plug-ins/common/gee.c | 109 ++++++++++----------- plug-ins/common/gz.c | 16 ++- plug-ins/common/hrz.c | 4 - plug-ins/makefile.mingw.in | 1 + 9 files changed, 101 insertions(+), 103 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ec29d13e4..a4d18b627c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2000-12-17 Tor Lillqvist + + * config.h.win32: Typo. + Use GLib random functions. + + * plug-ins/makefile.mingw.in (COMMON): Add gee_zoom. + + * plug-ins/common/animationplay.c: Win32-specific #include and + #define stuff not needed any longer. + + * plug-ins/FractalExplorer/FractalExplorer.c + * plug-ins/common/gz.c + * plug-ins/common/hrz.c: No use trying to use G_OS_WIN32 to decide + whether to include glib.h, as glib.h is where G_OS_WIN32 gets + defined... + + * plug-ins/common/gee.c: Can't use "environ" as variable name, + it's in the C library.h on various systems. Use the name "env" + instead. + 2000-12-17 Michael Natterer * plug-ins/FractalExplorer/FractalExplorer.c diff --git a/config.h.win32 b/config.h.win32 index 6578ef45d9..b890508bfa 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -84,7 +84,7 @@ /* #undef HAVE_STPCPY */ /* #undef HAVE_SYS_DIR_H */ /* #undef HAVE_SYS_NDIR_H */ -/* #undef HAVE_SYS_PARAM_H /* +/* #undef HAVE_SYS_PARAM_H */ /* #undef HAVE_SYS_SELECT_H */ /* #undef HAVE_SYS_TIME_H */ /* #undef HAVE_SYS_TIMES_H */ @@ -98,8 +98,8 @@ /* #undef NO_DIFFTIME */ /* #undef NO_FD_SET */ -#define RAND_FUNC rand -#define SRAND_FUNC srand +#define RAND_FUNC g_random_int +#define SRAND_FUNC g_random_set_seed /* #undef USE_PTHREADS */ diff --git a/plug-ins/FractalExplorer/FractalExplorer.c b/plug-ins/FractalExplorer/FractalExplorer.c index 4f4bac3d58..61b067846b 100644 --- a/plug-ins/FractalExplorer/FractalExplorer.c +++ b/plug-ins/FractalExplorer/FractalExplorer.c @@ -51,10 +51,6 @@ #include "config.h" -#ifdef G_OS_WIN32 -#include -#endif - #include #include #include @@ -68,6 +64,15 @@ #endif #include +#include +#include + +#include "pix_data.h" + +#include "FractalExplorer.h" +#include "Events.h" +#include "Dialogs.h" + #ifdef G_OS_WIN32 #include @@ -82,15 +87,6 @@ #endif #endif -#include -#include - -#include "pix_data.h" - -#include "FractalExplorer.h" -#include "Events.h" -#include "Dialogs.h" - #include "libgimp/stdplugins-intl.h" static void query (void); diff --git a/plug-ins/common/animationplay.c b/plug-ins/common/animationplay.c index f8d9b7b128..cee156ecde 100644 --- a/plug-ins/common/animationplay.c +++ b/plug-ins/common/animationplay.c @@ -113,16 +113,6 @@ #include #include -#ifdef G_OS_WIN32 -#include - -/* This just to be able to include windows.h and undef RGB */ -#define WinMain WinMain_foo -#include -#undef WinMain -#undef RGB -#endif - #include #ifndef GDK_WINDOWING_WIN32 #include diff --git a/plug-ins/common/compressor.c b/plug-ins/common/compressor.c index 024f829eca..2b1f490c28 100644 --- a/plug-ins/common/compressor.c +++ b/plug-ins/common/compressor.c @@ -58,15 +58,6 @@ #include "config.h" -#ifdef G_OS_WIN32 -#include - -#define STRICT -#define WinMain WinMain_foo -#include -#undef WinMain -#endif - #include #include #include @@ -90,6 +81,13 @@ #include +#ifdef G_OS_WIN32 +#define STRICT +#define WinMain WinMain_foo +#include +#undef WinMain +#endif + #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/common/gee.c b/plug-ins/common/gee.c index ae381af08a..032cedf213 100644 --- a/plug-ins/common/gee.c +++ b/plug-ins/common/gee.c @@ -68,7 +68,7 @@ GimpPlugInInfo PLUG_IN_INFO = /* Global widgets'n'stuff */ static guchar *disp; /* RGBX preview data */ -static guchar *environ; /* src warping image data */ +static guchar *env; /* src warping image data */ static guchar *bump1base; static guchar *bump1; static guchar *bump2base; @@ -406,7 +406,7 @@ iterate (void) frame++; - env = (guint32*) environ; + env = (guint32*) env; dest = (guint32*) disp; srcbump = (frame&1) ? bump1 : bump2; destbump = (frame&1) ? bump2 : bump1; @@ -615,8 +615,7 @@ render_frame (void) for (i=0;iid); - environ = g_malloc (4 * IWIDTH * IHEIGHT * 2); + env = g_malloc (4 * IWIDTH * IHEIGHT * 2); disp = g_malloc ((IWIDTH + 2 + IWIDTH * IHEIGHT) * 4); bump1base = g_malloc (IWIDTH * IHEIGHT + IWIDTH+IWIDTH); bump2base = g_malloc (IWIDTH * IHEIGHT + IWIDTH+IWIDTH); @@ -663,22 +662,22 @@ init_preview_misc (void) FALSE, FALSE); gimp_pixel_rgn_get_rect (&pixel_rgn, - &environ[(256*i + - ( - ( - drawable->width<256 ? - (256-drawable->width)/2 : - 0 - ) - + - ( - drawable->height<256 ? - (256-drawable->height)/2 : - 0 - ) * 256 - )) * - gimp_drawable_bpp - (drawable->id) + &env[(256*i + + ( + ( + drawable->width<256 ? + (256-drawable->width)/2 : + 0 + ) + + + ( + drawable->height<256 ? + (256-drawable->height)/2 : + 0 + ) * 256 + )) * + gimp_drawable_bpp + (drawable->id) ], drawable->width>256? (drawable->width/2-128):0, @@ -700,7 +699,7 @@ init_preview_misc (void) FALSE, FALSE); gimp_pixel_rgn_get_rect (&pixel_rgn, - environ, + env, drawable->width>256?(drawable->width/2-128):0, drawable->height>256?(drawable->height/2-128):0, MIN(256,drawable->width), @@ -719,24 +718,24 @@ init_preview_misc (void) { for (i=IWIDTH*IHEIGHT;i>0;i--) { - environ[4*(i-1)+2] = - ((palette[3*(environ[(i-1)*2])+2]*environ[(i-1)*2+1])/255) - + ((255-environ[(i-1)*2+1])*((i&255) ^ (i>>8)))/255; - environ[4*(i-1)+1] = - ((palette[3*(environ[(i-1)*2])+1]*environ[(i-1)*2+1])/255) - + ((255-environ[(i-1)*2+1])*((i&255) ^ (i>>8)))/255; - environ[4*(i-1)+0] = - ((palette[3*(environ[(i-1)*2])+0]*environ[(i-1)*2+1])/255) - + ((255-environ[(i-1)*2+1])*((i&255) ^ (i>>8)))/255; + env[4*(i-1)+2] = + ((palette[3*(env[(i-1)*2])+2]*env[(i-1)*2+1])/255) + + ((255-env[(i-1)*2+1])*((i&255) ^ (i>>8)))/255; + env[4*(i-1)+1] = + ((palette[3*(env[(i-1)*2])+1]*env[(i-1)*2+1])/255) + + ((255-env[(i-1)*2+1])*((i&255) ^ (i>>8)))/255; + env[4*(i-1)+0] = + ((palette[3*(env[(i-1)*2])+0]*env[(i-1)*2+1])/255) + + ((255-env[(i-1)*2+1])*((i&255) ^ (i>>8)))/255; } } else { for (i=IWIDTH*IHEIGHT;i>0;i--) { - environ[4*(i-1)+2] = palette[3*(environ[i-1])+2]; - environ[4*(i-1)+1] = palette[3*(environ[i-1])+1]; - environ[4*(i-1)+0] = palette[3*(environ[i-1])+0]; + env[4*(i-1)+2] = palette[3*(env[i-1])+2]; + env[4*(i-1)+1] = palette[3*(env[i-1])+1]; + env[4*(i-1)+0] = palette[3*(env[i-1])+0]; } } break; @@ -746,24 +745,24 @@ init_preview_misc (void) { for (i=0;i>8)))/255; - environ[i*4+1] = - (environ[i*4+1]*environ[i*4+3])/255 - + ((255-environ[i*4+3])*((i&255) ^ (i>>8)))/255; - environ[i*4+0] = - (environ[i*4+0]*environ[i*4+3])/255 - + ((255-environ[i*4+3])*((i&255) ^ (i>>8)))/255; + env[i*4+2] = + (env[i*4+2]*env[i*4+3])/255 + + ((255-env[i*4+3])*((i&255) ^ (i>>8)))/255; + env[i*4+1] = + (env[i*4+1]*env[i*4+3])/255 + + ((255-env[i*4+3])*((i&255) ^ (i>>8)))/255; + env[i*4+0] = + (env[i*4+0]*env[i*4+3])/255 + + ((255-env[i*4+3])*((i&255) ^ (i>>8)))/255; } } else { for (i=IWIDTH*IHEIGHT;i>0;i--) { - environ[4*(i-1)+2] = environ[(i-1)*3+2]; - environ[4*(i-1)+1] = environ[(i-1)*3+1]; - environ[4*(i-1)+0] = environ[(i-1)*3+0]; + env[4*(i-1)+2] = env[(i-1)*3+2]; + env[4*(i-1)+1] = env[(i-1)*3+1]; + env[4*(i-1)+0] = env[(i-1)*3+0]; } } break; @@ -776,15 +775,15 @@ init_preview_misc (void) for (i = 0; i < IWIDTH*IHEIGHT/2; i++) { guchar t; - t = environ[4*(i)+0]; - environ[4*(i)+0] = environ[4*(IWIDTH*IHEIGHT-(i+1))+0]; - environ[4*(IWIDTH*IHEIGHT-(i+1))+0] = t; - t = environ[4*(i)+1]; - environ[4*(i)+1] = environ[4*(IWIDTH*IHEIGHT-(i+1))+1]; - environ[4*(IWIDTH*IHEIGHT-(i+1))+1] = t; - t = environ[4*(i)+2]; - environ[4*(i)+2] = environ[4*(IWIDTH*IHEIGHT-(i+1))+2]; - environ[4*(IWIDTH*IHEIGHT-(i+1))+2] = t; + t = env[4*(i)+0]; + env[4*(i)+0] = env[4*(IWIDTH*IHEIGHT-(i+1))+0]; + env[4*(IWIDTH*IHEIGHT-(i+1))+0] = t; + t = env[4*(i)+1]; + env[4*(i)+1] = env[4*(IWIDTH*IHEIGHT-(i+1))+1]; + env[4*(IWIDTH*IHEIGHT-(i+1))+1] = t; + t = env[4*(i)+2]; + env[4*(i)+2] = env[4*(IWIDTH*IHEIGHT-(i+1))+2]; + env[4*(IWIDTH*IHEIGHT-(i+1))+2] = t; } } diff --git a/plug-ins/common/gz.c b/plug-ins/common/gz.c index 024f829eca..2b1f490c28 100644 --- a/plug-ins/common/gz.c +++ b/plug-ins/common/gz.c @@ -58,15 +58,6 @@ #include "config.h" -#ifdef G_OS_WIN32 -#include - -#define STRICT -#define WinMain WinMain_foo -#include -#undef WinMain -#endif - #include #include #include @@ -90,6 +81,13 @@ #include +#ifdef G_OS_WIN32 +#define STRICT +#define WinMain WinMain_foo +#include +#undef WinMain +#endif + #include "libgimp/stdplugins-intl.h" diff --git a/plug-ins/common/hrz.c b/plug-ins/common/hrz.c index e63c38b8ae..1772967e48 100644 --- a/plug-ins/common/hrz.c +++ b/plug-ins/common/hrz.c @@ -33,10 +33,6 @@ #include "config.h" -#ifdef G_OS_WIN32 -#include -#endif - #include #include #include diff --git a/plug-ins/makefile.mingw.in b/plug-ins/makefile.mingw.in index 08e41f9035..5d2fc89d47 100644 --- a/plug-ins/makefile.mingw.in +++ b/plug-ins/makefile.mingw.in @@ -78,6 +78,7 @@ COMMON = \ gauss_rle \ gbr \ gee \ + gee_zoom \ gicon \ gif \ gifload \