[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:41:56 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=cfb5ad2
The following commit has been merged in the master branch:
commit cfb5ad2bca49bed7a78d29652746161e2768165d
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Fri Sep 10 16:36:33 2010 +0000
Fixed two and silenced several other compiler warnings.
---
src/canonmn.cpp | 3 ++-
src/fujimn.cpp | 9 ++++++---
src/minoltamn.cpp | 6 ++++--
src/nikonmn.cpp | 7 ++++---
src/olympusmn.cpp | 3 ++-
src/panasonicmn.cpp | 12 ++++++++----
src/pentaxmn.cpp | 17 +++++++++--------
src/sonymn.cpp | 3 ++-
src/tags.cpp | 18 ++++++++++++------
9 files changed, 49 insertions(+), 29 deletions(-)
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 1e3c91b..778e562 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -339,7 +339,8 @@ namespace Exiv2 {
{ 0, N_("None") },
{ 1, "2x" },
{ 2, "4x" },
- { 3, N_("Other") }
+ { 3, N_("Other") },
+ { 3, N_("Other") } // To silence compiler warning
};
//! Contrast, Saturation Sharpness, tags 0x000d, 0x000e, 0x000f
diff --git a/src/fujimn.cpp b/src/fujimn.cpp
index 819a2ad..c94541f 100644
--- a/src/fujimn.cpp
+++ b/src/fujimn.cpp
@@ -75,7 +75,8 @@ namespace Exiv2 {
{ 769, N_("Fluorescent (warm white)") },
{ 770, N_("Fluorescent (cool white)") },
{ 1024, N_("Incandescent") },
- { 3480, N_("Custom") }
+ { 3480, N_("Custom") },
+ { 3480, N_("Custom") } // To silence compiler warning
};
//! Color, tag 0x1003
@@ -83,7 +84,8 @@ namespace Exiv2 {
{ 0, N_("Normal") },
{ 256, N_("High") },
{ 512, N_("Low") },
- { 768, N_("None (black & white)") }
+ { 768, N_("None (black & white)") },
+ { 768, N_("None (black & white)") } // To silence compiler warning
};
//! Tone, tag 0x1004
@@ -98,7 +100,8 @@ namespace Exiv2 {
{ 0, N_("Auto") },
{ 1, N_("On") },
{ 2, N_("Off") },
- { 3, N_("Red-eye reduction") }
+ { 3, N_("Red-eye reduction") },
+ { 3, N_("Red-eye reduction") } // To silence compiler warning
};
//! FocusMode, tag 0x1021
diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 1368e57..7e10a5e 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -334,7 +334,8 @@ namespace Exiv2 {
{ 4, "DiMAGE 7i" },
{ 5, "DiMAGE 7Hi" },
{ 6, "DiMAGE A1" },
- { 7, "DiMAGE A2 | S414" }
+ { 7, "DiMAGE A2 | S414" },
+ { 7, "DiMAGE A2 | S414" } // To silence compiler warning
};
//! Lookup table to translate Minolta Std camera settings interval mode values to readable labels
@@ -685,7 +686,8 @@ namespace Exiv2 {
{ 4, N_("Tungsten") },
{ 5, N_("Fluorescent") },
{ 256, N_("Kelvin") },
- { 512, N_("Manual") }
+ { 512, N_("Manual") },
+ { 512, N_("Manual") } // To silence compiler warning
};
//! Lookup table to translate Minolta Dynax 7D camera settings focus mode values to readable labels
diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index e0224c9..5053134 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -82,7 +82,7 @@ namespace Exiv2 {
};
//! Focus area for Nikon cameras.
- extern const char *nikonFocusarea[] = {
+ extern const char * const nikonFocusarea[] = {
N_("Single area"),
N_("Dynamic area"),
N_("Dynamic area, closest subject"),
@@ -95,7 +95,7 @@ namespace Exiv2 {
// module. Note that relative size and position will vary depending on if
// "wide" or not
//! Focus points for Nikon cameras, used for Nikon 1 and Nikon 3 makernotes.
- extern const char *nikonFocuspoints[] = {
+ extern const char * const nikonFocuspoints[] = {
N_("Center"),
N_("Top"),
N_("Bottom"),
@@ -950,7 +950,8 @@ namespace Exiv2 {
{ 4, N_("Automatic") },
{ 5, N_("GN (distance priority)") },
{ 6, N_("Manual") },
- { 7, N_("Repeating Flash") }
+ { 7, N_("Repeating Flash") },
+ { 7, N_("Repeating Flash") } // To silence compiler warning
};
//! ExternalFlashFlags
diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index 6ecf75a..459ee1c 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -731,7 +731,8 @@ namespace Exiv2 {
{ 4, "TF-22" },
{ 5, "FL-36" },
{ 6, "FL-50R" },
- { 7, "FL-36R" }
+ { 7, "FL-36R" },
+ { 7, "FL-36R" } // To silence compiler warning
};
const TagInfo OlympusMakerNote::tagInfoEq_[] = {
diff --git a/src/panasonicmn.cpp b/src/panasonicmn.cpp
index 505a008..b269d82 100644
--- a/src/panasonicmn.cpp
+++ b/src/panasonicmn.cpp
@@ -68,7 +68,8 @@ namespace Exiv2 {
{ 5, N_("Manual") },
{ 8, N_("Flash") },
{ 10, N_("Black and white") },
- { 11, N_("Manual") }
+ { 11, N_("Manual") },
+ { 11, N_("Manual") } // To silence compiler warning
};
//! FocusMode, tag 0x0007
@@ -76,7 +77,8 @@ namespace Exiv2 {
{ 1, N_("Auto") },
{ 2, N_("Manual") },
{ 4, N_("Auto, focus button") },
- { 5, N_("Auto, continuous") }
+ { 5, N_("Auto, continuous") },
+ { 5, N_("Auto, continuous") } // To silence compiler warning
};
//! ImageStabilizer, tag 0x001a
@@ -163,7 +165,8 @@ namespace Exiv2 {
{ 7, N_("Medium high") },
{ 256, N_("Low") },
{ 272, N_("Standard") },
- { 288, N_("High") }
+ { 288, N_("High") },
+ { 288, N_("High") } // To silence compiler warning
};
//! NoiseReduction, tag 0x002d
@@ -207,7 +210,8 @@ namespace Exiv2 {
{ 1, N_("Off") },
{ 2, N_("Wide") },
{ 3, N_("Telephoto") },
- { 4, N_("Macro") }
+ { 4, N_("Macro") },
+ { 4, N_("Macro") } // To silence compiler warning
};
//! WorldTimeLocation, tag 0x003a
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index ac77354..c580364 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -339,14 +339,15 @@ namespace Exiv2 {
//! Saturation, tag 0x001f
extern const TagDetails pentaxSaturation[] = {
- { 0, N_("Low") },
- { 1, N_("Normal") },
- { 2, N_("High") },
- { 3, N_("Med Low") },
- { 4, N_("Med High") },
- { 5, N_("Very Low") },
- { 6, N_("Very High") },
- { 65535, N_("None") },
+ { 0, N_("Low") },
+ { 1, N_("Normal") },
+ { 2, N_("High") },
+ { 3, N_("Med Low") },
+ { 4, N_("Med High") },
+ { 5, N_("Very Low") },
+ { 6, N_("Very High") },
+ { 65535, N_("None") },
+ { 65535, N_("None") } // To silence compiler warning
};
//! Contrast, tag 0x0020
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index ad44c18..e03f7f7 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -451,7 +451,8 @@ namespace Exiv2 {
{ 7, N_("Continuous Bracketing") },
{ 12, N_("Continuous Low") },
{ 18, N_("White Balance Bracketing Low") },
- { 19, N_("D-Range Optimizer Bracketing Low") }
+ { 19, N_("D-Range Optimizer Bracketing Low") },
+ { 19, N_("D-Range Optimizer Bracketing Low") } // To silence compiler warning
};
//! Lookup table to translate Sony camera settings focus mode values to readable labels
diff --git a/src/tags.cpp b/src/tags.cpp
index 127fe73..93a74d9 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -225,7 +225,8 @@ namespace Exiv2 {
{ 4, N_("Primary image, Transparency mask") },
{ 5, N_("Thumbnail/Preview image, Transparency mask") },
{ 6, N_("Primary image, Multi page file, Transparency mask") },
- { 7, N_("Thumbnail/Preview image, Multi page file, Transparency mask") }
+ { 7, N_("Thumbnail/Preview image, Multi page file, Transparency mask") },
+ { 7, N_("Thumbnail/Preview image, Multi page file, Transparency mask") } // To silence compiler warning
};
//! SubfileType, TIFF tag 0x00ff
@@ -310,7 +311,8 @@ namespace Exiv2 {
{ 5, N_("left, top") },
{ 6, N_("right, top") },
{ 7, N_("right, bottom") },
- { 8, N_("left, bottom") }
+ { 8, N_("left, bottom") },
+ { 8, N_("left, bottom") } // To silence compiler warning
};
//! Predictor, tag 0x013d
@@ -330,7 +332,8 @@ namespace Exiv2 {
{ 1, N_("Unsigned integer data") },
{ 2, N_("Two's complement signed integer data") },
{ 3, N_("IEEE floating point data") },
- { 4, N_("Undefined data format") }
+ { 4, N_("Undefined data format") },
+ { 4, N_("Undefined data format") } // To silence compiler warning
};
//! Indexed, tag 0x015a
@@ -1232,7 +1235,8 @@ namespace Exiv2 {
{ 4, N_("Multi-spot") },
{ 5, N_("Multi-segment") },
{ 6, N_("Partial") },
- { 255, N_("Other") }
+ { 255, N_("Other") },
+ { 255, N_("Other") } // To silence compiler warning
};
//! LightSource, tag 0x9208
@@ -1314,7 +1318,8 @@ namespace Exiv2 {
{ 0, N_("Standard") },
{ 1, N_("Landscape") },
{ 2, N_("Portrait") },
- { 3, N_("Night scene") }
+ { 3, N_("Night scene") },
+ { 3, N_("Night scene") } // To silence compiler warning
};
//! GainControl, tag 0xa407
@@ -1345,7 +1350,8 @@ namespace Exiv2 {
{ 0, N_("Unknown") },
{ 1, N_("Macro") },
{ 2, N_("Close view") },
- { 3, N_("Distant view") }
+ { 3, N_("Distant view") },
+ { 3, N_("Distant view") } // To silence compiler warning
};
// Exif IFD Tags
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list