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

Fixed g++-4.2 warnings.

Browse Source
This commit is contained in:
Andreas Huggel 2007-06-09 07:02:26 +00:00
parent 3e26160e49
commit 62d631d9ca
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nikonmn.cpp
View File

@ -3,7 +3,7 @@
* Copyright (C) 2004-2007 Andreas Huggel <ahuggel@gmx.net>
*
* Lens database to decode Exif.Nikon3.LensData
* Copyright (C) 2005, 2006 Robert Rottmerhusen <email@rottmerhusen.com>
* Copyright (C) 2005-2007 Robert Rottmerhusen <email@rottmerhusen.com>
*
* This program is part of the Exiv2 distribution.
*
@ -1098,7 +1098,7 @@ namespace Exiv2 {
//#
//#"data from TAG 0x98" "ltyp""manuf" "lens name from manuf";
//#
struct {unsigned char lid,stps,focs,focl,aps,apl,lfw, ltype; char *manuf, *lensname;}
struct {unsigned char lid,stps,focs,focl,aps,apl,lfw, ltype; const char *manuf, *lensname;}
fmountlens[] = {
{0x01,0x58,0x50,0x50,0x14,0x14,0x02,0x00, "Nikon", "AF Nikkor 50mm f/1.8"},
{0x01,0x00,0x00,0x00,0x00,0x00,0x02,0x00, "Nikon", "AF Teleconverter TC-16A 1.6x"},

4
src/tags.hpp
View File

@ -118,7 +118,7 @@ namespace Exiv2 {
*/
struct TagDetails {
long val_; //!< Tag value
char* label_; //!< Translation of the tag value
const char* label_; //!< Translation of the tag value
//! Comparison operator for use with the find template
bool operator==(long key) const { return val_ == key; }
@ -130,7 +130,7 @@ namespace Exiv2 {
*/
struct TagDetailsBitmask {
uint32_t mask_; //!< Bitmask value
char* label_; //!< Description of the tag value
const char* label_; //!< Description of the tag value
}; // struct TagDetailsBitmask
/*!