Chromium Code Reviews| Index: xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp |
| diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp b/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp |
| index 4c3d4dbdf223ad1f1ba87969fcbe8d7946cf58cf..4e1d8dd1e9ceaaaa4555433dacada067d78473c4 100644 |
| --- a/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp |
| +++ b/xfa/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp |
| @@ -423,15 +423,13 @@ CBC_PDF417ScanningDecoder::createDecoderResultFromAmbiguousValues( |
| } |
| CBC_CommonDecoderResult* decoderResult = |
| decodeCodewords(codewords, ecLevel, erasureArray, e); |
| - if (e != BCExceptionNO) { |
| - e = BCExceptionNO; |
| - continue; |
| - } else { |
| + if (e == BCExceptionNO) |
| return decoderResult; |
| - } |
| + |
| + e = BCExceptionNO; |
|
Tom Sepez
2016/05/23 16:57:54
agreed, most likely this was the intent.
|
| if (ambiguousIndexCount.GetSize() == 0) { |
| e = BCExceptionChecksumInstance; |
| - return NULL; |
| + return nullptr; |
| } |
| for (int32_t i = 0; i < ambiguousIndexCount.GetSize(); i++) { |
| if (ambiguousIndexCount[i] < |
| @@ -442,7 +440,7 @@ CBC_PDF417ScanningDecoder::createDecoderResultFromAmbiguousValues( |
| ambiguousIndexCount[i] = 0; |
| if (i == ambiguousIndexCount.GetSize() - 1) { |
| e = BCExceptionChecksumInstance; |
| - return NULL; |
| + return nullptr; |
| } |
| } |
| } |