[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:41:53 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=b5a0471
The following commit has been merged in the master branch:
commit b5a0471e382420caae5b60dbe3d5316c7a6359d3
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Wed Aug 18 16:32:13 2010 +0000
#667: Fixed Exif.CanonPr.ToneCurve (Greg Mansfield)
---
src/canonmn.cpp | 2 +-
src/tiffimage.cpp | 6 +-----
test/data/exiv2-test.out | 19 ++++++++++++-------
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index bea6f53..e975a39 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -1087,7 +1087,7 @@ namespace Exiv2 {
// Canon Processing Info Tag
const TagInfo CanonMakerNote::tagInfoPr_[] = {
- TagInfo(0x0001, "ToneCurve", N_("ToneCurve"), N_("Tone curve"), canonPrIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(canonToneCurve)),
+ TagInfo(0x0001, "ToneCurve", N_("ToneCurve"), N_("Tone curve"), canonPrIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonToneCurve)),
TagInfo(0x0002, "Sharpness", N_("Sharpness"), N_("Sharpness"), canonPrIfdId, makerTags, signedShort, printValue),
TagInfo(0x0003, "SharpnessFrequency", N_("SharpnessFrequency"), N_("Sharpness frequency"), canonPrIfdId, makerTags, signedShort, EXV_PRINT_TAG(canonSharpnessFrequency)),
TagInfo(0x0004, "SensorRedLevel", N_("SensorRedLevel"), N_("Sensor red level"), canonPrIfdId, makerTags, signedShort, printValue),
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 5aca976..76e5399 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -377,10 +377,6 @@ namespace Exiv2 {
false, // Don't concatenate gaps
{ 0, ttSignedShort, 1 }
};
- //! Canon File Info binary array - definition
- extern const ArrayDef canonPrDef[] = {
- { 2, ttUnsignedLong, 1 }
- };
//! Nikon Vibration Reduction binary array - configuration
extern const ArrayCfg nikonVrCfg = {
@@ -1440,7 +1436,7 @@ namespace Exiv2 {
{ 0x000f, Group::canonmn, EXV_SIMPLE_BINARY_ARRAY(canonCfCfg) },
{ 0x0012, Group::canonmn, EXV_SIMPLE_BINARY_ARRAY(canonPiCfg) },
{ 0x0093, Group::canonmn, EXV_BINARY_ARRAY(canonFiCfg, canonFiDef) },
- { 0x00a0, Group::canonmn, EXV_BINARY_ARRAY(canonPrCfg, canonPrDef) },
+ { 0x00a0, Group::canonmn, EXV_SIMPLE_BINARY_ARRAY(canonPrCfg) },
{ Tag::next, Group::canonmn, newTiffDirectory<Group::ignr> },
{ Tag::all, Group::canonmn, newTiffEntry },
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 215c92c..fe93859 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -1793,7 +1793,8 @@ Error: Directory Canon: Next pointer is out of bounds; ignored.
20060802_095200.jpg Exif.CanonFi.FilterEffect SShort 1 None
20060802_095200.jpg Exif.CanonFi.ToningEffect SShort 1 None
20060802_095200.jpg Exif.CanonPr.0x0000 SShort 1 28
-20060802_095200.jpg Exif.CanonPr.ToneCurve Long 1 Standard
+20060802_095200.jpg Exif.CanonPr.ToneCurve SShort 1 Standard
+20060802_095200.jpg Exif.CanonPr.Sharpness SShort 1 0
20060802_095200.jpg Exif.CanonPr.SharpnessFrequency SShort 1 n/a
20060802_095200.jpg Exif.CanonPr.SensorRedLevel SShort 1 0
20060802_095200.jpg Exif.CanonPr.SensorBlueLevel SShort 1 0
@@ -2212,7 +2213,7 @@ Writing thumbnail (image/jpeg, 6137 Bytes) to file ./20060127_225027-thumb.jpg
exiv2-empty.exv: No Exif data found in the file
Compare image data and extracted data ------------------------------------
-1,1539c1,1539
+1,1540c1,1540
< File 1/15: exiv2-empty.jpg
< File 2/15: 20031214_000043.jpg
< 20031214_000043.jpg Exif.Image.Make Ascii 6 Canon
@@ -3404,7 +3405,8 @@ Compare image data and extracted data ------------------------------------
< 20060802_095200.jpg Exif.CanonFi.FilterEffect SShort 1 None
< 20060802_095200.jpg Exif.CanonFi.ToningEffect SShort 1 None
< 20060802_095200.jpg Exif.CanonPr.0x0000 SShort 1 28
-< 20060802_095200.jpg Exif.CanonPr.ToneCurve Long 1 Standard
+< 20060802_095200.jpg Exif.CanonPr.ToneCurve SShort 1 Standard
+< 20060802_095200.jpg Exif.CanonPr.Sharpness SShort 1 0
< 20060802_095200.jpg Exif.CanonPr.SharpnessFrequency SShort 1 n/a
< 20060802_095200.jpg Exif.CanonPr.SensorRedLevel SShort 1 0
< 20060802_095200.jpg Exif.CanonPr.SensorBlueLevel SShort 1 0
@@ -4944,7 +4946,8 @@ Compare image data and extracted data ------------------------------------
> 20060802_095200.exv Exif.CanonFi.FilterEffect SShort 1 None
> 20060802_095200.exv Exif.CanonFi.ToningEffect SShort 1 None
> 20060802_095200.exv Exif.CanonPr.0x0000 SShort 1 28
-> 20060802_095200.exv Exif.CanonPr.ToneCurve Long 1 Standard
+> 20060802_095200.exv Exif.CanonPr.ToneCurve SShort 1 Standard
+> 20060802_095200.exv Exif.CanonPr.Sharpness SShort 1 0
> 20060802_095200.exv Exif.CanonPr.SharpnessFrequency SShort 1 n/a
> 20060802_095200.exv Exif.CanonPr.SensorRedLevel SShort 1 0
> 20060802_095200.exv Exif.CanonPr.SensorBlueLevel SShort 1 0
@@ -5512,7 +5515,7 @@ Writing Exif data from ./20060127_225027.exv to 20060127_225027.jpg
exiv2-empty.exv: No Exif data found in the file
Compare original and inserted image data ---------------------------------
-1,1539c1,1539
+1,1540c1,1540
< File 1/15: exiv2-empty.jpg
< File 2/15: 20031214_000043.jpg
< 20031214_000043.jpg Exif.Image.Make Ascii 6 Canon
@@ -6704,7 +6707,8 @@ Compare original and inserted image data ---------------------------------
< 20060802_095200.jpg Exif.CanonFi.FilterEffect SShort 1 None
< 20060802_095200.jpg Exif.CanonFi.ToningEffect SShort 1 None
< 20060802_095200.jpg Exif.CanonPr.0x0000 SShort 1 28
-< 20060802_095200.jpg Exif.CanonPr.ToneCurve Long 1 Standard
+< 20060802_095200.jpg Exif.CanonPr.ToneCurve SShort 1 Standard
+< 20060802_095200.jpg Exif.CanonPr.Sharpness SShort 1 0
< 20060802_095200.jpg Exif.CanonPr.SharpnessFrequency SShort 1 n/a
< 20060802_095200.jpg Exif.CanonPr.SensorRedLevel SShort 1 0
< 20060802_095200.jpg Exif.CanonPr.SensorBlueLevel SShort 1 0
@@ -8244,7 +8248,8 @@ Compare original and inserted image data ---------------------------------
> 20060802_095200.exv Exif.CanonFi.FilterEffect SShort 1 None
> 20060802_095200.exv Exif.CanonFi.ToningEffect SShort 1 None
> 20060802_095200.exv Exif.CanonPr.0x0000 SShort 1 28
-> 20060802_095200.exv Exif.CanonPr.ToneCurve Long 1 Standard
+> 20060802_095200.exv Exif.CanonPr.ToneCurve SShort 1 Standard
+> 20060802_095200.exv Exif.CanonPr.Sharpness SShort 1 0
> 20060802_095200.exv Exif.CanonPr.SharpnessFrequency SShort 1 n/a
> 20060802_095200.exv Exif.CanonPr.SensorRedLevel SShort 1 0
> 20060802_095200.exv Exif.CanonPr.SensorBlueLevel SShort 1 0
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list