Some fixes for build with MinGW
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@18 67173fc5-114c-0410-ac8e-9d2fd5bffc1fpull/1/head
parent
a052251bcf
commit
851ec21ee5
|
@ -1263,9 +1263,9 @@ INT_PTR CALLBACK MessageProc(HWND hwndDlg,UINT uMsg,
|
||||||
|
|
||||||
if(IDC_LCOLOR1 == pcStruct->CtlID)
|
if(IDC_LCOLOR1 == pcStruct->CtlID)
|
||||||
{
|
{
|
||||||
unsigned char r = unsigned char((g_avLightColors[0] >> 16) & 0xFF);
|
unsigned char r = (unsigned char)((g_avLightColors[0] >> 16) & 0xFF);
|
||||||
unsigned char g = unsigned char((g_avLightColors[0] >> 8) & 0xFF);
|
unsigned char g = (unsigned char)((g_avLightColors[0] >> 8) & 0xFF);
|
||||||
unsigned char b = unsigned char((g_avLightColors[0]) & 0xFF);
|
unsigned char b = (unsigned char)((g_avLightColors[0]) & 0xFF);
|
||||||
HBRUSH hbr = CreateSolidBrush(RGB(r,g,b));
|
HBRUSH hbr = CreateSolidBrush(RGB(r,g,b));
|
||||||
|
|
||||||
FillRect(pcStruct->hDC,&sRect,hbr);
|
FillRect(pcStruct->hDC,&sRect,hbr);
|
||||||
|
@ -1278,9 +1278,9 @@ INT_PTR CALLBACK MessageProc(HWND hwndDlg,UINT uMsg,
|
||||||
}
|
}
|
||||||
else if(IDC_LCOLOR2 == pcStruct->CtlID)
|
else if(IDC_LCOLOR2 == pcStruct->CtlID)
|
||||||
{
|
{
|
||||||
unsigned char r = unsigned char((g_avLightColors[1] >> 16) & 0xFF);
|
unsigned char r = (unsigned char)((g_avLightColors[1] >> 16) & 0xFF);
|
||||||
unsigned char g = unsigned char((g_avLightColors[1] >> 8) & 0xFF);
|
unsigned char g = (unsigned char)((g_avLightColors[1] >> 8) & 0xFF);
|
||||||
unsigned char b = unsigned char((g_avLightColors[1]) & 0xFF);
|
unsigned char b = (unsigned char)((g_avLightColors[1]) & 0xFF);
|
||||||
HBRUSH hbr = CreateSolidBrush(RGB(r,g,b));
|
HBRUSH hbr = CreateSolidBrush(RGB(r,g,b));
|
||||||
FillRect(pcStruct->hDC,&sRect,hbr);
|
FillRect(pcStruct->hDC,&sRect,hbr);
|
||||||
|
|
||||||
|
@ -1291,9 +1291,9 @@ INT_PTR CALLBACK MessageProc(HWND hwndDlg,UINT uMsg,
|
||||||
}
|
}
|
||||||
else if(IDC_LCOLOR3 == pcStruct->CtlID)
|
else if(IDC_LCOLOR3 == pcStruct->CtlID)
|
||||||
{
|
{
|
||||||
unsigned char r = unsigned char((g_avLightColors[2] >> 16) & 0xFF);
|
unsigned char r = (unsigned char)((g_avLightColors[2] >> 16) & 0xFF);
|
||||||
unsigned char g = unsigned char((g_avLightColors[2] >> 8) & 0xFF);
|
unsigned char g = (unsigned char)((g_avLightColors[2] >> 8) & 0xFF);
|
||||||
unsigned char b = unsigned char((g_avLightColors[2]) & 0xFF);
|
unsigned char b = (unsigned char)((g_avLightColors[2]) & 0xFF);
|
||||||
HBRUSH hbr = CreateSolidBrush(RGB(r,g,b));
|
HBRUSH hbr = CreateSolidBrush(RGB(r,g,b));
|
||||||
|
|
||||||
FillRect(pcStruct->hDC,&sRect,hbr);
|
FillRect(pcStruct->hDC,&sRect,hbr);
|
||||||
|
|
Loading…
Reference in New Issue