https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31d616ff732c754c5de41e...
commit 31d616ff732c754c5de41eb8aad8c9ba4c5a189e Author: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com AuthorDate: Sun Jul 21 21:39:05 2019 +0900 Commit: GitHub noreply@github.com CommitDate: Sun Jul 21 21:39:05 2019 +0900
[WIN32SS][GDI] Assume pso->sizlBitmap.cy positiveness (#1743)
We assume pso->sizlBitmap.cy is positive. CORE-15995
Because pso->sizlBitmap.cy is certificated as a positive value after initialization in SURFACE_AllocSurface, so we can safely omit abs and labs (absolute) function calls for it. --- win32ss/gdi/dib/stretchblt.c | 4 ++-- win32ss/gdi/ntgdi/bitmaps.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/win32ss/gdi/dib/stretchblt.c b/win32ss/gdi/dib/stretchblt.c index cbcdad2f88c..c768cf8e34c 100644 --- a/win32ss/gdi/dib/stretchblt.c +++ b/win32ss/gdi/dib/stretchblt.c @@ -58,7 +58,7 @@ BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, SURFOBJ *Ma
if (UsesSource) { - SourceCy = abs(SourceSurf->sizlBitmap.cy); + SourceCy = SourceSurf->sizlBitmap.cy; fnSource_GetPixel = DibFunctionsForBitmapFormat[SourceSurf->iBitmapFormat].DIB_GetPixel; DPRINT("Source BPP: %u, srcRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom); @@ -67,7 +67,7 @@ BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, SURFOBJ *Ma if (MaskSurf) { fnMask_GetPixel = DibFunctionsForBitmapFormat[MaskSurf->iBitmapFormat].DIB_GetPixel; - MaskCy = abs(MaskSurf->sizlBitmap.cy); + MaskCy = MaskSurf->sizlBitmap.cy; }
DstHeight = DestRect->bottom - DestRect->top; diff --git a/win32ss/gdi/ntgdi/bitmaps.c b/win32ss/gdi/ntgdi/bitmaps.c index 59fb5dd9d15..dbde5fd42c2 100644 --- a/win32ss/gdi/ntgdi/bitmaps.c +++ b/win32ss/gdi/ntgdi/bitmaps.c @@ -59,7 +59,7 @@ UnsafeSetBitmapBits( NT_ASSERT(psurf->SurfObj.iBitmapFormat <= BMF_32BPP);
nWidth = psurf->SurfObj.sizlBitmap.cx; - nHeight = labs(psurf->SurfObj.sizlBitmap.cy); + nHeight = psurf->SurfObj.sizlBitmap.cy; cBitsPixel = BitsPerFormat(psurf->SurfObj.iBitmapFormat);
pjDst = psurf->SurfObj.pvScan0; @@ -509,7 +509,7 @@ UnsafeGetBitmapBits( ULONG Y, iSrc, iDst, cbSrc, cbDst, nWidth, nHeight, cBitsPixel;
nWidth = psurf->SurfObj.sizlBitmap.cx; - nHeight = labs(psurf->SurfObj.sizlBitmap.cy); + nHeight = psurf->SurfObj.sizlBitmap.cy; cBitsPixel = BitsPerFormat(psurf->SurfObj.iBitmapFormat);
/* Get pointers */ @@ -575,7 +575,7 @@ NtGdiGetBitmapBits( /* Calculate the size of the bitmap in bytes */ cjSize = WIDTH_BYTES_ALIGN16(psurf->SurfObj.sizlBitmap.cx, BitsPerFormat(psurf->SurfObj.iBitmapFormat)) * - abs(psurf->SurfObj.sizlBitmap.cy); + psurf->SurfObj.sizlBitmap.cy;
/* If the bits vector is null, the function should return the read size */ if (pUnsafeBits == NULL)
-
Katayama Hirofumi MZ