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

formatting cleanup before trying to make the last failing C++ qr blackbox test pass

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1965 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2011-10-13 15:20:47 +00:00
parent beeef242b2
commit 492d773f59
2 changed files with 78 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
cpp/core/src/zxing/qrcode/decoder/DecodedBitStreamParser.cpp
View file

@ -327,6 +327,7 @@ DecodedBitStreamParser::guessEncoding(unsigned char *bytes, int length) {
return PLATFORM_DEFAULT_ENCODING; return PLATFORM_DEFAULT_ENCODING;
} }
/*
string DecodedBitStreamParser::decode(ArrayRef<unsigned char> bytes, Version *version) { string DecodedBitStreamParser::decode(ArrayRef<unsigned char> bytes, Version *version) {
string result; string result;
Ref<BitSource> bits(new BitSource(bytes)); Ref<BitSource> bits(new BitSource(bytes));
@ -357,3 +358,77 @@ string DecodedBitStreamParser::decode(ArrayRef<unsigned char> bytes, Version *ve
} while (mode != &Mode::TERMINATOR); } while (mode != &Mode::TERMINATOR);
return result; return result;
} }
*/
DecoderResult DecodedBitStreamParser::decode(ArrayRef<unsigned char> bytes,
Version* version,
ErrorCorrectionLevel ecLevel,
Hashtable hints) {
BitSource bits = new BitSource(bytes);
StringBuffer result = new StringBuffer(50);
CharacterSetECI currentCharacterSetECI = null;
boolean fc1InEffect = false;
Vector byteSegments = new Vector(1);
Mode mode;
do {
// While still another segment to read...
if (bits.available() < 4) {
// OK, assume we're done. Really, a TERMINATOR mode should have been recorded here
mode = Mode.TERMINATOR;
} else {
try {
mode = Mode.forBits(bits.readBits(4)); // mode is encoded by 4 bits
} catch (IllegalArgumentException iae) {
throw FormatException.getFormatInstance();
}
}
if (!mode.equals(Mode.TERMINATOR)) {
if (mode.equals(Mode.FNC1_FIRST_POSITION) || mode.equals(Mode.FNC1_SECOND_POSITION)) {
// We do little with FNC1 except alter the parsed result a bit according to the spec
fc1InEffect = true;
} else if (mode.equals(Mode.STRUCTURED_APPEND)) {
// not really supported; all we do is ignore it
// Read next 8 bits (symbol sequence #) and 8 bits (parity data), then continue
bits.readBits(16);
} else if (mode.equals(Mode.ECI)) {
// Count doesn't apply to ECI
int value = parseECIValue(bits);
currentCharacterSetECI = CharacterSetECI.getCharacterSetECIByValue(value);
if (currentCharacterSetECI == null) {
throw FormatException.getFormatInstance();
}
} else {
// First handle Hanzi mode which does not start with character count
if (mode.equals(Mode.HANZI)) {
//chinese mode contains a sub set indicator right after mode indicator
int subset = bits.readBits(4);
int countHanzi = bits.readBits(mode.getCharacterCountBits(version));
if (subset == GB2312_SUBSET) {
decodeHanziSegment(bits, result, countHanzi);
}
} else {
// "Normal" QR code modes:
// How many characters will follow, encoded in this mode?
int count = bits.readBits(mode.getCharacterCountBits(version));
if (mode.equals(Mode.NUMERIC)) {
decodeNumericSegment(bits, result, count);
} else if (mode.equals(Mode.ALPHANUMERIC)) {
decodeAlphanumericSegment(bits, result, count, fc1InEffect);
} else if (mode.equals(Mode.BYTE)) {
decodeByteSegment(bits, result, count, currentCharacterSetECI, byteSegments, hints);
} else if (mode.equals(Mode.KANJI)) {
decodeKanjiSegment(bits, result, count);
} else {
throw FormatException.getFormatInstance();
}
}
}
}
} while (!mode.equals(Mode.TERMINATOR));
return new DecoderResult(bytes,
result.toString(),
byteSegments.isEmpty() ? null : byteSegments,
ecLevel == null ? null : ecLevel.toString());
}

6
cpp/core/src/zxing/qrcode/decoder/DecodedBitStreamParser.h
View file

@ -1,3 +1,5 @@
// -*- mode:c++; tab-width:2; indent-tabs-mode:nil; c-basic-offset:2 -*-
#ifndef __DECODED_BIT_STREAM_PARSER_H__ #ifndef __DECODED_BIT_STREAM_PARSER_H__
#define __DECODED_BIT_STREAM_PARSER_H__ #define __DECODED_BIT_STREAM_PARSER_H__
@ -27,8 +29,6 @@
#include <zxing/common/Counted.h> #include <zxing/common/Counted.h>
#include <zxing/common/Array.h> #include <zxing/common/Array.h>
namespace zxing { namespace zxing {
namespace qrcode { namespace qrcode {
@ -50,7 +50,7 @@ private:
static void append(std::string &ost, const unsigned char *bufIn, size_t nIn, const char *src); static void append(std::string &ost, const unsigned char *bufIn, size_t nIn, const char *src);
public: public:
static std::string decode(ArrayRef<unsigned char> bytes, Version *version); static DecoderResulta decode(ArrayRef<unsigned char> bytes, Version *version);
}; };
} }