Commit 32bac1877a6575bd28d302b7bfe2b3d49b955a0a
1 parent
8de95566
fixed function signatures
Showing
2 changed files
with
3 additions
and
3 deletions
openbr/openbr_plugin.cpp
| ... | ... | @@ -426,7 +426,7 @@ br_utemplate Template::toUniversalTemplate(const Template &t) |
| 426 | 426 | return br_new_utemplate(algorithmID, x, y, width, height, confidence, metadata.data(), (const char*) m.data, m.rows * m.cols * m.elemSize()); |
| 427 | 427 | } |
| 428 | 428 | |
| 429 | -Template Template::fromUniversalTemplate(const br_utemplate &ut) | |
| 429 | +Template Template::fromUniversalTemplate(br_const_utemplate ut) | |
| 430 | 430 | { |
| 431 | 431 | QVariantMap map = QJsonDocument::fromJson(QByteArray((const char*) ut->data)).object().toVariantMap(); |
| 432 | 432 | map.insert("AlgorithmID", ut->algorithmID); |
| ... | ... | @@ -435,7 +435,7 @@ Template Template::fromUniversalTemplate(const br_utemplate &ut) |
| 435 | 435 | map.insert("Width" , ut->width ); |
| 436 | 436 | map.insert("Height" , ut->height ); |
| 437 | 437 | map.insert("Confidence" , ut->confidence ); |
| 438 | - const Mat m = Mat(1, ut->fvSize, CV_8UC1, ut->data + ut->mdSize).clone(); | |
| 438 | + const Mat m = Mat(1, ut->fvSize, CV_8UC1, (void*)(ut->data + ut->mdSize)).clone(); | |
| 439 | 439 | return Template(File(map), m); |
| 440 | 440 | } |
| 441 | 441 | ... | ... |
openbr/openbr_plugin.h
| ... | ... | @@ -295,7 +295,7 @@ struct Template : public QList<cv::Mat> |
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | static br_utemplate toUniversalTemplate(const Template &t); |
| 298 | - static Template fromUniversalTemplate(const br_utemplate &ut); | |
| 298 | + static Template fromUniversalTemplate(br_const_utemplate ut); | |
| 299 | 299 | static br_utemplate readUniversalTemplate(QFile &file); |
| 300 | 300 | static void freeUniversalTemplate(br_const_utemplate t); |
| 301 | 301 | }; | ... | ... |