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

update for xcode 4.6 warnings. Closes 1494

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2566 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2013-02-06 22:11:37 +00:00
parent cf69a3f6db
commit c55079baf7
8 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cpp/core/src/zxing/BinaryBitmap.h
View file

@ -30,7 +30,6 @@ namespace zxing {
class BinaryBitmap : public Counted { class BinaryBitmap : public Counted {
private: private:
Ref<Binarizer> binarizer_; Ref<Binarizer> binarizer_;
int cached_y_;
public: public:
BinaryBitmap(Ref<Binarizer> binarizer); BinaryBitmap(Ref<Binarizer> binarizer);

2
cpp/core/src/zxing/common/GreyscaleRotatedLuminanceSource.cpp
View file

@ -27,7 +27,7 @@ namespace zxing {
// greyData correctly, which does not get rotated. // greyData correctly, which does not get rotated.
GreyscaleRotatedLuminanceSource::GreyscaleRotatedLuminanceSource(unsigned char* greyData, GreyscaleRotatedLuminanceSource::GreyscaleRotatedLuminanceSource(unsigned char* greyData,
int dataWidth, int dataHeight, int left, int top, int width, int height) : greyData_(greyData), int dataWidth, int dataHeight, int left, int top, int width, int height) : greyData_(greyData),
dataWidth_(dataWidth), dataHeight_(dataHeight), left_(left), top_(top), width_(width), dataWidth_(dataWidth), left_(left), top_(top), width_(width),
height_(height) { height_(height) {
// Intentionally comparing to the opposite dimension since we're rotated. // Intentionally comparing to the opposite dimension since we're rotated.

1
cpp/core/src/zxing/common/GreyscaleRotatedLuminanceSource.h
View file

@ -28,7 +28,6 @@ class GreyscaleRotatedLuminanceSource : public LuminanceSource {
private: private:
unsigned char* greyData_; unsigned char* greyData_;
int dataWidth_; int dataWidth_;
int dataHeight_;
int left_; int left_;
int top_; int top_;
int width_; int width_;

2
cpp/core/src/zxing/common/HybridBinarizer.cpp
View file

@ -33,7 +33,7 @@ namespace {
} }
HybridBinarizer::HybridBinarizer(Ref<LuminanceSource> source) : HybridBinarizer::HybridBinarizer(Ref<LuminanceSource> source) :
GlobalHistogramBinarizer(source), matrix_(NULL), cached_row_(NULL), cached_row_num_(-1) { GlobalHistogramBinarizer(source), matrix_(NULL), cached_row_(NULL) {
} }
HybridBinarizer::~HybridBinarizer() { HybridBinarizer::~HybridBinarizer() {

1
cpp/core/src/zxing/common/HybridBinarizer.h
View file

@ -32,7 +32,6 @@ namespace zxing {
private: private:
Ref<BitMatrix> matrix_; Ref<BitMatrix> matrix_;
Ref<BitArray> cached_row_; Ref<BitArray> cached_row_;
int cached_row_num_;
public: public:
HybridBinarizer(Ref<LuminanceSource> source); HybridBinarizer(Ref<LuminanceSource> source);

2
cpp/core/src/zxing/qrcode/decoder/Mode.cpp
View file

@ -41,7 +41,7 @@ Mode Mode::HANZI(8, 10, 12, 0x0D, "HANZI");
Mode::Mode(int cbv0_9, int cbv10_26, int cbv27, int bits, char const* name) : Mode::Mode(int cbv0_9, int cbv10_26, int cbv27, int bits, char const* name) :
characterCountBitsForVersions0To9_(cbv0_9), characterCountBitsForVersions10To26_(cbv10_26), characterCountBitsForVersions0To9_(cbv0_9), characterCountBitsForVersions10To26_(cbv10_26),
characterCountBitsForVersions27AndHigher_(cbv27), bits_(bits), name_(name) { characterCountBitsForVersions27AndHigher_(cbv27), name_(name) {
} }
Mode& Mode::forBits(int bits) { Mode& Mode::forBits(int bits) {

1
cpp/core/src/zxing/qrcode/decoder/Mode.h
View file

@ -32,7 +32,6 @@ private:
int characterCountBitsForVersions0To9_; int characterCountBitsForVersions0To9_;
int characterCountBitsForVersions10To26_; int characterCountBitsForVersions10To26_;
int characterCountBitsForVersions27AndHigher_; int characterCountBitsForVersions27AndHigher_;
int bits_;
std::string name_; std::string name_;
Mode(int cbv0_9, int cbv10_26, int cbv27, int bits, char const* name); Mode(int cbv0_9, int cbv10_26, int cbv27, int bits, char const* name);

5
iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj
View file

@ -357,7 +357,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = { 29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0450; LastUpgradeCheck = 0460;
}; };
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Barcodes" */; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Barcodes" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
@ -619,6 +619,7 @@
); );
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99; GCC_C_LANGUAGE_STANDARD = c99;
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv6]" = NO; "GCC_THUMB_SUPPORT[arch=armv6]" = NO;
GCC_VERSION = ""; GCC_VERSION = "";
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
@ -677,6 +678,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99; GCC_C_LANGUAGE_STANDARD = c99;
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv6]" = NO; "GCC_THUMB_SUPPORT[arch=armv6]" = NO;
GCC_VERSION = ""; GCC_VERSION = "";
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
@ -709,6 +711,7 @@
); );
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99; GCC_C_LANGUAGE_STANDARD = c99;
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv6]" = NO; "GCC_THUMB_SUPPORT[arch=armv6]" = NO;
GCC_VERSION = ""; GCC_VERSION = "";
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;