Merge pull request #3409 from fish2000:patch-1

This commit is contained in:
Vadim Pisarevsky 2014-11-19 16:25:36 +00:00
commit ba9bc2d72f

View File

@ -150,7 +150,7 @@ CV_IMPL int cvInitSystem( int , char** )
#define NSAppKitVersionNumber10_5 949 #define NSAppKitVersionNumber10_5 949
#endif #endif
if( floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5 ) if( floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5 )
[application setActivationPolicy:0/*NSApplicationActivationPolicyRegular*/]; [application setActivationPolicy:NSApplicationActivationPolicyRegular];
#endif #endif
//[application finishLaunching]; //[application finishLaunching];
//atexit(icvCocoaCleanup); //atexit(icvCocoaCleanup);