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

Adding 8-byte swap functions + consts

Browse Source
This commit is contained in:
Michał Walenciak 2017-09-20 21:23:35 +02:00
parent f96d84ba8c
commit b6e79357de
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/exiv2/image.hpp
View File

@ -353,10 +353,12 @@ namespace Exiv2 {
bool isPrintXMP(uint16_t type, Exiv2::PrintStructureOption option);
bool isPrintICC(uint16_t type, Exiv2::PrintStructureOption option);
uint32_t byteSwap(uint32_t value,bool bSwap);
uint16_t byteSwap(uint16_t value,bool bSwap);
uint16_t byteSwap2(DataBuf& buf,size_t offset,bool bSwap);
uint32_t byteSwap4(DataBuf& buf,size_t offset,bool bSwap);
uint64_t byteSwap(uint64_t value,bool bSwap) const;
uint32_t byteSwap(uint32_t value,bool bSwap) const;
uint16_t byteSwap(uint16_t value,bool bSwap) const;
uint16_t byteSwap2(const DataBuf& buf,size_t offset,bool bSwap) const;
uint32_t byteSwap4(const DataBuf& buf,size_t offset,bool bSwap) const;
uint64_t byteSwap8(const DataBuf& buf,size_t offset,bool bSwap) const;
//@}

31
src/image.cpp
View File

@ -244,7 +244,19 @@ namespace Exiv2 {
}
bool Image::isLittleEndianPlatform() { return !isBigEndianPlatform(); }
uint32_t Image::byteSwap(uint32_t value,bool bSwap)
uint64_t Image::byteSwap(uint64_t value,bool bSwap) const
{
uint64_t result = 0;
byte* source_value = reinterpret_cast<byte *>(&value);
byte* destination_value = reinterpret_cast<byte *>(&result);
for (int i = 0; i < 8; i++)
destination_value[i] = source_value[8 - i - 1];
return bSwap ? result : value;
}
uint32_t Image::byteSwap(uint32_t value,bool bSwap) const
{
uint32_t result = 0;
result |= (value & 0x000000FF) << 24;
@ -254,7 +266,7 @@ namespace Exiv2 {
return bSwap ? result : value;
}
uint16_t Image::byteSwap(uint16_t value,bool bSwap)
uint16_t Image::byteSwap(uint16_t value,bool bSwap) const
{
uint16_t result = 0;
result |= (value & 0x00FF) << 8;
@ -262,7 +274,7 @@ namespace Exiv2 {
return bSwap ? result : value;
}
uint16_t Image::byteSwap2(DataBuf& buf,size_t offset,bool bSwap)
uint16_t Image::byteSwap2(const DataBuf& buf,size_t offset,bool bSwap) const
{
uint16_t v;
char* p = (char*) &v;
@ -271,7 +283,7 @@ namespace Exiv2 {
return Image::byteSwap(v,bSwap);
}
uint32_t Image::byteSwap4(DataBuf& buf,size_t offset,bool bSwap)
uint32_t Image::byteSwap4(const DataBuf& buf,size_t offset,bool bSwap) const
{
uint32_t v;
char* p = (char*) &v;
@ -282,6 +294,17 @@ namespace Exiv2 {
return Image::byteSwap(v,bSwap);
}
uint64_t Image::byteSwap8(const DataBuf& buf,size_t offset,bool bSwap) const
{
uint64_t v;
byte* p = reinterpret_cast<byte *>(&v);
for(int i = 0; i < 8; i++)
p[i] = buf.pData_[offset + i];
return Image::byteSwap(v,bSwap);
}
const char* Image::typeName(uint16_t tag) const
{
//! List of TIFF image tags