Get rid of CBC_AutoPtr and use std::unique_ptr instead.

xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 // Original code is licensed as follows:
 /*
  * Copyright 2008 ZXing authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
+#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h"
+
 #include <algorithm>
+#include <memory>
 
 #include "xfa/src/fxbarcode/BC_ResultPoint.h"
 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h"
-#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h"
 #include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h"
 #include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h"
 #include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h"
 #include "xfa/src/fxbarcode/utils.h"
 
 const int32_t CBC_DataMatrixDetector::INTEGERS[5] = {0, 1, 2, 3, 4};
 CBC_DataMatrixDetector::CBC_DataMatrixDetector(CBC_CommonBitMatrix* image)
     : m_image(image), m_rectangleDetector(NULL) {}
 void CBC_DataMatrixDetector::Init(int32_t& e) {
   m_rectangleDetector = new CBC_WhiteRectangleDetector(m_image);
@@ skipping 75 matching lines @@
   int32_t value;
   if (!pointCount.Lookup(pointA, value)) {
     topRight = pointA;
   } else if (!pointCount.Lookup(pointB, value)) {
     topRight = pointB;
   } else if (!pointCount.Lookup(pointC, value)) {
     topRight = pointC;
   } else {
     topRight = pointD;
   }
-  int32_t dimensionTop = CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+  int32_t dimensionTop = std::unique_ptr<CBC_ResultPointsAndTransitions>(
                              TransitionsBetween(topLeft, topRight))
                              ->GetTransitions();
-  int32_t dimensionRight = CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+  int32_t dimensionRight = std::unique_ptr<CBC_ResultPointsAndTransitions>(
                                TransitionsBetween(bottomRight, topRight))
                                ->GetTransitions();
   if ((dimensionTop & 0x01) == 1) {
     dimensionTop++;
   }
   dimensionTop += 2;
   if ((dimensionRight & 0x01) == 1) {
     dimensionRight++;
   }
   dimensionRight += 2;
-  CBC_AutoPtr<CBC_CommonBitMatrix> bits(NULL);
-  CBC_AutoPtr<CBC_ResultPoint> correctedTopRight(NULL);
+  std::unique_ptr<CBC_CommonBitMatrix> bits;
+  std::unique_ptr<CBC_ResultPoint> correctedTopRight;
   if (4 * dimensionTop >= 7 * dimensionRight ||
       4 * dimensionRight >= 7 * dimensionTop) {
-    correctedTopRight = CBC_AutoPtr<CBC_ResultPoint>(
+    correctedTopRight.reset(
         CorrectTopRightRectangular(bottomLeft, bottomRight, topLeft, topRight,
                                    dimensionTop, dimensionRight));
     if (correctedTopRight.get() == NULL) {
-      correctedTopRight = CBC_AutoPtr<CBC_ResultPoint>(topRight);
+      correctedTopRight.reset(topRight);
     } else {
       delete topRight;
       topRight = NULL;
     }
-    dimensionTop = CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+    dimensionTop = std::unique_ptr<CBC_ResultPointsAndTransitions>(
                        TransitionsBetween(topLeft, correctedTopRight.get()))
                        ->GetTransitions();
     dimensionRight =

[dsinclair, 2016/02/25 01:56:55]

Why not .reset() like the others?

[Lei Zhang, 2016/02/25 02:18:12]

|dimensionRight| is an int.

-        CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+        std::unique_ptr<CBC_ResultPointsAndTransitions>(
             TransitionsBetween(bottomRight, correctedTopRight.get()))
             ->GetTransitions();
     if ((dimensionTop & 0x01) == 1) {
       dimensionTop++;
     }
     if ((dimensionRight & 0x01) == 1) {
       dimensionRight++;
     }
-    bits = CBC_AutoPtr<CBC_CommonBitMatrix>(
-        SampleGrid(m_image, topLeft, bottomLeft, bottomRight,
-                   correctedTopRight.get(), dimensionTop, dimensionRight, e));
+    bits.reset(SampleGrid(m_image, topLeft, bottomLeft, bottomRight,
+                          correctedTopRight.get(), dimensionTop, dimensionRight,
+                          e));
     BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
   } else {
     int32_t dimension = std::min(dimensionRight, dimensionTop);
-    correctedTopRight = CBC_AutoPtr<CBC_ResultPoint>(
+    correctedTopRight.reset(
         CorrectTopRight(bottomLeft, bottomRight, topLeft, topRight, dimension));
     if (correctedTopRight.get() == NULL) {
-      correctedTopRight = CBC_AutoPtr<CBC_ResultPoint>(topRight);
+      correctedTopRight.reset(topRight);
     } else {
       delete topRight;
       topRight = NULL;
     }
     int32_t dimensionCorrected =
-        std::max(CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+        std::max(std::unique_ptr<CBC_ResultPointsAndTransitions>(
                      TransitionsBetween(topLeft, correctedTopRight.get()))
                      ->GetTransitions(),
-                 CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+                 std::unique_ptr<CBC_ResultPointsAndTransitions>(
                      TransitionsBetween(bottomRight, correctedTopRight.get()))
                      ->GetTransitions());
     dimensionCorrected++;
     if ((dimensionCorrected & 0x01) == 1) {
       dimensionCorrected++;
     }
-    bits = CBC_AutoPtr<CBC_CommonBitMatrix>(SampleGrid(
-        m_image, topLeft, bottomLeft, bottomRight, correctedTopRight.get(),
-        dimensionCorrected, dimensionCorrected, e));
+    bits.reset(SampleGrid(m_image, topLeft, bottomLeft, bottomRight,
+                          correctedTopRight.get(), dimensionCorrected,
+                          dimensionCorrected, e));
     BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
   }
   CFX_PtrArray* result = new CFX_PtrArray;
   result->SetSize(4);
   result->Add(topLeft);
   result->Add(bottomLeft);
   result->Add(bottomRight);
   result->Add(correctedTopRight.release());
   return new CBC_QRDetectorResult(bits.release(), result);
 }
 CBC_ResultPoint* CBC_DataMatrixDetector::CorrectTopRightRectangular(
     CBC_ResultPoint* bottomLeft,
     CBC_ResultPoint* bottomRight,
     CBC_ResultPoint* topLeft,
     CBC_ResultPoint* topRight,
     int32_t dimensionTop,
     int32_t dimensionRight) {
   FX_FLOAT corr = Distance(bottomLeft, bottomRight) / (FX_FLOAT)dimensionTop;
   int32_t norm = Distance(topLeft, topRight);
   FX_FLOAT cos = (topRight->GetX() - topLeft->GetX()) / norm;
   FX_FLOAT sin = (topRight->GetY() - topLeft->GetY()) / norm;
-  CBC_AutoPtr<CBC_ResultPoint> c1(new CBC_ResultPoint(
+  std::unique_ptr<CBC_ResultPoint> c1(new CBC_ResultPoint(
       topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
   corr = Distance(bottomLeft, topLeft) / (FX_FLOAT)dimensionRight;
   norm = Distance(bottomRight, topRight);
   cos = (topRight->GetX() - bottomRight->GetX()) / norm;
   sin = (topRight->GetY() - bottomRight->GetY()) / norm;
-  CBC_AutoPtr<CBC_ResultPoint> c2(new CBC_ResultPoint(
+  std::unique_ptr<CBC_ResultPoint> c2(new CBC_ResultPoint(
       topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
   if (!IsValid(c1.get())) {
     if (IsValid(c2.get())) {
       return c2.release();
     }
     return NULL;
   } else if (!IsValid(c2.get())) {
     return c1.release();
   }
   int32_t l1 = FXSYS_abs(dimensionTop -
-                         CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+                         std::unique_ptr<CBC_ResultPointsAndTransitions>(
                              TransitionsBetween(topLeft, c1.get()))
                              ->GetTransitions()) +
                FXSYS_abs(dimensionRight -
-                         CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+                         std::unique_ptr<CBC_ResultPointsAndTransitions>(
                              TransitionsBetween(bottomRight, c1.get()))
                              ->GetTransitions());
   int32_t l2 = FXSYS_abs(dimensionTop -
-                         CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+                         std::unique_ptr<CBC_ResultPointsAndTransitions>(
                              TransitionsBetween(topLeft, c2.get()))
                              ->GetTransitions()) +
                FXSYS_abs(dimensionRight -
-                         CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+                         std::unique_ptr<CBC_ResultPointsAndTransitions>(
                              TransitionsBetween(bottomRight, c2.get()))
                              ->GetTransitions());
   if (l1 <= l2) {
     return c1.release();
   }
   return c2.release();
 }
 CBC_ResultPoint* CBC_DataMatrixDetector::CorrectTopRight(
     CBC_ResultPoint* bottomLeft,
     CBC_ResultPoint* bottomRight,
     CBC_ResultPoint* topLeft,
     CBC_ResultPoint* topRight,
     int32_t dimension) {
   FX_FLOAT corr = Distance(bottomLeft, bottomRight) / (FX_FLOAT)dimension;
   int32_t norm = Distance(topLeft, topRight);
   FX_FLOAT cos = (topRight->GetX() - topLeft->GetX()) / norm;
   FX_FLOAT sin = (topRight->GetY() - topLeft->GetY()) / norm;
-  CBC_AutoPtr<CBC_ResultPoint> c1(new CBC_ResultPoint(
+  std::unique_ptr<CBC_ResultPoint> c1(new CBC_ResultPoint(
       topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
   corr = Distance(bottomLeft, bottomRight) / (FX_FLOAT)dimension;
   norm = Distance(bottomRight, topRight);
   cos = (topRight->GetX() - bottomRight->GetX()) / norm;
   sin = (topRight->GetY() - bottomRight->GetY()) / norm;
-  CBC_AutoPtr<CBC_ResultPoint> c2(new CBC_ResultPoint(
+  std::unique_ptr<CBC_ResultPoint> c2(new CBC_ResultPoint(
       topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
   if (!IsValid(c1.get())) {
     if (IsValid(c2.get())) {
       return c2.release();
     }
     return NULL;
   } else if (!IsValid(c2.get())) {
     return c1.release();
   }
-  int32_t l1 = FXSYS_abs(CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+  int32_t l1 = FXSYS_abs(std::unique_ptr<CBC_ResultPointsAndTransitions>(
                              TransitionsBetween(topLeft, c1.get()))
                              ->GetTransitions() -
-                         CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+                         std::unique_ptr<CBC_ResultPointsAndTransitions>(
                              TransitionsBetween(bottomRight, c1.get()))
                              ->GetTransitions());
-  int32_t l2 = FXSYS_abs(CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+  int32_t l2 = FXSYS_abs(std::unique_ptr<CBC_ResultPointsAndTransitions>(
                              TransitionsBetween(topLeft, c2.get()))
                              ->GetTransitions() -
-                         CBC_AutoPtr<CBC_ResultPointsAndTransitions>(
+                         std::unique_ptr<CBC_ResultPointsAndTransitions>(
                              TransitionsBetween(bottomRight, c2.get()))
                              ->GetTransitions());
   return l1 <= l2 ? c1.release() : c2.release();
 }
 FX_BOOL CBC_DataMatrixDetector::IsValid(CBC_ResultPoint* p) {
   return p->GetX() >= 0 && p->GetX() < m_image->GetWidth() && p->GetY() > 0 &&
          p->GetY() < m_image->GetHeight();
 }
 int32_t CBC_DataMatrixDetector::Round(FX_FLOAT d) {
   return (int32_t)(d + 0.5f);
@@ skipping 99 matching lines @@
       (bottomLeft->GetX() - topLeft->GetX()) *
           (topRight->GetY() - topLeft->GetY())) {
     CBC_ResultPoint* temp = topRight;
     topRight = bottomLeft;
     bottomLeft = temp;
   }
   (*patterns)[0] = bottomLeft;
   (*patterns)[1] = topLeft;
   (*patterns)[2] = topRight;
 }