X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/27d52569baad5d20ee444d6b3b8b1d096c9ccff1..21012ec0a0a3c535966813134645b87160b18bc3:/src/dem.h?ds=sidebyside

diff --git a/src/dem.h b/src/dem.h
index 13c5e422..87330a4f 100644
--- a/src/dem.h
+++ b/src/dem.h
@@ -1,6 +1,31 @@
+/*
+ * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
+ *
+ * Copyright (C) 2003-2008, Evan Battaglia <gtoevan@gmx.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
 #ifndef __VIKING_DEM_H
 #define __VIKING_DEM_H
 
+#include <glib.h>
+
+G_BEGIN_DECLS
+
 #define VIK_DEM_INVALID_ELEVATION -32768
 
 /* unit codes */
@@ -9,11 +34,15 @@
 
 #define VIK_DEM_VERT_DECIMETERS 2
 
+#define VIK_DEM_VERT_METERS 1 /* wrong in 250k?	 */
+
+
 typedef struct {
   guint n_columns;
   GPtrArray *columns;
 
-  guint16 horiz_units, vert_units;
+  guint8 horiz_units;
+  guint8 orig_vert_units; /* original, always converted to meters when loading. */
   gdouble east_scale; /* gap between samples */
   gdouble north_scale;
 
@@ -41,7 +70,12 @@ void vik_dem_free ( VikDEM *dem );
 gint16 vik_dem_get_xy ( VikDEM *dem, guint x, guint y );
 
 gint16 vik_dem_get_east_north ( VikDEM *dem, gdouble east, gdouble north );
+gint16 vik_dem_get_simple_interpol ( VikDEM *dem, gdouble east, gdouble north );
+gint16 vik_dem_get_shepard_interpol ( VikDEM *dem, gdouble east, gdouble north );
+gint16 vik_dem_get_best_interpol ( VikDEM *dem, gdouble east, gdouble north );
 
 void vik_dem_east_north_to_xy ( VikDEM *dem, gdouble east, gdouble north, guint *col, guint *row );
 
+G_END_DECLS
+
 #endif