Unverified Commit 7621b917 authored by Alexander Alekhin's avatar Alexander Alekhin Committed by GitHub

Merge pull request #14292 from alalek:issue_14291

* macosx: fix C++11 build

backporting commit c3cf35ab

* macosx: eliminate build warning
parent c8056b3e
...@@ -266,7 +266,7 @@ CV_IMPL void cvResizeWindow( const char* name, int width, int height) ...@@ -266,7 +266,7 @@ CV_IMPL void cvResizeWindow( const char* name, int width, int height)
CVWindow *window = cvGetWindow(name); CVWindow *window = cvGetWindow(name);
if(window && ![window autosize]) { if(window && ![window autosize]) {
height += [window contentView].sliderHeight; height += [window contentView].sliderHeight;
NSSize size = { width, height }; NSSize size = { (CGFloat)width, (CGFloat)height };
[window setContentSize:size]; [window setContentSize:size];
} }
[localpool drain]; [localpool drain];
......
...@@ -181,7 +181,7 @@ class CvVideoWriter_AVFoundation : public CvVideoWriter { ...@@ -181,7 +181,7 @@ class CvVideoWriter_AVFoundation : public CvVideoWriter {
double fps, CvSize frame_size, double fps, CvSize frame_size,
int is_color=1); int is_color=1);
~CvVideoWriter_AVFoundation(); ~CvVideoWriter_AVFoundation();
bool writeFrame(const IplImage* image); bool writeFrame(const IplImage* image) CV_OVERRIDE;
int getCaptureDomain() const CV_OVERRIDE { return cv::CAP_AVFOUNDATION; } int getCaptureDomain() const CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
private: private:
IplImage* argbimage; IplImage* argbimage;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment