*/
static gchar *dem_gradient_colors[] = {
-"#AAAAAA"
+"#AAAAAA",
"#000000", "#000011", "#000022", "#000033", "#000044", "#00004c", "#000055", "#00005d", "#000066", "#00006e",
"#000077", "#00007f", "#000088", "#000090", "#000099", "#0000a1", "#0000aa", "#0000b2", "#0000bb", "#0000c3",
"#0000cc", "#0000d4", "#0000dd", "#0000e5", "#0000ee", "#0000f6", "#0000ff", "#0008f7", "#0011ee", "#0019e6",
/* Convert to store internally
NB file operation always in internal units (metres) */
if (!is_file_operation && a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET )
- vdl->min_elev = data.d / VIK_FEET_IN_METER;
+ vdl->min_elev = VIK_FEET_TO_METERS(data.d);
else
vdl->min_elev = data.d;
break;
/* Convert to store internally
NB file operation always in internal units (metres) */
if (!is_file_operation && a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET )
- vdl->max_elev = data.d / VIK_FEET_IN_METER;
+ vdl->max_elev = VIK_FEET_TO_METERS(data.d);
else
vdl->max_elev = data.d;
break;
(intlon >= 0) ? 'E' : 'W',
ABS(intlon) );
- static DownloadOptions options = { 0, NULL, 0, a_check_map_file };
+ static DownloadMapOptions options = { FALSE, FALSE, NULL, 0, a_check_map_file };
a_http_download_get_url ( SRTM_HTTP_SITE, src_fn, p->dest, &options, NULL );
g_free ( src_fn );
}
a_background_thread ( VIK_GTK_WINDOW_FROM_LAYER(vdl), tmp,
(vik_thr_func) dem_download_thread, p,
(vik_thr_free_func) free_dem_download_params, NULL, 1 );
+
+ g_free ( tmp );
}
g_free ( dem_file );