[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:38:28 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=62d631d
The following commit has been merged in the master branch:
commit 62d631d9ca17fcf4e42cda26b768d4747c8dcf59
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sat Jun 9 07:02:26 2007 +0000
Fixed g++-4.2 warnings.
---
src/nikonmn.cpp | 4 ++--
src/tags.hpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index 04061b6..509b73c 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -3,7 +3,7 @@
* Copyright (C) 2004-2007 Andreas Huggel <ahuggel at gmx.net>
*
* Lens database to decode Exif.Nikon3.LensData
- * Copyright (C) 2005, 2006 Robert Rottmerhusen <email at rottmerhusen.com>
+ * Copyright (C) 2005-2007 Robert Rottmerhusen <email at 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"},
diff --git a/src/tags.hpp b/src/tags.hpp
index 8a01393..c346371 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
/*!
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list