diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp index 04061b65..509b73c9 100644 --- a/src/nikonmn.cpp +++ b/src/nikonmn.cpp @@ -3,7 +3,7 @@ * Copyright (C) 2004-2007 Andreas Huggel * * Lens database to decode Exif.Nikon3.LensData - * Copyright (C) 2005, 2006 Robert Rottmerhusen + * Copyright (C) 2005-2007 Robert Rottmerhusen * * 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"}, diff --git a/src/tags.hpp b/src/tags.hpp index 8a013939..c3463712 100644 --- a/src/tags.hpp +++ b/src/tags.hpp @@ -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 /*!