Merge all well-tested changes into the stable branchv2.22

1 files changed, 49 insertions, 0 deletions

diff --git a/src/exiv2-r2619.patch b/src/exiv2-r2619.patch
new file mode 100644
index 0000000..569e79c
--- /dev/null
+++ b/src/exiv2-r2619.patch
@@ -0,0 +1,49 @@
+This file is part of MXE.
+See index.html for further information.
+
+This patch has been taken from:
+http://dev.exiv2.org/projects/exiv2/repository/revisions/2619
+
+Index: trunk/src/epsimage.cpp
+===================================================================
+--- trunk/src/epsimage.cpp	(revision 2618)
++++ trunk/src/epsimage.cpp	(revision 2619)
+@@ -393,6 +393,7 @@
+         unsigned int depth = 0;
+         const unsigned int maxDepth = UINT_MAX;
+         bool illustrator8 = false;
++        bool corelDraw = false;
+         bool implicitPage = false;
+         bool implicitPageTrailer = false;
+         bool inDefaultsPreviewPrologSetup = false;
+@@ -547,6 +548,8 @@
+                 posAi7ThumbnailEndData = startPos;
+             } else if (posEndComments == posEndEps && line == "%%EndComments") {
+                 posEndComments = startPos;
++            } else if (inDefaultsPreviewPrologSetup && startsWith(line, "%%BeginResource: procset wCorel")) {
++                corelDraw = true;
+             } else if (line == "%%EndPreview") {
+                 inDefaultsPreviewPrologSetup = false;
+             } else if (line == "%%EndDefaults") {
+@@ -922,6 +925,10 @@
+                             writeTemp(*tempIo, "%%BeginPageSetup" + lineEnding);
+                         }
+                         writeTemp(*tempIo, "%Exiv2BeginXMP: Before %%EndPageSetup" + lineEnding);
++                        if (corelDraw) {
++                            writeTemp(*tempIo, "%Exiv2Notice: The following line is needed by CorelDRAW." + lineEnding);
++                            writeTemp(*tempIo, "@rs" + lineEnding);
++                        }
+                         if (posBeginPhotoshop != posEndEps) {
+                             writeTemp(*tempIo, "%Exiv2Notice: The following line is needed by Photoshop." + lineEnding);
+                             writeTemp(*tempIo, "%begin_xml_code" + lineEnding);
+@@ -953,6 +960,10 @@
+                             writeTemp(*tempIo, "%Exiv2Notice: The following line is needed by Photoshop." + lineEnding);
+                             writeTemp(*tempIo, "%end_xml_code" + lineEnding);
+                         }
++                        if (corelDraw) {
++                            writeTemp(*tempIo, "%Exiv2Notice: The following line is needed by CorelDRAW." + lineEnding);
++                            writeTemp(*tempIo, "@sv" + lineEnding);
++                        }
+                         writeTemp(*tempIo, "%Exiv2EndXMP" + lineEnding);
+                         if (line != "%%EndPageSetup") {
+                             writeTemp(*tempIo, "%%EndPageSetup" + lineEnding);