Changeset 522Tweet

Timestamp:

Apr 22, 2011, 4:12:43 AM (12 years ago)

Author:

Sam Hocevar

Message:

imlib: change loop logic here and there to be nicer to the cache.

File:

• abuse/trunk/src/imlib/image.cpp (modified) (5 diffs)

abuse/trunk/src/imlib/image.cpp

@@ -237 +237 @@
 int32_t image::total_pixels(uint8_t background)
 {
-    int16_t i, j;
-    int32_t co;
-    uint8_t *c;
-
+    int ret = 0;
     Lock();
-    for(co = 0, i = m_size.y - 1; i >= 0; i--)
-    {
-        c = scan_line(i);
-        for(j = m_size.x - 1; j >= 0; j--, c++)
-            if(*c != background) co++;
+    for(int i = 0; i < m_size.y; i++)
+    {
+        uint8_t *c = scan_line(i);
+        for (int x = 0; x < m_size.x; x++)
+            if (c[x] != background)
+                ret++;
     }
     Unlock();
-    return co;
+    return ret;
 }
 
 void image::clear(int16_t color)
 {
-    int16_t i;
-
     Lock();
     if(color == -1)
@@ -262 +258 @@
     {
         if(m_special->x1_clip() < m_special->x2_clip())
-            for(i = m_special->y2_clip() - 1; i >= m_special->y1_clip(); i--)
-                memset(scan_line(i) + m_special->x1_clip(), color,
+            for(int j = m_special->y1_clip(); j <m_special->y2_clip(); j++)
+                memset(scan_line(j) + m_special->x1_clip(), color,
                        m_special->x2_clip() - m_special->x1_clip());
     }
     else
-        for(i = m_size.y - 1; i >= 0; i--)
-            memset(scan_line(i), color, m_size.x);
+        for(int j = 0; j < m_size.y; j++)
+            memset(scan_line(j), color, m_size.x);
     AddDirty(0, 0, m_size.x, m_size.y);
     Unlock();
@@ -278 +274 @@
     image *im = new image(m_size);
     im->Lock();
-    for(int i = m_size.y - 1; i >= 0; i--)
-        memcpy(im->scan_line(i), scan_line(i), m_size.x);
+    for(int j = 0; j < m_size.y; j++)
+        memcpy(im->scan_line(j), scan_line(j), m_size.x);
     im->Unlock();
     Unlock();
@@ -1125 +1121 @@
   uint8_t *sl;
   Lock();
-  for (y=m_size.y-1; y>=0; y--)
+  for (y = 0; y < m_size.y; y++)
   {
     sl=scan_line(y);
-    for (i=0, j=y%4, x=m_size.x-1; x>=0; x--)
-    {
-      if (pal->red(sl[x])>dt_matrix[j*4+i])
-    sl[x]=255;
-      else sl[x]=0;
-      if (i==3) i=0; else i++;
-    }
+    for (i=0, j=y%4, x=0; x < m_size.x; x++)
+      sl[x] = (pal->red(sl[x]) > dt_matrix[j * 4 + (x & 3)]) ? 255 : 0;
   }
   Unlock();
@@ -1198 +1189 @@
     dst=scan_line(ydst)+xdst;
     if (xd<0)
-      for (xt=xtot; xt; xt--)
-        *(dst++)=*(src++);
-      else for (xt=xtot; xt; xt--)
-        *(dst--)=*(src--);
+      for (xt = 0; xt < xtot; xt++)
+        *dst++ = *src++;
+      else for (xt = 0; xt < xtot; xt++)
+        *dst-- = *src--;
     if (yd<0) { ysrc++; ydst++; } else { ysrc--; ydst--; }
   }