2000-08-14
2000-08-14 14:26:37 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
bea2ada9cca398be828b91e398eef94629ef6fae
(20 lines)
(+12/-8)
[
Show
| Annotate
]
Branch: 7.9
Fixed a few warnings.
Rev: src/modules/HTTPLoop/accept_and_parse.c:1.17
Rev: src/modules/HTTPLoop/cache.c:1.13
Rev: src/modules/HTTPLoop/cache.h:1.5
Rev: src/modules/HTTPLoop/log.c:1.8
Rev: src/modules/HTTPLoop/requestobject.c:1.13
Rev: src/modules/HTTPLoop/util.c:1.6
Rev: src/modules/Image/encodings/gif.c:1.57
Rev: src/modules/Image/encodings/ilbm.c:1.19
Rev: src/modules/Image/encodings/ras.c:1.11
Rev: src/modules/Image/encodings/x.c:1.31
Rev: src/modules/Image/font.c:1.63
1:
- /* $Id: font.c,v 1.62 2000/08/11 18:42:54 grubba Exp $ */
+ /* $Id: font.c,v 1.63 2000/08/14 14:26:37 grubba Exp $ */
#include "global.h"
#define SPACE_CHAR 'i'
9:
/*
**! module Image
**! note
- **! $Id: font.c,v 1.62 2000/08/11 18:42:54 grubba Exp $
+ **! $Id: font.c,v 1.63 2000/08/14 14:26:37 grubba Exp $
**! class Font
**!
**! note
250:
/***************** internals ***********************************/
- static INLINE int char_space(struct font *this, INT32 c)
+ static INLINE ptrdiff_t char_space(struct font *this, INT32 c)
{
if(c==0x20)
return DOUBLE_TO_INT((double)(this->height*this->xspacing_scale)/4.5);
268: Inside #if undefined(HAVE_MMAP)
#ifndef HAVE_MMAP
static INLINE int my_read(int from, void *t, size_t towrite)
{
- int res;
+ ptrdiff_t res;
while((res = fd_read(from, t, towrite)) < 0)
{
switch(errno)
676:
if(char_width(this,c))
write_char(this->charinfo+c,
(img->img+xsize)+
- (img->xsize*(int)(j*this->height*this->yspacing_scale)),
+ (img->xsize*DOUBLE_TO_INT(j*this->height*
+ this->yspacing_scale)),
img->xsize,
this->height);
xsize += char_space(this, c);
695:
if(char_width(this,c))
write_char(this->charinfo+c,
(img->img+xsize)+
- (img->xsize*(int)(j*this->height*this->yspacing_scale)),
+ (img->xsize*DOUBLE_TO_INT(j*this->height*
+ this->yspacing_scale)),
img->xsize,
this->height);
xsize += char_space(this, c);
714:
if(char_width(this,c))
write_char(this->charinfo+c,
(img->img+xsize)+
- (img->xsize*(int)(j*this->height*this->yspacing_scale)),
+ (img->xsize*DOUBLE_TO_INT(j*this->height*
+ this->yspacing_scale)),
img->xsize,
this->height);
xsize += char_space(this, c);
825:
pop_n_elems(args);
push_int(maxwidth2);
- push_int(args * THIS->height * THIS->yspacing_scale);
+ push_int64(args * THIS->height * THIS->yspacing_scale);
f_aggregate(2);
}