[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:39:18 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=7e4cecf
The following commit has been merged in the master branch:
commit 7e4cecf11b814f05e1e6e3f94b43f42a1d76fb75
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Wed Apr 16 15:40:36 2008 +0000
Added warning flag, fixed detected problems.
---
config/config.mk.in | 2 +-
src/crwimage.hpp | 1 +
src/value.hpp | 5 +++++
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/config/config.mk.in b/config/config.mk.in
index d615617..c51cc39 100644
--- a/config/config.mk.in
+++ b/config/config.mk.in
@@ -58,7 +58,7 @@ GXX = @GXX@
# Common compiler flags (warnings, symbols [-ggdb], optimization [-O2], etc)
CXXFLAGS = @CXXFLAGS@
ifeq ($(GXX),yes)
- CXXFLAGS += -Wall -Wcast-align -Wpointer-arith -Wformat-security -Wmissing-format-attribute -W
+ CXXFLAGS += -Wall -Wcast-align -Wpointer-arith -Wformat-security -Wmissing-format-attribute -Woverloaded-virtual -W
endif
# Command to run only the preprocessor
diff --git a/src/crwimage.hpp b/src/crwimage.hpp
index 356a3f3..c10203f 100644
--- a/src/crwimage.hpp
+++ b/src/crwimage.hpp
@@ -416,6 +416,7 @@ namespace Exiv2 {
private:
//! @name Manipulators
//@{
+ using CiffComponent::doAdd;
// See base class comment
virtual void doAdd(AutoPtr component);
/*!
diff --git a/src/value.hpp b/src/value.hpp
index c9435f0..e95ca14 100644
--- a/src/value.hpp
+++ b/src/value.hpp
@@ -485,6 +485,7 @@ namespace Exiv2 {
//! @name Manipulators
//@{
+ using StringValueBase::read;
/*!
@brief Set the value to that of the string buf. Overrides base class
to append a terminating '\0' character if buf doesn't end
@@ -572,6 +573,7 @@ namespace Exiv2 {
//! @name Manipulators
//@{
+ using StringValueBase::read;
/*!
@brief Read the value from a comment
@@ -716,6 +718,7 @@ namespace Exiv2 {
//! @name Manipulators
//@{
+ using XmpValue::read;
/*!
@brief Read a simple property value from \em buf to set the value.
@@ -795,6 +798,7 @@ namespace Exiv2 {
//! @name Manipulators
//@{
+ using XmpValue::read;
/*!
@brief Read a simple property value from \em buf and append it
to the value.
@@ -863,6 +867,7 @@ namespace Exiv2 {
//! @name Manipulators
//@{
+ using XmpValue::read;
/*!
@brief Read a simple property value from \em buf and append it
to the value.
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list