mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-01-12 19:57:27 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

objc cleanup

Browse source 
- regularize the naming/inclusion of C++ vs ObjC
- correct the way ZXCapture is stubbed out in the simulator to avoid a leak

git-svn-id: https://zxing.googlecode.com/svn/trunk@1826 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2011-06-19 03:52:26 +00:00
parent 1d80e8abf5
commit 0297363cfc
13 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
objc/src/ZXing/ZXBinarizer.h
View file

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
#import <zxing/Binarizer.h> #include <zxing/Binarizer.h>
#import <ZXing/ZXLuminanceSource.h> #import <ZXing/ZXLuminanceSource.h>
@interface ZXBinarizer : NSObject { @interface ZXBinarizer : NSObject {

2
objc/src/ZXing/ZXBinaryBitmap.h
View file

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
#import <zxing/BinaryBitmap.h> #include <zxing/BinaryBitmap.h>
@class ZXBinarizer; @class ZXBinarizer;

2
objc/src/ZXing/ZXCGImageLuminanceSource.h
View file

@ -15,8 +15,8 @@
* limitations under the License. * limitations under the License.
*/ */
#import <ZXing/ZXLuminanceSource.h>
#import <CoreVideo/CoreVideo.h> #import <CoreVideo/CoreVideo.h>
#import <ZXing/ZXLuminanceSource.h>
namespace zxing { namespace zxing {

2
objc/src/ZXing/ZXCapture.h
View file

@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
*/ */
#import <zxing/ZXCaptureDelegate.h> #import <ZXing/ZXCaptureDelegate.h>
#if !TARGET_IPHONE_SIMULATOR #if !TARGET_IPHONE_SIMULATOR
#if TARGET_OS_EMBEDDED #if TARGET_OS_EMBEDDED

3
objc/src/ZXing/ZXCapture.mm
View file

@ -562,6 +562,9 @@ ZXAV(didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer)
@synthesize captureToFilename; @synthesize captureToFilename;
- (id)init { - (id)init {
if ((self = [super init])) {
[self release];
}
return 0; return 0;
} }

2
objc/src/ZXing/ZXDecodeHints.h
View file

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
#import <zxing/DecodeHints.h> #include <zxing/DecodeHints.h>
@interface ZXDecodeHints : NSObject { @interface ZXDecodeHints : NSObject {
zxing::DecodeHints* native; zxing::DecodeHints* native;

2
objc/src/ZXing/ZXHybridBinarizer.h
View file

@ -15,8 +15,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include <zxing/common/HybridBinarizer.h>
#import <ZXing/ZXBinarizer.h> #import <ZXing/ZXBinarizer.h>
#import <zxing/common/HybridBinarizer.h>
@interface ZXHybridBinarizer : ZXBinarizer { @interface ZXHybridBinarizer : ZXBinarizer {
} }

2
objc/src/ZXing/ZXLuminanceSource.h
View file

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
#import <zxing/LuminanceSource.h> #include <zxing/LuminanceSource.h>
@interface ZXLuminanceSource : NSObject { @interface ZXLuminanceSource : NSObject {
zxing::Ref<zxing::LuminanceSource> native; zxing::Ref<zxing::LuminanceSource> native;

2
objc/src/ZXing/ZXMultiFormatReader.mm
View file

@ -15,8 +15,8 @@
* limitations under the License. * limitations under the License.
*/ */
#import <zxing/MultiFormatReader.h>
#import <ZXing/ZXMultiFormatReader.h> #import <ZXing/ZXMultiFormatReader.h>
#include <zxing/MultiFormatReader.h>
@implementation ZXMultiFormatReader @implementation ZXMultiFormatReader

2
objc/src/ZXing/ZXQRCodeReader.mm
View file

@ -15,8 +15,8 @@
* limitations under the License. * limitations under the License.
*/ */
#import <zxing/qrcode/QRCodeReader.h>
#import <ZXing/ZXQRCodeReader.h> #import <ZXing/ZXQRCodeReader.h>
#include <zxing/qrcode/QRCodeReader.h>
@implementation ZXQRCodeReader @implementation ZXQRCodeReader

2
objc/src/ZXing/ZXReader.h
View file

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
#import <zxing/Reader.h> #include <zxing/Reader.h>
@class ZXBinaryBitmap; @class ZXBinaryBitmap;
@class ZXDecodeHints; @class ZXDecodeHints;

4
objc/src/ZXing/ZXReader.mm
View file

@ -16,12 +16,12 @@
*/ */
#import <ZXing/ZXReader.h> #import <ZXing/ZXReader.h>
#include <zxing/common/IllegalArgumentException.h>
#include <zxing/ReaderException.h>
#import <ZXing/ZXResult.h> #import <ZXing/ZXResult.h>
#import <ZXing/ZXBinaryBitmap.h> #import <ZXing/ZXBinaryBitmap.h>
#import <ZXing/ZXDecodeHints.h> #import <ZXing/ZXDecodeHints.h>
#import <zxing/ReaderException.h>
#import <ZXing/ZXReaderException.h> #import <ZXing/ZXReaderException.h>
#import <zxing/common/IllegalArgumentException.h>
#import <ZXing/ZXIllegalArgumentException.h> #import <ZXing/ZXIllegalArgumentException.h>
@implementation ZXReader @implementation ZXReader

2
objc/src/ZXing/ZXResult.h
View file

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
#import <zxing/Result.h> #include <zxing/Result.h>
@interface ZXResult : NSObject { @interface ZXResult : NSObject {
zxing::Ref<zxing::Result> native; zxing::Ref<zxing::Result> native;