From cf3b7b899e26b40543cf9c2f981487e5bf59f0f6 Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Wed, 22 Oct 1997 00:07:26 +0200
Subject: [PATCH] HIDE_GLOBAL_VARIABLES _following_ local decls
Rev: src/modules/Image/image.c:1.45
Rev: src/modules/Image/lzw.c:1.4
Rev: src/modules/Image/togif.c:1.20
---
src/modules/Image/image.c | 15 ++++++++-------
src/modules/Image/lzw.c | 6 +++---
src/modules/Image/togif.c | 6 +++---
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c
index cc11cd0c6b..25ea2a6c34 100644
--- a/src/modules/Image/image.c
+++ b/src/modules/Image/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.44 1997/10/21 18:39:36 grubba Exp $ */
+/* $Id: image.c,v 1.45 1997/10/21 22:07:23 mirar Exp $ */
/*
**! module Image
@@ -6,7 +6,7 @@
**! This module adds image-drawing and -manipulating
**! capabilities to pike.
**! note
-**! $Id: image.c,v 1.44 1997/10/21 18:39:36 grubba Exp $<br>
+**! $Id: image.c,v 1.45 1997/10/21 22:07:23 mirar Exp $<br>
**! see also: Image.font, Image.image
**!
**! class image
@@ -107,7 +107,7 @@
#include "stralloc.h"
#include "global.h"
-RCSID("$Id: image.c,v 1.44 1997/10/21 18:39:36 grubba Exp $");
+RCSID("$Id: image.c,v 1.45 1997/10/21 22:07:23 mirar Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -300,15 +300,16 @@ static INLINE rgb_group _pixel_apply_matrix(struct image *img,
rgb_group default_rgb,
double div)
{
- /* NOTE:
- * This code MUST be MT-SAFE!
- */
- HIDE_GLOBAL_VARIABLES();
rgb_group res;
int i,j,bx,by,xp,yp;
int sumr,sumg,sumb,r,g,b;
float qdiv=1.0/div;
+ /* NOTE:
+ * This code MUST be MT-SAFE!
+ */
+ HIDE_GLOBAL_VARIABLES();
+
sumr=sumg=sumb=0;
r=g=b=0;
diff --git a/src/modules/Image/lzw.c b/src/modules/Image/lzw.c
index a68c969fe9..d82dc9cdd4 100644
--- a/src/modules/Image/lzw.c
+++ b/src/modules/Image/lzw.c
@@ -1,4 +1,4 @@
-/* $Id: lzw.c,v 1.3 1997/10/21 18:39:37 grubba Exp $ */
+/* $Id: lzw.c,v 1.4 1997/10/21 22:07:26 mirar Exp $ */
/*
@@ -15,7 +15,7 @@ the existanse of #define GIF_LZW is for that purpose. :-)
/*
**! module Image
**! note
-**! $Id: lzw.c,v 1.3 1997/10/21 18:39:37 grubba Exp $<br>
+**! $Id: lzw.c,v 1.4 1997/10/21 22:07:26 mirar Exp $<br>
*/
#include "global.h"
@@ -166,9 +166,9 @@ void lzw_write_last(struct lzw *lzw)
void lzw_add(struct lzw *lzw,int c)
{
- HIDE_GLOBAL_VARIABLES();
lzwcode_t lno,lno2;
struct lzwc *l;
+ HIDE_GLOBAL_VARIABLES();
if (lzw->current==LZWCNULL) /* no current, load */
{
diff --git a/src/modules/Image/togif.c b/src/modules/Image/togif.c
index 25a130e181..e754e2accc 100644
--- a/src/modules/Image/togif.c
+++ b/src/modules/Image/togif.c
@@ -4,14 +4,14 @@ togif
Pontus Hagland, law@infovav.se
-$Id: togif.c,v 1.19 1997/10/21 18:39:38 grubba Exp $
+$Id: togif.c,v 1.20 1997/10/21 22:07:25 mirar Exp $
*/
/*
**! module Image
**! note
-**! $Id: togif.c,v 1.19 1997/10/21 18:39:38 grubba Exp $<br>
+**! $Id: togif.c,v 1.20 1997/10/21 22:07:25 mirar Exp $<br>
**! class image
*/
@@ -163,9 +163,9 @@ void image_floyd_steinberg(rgb_group *rgb,int xsize,
struct colortable *ct,
int closest)
{
- HIDE_GLOBAL_VARIABLES();
rgbl_group err;
int x;
+ HIDE_GLOBAL_VARIABLES();
if (way)
{
--
GitLab