From 7094254bd31a947939fae53dd36e7ebceed96502 Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Sat, 29 Aug 2015 16:43:11 +0000
Subject: [PATCH] #640 #751  Fix to test suit to prevent crash in exiv2json -x
 test/data/BlueSquare.xmp (see #751 for discussion)

---
 test/bugfixes-test.sh       |   4 +--
 test/data/BlueSquare.xmp    |  60 ++++++++++++++++++------------------
 test/data/bugfixes-test.out | Bin 1835223 -> 1840788 bytes
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index 89bcf8dc..4dd42fba 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -371,8 +371,8 @@ source ./functions.source
 	echo '------>' Bug $num '<-------' >&2
 	copyTestFile BlueSquare.xmp   $filename1
 	copyTestFile exiv2-bug784.jpg $filename2
-	# runTest exiv2json        $filename1   TODO: This is Throwing
-	# runTest exiv2json x      $filename1   Caught Exiv2 exception 'XMP Toolkit error 9: Fatal namespace map problem'
+	runTest exiv2json        $filename1
+	runTest exiv2json x      $filename1
     runTest exiv2json        $filename2
 
 	num=1058
diff --git a/test/data/BlueSquare.xmp b/test/data/BlueSquare.xmp
index 65337cd5..0dad52ec 100644
--- a/test/data/BlueSquare.xmp
+++ b/test/data/BlueSquare.xmp
@@ -3,19 +3,19 @@
  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <rdf:Description rdf:about=""
     xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:xap="http://ns.adobe.com/xap/1.0/"
-    xmlns:xapMM="http://ns.adobe.com/xap/1.0/mm/"
+    xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+    xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
     xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
     xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/"
     xmlns:tiff="http://ns.adobe.com/tiff/1.0/"
     xmlns:exif="http://ns.adobe.com/exif/1.0/"
    dc:format="image/jpeg"
-   xap:CreatorTool="Adobe Photoshop CS2 Macintosh"
-   xap:CreateDate="2005-09-07T15:07:40-07:00"
-   xap:ModifyDate="2005-09-07T15:09:51-07:00"
-   xap:MetadataDate="2006-04-10T13:37:10-07:00"
-   xapMM:DocumentID="uuid:9A3B7F52214211DAB6308A7391270C13"
-   xapMM:InstanceID="uuid:B59AC1B3214311DAB6308A7391270C13"
+   xmp:CreatorTool="Adobe Photoshop CS2 Macintosh"
+   xmp:CreateDate="2005-09-07T15:07:40-07:00"
+   xmp:ModifyDate="2005-09-07T15:09:51-07:00"
+   xmp:MetadataDate="2006-04-10T13:37:10-07:00"
+   xmpMM:DocumentID="uuid:9A3B7F52214211DAB6308A7391270C13"
+   xmpMM:InstanceID="uuid:B59AC1B3214311DAB6308A7391270C13"
    photoshop:ColorMode="3"
    photoshop:ICCProfile="sRGB IEC61966-2.1"
    tiff:Orientation="1"
@@ -51,7 +51,7 @@
      <rdf:li>.jpg</rdf:li>
     </rdf:Bag>
    </dc:subject>
-   <xapMM:DerivedFrom
+   <xmpMM:DerivedFrom
     stRef:instanceID="uuid:9A3B7F4F214211DAB6308A7391270C13"
     stRef:documentID="uuid:9A3B7F4E214211DAB6308A7391270C13"/>
    <tiff:BitsPerSample>
@@ -64,25 +64,25 @@
   </rdf:Description>
  </rdf:RDF>
 </x:xmpmeta>
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                                                                                                    
-                           
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 <?xpacket end="w"?>
\ No newline at end of file
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 7d2e4370d20d9e80ddf539e9b2860d3c7e3607b9..5592290a3d70d4bdadcd02bd795d57220536dda3 100644
GIT binary patch
delta 3659
zcmeHIL66%+6xKppnq5jMbi2?Ik})dfkc6?F*l`Ys#7;_p&8C~Jx|NWS8_#B^P3&Mh
zkW#Huq`7fL@`(e79=RZ-{uHkKjO><DX2y2nG-*{NBrb_^7|*=-=DqKI@0&k<82t3>
z-~m}9uaH;CDRP>eA+M3MBtzE826>&FBX5xN<V|vcyhYw77s)2MM7GE~<Xv+4cVJ9D
zYV@rxx{2-JP%I0I3bX5(Oh)9pUm~Z=w`EDqhM!CTJP+xQTVy1*42Ki&{=(+Z6Y#;<
zv;wq;`-nyrWeAI9sF$H8$O>B&B{6l6iTsX-2LW~+X1%}Ns^cE=g=%kz+TRQ<4+#PC
z1L1(~W`&N2XlPr&j?g-E1J^%v2ZGU-vx0AZOZP2b$PfIhc2>yW8FaIP<=8?#zz6yG
z%5Cc|PpXOU()+^vG1wX#ZqN1F1FOSMq$sr(9--d8NlS42D6=U#{ODHth#|y*OUgEJ
z7YF!zWG|^-D;J<ht&i3-N7PGfguP?15k5Qyo8z6^cTgv2S`lyz0U?H9k3qnI5puk;
zxSTK0z3*Jl_G9Fh?52V&Ih`WQ&&C-s9dHWp5=Vw^yd4*7u?{i-lA3c+&p|CVGOU;A
zu<<Wiyrjbn)NJS<gIxH_3D8dmIOw79&lB+BIE8|+97;-i<m7I&S@thwZKIs=S!8Vu
zDPOM-E!(q#C_KXfC#_n~T&7b+`_1y>Jh5k-=lR|IPguVQNvJ;t@8xLlEFY(sOxg56
zO`9A|j2M3Xgc8wUW9E8$uG?cJR&4h+njbh}+v;G44Peq?KADRI*puk=GtyHslp&0*
zw_O__+<T6-zCkr2F%R7*VCxc8bFh$;;GU$E6|F2q(ZbPVaCJN!V!NzYl&V%Q%Cc0D
zCCRK*RRxwRnxadx1`SDx?`=4KU^yMsFj-yPvs%<EhE!Fkr}6?%6M2{_Ox<())b&2=
zV@C9YU3BJve}@nL0vFS{6zVU|g}U2rXGj$$NM#e%QK&uFmtP!_i7q*z#6cp3<0Lha
ziyB3lkK?p@!)SRfQ&LvFzk97JG-`$_>8hHO^AeXO#!!(eW>gg`a>v6oM?T-oEm80N
zUF5sHVItfb)p<CEUwzEqh8XT!OKhGonOWR$aKJ8*lU}7CCz0xJdVl&niBx^#gQj&Z
zpgp33MAec;3V&>Z?%0HdQc;&na#5`tB~#K&sHldl>XKfQplZg>^Djd*r&S#IE#$SW
z{vd*^loi;21{50M8BmLl2F?2OB<;m_BbEBx8#INuNkLE5^XO;?jMuJds#!JlI;<3H
zTForgRk>O)YNcAeq87ALwJ^(W)bBa$ZQyJb=NT-9_-{}?#R>?oKLr4=742T0_9up9
zN~_3V`Z;gKxWWxK*=qi5)E}^;D`D*^_;l@l`0xZ2SGt^E>GDdKnbNIvd8Nyl|6P|K
KU73L2&i(`FSnccp

delta 68
zcmV~$NezH76hOhSf3~*ls~Zee0whmDZEz#Cf)$R;xZA#$JqZYjh)GDv5ONAiDryuO
VLqkhP&%nsU%)<I?$LH1V<Od#_7DoU8