Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-12 14:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DIBLIB]

Browse source 
- Fix GCC compilation

svn path=/trunk/; revision=56933
This commit is contained in:
Jérôme Gardou 2012-07-22 00:15:02 +00:00
parent da04e4981b
commit 3465a99308
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c
View file

@ -45,14 +45,15 @@ Dib_BitBlt_SRCCOPY_S32_D32_EqSurf(PBLTDATA pBltData)
pjSrcBase += pBltData->siSrc.cjAdvanceY; pjSrcBase += pBltData->siSrc.cjAdvanceY;
} }
} }
#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf_manual 1
#else #else
#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf Dib_BitBlt_SRCCOPY_EqSurf #define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf Dib_BitBlt_SRCCOPY_EqSurf
#endif #endif
#define Dib_BitBlt_SRCCOPY_S8_D8_EqSurf_manual 1 #define Dib_BitBlt_SRCCOPY_EqSurf_manual 1
#define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf_manual 1 // #define Dib_BitBlt_SRCCOPY_S16_D16_EqSurf_manual 1
#define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf_manual 1 // #define Dib_BitBlt_SRCCOPY_S24_D24_EqSurf_manual 1
#define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf_manual 1 // #define Dib_BitBlt_SRCCOPY_S32_D32_EqSurf_manual 1
#define __USES_SOURCE 1 #define __USES_SOURCE 1
#define __USES_PATTERN 0 #define __USES_PATTERN 0

7
reactos/win32ss/gdi/diblib/DibLib.h
View file

@ -30,15 +30,16 @@ extern const BYTE ajShift4[2];
#define __PASTE_(s1,s2) s1##s2 #define __PASTE_(s1,s2) s1##s2
#define __PASTE(s1,s2) __PASTE_(s1,s2) #define __PASTE(s1,s2) __PASTE_(s1,s2)
#define EVALUATE(x) x
#define __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) Dib_ ## name ## _S ## src_bpp ## _D ## dst_bpp #define __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) Dib_ ## name ## _S ## src_bpp ## _D ## dst_bpp
#define __DIB_FUNCTION_NAME_SRCDST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) #define __DIB_FUNCTION_NAME_SRCDST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp)
#define __DIB_FUNCTION_NAME_DST2(name, dst_bpp) Dib_ ## name ## _D ## dst_bpp #define __DIB_FUNCTION_NAME_DST2(name, dst_bpp) Dib_ ## name ## _D ## dst_bpp
#define __DIB_FUNCTION_NAME_DST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_DST2(name, dst_bpp) #define __DIB_FUNCTION_NAME_DST(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_DST2(name, dst_bpp)
#define __DIB_FUNCTION_NAME_SRCDSTEQ(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurf #define __DIB_FUNCTION_NAME_SRCDSTEQ(name, src_bpp, dst_bpp) __PASTE(__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp), _EqSurf)
#define __DIB_FUNCTION_NAME_SRCDSTEQL2R(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurfL2R #define __DIB_FUNCTION_NAME_SRCDSTEQL2R(name, src_bpp, dst_bpp) __PASTE(__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp), _EqSurfL2R)
#define __DIB_FUNCTION_NAME_SRCDSTEQR2L(name, src_bpp, dst_bpp) __DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp) ## _EqSurfR2L #define __DIB_FUNCTION_NAME_SRCDSTEQR2L(name, src_bpp, dst_bpp) __PASTE(__DIB_FUNCTION_NAME_SRCDST2(name, src_bpp, dst_bpp), _EqSurfR2L)
#define _ReadPixel_1(pjSource, jShift) (((*(pjSource)) >> (jShift)) & 1) #define _ReadPixel_1(pjSource, jShift) (((*(pjSource)) >> (jShift)) & 1)
#define _WritePixel_1(pjDest, jShift, ulColor) (void)(*(pjDest) = (UCHAR)((*(pjDest) & ~(1<<(jShift))) | ((ulColor)<<(jShift)))) #define _WritePixel_1(pjDest, jShift, ulColor) (void)(*(pjDest) = (UCHAR)((*(pjDest) & ~(1<<(jShift))) | ((ulColor)<<(jShift))))