[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:46:25 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=c8674eb
The following commit has been merged in the master branch:
commit c8674eb102a2375ac8ecce23545783f8b178d970
Author: Robin Mills <robin at clanmills.com>
Date: Sun Apr 17 17:08:01 2016 +0000
#1179. Thank You to Pascal for reporting this, providing the patch and test data.
---
src/fujimn.cpp | 16 +++++++++++-----
test/bugfixes-test.sh | 9 +++++++++
test/data/bugfixes-test.out | Bin 1887108 -> 1900959 bytes
test/data/exiv2-bug1179a.exv | Bin 0 -> 10761 bytes
test/data/exiv2-bug1179b.exv | Bin 0 -> 10835 bytes
test/data/exiv2-bug1179c.exv | Bin 0 -> 10479 bytes
test/data/exiv2-bug1179d.exv | Bin 0 -> 10773 bytes
test/data/exiv2-bug1179e.exv | Bin 0 -> 10481 bytes
test/data/exiv2-bug1179f.exv | Bin 0 -> 2815 bytes
test/data/exiv2-bug1179g.exv | Bin 0 -> 2815 bytes
test/data/exiv2-bug1179h.exv | Bin 0 -> 2815 bytes
test/data/exiv2-bug1179i.exv | Bin 0 -> 2815 bytes
12 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/fujimn.cpp b/src/fujimn.cpp
index f339c27..64f0e30 100644
--- a/src/fujimn.cpp
+++ b/src/fujimn.cpp
@@ -157,11 +157,17 @@ namespace Exiv2 {
//! FilmMode, tag 0x1401
extern const TagDetails fujiFilmMode[] = {
- { 0, N_("F0/Standard") },
- { 256, N_("F1/Studio portrait") },
- { 512, N_("F2/Fujichrome") },
- { 768, N_("F3/Studio portrait Ex") },
- { 1024, N_("F4/Velvia") }
+ { 0, N_("F0/Standard (Provia)") },
+ { 256, N_("F1/Studio Portrait") },
+ { 272, N_("F1a/Studio Portrait Enhanced Saturation") },
+ { 288, N_("F1b/Studio Portrait Smooth Skin Tone (Astia)") },
+ { 304, N_("F1c/Studio Portrait Increased Sharpness") },
+ { 512, N_("F2/Fujichrome (Velvia)") },
+ { 768, N_("F3/Studio Portrait Ex") },
+ { 1024, N_("F4/Velvia") },
+ { 1280, N_("Pro Neg. Std") },
+ { 1281, N_("Pro Neg. Hi") },
+ { 1536, N_("Classic Chrome") },
};
//! DynamicRange, tag 0x1402
diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index d3053af..574cd38 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -539,6 +539,15 @@ source ./functions.source
copyTestFile $filename
runTest exiv2 -pa --grep lens/i $filename
+ num=1179
+ printf "$num " >&3
+ for X in a b c d e f g h i j; do
+ filename=exiv2-bug$num$X.exv
+ echo '------>' Bug $filename '<-------' >&2
+ copyTestFile $filename
+ runTest exiv2 -pa --grep fuji/i $filename
+ done
+
) 3>&1 > $results 2>&1
printf "
"
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 50697d1..a5050c8 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/exiv2-bug1179a.exv b/test/data/exiv2-bug1179a.exv
new file mode 100644
index 0000000..73144a6
Binary files /dev/null and b/test/data/exiv2-bug1179a.exv differ
diff --git a/test/data/exiv2-bug1179b.exv b/test/data/exiv2-bug1179b.exv
new file mode 100644
index 0000000..e222e3f
Binary files /dev/null and b/test/data/exiv2-bug1179b.exv differ
diff --git a/test/data/exiv2-bug1179c.exv b/test/data/exiv2-bug1179c.exv
new file mode 100644
index 0000000..71d9fbb
Binary files /dev/null and b/test/data/exiv2-bug1179c.exv differ
diff --git a/test/data/exiv2-bug1179d.exv b/test/data/exiv2-bug1179d.exv
new file mode 100644
index 0000000..abf2116
Binary files /dev/null and b/test/data/exiv2-bug1179d.exv differ
diff --git a/test/data/exiv2-bug1179e.exv b/test/data/exiv2-bug1179e.exv
new file mode 100644
index 0000000..16590e3
Binary files /dev/null and b/test/data/exiv2-bug1179e.exv differ
diff --git a/test/data/exiv2-bug1179f.exv b/test/data/exiv2-bug1179f.exv
new file mode 100644
index 0000000..40c587b
Binary files /dev/null and b/test/data/exiv2-bug1179f.exv differ
diff --git a/test/data/exiv2-bug1179g.exv b/test/data/exiv2-bug1179g.exv
new file mode 100644
index 0000000..46ec7ef
Binary files /dev/null and b/test/data/exiv2-bug1179g.exv differ
diff --git a/test/data/exiv2-bug1179h.exv b/test/data/exiv2-bug1179h.exv
new file mode 100644
index 0000000..4b7ac59
Binary files /dev/null and b/test/data/exiv2-bug1179h.exv differ
diff --git a/test/data/exiv2-bug1179i.exv b/test/data/exiv2-bug1179i.exv
new file mode 100644
index 0000000..01c1c8b
Binary files /dev/null and b/test/data/exiv2-bug1179i.exv differ
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list