#include "dem.h"
#include "file.h"
+/* Compatibility */
+#if ! GLIB_CHECK_VERSION(2,22,0)
+#define g_mapped_file_unref g_mapped_file_free
+#endif
+
#define DEM_BLOCK_SIZE 1024
#define GET_COLUMN(dem,n) ((VikDEMColumn *)g_ptr_array_index( (dem)->columns, (n) ))
dem->n_columns = 0;
if ((mf = g_mapped_file_new(file_name, FALSE, &error)) == NULL) {
- g_error(_("Couldn't map file %s: %s"), file_name, error->message);
+ g_critical(_("Couldn't map file %s: %s"), file_name, error->message);
g_error_free(error);
g_free(dem);
return NULL;
gulong ucsize;
if ((unzip_mem = unzip_hgt_file(dem_file, &ucsize)) == NULL) {
- g_mapped_file_free(mf);
+ g_mapped_file_unref(mf);
g_ptr_array_free(dem->columns, TRUE);
g_free(dem);
return NULL;
dem_mem = unzip_mem;
file_size = ucsize;
}
+ else
+ dem_mem = (gint16 *)dem_file;
if (file_size == (num_rows_3sec * num_rows_3sec * sizeof(gint16)))
arcsec = 3;
arcsec = 1;
else {
g_warning("%s(): file %s does not have right size", __PRETTY_FUNCTION__, basename);
- g_mapped_file_free(mf);
+ g_mapped_file_unref(mf);
g_free(dem);
return NULL;
}
if (zip)
g_free(dem_mem);
- g_mapped_file_free(mf);
+ g_mapped_file_unref(mf);
return dem;
}