Peter M. Groen / openbr

Commit c153b121eb45cbe8ea858d7991409726c978b0e4

Authored by Josh Klontz
2 parents 625ba11b cc6e57c0

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

Inline Side-by-side
Showing 5 changed files with 16 additions and 4 deletions
CMakeLists.txt
  View file @c153b12
@@ -130,6 +130,7 @@ include(InstallDependencies) @@ -130,6 +130,7 @@ include(InstallDependencies)
130 install_compiler_libraries() 130 install_compiler_libraries()
131 install_qt_libraries(QT_DEPENDENCIES) 131 install_qt_libraries(QT_DEPENDENCIES)
132 install_qt_imageformats() 132 install_qt_imageformats()
  133 +install_qt_misc()
133 install_opencv_libraries(OPENCV_DEPENDENCIES) 134 install_opencv_libraries(OPENCV_DEPENDENCIES)
134 135
135 # Package 136 # Package
openbr/plugins/neclatent1.cpp
  View file @c153b12
1 -#include <openbr_plugin.h> 1 +#include <openbr/openbr_plugin.h>
2 #include <LatentEFS.h> 2 #include <LatentEFS.h>
3 3
4 // necessary to allocate a large memory though the actual template size 4 // necessary to allocate a large memory though the actual template size
openbr/plugins/quantize.cpp
  View file @c153b12
@@ -183,8 +183,8 @@ private: @@ -183,8 +183,8 @@ private:
183 QList<int> clusterLabels = OpenCVUtils::matrixToVector<int>(labels); 183 QList<int> clusterLabels = OpenCVUtils::matrixToVector<int>(labels);
184 184
185 QHash< int, QList<int> > clusters; // QHash<clusterLabel, QList<templateLabel>> 185 QHash< int, QList<int> > clusters; // QHash<clusterLabel, QList<templateLabel>>
186 - for (int i=0; i<clusterLabels.size(); i++)  
187 - clusters[clusterLabels[i]].append(templateLabels[i]); 186 + for (int j=0; j<clusterLabels.size(); j++)
  187 + clusters[clusterLabels[j]].append(templateLabels[j]);
188 188
189 for (int j=0; j<256; j++) 189 for (int j=0; j<256; j++)
190 for (int k=0; k<256; k++) 190 for (int k=0; k<256; k++)
openbr/plugins/sentence.cpp
  View file @c153b12
@@ -77,7 +77,7 @@ class SentenceSimilarityDistance : public Distance @@ -77,7 +77,7 @@ class SentenceSimilarityDistance : public Distance
77 for (int i=0; i<aRows; i++) 77 for (int i=0; i<aRows; i++)
78 for (int j=0; j<bRows; j++) 78 for (int j=0; j<bRows; j++)
79 for (int k=0; k<aColumns; k++) 79 for (int k=0; k<aColumns; k++)
80 - distance += pow(aBuffer[i*aColumns+k] - bBuffer[j*bColumns+k], 2.f); 80 + distance += pow(aData[i*aColumns+k] - bData[j*bColumns+k], 2.f);
81 comparisons += aRows * bRows * aColumns; 81 comparisons += aRows * bRows * aColumns;
82 aWord = -2; 82 aWord = -2;
83 bWord = -1; 83 bWord = -1;
share/openbr/cmake/InstallDependencies.cmake
  View file @c153b12
@@ -64,6 +64,17 @@ function(install_qt_imageformats) @@ -64,6 +64,17 @@ function(install_qt_imageformats)
64 endif() 64 endif()
65 endfunction() 65 endfunction()
66 66
  67 +# Qt Other
  68 +function(install_qt_misc)
  69 + if(MSVC)
  70 + if(${CMAKE_BUILD_TYPE} MATCHES Debug)
  71 + set(BR_INSTALL_DEPENDENCIES_SUFFIX "d")
  72 + endif()
  73 + install(FILES ${_qt5Core_install_prefix}/bin/libGLESv2${BR_INSTALL_DEPENDENCIES_SUFFIX}.dll DESTINATION bin)
  74 + # install(FILES ${_qt5Core_install_prefix}/bin/icuin49${BR_INSTALL_DEPENDENCIES_SUFFIX}.dll DESTINATION bin)
  75 + endif()
  76 +endfunction()
  77 +
67 # Compiler libraries 78 # Compiler libraries
68 function(install_compiler_libraries) 79 function(install_compiler_libraries)
69 include(InstallRequiredSystemLibraries) 80 include(InstallRequiredSystemLibraries)