From: srowen Date: Thu, 21 May 2009 14:33:23 +0000 (+0000) Subject: Remove some DEBUG blocks that apparently do not compile X-Git-Url: http://git.rot13.org/?p=zxing.git;a=commitdiff_plain;h=a376202f56c691a0eb9e55d4b1bb29f0bb167d23;hp=ea0df96ba4942397523986d14811c870ae1965d3 Remove some DEBUG blocks that apparently do not compile git-svn-id: http://zxing.googlecode.com/svn/trunk@941 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- diff --git a/cpp/core/src/common/reedsolomon/GF256Poly.cpp b/cpp/core/src/common/reedsolomon/GF256Poly.cpp index 736ee33c..8f4201ca 100644 --- a/cpp/core/src/common/reedsolomon/GF256Poly.cpp +++ b/cpp/core/src/common/reedsolomon/GF256Poly.cpp @@ -55,10 +55,6 @@ namespace reedsolomon { GF256Poly::GF256Poly(GF256 &f, ArrayRef c) : Counted(), field(f), coefficients(c) { -#ifdef DEBUG - cout << "instantiating GF256Poly @ " << this << " with Array " << c.array_ << "(" << c.array_->count_ << "), size " << c.size() << ", "; - cout << "coefficients size = " << coefficients.size() << "\n"; -#endif fixCoefficients(); } diff --git a/cpp/core/src/common/reedsolomon/ReedSolomonDecoder.cpp b/cpp/core/src/common/reedsolomon/ReedSolomonDecoder.cpp index c387e972..92c75283 100644 --- a/cpp/core/src/common/reedsolomon/ReedSolomonDecoder.cpp +++ b/cpp/core/src/common/reedsolomon/ReedSolomonDecoder.cpp @@ -36,10 +36,6 @@ namespace reedsolomon { } void ReedSolomonDecoder::decode(ArrayRef received, int twoS) { -#ifdef DEBUG - cout << "decode(): received = " << &received << ", array = " << - received.array_ << " (" << received.array_->count_ << ")\n"; -#endif Ref poly(new GF256Poly(field, received)); @@ -63,35 +59,14 @@ namespace reedsolomon { } } if (noError) { - -#ifdef DEBUG - cout << "before returning: syndromeCoefficients rc = " << - syndromeCoefficients.array_->count_ << "\n"; -#endif - return; } - -#ifdef DEBUG - cout << "syndromeCoefficients rc = " << - syndromeCoefficients.array_->count_ << "\n"; -#endif + Ref syndrome(new GF256Poly(field, syndromeCoefficients)); -#ifdef DEBUG - cout << "syndrome rc = " << syndrome.object_->count_ << - ", syndromeCoefficients rc = " << - syndromeCoefficients.array_->count_ << "\n"; -#endif Ref monomial(field.buildMonomial(twoS, 1)); -#ifdef DEBUG - cout << "monopmial rc = " << monomial.object_->count_ << "\n"; -#endif vector > sigmaOmega (runEuclideanAlgorithm(monomial, syndrome, twoS)); ArrayRef errorLocations = findErrorLocations(sigmaOmega[0]); -#ifdef DEBUG - cout << "errorLocations count: " << errorLocations.array_->count_ << "\n"; -#endif ArrayRef errorMagitudes = findErrorMagnitudes(sigmaOmega[1], errorLocations); for (unsigned i = 0; i < errorLocations->size(); i++) {