mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 15:53:03 +04:00
Merge pull request #14292 from alalek:issue_14291
* macosx: fix C++11 build
backporting commit c3cf35ab63
* macosx: eliminate build warning
This commit is contained in:
committed by
GitHub
parent
c8056b3e27
commit
7621b91769
@@ -266,7 +266,7 @@ CV_IMPL void cvResizeWindow( const char* name, int width, int height)
|
||||
CVWindow *window = cvGetWindow(name);
|
||||
if(window && ![window autosize]) {
|
||||
height += [window contentView].sliderHeight;
|
||||
NSSize size = { width, height };
|
||||
NSSize size = { (CGFloat)width, (CGFloat)height };
|
||||
[window setContentSize:size];
|
||||
}
|
||||
[localpool drain];
|
||||
|
||||
Reference in New Issue
Block a user