mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-12 22:14:06 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tweaks to get the decode working

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1358 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dkavanagh 2010-05-13 14:10:18 +00:00
parent f337066fcc
commit 4ec4217f4d
4 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/ZXingWidget/MultiFormatReader.mm
View file

@ -35,7 +35,6 @@
- (id)init { - (id)init {
zxing::MultiFormatReader *reader = new zxing::MultiFormatReader(); zxing::MultiFormatReader *reader = new zxing::MultiFormatReader();
NSLog(@"MultiFormatReader: init called");
return [super initWithReader:reader]; return [super initWithReader:reader];
} }

12
iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj
View file

@ -1092,8 +1092,9 @@
ALWAYS_SEARCH_USER_PATHS = YES; ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = NO; DEAD_CODE_STRIPPING = YES;
DSTROOT = /tmp/ZXingWidget.dst; DSTROOT = /tmp/ZXingWidget.dst;
EXPORTED_SYMBOLS_FILE = exportList;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5; GCC_MODEL_TUNING = G5;
@ -1104,10 +1105,13 @@
INSTALL_PATH = /usr/local/lib; INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 3.1.2; IPHONEOS_DEPLOYMENT_TARGET = 3.1.2;
LD_GENERATE_MAP_FILE = YES; LD_GENERATE_MAP_FILE = YES;
LD_OPENMP_FLAGS = "-fopenmp -M"; LD_OPENMP_FLAGS = "-fopenmp";
MACH_O_TYPE = staticlib; MACH_O_TYPE = staticlib;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = (
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; "-ObjC",
"-M",
);
PRESERVE_DEAD_CODE_INITS_AND_TERMS = NO;
PRODUCT_NAME = ZXingWidget; PRODUCT_NAME = ZXingWidget;
SDKROOT = iphoneos3.1.3; SDKROOT = iphoneos3.1.3;
SEPARATE_STRIP = NO; SEPARATE_STRIP = NO;

17
iphone/ZXingWidget/ZXingWidgetController.m
View file

@ -81,6 +81,7 @@ CGImageRef UIGetScreenImage();
- (void)viewDidAppear:(BOOL)animated { - (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated]; [super viewDidAppear:animated];
[overlayView setPoints:nil];
wasCancelled = false; wasCancelled = false;
[NSTimer scheduledTimerWithTimeInterval: FIRST_TAKE_DELAY [NSTimer scheduledTimerWithTimeInterval: FIRST_TAKE_DELAY
target: self target: self
@ -138,16 +139,16 @@ CGImageRef UIGetScreenImage();
// [self presentResultForString:twoDResult.text]; // [self presentResultForString:twoDResult.text];
NSLog(@"decoded image!!"); NSLog(@"decoded image!!");
[self presentResultPoints:[twoDResult points] forImage:image usingSubset:subset]; [self presentResultPoints:[twoDResult points] forImage:image usingSubset:subset];
if (delegate != nil) { // now, in a selector, call the delegate to give this overlay time to show the points
[delegate scanResult:[twoDResult text]]; [self performSelectorOnMainThread:@selector(alertDelegate:) withObject:[[twoDResult text] copy] waitUntilDone:false];
}
decoder.delegate = nil; decoder.delegate = nil;
[decoder release]; [decoder release];
}
// save the scan to the shared database
// [[Database sharedDatabase] addScanWithText:twoDResult.text]; - (void)alertDelegate:(id)text {
// need to call delegate....` if (delegate != nil) {
// [self performResultAction:self]; [delegate scanResult:text];
}
} }
- (void)decoder:(Decoder *)decoder failedToDecodeImage:(UIImage *)image usingSubset:(UIImage *)subset reason:(NSString *)reason { - (void)decoder:(Decoder *)decoder failedToDecodeImage:(UIImage *)image usingSubset:(UIImage *)subset reason:(NSString *)reason {

1
iphone/ZXingWidget/exportList Normal file
View file

@ -0,0 +1 @@
.objc_class_name_MultiFormatReader