Changeset 526 for abuse/trunkTweet

Timestamp:

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

Author:

Sam Hocevar

Message:

imlib: get rid of temporary memory allocations in image::FlipX()
and image::FlipY().

Location:

abuse/trunk/src

Files:

• imlib/image.cpp (modified) (1 diff)
• imlib/image.h (modified) (1 diff)
• items.cpp (modified) (1 diff)

abuse/trunk/src/imlib/image.cpp

@@ -1249 +1249 @@
 }
 
-void image::flip_x()
-{
-  uint8_t *rev=(uint8_t *)malloc(m_size.x), *sl;
-  CONDITION(rev, "memory allocation");
-  int y, x, i;
-
-  /* FIXME: Abuse Win32 uses RestoreSurface() here instead of locking */
-  Lock();
-  for (y=0; y<m_size.y; y++)
-  { sl=scan_line(y);
-    for (i=0, x=m_size.x-1; x>=0; x--, i++)
-      rev[i]=sl[x];
-    memcpy(sl, rev, m_size.x);
-  }
-  Unlock();
-  free(rev);
-}
-
-void image::flip_y()
-{
-  uint8_t *rev=(uint8_t *)malloc(m_size.x), *sl;
-  CONDITION(rev, "memory allocation");
-  int y;
-
-  /* FIXME: Abuse Win32 uses RestoreSurface() here instead of locking */
-  Lock();
-  for (y=0; y<m_size.y/2; y++)
-  { sl=scan_line(y);
-    memcpy(rev, sl, m_size.x);
-    memcpy(sl, scan_line(m_size.y-y-1), m_size.x);
-    memcpy(scan_line(m_size.y-y-1), rev, m_size.x);
-  }
-  Unlock();
-  free(rev);
-}
-
+void image::FlipX()
+{
+    Lock();
+    for (int y = 0; y < m_size.y; y++)
+    {
+        uint8_t *sl = scan_line(y);
+        for (int x = 0; x < m_size.x / 2; x++)
+        {
+            uint8_t tmp = sl[x];
+            sl[x] = sl[m_size.x - 1 - x];
+            sl[m_size.x - 1 - x] = tmp;
+        }
+    }
+    Unlock();
+}
+
+void image::FlipY()
+{
+    Lock();
+    for (int y = 0; y < m_size.y / 2; y++)
+    {
+        uint8_t *sl1 = scan_line(y);
+        uint8_t *sl2 = scan_line(m_size.y - 1 - y);
+        for (int x = 0; x < m_size.x; x++)
+        {
+            uint8_t tmp = sl1[x];
+            sl1[x] = sl2[x];
+            sl2[x] = tmp;
+        }
+    }
+    Unlock();
+}
+

abuse/trunk/src/imlib/image.h

@@ -169 +169 @@
     image *create_smooth(int16_t smoothness = 1); // 0 no smoothness
     void unpack_scanline(int16_t line, char bitsperpixel = 1);
-    void flip_x();
-    void flip_y();
+    void FlipX();
+    void FlipY();
 };
 

abuse/trunk/src/items.cpp

@@ -286 +286 @@
   image *im=load_image(fp);
   forward=new trans_image(im,"figure data");
-  im->flip_x();
+  im->FlipX();
   backward=new trans_image(im,"figure backward data");
   delete im;