diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-10-02 10:38:55 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-10-02 18:43:08 +0000 |
| commit | 951b1119d4c7487364bee4c5124b36453e00130d (patch) | |
| tree | a128c8a30be2c1b74d3ac3f135dc0522b862cf83 /fxbarcode | |
| parent | c065d883d995700b6cb5a00bd027232afded7ae5 (diff) | |
| download | pdfium-951b1119d4c7487364bee4c5124b36453e00130d.tar.xz | |
More define cleanup
Remove unused defines; Move to .cpp files where possible; Fixup values.
Change-Id: I88cd5deb04b14ab8e9f8097a695c3d0b52d64b4c
Reviewed-on: https://pdfium-review.googlesource.com/15130
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fxbarcode')
| -rw-r--r-- | fxbarcode/utils.h | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/fxbarcode/utils.h b/fxbarcode/utils.h index 9e6c70fe7c..2303af44b0 100644 --- a/fxbarcode/utils.h +++ b/fxbarcode/utils.h @@ -7,6 +7,8 @@ #ifndef FXBARCODE_UTILS_H_ #define FXBARCODE_UTILS_H_ +#include <ctype.h> + #include <vector> #include "core/fxcrt/fx_string.h" @@ -21,21 +23,9 @@ void BC_FX_ByteString_Append(ByteString& dst, const std::vector<uint8_t>& ba); #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ #include <limits> -#define FXSYS_isnan(x) _isnan(x) -#define FXSYS_nan() (std::numeric_limits<float>::quiet_NaN()) -#endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ - -#if _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ || \ - _FX_OS_ == _FX_OS_ANDROID_ -#if _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ +#elif _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ #include <limits.h> -#endif // _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ - -#include <cmath> -#define FXSYS_isnan(x) std::isnan(x) -#define FXSYS_nan() NAN -#endif // _FX_OS_ == _FX_OS_MACOSX_ || _FX_OS_ == _FX_OS_LINUX_ || \ - // _FX_OS_ == _FX_OS_ANDROID_ +#endif enum BCFORMAT { BCFORMAT_UNSPECIFY = -1, @@ -51,11 +41,7 @@ enum BCFORMAT { BCFORMAT_DATAMATRIX, BCFORMAT_QR_CODE }; -#define BCFORMAT_ECLEVEL_L 0 -#define BCFORMAT_ECLEVEL_M 1 -#define BCFORMAT_ECLEVEL_Q 2 -#define BCFORMAT_ECLEVEL_H 3 -#include <ctype.h> + #define BCExceptionNO 0 #define BCExceptionIllegalArgument 16 #define BCExceptionDegreeIsNegative 31 |