QRcodeReader changed to MultiFormatReader (qrcode and one-d code detection)

git-svn-id: https://zxing.googlecode.com/svn/trunk@1197 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
warcholuke 2010-02-02 20:40:12 +00:00
parent 76272e8525
commit 3f6ba8771a

View file

@ -24,6 +24,8 @@
#import "TwoDDecoderResult.h" #import "TwoDDecoderResult.h"
#include <zxing/qrcode/QRCodeReader.h> #include <zxing/qrcode/QRCodeReader.h>
#include <zxing/MultiFormatReader.h>
#include <zxing/BinaryBitmap.h> #include <zxing/BinaryBitmap.h>
#include <zxing/ReaderException.h> #include <zxing/ReaderException.h>
#include <zxing/common/IllegalArgumentException.h> #include <zxing/common/IllegalArgumentException.h>
@ -31,7 +33,6 @@
#include "GrayBytesMonochromeBitmapSource.h" #include "GrayBytesMonochromeBitmapSource.h"
using namespace zxing; using namespace zxing;
using namespace zxing::qrcode;
@implementation Decoder @implementation Decoder
@ -139,9 +140,10 @@ using namespace zxing::qrcode;
- (void)decode:(id)arg { - (void)decode:(id)arg {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
{ {
QRCodeReader reader;
MultiFormatReader reader;
#ifdef DEBUG #ifdef DEBUG
NSLog(@"created QRCoreReader"); NSLog(@"created MultiFormatReader");
#endif #endif
Ref<LuminanceSource> source (new GrayBytesMonochromeBitmapSource(subsetData, subsetWidth, subsetHeight, subsetBytesPerRow)); Ref<LuminanceSource> source (new GrayBytesMonochromeBitmapSource(subsetData, subsetWidth, subsetHeight, subsetBytesPerRow));