| Index: xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
|
| diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
|
| index 930480f7b9b4cc7a44d5915cd535e93fc5db98e9..5a4a0a9798b5bfe75faf227f01d14f64b92174d4 100644
|
| --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
|
| +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
|
| @@ -39,10 +39,7 @@ void CBC_DataMatrixDetector::Init(int32_t& e) {
|
| BC_EXCEPTION_CHECK_ReturnVoid(e);
|
| }
|
| CBC_DataMatrixDetector::~CBC_DataMatrixDetector() {
|
| - if (m_rectangleDetector != NULL) {
|
| - delete m_rectangleDetector;
|
| - }
|
| - m_rectangleDetector = NULL;
|
| + delete m_rectangleDetector;
|
| }
|
| inline FX_BOOL ResultPointsAndTransitionsComparator(void* a, void* b) {
|
| return ((CBC_ResultPointsAndTransitions*)b)->GetTransitions() >
|
| @@ -81,7 +78,7 @@ CBC_QRDetectorResult* CBC_DataMatrixDetector::Detect(int32_t& e) {
|
| CBC_ResultPoint* bottomLeft = NULL;
|
| CBC_ResultPoint* maybeBottomRight = NULL;
|
| FX_POSITION itBegin = pointCount.GetStartPosition();
|
| - while (itBegin != NULL) {
|
| + while (itBegin) {
|
| CBC_ResultPoint* key = 0;
|
| int32_t value = 0;
|
| pointCount.GetNextAssoc(itBegin, key, value);
|
|
|