From 32bac1877a6575bd28d302b7bfe2b3d49b955a0a Mon Sep 17 00:00:00 2001 From: Josh Klontz Date: Thu, 11 Jun 2015 16:37:15 -0400 Subject: [PATCH] fixed function signatures --- openbr/openbr_plugin.cpp | 4 ++-- openbr/openbr_plugin.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openbr/openbr_plugin.cpp b/openbr/openbr_plugin.cpp index 142c451..9919cb9 100644 --- a/openbr/openbr_plugin.cpp +++ b/openbr/openbr_plugin.cpp @@ -426,7 +426,7 @@ br_utemplate Template::toUniversalTemplate(const Template &t) return br_new_utemplate(algorithmID, x, y, width, height, confidence, metadata.data(), (const char*) m.data, m.rows * m.cols * m.elemSize()); } -Template Template::fromUniversalTemplate(const br_utemplate &ut) +Template Template::fromUniversalTemplate(br_const_utemplate ut) { QVariantMap map = QJsonDocument::fromJson(QByteArray((const char*) ut->data)).object().toVariantMap(); map.insert("AlgorithmID", ut->algorithmID); @@ -435,7 +435,7 @@ Template Template::fromUniversalTemplate(const br_utemplate &ut) map.insert("Width" , ut->width ); map.insert("Height" , ut->height ); map.insert("Confidence" , ut->confidence ); - const Mat m = Mat(1, ut->fvSize, CV_8UC1, ut->data + ut->mdSize).clone(); + const Mat m = Mat(1, ut->fvSize, CV_8UC1, (void*)(ut->data + ut->mdSize)).clone(); return Template(File(map), m); } diff --git a/openbr/openbr_plugin.h b/openbr/openbr_plugin.h index 070bc8c..9bc036e 100644 --- a/openbr/openbr_plugin.h +++ b/openbr/openbr_plugin.h @@ -295,7 +295,7 @@ struct Template : public QList } static br_utemplate toUniversalTemplate(const Template &t); - static Template fromUniversalTemplate(const br_utemplate &ut); + static Template fromUniversalTemplate(br_const_utemplate ut); static br_utemplate readUniversalTemplate(QFile &file); static void freeUniversalTemplate(br_const_utemplate t); }; -- libgit2 0.21.4