[iphone] temporary fix because still not valid for app store. ScanTest now builds...

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

diff --git a/iphone/ScanTest/ScanTest-Info.plist b/iphone/ScanTest/ScanTest-Info.plist
index ded8e5d..2983a4b 100644 (file)
--- a/iphone/ScanTest/ScanTest-Info.plist
+++ b/iphone/ScanTest/ScanTest-Info.plist
@@ -11,7 +11,7 @@
        <key>CFBundleIconFile</key>
        <string></string>
        <key>CFBundleIdentifier</key>
-       <string>com.directthought.${PRODUCT_NAME:rfc1034identifier}</string>
+       <string>com.rpechayr.vmetronomelite</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundleName</key>

diff --git a/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj b/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj
index 1ddf1c1..22c5d1e 100755 (executable)
--- a/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj
+++ b/iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj
@@ -257,6 +257,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
+                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                COPY_PHASE_STRIP = NO;
                                DEAD_CODE_STRIPPING = NO;
                                EXPORTED_SYMBOLS_FILE = "";
@@ -279,6 +280,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
+                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                COPY_PHASE_STRIP = YES;
                                EXPORTED_SYMBOLS_FILE = "";
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -297,8 +299,8 @@
                C01FCF4F08A954540054247B /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
-                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Romain Pechayre (2CQ4EGKG4S)";
                                GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_VERSION = "";
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -309,15 +311,16 @@
                                );
                                IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
                                PREBINDING = NO;
-                               SDKROOT = iphoneos3.1.3;
+                               "PROVISIONING_PROFILE[sdk=iphoneos*]" = "4969F794-AB05-4D6F-909C-99C93009AC70";
+                               SDKROOT = iphoneos4.0;
                        };
                        name = Debug;
                };
                C01FCF5008A954540054247B /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
-                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+                               "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Romain Pechayre (2CQ4EGKG4S)";
                                GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
@@ -328,7 +331,8 @@
                                IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
                                OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
                                PREBINDING = NO;
-                               SDKROOT = iphoneos3.1.3;
+                               "PROVISIONING_PROFILE[sdk=iphoneos*]" = "4969F794-AB05-4D6F-909C-99C93009AC70";
+                               SDKROOT = iphoneos4.0;
                        };
                        name = Release;
                };

diff --git a/iphone/ZXingWidget/Classes/Decoder.mm b/iphone/ZXingWidget/Classes/Decoder.mm
index 4c11d3c..4d25cc8 100644 (file)
--- a/iphone/ZXingWidget/Classes/Decoder.mm
+++ b/iphone/ZXingWidget/Classes/Decoder.mm
@@ -28,7 +28,7 @@
 #include <zxing/ReaderException.h>
 #include <zxing/common/IllegalArgumentException.h>
 #include <zxing/common/GlobalHistogramBinarizer.h>
-#include "GrayBytesMonochromeBitmapSource.h"
+#include <zxing/common/GreyscaleLuminanceSource.h>
 
 using namespace zxing;
 
@@ -160,7 +160,8 @@ using namespace zxing;
   { 
     //NSSet *formatReaders = [FormatReader formatReaders];
     NSSet *formatReaders = self.readers;
-    Ref<LuminanceSource> source (new GrayBytesMonochromeBitmapSource(subsetData, subsetWidth, subsetHeight, subsetBytesPerRow));
+    Ref<LuminanceSource> source 
+           (new GreyscaleLuminanceSource(subsetData, subsetBytesPerRow, subsetHeight, 0, 0, subsetWidth, subsetHeight));
     Ref<Binarizer> binarizer (new GlobalHistogramBinarizer(source));
     Ref<BinaryBitmap> grayImage (new BinaryBitmap(binarizer));
 #ifdef DEBUG

diff --git a/iphone/ZXingWidget/Classes/GrayBytesMonochromeBitmapSource.cpp b/iphone/ZXingWidget/Classes/GrayBytesMonochromeBitmapSource.cpp
deleted file mode 100644 (file)
index 317919a..0000000
--- a/iphone/ZXingWidget/Classes/GrayBytesMonochromeBitmapSource.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-//  GrayBytesMonochromeBitmapSource.cpp
-//  ZXing
-//
-//  Created by Thomas Recloux, Norsys on 04/12/2009.
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "GrayBytesMonochromeBitmapSource.h"
-#include <zxing/ReaderException.h>
-
-
-GrayBytesMonochromeBitmapSource::GrayBytesMonochromeBitmapSource(const unsigned char *bytes, 
-                                int width, 
-                                int height,
-                                                               int bytesPerRow)  : 
-                               width_(width), 
-                               height_(height),
-                               bytes_(bytes), 
-                               bytesPerRow_(bytesPerRow) { }
-
-
-int GrayBytesMonochromeBitmapSource::getWidth() const{
-       return width_;
-}
-
-int GrayBytesMonochromeBitmapSource::getHeight() const {
-       return height_;
-}
-
-unsigned char GrayBytesMonochromeBitmapSource::getPixel(int x, int y) const {
-/*     if (x >= width_ || y >= height_) {
-               throw new ReaderException("bitmap coordinate out of bounds");
-       }*/
-       int index = y * bytesPerRow_ + x;
-       return bytes_[index];
-}

diff --git a/iphone/ZXingWidget/Classes/GrayBytesMonochromeBitmapSource.h b/iphone/ZXingWidget/Classes/GrayBytesMonochromeBitmapSource.h
deleted file mode 100644 (file)
index 462118c..0000000
--- a/iphone/ZXingWidget/Classes/GrayBytesMonochromeBitmapSource.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-//  GrayBytesMonochromeBitmapSource.h
-//  ZXing
-//
-//  Created by Thomas Recloux, Norsys on 04/12/2009.
-/*
- * Copyright 2008 ZXing authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __GRAY_BYTES_MONOCHROM_BITMAP_SOURCE_H__
-#define __GRAY_BYTES_MONOCHROM_BITMAP_SOURCE_H__
-
-#include <zxing/LuminanceSource.h>
-
-class GrayBytesMonochromeBitmapSource : public zxing::LuminanceSource {
-private:
-       int width_;
-       int height_;
-       const unsigned char *bytes_;
-       int bytesPerRow_;
-       
-public:
-       GrayBytesMonochromeBitmapSource(const unsigned char *bytes, 
-                                                                       int width, 
-                                                                       int height,
-                                                                       int bytesPerRow);
-       virtual ~GrayBytesMonochromeBitmapSource() { }
-       
-       virtual unsigned char getPixel(int x, int y) const;
-       
-       virtual int getWidth() const;
-       virtual int getHeight() const;
-
-private:
-  GrayBytesMonochromeBitmapSource(const GrayBytesMonochromeBitmapSource&);
-  GrayBytesMonochromeBitmapSource& operator=(const GrayBytesMonochromeBitmapSource&);  
-};
-
-#endif // __GRAY_BYTES_MONOCHROM_BITMAP_SOURCE_H__

diff --git a/iphone/ZXingWidget/Classes/MultiFormatOneDReader.mm b/iphone/ZXingWidget/Classes/MultiFormatOneDReader.mm
index c9e0df5..6e18bb7 100644 (file)
--- a/iphone/ZXingWidget/Classes/MultiFormatOneDReader.mm
+++ b/iphone/ZXingWidget/Classes/MultiFormatOneDReader.mm
@@ -8,12 +8,12 @@
 
 #import "MultiFormatOneDReader.h"
 #import <zxing/oned/MultiFormatOneDReader.h>
-
+#include <zxing/DecodeHints.h>
 @implementation MultiFormatOneDReader
 
 
 - (id) init {
-  zxing::oned::MultiFormatOneDReader *reader = new   zxing::oned::MultiFormatOneDReader();
+  zxing::oned::MultiFormatOneDReader *reader = new   zxing::oned::MultiFormatOneDReader(zxing::DecodeHints::DEFAULT_HINT);
   return [super initWithReader:reader];
 }
 @end

diff --git a/iphone/ZXingWidget/Classes/MultiFormatUPCEANReader.mm b/iphone/ZXingWidget/Classes/MultiFormatUPCEANReader.mm
index 33f723c..4dc7476 100644 (file)
--- a/iphone/ZXingWidget/Classes/MultiFormatUPCEANReader.mm
+++ b/iphone/ZXingWidget/Classes/MultiFormatUPCEANReader.mm
@@ -8,11 +8,12 @@
 
 #import "MultiFormatUPCEANReader.h"
 #import <zxing/oned/MultiFormatUPCEANReader.h>
+#include <zxing/DecodeHints.h>
 
 @implementation MultiFormatUPCEANReader
 
 - (id) init {
-  zxing::oned::MultiFormatUPCEANReader *reader = new zxing::oned::MultiFormatUPCEANReader();
+  zxing::oned::MultiFormatUPCEANReader *reader = new zxing::oned::MultiFormatUPCEANReader(zxing::DecodeHints::DEFAULT_HINT);
   return [super initWithReader:reader];
 }
 @end

diff --git a/iphone/ZXingWidget/Classes/OverlayView.h b/iphone/ZXingWidget/Classes/OverlayView.h
index ad1ee63..d9f6d35 100755 (executable)
--- a/iphone/ZXingWidget/Classes/OverlayView.h
+++ b/iphone/ZXingWidget/Classes/OverlayView.h
@@ -30,7 +30,6 @@
 @property (nonatomic, assign) id<CancelDelegate> delegate;
 @property (nonatomic, assign) BOOL oneDMode;
 
-
 - (id)initWithFrame:(CGRect)theFrame cancelEnabled:(BOOL)isCancelEnabled oneDMode:(BOOL)isOneDModeEnabled;
 
 - (CGRect)cropRect;

diff --git a/iphone/ZXingWidget/Classes/OverlayView.m b/iphone/ZXingWidget/Classes/OverlayView.m
index 7c55d49..eb6a6e9 100755 (executable)
--- a/iphone/ZXingWidget/Classes/OverlayView.m
+++ b/iphone/ZXingWidget/Classes/OverlayView.m
@@ -48,6 +48,7 @@ static const CGFloat kPadding = 10;
       
       [cancelButton addTarget:self action:@selector(cancel:) forControlEvents:UIControlEventTouchUpInside];
       [self addSubview:cancelButton];
+      [self addSubview:imageView];
     }
   }
        return self;
@@ -157,23 +158,23 @@ static const CGFloat kPadding = 10;
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 /*
  - (void) setImage:(UIImage*)image {
- if( nil == _imageView ) {
- _imageView = [[UIImageView alloc] initWithImage:image];
- _imageView.alpha = 0.5;
- } else {
- _imageView.image = image;
- }
+ //if( nil == imageView ) {
+// imageView = [[UIImageView alloc] initWithImage:image];
+// imageView.alpha = 0.5;
+// } else {
+ imageView.image = image;
+ //}
  
- CGRect frame = _imageView.frame;
- frame.origin.x = self.cropRect.origin.x;
- frame.origin.y = self.cropRect.origin.y;
- _imageView.frame = frame;
+ //CGRect frame = imageView.frame;
+ //frame.origin.x = self.cropRect.origin.x;
+ //frame.origin.y = self.cropRect.origin.y;
+ //imageView.frame = CGRectMake(0,0, 30, 50);
  
- [_points release];
- _points = nil;
- self.backgroundColor = [UIColor clearColor];
+ //[_points release];
+ //_points = nil;
+ //self.backgroundColor = [UIColor clearColor];
  
- [self setNeedsDisplay];
+ //[self setNeedsDisplay];
  }
  */
 
@@ -195,6 +196,14 @@ static const CGFloat kPadding = 10;
        }
 }
 
+/*
+- (void)viewDidLoad {
+  self.imageView = [[UIImageView alloc] init];
+  self.imageView.frame = CGRectMake(0, 0, 100, 100);
+  [self addSubview:self.imageView];
+       
+}
+*/
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 - (void) setPoints:(NSArray*)pnts {

diff --git a/iphone/ZXingWidget/Classes/ZXingWidgetController.m b/iphone/ZXingWidget/Classes/ZXingWidgetController.m
index cf9a921..3ea90e5 100755 (executable)
--- a/iphone/ZXingWidget/Classes/ZXingWidgetController.m
+++ b/iphone/ZXingWidget/Classes/ZXingWidgetController.m
@@ -256,6 +256,9 @@ CGImageRef UIGetScreenImage(void);
 
 - (void)takePicture:(NSTimer*)theTimer {
   CGImageRef capture = UIGetScreenImage();
+  static int cpt = 0;
+  if (cpt%10 == 0)
+    UIImageWriteToSavedPhotosAlbum([UIImage imageWithCGImage:capture], nil, nil,nil);
   CGRect cropRect = [overlayView cropRect];
   if (oneDMode) {
     // let's just give the decoder a vertical band right above the red line

diff --git a/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj b/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj
index b66b48f..93e2a54 100644 (file)
--- a/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj
+++ b/iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj
@@ -12,8 +12,6 @@
                1F027FAD11A7BEAF006B06DE /* DecoderDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F027FA111A7BEAF006B06DE /* DecoderDelegate.h */; };
                1F027FAE11A7BEAF006B06DE /* FormatReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F027FA211A7BEAF006B06DE /* FormatReader.h */; };
                1F027FAF11A7BEAF006B06DE /* FormatReader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F027FA311A7BEAF006B06DE /* FormatReader.mm */; };
-               1F027FB011A7BEAF006B06DE /* GrayBytesMonochromeBitmapSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F027FA411A7BEAF006B06DE /* GrayBytesMonochromeBitmapSource.cpp */; };
-               1F027FB111A7BEAF006B06DE /* GrayBytesMonochromeBitmapSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F027FA511A7BEAF006B06DE /* GrayBytesMonochromeBitmapSource.h */; };
                1F027FB211A7BEAF006B06DE /* MultiFormatReader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F027FA611A7BEAF006B06DE /* MultiFormatReader.mm */; };
                1F027FB311A7BEAF006B06DE /* NSString+HTML.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F027FA711A7BEAF006B06DE /* NSString+HTML.h */; };
                1F027FB411A7BEAF006B06DE /* NSString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = 1F027FA811A7BEAF006B06DE /* NSString+HTML.m */; };
@@ -87,6 +85,13 @@
                1F3DB0FE11C61080009C581B /* MultiFormatOneDReader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F3DB0F811C61080009C581B /* MultiFormatOneDReader.mm */; };
                1F3DB0FF11C61080009C581B /* MultiFormatUPCEANReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F3DB0F911C61080009C581B /* MultiFormatUPCEANReader.h */; };
                1F3DB10011C61080009C581B /* MultiFormatUPCEANReader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1F3DB0FA11C61080009C581B /* MultiFormatUPCEANReader.mm */; };
+               1F56ECA612094AB400DFA8DD /* GreyscaleLuminanceSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F56ECA212094AB400DFA8DD /* GreyscaleLuminanceSource.cpp */; };
+               1F56ECA712094AB400DFA8DD /* GreyscaleLuminanceSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F56ECA312094AB400DFA8DD /* GreyscaleLuminanceSource.h */; };
+               1F56ECA812094AB400DFA8DD /* GreyscaleRotatedLuminanceSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F56ECA412094AB400DFA8DD /* GreyscaleRotatedLuminanceSource.cpp */; };
+               1F56ECA912094AB400DFA8DD /* GreyscaleRotatedLuminanceSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F56ECA512094AB400DFA8DD /* GreyscaleRotatedLuminanceSource.h */; };
+               1F56ED0012094D6400DFA8DD /* DecodeHints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1F56ECFF12094D6400DFA8DD /* DecodeHints.cpp */; };
+               1FCC1295120FBD12002C7978 /* HybridBinarizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FCC1293120FBD12002C7978 /* HybridBinarizer.cpp */; };
+               1FCC1296120FBD12002C7978 /* HybridBinarizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1FCC1294120FBD12002C7978 /* HybridBinarizer.h */; };
                AA747D9F0F9514B9006C5449 /* ZXingWidget_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = AA747D9E0F9514B9006C5449 /* ZXingWidget_Prefix.pch */; };
                AACBBE4A0F95108600F1A2B1 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
                E534594311987396000CB77F /* BarcodeFormat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E53458B511987396000CB77F /* BarcodeFormat.cpp */; };
@@ -117,8 +122,6 @@
                E534595C11987396000CB77F /* GridSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = E53458CF11987396000CB77F /* GridSampler.h */; };
                E534595D11987396000CB77F /* IllegalArgumentException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E53458D011987396000CB77F /* IllegalArgumentException.cpp */; };
                E534595E11987396000CB77F /* IllegalArgumentException.h in Headers */ = {isa = PBXBuildFile; fileRef = E53458D111987396000CB77F /* IllegalArgumentException.h */; };
-               E534595F11987396000CB77F /* LocalBlockBinarizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E53458D211987396000CB77F /* LocalBlockBinarizer.cpp */; };
-               E534596011987396000CB77F /* LocalBlockBinarizer.h in Headers */ = {isa = PBXBuildFile; fileRef = E53458D311987396000CB77F /* LocalBlockBinarizer.h */; };
                E534596111987396000CB77F /* PerspectiveTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E53458D411987396000CB77F /* PerspectiveTransform.cpp */; };
                E534596211987396000CB77F /* PerspectiveTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = E53458D511987396000CB77F /* PerspectiveTransform.h */; };
                E534596311987396000CB77F /* Point.h in Headers */ = {isa = PBXBuildFile; fileRef = E53458D611987396000CB77F /* Point.h */; };
@@ -233,8 +236,6 @@
                1F027FA111A7BEAF006B06DE /* DecoderDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DecoderDelegate.h; path = Classes/DecoderDelegate.h; sourceTree = "<group>"; };
                1F027FA211A7BEAF006B06DE /* FormatReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FormatReader.h; path = Classes/FormatReader.h; sourceTree = "<group>"; };
                1F027FA311A7BEAF006B06DE /* FormatReader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = FormatReader.mm; path = Classes/FormatReader.mm; sourceTree = "<group>"; };
-               1F027FA411A7BEAF006B06DE /* GrayBytesMonochromeBitmapSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GrayBytesMonochromeBitmapSource.cpp; path = Classes/GrayBytesMonochromeBitmapSource.cpp; sourceTree = "<group>"; };
-               1F027FA511A7BEAF006B06DE /* GrayBytesMonochromeBitmapSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GrayBytesMonochromeBitmapSource.h; path = Classes/GrayBytesMonochromeBitmapSource.h; sourceTree = "<group>"; };
                1F027FA611A7BEAF006B06DE /* MultiFormatReader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MultiFormatReader.mm; path = Classes/MultiFormatReader.mm; sourceTree = "<group>"; };
                1F027FA711A7BEAF006B06DE /* NSString+HTML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSString+HTML.h"; path = "Classes/NSString+HTML.h"; sourceTree = "<group>"; };
                1F027FA811A7BEAF006B06DE /* NSString+HTML.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+HTML.m"; path = "Classes/NSString+HTML.m"; sourceTree = "<group>"; };
@@ -308,6 +309,13 @@
                1F3DB0F811C61080009C581B /* MultiFormatOneDReader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MultiFormatOneDReader.mm; path = Classes/MultiFormatOneDReader.mm; sourceTree = "<group>"; };
                1F3DB0F911C61080009C581B /* MultiFormatUPCEANReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MultiFormatUPCEANReader.h; path = Classes/MultiFormatUPCEANReader.h; sourceTree = "<group>"; };
                1F3DB0FA11C61080009C581B /* MultiFormatUPCEANReader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MultiFormatUPCEANReader.mm; path = Classes/MultiFormatUPCEANReader.mm; sourceTree = "<group>"; };
+               1F56ECA212094AB400DFA8DD /* GreyscaleLuminanceSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GreyscaleLuminanceSource.cpp; sourceTree = "<group>"; };
+               1F56ECA312094AB400DFA8DD /* GreyscaleLuminanceSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GreyscaleLuminanceSource.h; sourceTree = "<group>"; };
+               1F56ECA412094AB400DFA8DD /* GreyscaleRotatedLuminanceSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GreyscaleRotatedLuminanceSource.cpp; sourceTree = "<group>"; };
+               1F56ECA512094AB400DFA8DD /* GreyscaleRotatedLuminanceSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GreyscaleRotatedLuminanceSource.h; sourceTree = "<group>"; };
+               1F56ECFF12094D6400DFA8DD /* DecodeHints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DecodeHints.cpp; sourceTree = "<group>"; };
+               1FCC1293120FBD12002C7978 /* HybridBinarizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HybridBinarizer.cpp; sourceTree = "<group>"; };
+               1FCC1294120FBD12002C7978 /* HybridBinarizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HybridBinarizer.h; sourceTree = "<group>"; };
                AA747D9E0F9514B9006C5449 /* ZXingWidget_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZXingWidget_Prefix.pch; sourceTree = SOURCE_ROOT; };
                AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
                D2AAC07E0554694100DB518D /* libZXingWidget.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libZXingWidget.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -339,8 +347,6 @@
                E53458CF11987396000CB77F /* GridSampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GridSampler.h; sourceTree = "<group>"; };
                E53458D011987396000CB77F /* IllegalArgumentException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IllegalArgumentException.cpp; sourceTree = "<group>"; };
                E53458D111987396000CB77F /* IllegalArgumentException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IllegalArgumentException.h; sourceTree = "<group>"; };
-               E53458D211987396000CB77F /* LocalBlockBinarizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalBlockBinarizer.cpp; sourceTree = "<group>"; };
-               E53458D311987396000CB77F /* LocalBlockBinarizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalBlockBinarizer.h; sourceTree = "<group>"; };
                E53458D411987396000CB77F /* PerspectiveTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PerspectiveTransform.cpp; sourceTree = "<group>"; };
                E53458D511987396000CB77F /* PerspectiveTransform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PerspectiveTransform.h; sourceTree = "<group>"; };
                E53458D611987396000CB77F /* Point.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Point.h; sourceTree = "<group>"; };
@@ -516,8 +522,6 @@
                                1F027FA111A7BEAF006B06DE /* DecoderDelegate.h */,
                                1F027FA211A7BEAF006B06DE /* FormatReader.h */,
                                1F027FA311A7BEAF006B06DE /* FormatReader.mm */,
-                               1F027FA411A7BEAF006B06DE /* GrayBytesMonochromeBitmapSource.cpp */,
-                               1F027FA511A7BEAF006B06DE /* GrayBytesMonochromeBitmapSource.h */,
                                1F027FA611A7BEAF006B06DE /* MultiFormatReader.mm */,
                                1F027FA711A7BEAF006B06DE /* NSString+HTML.h */,
                                1F027FA811A7BEAF006B06DE /* NSString+HTML.m */,
@@ -550,6 +554,7 @@
                E53458B411987396000CB77F /* zxing */ = {
                        isa = PBXGroup;
                        children = (
+                               1F56ECFF12094D6400DFA8DD /* DecodeHints.cpp */,
                                E53458B511987396000CB77F /* BarcodeFormat.cpp */,
                                E53458B611987396000CB77F /* BarcodeFormat.h */,
                                E53458B711987396000CB77F /* Binarizer.cpp */,
@@ -581,6 +586,12 @@
                E53458BB11987396000CB77F /* common */ = {
                        isa = PBXGroup;
                        children = (
+                               1FCC1293120FBD12002C7978 /* HybridBinarizer.cpp */,
+                               1FCC1294120FBD12002C7978 /* HybridBinarizer.h */,
+                               1F56ECA212094AB400DFA8DD /* GreyscaleLuminanceSource.cpp */,
+                               1F56ECA312094AB400DFA8DD /* GreyscaleLuminanceSource.h */,
+                               1F56ECA412094AB400DFA8DD /* GreyscaleRotatedLuminanceSource.cpp */,
+                               1F56ECA512094AB400DFA8DD /* GreyscaleRotatedLuminanceSource.h */,
                                E53458BC11987396000CB77F /* Array.cpp */,
                                E53458BD11987396000CB77F /* Array.h */,
                                E53458BE11987396000CB77F /* BitArray.cpp */,
@@ -603,8 +614,6 @@
                                E53458CF11987396000CB77F /* GridSampler.h */,
                                E53458D011987396000CB77F /* IllegalArgumentException.cpp */,
                                E53458D111987396000CB77F /* IllegalArgumentException.h */,
-                               E53458D211987396000CB77F /* LocalBlockBinarizer.cpp */,
-                               E53458D311987396000CB77F /* LocalBlockBinarizer.h */,
                                E53458D411987396000CB77F /* PerspectiveTransform.cpp */,
                                E53458D511987396000CB77F /* PerspectiveTransform.h */,
                                E53458D611987396000CB77F /* Point.h */,
@@ -865,7 +874,6 @@
                                E534595A11987396000CB77F /* GlobalHistogramBinarizer.h in Headers */,
                                E534595C11987396000CB77F /* GridSampler.h in Headers */,
                                E534595E11987396000CB77F /* IllegalArgumentException.h in Headers */,
-                               E534596011987396000CB77F /* LocalBlockBinarizer.h in Headers */,
                                E534596211987396000CB77F /* PerspectiveTransform.h in Headers */,
                                E534596311987396000CB77F /* Point.h in Headers */,
                                E534596511987396000CB77F /* GF256.h in Headers */,
@@ -921,7 +929,6 @@
                                1F027FAB11A7BEAF006B06DE /* Decoder.h in Headers */,
                                1F027FAD11A7BEAF006B06DE /* DecoderDelegate.h in Headers */,
                                1F027FAE11A7BEAF006B06DE /* FormatReader.h in Headers */,
-                               1F027FB111A7BEAF006B06DE /* GrayBytesMonochromeBitmapSource.h in Headers */,
                                1F027FB311A7BEAF006B06DE /* NSString+HTML.h in Headers */,
                                1F027FB511A7BEAF006B06DE /* OverlayView.h in Headers */,
                                1F027FBB11A7BEBF006B06DE /* TwoDDecoderResult.h in Headers */,
@@ -958,6 +965,9 @@
                                1F3DB0FB11C61080009C581B /* DataMatrixReader.h in Headers */,
                                1F3DB0FD11C61080009C581B /* MultiFormatOneDReader.h in Headers */,
                                1F3DB0FF11C61080009C581B /* MultiFormatUPCEANReader.h in Headers */,
+                               1F56ECA712094AB400DFA8DD /* GreyscaleLuminanceSource.h in Headers */,
+                               1F56ECA912094AB400DFA8DD /* GreyscaleRotatedLuminanceSource.h in Headers */,
+                               1FCC1296120FBD12002C7978 /* HybridBinarizer.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -1018,7 +1028,6 @@
                                E534595911987396000CB77F /* GlobalHistogramBinarizer.cpp in Sources */,
                                E534595B11987396000CB77F /* GridSampler.cpp in Sources */,
                                E534595D11987396000CB77F /* IllegalArgumentException.cpp in Sources */,
-                               E534595F11987396000CB77F /* LocalBlockBinarizer.cpp in Sources */,
                                E534596111987396000CB77F /* PerspectiveTransform.cpp in Sources */,
                                E534596411987396000CB77F /* GF256.cpp in Sources */,
                                E534596611987396000CB77F /* GF256Poly.cpp in Sources */,
@@ -1072,7 +1081,6 @@
                                E53459C611987396000CB77F /* ResultPoint.cpp in Sources */,
                                1F027FAC11A7BEAF006B06DE /* Decoder.mm in Sources */,
                                1F027FAF11A7BEAF006B06DE /* FormatReader.mm in Sources */,
-                               1F027FB011A7BEAF006B06DE /* GrayBytesMonochromeBitmapSource.cpp in Sources */,
                                1F027FB211A7BEAF006B06DE /* MultiFormatReader.mm in Sources */,
                                1F027FB411A7BEAF006B06DE /* NSString+HTML.m in Sources */,
                                1F027FB611A7BEAF006B06DE /* OverlayView.m in Sources */,
@@ -1110,6 +1118,10 @@
                                1F3DB0FC11C61080009C581B /* DataMatrixReader.mm in Sources */,
                                1F3DB0FE11C61080009C581B /* MultiFormatOneDReader.mm in Sources */,
                                1F3DB10011C61080009C581B /* MultiFormatUPCEANReader.mm in Sources */,
+                               1F56ECA612094AB400DFA8DD /* GreyscaleLuminanceSource.cpp in Sources */,
+                               1F56ECA812094AB400DFA8DD /* GreyscaleRotatedLuminanceSource.cpp in Sources */,
+                               1F56ED0012094D6400DFA8DD /* DecodeHints.cpp in Sources */,
+                               1FCC1295120FBD12002C7978 /* HybridBinarizer.cpp in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -1120,7 +1132,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = YES;
-                               ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                COPY_PHASE_STRIP = NO;
                                DEAD_CODE_STRIPPING = YES;
                                DSTROOT = /tmp/ZXingWidget.dst;
@@ -1144,7 +1156,7 @@
                                );
                                PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
                                PRODUCT_NAME = ZXingWidget;
-                               SDKROOT = iphoneos3.1.3;
+                               SDKROOT = iphoneos4.0;
                                SEPARATE_STRIP = NO;
                                SKIP_INSTALL = YES;
                                STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
@@ -1155,7 +1167,7 @@
                        isa = XCBuildConfiguration;
                        buildSettings = {
                                ALWAYS_SEARCH_USER_PATHS = NO;
-                               ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                DSTROOT = /tmp/ZXingWidget.dst;
                                GCC_MODEL_TUNING = G5;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1165,14 +1177,14 @@
                                INSTALL_PATH = /usr/local/lib;
                                IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
                                PRODUCT_NAME = ZXingWidget;
-                               SDKROOT = iphoneos3.1.3;
+                               SDKROOT = iphoneos4.0;
                        };
                        name = Release;
                };
                1DEB922308733DC00010E9CD /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_OPTIMIZATION_LEVEL = 0;
                                GCC_VERSION = "";
@@ -1181,14 +1193,14 @@
                                IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
                                OTHER_LDFLAGS = "-ObjC";
                                PREBINDING = NO;
-                               SDKROOT = iphoneos3.1.3;
+                               SDKROOT = iphoneos4.0;
                        };
                        name = Debug;
                };
                1DEB922408733DC00010E9CD /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+                               ARCHS = "$(ARCHS_STANDARD_32_BIT)";
                                GCC_C_LANGUAGE_STANDARD = c99;
                                GCC_VERSION = "";
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1196,7 +1208,7 @@
                                IPHONEOS_DEPLOYMENT_TARGET = 3.1.3;
                                OTHER_LDFLAGS = "-ObjC";
                                PREBINDING = NO;
-                               SDKROOT = iphoneos3.1.3;
+                               SDKROOT = iphoneos4.0;
                        };
                        name = Release;
                };