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

#1199 (as was discussed) moved WebPImage::debugPrintHex to Internal::binaryToHex

Browse Source
This commit is contained in:
draekko 2016-08-12 11:46:51 +00:00
parent 85cc2f745d
commit 71fd0ae96e
3 changed files with 59 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/image.cpp
View File

@ -648,6 +648,56 @@ namespace Exiv2 {
return binaryToString(buf.pData_,size,start);
}
std::string binaryToHex(const byte *data, size_t size)
{
std::stringstream hexOutput;
unsigned long tl = (unsigned long)(size / 16) * 16;
unsigned long tl_offset = size - tl;
hexOutput << "Display Hex Dump [size:" << (unsigned long)size << "]" << std::endl;
for (unsigned long loop = 0; loop < (unsigned long)size; loop++) {
if (data[loop] < 16) {
hexOutput << "0";
}
hexOutput << std::hex << (int)data[loop];
if ((loop % 8) == 7) {
hexOutput << " ";
}
if ((loop % 16) == 15 || loop == (tl + tl_offset - 1)) {
int max = 15;
if (loop >= tl) {
max = tl_offset - 1;
hexOutput << " ";
for (long offset = 0; offset < (16 - tl_offset); offset++) {
if ((offset % 8) == 7) {
hexOutput << " ";
}
hexOutput << " ";
}
}
hexOutput << " ";
for (unsigned long offset = max; offset >= 0; offset--) {
if (offset == (max - 8)) {
hexOutput << " ";
}
if ((data[loop - offset]) >= 0x20 &&
(data[loop - offset]) <= 0x7E) {
hexOutput << data[loop - offset];
} else {
hexOutput << ".";
}
}
hexOutput << std::endl;
}
}
hexOutput << std::endl << std::endl << std::endl;
return hexOutput.str();
}
std::string indent(int32_t d)
{
std::string result ;

5
src/image_int.hpp
View File

@ -65,6 +65,11 @@ namespace Exiv2 {
*/
std::string binaryToString(const byte* buff, size_t size, size_t start /*=0*/);
/*!
@brief format binary for display of raw data .
*/
std::string binaryToHex(const byte *data, size_t size);
/*!
@brief indent output for kpsRecursive in \em printStructure() \em .
*/

44
src/webpimage.cpp
View File

@ -43,16 +43,14 @@
#include "tiffimage_int.hpp"
#include "exiv2/convert.hpp"
#include <cmath>
#include <sstream>
#include <iomanip>
#include <string>
#include <cstring>
#include <iostream>
#include <sstream>
#include <cassert>
#include <cstdio>
#include <zlib.h> // To uncompress or compress text chunk
#define CHECK_BIT(var,pos) ((var) & (1<<(pos)))
// *****************************************************************************
@ -60,7 +58,6 @@
namespace Exiv2 {
namespace Internal {
}} // namespace Internal, Exiv2
namespace Exiv2 {
@ -668,8 +665,9 @@ namespace Exiv2 {
memcpy(rawExifData + offset, payload.pData_, (long)payload.size_);
#ifdef DEBUG
debugPrintHex(rawExifData, size);
std::cout << Internal::binaryToHex(rawExifData, size);
#endif
if (pos != -1) {
XmpData xmpData;
ByteOrder bo = ExifParser::decode(exifData_,
@ -696,7 +694,7 @@ namespace Exiv2 {
#endif
} else {
#ifdef DEBUG
debugPrintHex(xmpData_, xmpData_.size());
std::cout << Internal::binaryToHex(xmpData_, xmpData_.size());
#endif
#ifdef __USE_IPTC__
copyXmpToIptc(xmpData_, iptcData_);
@ -831,38 +829,4 @@ namespace Exiv2 {
return pos;
}
void WebPImage::debugPrintHex(byte *data, long size) {
std::cout << "Display Hex Dump [size:" << size << "]" << std::endl;
long tl = (long)(size / 16) * 16;
long tl_offset = size - tl;
for (long loop = 0; loop < size; loop++) {
if (data[loop] < 16) std::cout << "0";
std::cout << std::hex << (int)data[loop] << " ";
if ((loop % 8) == 7) std::cout << " ";
if ((loop % 16) == 15 || loop == (tl + tl_offset - 1)) {
int max = 15;
if (loop >= tl) {
max = tl_offset - 1;
std::cout << " ";
for (long offset = 0; offset < (16 - tl_offset); offset++) {
if ((offset % 8) == 7) std::cout << " ";
std::cout << " ";
}
}
std::cout << " ";
for (long offset = max; offset >= 0; offset--) {
if (offset == (max - 8)) std::cout << " ";
if ((data[loop - offset]) >= 0x20 &&
(data[loop - offset]) <= 0x7E) {
std::cout << data[loop - offset];
} else {
std::cout << ".";
}
}
std::cout << std::endl;
}
}
std::cout << std::dec << std::endl << std::endl;
}
} // namespace Exiv2