generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed compilation problems with MinGW after rev7353

Browse Source
This commit is contained in:
Alexander Shishkov 2012-02-28 12:39:25 +00:00
parent f1f045858f
commit d05b788db4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/highgui/src/window_w32.cpp
View File

@ -1513,7 +1513,7 @@ cvShowImageHWND(HWND w_hWnd, const CvArr* arr)
FillBitmapInfo( binfo, size.cx, size.cy, channels*8, 1 ); FillBitmapInfo( binfo, size.cx, size.cy, channels*8, 1 );
HGDIOBJ tempImage = SelectObject( hdc, CreateDIBSection( hdc, binfo, DIB_RGB_COLORS, &dst_ptr, 0, 0)); SelectObject( hdc, CreateDIBSection( hdc, binfo, DIB_RGB_COLORS, &dst_ptr, 0, 0));
} }
cvInitMatHeader( &dst, size.cy, size.cx, CV_8UC3, dst_ptr, (size.cx * channels + 3) & -4 ); cvInitMatHeader( &dst, size.cy, size.cx, CV_8UC3, dst_ptr, (size.cx * channels + 3) & -4 );
@ -1522,7 +1522,7 @@ cvShowImageHWND(HWND w_hWnd, const CvArr* arr)
// Image stretching to fit the window // Image stretching to fit the window
RECT rect; RECT rect;
GetClientRect(w_hWnd, &rect); GetClientRect(w_hWnd, &rect);
int bSuccess = StretchDIBits( hdc, 0, 0, rect.right, rect.bottom, 0, 0, image->width, image->height, dst_ptr, &tempbinfo, DIB_RGB_COLORS, SRCCOPY ); StretchDIBits( hdc, 0, 0, rect.right, rect.bottom, 0, 0, image->width, image->height, dst_ptr, &tempbinfo, DIB_RGB_COLORS, SRCCOPY );
// ony resize window if needed // ony resize window if needed
InvalidateRect(w_hWnd, 0, 0); InvalidateRect(w_hWnd, 0, 0);