mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-31 01:47:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7193 from valeriyvan:osxcleanup

Browse Source
This commit is contained in:
Alexander Alekhin 2016-09-14 11:51:25 +00:00
commit adbf2dc9f1
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,42 +82,26 @@ static NSAutoreleasePool *pool = nil;
static NSMutableDictionary *windows = nil;
static bool wasInitialized = false;
@interface CVView : NSView {
NSImage *image;
}
@property(retain) NSImage *image;
@interface CVView : NSView
@property(strong) NSImage *image;
- (void)setImageData:(CvArr *)arr;
@end
@interface CVSlider : NSView {
NSSlider *slider;
NSTextField *name;
int *value;
void *userData;
CvTrackbarCallback callback;
CvTrackbarCallback2 callback2;
}
@property(retain) NSSlider *slider;
@property(retain) NSTextField *name;
@interface CVSlider : NSView
@property(strong) NSSlider *slider;
@property(strong) NSTextField *name;
@property(assign) int *value;
@property(assign) void *userData;
@property(assign) CvTrackbarCallback callback;
@property(assign) CvTrackbarCallback2 callback2;
@end
@interface CVWindow : NSWindow {
NSMutableDictionary *sliders;
CvMouseCallback mouseCallback;
void *mouseParam;
BOOL autosize;
BOOL firstContent;
int status;
}
@interface CVWindow : NSWindow
@property(assign) CvMouseCallback mouseCallback;
@property(assign) void *mouseParam;
@property(assign) BOOL autosize;
@property(assign) BOOL firstContent;
@property(retain) NSMutableDictionary *sliders;
@property(strong) NSMutableDictionary *sliders;
@property(readwrite) int status;
- (CVView *)contentView;
- (void)cvSendMouseEvent:(NSEvent *)event type:(int)type flags:(int)flags;