Branch: Tag:

2016-04-08

2016-04-08 19:48:49 by Martin Nilsson <nilsson@fastmail.com>

Removed DOUBLE_TO_INT

205:   static inline int char_space(struct font *this, INT32 c)   {    if(c==0x20) -  return DOUBLE_TO_INT((double)(this->height*this->xspacing_scale)/4.5); +  return (int)((double)(this->height*this->xspacing_scale)/4.5);    else if(c==0x20+128) -  return DOUBLE_TO_INT((this->height*this->xspacing_scale)/18); -  return DOUBLE_TO_INT(this->charinfo[c].spacing*this->xspacing_scale); +  return (int)((this->height*this->xspacing_scale)/18); +  return (int)(this->charinfo[c].spacing*this->xspacing_scale);   }      static inline int char_width(struct font *this, INT32 c)
587:    img = ((struct image*)o->storage);    img->xsize = maxwidth2;    if(args>1) -  img->ysize = DOUBLE_TO_INT(this->height+ +  img->ysize = (int)(this->height+    ((double)this->height*(double)(args-1)*    (double)this->yspacing_scale)+1);    else
633:    if(char_width(this,c))    write_char(this->charinfo+c,    (img->img+xsize)+ -  (img->xsize*DOUBLE_TO_INT(j*this->height* +  (img->xsize*(int)(j*this->height*    this->yspacing_scale)),    img->xsize,    this->height);
653:    if(char_width(this,c))    write_char(this->charinfo+c,    (img->img+xsize)+ -  (img->xsize*DOUBLE_TO_INT(j*this->height* +  (img->xsize*(int)(j*this->height*    this->yspacing_scale)),    img->xsize,    this->height);
673:    if(char_width(this,c))    write_char(this->charinfo+c,    (img->img+xsize)+ -  (img->xsize*DOUBLE_TO_INT(j*this->height* +  (img->xsize*(int)(j*this->height*    this->yspacing_scale)),    img->xsize,    this->height);