|
16 | 16 | * |
17 | 17 | *=========================================================================*/ |
18 | 18 | #include "itkNumberToString.h" |
19 | | -#include "itkNumericTraits.h" |
20 | | -#include "double-conversion/double-conversion.h" |
| 19 | +#include "double-conversion/double-to-string.h" |
21 | 20 |
|
22 | 21 | #include <sstream> |
23 | 22 |
|
24 | | -namespace itk |
| 23 | +namespace |
25 | 24 | { |
26 | 25 |
|
27 | | -template <> |
| 26 | +bool |
| 27 | +ConvertToShortest(const double_conversion::DoubleToStringConverter & converter, |
| 28 | + const double val, |
| 29 | + double_conversion::StringBuilder & builder) |
| 30 | +{ |
| 31 | + return converter.ToShortest(val, &builder); |
| 32 | +} |
| 33 | + |
| 34 | +bool |
| 35 | +ConvertToShortest(const double_conversion::DoubleToStringConverter & converter, |
| 36 | + const float val, |
| 37 | + double_conversion::StringBuilder & builder) |
| 38 | +{ |
| 39 | + // Call the converter member function that is specific for single-precision `float`. |
| 40 | + return converter.ToShortestSingle(val, &builder); |
| 41 | +} |
| 42 | + |
| 43 | +template <typename TValue> |
28 | 44 | std::string |
29 | | -NumberToString<double>::operator()(double val) const |
| 45 | +FloatingPointNumberToString(const TValue val) |
30 | 46 | { |
31 | | - char buf[256]; |
32 | | - const double_conversion::DoubleToStringConverter & converter = |
33 | | - double_conversion::DoubleToStringConverter::EcmaScriptConverter(); |
| 47 | + // Declare a buffer, large enough for strings like: |
| 48 | + // "-100000000000000000000" (-1e20, either float or double, 23 chars) |
| 49 | + // "-1.7976931348623157e+308" (-DBL_MAX, 25 chars) |
| 50 | + // "-0.0000033333333333333333" (-3e-005/9.0, 26 chars) |
| 51 | + char buf[32]; |
| 52 | + |
34 | 53 | double_conversion::StringBuilder builder(buf, sizeof(buf)); |
35 | | - builder.Reset(); |
36 | | - if (!converter.ToShortest(val, &builder)) |
| 54 | + |
| 55 | + if (!ConvertToShortest(double_conversion::DoubleToStringConverter::EcmaScriptConverter(), val, builder)) |
37 | 56 | { |
38 | 57 | itkGenericExceptionMacro(<< "Conversion failed for " << val); |
39 | 58 | } |
40 | 59 | return std::string(builder.Finalize()); |
41 | 60 | } |
42 | 61 |
|
| 62 | +} // namespace |
| 63 | + |
| 64 | +namespace itk |
| 65 | +{ |
| 66 | + |
43 | 67 | template <> |
44 | 68 | std::string |
45 | | -NumberToString<float>::operator()(float val) const |
| 69 | +NumberToString<double>::operator()(double val) const |
46 | 70 | { |
47 | | - char buf[256]; |
48 | | - const double_conversion::DoubleToStringConverter & converter = |
49 | | - double_conversion::DoubleToStringConverter::EcmaScriptConverter(); |
| 71 | + return FloatingPointNumberToString(val); |
| 72 | +} |
50 | 73 |
|
51 | | - double_conversion::StringBuilder builder(buf, sizeof(buf)); |
52 | | - builder.Reset(); |
53 | | - if (!converter.ToShortestSingle(val, &builder)) |
54 | | - { |
55 | | - itkGenericExceptionMacro(<< "Conversion failed for " << val); |
56 | | - } |
57 | | - return std::string(builder.Finalize()); |
| 74 | +template <> |
| 75 | +std::string |
| 76 | +NumberToString<float>::operator()(float val) const |
| 77 | +{ |
| 78 | + return FloatingPointNumberToString(val); |
58 | 79 | } |
59 | 80 |
|
60 | 81 | } // namespace itk |
0 commit comments