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

git-svn-id: http://zxing.googlecode.com/svn/trunk@1197 59b500cc-1b3d-0410-9834-0bbf25fbcc57

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