[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:38:26 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=5cd4571
The following commit has been merged in the master branch:
commit 5cd4571c73f5447260a136a066e0043d1a3fcc35
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Tue Apr 10 14:46:50 2007 +0000
Fixed AFPoint mapping for Canon cameras. Fixes bug #512. (Bug report with patch by Rob Walker.)
---
src/canonmn.cpp | 2 +-
test/data/exiv2-test.out | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index ba1a431..1b0e5b1 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -542,7 +542,7 @@ namespace Exiv2 {
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(0x0016, "AFPointsUsed", "AFPointsUsed", "AF points used", canonPiIfdId, makerTags, unsignedShort, EXV_PRINT_TAG_BITMASK(canonPiAFPointsUsed)),
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)
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 22f859c..c24ffbb 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -1049,7 +1049,7 @@ File 6/15: 20030925_201850.jpg
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.AFPointsUsed Short 1 center
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
@@ -1628,7 +1628,7 @@ Warning: Makernote: Pointer to next IFD is out of bounds; ignored.
20060802_095200.jpg Exif.CanonPi.0x0013 Short 1 270
20060802_095200.jpg Exif.CanonPi.0x0014 Short 1 4
20060802_095200.jpg Exif.CanonPi.0x0015 Short 1 4
-20060802_095200.jpg Exif.CanonPi.AFPointsUsed Short 1 upper-right
+20060802_095200.jpg Exif.CanonPi.AFPointsUsed Short 1 bottom
20060802_095200.jpg Exif.CanonPi.0x0017 Short 1 65274
20060802_095200.jpg Exif.CanonPi.0x0018 Short 1 65274
20060802_095200.jpg Exif.CanonPi.0x0019 Short 1 65040
@@ -2511,7 +2511,7 @@ Compare image data and extracted data ------------------------------------
< 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.AFPointsUsed Short 1 center
< 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
@@ -3089,7 +3089,7 @@ Compare image data and extracted data ------------------------------------
< 20060802_095200.jpg Exif.CanonPi.0x0013 Short 1 270
< 20060802_095200.jpg Exif.CanonPi.0x0014 Short 1 4
< 20060802_095200.jpg Exif.CanonPi.0x0015 Short 1 4
-< 20060802_095200.jpg Exif.CanonPi.AFPointsUsed Short 1 upper-right
+< 20060802_095200.jpg Exif.CanonPi.AFPointsUsed Short 1 bottom
< 20060802_095200.jpg Exif.CanonPi.0x0017 Short 1 65274
< 20060802_095200.jpg Exif.CanonPi.0x0018 Short 1 65274
< 20060802_095200.jpg Exif.CanonPi.0x0019 Short 1 65040
@@ -3900,7 +3900,7 @@ Compare image data and extracted data ------------------------------------
> 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.AFPointsUsed Short 1 center
> 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
@@ -4478,7 +4478,7 @@ Compare image data and extracted data ------------------------------------
> 20060802_095200.exv Exif.CanonPi.0x0013 Short 1 270
> 20060802_095200.exv Exif.CanonPi.0x0014 Short 1 4
> 20060802_095200.exv Exif.CanonPi.0x0015 Short 1 4
-> 20060802_095200.exv Exif.CanonPi.AFPointsUsed Short 1 upper-right
+> 20060802_095200.exv Exif.CanonPi.AFPointsUsed Short 1 bottom
> 20060802_095200.exv Exif.CanonPi.0x0017 Short 1 65274
> 20060802_095200.exv Exif.CanonPi.0x0018 Short 1 65274
> 20060802_095200.exv Exif.CanonPi.0x0019 Short 1 65040
@@ -5452,7 +5452,7 @@ Compare original and inserted image data ---------------------------------
< 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.AFPointsUsed Short 1 center
< 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
@@ -6030,7 +6030,7 @@ Compare original and inserted image data ---------------------------------
< 20060802_095200.jpg Exif.CanonPi.0x0013 Short 1 270
< 20060802_095200.jpg Exif.CanonPi.0x0014 Short 1 4
< 20060802_095200.jpg Exif.CanonPi.0x0015 Short 1 4
-< 20060802_095200.jpg Exif.CanonPi.AFPointsUsed Short 1 upper-right
+< 20060802_095200.jpg Exif.CanonPi.AFPointsUsed Short 1 bottom
< 20060802_095200.jpg Exif.CanonPi.0x0017 Short 1 65274
< 20060802_095200.jpg Exif.CanonPi.0x0018 Short 1 65274
< 20060802_095200.jpg Exif.CanonPi.0x0019 Short 1 65040
@@ -6841,7 +6841,7 @@ Compare original and inserted image data ---------------------------------
> 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.AFPointsUsed Short 1 center
> 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
@@ -7419,7 +7419,7 @@ Compare original and inserted image data ---------------------------------
> 20060802_095200.exv Exif.CanonPi.0x0013 Short 1 270
> 20060802_095200.exv Exif.CanonPi.0x0014 Short 1 4
> 20060802_095200.exv Exif.CanonPi.0x0015 Short 1 4
-> 20060802_095200.exv Exif.CanonPi.AFPointsUsed Short 1 upper-right
+> 20060802_095200.exv Exif.CanonPi.AFPointsUsed Short 1 bottom
> 20060802_095200.exv Exif.CanonPi.0x0017 Short 1 65274
> 20060802_095200.exv Exif.CanonPi.0x0018 Short 1 65274
> 20060802_095200.exv Exif.CanonPi.0x0019 Short 1 65040
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list