Add C API calls for compare with void pointers (and more\!)

Austin Blanton
1 parent 5e74d174
Showing 4 changed files with 72 additions and 1 deletions
openbr/core/core.cpp
openbr/openbr.cpp
openbr/openbr.h
openbr/openbr_plugin.h
@@ -430,6 +430,13 @@ void br::Compare(const File &amp;targetGallery, const File &amp;queryGallery, const File
     AlgorithmManager::getAlgorithm(output.get<QString>("algorithm"))->compare(targetGallery, queryGallery, output);
 }
  
+void br::CompareTemplateLists(const TemplateList &target, const TemplateList &query, Output *output)
+{
+    QString alg = output->file.get<QString>("algorithm");
+    QSharedPointer<Distance> dist = Distance::fromAlgorithm(alg);
+    dist->compare(target, query, output);
+}
+
 void br::PairwiseCompare(const File &targetGallery, const File &queryGallery, const File &output)
 {
     AlgorithmManager::getAlgorithm(output.get<QString>("algorithm"))->pairwiseCompare(targetGallery, queryGallery, output);
@@ -323,6 +323,14 @@ unsigned char *br_unload_img(br_template tmpl)
     return t->m().data;
 }
  
+br_template_list br_template_list_from_buffer(const char *buf, int len)
+{
+    QByteArray arr(buf, len);
+    TemplateList *tl = new TemplateList();
+    *tl = TemplateList::fromBuffer(arr);
+    return (br_template_list)tl;
+}
+
 void br_free_template(br_template tmpl)
 {
     Template *t = reinterpret_cast<Template*>(tmpl);
@@ -335,6 +343,12 @@ void br_free_template_list(br_template_list tl)
     delete realTL;
 }
  
+void br_free_output(br_matrix_output output)
+{
+    MatrixOutput *matOut = reinterpret_cast<MatrixOutput*>(output);
+    delete matOut;
+}
+
 int br_img_rows(br_template tmpl)
 {
     Template *t = reinterpret_cast<Template*>(tmpl);
@@ -359,6 +373,12 @@ bool br_img_is_empty(br_template tmpl)
     return t->m().empty();
 }
  
+const char* br_get_filename(br_template tmpl)
+{
+    Template *t = reinterpret_cast<Template*>(tmpl);
+    return t->file.name.toStdString().c_str();
+}
+
 void br_set_filename(br_template tmpl, const char *filename)
 {
     Template *t = reinterpret_cast<Template*>(tmpl);
@@ -391,6 +411,21 @@ void br_enroll_template_list(br_template_list tl)
     Enroll(*realTL);
 }
  
+br_matrix_output br_compare_template_lists(br_template_list target, br_template_list query)
+{
+    TemplateList *targetTL = reinterpret_cast<TemplateList*>(target);
+    TemplateList *queryTL = reinterpret_cast<TemplateList*>(query);
+    MatrixOutput *output = MatrixOutput::make(targetTL->files(), queryTL->files());
+    CompareTemplateLists(*targetTL, *queryTL, output);
+    return (br_matrix_output)output;
+}
+
+float br_get_matrix_output_at(br_matrix_output output, int row, int col)
+{
+    MatrixOutput *matOut = reinterpret_cast<MatrixOutput*>(output);
+    return matOut->data.at<float>(row, col);
+}
+
 br_template br_get_template(br_template_list tl, int index)
 {
     TemplateList *realTL = reinterpret_cast<TemplateList*>(tl);
@@ -437,6 +437,7 @@ BR_EXPORT void br_slave_process(const char * baseKey);
 typedef void* br_template;
 typedef void* br_template_list;
 typedef void* br_gallery;
+typedef void* br_matrix_output;
 /*!
   * \brief Load an image from a string buffer.
   *   Easy way to pass an image in memory from another programming language to openbr.
@@ -452,6 +453,12 @@ BR_EXPORT br_template br_load_img(const char *data, int len);
   */
 BR_EXPORT unsigned char* br_unload_img(br_template tmpl);
 /*!
+  * \brief Deserialize a br::TemplateList from a buffer.
+  *        Can be the buffer for a .gal file,
+  *        since they are just a TemplateList serialized to disk.
+  */
+BR_EXPORT br_template_list br_template_list_from_buffer(const char *buf, int len);
+/*!
   * \brief Free a br::Template's memory.
   */
 BR_EXPORT void br_free_template(br_template tmpl);
@@ -460,6 +467,10 @@ BR_EXPORT void br_free_template(br_template tmpl);
   */
 BR_EXPORT void br_free_template_list(br_template_list tl);
 /*!
+  * \brief Free a br::Output's memory.
+  */
+BR_EXPORT void br_free_output(br_matrix_output output);
+/*!
   * \brief Get the number of rows in an image.
   * \param tmpl Pointer to a br::Template.
   */
@@ -479,7 +490,11 @@ BR_EXPORT int br_img_channels(br_template tmpl);
   */
 BR_EXPORT bool br_img_is_empty(br_template tmpl);
 /*!
-  * \brief Set the filename for a template.
+  * \brief Get the filename for a br::Template
+  */
+BR_EXPORT const char* br_get_filename(br_template tmpl);
+/*!
+  * \brief Set the filename for a br::Template.
   */
 BR_EXPORT void br_set_filename(br_template tmpl, const char *filename);
 /*!
@@ -497,6 +512,15 @@ BR_EXPORT br_template_list br_enroll_template(br_template tmpl);
   */
 BR_EXPORT void br_enroll_template_list(br_template_list tl);
 /*!
+  * \brief Compare br::TemplateLists from the C API!
+  * \return Pointer to a br::MatrixOutput.
+  */
+BR_EXPORT br_matrix_output br_compare_template_lists(br_template_list target, br_template_list query);
+/*!
+  * \brief Get a value in the br::MatrixOutput.
+  */
+BR_EXPORT float br_get_matrix_output_at(br_matrix_output output, int row, int col);
+/*!
   * \brief Get a pointer to a br::Template at a specified index.
   * \param tl Pointer to a br::TemplateList.
   * \param index The index of the br::Template.
@@ -1343,6 +1343,11 @@ BR_EXPORT void Enroll(TemplateList &amp;tmpl);
  * \see br_compare
  */
 BR_EXPORT void Compare(const File &targetGallery, const File &queryGallery, const File &output);
+/*!
+ * \brief High-level function for comparing templates.
+ */
+BR_EXPORT void CompareTemplateLists(const TemplateList &target, const TemplateList &query, Output *output);
+
  
 /*!
  * \brief High-level function for doing a series of pairwise comparisons.