Merge to XFA: Kill CFX_Object.

xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h

 // 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
 
 #ifndef _BC_DATAMATRIXDETECTOR_H_
 #define _BC_DATAMATRIXDETECTOR_H_
 class CBC_CommonBitMatrix;
 class CBC_WhiteRectangleDetector;
 class CBC_ResultPoint;
 class CBC_QRDetectorResult;
 class CBC_DataMatrixDetector;
 class ResultPointsAndTransitions;
-class CBC_ResultPointsAndTransitions : public CFX_Object
+class CBC_ResultPointsAndTransitions
 {
 public:
     CBC_ResultPointsAndTransitions(CBC_ResultPoint *from, CBC_ResultPoint *to, FX_INT32 transitions)
     {
         m_from = from;
         m_to = to;
         m_transitions = transitions;
     }
     ~CBC_ResultPointsAndTransitions()
     {
@@ skipping 43 matching lines @@
     void Increment(CFX_MapPtrTemplate<CBC_ResultPoint*, FX_INT32> &table, CBC_ResultPoint *key);
     FX_INT32 Round(FX_FLOAT d);
     void OrderBestPatterns(CFX_PtrArray *patterns);
     virtual void Init(FX_INT32 &e);
 private:
     CBC_CommonBitMatrix *m_image;
     CBC_WhiteRectangleDetector *m_rectangleDetector;
     const static FX_INT32 INTEGERS[5];
 };
 #endif