diff --git a/sdk/core/plot.cpp b/sdk/core/plot.cpp index 53982a7..8eb874f 100644 --- a/sdk/core/plot.cpp +++ b/sdk/core/plot.cpp @@ -122,7 +122,7 @@ float Evaluate(const QString &simmat, const QString &mask, const QString &csv) maskFile.insert("rows", scores.rows); maskFile.insert("columns", scores.cols); const Mat masks = BEE::readMask(maskFile); - if (scores.size() != masks.size()) qFatal("Simmat/Mask size mismatch."); + if (scores.size() != masks.size()) qFatal("Simmat %i /Mask %i size mismatch.", scores.size(), mask.size()); // Make comparisons QList comparisons; comparisons.reserve(scores.rows*scores.cols); diff --git a/sdk/plugins/ct8.cmake b/sdk/plugins/ct8.cmake index d8ff6d1..3b9d23b 100644 --- a/sdk/plugins/ct8.cmake +++ b/sdk/plugins/ct8.cmake @@ -7,10 +7,16 @@ if(${BR_WITH_CT8}) set(CT8_LIBS optimized ${CT8_LIBRARY_RELEASE} debug ${CT8_LIBRARY_DEBUG}) set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${CT8_LIBS}) + + if(WIN32) + install(FILES ${CT8_DIR_LIB}/libfrsdk-8.6.0.dll + DESTINATION bin) + install(DIRECTORY ${CT8_DIR}/etc DESTINATION models/ct8) + add_definitions(-DCT8_DIR=\"${CT8_DIR}\") + else() install(FILES ${CT8_DIR_LIB}/libfrsdk-8.5.0.so ${CT8_DIR_LIB}/../share/libhasp_linux_x86_64_67109.so ${CT8_DIR_LIB}/../share/libiomp5.so DESTINATION lib) - install(DIRECTORY ${CT8_DIR}/etc DESTINATION models/ct8) - add_definitions(-DCT8_DIR=\"${CT8_DIR}\") + endif() endif() diff --git a/sdk/plugins/output.cpp b/sdk/plugins/output.cpp index 88e2e80..c0009e2 100644 --- a/sdk/plugins/output.cpp +++ b/sdk/plugins/output.cpp @@ -279,7 +279,7 @@ class rankOutput : public MatrixOutput typedef QPair Pair; int rank = 1; foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector(data.row(i)), true)) { - if(targetFiles[pair.second].label() == queryFiles[i].label()) { + if(targetFiles[pair.second].getString("Label") == queryFiles[i].getString("Label")) { ranks.append(rank); positions.append(pair.second); scores.append(pair.first);