Updated patches

1 files changed, 58 insertions, 0 deletions

diff --git a/exiv2-error.patch b/exiv2-error.patch
new file mode 100644
index 000000000000..665221c58872
--- /dev/null
+++ b/exiv2-error.patch
@@ -0,0 +1,58 @@
+diff --git a/nufraw_exiv2.cc b/nufraw_exiv2.cc
+index 2de4cc3..45aea87 100644
+--- a/nufraw_exiv2.cc
++++ b/nufraw_exiv2.cc
+@@ -54,7 +54,7 @@ extern "C" int nufraw_exif_read_input(nufraw_data *uf)
+         uf->inputExifBuf = NULL;
+         uf->inputExifBufLen = 0;
+ 
+-        Exiv2::Image::AutoPtr image;
++        Exiv2::Image::UniquePtr image;
+         if (uf->unzippedBuf != NULL) {
+             image = Exiv2::ImageFactory::open(
+                         (const Exiv2::byte*)uf->unzippedBuf, uf->unzippedBufLen);
+@@ -135,7 +135,7 @@ extern "C" int nufraw_exif_read_input(nufraw_data *uf)
+         nufraw_message(NUFRAW_SET_LOG, "%s\n", stderror.str().c_str());
+ 
+         return NUFRAW_SUCCESS;
+-    } catch (Exiv2::AnyError& e) {
++    } catch (Exiv2::Error& e) {
+         std::cerr.rdbuf(savecerr);
+         std::string s(e.what());
+         nufraw_message(NUFRAW_SET_WARNING, "%s\n", s.c_str());
+@@ -156,7 +156,7 @@ static Exiv2::ExifData nufraw_prepare_exifdata(nufraw_data *uf)
+         if ((pos = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation")))
+                 != exifData.end()) {
+             nufraw_message(NUFRAW_SET_LOG, "Resetting %s from '%d' to '1'\n",
+-                          pos->key().c_str(), pos->value().toLong());
++                          pos->key().c_str(), pos->value().toInt64());
+             pos->setValue("1"); /* 1 = Normal orientation */
+         }
+     }
+@@ -327,7 +327,7 @@ extern "C" int nufraw_exif_prepare_output(nufraw_data *uf)
+         nufraw_message(NUFRAW_SET_LOG, "%s\n", stderror.str().c_str());
+ 
+         return NUFRAW_SUCCESS;
+-    } catch (Exiv2::AnyError& e) {
++    } catch (Exiv2::Error& e) {
+         std::cerr.rdbuf(savecerr);
+         std::string s(e.what());
+         nufraw_message(NUFRAW_SET_WARNING, "%s\n", s.c_str());
+@@ -347,7 +347,7 @@ extern "C" int nufraw_exif_write(nufraw_data *uf)
+ 
+         char *filename =
+             uf_win32_locale_filename_from_utf8(uf->conf->outputFilename);
+-        Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
++        Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
+         uf_win32_locale_filename_free(filename);
+         assert(image.get() != 0);
+ 
+@@ -367,7 +367,7 @@ extern "C" int nufraw_exif_write(nufraw_data *uf)
+         nufraw_message(NUFRAW_SET_LOG, "%s\n", stderror.str().c_str());
+ 
+         return NUFRAW_SUCCESS;
+-    } catch (Exiv2::AnyError& e) {
++    } catch (Exiv2::Error& e) {
+         std::cerr.rdbuf(savecerr);
+         std::string s(e.what());
+         nufraw_message(NUFRAW_SET_WARNING, "%s\n", s.c_str());