From a011d2d078cf65c97d70b31435b90c294ce6aec4 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Wed, 24 Feb 2016 10:22:58 +0000
Subject: [PATCH] Added triangle reconstruction and tristar assignment
---
src/snapshot.c | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/snapshot.c b/src/snapshot.c
index a39ff87..f279dd0 100644
--- a/src/snapshot.c
+++ b/src/snapshot.c
@@ -5,6 +5,8 @@
#include<stdarg.h>
#include <zlib.h>
#include<inttypes.h>
+#include<config.h>
+#include <time.h>
ts_uint ts_sprintf(ts_string *str, char *fmt, ...){
va_list ap;
@@ -42,9 +44,16 @@
}
ts_bool xml_trisurf_header(FILE *fh, ts_vesicle *vesicle){
- fprintf(fh, "<trisurfversion></trisurfversion>\n");
- fprintf(fh, "<trisurfdate></trisurfdate>\n");
- fprintf(fh, "<dumpdate></dumpdate>\n");
+/* format current time */
+ time_t current_time;
+ char *c_time_string;
+ current_time = time(NULL);
+ c_time_string = ctime(¤t_time);
+
+ fprintf(fh, "<trisurfversion>Trisurf (commit %s), compiled on %s %s</trisurfversion>\n",TS_VERSION, __DATE__, __TIME__);
+ fprintf(fh, "<dumpdate>%s</dumpdate>\n", c_time_string);
+ //free (c_time_string);
+
fprintf(fh, "<tape>\n");
fprintf(fh, "</tape>\n");
@@ -108,6 +117,7 @@
/* zlib compression base64 encoded */
/* compressed must not be pre-malloced */
+/* taken from https://gist.github.com/arq5x/5315739 */
ts_uint ts_compress_string64(char *data, ts_uint data_len, char **compressed){
z_stream defstream;
defstream.zalloc = Z_NULL;
@@ -129,6 +139,10 @@
return nbase;
}
+ts_uint ts_decompress_string64(char *b64, ts_uint data_len, char **decompressed){
+return TS_SUCCESS;
+
+}
/* base64 encoding, taken from http://stackoverflow.com/questions/342409/how-do-i-base64-encode-decode-in-c */
static char encoding_table[] = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
@@ -205,7 +219,7 @@
if (j < *output_length) decoded_data[j++] = (triple >> 1 * 8) & 0xFF;
if (j < *output_length) decoded_data[j++] = (triple >> 0 * 8) & 0xFF;
}
-
+ if(decoding_table !=NULL) free(decoding_table);
return decoded_data;
}
--
Gitblit v1.9.3