mirror of
https://github.com/reactos/reactos.git
synced 2024-09-05 18:26:53 +00:00
Fix warnings, and compilation of dib24bppc.c/dib32bppc.c
svn path=/trunk/; revision=28777
This commit is contained in:
parent
f503e01b03
commit
2d5d8783a9
|
@ -130,7 +130,7 @@ DIB_16BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c)
|
||||||
"r"(SurfObj->lDelta), "r"(y2 - y1), "a"(c)
|
"r"(SurfObj->lDelta), "r"(y2 - y1), "a"(c)
|
||||||
: "cc", "memory", "%ecx");
|
: "cc", "memory", "%ecx");
|
||||||
#else
|
#else
|
||||||
PBYTE byteaddr = (ULONG_PTR)SurfObj->pvScan0 + y1 * SurfObj->lDelta;
|
PBYTE byteaddr = (PBYTE)(ULONG_PTR)SurfObj->pvScan0 + y1 * SurfObj->lDelta;
|
||||||
PWORD addr = (PWORD)byteaddr + x;
|
PWORD addr = (PWORD)byteaddr + x;
|
||||||
LONG lDelta = SurfObj->lDelta;
|
LONG lDelta = SurfObj->lDelta;
|
||||||
|
|
||||||
|
|
|
@ -43,6 +43,9 @@ DIB_24BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
ULONG Fill[3];
|
||||||
|
ULONG MultiCount;
|
||||||
|
|
||||||
/* Align to 4-byte address */
|
/* Align to 4-byte address */
|
||||||
while (0 != ((ULONG_PTR) addr & 0x3))
|
while (0 != ((ULONG_PTR) addr & 0x3))
|
||||||
{
|
{
|
||||||
|
|
|
@ -26,9 +26,10 @@
|
||||||
VOID
|
VOID
|
||||||
DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
|
DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
|
||||||
{
|
{
|
||||||
PBYTE byteaddr = (ULONG_PTR)SurfObj->pvScan0 + y * SurfObj->lDelta;
|
PBYTE byteaddr = (PBYTE)((ULONG_PTR)SurfObj->pvScan0 + y * SurfObj->lDelta);
|
||||||
PDWORD addr = (PDWORD)byteaddr + x1;
|
PDWORD addr = (PDWORD)byteaddr + x1;
|
||||||
LONG cx = x1;
|
LONG cx = x1;
|
||||||
|
|
||||||
while(cx < x2)
|
while(cx < x2)
|
||||||
{
|
{
|
||||||
*addr = (DWORD)c;
|
*addr = (DWORD)c;
|
||||||
|
|
Loading…
Reference in a new issue