third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#719: Removed Pentax makernote class and pretty-print functions from the published interface.

Browse Source
This commit is contained in:
Andreas Huggel 2010-08-14 02:45:46 +00:00
parent 9bf9e434bd
commit a9feb74f48
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -35,6 +35,7 @@ SET( LIBEXIV2_PRIVATE_HDR cr2image_int.hpp
nikonmn_int.hpp
orfimage_int.hpp
panasonicmn_int.hpp
pentaxmn_int.hpp
pngchunk_int.hpp
rcsid_int.hpp
rw2image_int.hpp
@ -68,7 +69,6 @@ SET( LIBEXIV2_HDR basicio.hpp
mrwimage.hpp
olympusmn.hpp
orfimage.hpp
pentaxmn.hpp
pgfimage.hpp
pngimage.hpp
preview.hpp

5
src/pentaxmn.cpp
View File

@ -35,7 +35,7 @@ EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// included header files
#include "types.hpp"
#include "pentaxmn.hpp"
#include "pentaxmn_int.hpp"
#include "value.hpp"
#include "i18n.h" // NLS support.
@ -49,6 +49,7 @@ EXIV2_RCSID("@(#) $Id$")
// *****************************************************************************
// class member definitions
namespace Exiv2 {
namespace Internal {
//! ShootingMode, tag 0x0001
extern const TagDetails pentaxShootingMode[] = {
@ -1129,4 +1130,4 @@ namespace Exiv2 {
return tagInfo_;
}
} // namespace Exiv2
}} // namespace Internal, Exiv2

13
src/pentaxmn.hpp → src/pentaxmn_int.hpp
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
*/
/*!
@file pentaxmn.hpp
@file pentaxmn_int.hpp
@brief Pentax MakerNote implemented according to the specification
http://www.gvsoft.homedns.org/exif/makernote-pentax-type3.html and
based on ExifTool implementation and
@ -29,8 +29,8 @@
<a href="mailto:michal@cihar.com">michal@cihar.com</a>
@date 27-Sep-07
*/
#ifndef PENTAXMN_HPP_
#define PENTAXMN_HPP_
#ifndef PENTAXMN_INT_HPP_
#define PENTAXMN_INT_HPP_
// *****************************************************************************
// included header files
@ -46,12 +46,13 @@
// *****************************************************************************
// namespace extensions
namespace Exiv2 {
namespace Internal {
// *****************************************************************************
// class definitions
//! MakerNote for Pentaxfilm cameras
class EXIV2API PentaxMakerNote {
class PentaxMakerNote {
public:
//! Return read-only list of built-in Pentaxfilm tags
static const TagInfo* tagList();
@ -119,6 +120,6 @@ namespace Exiv2 {
//! Shortcut for the printCombiTag template which requires typing the array name only once.
#define EXV_PRINT_COMBITAG_MULTI(array, count, ignoredcount, ignoredcountmax) printCombiTag<EXV_COUNTOF(array), array, count, ignoredcount, ignoredcountmax>
} // namespace Exiv2
}} // namespace Internal, Exiv2
#endif // #ifndef PENTAXMN_HPP_
#endif // #ifndef PENTAXMN_INT_HPP_

2
src/tags.cpp
View File

@ -43,7 +43,7 @@ EXIV2_RCSID("@(#) $Id$")
#include "nikonmn_int.hpp"
#include "olympusmn.hpp"
#include "panasonicmn_int.hpp"
#include "pentaxmn.hpp"
#include "pentaxmn_int.hpp"
#include "sigmamn.hpp"
#include "sonymn.hpp"
#include "i18n.h" // NLS support.