Skip to content

Commit d08e128

Browse files
Fix 2 warnings raised by gcc 7.5
1 parent 79652b1 commit d08e128

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

mapwms.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,17 +1021,18 @@ int msWMSLoadGetMapParams(mapObj *map, int nVersion,
10211021
if (strcasecmp(names[i], "SLD") == 0 || strcasecmp(names[i], "SLD_BODY") == 0) {
10221022
sldenabled = msOWSLookupMetadata(&(map->web.metadata), "MO", "sld_enabled");
10231023

1024-
if (sldenabled == NULL)
1024+
if (sldenabled == NULL) {
10251025
sldenabled = "true";
1026+
}
10261027

1027-
if (strcasecmp(sldenabled, "true") == 0) {
1028-
if (strcasecmp(names[i], "SLD") == 0) {
1029-
sld_url = values[i];
1030-
}
1031-
if (strcasecmp(names[i], "SLD_BODY") == 0) {
1032-
sld_body = values[i];
1033-
}
1028+
if (strcasecmp(sldenabled, "true") == 0) {
1029+
if (strcasecmp(names[i], "SLD") == 0) {
1030+
sld_url = values[i];
10341031
}
1032+
if (strcasecmp(names[i], "SLD_BODY") == 0) {
1033+
sld_body = values[i];
1034+
}
1035+
}
10351036
}
10361037
}
10371038

renderers/agg/include/agg_conv_curve.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ namespace mapserver
156156

157157
double ct2_x = 0;
158158
double ct2_y = 0;
159-
double end_x;
160-
double end_y;
159+
double end_x = 0;
160+
double end_y = 0;
161161

162162
unsigned cmd = m_source->vertex(x, y);
163163
switch(cmd)

0 commit comments

Comments
 (0)