liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to fix clang warnings in rtexif/stdattribs.cc (see #2017)

Browse Source 
https://github.com/Beep6581/RawTherapee/issues/2017#issuecomment-361060194
This commit is contained in:
Hombre
2018-01-28 14:47:56 +01:00
parent 70379f4a19
commit 2f1ab34ef1
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtexif/rtexif.cc
View File

@@ -1928,9 +1928,9 @@ void Tag::initInt (int data, TagType t, int cnt)
setInt (data, 0, t); setInt (data, 0, t);
} }
void Tag::swapByteOrder2(char *buffer, int count) void Tag::swapByteOrder2(unsigned char *buffer, int count)
{ {
char* ptr = buffer; unsigned char* ptr = buffer;
for (int i = 0; i < count; i+=2) { for (int i = 0; i < count; i+=2) {
unsigned char c = ptr[0]; unsigned char c = ptr[0];
ptr[0] = ptr[1]; ptr[0] = ptr[1];
@@ -1966,7 +1966,7 @@ void Tag::initUserComment (const Glib::ustring &text)
// Swapping byte order to match the Exif's byte order // Swapping byte order to match the Exif's byte order
if (getOrder() != HOSTORDER) { if (getOrder() != HOSTORDER) {
swapByteOrder2((char*)commentStr, wcStrSize * 2); swapByteOrder2((unsigned char*)commentStr, wcStrSize * 2);
} }
memcpy(value + 8 + (useBOM ? 2 : 0), (char*)commentStr, wcStrSize * 2); memcpy(value + 8 + (useBOM ? 2 : 0), (char*)commentStr, wcStrSize * 2);

2
rtexif/rtexif.h
View File

@@ -236,7 +236,7 @@ public:
void initLongArray (const char* data, int len); void initLongArray (const char* data, int len);
void initRational (int num, int den); void initRational (int num, int den);
static void swapByteOrder2 (char *buffer, int count); static void swapByteOrder2 (unsigned char *buffer, int count);
// get basic tag properties // get basic tag properties
int getID () const int getID () const

22
rtexif/stdattribs.cc
View File

@@ -452,8 +452,8 @@ public:
} }
count = std::min (count, 65535); // limit to 65535 chars to avoid crashes in case of corrupted metadata count = std::min (count, 65535); // limit to 65535 chars to avoid crashes in case of corrupted metadata
char *buffer = new char[count - 6]; // include 2 ending null chars for UCS-2 string (possibly) unsigned char *buffer = new unsigned char[count - 6]; // include 2 ending null chars for UCS-2 string (possibly)
char *value = (char*)t->getValue(); unsigned char *value = t->getValue();
if (!memcmp(value, "ASCII\0\0\0", 8)) { if (!memcmp(value, "ASCII\0\0\0", 8)) {
memcpy(buffer, value + 8, count - 8); memcpy(buffer, value + 8, count - 8);
@@ -461,14 +461,14 @@ public:
} else if (!memcmp(value, "UNICODE\0", 8)) { } else if (!memcmp(value, "UNICODE\0", 8)) {
memcpy(buffer, value + 8, count - 8); memcpy(buffer, value + 8, count - 8);
buffer[count - 7] = buffer[count - 8] = '\0'; buffer[count - 7] = buffer[count - 8] = '\0';
Glib::ustring tmp1(buffer); Glib::ustring tmp1((char*)buffer);
bool hasBOM = false; bool hasBOM = false;
enum ByteOrder bo = UNKNOWN; enum ByteOrder bo = UNKNOWN;
if (count % 2 || (count >= 11 && (buffer[0] == 0xEF && buffer[1] == 0xBB && buffer[2] == 0xBF))) { if (count % 2 || (count >= 11 && (buffer[0] == 0xEF && buffer[1] == 0xBB && buffer[2] == 0xBF))) {
// odd string length can only be UTF-8, don't change anything // odd string length can only be UTF-8, don't change anything
std::string retVal (buffer + 3); std::string retVal ((char*)buffer + 3);
delete [] buffer; delete [] buffer;
return retVal; return retVal;
} else if (count >= 10) { } else if (count >= 10) {
@@ -484,7 +484,7 @@ public:
// auto-detecting byte order; we still don't know if it's UCS-2 or UTF-8 // auto-detecting byte order; we still don't know if it's UCS-2 or UTF-8
int a = 0, b = 0, c = 0, d = 0; int a = 0, b = 0, c = 0, d = 0;
for (int j = 8; j < count; j++) { for (int j = 8; j < count; j++) {
char cc = value[j]; unsigned char cc = value[j];
if (!(j%2)) { if (!(j%2)) {
// counting zeros for first byte // counting zeros for first byte
if (!cc) { if (!cc) {
@@ -505,7 +505,7 @@ public:
} }
if (c == (count - 8) && d) { if (c == (count - 8) && d) {
// this is an UTF-8 string // this is an UTF-8 string
std::string retVal (buffer); std::string retVal ((char*)buffer);
delete [] buffer; delete [] buffer;
return retVal; return retVal;
} }
@@ -532,7 +532,7 @@ public:
glong written; glong written;
char* utf8Str = g_utf16_to_utf8((unsigned short int*)buffer, -1, nullptr, &written, nullptr); char* utf8Str = g_utf16_to_utf8((unsigned short int*)buffer, -1, nullptr, &written, nullptr);
delete [] buffer; delete [] buffer;
buffer = new char[written + 1]; buffer = new unsigned char[written + 1];
memcpy(buffer, utf8Str, written); memcpy(buffer, utf8Str, written);
buffer[written] = 0; buffer[written] = 0;
} else if (!memcmp(value, "\0\0\0\0\0\0\0\0", 8)) { } else if (!memcmp(value, "\0\0\0\0\0\0\0\0", 8)) {
@@ -541,12 +541,12 @@ public:
buffer[count - 7] = buffer[count - 8] = '\0'; buffer[count - 7] = buffer[count - 8] = '\0';
gsize written = 0; gsize written = 0;
char *utf8Str = g_locale_to_utf8(buffer, count - 8, nullptr, &written, nullptr); char *utf8Str = g_locale_to_utf8((char*)buffer, count - 8, nullptr, &written, nullptr);
if (utf8Str && written) { if (utf8Str && written) {
delete [] buffer; delete [] buffer;
size_t length = strlen(utf8Str); size_t length = strlen(utf8Str);
buffer = new char[length + 1]; buffer = new unsigned char[length + 1];
strcpy(buffer, utf8Str); strcpy((char*)buffer, utf8Str);
} else { } else {
buffer[0] = 0; buffer[0] = 0;
} }
@@ -558,7 +558,7 @@ public:
buffer[0] = 0; buffer[0] = 0;
} }
std::string retVal (buffer); std::string retVal ((char*)buffer);
delete [] buffer; delete [] buffer;
return retVal; return retVal;
} }