From 6c3bb91fea92c5013507bdf4f5ac49e889e213ff Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Oct 2015 12:07:39 +0000
Subject: [PATCH] Unkonown merge difference between different directories are merged together.

---
 src/cross-section.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/cross-section.h b/src/cross-section.h
index d4a2566..a8e92de 100644
--- a/src/cross-section.h
+++ b/src/cross-section.h
@@ -1,5 +1,10 @@
 #ifndef _H_CROSS_SECTION
 #define _H_CROSS_SECTION
+#include<cairo/cairo.h>
 ts_coord_list *get_crossection_with_plane(ts_vesicle *vesicle,ts_double a,ts_double b,ts_double c, ts_double d);
-#endif
 
+ts_bool add_crosssection_point(ts_coord_list *pts,  ts_double a, ts_double b, ts_double c, ts_double d, ts_vertex *vtx1, ts_vertex *vtx2);
+ts_bool crossection_to_png(ts_coord_list *pts, char *filename);
+ts_bool save_crossection_snapshot(ts_coord_list *pts, ts_uint timestepno);
+ts_bool append_to_isak_program_raw(cairo_surface_t *surface, char *filename);
+#endif

--
Gitblit v1.9.3