[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:42:27 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=155b37d

The following commit has been merged in the master branch:
commit 155b37d45f358e5ffe47e0b02eac1d53f163cf77
Author: vog <vog at notjusthosting.com>
Date:   Fri Jun 24 14:59:37 2011 +0000

    #689: Support XMP previews that use the old xapGImg: namespace prefix
---
 src/preview.cpp                                    |  14 ++-
 ...flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps} |  24 ++---
 ...draw_ai-cs5-lev3_preview-ns-xapGImg.eps.newxmp} |   0
 ...flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.xmp} |  24 ++---
 test/data/eps/eps-test.out                         | 110 +++++++++++++++++++++
 5 files changed, 144 insertions(+), 28 deletions(-)

diff --git a/src/preview.cpp b/src/preview.cpp
index 183b33f..1b3cbf8 100644
--- a/src/preview.cpp
+++ b/src/preview.cpp
@@ -699,13 +699,19 @@ namespace {
         (void)parIdx;
 
         const Exiv2::XmpData &xmpData = image_.xmpData();
-        XmpData::const_iterator imageDatum = xmpData.findKey(XmpKey("Xmp.xmp.Thumbnails[1]/xmpGImg:image"));
+
+        std::string prefix = "xmpGImg";
+        if (xmpData.findKey(XmpKey("Xmp.xmp.Thumbnails[1]/xapGImg:image")) != xmpData.end()) {
+            prefix = "xapGImg";
+        }
+
+        XmpData::const_iterator imageDatum = xmpData.findKey(XmpKey("Xmp.xmp.Thumbnails[1]/" + prefix + ":image"));
         if (imageDatum == xmpData.end()) return;
-        XmpData::const_iterator formatDatum = xmpData.findKey(XmpKey("Xmp.xmp.Thumbnails[1]/xmpGImg:format"));
+        XmpData::const_iterator formatDatum = xmpData.findKey(XmpKey("Xmp.xmp.Thumbnails[1]/" + prefix + ":format"));
         if (formatDatum == xmpData.end()) return;
-        XmpData::const_iterator widthDatum = xmpData.findKey(XmpKey("Xmp.xmp.Thumbnails[1]/xmpGImg:width"));
+        XmpData::const_iterator widthDatum = xmpData.findKey(XmpKey("Xmp.xmp.Thumbnails[1]/" + prefix + ":width"));
         if (widthDatum == xmpData.end()) return;
-        XmpData::const_iterator heightDatum = xmpData.findKey(XmpKey("Xmp.xmp.Thumbnails[1]/xmpGImg:height"));
+        XmpData::const_iterator heightDatum = xmpData.findKey(XmpKey("Xmp.xmp.Thumbnails[1]/" + prefix + ":height"));
         if (heightDatum == xmpData.end()) return;
 
         if (formatDatum->toString() != "JPEG") return;
diff --git a/test/data/eps/eps-flat_oodraw_ai-cs5-lev3.eps b/test/data/eps/eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
similarity index 99%
copy from test/data/eps/eps-flat_oodraw_ai-cs5-lev3.eps
copy to test/data/eps/eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
index 5dcbec8..3af84f5 100644
--- a/test/data/eps/eps-flat_oodraw_ai-cs5-lev3.eps
+++ b/test/data/eps/eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
@@ -4811,22 +4811,22 @@ Adobe_CoolType_Core/ps get exec
Adobe_AGM_Image/ps gx
 <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.0-c060 61.134777, 2010/02/12-17:32:00        ">
    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
       <rdf:Description rdf:about=""
-            xmlns:xmp="http://ns.adobe.com/xap/1.0/"
-            xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/">
-         <xmp:CreatorTool>Adobe Illustrator CS5</xmp:CreatorTool>
-         <xmp:CreateDate>2011-03-25T16:07+01:00</xmp:CreateDate>
-         <xmp:Thumbnails>
+            xmlns:xap="http://ns.adobe.com/xap/1.0/"
+            xmlns:xapGImg="http://ns.adobe.com/xap/1.0/g/img/">
+         <xap:CreatorTool>Adobe Illustrator CS5</xap:CreatorTool>
+         <xap:CreateDate>2011-03-25T16:07+01:00</xap:CreateDate>
+         <xap:Thumbnails>
             <rdf:Alt>
                <rdf:li rdf:parseType="Resource">
-                  <xmpGImg:width>256</xmpGImg:width>
-                  <xmpGImg:height>208</xmpGImg:height>
-                  <xmpGImg:format>JPEG</xmpGImg:format>
-                  <xmpGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgA0AEAAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8APbW1tvq0X7pPsL+yPDFV&#xA;X6rbf75T/gRgV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9Vtv98p/w&#xA;IxV31W2/3yn/AAIxV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9Vtv9&#xA;8p/wIxV31W2/3yn/AAIxV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9&#xA;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</xmpGImg:image>
+                  <xapGImg:width>256</xapGImg:width>
+                  <xapGImg:height>208</xapGImg:height>
+                  <xapGImg:format>JPEG</xapGImg:format>
+                  <xapGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgA0AEAAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8APbW1tvq0X7pPsL+yPDFV&#xA;X6rbf75T/gRgV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9Vtv98p/w&#xA;IxV31W2/3yn/AAIxV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9Vtv9&#xA;8p/wIxV31W2/3yn/AAIxV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9&#xA;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</xapGImg:image>
                </rdf:li>
             </rdf:Alt>
-         </xmp:Thumbnails>
-         <xmp:MetadataDate>2011-03-25T16:07+01:00</xmp:MetadataDate>
-         <xmp:ModifyDate>2011-03-25T16:07+01:00</xmp:ModifyDate>
+         </xap:Thumbnails>
+         <xap:MetadataDate>2011-03-25T16:07+01:00</xap:MetadataDate>
+         <xap:ModifyDate>2011-03-25T16:07+01:00</xap:ModifyDate>
       </rdf:Description>
       <rdf:Description rdf:about=""
             xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"
diff --git a/test/data/eps/eps-flat_oodraw_ai-cs5-lev3.eps.newxmp b/test/data/eps/eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps.newxmp
similarity index 100%
copy from test/data/eps/eps-flat_oodraw_ai-cs5-lev3.eps.newxmp
copy to test/data/eps/eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps.newxmp
diff --git a/test/data/eps/eps-flat_oodraw_ai-cs5-lev3.xmp b/test/data/eps/eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.xmp
similarity index 93%
copy from test/data/eps/eps-flat_oodraw_ai-cs5-lev3.xmp
copy to test/data/eps/eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.xmp
index c9fc978..5c81cd4 100644
--- a/test/data/eps/eps-flat_oodraw_ai-cs5-lev3.xmp
+++ b/test/data/eps/eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.xmp
@@ -2,18 +2,18 @@
 <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
   <rdf:Description rdf:about=""
-    xmlns:xmp="http://ns.adobe.com/xap/1.0/"
-    xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/"
+    xmlns:xap="http://ns.adobe.com/xap/1.0/"
+    xmlns:xapGImg="http://ns.adobe.com/xap/1.0/g/img/"
     xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"
     xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
     xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/"
     xmlns:dc="http://purl.org/dc/elements/1.1/"
     xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
     xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#"
-   xmp:CreatorTool="Adobe Illustrator CS5"
-   xmp:CreateDate="2011-03-25T16:07+01:00"
-   xmp:MetadataDate="2011-03-25T16:07+01:00"
-   xmp:ModifyDate="2011-03-25T16:07+01:00"
+   xap:CreatorTool="Adobe Illustrator CS5"
+   xap:CreateDate="2011-03-25T16:07+01:00"
+   xap:MetadataDate="2011-03-25T16:07+01:00"
+   xap:ModifyDate="2011-03-25T16:07+01:00"
    xmpTPg:NPages="1"
    xmpTPg:HasVisibleTransparency="False"
    xmpTPg:HasVisibleOverprint="False"
@@ -21,15 +21,15 @@
    xmpMM:DocumentID="xmp.did:01801174072068118C14A928EC4F6B4E"
    xmpMM:InstanceID="xmp.iid:01801174072068118C14A928EC4F6B4E"
    xmpMM:OriginalDocumentID="xmp.did:01801174072068118C14A928EC4F6B4E">
-   <xmp:Thumbnails>
+   <xap:Thumbnails>
     <rdf:Alt>
      <rdf:li
-      xmpGImg:width="256"
-      xmpGImg:height="208"
-      xmpGImg:format="JPEG"
-      xmpGImg:image="/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgA0AEAAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8APbW1tvq0X7pPsL+yPDFV&#xA;X6rbf75T/gRgV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9Vtv98p/w&#xA;IxV31W2/3yn/AAIxV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9Vtv9&#xA;8p/wIxV31W2/3yn/AAIxV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9&#xA;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"/>
+      xapGImg:width="256"
+      xapGImg:height="208"
+      xapGImg:format="JPEG"
+      xapGImg:image="/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgA0AEAAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8APbW1tvq0X7pPsL+yPDFV&#xA;X6rbf75T/gRgV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9Vtv98p/w&#xA;IxV31W2/3yn/AAIxV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9Vtv9&#xA;8p/wIxV31W2/3yn/AAIxV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9&#xA;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"/>
     </rdf:Alt>
-   </xmp:Thumbnails>
+   </xap:Thumbnails>
    <xmpTPg:MaxPageSize
     stDim:w="612.000000"
     stDim:h="792.000000"
diff --git a/test/data/eps/eps-test.out b/test/data/eps/eps-test.out
index 3b393a6..9131385 100644
--- a/test/data/eps/eps-test.out
+++ b/test/data/eps/eps-test.out
@@ -1825,6 +1825,116 @@ Exit code: 0
 Command: exiv2 -f -ex eps-flat_oodraw_ai-cs5-lev3.eps
 Exit code: 0
 
+-----> eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps <-----
+
+Command: exiv2 -u -pa eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
+Xmp.xmp.CreatorTool                          XmpText    21  Adobe Illustrator CS5
+Xmp.xmp.CreateDate                           XmpText    22  2011-03-25T16:07+01:00
+Xmp.xmp.Thumbnails                           XmpText     0  type="Alt"
+Xmp.xmp.Thumbnails[1]                        XmpText     0  type="Struct"
+Xmp.xmp.Thumbnails[1]/xapGImg:width          XmpText     3  256
+Xmp.xmp.Thumbnails[1]/xapGImg:height         XmpText     3  208
+Xmp.xmp.Thumbnails[1]/xapGImg:format         XmpText     4  JPEG
+Xmp.xmp.Thumbnails[1]/xapGImg:image          XmpText   4279  /9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA
+AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK
+DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f
+Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgA0AEAAwER
+AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA
+AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB
+UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE
+1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ
+qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy
+obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp
+0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo
++DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8APbW1tvq0X7pPsL+yPDFV
+X6rbf75T/gRgV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9Vtv98p/w
+IxV31W2/3yn/AAIxV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9Vtv9
+8p/wIxV31W2/3yn/AAIxV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wACMVd9
+Vtv98p/wIxV31W2/3yn/AAIxV31W2/3yn/AjFXfVbb/fKf8AAjFXfVbb/fKf8CMVd9Vtv98p/wAC
+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
+Xmp.xmp.MetadataDate                         XmpText    22  2011-03-25T16:07+01:00
+Xmp.xmp.ModifyDate                           XmpText    22  2011-03-25T16:07+01:00
+Xmp.xmpTPg.MaxPageSize                       XmpText     0  type="Struct"
+Xmp.xmpTPg.MaxPageSize/stDim:w               XmpText    10  612.000000
+Xmp.xmpTPg.MaxPageSize/stDim:h               XmpText    10  792.000000
+Xmp.xmpTPg.MaxPageSize/stDim:unit            XmpText     6  Points
+Xmp.xmpTPg.NPages                            XmpText     1  1
+Xmp.xmpTPg.HasVisibleTransparency            XmpText     5  False
+Xmp.xmpTPg.HasVisibleOverprint               XmpText     5  False
+Xmp.xmpTPg.PlateNames                        XmpSeq      1  Black
+Xmp.xmpTPg.SwatchGroups                      XmpText     0  type="Seq"
+Xmp.xmpTPg.SwatchGroups[1]                   XmpText     0  type="Struct"
+Xmp.xmpTPg.SwatchGroups[1]/xmpG:groupName    XmpText    20  Default Swatch Group
+Xmp.xmpTPg.SwatchGroups[1]/xmpG:groupType    XmpText     1  0
+Xmp.dc.format                                XmpText    22  application/postscript
+Xmp.xmpMM.DerivedFrom                        XmpText     0  type="Struct"
+Xmp.xmpMM.DocumentID                         XmpText    40  xmp.did:01801174072068118C14A928EC4F6B4E
+Xmp.xmpMM.InstanceID                         XmpText    40  xmp.iid:01801174072068118C14A928EC4F6B4E
+Xmp.xmpMM.OriginalDocumentID                 XmpText    40  xmp.did:01801174072068118C14A928EC4F6B4E
+Xmp.xmpMM.History                            XmpText     0  type="Seq"
+Xmp.xmpMM.History[1]                         XmpText     0  type="Struct"
+Xmp.xmpMM.History[1]/stEvt:action            XmpText     5  saved
+Xmp.xmpMM.History[1]/stEvt:instanceID        XmpText    40  xmp.iid:01801174072068118C14A928EC4F6B4E
+Xmp.xmpMM.History[1]/stEvt:when              XmpText    22  2011-03-25T16:07+01:00
+Xmp.xmpMM.History[1]/stEvt:softwareAgent     XmpText    21  Adobe Illustrator CS5
+Xmp.xmpMM.History[1]/stEvt:changed           XmpText     1  /
+Exit code: 253
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -eX eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
+Exit code: 0
+
+Command: exiv2 -ix eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
+Exit code: 0
+
+Command: (2) exiv2 -ix eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
+Exit code: 0
+
+Command: exiv2 -f -ex eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
+Exit code: 0
+
 -----> eps-flat_photoshop-cs5-ascii-colorprofile.eps <-----
 
 Command: exiv2 -u -pa eps-flat_photoshop-cs5-ascii-colorprofile.eps

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list