| Index: fpdfsdk/include/formfiller/FFL_Utils.h
|
| diff --git a/fpdfsdk/include/formfiller/FFL_Utils.h b/fpdfsdk/include/formfiller/FFL_Utils.h
|
| index 2fdc7b171c89a42870fd48f09949673ad09cce8c..7dcfa40f6a9b5828d84d3473b593aeee552f58b6 100644
|
| --- a/fpdfsdk/include/formfiller/FFL_Utils.h
|
| +++ b/fpdfsdk/include/formfiller/FFL_Utils.h
|
| @@ -1,20 +1,24 @@
|
| // 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
|
|
|
| -#define FFL_BASE_USERUNIT 1.0f / 72.0f
|
| +#define FFL_BASE_USERUNIT 1.0f / 72.0f
|
|
|
| -template<class T> T FFL_MIN (const T & i, const T & j) { return ((i < j) ? i : j); }
|
| -template<class T> T FFL_MAX (const T & i, const T & j) { return ((i > j) ? i : j); }
|
| +template <class T>
|
| +T FFL_MIN(const T& i, const T& j) {
|
| + return ((i < j) ? i : j);
|
| +}
|
| +template <class T>
|
| +T FFL_MAX(const T& i, const T& j) {
|
| + return ((i > j) ? i : j);
|
| +}
|
|
|
| -class CFFL_Utils
|
| -{
|
| -public:
|
| - static CPDF_Rect MaxRect(const CPDF_Rect & rect1,const CPDF_Rect & rect2);
|
| - static CPDF_Rect InflateRect(const CPDF_Rect & crRect, const FX_FLOAT & fSize);
|
| - static CPDF_Rect DeflateRect(const CPDF_Rect & crRect, const FX_FLOAT & fSize);
|
| - static FX_BOOL TraceObject(CPDF_Object* pObj);
|
| +class CFFL_Utils {
|
| + public:
|
| + static CPDF_Rect MaxRect(const CPDF_Rect& rect1, const CPDF_Rect& rect2);
|
| + static CPDF_Rect InflateRect(const CPDF_Rect& crRect, const FX_FLOAT& fSize);
|
| + static CPDF_Rect DeflateRect(const CPDF_Rect& crRect, const FX_FLOAT& fSize);
|
| + static FX_BOOL TraceObject(CPDF_Object* pObj);
|
| };
|
| -
|
|
|