3238
|
1 |
--- ufraw-0.18/ufraw_exiv2.cc 2011-03-01 22:10:22.587859793 +0100
|
|
2 |
+++ ufraw-0.18-patch/ufraw_exiv2.cc 2011-03-01 22:09:59.365670823 +0100
|
|
3 |
@@ -143,7 +143,7 @@
|
|
4 |
Exiv2::ExifParser::encode(blob, Exiv2::bigEndian, exifData);
|
|
5 |
uf->inputExifBufLen = blob.size();
|
|
6 |
uf->inputExifBuf = g_new(unsigned char, uf->inputExifBufLen);
|
|
7 |
- memcpy(uf->inputExifBuf, &blob[0], blob.size());
|
|
8 |
+ std::memcpy(uf->inputExifBuf, &blob[0], blob.size());
|
|
9 |
ufraw_message(UFRAW_SET_LOG, "EXIF data read using exiv2, buflen %d\n",
|
|
10 |
uf->inputExifBufLen);
|
|
11 |
g_strlcpy(uf->conf->exifSource, EXV_PACKAGE_STRING, max_name);
|
|
12 |
@@ -271,7 +271,7 @@
|
|
13 |
exifData.erase(pos);
|
|
14 |
|
|
15 |
/* Write appropriate color space tag if using sRGB output */
|
|
16 |
- if (!strcmp(uf->developer->profileFile[out_profile], ""))
|
|
17 |
+ if (!std::strcmp(uf->developer->profileFile[out_profile], ""))
|
|
18 |
exifData["Exif.Photo.ColorSpace"] = uint16_t(1); /* sRGB */
|
|
19 |
|
|
20 |
/* Add "UFRaw" and version used to output file as processing software. */
|
|
21 |
@@ -321,8 +321,8 @@
|
|
22 |
}
|
|
23 |
uf->outputExifBufLen = size + sizeof(ExifHeader);
|
|
24 |
uf->outputExifBuf = g_new(unsigned char, uf->outputExifBufLen);
|
|
25 |
- memcpy(uf->outputExifBuf, ExifHeader, sizeof(ExifHeader));
|
|
26 |
- memcpy(uf->outputExifBuf + sizeof(ExifHeader), &blob[0], blob.size());
|
|
27 |
+ std::memcpy(uf->outputExifBuf, ExifHeader, sizeof(ExifHeader));
|
|
28 |
+ std::memcpy(uf->outputExifBuf + sizeof(ExifHeader), &blob[0], blob.size());
|
|
29 |
std::cerr.rdbuf(savecerr);
|
|
30 |
ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str());
|
|
31 |
|