From 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 13:50:34 -0700 Subject: Merge to XFA: Kill CFX_Object. Not just a simple merge, but changes to remove CFX_Object from XFA. Original Review URL: https://codereview.chromium.org/1088733002 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1087053002 --- xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h') diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h index 7470b553ee..d0fde46542 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h @@ -10,8 +10,8 @@ class CBC_CommonBitMatrix; class CBC_QRFinderPattern; class CBC_ResultPoint; class CBC_QRFinderPatternInfo; -class CBC_QRFinderPatternFinder; -class CBC_QRFinderPatternFinder : public CFX_Object + +class CBC_QRFinderPatternFinder { private: const static FX_INT32 CENTER_QUORUM; -- cgit v1.2.3