From e7db4baab608419d6031b8264dd94bf4298f92f3 Mon Sep 17 00:00:00 2001 From: Andreas Huggel Date: Wed, 26 Apr 2006 04:34:41 +0000 Subject: [PATCH] Minor tweaks --- src/canonmn2.cpp | 4 ---- src/fujimn2.cpp | 4 ---- src/makernote2.cpp | 4 ---- src/olympusmn2.cpp | 10 ++++------ src/olympusmn2.hpp | 6 +++--- src/panasonicmn2.cpp | 4 ---- src/sonymn2.cpp | 4 ---- src/tiffvisitor.cpp | 4 ---- 8 files changed, 7 insertions(+), 33 deletions(-) diff --git a/src/canonmn2.cpp b/src/canonmn2.cpp index 0350b2a7..d1b5acf8 100644 --- a/src/canonmn2.cpp +++ b/src/canonmn2.cpp @@ -28,10 +28,6 @@ #include "rcsid.hpp" EXIV2_RCSID("@(#) $Id$"); -// Define DEBUG to output debug information to std::cerr, e.g, by calling make -// like this: make DEFS=-DDEBUG makernote2.o -//#define DEBUG - // ***************************************************************************** // included header files #ifdef _MSC_VER diff --git a/src/fujimn2.cpp b/src/fujimn2.cpp index 3d299238..0b795bb1 100644 --- a/src/fujimn2.cpp +++ b/src/fujimn2.cpp @@ -28,10 +28,6 @@ #include "rcsid.hpp" EXIV2_RCSID("@(#) $Id$"); -// Define DEBUG to output debug information to std::cerr, e.g, by calling make -// like this: make DEFS=-DDEBUG makernote2.o -//#define DEBUG - // ***************************************************************************** // included header files #ifdef _MSC_VER diff --git a/src/makernote2.cpp b/src/makernote2.cpp index 2eca3bed..9820ec0b 100644 --- a/src/makernote2.cpp +++ b/src/makernote2.cpp @@ -28,10 +28,6 @@ #include "rcsid.hpp" EXIV2_RCSID("@(#) $Id$"); -// Define DEBUG to output debug information to std::cerr, e.g, by calling make -// like this: make DEFS=-DDEBUG makernote2.o -//#define DEBUG - // ***************************************************************************** // included header files #ifdef _MSC_VER diff --git a/src/olympusmn2.cpp b/src/olympusmn2.cpp index 6998e988..ad3178d9 100644 --- a/src/olympusmn2.cpp +++ b/src/olympusmn2.cpp @@ -28,10 +28,6 @@ #include "rcsid.hpp" EXIV2_RCSID("@(#) $Id$"); -// Define DEBUG to output debug information to std::cerr, e.g, by calling make -// like this: make DEFS=-DDEBUG makernote2.o -//#define DEBUG - // ***************************************************************************** // included header files #ifdef _MSC_VER @@ -52,12 +48,14 @@ EXIV2_RCSID("@(#) $Id$"); // class member definitions namespace Exiv2 { - const char* OlympusMnHeader::signature_ = "OLYMP\0\1\0"; + const byte OlympusMnHeader::signature_[] = { + 'O', 'L', 'Y', 'M', 'P', 0x00, 0x01, 0x00 + }; const uint32_t OlympusMnHeader::size_ = 8; OlympusMnHeader::OlympusMnHeader() { - read(reinterpret_cast(signature_), size_, invalidByteOrder); + read(signature_, size_, invalidByteOrder); } bool OlympusMnHeader::read(const byte* pData, diff --git a/src/olympusmn2.hpp b/src/olympusmn2.hpp index d2de7544..68aba42a 100644 --- a/src/olympusmn2.hpp +++ b/src/olympusmn2.hpp @@ -71,9 +71,9 @@ namespace Exiv2 { //@} private: - DataBuf header_; //!< Data buffer for the makernote header - static const char* signature_; //!< Olympus makernote header signature - static const uint32_t size_; //!< Size of the signature + DataBuf header_; //!< Data buffer for the makernote header + static const byte signature_[]; //!< Olympus makernote header signature + static const uint32_t size_; //!< Size of the signature }; // class OlympusMnHeader diff --git a/src/panasonicmn2.cpp b/src/panasonicmn2.cpp index 0514af21..c512b7b9 100644 --- a/src/panasonicmn2.cpp +++ b/src/panasonicmn2.cpp @@ -28,10 +28,6 @@ #include "rcsid.hpp" EXIV2_RCSID("@(#) $Id$"); -// Define DEBUG to output debug information to std::cerr, e.g, by calling make -// like this: make DEFS=-DDEBUG makernote2.o -//#define DEBUG - // ***************************************************************************** // included header files #ifdef _MSC_VER diff --git a/src/sonymn2.cpp b/src/sonymn2.cpp index 4f7f08fa..ecd794cf 100644 --- a/src/sonymn2.cpp +++ b/src/sonymn2.cpp @@ -28,10 +28,6 @@ #include "rcsid.hpp" EXIV2_RCSID("@(#) $Id$"); -// Define DEBUG to output debug information to std::cerr, e.g, by calling make -// like this: make DEFS=-DDEBUG makernote2.o -//#define DEBUG - // ***************************************************************************** // included header files #ifdef _MSC_VER diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp index b79a47e8..d262a561 100644 --- a/src/tiffvisitor.cpp +++ b/src/tiffvisitor.cpp @@ -28,10 +28,6 @@ #include "rcsid.hpp" EXIV2_RCSID("@(#) $Id$"); -// Define DEBUG to output debug information to std::cerr, e.g, by calling make -// like this: make DEFS=-DDEBUG tiffvisitor.o -//#define DEBUG - // ***************************************************************************** // included header files #ifdef _MSC_VER