diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-14 14:43:42 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-14 19:05:58 +0000 |
| commit | 05df075154a832fcb476e1dfcfb865722d0ea898 (patch) | |
| tree | b8b771b62adae74d5d5ee561db75d10de3a848bf /xfa/fxbarcode/pdf417 | |
| parent | 6b94f01d1c8ad386d497428c7397b1a99614aeba (diff) | |
| download | pdfium-05df075154a832fcb476e1dfcfb865722d0ea898.tar.xz | |
Replace FX_FLOAT with underlying float type.
Change-Id: I158b7d80b0ec28b742a9f2d5a96f3dde7fb3ab56
Reviewed-on: https://pdfium-review.googlesource.com/3031
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'xfa/fxbarcode/pdf417')
| -rw-r--r-- | xfa/fxbarcode/pdf417/BC_PDF417.cpp | 4 | ||||
| -rw-r--r-- | xfa/fxbarcode/pdf417/BC_PDF417.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417.cpp b/xfa/fxbarcode/pdf417/BC_PDF417.cpp index 94c65b8538..f7aad69953 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417.cpp +++ b/xfa/fxbarcode/pdf417/BC_PDF417.cpp @@ -540,7 +540,7 @@ CFX_ArrayTemplate<int32_t>* CBC_PDF417::determineDimensions( int32_t sourceCodeWords, int32_t errorCorrectionCodeWords, int32_t& e) { - FX_FLOAT ratio = 0.0f; + float ratio = 0.0f; CFX_ArrayTemplate<int32_t>* dimension = nullptr; for (int32_t cols = m_minCols; cols <= m_maxCols; cols++) { int32_t rows = @@ -551,7 +551,7 @@ CFX_ArrayTemplate<int32_t>* CBC_PDF417::determineDimensions( if (rows > m_maxRows) { continue; } - FX_FLOAT newRatio = + float newRatio = ((17 * cols + 69) * DEFAULT_MODULE_WIDTH) / (rows * HEIGHT); if (dimension && fabsf(newRatio - PREFERRED_RATIO) > fabsf(ratio - PREFERRED_RATIO)) { diff --git a/xfa/fxbarcode/pdf417/BC_PDF417.h b/xfa/fxbarcode/pdf417/BC_PDF417.h index 3ba5aa2f0c..b382e5d26e 100644 --- a/xfa/fxbarcode/pdf417/BC_PDF417.h +++ b/xfa/fxbarcode/pdf417/BC_PDF417.h @@ -36,9 +36,9 @@ class CBC_PDF417 { static const int32_t START_PATTERN = 0x1fea8; static const int32_t STOP_PATTERN = 0x3fa29; static const int32_t CODEWORD_TABLE[][929]; - static constexpr FX_FLOAT PREFERRED_RATIO = 3.0f; - static constexpr FX_FLOAT DEFAULT_MODULE_WIDTH = 0.357f; - static constexpr FX_FLOAT HEIGHT = 2.0f; + static constexpr float PREFERRED_RATIO = 3.0f; + static constexpr float DEFAULT_MODULE_WIDTH = 0.357f; + static constexpr float HEIGHT = 2.0f; static int32_t calculateNumberOfRows(int32_t m, int32_t k, int32_t c); static int32_t getNumberOfPadCodewords(int32_t m, |