[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:44:04 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=2840506
The following commit has been merged in the master branch:
commit 284050623bf2dfecd248d491b259a90dc31b5ec5
Author: nkbj <nkbj1970 at hotmail.com>
Date: Sat Dec 7 04:38:20 2013 +0000
Feature request #933: Add support for Casio makernotes. Thanks goes to T Modes for the patch.
---
src/CMakeLists.txt | 2 ++
src/Makefile | 1 +
src/easyaccess.cpp | 40 ++++++++++++++++++++------
src/makernote.cpp | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++
src/makernote_int.hpp | 49 +++++++++++++++++++++++++++++++-
src/preview.cpp | 4 ++-
src/tags.cpp | 3 ++
src/tags_int.hpp | 2 ++
src/tiffimage.cpp | 10 +++++++
9 files changed, 178 insertions(+), 10 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4ad7612..5ad7c83 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,6 +12,7 @@ endif()
# Private headers which are only needed for the library itself
SET( LIBEXIV2_PRIVATE_HDR canonmn_int.hpp
+ casiomn_int.hpp
cr2image_int.hpp
crwimage_int.hpp
fujimn_int.hpp
@@ -81,6 +82,7 @@ SET( LIBEXIV2_SRC asfvideo.cpp
basicio.cpp
bmpimage.cpp
canonmn.cpp
+ casiomn.cpp
convert.cpp
cr2image.cpp
crwedit.cpp
diff --git a/src/Makefile b/src/Makefile
index 80ab58c..bb1ddf9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -69,6 +69,7 @@ CCSRC = asfvideo.cpp \
basicio.cpp \
bmpimage.cpp \
canonmn.cpp \
+ casiomn.cpp \
convert.cpp \
cr2image.cpp \
crwimage.cpp \
diff --git a/src/easyaccess.cpp b/src/easyaccess.cpp
index 2a79804..69d3dc1 100644
--- a/src/easyaccess.cpp
+++ b/src/easyaccess.cpp
@@ -106,7 +106,10 @@ namespace Exiv2 {
"Exif.Pentax.ISO",
"Exif.PentaxDng.ISO",
"Exif.Olympus.ISOSpeed",
- "Exif.Samsung2.ISO"
+ "Exif.Samsung2.ISO",
+ "Exif.Casio.ISO",
+ "Exif.Casio2.ISO",
+ "Exif.Casio2.ISOSpeed"
};
// Find the first ISO value which is not "0"
@@ -220,7 +223,10 @@ namespace Exiv2 {
"Exif.Sony1Cs.Quality",
"Exif.Sony2.JPEGQuality",
"Exif.Sony2.Quality",
- "Exif.Sony2Cs.Quality"
+ "Exif.Sony2Cs.Quality",
+ "Exif.Casio.Quality",
+ "Exif.Casio2.QualityMode",
+ "Exif.Casio2.Quality"
};
return findMetadatum(ed, keys, EXV_COUNTOF(keys));
}
@@ -248,6 +254,9 @@ namespace Exiv2 {
"Exif.Sony2.WhiteBalance",
"Exif.Sony1.WhiteBalance2",
"Exif.Sony2.WhiteBalance2",
+ "Exif.Casio.WhiteBalance",
+ "Exif.Casio2.WhiteBalance",
+ "Exif.Casio2.WhiteBalance2",
"Exif.Photo.WhiteBalance"
};
return findMetadatum(ed, keys, EXV_COUNTOF(keys));
@@ -290,7 +299,10 @@ namespace Exiv2 {
"Exif.Panasonic.Saturation",
"Exif.Pentax.Saturation",
"Exif.PentaxDng.Saturation",
- "Exif.Sigma.Saturation"
+ "Exif.Sigma.Saturation",
+ "Exif.Casio.Saturation",
+ "Exif.Casio2.Saturation",
+ "Exif.Casio2.Saturation2"
};
return findMetadatum(ed, keys, EXV_COUNTOF(keys));
}
@@ -309,7 +321,10 @@ namespace Exiv2 {
"Exif.Panasonic.Sharpness",
"Exif.Pentax.Sharpness",
"Exif.PentaxDng.Sharpness",
- "Exif.Sigma.Sharpness"
+ "Exif.Sigma.Sharpness",
+ "Exif.Casio.Sharpness",
+ "Exif.Casio2.Sharpness",
+ "Exif.Casio2.Sharpness2"
};
return findMetadatum(ed, keys, EXV_COUNTOF(keys));
}
@@ -328,7 +343,11 @@ namespace Exiv2 {
"Exif.Panasonic.Contrast",
"Exif.Pentax.Contrast",
"Exif.PentaxDng.Contrast",
- "Exif.Sigma.Contrast"
+ "Exif.Sigma.Contrast",
+ "Exif.Casio.Contrast",
+ "Exif.Casio2.Contrast",
+ "Exif.Casio2.Contrast2"
+
};
return findMetadatum(ed, keys, EXV_COUNTOF(keys));
}
@@ -401,7 +420,9 @@ namespace Exiv2 {
"Exif.NikonLd2.FocusDistance",
"Exif.NikonLd3.FocusDistance",
"Exif.Olympus.FocusDistance",
- "Exif.OlympusFi.FocusDistance"
+ "Exif.OlympusFi.FocusDistance",
+ "Exif.Casio.ObjectDistance",
+ "Exif.Casio2.ObjectDistance"
};
return findMetadatum(ed, keys, EXV_COUNTOF(keys));
}
@@ -430,7 +451,8 @@ namespace Exiv2 {
"Exif.NikonLd3.FocalLength",
"Exif.MinoltaCsNew.FocalLength",
"Exif.Pentax.FocalLength",
- "Exif.PentaxDng.FocalLength"
+ "Exif.PentaxDng.FocalLength",
+ "Exif.Casio2.FocalLength"
};
return findMetadatum(ed, keys, EXV_COUNTOF(keys));
}
@@ -457,7 +479,9 @@ namespace Exiv2 {
"Exif.Sony2Cs.LocalAFAreaPoint",
"Exif.Sony1Cs2.LocalAFAreaPoint",
"Exif.Sony2Cs2.LocalAFAreaPoint",
- "Exif.Sony1MltCsA100.LocalAFAreaPoint"
+ "Exif.Sony1MltCsA100.LocalAFAreaPoint",
+ "Exif.Casio.AFPoint",
+ "Exif.Casio2.AFPointPosition"
};
return findMetadatum(ed, keys, EXV_COUNTOF(keys));
}
diff --git a/src/makernote.cpp b/src/makernote.cpp
index 97efe36..f6be4f9 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -73,6 +73,7 @@ namespace Exiv2 {
{ "SAMSUNG", samsung2Id, newSamsungMn, newSamsungMn2 },
{ "SIGMA", sigmaId, newSigmaMn, newSigmaMn2 },
{ "SONY", ifdIdNotSet, newSonyMn, 0 }, // mnGroup_ is not used
+ { "CASIO", ifdIdNotSet, newCasioMn, 0 }, // mnGroup_ is not used
// Entries below are only used for lookup by group
{ "-", nikon1Id, 0, newIfdMn2 },
{ "-", nikon2Id, 0, newNikon2Mn2 },
@@ -727,6 +728,59 @@ namespace Exiv2 {
return sizeOfSignature();
} // SonyMnHeader::write
+ const byte Casio2MnHeader::signature_[] = {
+ 'Q', 'V', 'C', '
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list