Peter M. Groen / openbr

Commit b92e353096c4b87b442ce191fa9ba6f0f9c68991

Authored by Josh Klontz
2 parents 75a21481 64a36c1c

Merge branch 'master' of https://github.com/biometrics/openbr

Inline Side-by-side
Showing 3 changed files with 10 additions and 4 deletions
sdk/core/plot.cpp
  View file @b92e353
... ... @@ -122,7 +122,7 @@ float Evaluate(const QString &simmat, const QString &mask, const QString &csv)
122 122 maskFile.insert("rows", scores.rows);
123 123 maskFile.insert("columns", scores.cols);
124 124 const Mat masks = BEE::readMask(maskFile);
125   - if (scores.size() != masks.size()) qFatal("Simmat/Mask size mismatch.");
  125 + if (scores.size() != masks.size()) qFatal("Simmat %i /Mask %i size mismatch.", scores.size(), mask.size());
126 126  
127 127 // Make comparisons
128 128 QList<Comparison> comparisons; comparisons.reserve(scores.rows*scores.cols);
... ...
sdk/plugins/ct8.cmake
  View file @b92e353
... ... @@ -7,10 +7,16 @@ if(${BR_WITH_CT8})
7 7 set(CT8_LIBS optimized ${CT8_LIBRARY_RELEASE} debug ${CT8_LIBRARY_DEBUG})
8 8 set(BR_THIRDPARTY_LIBS ${BR_THIRDPARTY_LIBS} ${CT8_LIBS})
9 9  
  10 +
  11 + if(WIN32)
  12 + install(FILES ${CT8_DIR_LIB}/libfrsdk-8.6.0.dll
  13 + DESTINATION bin)
  14 + install(DIRECTORY ${CT8_DIR}/etc DESTINATION models/ct8)
  15 + add_definitions(-DCT8_DIR=\"${CT8_DIR}\")
  16 + else()
10 17 install(FILES ${CT8_DIR_LIB}/libfrsdk-8.5.0.so
11 18 ${CT8_DIR_LIB}/../share/libhasp_linux_x86_64_67109.so
12 19 ${CT8_DIR_LIB}/../share/libiomp5.so
13 20 DESTINATION lib)
14   - install(DIRECTORY ${CT8_DIR}/etc DESTINATION models/ct8)
15   - add_definitions(-DCT8_DIR=\"${CT8_DIR}\")
  21 + endif()
16 22 endif()
... ...
sdk/plugins/output.cpp
  View file @b92e353
... ... @@ -279,7 +279,7 @@ class rankOutput : public MatrixOutput
279 279 typedef QPair<float,int> Pair;
280 280 int rank = 1;
281 281 foreach (const Pair &pair, Common::Sort(OpenCVUtils::matrixToVector(data.row(i)), true)) {
282   - if(targetFiles[pair.second].label() == queryFiles[i].label()) {
  282 + if(targetFiles[pair.second].getString("Label") == queryFiles[i].getString("Label")) {
283 283 ranks.append(rank);
284 284 positions.append(pair.second);
285 285 scores.append(pair.first);
... ...