From 496bfed4d577e1090900bffae993f5978bf17d13 Mon Sep 17 00:00:00 2001 From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org> Date: Thu, 8 Jan 1998 21:51:39 +0100 Subject: [PATCH] no padding (it didn't work very perfect... *grin*) Rev: src/modules/Image/encodings/pnm.c:1.7 Rev: src/modules/Image/image.h:1.17 --- src/modules/Image/encodings/pnm.c | 8 ++++---- src/modules/Image/image.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/Image/encodings/pnm.c b/src/modules/Image/encodings/pnm.c index 412a0a98e4..0cafbf1608 100644 --- a/src/modules/Image/encodings/pnm.c +++ b/src/modules/Image/encodings/pnm.c @@ -1,9 +1,9 @@ -/* $Id: pnm.c,v 1.6 1998/01/06 21:39:30 mirar Exp $ */ +/* $Id: pnm.c,v 1.7 1998/01/08 20:51:39 mirar Exp $ */ /* **! module Image **! note -**! $Id: pnm.c,v 1.6 1998/01/06 21:39:30 mirar Exp $ +**! $Id: pnm.c,v 1.7 1998/01/08 20:51:39 mirar Exp $ **! submodule PNM **! **! This submodule keeps the PNM encode/decode capabilities @@ -49,7 +49,7 @@ #include "stralloc.h" #include "global.h" -RCSID("$Id: pnm.c,v 1.6 1998/01/06 21:39:30 mirar Exp $"); +RCSID("$Id: pnm.c,v 1.7 1998/01/08 20:51:39 mirar Exp $"); #include "pike_macros.h" #include "object.h" #include "constants.h" @@ -278,7 +278,7 @@ void img_pnm_encode_P6(INT32 args) unsigned char *c; int n=img->xsize*img->ysize; rgb_group *s=img->img; - c=(unsigned char*)(b=begin_shared_string(n*3)); + c=(unsigned char*)((b=begin_shared_string(n*3))->str); while (n--) { *(c++)=s->r; diff --git a/src/modules/Image/image.h b/src/modules/Image/image.h index 2aaa53f6e7..8432ab1ea3 100644 --- a/src/modules/Image/image.h +++ b/src/modules/Image/image.h @@ -1,7 +1,7 @@ /* **! module Image **! note -**! $Id: image.h,v 1.16 1998/01/06 21:39:28 mirar Exp $ +**! $Id: image.h,v 1.17 1998/01/08 20:51:38 mirar Exp $ */ #ifdef PIKE_IMAGE_IMAGE_H @@ -22,7 +22,7 @@ typedef struct { COLORTYPE r,g,b; - COLORTYPE __padding_dont_use__; +/* COLORTYPE __padding_dont_use__;*/ } rgb_group; typedef struct -- GitLab