Changeset 527 for abuse/trunk/src/imlib/supmorph.cppTweet

Timestamp:

Apr 22, 2011, 4:13:04 AM (11 years ago)

Author:

Sam Hocevar

Message:

imlib: some cleaning up in trans_image before I templatise half of it.

File:

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

abuse/trunk/src/imlib/supmorph.cpp

@@ -28 +28 @@
              int aneal_steps, void (*stat_fun)(int))
 {
-  int x,y,w1=hint1->width(),
-          h1=hint1->height(),
-          w2=hint2->width(),
-          h2=hint2->height();
+  int x,y,w1=hint1->Size().x,
+          h1=hint1->Size().y,
+          w2=hint2->Size().x,
+          h2=hint2->Size().y;
   if (w1>w2) w=w1; else w=w2;
   if (h1>h2) h=h1; else h=h2;
@@ -41 +41 @@
   memset(hints2,0,256*2);
 
-  dp=hint1->t_data();
+  dp=hint1->Data();
   for (y=0; y<h1; y++)
   {
@@ -58 +58 @@
 
   // hint2 image2
-  dp=hint2->t_data();
+  dp=hint2->Data();
   for (y=0; y<h2; y++)
   {
@@ -102 +102 @@
 
   /**************** Now scan the images again setup hints *********************/
-  dp=hint1->t_data();
+  dp=hint1->Data();
   for (y=0; y<h1; y++)
   {
@@ -124 +124 @@
   }
 
-  dp=hint2->t_data();
+  dp=hint2->Data();
   for (y=0; y<h2; y++)
   {