From b10e1c6b0ed41e1feca0a316fab73431a21da64a Mon Sep 17 00:00:00 2001 From: "smparkes@smparkes.net" Date: Tue, 6 Mar 2012 16:22:41 +0000 Subject: [PATCH] incorrect case fix; remove uint8_t use since doesn't fit style; remove old debugging cruft git-svn-id: https://zxing.googlecode.com/svn/trunk@2219 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- cpp/core/src/zxing/aztec/decoder/Decoder.cpp | 2 +- cpp/core/src/zxing/aztec/decoder/Decoder.h | 2 +- cpp/core/src/zxing/aztec/detector/Detector.cpp | 13 ------------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/cpp/core/src/zxing/aztec/decoder/Decoder.cpp b/cpp/core/src/zxing/aztec/decoder/Decoder.cpp index 09b2fe9bd..2f2b3aba9 100644 --- a/cpp/core/src/zxing/aztec/decoder/Decoder.cpp +++ b/cpp/core/src/zxing/aztec/decoder/Decoder.cpp @@ -38,7 +38,7 @@ using zxing::Ref; using std::string; namespace { - void add(string& result, uint8_t character) { + void add(string& result, unsigned char character) { char s[] = { character & 0xff }; char* ss = s; size_t sl = sizeof(s); diff --git a/cpp/core/src/zxing/aztec/decoder/Decoder.h b/cpp/core/src/zxing/aztec/decoder/Decoder.h index a6f8d936c..e29801c69 100644 --- a/cpp/core/src/zxing/aztec/decoder/Decoder.h +++ b/cpp/core/src/zxing/aztec/decoder/Decoder.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include namespace zxing { diff --git a/cpp/core/src/zxing/aztec/detector/Detector.cpp b/cpp/core/src/zxing/aztec/detector/Detector.cpp index 92bb55f5d..8d51ff773 100644 --- a/cpp/core/src/zxing/aztec/detector/Detector.cpp +++ b/cpp/core/src/zxing/aztec/detector/Detector.cpp @@ -380,19 +380,6 @@ Ref Detector::sampleGrid(Ref image, } void Detector::getParameters(Ref parameterData) { - - if (false) { - printf("getting parameters from: "); - for (int i = 0; i < (int)parameterData->getSize(); i++) { - if (parameterData->get(i)) { - printf("1"); - } else { - printf("0"); - } - } - printf("\n"); - } - nbLayers_ = 0; nbDataBlocks_ = 0;