[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:37:45 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=9daaaa3
The following commit has been merged in the master branch:
commit 9daaaa3f6d8c92f71aea3a80717286e813eb9c04
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Wed Jun 21 09:16:36 2006 +0000
Fixed compiler warnings
---
src/actions.cpp | 2 +-
src/actions.hpp | 2 +-
src/basicio.cpp | 2 +-
src/canonmn.cpp | 12 ++++++------
src/crwimage.cpp | 12 ++++++------
src/dataarea-test.cpp | 2 +-
src/datasets.cpp | 4 ++--
src/error.cpp | 2 +-
src/exif.cpp | 2 +-
src/exiv2.cpp | 2 +-
src/fujimn.cpp | 14 +++++++-------
src/futils.cpp | 2 +-
src/ifd.cpp | 2 +-
src/image.cpp | 2 +-
src/imgreg.cpp | 2 +-
src/iptc.cpp | 2 +-
src/jpgimage.cpp | 2 +-
src/makernote.cpp | 8 ++++----
src/makernote2.cpp | 6 +++---
src/makernote2.hpp | 8 +++-----
src/metacopy.cpp | 2 +-
src/metadatum.cpp | 2 +-
src/minoltamn.cpp | 12 +++++++++---
src/mrwimage.cpp | 4 ++--
src/nikonmn.cpp | 18 +++++++++---------
src/olympusmn.cpp | 16 ++++++++--------
src/panasonicmn.cpp | 16 ++++++++--------
src/pngchunk.cpp | 2 +-
src/pngimage.cpp | 4 ++--
src/sigmamn.cpp | 16 ++++++++--------
src/sonymn.cpp | 16 ++++++++--------
src/taglist.cpp | 2 +-
src/tags.cpp | 4 ++--
src/tiffcomposite.cpp | 2 +-
src/tiffcomposite.hpp | 4 ++--
src/tiffimage.cpp | 2 +-
src/tiffparser.cpp | 2 +-
src/tiffvisitor.cpp | 14 +++++++-------
src/tiffvisitor.hpp | 6 +++---
src/types.cpp | 2 +-
src/utils.cpp | 2 +-
src/value.cpp | 14 +++++++-------
42 files changed, 128 insertions(+), 124 deletions(-)
diff --git a/src/actions.cpp b/src/actions.cpp
index 3e5ebae..3a587f6 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -27,7 +27,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/actions.hpp b/src/actions.hpp
index 4f3272b..3b295ec 100644
--- a/src/actions.hpp
+++ b/src/actions.hpp
@@ -312,7 +312,7 @@ namespace Action {
private:
virtual Modify* clone_() const;
//! Copy contructor needed because of AutoPtr member
- Modify(const Modify& /*src*/) {}
+ Modify(const Modify& /*src*/) : Task() {}
//! Add a metadatum according to \em modifyCmd
void addMetadatum(const ModifyCmd& modifyCmd);
diff --git a/src/basicio.cpp b/src/basicio.cpp
index b18d483..045a194 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index e7a5c1f..88cc6eb 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -30,7 +30,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
@@ -915,11 +915,11 @@ namespace Exiv2 {
// *****************************************************************************
// free functions
- MakerNote::AutoPtr createCanonMakerNote(bool alloc,
- const byte* buf,
- long len,
- ByteOrder byteOrder,
- long offset)
+ MakerNote::AutoPtr createCanonMakerNote( bool alloc,
+ const byte* /*buf*/,
+ long /*len*/,
+ ByteOrder /*byteOrder*/,
+ long /*offset*/)
{
return MakerNote::AutoPtr(new CanonMakerNote(alloc));
}
diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index 787ad75..c30ca73 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -27,7 +27,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// Define DEBUG to output debug information to std::cerr, e.g, by calling make
// like this: make DEFS=-DDEBUG crwimage.o
@@ -343,7 +343,7 @@ namespace Exiv2 {
doAdd(component);
}
- void CiffEntry::doAdd(AutoPtr component)
+ void CiffEntry::doAdd(AutoPtr /*component*/)
{
throw Error(34, "CiffEntry::add");
} // CiffEntry::doAdd
@@ -787,7 +787,7 @@ namespace Exiv2 {
return doAdd(crwDirs, crwTagId);
} // CiffComponent::add
- CiffComponent* CiffComponent::doAdd(CrwDirs& crwDirs, uint16_t crwTagId)
+ CiffComponent* CiffComponent::doAdd(CrwDirs& /*crwDirs*/, uint16_t /*crwTagId*/)
{
return 0;
} // CiffComponent::doAdd
@@ -865,7 +865,7 @@ namespace Exiv2 {
return doRemove(crwDirs, crwTagId);
} // CiffComponent::remove
- void CiffComponent::doRemove(CrwDirs& crwDirs, uint16_t crwTagId)
+ void CiffComponent::doRemove(CrwDirs& /*crwDirs*/, uint16_t /*crwTagId*/)
{
// do nothing
} // CiffComponent::doRemove
@@ -949,7 +949,7 @@ namespace Exiv2 {
} // CrwMap::decode0x0805
void CrwMap::decode0x080a(const CiffComponent& ciffComponent,
- const CrwMapping* pCrwMapping,
+ const CrwMapping* /*pCrwMapping*/,
Image& image,
ByteOrder byteOrder)
{
@@ -1412,7 +1412,7 @@ namespace {
{ 8, 90 },
{ 8, -270 },
// last entry
- { 0, 0 },
+ { 0, 0 }
};
uint16_t RotationMap::orientation(int32_t degrees)
diff --git a/src/dataarea-test.cpp b/src/dataarea-test.cpp
index 407f3cc..eab898d 100644
--- a/src/dataarea-test.cpp
+++ b/src/dataarea-test.cpp
@@ -26,7 +26,7 @@ using namespace Exiv2;
// *****************************************************************************
// Main
-int main(int argc, char* const argv[])
+int main(int /*argc*/, char* const /*argv*/[])
{
try {
byte da1[]
diff --git a/src/datasets.cpp b/src/datasets.cpp
index 1b5ef03..5528e10 100644
--- a/src/datasets.cpp
+++ b/src/datasets.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
@@ -315,7 +315,7 @@ namespace Exiv2 {
}
IptcKey::IptcKey(const IptcKey& rhs)
- : tag_(rhs.tag_), record_(rhs.record_), key_(rhs.key_)
+ : Key(), tag_(rhs.tag_), record_(rhs.record_), key_(rhs.key_)
{
}
diff --git a/src/error.cpp b/src/error.cpp
index 5fcdacb..57e7ae7 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/exif.cpp b/src/exif.cpp
index 7729faf..2f788d0 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -27,7 +27,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// Define DEBUG_MAKERNOTE to output debug information to std::cerr, e.g, by
// calling make like this: make DEFS=-DDEBUG_MAKERNOTE exif.o
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index 8b178b5..7152b47 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -28,7 +28,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/fujimn.cpp b/src/fujimn.cpp
index 72fbd3a..9123dd8 100644
--- a/src/fujimn.cpp
+++ b/src/fujimn.cpp
@@ -31,7 +31,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
@@ -105,7 +105,7 @@ namespace Exiv2 {
int FujiMakerNote::readHeader(const byte* buf,
long len,
- ByteOrder byteOrder)
+ ByteOrder /*byteOrder*/)
{
if (len < 12) return 1;
@@ -263,11 +263,11 @@ namespace Exiv2 {
// *****************************************************************************
// free functions
- MakerNote::AutoPtr createFujiMakerNote(bool alloc,
- const byte* buf,
- long len,
- ByteOrder byteOrder,
- long offset)
+ MakerNote::AutoPtr createFujiMakerNote(bool alloc,
+ const byte* /*buf*/,
+ long /*len*/,
+ ByteOrder /*byteOrder*/,
+ long /*offset*/)
{
return MakerNote::AutoPtr(new FujiMakerNote(alloc));
}
diff --git a/src/futils.cpp b/src/futils.cpp
index d19c913..4aacffd 100644
--- a/src/futils.cpp
+++ b/src/futils.cpp
@@ -27,7 +27,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/ifd.cpp b/src/ifd.cpp
index 1f4001f..91671fb 100644
--- a/src/ifd.cpp
+++ b/src/ifd.cpp
@@ -27,7 +27,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/image.cpp b/src/image.cpp
index 995d3e7..1364f4b 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -30,7 +30,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/imgreg.cpp b/src/imgreg.cpp
index dd8c4c7..e675f1c 100644
--- a/src/imgreg.cpp
+++ b/src/imgreg.cpp
@@ -27,7 +27,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/iptc.cpp b/src/iptc.cpp
index c03c813..cb6201f 100644
--- a/src/iptc.cpp
+++ b/src/iptc.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index 6e3b811..17e7ce6 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -28,7 +28,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/makernote.cpp b/src/makernote.cpp
index 107b77f..895af0c 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// Define DEBUG_* to output debug information to std::cerr, e.g, by calling
// make like this: make DEFS=-DDEBUG_MAKERNOTE makernote.o
@@ -132,9 +132,9 @@ namespace Exiv2 {
return len;
} // IfdMakerNote::copy
- int IfdMakerNote::readHeader(const byte* buf,
- long len,
- ByteOrder byteOrder)
+ int IfdMakerNote::readHeader(const byte* /*buf*/,
+ long /*len*/,
+ ByteOrder /*byteOrder*/)
{
// Default implementation does nothing, assuming there is no header
return 0;
diff --git a/src/makernote2.cpp b/src/makernote2.cpp
index e5c468e..f5ea3cf 100644
--- a/src/makernote2.cpp
+++ b/src/makernote2.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
@@ -372,7 +372,7 @@ namespace Exiv2 {
TiffComponent* newNikonMn(uint16_t tag,
uint16_t group,
- uint16_t mnGroup,
+ uint16_t /*mnGroup*/,
const byte* pData,
uint32_t size,
ByteOrder /*byteOrder*/)
@@ -416,7 +416,7 @@ namespace Exiv2 {
TiffComponent* newSonyMn(uint16_t tag,
uint16_t group,
- uint16_t mnGroup,
+ uint16_t /*mnGroup*/,
const byte* pData,
uint32_t size,
ByteOrder /*byteOrder*/)
diff --git a/src/makernote2.hpp b/src/makernote2.hpp
index 0c03a0e..051b307 100644
--- a/src/makernote2.hpp
+++ b/src/makernote2.hpp
@@ -160,12 +160,10 @@ namespace Exiv2 {
virtual ByteOrder byteOrder() const { return invalidByteOrder; }
/*!
@brief Return the base offset for the makernote IFD entries relative
- to the start of the TIFF header.
-
- @param mnOffset Offset to the makernote from the start of the
- TIFF header.
+ to the start of the TIFF header. \em mnOffset is the offset
+ to the makernote from the start of the TIFF header.
*/
- virtual uint32_t baseOffset(uint32_t mnOffset) const { return 0; }
+ virtual uint32_t baseOffset(uint32_t /*mnOffset*/) const { return 0; }
//@}
}; // class MnHeader
diff --git a/src/metacopy.cpp b/src/metacopy.cpp
index 65490d8..f8dd4d8 100644
--- a/src/metacopy.cpp
+++ b/src/metacopy.cpp
@@ -92,7 +92,7 @@ catch (Exiv2::AnyError& e) {
}
}
-int Params::option(int opt, const std::string& optarg, int optopt)
+int Params::option(int opt, const std::string& /*optarg*/, int optopt)
{
int rc = 0;
switch (opt) {
diff --git a/src/metadatum.cpp b/src/metadatum.cpp
index 7253dd5..223a409 100644
--- a/src/metadatum.cpp
+++ b/src/metadatum.cpp
@@ -28,7 +28,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index b14b5e5..04bc89b 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -29,7 +29,7 @@
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
@@ -1078,7 +1078,10 @@ namespace Exiv2 {
return headerSize() + ifd.size() + ifd.dataSize();
} // MinoltaMakerNote::size
- long MinoltaMakerNote::assemble(Entry& e, IfdId ifdId, uint16_t tag, ByteOrder byteOrder) const
+ long MinoltaMakerNote::assemble(Entry& e,
+ IfdId ifdId,
+ uint16_t tag,
+ ByteOrder /*byteOrder*/) const
{
DataBuf buf(1024);
memset(buf.pData_, 0x0, 1024);
@@ -1103,7 +1106,10 @@ namespace Exiv2 {
return len;
} // MinoltaMakerNote::assemble
- long MinoltaMakerNote::assembleStd(Entry& e, IfdId ifdId, uint32_t tag, ByteOrder byteOrder) const
+ long MinoltaMakerNote::assembleStd(Entry& e,
+ IfdId ifdId,
+ uint32_t tag,
+ ByteOrder /*byteOrder*/) const
{
DataBuf buf(1024);
memset(buf.pData_, 0x0, 1024);
diff --git a/src/mrwimage.cpp b/src/mrwimage.cpp
index fdd2a7a..e60fb11 100644
--- a/src/mrwimage.cpp
+++ b/src/mrwimage.cpp
@@ -27,7 +27,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
@@ -105,7 +105,7 @@ namespace Exiv2 {
// not supported
}
- void MrwImage::setComment(const std::string& comment)
+ void MrwImage::setComment(const std::string& /*comment*/)
{
// not supported
}
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index a6ab352..2afa9bf 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -30,7 +30,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
@@ -271,8 +271,8 @@ namespace Exiv2 {
}
int Nikon2MakerNote::readHeader(const byte* buf,
- long len,
- ByteOrder byteOrder)
+ long len,
+ ByteOrder /*byteOrder*/)
{
if (len < 8) return 1;
@@ -505,8 +505,8 @@ namespace Exiv2 {
}
int Nikon3MakerNote::readHeader(const byte* buf,
- long len,
- ByteOrder byteOrder)
+ long len,
+ ByteOrder /*byteOrder*/)
{
if (len < 18) return 1;
@@ -996,11 +996,11 @@ namespace Exiv2 {
// *****************************************************************************
// free functions
- MakerNote::AutoPtr createNikonMakerNote(bool alloc,
+ MakerNote::AutoPtr createNikonMakerNote(bool alloc,
const byte* buf,
- long len,
- ByteOrder byteOrder,
- long offset)
+ long len,
+ ByteOrder /*byteOrder*/,
+ long /*offset*/)
{
// If there is no "Nikon" string it must be Nikon1 format
if (len < 6 || std::string(reinterpret_cast<const char*>(buf), 6)
diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index 0a99978..d15c549 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -29,7 +29,7 @@
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
@@ -179,8 +179,8 @@ namespace Exiv2 {
}
int OlympusMakerNote::readHeader(const byte* buf,
- long len,
- ByteOrder byteOrder)
+ long len,
+ ByteOrder /*byteOrder*/)
{
if (len < 8) return 1;
@@ -274,11 +274,11 @@ namespace Exiv2 {
// *****************************************************************************
// free functions
- MakerNote::AutoPtr createOlympusMakerNote(bool alloc,
- const byte* buf,
- long len,
- ByteOrder byteOrder,
- long offset)
+ MakerNote::AutoPtr createOlympusMakerNote(bool alloc,
+ const byte* /*buf*/,
+ long /*len*/,
+ ByteOrder /*byteOrder*/,
+ long /*offset*/)
{
return MakerNote::AutoPtr(new OlympusMakerNote(alloc));
}
diff --git a/src/panasonicmn.cpp b/src/panasonicmn.cpp
index d3bea19..ad41c29 100644
--- a/src/panasonicmn.cpp
+++ b/src/panasonicmn.cpp
@@ -27,7 +27,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
@@ -196,8 +196,8 @@ namespace Exiv2 {
}
int PanasonicMakerNote::readHeader(const byte* buf,
- long len,
- ByteOrder byteOrder)
+ long len,
+ ByteOrder /*byteOrder*/)
{
if (len < 12) return 1;
@@ -272,11 +272,11 @@ namespace Exiv2 {
// *****************************************************************************
// free functions
- MakerNote::AutoPtr createPanasonicMakerNote(bool alloc,
- const byte* buf,
- long len,
- ByteOrder byteOrder,
- long offset)
+ MakerNote::AutoPtr createPanasonicMakerNote(bool alloc,
+ const byte* /*buf*/,
+ long /*len*/,
+ ByteOrder /*byteOrder*/,
+ long /*offset*/)
{
return MakerNote::AutoPtr(new PanasonicMakerNote(alloc));
}
diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp
index 66cd6b0..24b95e5 100644
--- a/src/pngchunk.cpp
+++ b/src/pngchunk.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: pngchunk.cpp 823 2006-06-23 07:35:00Z cgilles $");
+EXIV2_RCSID("@(#) $Id: pngchunk.cpp 823 2006-06-23 07:35:00Z cgilles $")
// *****************************************************************************
// included header files
diff --git a/src/pngimage.cpp b/src/pngimage.cpp
index 50dc179..5174c98 100644
--- a/src/pngimage.cpp
+++ b/src/pngimage.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: pngimage.cpp 823 2006-06-12 07:35:00Z cgilles $");
+EXIV2_RCSID("@(#) $Id: pngimage.cpp 823 2006-06-12 07:35:00Z cgilles $")
// *****************************************************************************
@@ -110,7 +110,7 @@ namespace Exiv2 {
// TODO : Add 'iTXt' chunk 'Description' tag support here
}
- void PngImage::setComment(const std::string& comment)
+ void PngImage::setComment(const std::string& /*comment*/)
{
// not yet supported
// TODO : Add 'iTXt' chunk 'Description' tag support here
diff --git a/src/sigmamn.cpp b/src/sigmamn.cpp
index 2304082..8016986 100644
--- a/src/sigmamn.cpp
+++ b/src/sigmamn.cpp
@@ -29,7 +29,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
@@ -104,8 +104,8 @@ namespace Exiv2 {
}
int SigmaMakerNote::readHeader(const byte* buf,
- long len,
- ByteOrder byteOrder)
+ long len,
+ ByteOrder /*byteOrder*/)
{
if (len < 10) return 1;
@@ -196,11 +196,11 @@ namespace Exiv2 {
// *****************************************************************************
// free functions
- MakerNote::AutoPtr createSigmaMakerNote(bool alloc,
- const byte* buf,
- long len,
- ByteOrder byteOrder,
- long offset)
+ MakerNote::AutoPtr createSigmaMakerNote(bool alloc,
+ const byte* /*buf*/,
+ long /*len*/,
+ ByteOrder /*byteOrder*/,
+ long /*offset*/)
{
return MakerNote::AutoPtr(new SigmaMakerNote(alloc));
}
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index ca0f15a..2d006fd 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
@@ -86,8 +86,8 @@ namespace Exiv2 {
}
int SonyMakerNote::readHeader(const byte* buf,
- long len,
- ByteOrder byteOrder)
+ long len,
+ ByteOrder /*byteOrder*/)
{
if (len < 12) return 1;
header_.alloc(12);
@@ -135,11 +135,11 @@ namespace Exiv2 {
// *****************************************************************************
// free functions
- MakerNote::AutoPtr createSonyMakerNote(bool alloc,
- const byte* buf,
- long len,
- ByteOrder byteOrder,
- long offset)
+ MakerNote::AutoPtr createSonyMakerNote(bool alloc,
+ const byte* /*buf*/,
+ long /*len*/,
+ ByteOrder /*byteOrder*/,
+ long /*offset*/)
{
return MakerNote::AutoPtr(new SonyMakerNote(alloc));
}
diff --git a/src/taglist.cpp b/src/taglist.cpp
index 5244b34..0eab2da 100644
--- a/src/taglist.cpp
+++ b/src/taglist.cpp
@@ -9,7 +9,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
#include "makernote.hpp"
#include "tags.hpp"
diff --git a/src/tags.cpp b/src/tags.cpp
index 8f1076f..c254528 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -27,7 +27,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
@@ -852,7 +852,7 @@ namespace Exiv2 {
}
ExifKey::ExifKey(const ExifKey& rhs)
- : tag_(rhs.tag_), ifdId_(rhs.ifdId_), ifdItem_(rhs.ifdItem_),
+ : Key(), tag_(rhs.tag_), ifdId_(rhs.ifdId_), ifdItem_(rhs.ifdItem_),
idx_(rhs.idx_), key_(rhs.key_)
{
}
diff --git a/src/tiffcomposite.cpp b/src/tiffcomposite.cpp
index 5d78e6f..e9d1898 100644
--- a/src/tiffcomposite.cpp
+++ b/src/tiffcomposite.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/tiffcomposite.hpp b/src/tiffcomposite.hpp
index 0dd6788..8d3a001 100644
--- a/src/tiffcomposite.hpp
+++ b/src/tiffcomposite.hpp
@@ -152,10 +152,10 @@ namespace Exiv2 {
//! @name Manipulators
//@{
//! Implements addChild(). The default implementation does nothing.
- virtual void doAddChild(AutoPtr tiffComponent) {}
+ virtual void doAddChild(AutoPtr /*tiffComponent*/) {}
//! Implements addNext(). The default implementation does nothing.
- virtual void doAddNext(AutoPtr tiffComponent) {}
+ virtual void doAddNext(AutoPtr /*tiffComponent*/) {}
//! Implements accept()
virtual void doAccept(TiffVisitor& visitor) =0;
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 96c3835..2ba5156 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -27,7 +27,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/tiffparser.cpp b/src/tiffparser.cpp
index e2c3255..629b43f 100644
--- a/src/tiffparser.cpp
+++ b/src/tiffparser.cpp
@@ -27,7 +27,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp
index 643a581..0195cca 100644
--- a/src/tiffvisitor.cpp
+++ b/src/tiffvisitor.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
@@ -162,7 +162,7 @@ namespace Exiv2 {
decodeTiffEntry(object);
}
- void TiffMetadataDecoder::visitDirectory(TiffDirectory* object)
+ void TiffMetadataDecoder::visitDirectory(TiffDirectory* /*object*/)
{
// Nothing to do
}
@@ -177,7 +177,7 @@ namespace Exiv2 {
if (!object->mn_) decodeTiffEntry(object);
}
- void TiffMetadataDecoder::visitIfdMakernote(TiffIfdMakernote* object)
+ void TiffMetadataDecoder::visitIfdMakernote(TiffIfdMakernote* /*object*/)
{
// Nothing to do
}
@@ -293,7 +293,7 @@ namespace Exiv2 {
} // TiffMetadataDecoder::addExifTag
- void TiffMetadataDecoder::visitArrayEntry(TiffArrayEntry* object)
+ void TiffMetadataDecoder::visitArrayEntry(TiffArrayEntry* /*object*/)
{
// Nothing to do
}
@@ -359,7 +359,7 @@ namespace Exiv2 {
}
} // TiffPrinter::visitDirectoryNext
- void TiffPrinter::visitDirectoryEnd(TiffDirectory* object)
+ void TiffPrinter::visitDirectoryEnd(TiffDirectory* /*object*/)
{
// Nothing to do
} // TiffPrinter::visitDirectoryEnd
@@ -376,7 +376,7 @@ namespace Exiv2 {
else os_ << prefix() << "Makernote ";
} // TiffPrinter::visitMnEntry
- void TiffPrinter::visitIfdMakernote(TiffIfdMakernote* object)
+ void TiffPrinter::visitIfdMakernote(TiffIfdMakernote* /*object*/)
{
// Nothing to do
} // TiffPrinter::visitIfdMakernote
@@ -713,7 +713,7 @@ namespace Exiv2 {
} // TiffReader::visitIfdMakernote
- void TiffReader::visitIfdMakernoteEnd(TiffIfdMakernote* object)
+ void TiffReader::visitIfdMakernoteEnd(TiffIfdMakernote* /*object*/)
{
// Reset state (byte order, create function, offset) back to that
// for the image
diff --git a/src/tiffvisitor.hpp b/src/tiffvisitor.hpp
index 422cb81..d39c07d 100644
--- a/src/tiffvisitor.hpp
+++ b/src/tiffvisitor.hpp
@@ -106,12 +106,12 @@ namespace Exiv2 {
@brief Operation to perform for a TIFF directory, after all components
and before the next entry is processed.
*/
- virtual void visitDirectoryNext(TiffDirectory* object) {}
+ virtual void visitDirectoryNext(TiffDirectory* /*object*/) {}
/*!
@brief Operation to perform for a TIFF directory, at the end of the
processing.
*/
- virtual void visitDirectoryEnd(TiffDirectory* object) {}
+ virtual void visitDirectoryEnd(TiffDirectory* /*object*/) {}
//! Operation to perform for a TIFF sub-IFD
virtual void visitSubIfd(TiffSubIfd* object) =0;
//! Operation to perform for the makernote component
@@ -119,7 +119,7 @@ namespace Exiv2 {
//! Operation to perform for an IFD makernote
virtual void visitIfdMakernote(TiffIfdMakernote* object) =0;
//! Operation to perform after processing an IFD makernote
- virtual void visitIfdMakernoteEnd(TiffIfdMakernote* object) {}
+ virtual void visitIfdMakernoteEnd(TiffIfdMakernote* /*object*/) {}
//! Operation to perform for an array entry (as found in Canon makernotes)
virtual void visitArrayEntry(TiffArrayEntry* object) =0;
//! Operation to perform for an array element
diff --git a/src/types.cpp b/src/types.cpp
index 7bc26b2..4c8802b 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -27,7 +27,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/utils.cpp b/src/utils.cpp
index d6d6bb0..8a369d9 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -26,7 +26,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
diff --git a/src/value.cpp b/src/value.cpp
index 917b4ec..c2df29b 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -28,7 +28,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id$");
+EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
@@ -131,7 +131,7 @@ namespace Exiv2 {
return *this;
}
- int DataValue::read(const byte* buf, long len, ByteOrder byteOrder)
+ int DataValue::read(const byte* buf, long len, ByteOrder /*byteOrder*/)
{
// byteOrder not needed
value_.assign(buf, buf + len);
@@ -149,7 +149,7 @@ namespace Exiv2 {
return 0;
}
- long DataValue::copy(byte* buf, ByteOrder byteOrder) const
+ long DataValue::copy(byte* buf, ByteOrder /*byteOrder*/) const
{
// byteOrder not needed
return static_cast<long>(
@@ -190,14 +190,14 @@ namespace Exiv2 {
return 0;
}
- int StringValueBase::read(const byte* buf, long len, ByteOrder byteOrder)
+ int StringValueBase::read(const byte* buf, long len, ByteOrder /*byteOrder*/)
{
// byteOrder not needed
if (buf) value_ = std::string(reinterpret_cast<const char*>(buf), len);
return 0;
}
- long StringValueBase::copy(byte* buf, ByteOrder byteOrder) const
+ long StringValueBase::copy(byte* buf, ByteOrder /*byteOrder*/) const
{
// byteOrder not needed
assert(buf != 0);
@@ -465,7 +465,7 @@ namespace Exiv2 {
<< std::setw(2) << std::setfill('0') << date_.day;
}
- long DateValue::toLong(long n) const
+ long DateValue::toLong(long /*n*/) const
{
// Range of tm struct is limited to about 1970 to 2038
// This will return -1 if outside that range
@@ -621,7 +621,7 @@ namespace Exiv2 {
<< std::setw(2) << std::setfill('0') << abs(time_.tzMinute);
}
- long TimeValue::toLong(long n) const
+ long TimeValue::toLong(long /*n*/) const
{
// Returns number of seconds in the day in UTC.
long result = (time_.hour - time_.tzHour) * 60 * 60;
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list