mirror of
https://github.com/zxing/zxing.git
synced 2024-11-10 04:54:04 -08:00
fix objc init signatures
git-svn-id: https://zxing.googlecode.com/svn/trunk@1953 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
parent
f395cd4a48
commit
7762515c59
|
@ -27,7 +27,7 @@
|
|||
|
||||
@implementation ZXBinarizer
|
||||
|
||||
- (ZXBinarizer*)initWithNative:(zxing::Binarizer*)binarizer {
|
||||
- (id)initWithNative:(zxing::Binarizer*)binarizer {
|
||||
if ((self = [super init])) {
|
||||
native = binarizer;
|
||||
}
|
||||
|
|
|
@ -97,29 +97,29 @@ class CGImageLuminanceSource : public LuminanceSource {
|
|||
width:(size_t)width
|
||||
height:(size_t)height;
|
||||
|
||||
- (ZXCGImageLuminanceSource*)initWithZXImage:(ZXImage*)image
|
||||
left:(size_t)left
|
||||
top:(size_t)top
|
||||
width:(size_t)width
|
||||
- (id)initWithZXImage:(ZXImage*)image
|
||||
left:(size_t)left
|
||||
top:(size_t)top
|
||||
width:(size_t)width
|
||||
height:(size_t)height;
|
||||
|
||||
- (ZXCGImageLuminanceSource*)initWithZXImage:(ZXImage*)image;
|
||||
- (id)initWithZXImage:(ZXImage*)image;
|
||||
|
||||
- (ZXCGImageLuminanceSource*)initWithCGImage:(CGImageRef)image
|
||||
left:(size_t)left
|
||||
top:(size_t)top
|
||||
width:(size_t)width
|
||||
height:(size_t)height;
|
||||
- (id)initWithCGImage:(CGImageRef)image
|
||||
left:(size_t)left
|
||||
top:(size_t)top
|
||||
width:(size_t)width
|
||||
height:(size_t)height;
|
||||
|
||||
- (ZXCGImageLuminanceSource*)initWithCGImage:(CGImageRef)image;
|
||||
- (id)initWithCGImage:(CGImageRef)image;
|
||||
|
||||
- (ZXCGImageLuminanceSource*)initWithBuffer:(CVPixelBufferRef)buffer
|
||||
left:(size_t)left
|
||||
top:(size_t)top
|
||||
width:(size_t)width
|
||||
height:(size_t)height;
|
||||
- (id)initWithBuffer:(CVPixelBufferRef)buffer
|
||||
left:(size_t)left
|
||||
top:(size_t)top
|
||||
width:(size_t)width
|
||||
height:(size_t)height;
|
||||
|
||||
- (ZXCGImageLuminanceSource*)initWithBuffer:(CVPixelBufferRef)buffer;
|
||||
- (id)initWithBuffer:(CVPixelBufferRef)buffer;
|
||||
|
||||
- (CGImageRef)image;
|
||||
|
||||
|
|
|
@ -33,45 +33,45 @@
|
|||
(buffer, left, top, width, height);
|
||||
}
|
||||
|
||||
- (ZXCGImageLuminanceSource*)initWithZXImage:(ZXImage*)image
|
||||
left:(size_t)left
|
||||
top:(size_t)top
|
||||
width:(size_t)width
|
||||
height:(size_t)height {
|
||||
[super initWithNative:new zxing::CGImageLuminanceSource(image.cgimage, left, top, width, height)];
|
||||
- (id)initWithZXImage:(ZXImage*)image
|
||||
left:(size_t)left
|
||||
top:(size_t)top
|
||||
width:(size_t)width
|
||||
height:(size_t)height {
|
||||
self = [super initWithNative:new zxing::CGImageLuminanceSource(image.cgimage, left, top, width, height)];
|
||||
return self;
|
||||
}
|
||||
|
||||
- (ZXCGImageLuminanceSource*)initWithZXImage:(ZXImage*)image {
|
||||
[super initWithNative:new zxing::CGImageLuminanceSource(image.cgimage)];
|
||||
- (id)initWithZXImage:(ZXImage*)image {
|
||||
self = [super initWithNative:new zxing::CGImageLuminanceSource(image.cgimage)];
|
||||
return self;
|
||||
}
|
||||
|
||||
- (ZXCGImageLuminanceSource*)initWithCGImage:(CGImageRef)image
|
||||
left:(size_t)left
|
||||
top:(size_t)top
|
||||
width:(size_t)width
|
||||
height:(size_t)height {
|
||||
[super initWithNative:new zxing::CGImageLuminanceSource(image, left, top, width, height)];
|
||||
- (id)initWithCGImage:(CGImageRef)image
|
||||
left:(size_t)left
|
||||
top:(size_t)top
|
||||
width:(size_t)width
|
||||
height:(size_t)height {
|
||||
self = [super initWithNative:new zxing::CGImageLuminanceSource(image, left, top, width, height)];
|
||||
return self;
|
||||
}
|
||||
|
||||
- (ZXCGImageLuminanceSource*)initWithCGImage:(CGImageRef)image {
|
||||
[super initWithNative:new zxing::CGImageLuminanceSource(image)];
|
||||
- (id)initWithCGImage:(CGImageRef)image {
|
||||
self = [super initWithNative:new zxing::CGImageLuminanceSource(image)];
|
||||
return self;
|
||||
}
|
||||
|
||||
- (ZXCGImageLuminanceSource*)initWithBuffer:(CVPixelBufferRef)buffer
|
||||
left:(size_t)left
|
||||
top:(size_t)top
|
||||
width:(size_t)width
|
||||
height:(size_t)height {
|
||||
[super initWithNative:new zxing::CGImageLuminanceSource(buffer, left, top, width, height)];
|
||||
- (id)initWithBuffer:(CVPixelBufferRef)buffer
|
||||
left:(size_t)left
|
||||
top:(size_t)top
|
||||
width:(size_t)width
|
||||
height:(size_t)height {
|
||||
self = [super initWithNative:new zxing::CGImageLuminanceSource(buffer, left, top, width, height)];
|
||||
return self;
|
||||
}
|
||||
|
||||
- (ZXCGImageLuminanceSource*)initWithBuffer:(CVPixelBufferRef)buffer {
|
||||
[super initWithNative:new zxing::CGImageLuminanceSource(buffer)];
|
||||
- (id)initWithBuffer:(CVPixelBufferRef)buffer {
|
||||
self = [super initWithNative:new zxing::CGImageLuminanceSource(buffer)];
|
||||
return self;
|
||||
}
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
zxing::Ref<zxing::LuminanceSource> native;
|
||||
}
|
||||
|
||||
- (ZXLuminanceSource*)initWithNative:(zxing::LuminanceSource*)native;
|
||||
- (id)initWithNative:(zxing::LuminanceSource*)native;
|
||||
- (zxing::LuminanceSource*)native;
|
||||
|
||||
@end
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
@implementation ZXLuminanceSource
|
||||
|
||||
- (ZXLuminanceSource*)initWithNative:(zxing::LuminanceSource*)_native {
|
||||
- (id)initWithNative:(zxing::LuminanceSource*)_native {
|
||||
native = _native;
|
||||
return self;
|
||||
}
|
||||
|
|
|
@ -20,6 +20,6 @@
|
|||
@interface ZXQRCodeReader : ZXReader {
|
||||
}
|
||||
|
||||
- (ZXQRCodeReader*)init;
|
||||
- (id)init;
|
||||
|
||||
@end
|
||||
|
|
|
@ -20,9 +20,9 @@
|
|||
|
||||
@implementation ZXQRCodeReader
|
||||
|
||||
- (ZXQRCodeReader*)init {
|
||||
- (id)init {
|
||||
zxing::qrcode::QRCodeReader* multi = new zxing::qrcode::QRCodeReader();
|
||||
[super initWithReader:multi];
|
||||
self = [super initWithReader:multi];
|
||||
return self;
|
||||
}
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
zxing::Ref<zxing::Reader> reader;
|
||||
}
|
||||
|
||||
- (ZXReader*)initWithReader:(zxing::Reader*)reader;
|
||||
- (id)initWithReader:(zxing::Reader*)reader;
|
||||
- (ZXResult*)decode:(ZXBinaryBitmap*)bitmap hints:(ZXDecodeHints*)hints;
|
||||
|
||||
@end
|
||||
|
|
Loading…
Reference in a new issue