patches/ufraw-02-sunstudio.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 3238 3c109bdfc904
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3238
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
     1
--- ufraw-0.18/ufraw_exiv2.cc	2011-03-01 22:10:22.587859793 +0100
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
     2
+++ ufraw-0.18-patch/ufraw_exiv2.cc	2011-03-01 22:09:59.365670823 +0100
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
     3
@@ -143,7 +143,7 @@
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
     4
         Exiv2::ExifParser::encode(blob, Exiv2::bigEndian, exifData);
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
     5
         uf->inputExifBufLen = blob.size();
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
     6
         uf->inputExifBuf = g_new(unsigned char, uf->inputExifBufLen);
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
     7
-        memcpy(uf->inputExifBuf, &blob[0], blob.size());
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
     8
+        std::memcpy(uf->inputExifBuf, &blob[0], blob.size());
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
     9
         ufraw_message(UFRAW_SET_LOG, "EXIF data read using exiv2, buflen %d\n",
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    10
                       uf->inputExifBufLen);
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    11
         g_strlcpy(uf->conf->exifSource, EXV_PACKAGE_STRING, max_name);
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    12
@@ -271,7 +271,7 @@
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    13
         exifData.erase(pos);
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    14
 
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    15
     /* Write appropriate color space tag if using sRGB output */
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    16
-    if (!strcmp(uf->developer->profileFile[out_profile], ""))
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    17
+    if (!std::strcmp(uf->developer->profileFile[out_profile], ""))
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    18
         exifData["Exif.Photo.ColorSpace"] = uint16_t(1); /* sRGB */
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    19
 
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    20
     /* Add "UFRaw" and version used to output file as processing software. */
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    21
@@ -321,8 +321,8 @@
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    22
         }
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    23
         uf->outputExifBufLen = size + sizeof(ExifHeader);
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    24
         uf->outputExifBuf = g_new(unsigned char, uf->outputExifBufLen);
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    25
-        memcpy(uf->outputExifBuf, ExifHeader, sizeof(ExifHeader));
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    26
-        memcpy(uf->outputExifBuf + sizeof(ExifHeader), &blob[0], blob.size());
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    27
+        std::memcpy(uf->outputExifBuf, ExifHeader, sizeof(ExifHeader));
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    28
+        std::memcpy(uf->outputExifBuf + sizeof(ExifHeader), &blob[0], blob.size());
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    29
         std::cerr.rdbuf(savecerr);
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    30
         ufraw_message(UFRAW_SET_LOG, "%s\n", stderror.str().c_str());
3c109bdfc904 SFEufraw.spec: bump to 0.18
jurikm
parents:
diff changeset
    31