From 157e10b88dfb731e19498cb4d05e5cc4d61ad501 Mon Sep 17 00:00:00 2001
From: Per Hedbor <ph@opera.com>
Date: Sun, 23 Nov 1997 08:22:45 +0100
Subject: [PATCH] Fixed typo..
Rev: src/modules/Image/blit.c:1.21
Rev: src/modules/Image/image.c:1.67
---
src/modules/Image/blit.c | 6 +++---
src/modules/Image/image.c | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/modules/Image/blit.c b/src/modules/Image/blit.c
index 0f859188c4..2930c504b0 100644
--- a/src/modules/Image/blit.c
+++ b/src/modules/Image/blit.c
@@ -1,10 +1,10 @@
-/* $Id: blit.c,v 1.20 1997/11/23 06:03:48 per Exp $ */
+/* $Id: blit.c,v 1.21 1997/11/23 07:22:44 per Exp $ */
#include "global.h"
/*
**! module Image
**! note
-**! $Id: blit.c,v 1.20 1997/11/23 06:03:48 per Exp $
+**! $Id: blit.c,v 1.21 1997/11/23 07:22:44 per Exp $
**! class image
*/
@@ -167,7 +167,7 @@ CHRONO("image_blit begin");
THREADS_ALLOW();
if(!moddest && !modsrc)
- MEMCPY(dest,src,sizeof(rgb_group*width*lines));
+ MEMCPY(dest,src,sizeof(rgb_group)*width*lines);
else
while (lines--)
{
diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c
index ed9d38d7fd..3f76f24953 100644
--- a/src/modules/Image/image.c
+++ b/src/modules/Image/image.c
@@ -1,9 +1,9 @@
-/* $Id: image.c,v 1.66 1997/11/23 06:03:49 per Exp $ */
+/* $Id: image.c,v 1.67 1997/11/23 07:22:45 per Exp $ */
/*
**! module Image
**! note
-**! $Id: image.c,v 1.66 1997/11/23 06:03:49 per Exp $
+**! $Id: image.c,v 1.67 1997/11/23 07:22:45 per Exp $
**! class image
**!
**! The main object of the <ref>Image</ref> module, this object
@@ -82,7 +82,7 @@
#include "stralloc.h"
#include "global.h"
-RCSID("$Id: image.c,v 1.66 1997/11/23 06:03:49 per Exp $");
+RCSID("$Id: image.c,v 1.67 1997/11/23 07:22:45 per Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -184,7 +184,7 @@ static void exit_image_struct(struct object *obj)
set_rgb_group_alpha(THIS->img[(x)+(y)*THIS->xsize],THIS->rgb,THIS->alpha): \
((pixel(THIS,x,y)=THIS->rgb),0))
-#define color_equal(A,B) ((A.r == B.r) && (A.g == B.g) && (A.b == B.b))
+#define color_equal(A,B) (((A).r == (B).r) && ((A).g == (B).g) && ((A).b == (B).b))
#define setpixel_test(x,y) \
((((int)x)<0||((int)y)<0||((int)x)>=(int)THIS->xsize||((int)y)>=(int)THIS->ysize)? \
--
GitLab