Read hgt.zip files directly. Process correctly 1 arc sec hgt(.zip) files

[andy/viking.git] / src / vikwaypoint.h

diff --git a/src/vikwaypoint.h b/src/vikwaypoint.h
index 965cc651693767d40d91965d0ca8809e4ec52293..3c57de97025db7c0e54f66dbf511b677c4ccc09f 100644 (file)
--- a/src/vikwaypoint.h
+++ b/src/vikwaypoint.h
@@ -22,6 +22,8 @@
 #ifndef _VIKING_WAYPOINT_H
 #define _VIKING_WAYPOINT_H
 
 #ifndef _VIKING_WAYPOINT_H
 #define _VIKING_WAYPOINT_H
 

+#include "vikcoord.h"
+

 /* todo important: put these in their own header file, maybe.probably also rename */
 
 #define VIK_WAYPOINT(x) ((VikWaypoint *)(x))
 /* todo important: put these in their own header file, maybe.probably also rename */
 
 #define VIK_WAYPOINT(x) ((VikWaypoint *)(x))


@@ -39,14 +41,17 @@ struct _VikWaypoint {
    * dimensions of the original image. */
   guint8 image_width;
   guint8 image_height;
    * dimensions of the original image. */
   guint8 image_width;
   guint8 image_height;

-  /* int symbol; */
+  gchar *symbol;

 };
 
 VikWaypoint *vik_waypoint_new();
 void vik_waypoint_set_comment(VikWaypoint *wp, const gchar *comment);
 void vik_waypoint_set_image(VikWaypoint *wp, const gchar *image);
 };
 
 VikWaypoint *vik_waypoint_new();
 void vik_waypoint_set_comment(VikWaypoint *wp, const gchar *comment);
 void vik_waypoint_set_image(VikWaypoint *wp, const gchar *image);

+void vik_waypoint_set_symbol(VikWaypoint *wp, const gchar *symname);

 void vik_waypoint_free(VikWaypoint * wp);
 VikWaypoint *vik_waypoint_copy(const VikWaypoint *wp);
 void vik_waypoint_set_comment_no_copy(VikWaypoint *wp, gchar *comment);
 void vik_waypoint_free(VikWaypoint * wp);
 VikWaypoint *vik_waypoint_copy(const VikWaypoint *wp);
 void vik_waypoint_set_comment_no_copy(VikWaypoint *wp, gchar *comment);

+void vik_waypoint_marshall ( VikWaypoint *wp, guint8 **data, guint *len);
+VikWaypoint *vik_waypoint_unmarshall (guint8 *data, guint datalen);

 
 #endif
 
 #endif