Merge pull request #2903 from mmaraya:2.4

11 years ago · d262b04d99
parent 2df3abe16b 5c85f816c9
commit d262b04d99
1 changed files with 1 additions and 1 deletions
--- a/modules/highgui/src/window_cocoa.mm
+++ b/modules/highgui/src/window_cocoa.mm
@ -253,7 +253,7 @@ CV_IMPL void cvResizeWindow( const char* name, int width, int height)
    //cout << "cvResizeWindow" << endl;
    NSAutoreleasePool* localpool = [[NSAutoreleasePool alloc] init];
    CVWindow *window = cvGetWindow(name);
-    if(window) {
+    if(window && ![window autosize]) {
        NSRect frame = [window frame];
        frame.size.width = width;
        frame.size.height = height;