From 6ee480dbc40e6b159b8f1c8e5411e424663f531c Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Thu, 8 Jan 1998 19:44:27 +0100
Subject: [PATCH] sizeof(rgb_group) fix
Rev: src/modules/Image/image.c:1.72
---
src/modules/Image/image.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c
index 154cb7cb92..57a35710a0 100644
--- a/src/modules/Image/image.c
+++ b/src/modules/Image/image.c
@@ -1,9 +1,9 @@
-/* $Id: image.c,v 1.71 1998/01/07 01:11:26 mirar Exp $ */
+/* $Id: image.c,v 1.72 1998/01/08 18:44:27 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: image.c,v 1.71 1998/01/07 01:11:26 mirar Exp $
+**! $Id: image.c,v 1.72 1998/01/08 18:44:27 mirar 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.71 1998/01/07 01:11:26 mirar Exp $");
+RCSID("$Id: image.c,v 1.72 1998/01/08 18:44:27 mirar Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -161,7 +161,7 @@ static void exit_image_struct(struct object *obj)
/*
fprintf(stderr,"exit %lx (%d) %dx%d=%.1fKb\n",obj,--obj_counter,
THIS->xsize,THIS->ysize,
- (THIS->xsize*THIS->ysize*3+sizeof(struct image))/1024.0);
+ (THIS->xsize*THIS->ysize*sizeof(rgb_group)+sizeof(struct image))/1024.0);
*/
}
@@ -2654,7 +2654,7 @@ void image_read_lsb_rgb(INT32 args)
char *d;
struct pike_string *ps;
- ps=begin_shared_string((THIS->xsize*THIS->ysize*3+7)>>3);
+ ps=begin_shared_string((THIS->xsize*THIS->ysize*sizeof(rgb_group)+7)>>3);
d=ps->str;
@@ -2663,7 +2663,7 @@ void image_read_lsb_rgb(INT32 args)
b=128;
- MEMSET(d,0,(THIS->xsize*THIS->ysize*3+7)>>3);
+ MEMSET(d,0,(THIS->xsize*THIS->ysize*sizeof(rgb_group)+7)>>3);
if (s)
while (n--)
--
GitLab