Mercurial > mm7

changeset 1834:0b44f4d67c18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Tue, 08 Oct 2013 15:27:57 +0600
parents 724af9295e53 (diff) 9442b7c19a64 (current diff)
children a5637690ffbb
files NewUI/UIControl.h mm7_2.cpp
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Render.cpp	Tue Oct 08 11:06:24 2013 +0200
+++ b/Render.cpp	Tue Oct 08 15:27:57 2013 +0600
@@ -6437,7 +6437,7 @@
 
         if ( LockSurface_DDraw4(pNextSurf, &desc, DDLOCK_WAIT | DDLOCK_WRITEONLY) )
         {
-          /*Dst.sub_451007_scale_image_bicubic(
+          Dst.sub_451007_scale_image_bicubic(
             pHWLTexture->pPixels,
             pHWLTexture->uWidth,
             pHWLTexture->uHeight,
@@ -6447,7 +6447,7 @@
             desc.dwHeight,
             desc.lPitch >> 1,
             0,
-            0);*/
+            0);
           ErrD3D(pNextSurf->Unlock(0));
           //bMipMaps = 0x4D86ACu;
         }
--- a/mm7_2.cpp	Tue Oct 08 11:06:24 2013 +0200
+++ b/mm7_2.cpp	Tue Oct 08 15:27:57 2013 +0600
@@ -850,7 +850,6 @@
 
 
 
-
 //----- (00451007) --------------------------------------------------------
 int stru350::sub_451007_scale_image_bicubic(unsigned short *pSrc, int srcWidth, int srcHeight, int srcPitch,          //changing this to some library function might be a good idea
                                             unsigned short *pDst, int dstWidth, int dstHeight, int dstPitch,