Commit 15f38d8fc0d9189b88f7fca256d7e524b621c932
1 parent
b7a3b953
updated to latest janus
Showing
2 changed files
with
6 additions
and
3 deletions
openbr/janus.cpp
| @@ -40,7 +40,7 @@ janus_error janus_finalize() | @@ -40,7 +40,7 @@ janus_error janus_finalize() | ||
| 40 | struct janus_template_type : public Template | 40 | struct janus_template_type : public Template |
| 41 | {}; | 41 | {}; |
| 42 | 42 | ||
| 43 | -janus_error janus_initialize_template(janus_template *template_) | 43 | +janus_error janus_allocate(janus_template *template_) |
| 44 | { | 44 | { |
| 45 | *template_ = new janus_template_type(); | 45 | *template_ = new janus_template_type(); |
| 46 | return JANUS_SUCCESS; | 46 | return JANUS_SUCCESS; |
| @@ -94,7 +94,11 @@ janus_error janus_finalize_template(janus_template template_, janus_flat_templat | @@ -94,7 +94,11 @@ janus_error janus_finalize_template(janus_template template_, janus_flat_templat | ||
| 94 | flat_template += templateBytes; | 94 | flat_template += templateBytes; |
| 95 | *bytes += templateBytes; | 95 | *bytes += templateBytes; |
| 96 | } | 96 | } |
| 97 | + return JANUS_SUCCESS; | ||
| 98 | +} | ||
| 97 | 99 | ||
| 100 | +janus_error janus_free(janus_template template_) | ||
| 101 | +{ | ||
| 98 | delete template_; | 102 | delete template_; |
| 99 | return JANUS_SUCCESS; | 103 | return JANUS_SUCCESS; |
| 100 | } | 104 | } |
| @@ -141,7 +145,6 @@ janus_error janus_enroll(const janus_template template_, const janus_template_id | @@ -141,7 +145,6 @@ janus_error janus_enroll(const janus_template template_, const janus_template_id | ||
| 141 | QDataStream stream(&file); | 145 | QDataStream stream(&file); |
| 142 | stream << *template_; | 146 | stream << *template_; |
| 143 | file.close(); | 147 | file.close(); |
| 144 | - delete template_; | ||
| 145 | return JANUS_SUCCESS; | 148 | return JANUS_SUCCESS; |
| 146 | } | 149 | } |
| 147 | 150 |