Ignore:
Timestamp:
Apr 20, 2011, 12:39:27 AM (11 years ago)
Author:
Sam Hocevar
Message:

imlib: use vec2i for image::size and unroll all necessary changes
everywhere else in the code.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • abuse/trunk/src/loader2.cpp

    r503 r512  
    1212
    1313#include <math.h>
     14
     15#include "common.h"
    1416
    1517#include "timing.h"
     
    7577  image *im=new image(e,fp);
    7678  if (scale_mult!=1 || scale_div!=1)
    77     im->resize(im->width()*scale_mult/scale_div,im->height()*scale_mult/scale_div);
     79    im->resize(im->Size().x*scale_mult/scale_div,im->Size().y*scale_mult/scale_div);
    7880  return im;
    7981}
     
    8385  image *im=new image(fp);
    8486  if (scale_mult!=1 || scale_div!=1)
    85     im->resize(im->width()*scale_mult/scale_div,im->height()*scale_mult/scale_div);
     87    im->resize(im->Size().x*scale_mult/scale_div,im->Size().y*scale_mult/scale_div);
    8688
    8789  return im;
     
    456458  f_wid=cache.foret(foretiles[0])->im->width();
    457459  f_hi=cache.foret(foretiles[0])->im->height();
    458   b_wid=cache.backt(backtiles[0])->im->width();
    459   b_hi=cache.backt(backtiles[0])->im->height();
     460  b_wid=cache.backt(backtiles[0])->im->Size().x;
     461  b_hi=cache.backt(backtiles[0])->im->Size().y;
    460462
    461463#if 0
Note: See TracChangeset for help on using the changeset viewer.