Mercurial > mm7

changeset 2332:defd2526c94c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Wed, 02 Apr 2014 20:53:35 +0600
parents a59892f99d31
children 82851980e3d8
files Render.cpp
diffstat 1 files changed, 7 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Render.cpp	Sun Mar 23 19:55:59 2014 +0600
+++ b/Render.cpp	Wed Apr 02 20:53:35 2014 +0600
@@ -6609,11 +6609,11 @@
   //unsigned __int16 *v5; // edx@3
   unsigned __int16 *v6; // esi@3
   unsigned int v8; // eax@5
-  unsigned int v9; // ebx@5
+  //unsigned int v9; // ebx@5
   unsigned int v11; // eax@7
   unsigned int v12; // ebx@8
   unsigned int v15; // eax@14
-  int v19; // [sp+10h] [bp-8h]@3
+  //int v19; // [sp+10h] [bp-8h]@3
   unsigned int uOutXa; // [sp+20h] [bp+8h]@16
   int v23; // [sp+28h] [bp+10h]@3
 
@@ -6623,35 +6623,31 @@
     //v5 = &this->pTargetSurface[uOutX + uOutY * this->uTargetSurfacePitch];
     v6 = a4->pPixels;
     v23 = a4->uHeight;
-    v19 = v4;
+    ///v19 = v4;
     if ( this->bClip )
     {
       if ( (signed int)uOutX < (signed int)this->uClipX )
       {
         v8 = this->uClipX - uOutX;
-        v9 = uOutX - this->uClipX;
+        //v9 = uOutX - this->uClipX;
         v8 *= 2;
-        v4 += v9;
+        v4 += uOutX - this->uClipX;
         v6 = (unsigned __int16 *)((char *)v6 + v8);
         //v5 = (unsigned __int16 *)((char *)v5 + v8);
       }
       if ( (signed int)uOutY < (signed int)this->uClipY )
       {
         v11 = this->uClipY - uOutY;
-        v6 += v19 * v11;
+        v6 += a4->uWidth * v11;
         v23 += uOutY - this->uClipY;
         //v5 += this->uTargetSurfacePitch * v11;
       }
       v12 = max(this->uClipX, uOutX);
       if ( (signed int)(v4 + v12) > (signed int)this->uClipZ )
-      {
         v4 = this->uClipZ - max(this->uClipX, uOutX);
-      }
       v15 = max(this->uClipY, uOutY);
       if ( (signed int)(v15 + v23) > (signed int)this->uClipW )
-      {
         v23 = this->uClipW - max(this->uClipY, uOutY);
-      }
     }
 
     for (int y = 0; y < v23; y++)
@@ -6663,7 +6659,7 @@
         //++v5;
         ++v6;
       }
-      v6 += v19 - v4;
+      v6 += a4->uWidth - v4;
       //v5 += this->uTargetSurfacePitch - v4;
     }
   }