1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
Description: fix some GCC warnings.
Author: Joao Eriberto Mota Filho <eriberto@debian.org>
Last-Update: 2016-11-23
Index: metacam-1.2/dpyfuncs.cc
===================================================================
--- metacam-1.2.orig/dpyfuncs.cc
+++ metacam-1.2/dpyfuncs.cc
@@ -428,7 +428,7 @@ dpyCanonBlock1(OutputContext &ctx, const
}
if (v[4]) {
- static char *flashmodes[] = {
+ static char const *flashmodes[] = {
"Auto", "On", "Red-Eye Reduction", "Slow Synchro",
"Auto + Red-Eye Reduction", "On + Red-Eye Reduction"
};
@@ -444,7 +444,7 @@ dpyCanonBlock1(OutputContext &ctx, const
if (n >= 32 && v[32]) {
fmt(ctx, "Focus Mode", "Continuous");
} else if (v[7] <= 6) {
- static char *focusModes[] = {
+ static const char *focusModes[] = {
"One-Shot", "AI Servo", "AI Focus", "Manual Focus",
"Single Focus", "Continuous Focus", "Manual Focus"
};
@@ -452,14 +452,14 @@ dpyCanonBlock1(OutputContext &ctx, const
}
if (v[10] <= 2) {
- static char *imageSizes[] = {
+ static const char *imageSizes[] = {
"Large", "Medium", "Small"
};
fmt(ctx, "Image Size", imageSizes[v[10]]);
}
{
- static char *adjustment[] = { "Low", "Normal", "High", "unknown" };
+ static const char *adjustment[] = { "Low", "Normal", "High", "unknown" };
fmt(ctx, "Contrast", adjustment[((short)v[13] + 1) & 0x3]);
fmt(ctx, "Saturation", adjustment[((short)v[14] + 1) & 0x3]);
@@ -467,34 +467,34 @@ dpyCanonBlock1(OutputContext &ctx, const
}
if (v[16] >= 15 && v[16] <= 19) {
- static char *speeds[] = { "auto", "50", "100", "200", "400" };
+ static const char *speeds[] = { "auto", "50", "100", "200", "400" };
fmt(ctx, "ISO Speed", speeds[v[16] - 15]);
}
if (v[17] >= 3 && v[17] <= 5) {
- static char *meterModes[] = {
+ static const char *meterModes[] = {
"Evaluative", "Partial", "Center-weighted"
};
fmt(ctx, "Metering Mode", meterModes[v[17] - 3]);
}
if (v[18] >= 0x3000 && v[18] <= 0x3004) {
- static char *afPoints[] = {
+ static const char *afPoints[] = {
"Manual Focus", "Auto-Select", "Right", "Center", "Left"
};
fmt(ctx, "Autofocus Point", afPoints[v[18] - 0x3000]);
}
if (v[20] <= 5) {
- static char *exposureModes[] = {
+ static const char *exposureModes[] = {
"Preprogrammed", "Program", "Tv-priority", "Av-priority",
"Manual", "A-DEP"
};
fmt(ctx, "Exposure Mode", exposureModes[v[20]]);
}
if (v[20] == 0 && v[11] <= 11) {
- static char *shootModes[] = {
+ static const char *shootModes[] = {
"Full Auto", "Manual", "Landscape", "Fast Shutter", "Slow Shutter",
"Night", "B&W", "Sepia", "Portrait", "Sports", "Macro / Close-Up",
"Pan Focus"
@@ -547,7 +547,7 @@ extern void dpyCanonBlock4(OutputContext
// int n = v[0] / 2;
if (v[7] <= 6) {
- static char *whiteBalances[] = {
+ static const char *whiteBalances[] = {
"Auto", "Sunny", "Cloudy", "Tungsten", "Fluorescent", "Flash", "Custom"
};
fmt(ctx, "White Balance", whiteBalances[v[7]]);
@@ -561,7 +561,7 @@ extern void dpyCanonBlock4(OutputContext
}
{
- struct { unsigned short value; char *bias; } flashBias[] = {
+ struct { unsigned short value; char const *bias; } flashBias[] = {
{0xffc0, "-2 EV"}, {0xffcc, "-1.67 EV"}, {0xffd0, "-1.50 EV"},
{0xffd4, "-1.33 EV"}, {0xffe0, "-1 EV"}, {0xffec, "-0.67 EV"},
{0xfff0, "-0.50 EV"}, {0xfff4, "-0.33 EV"}, {0x0000, "0 EV"},
Index: metacam-1.2/filetiff.cc
===================================================================
--- metacam-1.2.orig/filetiff.cc
+++ metacam-1.2/filetiff.cc
@@ -72,7 +72,7 @@ size_t
_FileTIFF::getData(unsigned char *buf, size_t bytes)
{
is.read((char*)buf, bytes);
- if (is.gcount() != bytes) {
+ if ((unsigned)is.gcount() != bytes) {
// int err = errno;
// cerr << "Read failed: " << strerror(err) << endl;
// exit(2);
|
