third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added static cast to prevent MSVC warning and comment highlighting non-conforming C++.

Browse Source
This commit is contained in:
Andreas Huggel 2010-07-23 15:32:03 +00:00
parent bb51bdad0e
commit 5d24f66ebd
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/types.cpp
View File

@ -237,6 +237,9 @@ namespace Exiv2 {
float getFloat(const byte* buf, ByteOrder byteOrder)
{
// This algorithm assumes that the internal representation of the float
// type is the 4-byte IEEE 754 binary32 format, which is common but not
// required by the C++ standard.
assert(sizeof(float) == 4);
uint32_t ul = getULong(buf, byteOrder);
return *reinterpret_cast<float*>(&ul);
@ -318,6 +321,9 @@ namespace Exiv2 {
long f2Data(byte* buf, float f, ByteOrder byteOrder)
{
// This algorithm assumes that the internal representation of the float
// type is the 4-byte IEEE 754 binary32 format, which is common but not
// required by the C++ standard.
assert(sizeof(float) == 4);
uint32_t ul = *reinterpret_cast<uint32_t*>(&f);
return ul2Data(buf, ul, byteOrder);

2
src/value.hpp
View File

@ -1597,7 +1597,7 @@ namespace Exiv2 {
long ValueType<T>::toLong(long n) const
{
ok_ = true;
return value_[n];
return static_cast<long>(value_[n]);
}
// Specialization for rational
template<>