diff --git a/Doxyfile b/Doxyfile index 6a9249d..9749016 100644 --- a/Doxyfile +++ b/Doxyfile @@ -5,8 +5,8 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = openfec -PROJECT_NUMBER = $VERSION$ -OUTPUT_DIRECTORY = +PROJECT_NUMBER = # TODO: Generate version string in precompile script +OUTPUT_DIRECTORY = doc/doxygen CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES @@ -25,7 +25,7 @@ ABBREVIATE_BRIEF = "The $name class" \ ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO FULL_PATH_NAMES = YES -STRIP_FROM_PATH = /home/planete/detchart/ +STRIP_FROM_PATH = STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = NO @@ -95,7 +95,7 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = /scratch/lupus/trunk/openfec +INPUT = INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.c \ *.cc \ diff --git a/applis/eperftool/callbacks.c b/applis/eperftool/callbacks.c index dfcf2a5..e40cf4e 100644 --- a/applis/eperftool/callbacks.c +++ b/applis/eperftool/callbacks.c @@ -32,6 +32,7 @@ */ #include "callbacks.h" +#include void* decode_source_symbol_callback(void *context,unsigned int size, unsigned int esi) { diff --git a/applis/eperftool/eperftool.c b/applis/eperftool/eperftool.c index 33b3e8f..eea94ae 100644 --- a/applis/eperftool/eperftool.c +++ b/applis/eperftool/eperftool.c @@ -43,7 +43,7 @@ print_params() OF_TRACE_LVL(1, ("\tcodec_id:\t\t%i\n", codec_id)) OF_TRACE_LVL(1, ("\ttot_nb_source_symbols:\t%i\n", tot_nb_source_symbols)) OF_TRACE_LVL(1, ("\ttot_nb_repair_symbols:\t%i\n", tot_nb_repair_symbols)) - OF_TRACE_LVL(1, ("\tcode_rate:\t\t%i\n", code_rate)) + OF_TRACE_LVL(1, ("\tcode_rate:\t\t%.2f\n", code_rate)) OF_TRACE_LVL(1, ("\tfec_ratio:\t\t%f\n", fec_ratio)) OF_TRACE_LVL(1, ("\tsrc_pkt_ratio:\t\t%i\n", src_pkt_ratio)) OF_TRACE_LVL(1, ("\tuse_src_pkt_ratio:\t%s\n", use_src_pkt_ratio ? "true" : "false")) @@ -147,7 +147,7 @@ print_preamble (char *command_line) char *version; /* pointer to version string */ char *copyrights; /* pointer to copyrights string */ - OF_PRINT((command_line)) + OF_PRINT(("%s", command_line)) // To avoid -Wformat-security warning. OF_PRINT(("eperf_tool: an extended AL-FEC performance evaluation tool\n")) /* NB: since session pointer is null, we only get a generic string for the * OpenFEC.org project, not specific to the codec itself */ diff --git a/perf_eval/descr_stats b/perf_eval/descr_stats old mode 100644 new mode 100755 index 534d7df..3858801 Binary files a/perf_eval/descr_stats and b/perf_eval/descr_stats differ diff --git a/src/lib_common/linear_binary_codes_utils/ml_decoding/of_ml_tool.c b/src/lib_common/linear_binary_codes_utils/ml_decoding/of_ml_tool.c index a92fc03..db3782e 100644 --- a/src/lib_common/linear_binary_codes_utils/ml_decoding/of_ml_tool.c +++ b/src/lib_common/linear_binary_codes_utils/ml_decoding/of_ml_tool.c @@ -379,7 +379,7 @@ INT32 of_linear_binary_code_backward_substitution (void * variables[], #if 1 if (ofcb->nb_tmp_symbols!=0) #ifdef OF_DEBUG - of_add_from_multiple_symbols(variables[i],ofcb->tmp_tab_symbols,ofcb->nb_tmp_symbols, + of_add_from_multiple_symbols(variables[i],(const void**)ofcb->tmp_tab_symbols,ofcb->nb_tmp_symbols, ofcb->encoding_symbol_length, &(ofcb->stats_xor->nb_xor_for_ML)); #else diff --git a/src/lib_common/of_openfec_api.c b/src/lib_common/of_openfec_api.c index be1a8e0..a7e31d7 100644 --- a/src/lib_common/of_openfec_api.c +++ b/src/lib_common/of_openfec_api.c @@ -330,6 +330,7 @@ of_status_t of_more_about (of_session_t* ses, char** copyrights_str) { OF_ENTER_FUNCTION + // TODO: Generate version string in precompile script static char of_version_string[] = "OpenFEC.org - Version 1.3.0, April 13th, 2012\n"; static char of_copyrights_string[] ="\n\ OpenFEC.org - Because free, open source AL-FEC codes and codecs matter\n\