moves them up a level to the callers.
git-svn-id: http://zxing.googlecode.com/svn/trunk@1531
59b500cc-1b3d-0410-9834-
0bbf25fbcc57
}
int Code128Reader::decodeCode(Ref<BitArray> row, int counters[], int countersCount,
}
int Code128Reader::decodeCode(Ref<BitArray> row, int counters[], int countersCount,
- int rowOffset){
- recordPattern(row, rowOffset, counters, countersCount);
+ int rowOffset) {
+ if (!recordPattern(row, rowOffset, counters, countersCount)) {
+ throw ReaderException("");
+ }
unsigned int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept
int bestMatch = -1;
for (int d = 0; d < CODE_PATTERNS_LENGTH; d++) {
unsigned int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept
int bestMatch = -1;
for (int d = 0; d < CODE_PATTERNS_LENGTH; d++) {
char decodedChar;
int lastStart;
do {
char decodedChar;
int lastStart;
do {
- recordPattern(row, nextStart, counters, countersLen);
+ if (!recordPattern(row, nextStart, counters, countersLen)) {
+ throw ReaderException("");
+ }
int pattern = toNarrowWidePattern(counters, countersLen);
if (pattern < 0) {
throw ReaderException("pattern < 0");
int pattern = toNarrowWidePattern(counters, countersLen);
if (pattern < 0) {
throw ReaderException("pattern < 0");
while (payloadStart < payloadEnd) {
// Get 10 runs of black/white.
while (payloadStart < payloadEnd) {
// Get 10 runs of black/white.
- recordPattern(row, payloadStart, counterDigitPair, counterDigitPairLen);
+ if (!recordPattern(row, payloadStart, counterDigitPair, counterDigitPairLen)) {
+ throw ReaderException("");
+ }
// Split them into each array
for (int k = 0; k < 5; k++) {
int twoK = k << 1;
// Split them into each array
for (int k = 0; k < 5; k++) {
int twoK = k << 1;
// if there's exactly two points (which there should be), flip the x coordinate
// if there's not exactly 2, I don't know what do do with it
if (points.size() == 2) {
// if there's exactly two points (which there should be), flip the x coordinate
// if there's not exactly 2, I don't know what do do with it
if (points.size() == 2) {
- Ref<ResultPoint> pointZero(new OneDResultPoint(width - points[0]->getX() - 1, points[0]->getY()));
+ Ref<ResultPoint> pointZero(new OneDResultPoint(width - points[0]->getX() - 1,
+ points[0]->getY()));
- Ref<ResultPoint> pointOne(new OneDResultPoint(width - points[1]->getX() - 1, points[1]->getY()));
+ Ref<ResultPoint> pointOne(new OneDResultPoint(width - points[1]->getX() - 1,
+ points[1]->getY()));
- result.reset(new Result(result->getText(),result->getRawBytes(),points,result->getBarcodeFormat()));
+ result.reset(new Result(result->getText(), result->getRawBytes(), points,
+ result->getBarcodeFormat()));
throw ReaderException("doDecode() failed");
}
throw ReaderException("doDecode() failed");
}
- unsigned int OneDReader::patternMatchVariance(int counters[], int countersSize, const int pattern[], int maxIndividualVariance) {
+ unsigned int OneDReader::patternMatchVariance(int counters[], int countersSize,
+ const int pattern[], int maxIndividualVariance) {
int numCounters = countersSize;
unsigned int total = 0;
unsigned int patternLength = 0;
int numCounters = countersSize;
unsigned int total = 0;
unsigned int patternLength = 0;
return totalVariance / total;
}
return totalVariance / total;
}
- void OneDReader::recordPattern(Ref<BitArray> row, int start, int counters[], int countersCount){
+ bool OneDReader::recordPattern(Ref<BitArray> row, int start, int counters[], int countersCount) {
int numCounters = countersCount;//sizeof(counters) / sizeof(int);
for (int i = 0; i < numCounters; i++) {
counters[i] = 0;
}
int end = row->getSize();
if (start >= end) {
int numCounters = countersCount;//sizeof(counters) / sizeof(int);
for (int i = 0; i < numCounters; i++) {
counters[i] = 0;
}
int end = row->getSize();
if (start >= end) {
- throw ReaderException("recordPattern: start >= end");
}
bool isWhite = !row->get(start);
int counterPosition = 0;
}
bool isWhite = !row->get(start);
int counterPosition = 0;
// If we read fully the last section of pixels and filled up our counters -- or filled
// the last counter but ran off the side of the image, OK. Otherwise, a problem.
if (!(counterPosition == numCounters || (counterPosition == numCounters - 1 && i == end))) {
// If we read fully the last section of pixels and filled up our counters -- or filled
// the last counter but ran off the side of the image, OK. Otherwise, a problem.
if (!(counterPosition == numCounters || (counterPosition == numCounters - 1 && i == end))) {
- throw ReaderException("recordPattern");
}
OneDReader::~OneDReader() {
}
OneDReader::~OneDReader() {
static unsigned int patternMatchVariance(int counters[], int countersSize,
const int pattern[], int maxIndividualVariance);
static unsigned int patternMatchVariance(int counters[], int countersSize,
const int pattern[], int maxIndividualVariance);
- static void recordPattern(Ref<BitArray> row, int start, int counters[], int countersCount);
+ static bool recordPattern(Ref<BitArray> row, int start, int counters[], int countersCount);
virtual ~OneDReader();
};
}
virtual ~OneDReader();
};
}
sizeof(START_END_PATTERN) / sizeof(int));
}
sizeof(START_END_PATTERN) / sizeof(int));
}
-// int UPCEANReader::decodeDigit(Ref<BitArray> row, int counters[], int countersLen, int rowOffset, int** patterns/*[][]*/, int paterns1Len, int paterns2Len)
int UPCEANReader::decodeDigit(Ref<BitArray> row, int counters[], int countersLen, int rowOffset,
UPC_EAN_PATTERNS patternType) {
int UPCEANReader::decodeDigit(Ref<BitArray> row, int counters[], int countersLen, int rowOffset,
UPC_EAN_PATTERNS patternType) {
- recordPattern(row, rowOffset, counters, countersLen);
+ if (!recordPattern(row, rowOffset, counters, countersLen)) {
+ throw ReaderException("");
+ }
unsigned int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept
int bestMatch = -1;
unsigned int bestVariance = MAX_AVG_VARIANCE; // worst variance we'll accept
int bestMatch = -1;