TIFF parser checkpoint (experimental): Added Canon makernote. Uses a Canon TIFF component factory when the makernote is parsed. Added TiffArrayEntry and TiffArrayElement components.
Andreas Huggel
19 years ago
parent
0fa2d525fc
commit
73c42ee8f6
@ -0,0 +1,103 @@
|
|||||||
|
// ***************************************************************** -*- C++ -*-
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2006 Andreas Huggel <ahuggel@gmx.net>
|
||||||
|
*
|
||||||
|
* This program is part of the Exiv2 distribution.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 2
|
||||||
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
File: canonmn2.cpp
|
||||||
|
Version: $Rev$
|
||||||
|
Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
|
||||||
|
History: 18-Apr-06, ahu: created
|
||||||
|
*/
|
||||||
|
// *****************************************************************************
|
||||||
|
#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
|
||||||
|
# include "exv_msvc.h"
|
||||||
|
#else
|
||||||
|
# include "exv_conf.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "canonmn2.hpp"
|
||||||
|
#include "tiffcomposite.hpp"
|
||||||
|
#include "types.hpp"
|
||||||
|
|
||||||
|
// + standard includes
|
||||||
|
|
||||||
|
// *****************************************************************************
|
||||||
|
// class member definitions
|
||||||
|
namespace Exiv2 {
|
||||||
|
|
||||||
|
const TiffStructure TiffCanonCreator::tiffStructure_[] = {
|
||||||
|
// ext. tag group create function new group
|
||||||
|
//--------- -------------- ------------------- --------------
|
||||||
|
{ 0x0001, Group::canonmn, newTiffArrayEntry, Group::canoncs },
|
||||||
|
{ 0x0004, Group::canonmn, newTiffArrayEntry, Group::canonsi },
|
||||||
|
{ 0x000f, Group::canonmn, newTiffArrayEntry, Group::canoncf },
|
||||||
|
{ Tag::all, Group::canoncs, newTiffArrayElement, Group::canoncs },
|
||||||
|
{ Tag::all, Group::canonsi, newTiffArrayElement, Group::canonsi },
|
||||||
|
{ Tag::all, Group::canoncf, newTiffArrayElement, Group::canoncf }
|
||||||
|
};
|
||||||
|
|
||||||
|
TiffComponent::AutoPtr TiffCanonCreator::create(uint32_t extendedTag,
|
||||||
|
uint16_t group)
|
||||||
|
{
|
||||||
|
const TiffStructure* ts = find(tiffStructure_,
|
||||||
|
TiffStructure::Key(extendedTag, group));
|
||||||
|
TiffComponent::AutoPtr tc(0);
|
||||||
|
uint16_t tag = static_cast<uint16_t>(extendedTag & 0xffff);
|
||||||
|
if (ts && ts->newTiffCompFct_) {
|
||||||
|
tc = ts->newTiffCompFct_(tag, ts);
|
||||||
|
}
|
||||||
|
if (!ts) {
|
||||||
|
tc = TiffComponent::AutoPtr(new TiffEntry(tag, group));
|
||||||
|
}
|
||||||
|
return tc;
|
||||||
|
} // TiffCanonCreator::create
|
||||||
|
|
||||||
|
TiffRwState::AutoPtr TiffCanonMn::doGetState(uint32_t /*mnOffset*/,
|
||||||
|
ByteOrder byteOrder) const
|
||||||
|
{
|
||||||
|
// Byteorder: No change
|
||||||
|
// Offsets : No change (relative to the start of the TIFF header)
|
||||||
|
// Creator : Canon TIFF component factory
|
||||||
|
return TiffRwState::AutoPtr(
|
||||||
|
new TiffRwState(byteOrder, 0, TiffCanonCreator::create));
|
||||||
|
}
|
||||||
|
|
||||||
|
// *************************************************************************
|
||||||
|
// free functions
|
||||||
|
|
||||||
|
TiffComponent* newCanonMn(uint16_t tag,
|
||||||
|
uint16_t group,
|
||||||
|
uint16_t mnGroup,
|
||||||
|
const byte* /*pData*/,
|
||||||
|
uint32_t /*size*/,
|
||||||
|
ByteOrder /*byteOrder*/)
|
||||||
|
{
|
||||||
|
return new TiffCanonMn(tag, group, mnGroup);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Exiv2
|
||||||
@ -0,0 +1,109 @@
|
|||||||
|
// ***************************************************************** -*- C++ -*-
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2006 Andreas Huggel <ahuggel@gmx.net>
|
||||||
|
*
|
||||||
|
* This program is part of the Exiv2 distribution.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 2
|
||||||
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
/*!
|
||||||
|
@file canonmn2.hpp
|
||||||
|
@brief TIFF Canon makernote
|
||||||
|
@version $Rev$
|
||||||
|
@author Andreas Huggel (ahu)
|
||||||
|
<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
|
||||||
|
@date 18-Apr-06, ahu: created
|
||||||
|
*/
|
||||||
|
#ifndef CANONMN2_HPP_
|
||||||
|
#define CANONMN2_HPP_
|
||||||
|
|
||||||
|
// *****************************************************************************
|
||||||
|
// included header files
|
||||||
|
#include "makernote2.hpp"
|
||||||
|
#include "tiffcomposite.hpp"
|
||||||
|
#include "types.hpp"
|
||||||
|
|
||||||
|
// + standard includes
|
||||||
|
|
||||||
|
// *****************************************************************************
|
||||||
|
// namespace extensions
|
||||||
|
namespace Exiv2 {
|
||||||
|
|
||||||
|
// *****************************************************************************
|
||||||
|
// class definitions
|
||||||
|
|
||||||
|
namespace Group {
|
||||||
|
const uint16_t canonmn = 259; //!< Canon makernote
|
||||||
|
const uint16_t canoncs = 260; //!< Canon camera settings
|
||||||
|
const uint16_t canonsi = 261; //!< Canon shot info
|
||||||
|
const uint16_t canoncf = 262; //!< Canon customer functions
|
||||||
|
}
|
||||||
|
|
||||||
|
/*!
|
||||||
|
@brief Canon Makernote
|
||||||
|
*/
|
||||||
|
class TiffCanonMn : public TiffIfdMakernote {
|
||||||
|
public:
|
||||||
|
//! @name Creators
|
||||||
|
//@{
|
||||||
|
//! Default constructor
|
||||||
|
TiffCanonMn(uint16_t tag, uint16_t group, uint16_t mnGroup)
|
||||||
|
: TiffIfdMakernote(tag, group, mnGroup) {}
|
||||||
|
//! Virtual destructor
|
||||||
|
virtual ~TiffCanonMn() {}
|
||||||
|
//@}
|
||||||
|
private:
|
||||||
|
//! @name Accessors
|
||||||
|
//@{
|
||||||
|
virtual TiffRwState::AutoPtr doGetState(uint32_t mnOffset,
|
||||||
|
ByteOrder byteOrder) const;
|
||||||
|
//@}
|
||||||
|
|
||||||
|
}; // class TiffCanonMn
|
||||||
|
|
||||||
|
/*!
|
||||||
|
@brief TIFF component factory for Canon TIFF components.
|
||||||
|
*/
|
||||||
|
class TiffCanonCreator {
|
||||||
|
public:
|
||||||
|
/*!
|
||||||
|
@brief Create the TiffComponent for TIFF entry \em extendedTag and
|
||||||
|
\em group based on the embedded lookup table.
|
||||||
|
|
||||||
|
If a tag and group combination is not found in the table, a TiffEntry
|
||||||
|
is created. If the pointer that is returned is 0, then the TIFF entry
|
||||||
|
should be ignored.
|
||||||
|
*/
|
||||||
|
static TiffComponent::AutoPtr create(uint32_t extendedTag,
|
||||||
|
uint16_t group);
|
||||||
|
|
||||||
|
private:
|
||||||
|
static const TiffStructure tiffStructure_[]; //<! TIFF structure
|
||||||
|
}; // class TiffCanonCreator
|
||||||
|
|
||||||
|
// *****************************************************************************
|
||||||
|
// template, inline and free functions
|
||||||
|
|
||||||
|
//! Function to create a Canon makernote
|
||||||
|
TiffComponent* newCanonMn(uint16_t tag,
|
||||||
|
uint16_t group,
|
||||||
|
uint16_t mnGroup,
|
||||||
|
const byte* pData,
|
||||||
|
uint32_t size,
|
||||||
|
ByteOrder byteOrder);
|
||||||
|
|
||||||
|
} // namespace Exiv2
|
||||||
|
|
||||||
|
#endif // #ifndef CANONMN2_HPP_
|
||||||
Loading…
Reference in New Issue