Skip to content

Commit 7621b91

Browse files
authored
Merge pull request opencv#14292 from alalek:issue_14291
* macosx: fix C++11 build backporting commit c3cf35a * macosx: eliminate build warning
1 parent c8056b3 commit 7621b91

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

modules/highgui/src/window_cocoa.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ CV_IMPL void cvResizeWindow( const char* name, int width, int height)
266266
CVWindow *window = cvGetWindow(name);
267267
if(window && ![window autosize]) {
268268
height += [window contentView].sliderHeight;
269-
NSSize size = { width, height };
269+
NSSize size = { (CGFloat)width, (CGFloat)height };
270270
[window setContentSize:size];
271271
}
272272
[localpool drain];

modules/videoio/src/cap_avfoundation_mac.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ - (IplImage*)getOutput;
181181
double fps, CvSize frame_size,
182182
int is_color=1);
183183
~CvVideoWriter_AVFoundation();
184-
bool writeFrame(const IplImage* image);
184+
bool writeFrame(const IplImage* image) CV_OVERRIDE;
185185
int getCaptureDomain() const CV_OVERRIDE { return cv::CAP_AVFOUNDATION; }
186186
private:
187187
IplImage* argbimage;

0 commit comments

Comments
 (0)