mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-02-02 05:41:08 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

license and whitespace only

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2444 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2012-10-03 00:19:58 +00:00
parent 39cd6a78bb
commit 35069ed41d
3 changed files with 109 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
iphone/Barcodes/Classes/BarcodesAppDelegate.m
View file

@ -1,10 +1,19 @@
// // -*- mode:objc; c-basic-offset:2; indent-tabs-mode:nil -*-
// BarcodesAppDelegate.m /**
// Barcodes * Copyright 2010-2012 ZXing authors All rights reserved.
// *
// Created by Romain Pechayre on 11/14/10. * Licensed under the Apache License, Version 2.0 (the "License");
// Copyright 2010 __MyCompanyName__. All rights reserved. * 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.
*/
#import "BarcodesAppDelegate.h" #import "BarcodesAppDelegate.h"

2
iphone/ScanTest/Classes/ScanTestAppDelegate.m
View file

@ -1,6 +1,6 @@
// -*- mode:objc; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*- // -*- mode:objc; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
/* /*
* Copyright 2011 ZXing authors All rights reserved. * Copyright 2010-2012 ZXing authors All rights reserved.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

28
iphone/ZXingWidget/Classes/ZXingWidgetController.m
View file

@ -1,6 +1,6 @@
// -*- mode:objc; c-basic-offset:2; indent-tabs-mode:nil -*- // -*- mode:objc; c-basic-offset:2; indent-tabs-mode:nil -*-
/** /**
* Copyright 2009 Jeff Verkoeyen * Copyright 2009-2012 ZXing authors All rights reserved.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -290,13 +290,13 @@
} }
/* /*
- (void)stopPreview:(NSNotification*)notification { - (void)stopPreview:(NSNotification*)notification {
// NSLog(@"stop preview"); // NSLog(@"stop preview");
} }
- (void)notification:(NSNotification*)notification { - (void)notification:(NSNotification*)notification {
// NSLog(@"notification %@", notification.name); // NSLog(@"notification %@", notification.name);
} }
*/ */
#pragma mark - #pragma mark -
@ -509,15 +509,15 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
[self.prevLayer removeFromSuperlayer]; [self.prevLayer removeFromSuperlayer];
/* /*
// heebee jeebees here ... is iOS still writing into the layer? // heebee jeebees here ... is iOS still writing into the layer?
if (self.prevLayer) { if (self.prevLayer) {
layer.session = nil; layer.session = nil;
AVCaptureVideoPreviewLayer* layer = prevLayer; AVCaptureVideoPreviewLayer* layer = prevLayer;
[self.prevLayer retain]; [self.prevLayer retain];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 12000000000), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 12000000000), dispatch_get_main_queue(), ^{
[layer release]; [layer release];
}); });
} }
*/ */
self.prevLayer = nil; self.prevLayer = nil;