Minor tweaks

This commit is contained in:
Andreas Huggel
2006-04-26 04:34:41 +00:00
parent 4e7f2ee7d9
commit e7db4baab6
8 changed files with 7 additions and 33 deletions
-4
View File
@@ -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
-4
View File
@@ -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
-4
View File
@@ -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
+4 -6
View File
@@ -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<const byte*>(signature_), size_, invalidByteOrder);
read(signature_, size_, invalidByteOrder);
}
bool OlympusMnHeader::read(const byte* pData,
+3 -3
View File
@@ -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
-4
View File
@@ -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
-4
View File
@@ -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
-4
View File
@@ -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