Put template in a templatelist before enrolling, return the templatelist

Austin Blanton
1 parent c5786a1a
Showing 4 changed files with 21 additions and 9 deletions
openbr/core/core.cpp
openbr/openbr.cpp
openbr/openbr.h
openbr/openbr_plugin.h
@@ -184,7 +184,7 @@ struct AlgorithmCore
         return fileList;
     }
-    void enroll(Template &data)
+    void enroll(TemplateList &data)
     {
         if (transform.isNull()) qFatal("Null transform.");
         data >> *transform;
@@ -377,9 +377,10 @@ FileList br::Enroll(const File &amp;input, const File &amp;gallery)
     return AlgorithmManager::getAlgorithm(gallery.get<QString>("algorithm"))->enroll(input, gallery);
 }
-void br::Enroll(Template &tmpl)
+void br::Enroll(TemplateList &tl)
 {
-    AlgorithmManager::getAlgorithm(tmpl.file.get<QString>("algorithm"))->enroll(tmpl);
+    QString alg = tl.first().file.get<QString>("algorithm");
+    AlgorithmManager::getAlgorithm(alg)->enroll(tl);
 }
 void br::Compare(const File &targetGallery, const File &queryGallery, const File &output)
@@ -331,8 +331,17 @@ int br_img_channels(br_template tmpl)
     return t->m().channels();
 }
-void br_enroll_template(br_template tmpl)
+br_template_list br_enroll_template(br_template tmpl)
 {
     Template *t = reinterpret_cast<Template*>(tmpl);
-    Enroll(*t);
+    TemplateList *tl = new TemplateList();
+    tl->append(*t);
+    Enroll(*tl);
+    return (br_template_list)tl;
+}
+
+br_template br_get_template(br_template_list tl, int index)
+{
+    TemplateList *realTL = reinterpret_cast<TemplateList*>(tl);
+    return (br_template)&realTL->at(index);
 }
@@ -420,10 +420,11 @@ BR_EXPORT const char *br_version();
 BR_EXPORT void br_slave_process(const char * baseKey);
 // to avoid having to include unwanted headers
-// this will be this header's conception of a template
+// this will be this header's conception of a Template
 // any functions that need a Template pointer
 // will take this typedef and cast it
 typedef void* br_template;
+typedef void* br_template_list;
 /*!
   * \brief Load an image from a string buffer.
   *   Easy way to pass an image in memory from another programming language to openbr.
@@ -450,9 +451,10 @@ BR_EXPORT int br_img_cols(br_template tmpl);
   */
 BR_EXPORT int br_img_channels(br_template tmpl);
 /*!
-  * \brief Enroll a br::Template from the C API!
+  * \brief Enroll a br::Template from the C API! Returns a br::TemplateList
   */
-BR_EXPORT void br_enroll_template(br_template tmpl);
+BR_EXPORT br_template_list br_enroll_template(br_template tmpl);
+BR_EXPORT br_template br_get_template(br_template_list tl, int index);
 /*! @}*/
@@ -1321,7 +1321,7 @@ BR_EXPORT FileList Enroll(const File &amp;input, const File &amp;gallery = File());
  * \brief High-level function for enrolling templates.
  * \see br_enroll
  */
-BR_EXPORT void Enroll(Template &tmpl);
+BR_EXPORT void Enroll(TemplateList &tmpl);
 /*!
  * \brief High-level function for comparing galleries.