From f0594882d0962dd6c500299298ef06d0dab7ecc7 Mon Sep 17 00:00:00 2001 From: "smparkes@smparkes.net" Date: Wed, 18 May 2011 19:13:07 +0000 Subject: [PATCH] change directory name case to match objc convention; add missing includes so that pch aren't needed git-svn-id: https://zxing.googlecode.com/svn/trunk@1783 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- objc/osx_Prefix.pch | 1 - objc/src/ZXing/CGImageLuminanceSource.h | 93 -------------------- objc/src/ZXing/CGImageLuminanceSource.mm | 2 +- objc/src/ZXing/ZXBinarizer.h | 2 +- objc/src/ZXing/ZXBinarizer.mm | 2 +- objc/src/ZXing/ZXBinaryBitmap.mm | 4 +- objc/src/ZXing/ZXCGImageLuminanceSource.h | 71 ++++++++++++++- objc/src/ZXing/ZXCGImageLuminanceSource.mm | 4 +- objc/src/ZXing/ZXCapture.h | 1 + objc/src/ZXing/ZXCapture.mm | 18 ++-- objc/src/ZXing/ZXCaptureView.h | 2 +- objc/src/ZXing/ZXCaptureView.mm | 2 +- objc/src/ZXing/ZXDecodeHints.mm | 2 +- objc/src/ZXing/ZXHybridBinarizer.h | 2 +- objc/src/ZXing/ZXHybridBinarizer.mm | 2 +- objc/src/ZXing/ZXIllegalArgumentException.mm | 2 +- objc/src/ZXing/ZXImage.mm | 2 +- objc/src/ZXing/ZXLuminanceSource.mm | 2 +- objc/src/ZXing/ZXMultiFormatReader.h | 2 +- objc/src/ZXing/ZXMultiFormatReader.mm | 2 +- objc/src/ZXing/ZXQRCodeReader.h | 2 +- objc/src/ZXing/ZXQRCodeReader.mm | 2 +- objc/src/ZXing/ZXReader.mm | 12 +-- objc/src/ZXing/ZXReaderException.mm | 2 +- objc/src/ZXing/ZXResult.mm | 2 +- 25 files changed, 106 insertions(+), 132 deletions(-) delete mode 100644 objc/src/ZXing/CGImageLuminanceSource.h diff --git a/objc/osx_Prefix.pch b/objc/osx_Prefix.pch index c0ec17e12..7c0c7a4de 100644 --- a/objc/osx_Prefix.pch +++ b/objc/osx_Prefix.pch @@ -1,5 +1,4 @@ #ifdef __OBJC__ #import #import - #import #endif diff --git a/objc/src/ZXing/CGImageLuminanceSource.h b/objc/src/ZXing/CGImageLuminanceSource.h deleted file mode 100644 index 460d101e6..000000000 --- a/objc/src/ZXing/CGImageLuminanceSource.h +++ /dev/null @@ -1,93 +0,0 @@ -// -*- mode:c++; c-basic-offset:2; indent-tabs-mode:nil -*- -#ifndef __CGIIMAGE_LUMINANCE_SOURCE__ -#define __CGIIMAGE_LUMINANCE_SOURCE__ -/* - * Copyright 2011 ZXing authors All rights reserved. - * - * 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. - */ - -#if TARGET_OS_EMBEDDED || TARGET_IPHONE_SIMULATOR -#include -#endif - -#include - -namespace zxing { - -class CGImageLuminanceSource : public LuminanceSource { - - private: - CGImageRef image_; - CFDataRef data_; - int left_; - int top_; - int width_; - int height_; - int dataWidth_; - int dataHeight_; - int bytesPerRow_; - - public: - - static CGImageRef createImageFromBuffer(CVImageBufferRef); - static CGImageRef createImageFromBuffer(CVImageBufferRef, - int left, - int top, - int width, - int height); - - CGImageLuminanceSource(CVPixelBufferRef buffer, - int left, - int top, - int width, - int height); - CGImageLuminanceSource(CVPixelBufferRef buffer); - - CGImageLuminanceSource(CGImageRef image, - int left, - int top, - int width, - int height); - CGImageLuminanceSource(CGImageRef image); - ~CGImageLuminanceSource(); - - CGImageRef image() { return image_; } - CGImageRef image(size_t width, size_t height); - - unsigned char* getRow(int y, unsigned char* row); - unsigned char* getMatrix(); - - bool isRotateSupported() const { - return true; - } - - int getWidth() const { - return width_; - } - - int getHeight() const { - return height_; - } - - Ref rotateCounterClockwise(); - - private: - - void init(CGImageRef image); - void init(CGImageRef image, int left, int top, int width, int height); -}; - -} /* namespace */ - -#endif diff --git a/objc/src/ZXing/CGImageLuminanceSource.mm b/objc/src/ZXing/CGImageLuminanceSource.mm index 81f9738fa..f5f5e23ce 100644 --- a/objc/src/ZXing/CGImageLuminanceSource.mm +++ b/objc/src/ZXing/CGImageLuminanceSource.mm @@ -15,7 +15,7 @@ * limitations under the License. */ -#include +#import #include namespace zxing { diff --git a/objc/src/ZXing/ZXBinarizer.h b/objc/src/ZXing/ZXBinarizer.h index 53f80075f..f62b37ab8 100644 --- a/objc/src/ZXing/ZXBinarizer.h +++ b/objc/src/ZXing/ZXBinarizer.h @@ -16,7 +16,7 @@ */ #import -#import +#import @interface ZXBinarizer : NSObject { zxing::Ref native; diff --git a/objc/src/ZXing/ZXBinarizer.mm b/objc/src/ZXing/ZXBinarizer.mm index 8b7504e9a..2726ba30a 100644 --- a/objc/src/ZXing/ZXBinarizer.mm +++ b/objc/src/ZXing/ZXBinarizer.mm @@ -15,7 +15,7 @@ * limitations under the License. */ -#import +#import #if TARGET_OS_EMBEDDED || TARGET_IPHONE_SIMULATOR #define ZXBlack [[UIColor blackColor] CGColor] diff --git a/objc/src/ZXing/ZXBinaryBitmap.mm b/objc/src/ZXing/ZXBinaryBitmap.mm index 2ebd4252f..4134984bd 100644 --- a/objc/src/ZXing/ZXBinaryBitmap.mm +++ b/objc/src/ZXing/ZXBinaryBitmap.mm @@ -15,8 +15,8 @@ * limitations under the License. */ -#import -#import +#import +#import @implementation ZXBinaryBitmap diff --git a/objc/src/ZXing/ZXCGImageLuminanceSource.h b/objc/src/ZXing/ZXCGImageLuminanceSource.h index bac9373ed..8b8a25002 100644 --- a/objc/src/ZXing/ZXCGImageLuminanceSource.h +++ b/objc/src/ZXing/ZXCGImageLuminanceSource.h @@ -15,8 +15,75 @@ * limitations under the License. */ -#import -#import +#import +#import + +namespace zxing { + +class CGImageLuminanceSource : public LuminanceSource { + + private: + CGImageRef image_; + CFDataRef data_; + int left_; + int top_; + int width_; + int height_; + int dataWidth_; + int dataHeight_; + int bytesPerRow_; + + public: + + static CGImageRef createImageFromBuffer(CVImageBufferRef); + static CGImageRef createImageFromBuffer(CVImageBufferRef, + int left, + int top, + int width, + int height); + + CGImageLuminanceSource(CVPixelBufferRef buffer, + int left, + int top, + int width, + int height); + CGImageLuminanceSource(CVPixelBufferRef buffer); + + CGImageLuminanceSource(CGImageRef image, + int left, + int top, + int width, + int height); + CGImageLuminanceSource(CGImageRef image); + ~CGImageLuminanceSource(); + + CGImageRef image() { return image_; } + CGImageRef image(size_t width, size_t height); + + unsigned char* getRow(int y, unsigned char* row); + unsigned char* getMatrix(); + + bool isRotateSupported() const { + return true; + } + + int getWidth() const { + return width_; + } + + int getHeight() const { + return height_; + } + + Ref rotateCounterClockwise(); + + private: + + void init(CGImageRef image); + void init(CGImageRef image, int left, int top, int width, int height); +}; + +} /* namespace */ @class ZXImage; diff --git a/objc/src/ZXing/ZXCGImageLuminanceSource.mm b/objc/src/ZXing/ZXCGImageLuminanceSource.mm index c98a82797..50522c563 100644 --- a/objc/src/ZXing/ZXCGImageLuminanceSource.mm +++ b/objc/src/ZXing/ZXCGImageLuminanceSource.mm @@ -15,8 +15,8 @@ * limitations under the License. */ -#import -#import +#import +#import @implementation ZXCGImageLuminanceSource diff --git a/objc/src/ZXing/ZXCapture.h b/objc/src/ZXing/ZXCapture.h index 5b1eec357..be52ac6f8 100644 --- a/objc/src/ZXing/ZXCapture.h +++ b/objc/src/ZXing/ZXCapture.h @@ -30,6 +30,7 @@ #define ZXCaptureDeviceInput AVCaptureDeviceInput #define ZXCaptureVideoOutput AVCaptureVideoDataOutput #else +#import #define ZX(x) x #define ZXAV(x) #define ZXAVC(x) diff --git a/objc/src/ZXing/ZXCapture.mm b/objc/src/ZXing/ZXCapture.mm index 27214afc0..565ea5701 100644 --- a/objc/src/ZXing/ZXCapture.mm +++ b/objc/src/ZXing/ZXCapture.mm @@ -15,17 +15,17 @@ * limitations under the License. */ -#include +#include #if !TARGET_IPHONE_SIMULATOR -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #if TARGET_OS_EMBEDDED || TARGET_IPHONE_SIMULATOR #define ZXCaptureDevice AVCaptureDevice diff --git a/objc/src/ZXing/ZXCaptureView.h b/objc/src/ZXing/ZXCaptureView.h index 749ab6958..fadcb1999 100644 --- a/objc/src/ZXing/ZXCaptureView.h +++ b/objc/src/ZXing/ZXCaptureView.h @@ -15,7 +15,7 @@ * limitations under the License. */ -#include +#include @interface ZXCaptureView : ZXView { } diff --git a/objc/src/ZXing/ZXCaptureView.mm b/objc/src/ZXing/ZXCaptureView.mm index 496fbb79c..7979c89f1 100644 --- a/objc/src/ZXing/ZXCaptureView.mm +++ b/objc/src/ZXing/ZXCaptureView.mm @@ -15,7 +15,7 @@ * limitations under the License. */ -#include +#include @implementation ZXCaptureView { } diff --git a/objc/src/ZXing/ZXDecodeHints.mm b/objc/src/ZXing/ZXDecodeHints.mm index 0a2afcf59..208cc17ab 100644 --- a/objc/src/ZXing/ZXDecodeHints.mm +++ b/objc/src/ZXing/ZXDecodeHints.mm @@ -15,7 +15,7 @@ * limitations under the License. */ -#import +#import @implementation ZXDecodeHints diff --git a/objc/src/ZXing/ZXHybridBinarizer.h b/objc/src/ZXing/ZXHybridBinarizer.h index 03635e532..e44b1fa4e 100644 --- a/objc/src/ZXing/ZXHybridBinarizer.h +++ b/objc/src/ZXing/ZXHybridBinarizer.h @@ -15,7 +15,7 @@ * limitations under the License. */ -#import +#import #import @interface ZXHybridBinarizer : ZXBinarizer { diff --git a/objc/src/ZXing/ZXHybridBinarizer.mm b/objc/src/ZXing/ZXHybridBinarizer.mm index 709585aa4..61a1792b9 100644 --- a/objc/src/ZXing/ZXHybridBinarizer.mm +++ b/objc/src/ZXing/ZXHybridBinarizer.mm @@ -15,7 +15,7 @@ * limitations under the License. */ -#import +#import @implementation ZXHybridBinarizer diff --git a/objc/src/ZXing/ZXIllegalArgumentException.mm b/objc/src/ZXing/ZXIllegalArgumentException.mm index 88c4b5a29..d52707cb7 100644 --- a/objc/src/ZXing/ZXIllegalArgumentException.mm +++ b/objc/src/ZXing/ZXIllegalArgumentException.mm @@ -15,7 +15,7 @@ * limitations under the License. */ -#import +#import @implementation ZXIllegalArgumentException { } diff --git a/objc/src/ZXing/ZXImage.mm b/objc/src/ZXing/ZXImage.mm index b7179257f..6783abb79 100644 --- a/objc/src/ZXing/ZXImage.mm +++ b/objc/src/ZXing/ZXImage.mm @@ -15,7 +15,7 @@ * limitations under the License. */ -#import +#import @implementation ZXImage diff --git a/objc/src/ZXing/ZXLuminanceSource.mm b/objc/src/ZXing/ZXLuminanceSource.mm index 5a3b53a27..cd83a43fa 100644 --- a/objc/src/ZXing/ZXLuminanceSource.mm +++ b/objc/src/ZXing/ZXLuminanceSource.mm @@ -15,7 +15,7 @@ * limitations under the License. */ -#import +#import @implementation ZXLuminanceSource diff --git a/objc/src/ZXing/ZXMultiFormatReader.h b/objc/src/ZXing/ZXMultiFormatReader.h index ed308ce6e..823474747 100644 --- a/objc/src/ZXing/ZXMultiFormatReader.h +++ b/objc/src/ZXing/ZXMultiFormatReader.h @@ -15,7 +15,7 @@ * limitations under the License. */ -#import +#import @interface ZXMultiFormatReader : ZXReader { } diff --git a/objc/src/ZXing/ZXMultiFormatReader.mm b/objc/src/ZXing/ZXMultiFormatReader.mm index 1931c2ec5..ba96e68c8 100644 --- a/objc/src/ZXing/ZXMultiFormatReader.mm +++ b/objc/src/ZXing/ZXMultiFormatReader.mm @@ -16,7 +16,7 @@ */ #import -#import +#import @implementation ZXMultiFormatReader diff --git a/objc/src/ZXing/ZXQRCodeReader.h b/objc/src/ZXing/ZXQRCodeReader.h index 7e1537348..6d563ba5e 100644 --- a/objc/src/ZXing/ZXQRCodeReader.h +++ b/objc/src/ZXing/ZXQRCodeReader.h @@ -15,7 +15,7 @@ * limitations under the License. */ -#import +#import @interface ZXQRCodeReader : ZXReader { } diff --git a/objc/src/ZXing/ZXQRCodeReader.mm b/objc/src/ZXing/ZXQRCodeReader.mm index be74c6012..2cc2451f8 100644 --- a/objc/src/ZXing/ZXQRCodeReader.mm +++ b/objc/src/ZXing/ZXQRCodeReader.mm @@ -16,7 +16,7 @@ */ #import -#import +#import @implementation ZXQRCodeReader diff --git a/objc/src/ZXing/ZXReader.mm b/objc/src/ZXing/ZXReader.mm index 8e8f7d429..4c7133da0 100644 --- a/objc/src/ZXing/ZXReader.mm +++ b/objc/src/ZXing/ZXReader.mm @@ -15,14 +15,14 @@ * limitations under the License. */ -#import -#import -#import -#import +#import +#import +#import +#import #import -#import +#import #import -#import +#import @implementation ZXReader diff --git a/objc/src/ZXing/ZXReaderException.mm b/objc/src/ZXing/ZXReaderException.mm index 6f311a740..140f86a9a 100644 --- a/objc/src/ZXing/ZXReaderException.mm +++ b/objc/src/ZXing/ZXReaderException.mm @@ -15,7 +15,7 @@ * limitations under the License. */ -#import +#import @implementation ZXReaderException { } diff --git a/objc/src/ZXing/ZXResult.mm b/objc/src/ZXing/ZXResult.mm index f88bea5c1..e42ea8288 100644 --- a/objc/src/ZXing/ZXResult.mm +++ b/objc/src/ZXing/ZXResult.mm @@ -15,7 +15,7 @@ * limitations under the License. */ -#import +#import @implementation ZXResult