[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:52 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=f82a203
The following commit has been merged in the master branch:
commit f82a203410471216e7623d81e6b228e45c4dc5f4
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sat Aug 14 03:06:21 2010 +0000
#719: Removed Minolta makernote class and pretty-print functions from the published interface.
---
src/CMakeLists.txt | 2 +-
src/minoltamn.cpp | 5 ++--
src/{minoltamn.hpp => minoltamn_int.hpp} | 43 ++++++++++++++++----------------
src/sonymn.cpp | 2 +-
src/tags.cpp | 2 +-
5 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bc37b5e..81604a8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,6 +32,7 @@
SET( LIBEXIV2_PRIVATE_HDR cr2image_int.hpp
crwimage_int.hpp
makernote_int.hpp
+ minoltamn_int.hpp
nikonmn_int.hpp
orfimage_int.hpp
panasonicmn_int.hpp
@@ -67,7 +68,6 @@ SET( LIBEXIV2_HDR basicio.hpp
jp2image.hpp
jpgimage.hpp
metadatum.hpp
- minoltamn.hpp
mrwimage.hpp
olympusmn.hpp
orfimage.hpp
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 667b556..753dc1e 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -33,7 +33,7 @@ EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
-#include "minoltamn.hpp"
+#include "minoltamn_int.hpp"
#include "value.hpp"
#include "i18n.h" // NLS support.
@@ -46,6 +46,7 @@ EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// class member definitions
namespace Exiv2 {
+ namespace Internal {
// -- Standard Minolta Makernotes tags ---------------------------------------------------------------
@@ -2125,4 +2126,4 @@ namespace Exiv2 {
return os << std::fixed << std::setprecision(2) << value.toFloat(0) << " EV";
}
-} // namespace Exiv2
+}} // namespace Internal, Exiv2
diff --git a/src/minoltamn.hpp b/src/minoltamn_int.hpp
similarity index 81%
rename from src/minoltamn.hpp
rename to src/minoltamn_int.hpp
index 683835e..8df1c05 100644
--- a/src/minoltamn.hpp
+++ b/src/minoltamn_int.hpp
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
*/
/*!
- @file minoltamn.hpp
+ @file minoltamn_int.hpp
@brief Minolta MakerNote implemented using the following references:<br>
<a href="http://www.dalibor.cz/minolta/makernote.htm">Minolta Makernote Format Specification</a> by Dalibor Jelinek,<br>
<a href="http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Minolta.html">Minolta Makernote list</a> by Phil Harvey<br>
@@ -33,8 +33,8 @@
<a href="mailto:caulier dot gilles at gmail dot com">caulier dot gilles at gmail dot com</a>
@date 06-May-06, gc: submitted
*/
-#ifndef MINOLTAMN_HPP_
-#define MINOLTAMN_HPP_
+#ifndef MINOLTAMN_INT_HPP_
+#define MINOLTAMN_INT_HPP_
// *****************************************************************************
// included header files
@@ -47,12 +47,13 @@
// *****************************************************************************
// namespace extensions
namespace Exiv2 {
+ namespace Internal {
// *****************************************************************************
// class definitions
//! MakerNote for Minolta cameras
- class EXIV2API MinoltaMakerNote {
+ class MinoltaMakerNote {
public:
//! Return read-only list of built-in Minolta tags
static const TagInfo* tagList();
@@ -107,52 +108,52 @@ namespace Exiv2 {
// -- Minolta and Sony MakerNote Common Values ---------------------------------------
//! Print Minolta/Sony Lens id values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyLensID(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonyLensID(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony Color Mode values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyColorMode(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonyColorMode(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony bool function values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyBoolValue(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonyBoolValue(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony bool inverse function values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyBoolInverseValue(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonyBoolInverseValue(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony AF Area Mode values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyAFAreaMode(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonyAFAreaMode(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony Local AF Area Point values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyLocalAFAreaPoint(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonyLocalAFAreaPoint(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony dynamic range optimizer mode values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyDynamicRangeOptimizerMode(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonyDynamicRangeOptimizerMode(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony priority setup shutter release values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyPrioritySetupShutterRelease(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonyPrioritySetupShutterRelease(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony Quality values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyQualityCs(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonyQualityCs(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony Rotation values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyRotation(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonyRotation(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony Scene Mode values to readable labels.
- EXIV2API std::ostream& printMinoltaSonySceneMode(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonySceneMode(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony Image Quality values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyImageQuality(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonyImageQuality(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony Teleconverter Model values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyTeleconverterModel(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonyTeleconverterModel(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony White Balance Std values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyWhiteBalanceStd(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonyWhiteBalanceStd(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony ZoneMatching values to readable labels.
- EXIV2API std::ostream& printMinoltaSonyZoneMatching(std::ostream&, const Value&, const ExifData*);
+ std::ostream& printMinoltaSonyZoneMatching(std::ostream&, const Value&, const ExifData*);
// TODO: Added shared methods here.
-} // namespace Exiv2
+}} // namespace Internal, Exiv2
-#endif // #ifndef MINOLTAMN_HPP_
+#endif // #ifndef MINOLTAMN_INT_HPP_
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index de71509..3a591f2 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -31,7 +31,7 @@ EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
#include "types.hpp"
-#include "minoltamn.hpp"
+#include "minoltamn_int.hpp"
#include "sonymn_int.hpp"
#include "value.hpp"
#include "i18n.h" // NLS support.
diff --git a/src/tags.cpp b/src/tags.cpp
index 46ca2bd..362a4a2 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -39,7 +39,7 @@ EXIV2_RCSID("@(#) $Id$")
#include "value.hpp"
#include "canonmn.hpp"
#include "fujimn.hpp"
-#include "minoltamn.hpp"
+#include "minoltamn_int.hpp"
#include "nikonmn_int.hpp"
#include "olympusmn.hpp"
#include "panasonicmn_int.hpp"
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list