[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:37:50 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=f8f9917
The following commit has been merged in the master branch:
commit f8f9917dd971ba2680af7091f1d3fdd4c871fd44
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Tue Aug 15 14:40:34 2006 +0000
Added support for Canon Picture Info tags (David Cannings)
---
doc/templates/Makefile | 2 +-
doc/templates/tags-canon.html.in | 5 ++
src/canonmn.cpp | 66 +++++++++++++++++++-
src/canonmn.hpp | 1 +
src/crwimage.cpp | 8 ++-
src/makernote2.hpp | 3 +-
src/tags.cpp | 1 +
src/tiffcomposite.cpp | 7 ++-
src/tiffparser.cpp | 2 +
src/types.hpp | 1 +
src/write2-test.cpp | 1 +
test/data/exiv2-test.out | 126 ++++++++++++++++++++++++++++++++++++---
test/data/write2-test.out | 2 +
13 files changed, 208 insertions(+), 17 deletions(-)
diff --git a/doc/templates/Makefile b/doc/templates/Makefile
index 27a7efd..f435460 100644
--- a/doc/templates/Makefile
+++ b/doc/templates/Makefile
@@ -14,7 +14,7 @@
# Only tested with GNU make.
#
-TABLES = Exif Canon CanonCs CanonSi CanonCf Fujifilm Minolta MinoltaCsNew \
+TABLES = Exif Canon CanonCs CanonSi CanonCf CanonPi Fujifilm Minolta MinoltaCsNew \
MinoltaCs5D MinoltaCs7D Nikon1 Nikon2 Nikon3 Olympus Panasonic \
Sigma Sony
diff --git a/doc/templates/tags-canon.html.in b/doc/templates/tags-canon.html.in
index 6a0a807..e0867e8 100644
--- a/doc/templates/tags-canon.html.in
+++ b/doc/templates/tags-canon.html.in
@@ -29,6 +29,11 @@ __CanonSi__
__CanonCf__
<br>
+<h3>Canon Picture Info Tags</h3>
+<p>Click on a column header to sort the table.</p>
+__CanonPi__
+<br>
+
</div>
<!-- closes content -->
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 78a4739..7c303b8 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -64,11 +64,14 @@ namespace Exiv2 {
canonSiIfdId, MakerNote::AutoPtr(new CanonMakerNote));
MakerNoteFactory::registerMakerNote(
canonCfIfdId, MakerNote::AutoPtr(new CanonMakerNote));
+ MakerNoteFactory::registerMakerNote(
+ canonPiIfdId, MakerNote::AutoPtr(new CanonMakerNote));
ExifTags::registerMakerTagInfo(canonIfdId, tagInfo_);
ExifTags::registerMakerTagInfo(canonCsIfdId, tagInfoCs_);
ExifTags::registerMakerTagInfo(canonSiIfdId, tagInfoSi_);
ExifTags::registerMakerTagInfo(canonCfIfdId, tagInfoCf_);
+ ExifTags::registerMakerTagInfo(canonPiIfdId, tagInfoPi_);
}
//! @endcond
@@ -431,6 +434,43 @@ namespace Exiv2 {
TagInfo(0xffff, "(UnknownCanonCfTag)", "(UnknownCanonCfTag)", "Unknown Canon Custom Function tag", canonCfIfdId, makerTags, invalidTypeId, printValue)
};
+ //! AFPointsUsed, tag 0x0016
+ extern const TagDetailsBitmask canonPiAFPointsUsed[] = {
+ { 0x01, "right" },
+ { 0x02, "mid-right" },
+ { 0x04, "bottom" },
+ { 0x08, "center" },
+ { 0x10, "top" },
+ { 0x20, "mid-left" },
+ { 0x40, "left" }
+ };
+
+ //! AFPointsUsed20D, tag 0x001a
+ extern const TagDetailsBitmask canonPiAFPointsUsed20D[] = {
+ { 0x001, "top" },
+ { 0x002, "upper-left" },
+ { 0x004, "upper-right" },
+ { 0x008, "left" },
+ { 0x010, "center" },
+ { 0x020, "right" },
+ { 0x040, "lower-left" },
+ { 0x080, "lower-right" },
+ { 0x100, "bottom" }
+ };
+
+ // Canon Picture Info Tag
+ const TagInfo CanonMakerNote::tagInfoPi_[] = {
+ TagInfo(0x0002, "ImageWidth", "ImageWidth", "Image width", canonPiIfdId, makerTags, unsignedShort, printValue),
+ TagInfo(0x0003, "ImageHeight", "ImageHeight", "Image height", canonPiIfdId, makerTags, unsignedShort, printValue),
+ TagInfo(0x0004, "ImageWidthAsShot", "ImageWidthAsShot", "Image width (as shot)", canonPiIfdId, makerTags, unsignedShort, printValue),
+ TagInfo(0x0005, "ImageHeightAsShot", "ImageHeightAsShot", "Image height (as shot)", canonPiIfdId, makerTags, unsignedShort, printValue),
+ TagInfo(0x0016, "AFPointsUsed", "AFPointsUsed", "AF points used", canonPiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(canonPiAFPointsUsed20D)),
+ TagInfo(0x001a, "AFPointsUsed20D", "AFPointsUsed20D", "AF points used (20D)", canonPiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(canonPiAFPointsUsed20D)),
+ // End of list marker
+ TagInfo(0xffff, "(UnknownCanonPiTag)", "(UnknownCanonPiTag)", "Unknown Canon Picture Info tag", canonPiIfdId, makerTags, invalidTypeId, printValue)
+ };
+
+
int CanonMakerNote::read(const byte* buf,
long len,
long start,
@@ -481,6 +521,17 @@ namespace Exiv2 {
ifd_.erase(cs);
}
+ // Decode picture info and add each as an additional entry
+ cs = ifd_.findTag(0x0012);
+ if (cs != ifd_.end() && cs->type() == unsignedShort) {
+ for (uint16_t c = 1; cs->count() > c; ++c) {
+ addCsEntry(canonPiIfdId, c, cs->offset() + c*2,
+ cs->data() + c*2, 1);
+ }
+ // Discard the original entry
+ ifd_.erase(cs);
+ }
+
// Copy remaining ifd entries
entries_.insert(entries_.begin(), ifd_.begin(), ifd_.end());
@@ -514,7 +565,8 @@ namespace Exiv2 {
assert( entry.ifdId() == canonIfdId
|| entry.ifdId() == canonCsIfdId
|| entry.ifdId() == canonSiIfdId
- || entry.ifdId() == canonCfIfdId);
+ || entry.ifdId() == canonCfIfdId
+ || entry.ifdId() == canonPiIfdId);
// allow duplicates
entries_.push_back(entry);
}
@@ -551,6 +603,12 @@ namespace Exiv2 {
ifd_.erase(0x000f);
ifd_.add(cf);
}
+ // Collect picture info entries and add the original Canon tag
+ Entry pi;
+ if (assemble(pi, canonPiIfdId, 0x0012, byteOrder_)) {
+ ifd_.erase(0x0012);
+ ifd_.add(pi);
+ }
return IfdMakerNote::copy(buf, byteOrder_, offset);
} // CanonMakerNote::copy
@@ -595,6 +653,12 @@ namespace Exiv2 {
ifd.erase(0x000f);
ifd.add(cf);
}
+ // Collect picture info entries and add the original Canon tag
+ Entry pi(alloc_);
+ if (assemble(pi, canonPiIfdId, 0x0012, littleEndian)) {
+ ifd.erase(0x0012);
+ ifd.add(pi);
+ }
return headerSize() + ifd.size() + ifd.dataSize();
} // CanonMakerNote::size
diff --git a/src/canonmn.hpp b/src/canonmn.hpp
index bd13e7e..0317c68 100644
--- a/src/canonmn.hpp
+++ b/src/canonmn.hpp
@@ -193,6 +193,7 @@ namespace Exiv2 {
static const TagInfo tagInfoCs_[];
static const TagInfo tagInfoSi_[];
static const TagInfo tagInfoCf_[];
+ static const TagInfo tagInfoPi_[];
}; // class CanonMakerNote
diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index 982a7c3..90d59e2 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -115,7 +115,7 @@ namespace Exiv2 {
CrwMapping(0x102a, 0x300b, 0, 0x0004, canonIfdId, decodeArray, encodeArray),
CrwMapping(0x102d, 0x300b, 0, 0x0001, canonIfdId, decodeArray, encodeArray),
CrwMapping(0x1033, 0x300b, 0, 0x000f, canonIfdId, decodeArray, encodeArray),
- CrwMapping(0x1038, 0x300b, 0, 0x0012, canonIfdId, decodeBasic, encodeBasic),
+ CrwMapping(0x1038, 0x300b, 0, 0x0012, canonIfdId, decodeArray, encodeArray),
CrwMapping(0x10a9, 0x300b, 0, 0x00a9, canonIfdId, decodeBasic, encodeBasic),
// Mapped to Exif.Photo.ColorSpace instead (see below)
//CrwMapping(0x10b4, 0x300b, 0, 0x00b4, canonIfdId, decodeBasic, encodeBasic),
@@ -990,7 +990,8 @@ namespace Exiv2 {
switch (pCrwMapping->tag_) {
case 0x0001: ifdId = canonCsIfdId; break;
case 0x0004: ifdId = canonSiIfdId; break;
- case 0x000f: ifdId = canonCfIfdId; break;
+ case 0x000f: ifdId = canonCfIfdId; break;
+ case 0x0012: ifdId = canonPiIfdId; break;
}
assert(ifdId != ifdIdNotSet);
@@ -1236,7 +1237,8 @@ namespace Exiv2 {
switch (pCrwMapping->tag_) {
case 0x0001: ifdId = canonCsIfdId; break;
case 0x0004: ifdId = canonSiIfdId; break;
- case 0x000f: ifdId = canonCfIfdId; break;
+ case 0x000f: ifdId = canonCfIfdId; break;
+ case 0x0012: ifdId = canonPiIfdId; break;
}
assert(ifdId != ifdIdNotSet);
DataBuf buf = packIfdId(image.exifData(), ifdId, pHead->byteOrder());
diff --git a/src/makernote2.hpp b/src/makernote2.hpp
index 95d20da..701ffc7 100644
--- a/src/makernote2.hpp
+++ b/src/makernote2.hpp
@@ -49,7 +49,7 @@ namespace Exiv2 {
const uint16_t canonmn = 259; //!< Canon makernote
const uint16_t canoncs = 260; //!< Canon camera settings
const uint16_t canonsi = 261; //!< Canon shot info
- const uint16_t canoncf = 262; //!< Canon customer functions
+ const uint16_t canoncf = 262; //!< Canon custom functions
const uint16_t nikonmn = 263; //!< Any Nikon makernote (pseudo group)
const uint16_t nikon1mn = 264; //!< Nikon1 makernote
const uint16_t nikon2mn = 265; //!< Nikon2 makernote
@@ -64,6 +64,7 @@ namespace Exiv2 {
const uint16_t minocsn = 274; //!< Minolta camera settings (new)
const uint16_t minocs5 = 275; //!< Minolta camera settings (D5)
const uint16_t minocs7 = 276; //!< Minolta camera settings (D7)
+ const uint16_t canonpi = 277; //!< Canon picture info
}
// *****************************************************************************
diff --git a/src/tags.cpp b/src/tags.cpp
index 93fcb95..d0fb634 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -69,6 +69,7 @@ namespace Exiv2 {
IfdInfo(canonCsIfdId, "Makernote", "CanonCs"),
IfdInfo(canonSiIfdId, "Makernote", "CanonSi"),
IfdInfo(canonCfIfdId, "Makernote", "CanonCf"),
+ IfdInfo(canonPiIfdId, "Makernote", "CanonPi"),
IfdInfo(fujiIfdId, "Makernote", "Fujifilm"),
IfdInfo(minoltaIfdId, "Makernote", "Minolta"),
IfdInfo(minoltaCs5DIfdId, "Makernote", "MinoltaCs5D"),
diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index ee9c85a..be65815 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -74,8 +74,8 @@ namespace Exiv2 {
{ 257, "Olympus" },
{ 258, "Fujifilm" },
{ 259, "Canon" },
- { 260, "CanonCs" },
- { 261, "CanonSi" },
+ { 260, "CanonCs" },
+ { 261, "CanonSi" },
{ 262, "CanonCf" },
// 263 not needed (nikonmn)
{ 264, "Nikon1" },
@@ -90,7 +90,8 @@ namespace Exiv2 {
{ 273, "MinoltaCsOld" },
{ 274, "MinoltaCsNew" },
{ 275, "MinoltaCs5D" },
- { 276, "MinoltaCs7D" }
+ { 276, "MinoltaCs7D" },
+ { 277, "CanonPi" }
};
bool TiffGroupInfo::operator==(uint16_t group) const
diff --git a/src/tiffparser.cpp b/src/tiffparser.cpp
index 106483d..4b846e1 100644
--- a/src/tiffparser.cpp
+++ b/src/tiffparser.cpp
@@ -114,9 +114,11 @@ namespace Exiv2 {
{ 0x0001, Group::canonmn, newTiffArrayEntry<2>, Group::canoncs },
{ 0x0004, Group::canonmn, newTiffArrayEntry<2>, Group::canonsi },
{ 0x000f, Group::canonmn, newTiffArrayEntry<2>, Group::canoncf },
+ { 0x0012, Group::canonmn, newTiffArrayEntry<2>, Group::canonpi },
{ Tag::all, Group::canoncs, newTiffArrayElement<unsignedShort>, Group::canoncs },
{ Tag::all, Group::canonsi, newTiffArrayElement<unsignedShort>, Group::canonsi },
{ Tag::all, Group::canoncf, newTiffArrayElement<unsignedShort>, Group::canoncf },
+ { Tag::all, Group::canonpi, newTiffArrayElement<unsignedShort>, Group::canonpi },
// Some Olympus cameras use Minolta structures
{ 0x0001, Group::olympmn, newTiffArrayEntry<4>, Group::minocso },
{ 0x0003, Group::olympmn, newTiffArrayEntry<4>, Group::minocsn },
diff --git a/src/types.hpp b/src/types.hpp
index fe45868..9806be9 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -106,6 +106,7 @@ namespace Exiv2 {
enum IfdId { ifdIdNotSet,
ifd0Id, exifIfdId, gpsIfdId, iopIfdId, ifd1Id,
canonIfdId, canonCsIfdId, canonSiIfdId, canonCfIfdId,
+ canonPiIfdId,
fujiIfdId,
minoltaIfdId, minoltaCs5DIfdId, minoltaCs7DIfdId,
minoltaCsOldIfdId, minoltaCsNewIfdId,
diff --git a/src/write2-test.cpp b/src/write2-test.cpp
index 31f8e3a..057d7c3 100644
--- a/src/write2-test.cpp
+++ b/src/write2-test.cpp
@@ -68,6 +68,7 @@ try {
edMn1["Exif.CanonCs.0x0002"] = uint16_t(41);
edMn1["Exif.CanonSi.0x0005"] = uint16_t(42);
edMn1["Exif.CanonCf.0x0001"] = uint16_t(43);
+ edMn1["Exif.CanonPi.0x0001"] = uint16_t(44);
write(file, edMn1);
print(file);
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index edf9ad6..3e3ac02 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -22,7 +22,7 @@ Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301 USA
Exiv2 help ---------------------------------------------------------------
-Usage: lt-exiv2 [ options ] [ action ] file ...
+Usage: exiv2 [ options ] [ action ] file ...
Manipulate the Exif metadata of images.
@@ -850,7 +850,6 @@ File 6/12: 20030925_201850.jpg
20030925_201850.jpg Exif.Canon.WhiteBalanceTable Short 41 82 1751 836 827 1074 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 128 128 128 128
20030925_201850.jpg Exif.Canon.0x00ae Short 1 5200
20030925_201850.jpg Exif.Canon.0x00b4 Short 1 1
-20030925_201850.jpg Exif.Canon.PictureInfo Short 24 7 7 3072 2048 3072 2048 151 151 1014 608 0 0 0 64928 64522 0 0 65030 0 506 0 0 8 65535
20030925_201850.jpg Exif.Canon.0x0013 Short 4 0 159 7 112
20030925_201850.jpg Exif.Canon.0x0000 Short 5 0 0 0 0 0
20030925_201850.jpg Exif.Canon.0x00b6 Long 12 24 2 380376 1536 1024 2449882 3072000 892 2048000 595 65540 262146
@@ -929,6 +928,29 @@ File 6/12: 20030925_201850.jpg
20030925_201850.jpg Exif.CanonSi.0x001e Short 1 0
20030925_201850.jpg Exif.CanonSi.0x001f Short 1 0
20030925_201850.jpg Exif.CanonSi.0x0020 Short 1 0
+20030925_201850.jpg Exif.CanonPi.0x0001 Short 1 7
+20030925_201850.jpg Exif.CanonPi.ImageWidth Short 1 3072
+20030925_201850.jpg Exif.CanonPi.ImageHeight Short 1 2048
+20030925_201850.jpg Exif.CanonPi.ImageWidthAsShot Short 1 3072
+20030925_201850.jpg Exif.CanonPi.ImageHeightAsShot Short 1 2048
+20030925_201850.jpg Exif.CanonPi.0x0006 Short 1 151
+20030925_201850.jpg Exif.CanonPi.0x0007 Short 1 151
+20030925_201850.jpg Exif.CanonPi.0x0008 Short 1 1014
+20030925_201850.jpg Exif.CanonPi.0x0009 Short 1 608
+20030925_201850.jpg Exif.CanonPi.0x000a Short 1 0
+20030925_201850.jpg Exif.CanonPi.0x000b Short 1 0
+20030925_201850.jpg Exif.CanonPi.0x000c Short 1 0
+20030925_201850.jpg Exif.CanonPi.0x000d Short 1 64928
+20030925_201850.jpg Exif.CanonPi.0x000e Short 1 64522
+20030925_201850.jpg Exif.CanonPi.0x000f Short 1 0
+20030925_201850.jpg Exif.CanonPi.0x0010 Short 1 0
+20030925_201850.jpg Exif.CanonPi.0x0011 Short 1 65030
+20030925_201850.jpg Exif.CanonPi.0x0012 Short 1 0
+20030925_201850.jpg Exif.CanonPi.0x0013 Short 1 506
+20030925_201850.jpg Exif.CanonPi.0x0014 Short 1 0
+20030925_201850.jpg Exif.CanonPi.0x0015 Short 1 0
+20030925_201850.jpg Exif.CanonPi.AFPointsUsed Short 1 left
+20030925_201850.jpg Exif.CanonPi.0x0017 Short 1 65535
20030925_201850.jpg Exif.Iop.InteroperabilityIndex Ascii 4 R98
20030925_201850.jpg Exif.Iop.InteroperabilityVersion Undefined 4 48 49 48 48
20030925_201850.jpg Exif.Iop.RelatedImageWidth Short 1 3072
@@ -1389,7 +1411,7 @@ Writing JPEG thumbnail (15605 Bytes) to file ./20050527_051833-thumb.jpg
exiv2-empty.exv: No Exif data found in the file
Compare image data and extracted data ------------------------------------
-1,884c1,884
+1,906c1,906
< File 1/12: exiv2-empty.jpg
< File 2/12: 20031214_000043.jpg
< 20031214_000043.jpg Exif.Image.Make Ascii 6 Canon
@@ -1791,7 +1813,6 @@ Compare image data and extracted data ------------------------------------
< 20030925_201850.jpg Exif.Canon.WhiteBalanceTable Short 41 82 1751 836 827 1074 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 128 128 128 128
< 20030925_201850.jpg Exif.Canon.0x00ae Short 1 5200
< 20030925_201850.jpg Exif.Canon.0x00b4 Short 1 1
-< 20030925_201850.jpg Exif.Canon.PictureInfo Short 24 7 7 3072 2048 3072 2048 151 151 1014 608 0 0 0 64928 64522 0 0 65030 0 506 0 0 8 65535
< 20030925_201850.jpg Exif.Canon.0x0013 Short 4 0 159 7 112
< 20030925_201850.jpg Exif.Canon.0x0000 Short 5 0 0 0 0 0
< 20030925_201850.jpg Exif.Canon.0x00b6 Long 12 24 2 380376 1536 1024 2449882 3072000 892 2048000 595 65540 262146
@@ -1870,6 +1891,29 @@ Compare image data and extracted data ------------------------------------
< 20030925_201850.jpg Exif.CanonSi.0x001e Short 1 0
< 20030925_201850.jpg Exif.CanonSi.0x001f Short 1 0
< 20030925_201850.jpg Exif.CanonSi.0x0020 Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x0001 Short 1 7
+< 20030925_201850.jpg Exif.CanonPi.ImageWidth Short 1 3072
+< 20030925_201850.jpg Exif.CanonPi.ImageHeight Short 1 2048
+< 20030925_201850.jpg Exif.CanonPi.ImageWidthAsShot Short 1 3072
+< 20030925_201850.jpg Exif.CanonPi.ImageHeightAsShot Short 1 2048
+< 20030925_201850.jpg Exif.CanonPi.0x0006 Short 1 151
+< 20030925_201850.jpg Exif.CanonPi.0x0007 Short 1 151
+< 20030925_201850.jpg Exif.CanonPi.0x0008 Short 1 1014
+< 20030925_201850.jpg Exif.CanonPi.0x0009 Short 1 608
+< 20030925_201850.jpg Exif.CanonPi.0x000a Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x000b Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x000c Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x000d Short 1 64928
+< 20030925_201850.jpg Exif.CanonPi.0x000e Short 1 64522
+< 20030925_201850.jpg Exif.CanonPi.0x000f Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x0010 Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x0011 Short 1 65030
+< 20030925_201850.jpg Exif.CanonPi.0x0012 Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x0013 Short 1 506
+< 20030925_201850.jpg Exif.CanonPi.0x0014 Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x0015 Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.AFPointsUsed Short 1 left
+< 20030925_201850.jpg Exif.CanonPi.0x0017 Short 1 65535
< 20030925_201850.jpg Exif.Iop.InteroperabilityIndex Ascii 4 R98
< 20030925_201850.jpg Exif.Iop.InteroperabilityVersion Undefined 4 48 49 48 48
< 20030925_201850.jpg Exif.Iop.RelatedImageWidth Short 1 3072
@@ -2676,7 +2720,6 @@ Compare image data and extracted data ------------------------------------
> 20030925_201850.exv Exif.Canon.WhiteBalanceTable Short 41 82 1751 836 827 1074 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 128 128 128 128
> 20030925_201850.exv Exif.Canon.0x00ae Short 1 5200
> 20030925_201850.exv Exif.Canon.0x00b4 Short 1 1
-> 20030925_201850.exv Exif.Canon.PictureInfo Short 24 7 7 3072 2048 3072 2048 151 151 1014 608 0 0 0 64928 64522 0 0 65030 0 506 0 0 8 65535
> 20030925_201850.exv Exif.Canon.0x0013 Short 4 0 159 7 112
> 20030925_201850.exv Exif.Canon.0x0000 Short 5 0 0 0 0 0
> 20030925_201850.exv Exif.Canon.0x00b6 Long 12 24 2 380376 1536 1024 2449882 3072000 892 2048000 595 65540 262146
@@ -2755,6 +2798,29 @@ Compare image data and extracted data ------------------------------------
> 20030925_201850.exv Exif.CanonSi.0x001e Short 1 0
> 20030925_201850.exv Exif.CanonSi.0x001f Short 1 0
> 20030925_201850.exv Exif.CanonSi.0x0020 Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x0001 Short 1 7
+> 20030925_201850.exv Exif.CanonPi.ImageWidth Short 1 3072
+> 20030925_201850.exv Exif.CanonPi.ImageHeight Short 1 2048
+> 20030925_201850.exv Exif.CanonPi.ImageWidthAsShot Short 1 3072
+> 20030925_201850.exv Exif.CanonPi.ImageHeightAsShot Short 1 2048
+> 20030925_201850.exv Exif.CanonPi.0x0006 Short 1 151
+> 20030925_201850.exv Exif.CanonPi.0x0007 Short 1 151
+> 20030925_201850.exv Exif.CanonPi.0x0008 Short 1 1014
+> 20030925_201850.exv Exif.CanonPi.0x0009 Short 1 608
+> 20030925_201850.exv Exif.CanonPi.0x000a Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x000b Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x000c Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x000d Short 1 64928
+> 20030925_201850.exv Exif.CanonPi.0x000e Short 1 64522
+> 20030925_201850.exv Exif.CanonPi.0x000f Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x0010 Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x0011 Short 1 65030
+> 20030925_201850.exv Exif.CanonPi.0x0012 Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x0013 Short 1 506
+> 20030925_201850.exv Exif.CanonPi.0x0014 Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x0015 Short 1 0
+> 20030925_201850.exv Exif.CanonPi.AFPointsUsed Short 1 left
+> 20030925_201850.exv Exif.CanonPi.0x0017 Short 1 65535
> 20030925_201850.exv Exif.Iop.InteroperabilityIndex Ascii 4 R98
> 20030925_201850.exv Exif.Iop.InteroperabilityVersion Undefined 4 48 49 48 48
> 20030925_201850.exv Exif.Iop.RelatedImageWidth Short 1 3072
@@ -3287,7 +3353,7 @@ Writing Exif data from ./20050527_051833.exv to 20050527_051833.jpg
exiv2-empty.exv: No Exif data found in the file
Compare original and inserted image data ---------------------------------
-1,884c1,884
+1,906c1,906
< File 1/12: exiv2-empty.jpg
< File 2/12: 20031214_000043.jpg
< 20031214_000043.jpg Exif.Image.Make Ascii 6 Canon
@@ -3689,7 +3755,6 @@ Compare original and inserted image data ---------------------------------
< 20030925_201850.jpg Exif.Canon.WhiteBalanceTable Short 41 82 1751 836 827 1074 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 128 128 128 128
< 20030925_201850.jpg Exif.Canon.0x00ae Short 1 5200
< 20030925_201850.jpg Exif.Canon.0x00b4 Short 1 1
-< 20030925_201850.jpg Exif.Canon.PictureInfo Short 24 7 7 3072 2048 3072 2048 151 151 1014 608 0 0 0 64928 64522 0 0 65030 0 506 0 0 8 65535
< 20030925_201850.jpg Exif.Canon.0x0013 Short 4 0 159 7 112
< 20030925_201850.jpg Exif.Canon.0x0000 Short 5 0 0 0 0 0
< 20030925_201850.jpg Exif.Canon.0x00b6 Long 12 24 2 380376 1536 1024 2449882 3072000 892 2048000 595 65540 262146
@@ -3768,6 +3833,29 @@ Compare original and inserted image data ---------------------------------
< 20030925_201850.jpg Exif.CanonSi.0x001e Short 1 0
< 20030925_201850.jpg Exif.CanonSi.0x001f Short 1 0
< 20030925_201850.jpg Exif.CanonSi.0x0020 Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x0001 Short 1 7
+< 20030925_201850.jpg Exif.CanonPi.ImageWidth Short 1 3072
+< 20030925_201850.jpg Exif.CanonPi.ImageHeight Short 1 2048
+< 20030925_201850.jpg Exif.CanonPi.ImageWidthAsShot Short 1 3072
+< 20030925_201850.jpg Exif.CanonPi.ImageHeightAsShot Short 1 2048
+< 20030925_201850.jpg Exif.CanonPi.0x0006 Short 1 151
+< 20030925_201850.jpg Exif.CanonPi.0x0007 Short 1 151
+< 20030925_201850.jpg Exif.CanonPi.0x0008 Short 1 1014
+< 20030925_201850.jpg Exif.CanonPi.0x0009 Short 1 608
+< 20030925_201850.jpg Exif.CanonPi.0x000a Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x000b Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x000c Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x000d Short 1 64928
+< 20030925_201850.jpg Exif.CanonPi.0x000e Short 1 64522
+< 20030925_201850.jpg Exif.CanonPi.0x000f Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x0010 Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x0011 Short 1 65030
+< 20030925_201850.jpg Exif.CanonPi.0x0012 Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x0013 Short 1 506
+< 20030925_201850.jpg Exif.CanonPi.0x0014 Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.0x0015 Short 1 0
+< 20030925_201850.jpg Exif.CanonPi.AFPointsUsed Short 1 left
+< 20030925_201850.jpg Exif.CanonPi.0x0017 Short 1 65535
< 20030925_201850.jpg Exif.Iop.InteroperabilityIndex Ascii 4 R98
< 20030925_201850.jpg Exif.Iop.InteroperabilityVersion Undefined 4 48 49 48 48
< 20030925_201850.jpg Exif.Iop.RelatedImageWidth Short 1 3072
@@ -4574,7 +4662,6 @@ Compare original and inserted image data ---------------------------------
> 20030925_201850.exv Exif.Canon.WhiteBalanceTable Short 41 82 1751 836 827 1074 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 128 128 128 128
> 20030925_201850.exv Exif.Canon.0x00ae Short 1 5200
> 20030925_201850.exv Exif.Canon.0x00b4 Short 1 1
-> 20030925_201850.exv Exif.Canon.PictureInfo Short 24 7 7 3072 2048 3072 2048 151 151 1014 608 0 0 0 64928 64522 0 0 65030 0 506 0 0 8 65535
> 20030925_201850.exv Exif.Canon.0x0013 Short 4 0 159 7 112
> 20030925_201850.exv Exif.Canon.0x0000 Short 5 0 0 0 0 0
> 20030925_201850.exv Exif.Canon.0x00b6 Long 12 24 2 380376 1536 1024 2449882 3072000 892 2048000 595 65540 262146
@@ -4653,6 +4740,29 @@ Compare original and inserted image data ---------------------------------
> 20030925_201850.exv Exif.CanonSi.0x001e Short 1 0
> 20030925_201850.exv Exif.CanonSi.0x001f Short 1 0
> 20030925_201850.exv Exif.CanonSi.0x0020 Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x0001 Short 1 7
+> 20030925_201850.exv Exif.CanonPi.ImageWidth Short 1 3072
+> 20030925_201850.exv Exif.CanonPi.ImageHeight Short 1 2048
+> 20030925_201850.exv Exif.CanonPi.ImageWidthAsShot Short 1 3072
+> 20030925_201850.exv Exif.CanonPi.ImageHeightAsShot Short 1 2048
+> 20030925_201850.exv Exif.CanonPi.0x0006 Short 1 151
+> 20030925_201850.exv Exif.CanonPi.0x0007 Short 1 151
+> 20030925_201850.exv Exif.CanonPi.0x0008 Short 1 1014
+> 20030925_201850.exv Exif.CanonPi.0x0009 Short 1 608
+> 20030925_201850.exv Exif.CanonPi.0x000a Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x000b Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x000c Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x000d Short 1 64928
+> 20030925_201850.exv Exif.CanonPi.0x000e Short 1 64522
+> 20030925_201850.exv Exif.CanonPi.0x000f Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x0010 Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x0011 Short 1 65030
+> 20030925_201850.exv Exif.CanonPi.0x0012 Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x0013 Short 1 506
+> 20030925_201850.exv Exif.CanonPi.0x0014 Short 1 0
+> 20030925_201850.exv Exif.CanonPi.0x0015 Short 1 0
+> 20030925_201850.exv Exif.CanonPi.AFPointsUsed Short 1 left
+> 20030925_201850.exv Exif.CanonPi.0x0017 Short 1 65535
> 20030925_201850.exv Exif.Iop.InteroperabilityIndex Ascii 4 R98
> 20030925_201850.exv Exif.Iop.InteroperabilityVersion Undefined 4 48 49 48 48
> 20030925_201850.exv Exif.Iop.RelatedImageWidth Short 1 3072
diff --git a/test/data/write2-test.out b/test/data/write2-test.out
index fbcd43e..9bd2505 100644
--- a/test/data/write2-test.out
+++ b/test/data/write2-test.out
@@ -22,6 +22,7 @@ Exif.CanonSi.0x0003 0x0003 Makernote Short 1
Exif.CanonSi.TargetAperture 0x0004 Makernote Short 1 0
Exif.CanonSi.TargetShutterSpeed 0x0005 Makernote Short 1 42
Exif.CanonCf.NoiseReduction 0x0001 Makernote Short 1 43
+Exif.CanonPi.0x0001 0x0001 Makernote Short 1 44
----- Non-intrusive writing of special Canon MakerNote tags
Exif.Image.Make 0x010f IFD0 Ascii 6 Canon
@@ -36,6 +37,7 @@ Exif.CanonSi.0x0003 0x0003 Makernote Short 1
Exif.CanonSi.TargetAperture 0x0004 Makernote Short 1 99
Exif.CanonSi.TargetShutterSpeed 0x0005 Makernote Short 1 42
Exif.CanonCf.NoiseReduction 0x0001 Makernote Short 1 43
+Exif.CanonPi.0x0001 0x0001 Makernote Short 1 44
----- One Fujifilm MakerNote tag
Exif.Image.Make 0x010f IFD0 Ascii 9 FUJIFILM
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list