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

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:36:39 UTC 2017


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

The following commit has been merged in the master branch:
commit 61171b585777698d5a5a4edc10f8b0277b038c2e
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Oct 3 16:34:41 2004 +0000

    Minor change
---
 src/Todo      |   1 +
 src/exiv2.cpp |   8 +-
 src/iptc.awk  |  47 ----
 src/iptc.pl   |  57 -----
 src/iptc.xml  | 790 ----------------------------------------------------------
 src/iptc.xsd  |  48 ----
 src/tags.awk  |  43 ----
 7 files changed, 5 insertions(+), 989 deletions(-)

diff --git a/src/Todo b/src/Todo
index 76d3803..5183d80 100644
--- a/src/Todo
+++ b/src/Todo
@@ -43,3 +43,4 @@ Bugs:
 + Review: Exception safety
 + Review: Ifd1 only at Thumbnail, do we really need Thumbnail::update() ?
 + Is the hexdump output of exiv2 byte-swapped??
++ Should JpegImage differ between NO Jpeg comment and an empty Jpeg comment??
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index 68865f7..502f8f9 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -22,13 +22,13 @@
   Abstract:  Command line program to display and manipulate image %Exif data
 
   File:      exiv2.cpp
-  Version:   $Name:  $ $Revision: 1.15 $
+  Version:   $Name:  $ $Revision: 1.16 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   10-Dec-03, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.15 $ $RCSfile: exiv2.cpp,v $");
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.16 $ $RCSfile: exiv2.cpp,v $");
 
 // *****************************************************************************
 // included header files
@@ -165,12 +165,12 @@ void Params::help(std::ostream& os) const
        << "   -d tgt  Delete target for the `delete' action. Possible targets are
"
        << "           `e' to delete the whole Exif section (the default) and `t'
"
        << "           to delete only the Exif thumbnail from the files.
"
-       << "   -i tgt  Insert target for the `insert' action. Possible targets are:
"
+       << "   -i tgt  Insert target(s) for the `insert' action. Possible targets are:
"
        << "             a : all supported metadata (default)
"
        << "             e : Exif data
"
        << "             i : Iptc data
"
        << "             c : Jpeg comment
"
-       << "   -e tgt  Extract target for the `extract' action. Possible targets
"
+       << "   -e tgt  Extract target(s) for the `extract' action. Possible targets
"
        << "           are the same as those for the -i option plus:
"
        << "             t : extract the Exif thumbnail to an image file
"
        << "   -r fmt  Filename format for the `rename' action. The format string
"
diff --git a/src/iptc.awk b/src/iptc.awk
deleted file mode 100644
index feb6b43..0000000
--- a/src/iptc.awk
+++ /dev/null
@@ -1,47 +0,0 @@
-################################################################################
-# File     : iptc.awk
-# Version  : $Name:  $ $Revision: 1.2 $
-# Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
-# History  : 07-Feb-04, ahu: created
-#
-# Description:
-#  Awk script to convert a taglist to XML format used in the documentation.
-#  $ taglist [SectionName] | awk -f iptc.awk > iptc.xml
-################################################################################
-
-BEGIN {
-   FS = ", "
-   print "<?xml version = '1.0'?>";   
-   print "<?xml-stylesheet type=\"text/xsl\" href=\"iptc.xsl\"?>";
-
-   print "<TAGLIST>"
-   print "<HEADER>"
-   print "<title>Iptc datasets defined in Exiv2</title>"
-   print "<text>"
-   print "<p>Datasets are defined according to the specification of the Iptc "
-   print "<a href=\"http://www.iptc.org/IIM/\">Information Interchange Model (IIM)</a>.</p>"
-   print "<p>Click on a column header to sort the table.</p>"
-   print "</text>"
-   print "</HEADER>"
-   print "<ROWSET>"
-}
-
-{
-   print "   <ROW num=\"" ++row "\">";
-   print "      <tagname>" $1 "</tagname>"
-   print "      <tagdec>" $2 "</tagdec>"
-   print "      <taghex>" $3 "</taghex>"
-   print "      <recname>" $4 "</recname>"
-   print "      <mandatory>" $5 "</mandatory>"
-   print "      <repeatable>" $6 "</repeatable>"
-   print "      <minbytes>" $7 "</minbytes>"
-   print "      <maxbytes>" $8 "</maxbytes>"
-   print "      <key>" $9 "</key>"
-   print "      <tagdesc>" $10 "</tagdesc>"
-   print "   </ROW>";
-}
-
-END {
-   print "</ROWSET>"   
-   print "</TAGLIST>"
-}
diff --git a/src/iptc.pl b/src/iptc.pl
deleted file mode 100644
index 2fe845b..0000000
--- a/src/iptc.pl
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/perl -s -w
-
-use XML::Simple qw(:strict);
-#use Data::Dumper;
-
-my $data = XMLin(undef, 'KeyAttr' => {'record' => 'number'}, 'ForceArray' => ['record'], 'SuppressEmpty' => '');
-#print Dumper($data);
-#exit 0;
-
-#print dataset ids
-foreach $key (sort keys %{$data->{record}}) {
-    PrintIds( $data->{record}->{$key} );
-}
-
-print "
";
-
-#print dataset arrays
-foreach $key (sort keys %{$data->{record}}) {
-    PrintRecord( $data->{record}->{$key} );
-}
-
-sub PrintIds
-{
-    my $record = $_[0];
-
-    foreach $dataset (@{$record->{dataset}}) {
-        print '        static const uint16 ' . 
-             $dataset->{name} . ' ' x (22-length($dataset->{name})) 
-             . ' = ' . $dataset->{number} . ";
";
-    }
-}
-
-sub PrintRecord
-{
-    my $record = $_[0];
-    print '    static const DataSet ' . $record->{type}. "Record[] = {
";
-
-    foreach $dataset (@{$record->{dataset}}) {
-        print '        DataSet(' . 
-             'IptcDataSets::' . $dataset->{name} . ', "' . 
-             $dataset->{name} . '", "' . 
-             $dataset->{description} . '", ' . 
-             $dataset->{mandatory} . ', ' . 
-             $dataset->{repeatable} . ', ' . 
-             $dataset->{minbytes} . ', ' . 
-             $dataset->{maxbytes} . ', Exiv2::' . 
-             $dataset->{type} . ', ' . 
-             'IptcDataSets::' . $record->{type} . ', "' . 
-             $dataset->{photoshop} . "\"),
";
-    }
-
-    #end of record marker
-    print "        DataSet(0xffff, \"(Invalid)\", \"(Invalid)\", false, false, 0, 0, Exiv2::unsignedShort, IptcDataSets::$record->{type}, \"\")
";
-    print "    };

";
-}
-
-
diff --git a/src/iptc.xml b/src/iptc.xml
deleted file mode 100644
index a99542c..0000000
--- a/src/iptc.xml
+++ /dev/null
@@ -1,790 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<IPTC-IIM4 xmlns="x-schema:iptc.xsd">
-    <record number="1">
-        <type>envelope</type>
-        <dataset>
-            <number>0</number>
-            <name>ModelVersion</name>
-            <description>Version of IIM part 1</description>
-            <mandatory>true</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>2</minbytes>
-            <maxbytes>2</maxbytes>
-            <type>unsignedShort</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>5</number>
-            <name>Destination</name>
-            <description>Routing information</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>1024</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>20</number>
-            <name>FileFormat</name>
-            <description>IIM appendix A file format</description>
-            <mandatory>true</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>2</minbytes>
-            <maxbytes>2</maxbytes>
-            <type>unsignedShort</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>22</number>
-            <name>FileVersion</name>
-            <description>File format version</description>
-            <mandatory>true</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>2</minbytes>
-            <maxbytes>2</maxbytes>
-            <type>unsignedShort</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>30</number>
-            <name>ServiceId</name>
-            <description>Identifies the provider and product</description>
-            <mandatory>true</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>10</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>40</number>
-            <name>EnvelopeNumber</name>
-            <description>Combined unique identification</description>
-            <mandatory>true</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>8</minbytes>
-            <maxbytes>8</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>50</number>
-            <name>ProductId</name>
-            <description>Identifies service subset</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>32</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>60</number>
-            <name>EnvelopePriority</name>
-            <description>Envelope handling priority</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>1</minbytes>
-            <maxbytes>1</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>70</number>
-            <name>DateSent</name>
-            <description>Date material was sent</description>
-            <mandatory>true</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>8</minbytes>
-            <maxbytes>8</maxbytes>
-            <type>date</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>80</number>
-            <name>TimeSent</name>
-            <description>Time material was sent</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>11</minbytes>
-            <maxbytes>11</maxbytes>
-            <type>time</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>90</number>
-            <name>CharacterSet</name>
-            <description>Specifies character sets</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>32</maxbytes>
-            <type>undefined</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>100</number>
-            <name>UNO</name>
-            <description>Unique Name of Object</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>14</minbytes>
-            <maxbytes>80</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>120</number>
-            <name>ARMId</name>
-            <description>Abstract Relationship Method identifier</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>2</minbytes>
-            <maxbytes>2</maxbytes>
-            <type>unsignedShort</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>122</number>
-            <name>ARMVersion</name>
-            <description>Abstract Relationship Method version</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>2</minbytes>
-            <maxbytes>2</maxbytes>
-            <type>unsignedShort</type>
-            <photoshop/>
-        </dataset>
-    </record>
-    <record number="2">
-        <type>application2</type>
-        <dataset>
-            <number>0</number>
-            <name>RecordVersion</name>
-            <description>Version of IIM part 2</description>
-            <mandatory>true</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>2</minbytes>
-            <maxbytes>2</maxbytes>
-            <type>unsignedShort</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>3</number>
-            <name>ObjectType</name>
-            <description>IIM appendix G object type</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>3</minbytes>
-            <maxbytes>67</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>4</number>
-            <name>ObjectAttribute</name>
-            <description>IIM appendix G object attribute</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>4</minbytes>
-            <maxbytes>68</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>5</number>
-            <name>ObjectName</name>
-            <description>Shorthand reference of content</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>64</maxbytes>
-            <type>string</type>
-            <photoshop>Document title</photoshop>
-        </dataset>
-        <dataset>
-            <number>7</number>
-            <name>EditStatus</name>
-            <description>Content status</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>64</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>8</number>
-            <name>EditorialUpdate</name>
-            <description>Indicates the type of update</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>2</minbytes>
-            <maxbytes>2</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>10</number>
-            <name>Urgency</name>
-            <description>Editorial urgency of content</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>1</minbytes>
-            <maxbytes>1</maxbytes>
-            <type>string</type>
-            <photoshop>Urgency</photoshop>
-        </dataset>
-        <dataset>
-            <number>12</number>
-            <name>Subject</name>
-            <description>Structured definition of the subject</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>13</minbytes>
-            <maxbytes>236</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>15</number>
-            <name>Category</name>
-            <description>Identifies the subject</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>3</maxbytes>
-            <type>string</type>
-            <photoshop>Category</photoshop>
-        </dataset>
-        <dataset>
-            <number>20</number>
-            <name>SuppCategory</name>
-            <description>Refines the subject</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>32</maxbytes>
-            <type>string</type>
-            <photoshop>Supplemental Categories</photoshop>
-        </dataset>
-        <dataset>
-            <number>22</number>
-            <name>FixtureId</name>
-            <description>Identifies content that recurs</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>32</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>25</number>
-            <name>Keywords</name>
-            <description>Information retrieval words</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>64</maxbytes>
-            <type>string</type>
-            <photoshop>Keywords</photoshop>
-        </dataset>
-        <dataset>
-            <number>26</number>
-            <name>LocationCode</name>
-            <description>ISO country code for content</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>3</minbytes>
-            <maxbytes>3</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>27</number>
-            <name>LocationName</name>
-            <description>Full country name for content</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>64</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>30</number>
-            <name>ReleaseDate</name>
-            <description>Earliest intended usable date</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>8</minbytes>
-            <maxbytes>8</maxbytes>
-            <type>date</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>35</number>
-            <name>ReleaseTime</name>
-            <description>Earliest intended usable time</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>11</minbytes>
-            <maxbytes>11</maxbytes>
-            <type>time</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>37</number>
-            <name>ExpirationDate</name>
-            <description>Latest intended usable date</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>8</minbytes>
-            <maxbytes>8</maxbytes>
-            <type>date</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>38</number>
-            <name>ExpirationTime</name>
-            <description>Latest intended usable time</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>11</minbytes>
-            <maxbytes>11</maxbytes>
-            <type>time</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>40</number>
-            <name>SpecialInstructions</name>
-            <description>Editorial usage instructions</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>256</maxbytes>
-            <type>string</type>
-            <photoshop>Instructions</photoshop>
-        </dataset>
-        <dataset>
-            <number>42</number>
-            <name>ActionAdvised</name>
-            <description>Action provided to previous data</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>2</minbytes>
-            <maxbytes>2</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>45</number>
-            <name>ReferenceService</name>
-            <description>Service Identifier of a prior envelope</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>10</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>47</number>
-            <name>ReferenceDate</name>
-            <description>Date of a prior envelope</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>8</minbytes>
-            <maxbytes>8</maxbytes>
-            <type>date</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>50</number>
-            <name>ReferenceNumber</name>
-            <description>Envelope Number of a prior envelope</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>8</minbytes>
-            <maxbytes>8</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>55</number>
-            <name>DateCreated</name>
-            <description>Creation date of intellectual content</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>8</minbytes>
-            <maxbytes>8</maxbytes>
-            <type>date</type>
-            <photoshop>Date created</photoshop>
-        </dataset>
-        <dataset>
-            <number>60</number>
-            <name>TimeCreated</name>
-            <description>Creation time of intellectual content</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>11</minbytes>
-            <maxbytes>11</maxbytes>
-            <type>time</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>62</number>
-            <name>DigitizationDate</name>
-            <description>Creation date of digital representation</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>8</minbytes>
-            <maxbytes>8</maxbytes>
-            <type>date</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>63</number>
-            <name>DigitizationTime</name>
-            <description>Creation time of digital representation</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>11</minbytes>
-            <maxbytes>11</maxbytes>
-            <type>time</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>65</number>
-            <name>Program</name>
-            <description>Content creation program</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>32</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>70</number>
-            <name>ProgramVersion</name>
-            <description>Content creation program version</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>10</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>75</number>
-            <name>ObjectCycle</name>
-            <description>Morning, evening, or both</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>1</minbytes>
-            <maxbytes>1</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>80</number>
-            <name>Byline</name>
-            <description>Name of content creator</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>32</maxbytes>
-            <type>string</type>
-            <photoshop>Author</photoshop>
-        </dataset>
-        <dataset>
-            <number>85</number>
-            <name>BylineTitle</name>
-            <description>Title of content creator</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>32</maxbytes>
-            <type>string</type>
-            <photoshop>Authors Position</photoshop>
-        </dataset>
-        <dataset>
-            <number>90</number>
-            <name>City</name>
-            <description>City of content origin</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>32</maxbytes>
-            <type>string</type>
-            <photoshop>City</photoshop>
-        </dataset>
-        <dataset>
-            <number>92</number>
-            <name>SubLocation</name>
-            <description>Location within city</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>32</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>95</number>
-            <name>ProvinceState</name>
-            <description>Province/State of content origin</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>32</maxbytes>
-            <type>string</type>
-            <photoshop>State/Province</photoshop>
-        </dataset>
-        <dataset>
-            <number>100</number>
-            <name>CountryCode</name>
-            <description>ISO country code of content origin</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>3</minbytes>
-            <maxbytes>3</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>101</number>
-            <name>CountryName</name>
-            <description>Full country name of content origin</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>64</maxbytes>
-            <type>string</type>
-            <photoshop>Country</photoshop>
-        </dataset>
-        <dataset>
-            <number>103</number>
-            <name>TransmissionReference</name>
-            <description>Location of original transmission</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>32</maxbytes>
-            <type>string</type>
-            <photoshop>Transmission Reference</photoshop>
-        </dataset>
-        <dataset>
-            <number>105</number>
-            <name>Headline</name>
-            <description>Content synopsis</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>256</maxbytes>
-            <type>string</type>
-            <photoshop>Headline</photoshop>
-        </dataset>
-        <dataset>
-            <number>110</number>
-            <name>Credit</name>
-            <description>Content provider</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>32</maxbytes>
-            <type>string</type>
-            <photoshop>Credit</photoshop>
-        </dataset>
-        <dataset>
-            <number>115</number>
-            <name>Source</name>
-            <description>Original owner of content</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>32</maxbytes>
-            <type>string</type>
-            <photoshop>Source</photoshop>
-        </dataset>
-        <dataset>
-            <number>116</number>
-            <name>Copyright</name>
-            <description>Necessary copyright notice</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>128</maxbytes>
-            <type>string</type>
-            <photoshop>Copyright notice</photoshop>
-        </dataset>
-        <dataset>
-            <number>118</number>
-            <name>Contact</name>
-            <description>Person or organisation to contact</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>128</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>120</number>
-            <name>Caption</name>
-            <description>Content description</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>2000</maxbytes>
-            <type>string</type>
-            <photoshop>Description</photoshop>
-        </dataset>
-        <dataset>
-            <number>122</number>
-            <name>Writer</name>
-            <description>Person responsible for caption</description>
-            <mandatory>false</mandatory>
-            <repeatable>true</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>32</maxbytes>
-            <type>string</type>
-            <photoshop>Description writer</photoshop>
-        </dataset>
-        <dataset>
-            <number>125</number>
-            <name>RasterizedCaption</name>
-            <description>Black and white caption image</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>7360</minbytes>
-            <maxbytes>7360</maxbytes>
-            <type>undefined</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>130</number>
-            <name>ImageType</name>
-            <description>Color components in an image</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>2</minbytes>
-            <maxbytes>2</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>131</number>
-            <name>ImageOrientation</name>
-            <description>Indicates the layout of an image</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>1</minbytes>
-            <maxbytes>1</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>135</number>
-            <name>Language</name>
-            <description>ISO 639:1988 language code</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>2</minbytes>
-            <maxbytes>3</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>150</number>
-            <name>AudioType</name>
-            <description>Information about audio content</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>2</minbytes>
-            <maxbytes>2</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>151</number>
-            <name>AudioRate</name>
-            <description>Sampling rate of audio content</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>6</minbytes>
-            <maxbytes>6</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>152</number>
-            <name>AudioResolution</name>
-            <description>Sampling resolution of audio content</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>2</minbytes>
-            <maxbytes>2</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>153</number>
-            <name>AudioDuration</name>
-            <description>Duration of audio content</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>6</minbytes>
-            <maxbytes>6</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>154</number>
-            <name>AudioOutcue</name>
-            <description>Final words or sounds of audio content</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>64</maxbytes>
-            <type>string</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>200</number>
-            <name>PreviewFormat</name>
-            <description>IIM appendix A file format of preview</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>2</minbytes>
-            <maxbytes>2</maxbytes>
-            <type>unsignedShort</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>201</number>
-            <name>PreviewVersion</name>
-            <description>File format version of preview</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>2</minbytes>
-            <maxbytes>2</maxbytes>
-            <type>unsignedShort</type>
-            <photoshop/>
-        </dataset>
-        <dataset>
-            <number>202</number>
-            <name>Preview</name>
-            <description>Binary preview data</description>
-            <mandatory>false</mandatory>
-            <repeatable>false</repeatable>
-            <minbytes>0</minbytes>
-            <maxbytes>256000</maxbytes>
-            <type>undefined</type>
-            <photoshop/>
-        </dataset>
-    </record>
-</IPTC-IIM4>
diff --git a/src/iptc.xsd b/src/iptc.xsd
deleted file mode 100644
index 7746adf..0000000
--- a/src/iptc.xsd
+++ /dev/null
@@ -1,48 +0,0 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0"
-    xml:lang="EN">
-    <xs:annotation>
-        <xs:documentation xml:lang="EN">Xml schema for iptc data</xs:documentation>
-    </xs:annotation>
-    
-    <xs:element name="IPTC-IIM4">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="record" maxOccurs="8">
-                    <xs:complexType>
-                        <xs:sequence>
-                            <xs:element name="type" type="xs:string" />
-                            <xs:element name="dataset" maxOccurs="unbounded">
-                                <xs:complexType>
-                                    <xs:sequence>
-                                        <xs:element name="number" type="xs:unsignedShort" />
-                                        <xs:element name="name" type="xs:string" />
-                                        <xs:element name="description" type="xs:string" />
-                                        <xs:element name="mandatory" type="xs:boolean" />
-                                        <xs:element name="repeatable" type="xs:boolean" />
-                                        <xs:element name="minbytes" type="xs:unsignedInt" />
-                                        <xs:element name="maxbytes" type="xs:unsignedInt" />
-                                        <xs:element ref="type" />
-                                        <xs:element name="photoshop" default="" type="xs:string" />
-                                    </xs:sequence>
-                                </xs:complexType>
-                            </xs:element>
-                        </xs:sequence>
-                        <xs:attribute name="number" type="xs:unsignedShort" />
-                    </xs:complexType>
-                </xs:element>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
-    
-    <xs:element name="type">
-        <xs:simpleType>
-            <xs:restriction base="xs:NMTOKEN">
-                <xs:enumeration value="unsignedShort" />
-                <xs:enumeration value="string" />
-                <xs:enumeration value="time" />
-                <xs:enumeration value="date" />
-                <xs:enumeration value="undefined" />
-            </xs:restriction>
-        </xs:simpleType>
-    </xs:element>
-</xs:schema>
diff --git a/src/tags.awk b/src/tags.awk
deleted file mode 100644
index 0670ab4..0000000
--- a/src/tags.awk
+++ /dev/null
@@ -1,43 +0,0 @@
-################################################################################
-# File     : tags.awk
-# Version  : $Name:  $ $Revision: 1.4 $
-# Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
-# History  : 07-Feb-04, ahu: created
-#
-# Description:
-#  Awk script to convert a taglist to XML format used in the documentation.
-#  $ taglist [itemName] | awk -f tags.awk > tags.xml
-################################################################################
-
-BEGIN {
-   FS = ", "
-   print "<?xml version = '1.0'?>";   
-   print "<?xml-stylesheet type=\"text/xsl\" href=\"tags.xsl\"?>";
-
-   print "<TAGLIST>"
-   print "<HEADER>"
-   print "<title>XYZ MakerNote Tags defined in Exiv2</title>"
-   print "<text>"
-   print "<p>Tags found in the MakerNote of images taken with XYZ cameras. These tags "
-   print "are defined by Exiv2 in accordance with <a href=\"makernote.html#RX\">[X]</a>.</p>"
-   print "<p>Click on a column header to sort the table.</p>"
-   print "</text>"
-   print "</HEADER>"
-   print "<ROWSET>"
-}
-
-{
-   print "   <ROW num=\"" ++row "\">";
-   print "      <tagname>" $1 "</tagname>"
-   print "      <tagdec>" $2 "</tagdec>"
-   print "      <taghex>" $3 "</taghex>"
-   print "      <ifd>" $4 "</ifd>"
-   print "      <key>" $5 "</key>"
-   print "      <tagdesc>" $6 "</tagdesc>"
-   print "   </ROW>";
-}
-
-END {
-   print "</ROWSET>"   
-   print "</TAGLIST>"
-}

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list