third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14292 from alalek:issue_14291

Browse Source 
* macosx: fix C++11 build

backporting commit c3cf35ab63

* macosx: eliminate build warning
This commit is contained in:
Alexander Alekhin 2019-04-11 17:46:28 +03:00 committed by GitHub
parent c8056b3e27
commit 7621b91769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/highgui/src/window_cocoa.mm
View File

@ -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];

2
modules/videoio/src/cap_avfoundation_mac.mm
View File

@ -181,7 +181,7 @@ class CvVideoWriter_AVFoundation : public CvVideoWriter {
double fps, CvSize frame_size,
int is_color=1);
~CvVideoWriter_AVFoundation();
bool writeFrame(const IplImage* image);
bool writeFrame(const IplImage* image) CV_OVERRIDE;
int getCaptureDomain() const CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
private:
IplImage* argbimage;