Changeset 512 for abuse/trunk/src/imlib/pcxread.cppTweet

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:

• abuse/trunk/src/imlib/pcxread.cpp (modified) (3 diffs)

abuse/trunk/src/imlib/pcxread.cpp

@@ -10 +10 @@
 
 #include "config.h"
+
+#include "common.h"
 
 #include "pcxread.h"
@@ -60 +62 @@
   PCX_header.xmin=0;
   PCX_header.ymin=0;
-  PCX_header.xmax=im->width()-1;
-  PCX_header.ymax=im->height()-1;
+  PCX_header.xmax=im->Size().x-1;
+  PCX_header.ymax=im->Size().y-1;
   PCX_header.hres=320;
   PCX_header.vres=200;
   PCX_header.reserved=0;
   PCX_header.color_planes=1;
-  PCX_header.bytes_per_line=im->width();
+  PCX_header.bytes_per_line=im->Size().x;
   PCX_header.palette_type=0;
   memset(PCX_header.filter,0,58);
@@ -78 +80 @@
   int y,run_length,x;
   unsigned char *sl,code;
-  for (y=0; y<im->height(); y++)
+  for (y=0; y<im->Size().y; y++)
   {
     sl=im->scan_line(y);
-    for (x=0; x<im->width(); )
+    for (x=0; x<im->Size().x; )
     {
       run_length=1;
-      while (x+run_length<im->width() && sl[x]==sl[x+run_length])
+      while (x+run_length<im->Size().x && sl[x]==sl[x+run_length])
         run_length++;
       if (run_length==1 && sl[x]<64)