Merge branch 'fdis-prep'

.github/workflows/build-member.yml

@@ -92,7 +92,7 @@ jobs:
       shell: bash
       run: |
         HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 \
-            HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install \
+            HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --quiet \
             berkeley-db \
             hwloc \
             jpeg-turbo \
@@ -243,4 +243,4 @@ jobs:
       shell: bash
       run: |
         python -m pip install pandas==2.1.4 packaging
-        python ./diff.py -s conformance_expected_output.csv github.csv
+        python ./diff.py -s conformance_expected_output-v2.3.0.csv github.csv

.github/workflows/build-pr.yml

@@ -88,7 +88,7 @@ jobs:
       shell: bash
       run: |
         HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 \
-            HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install \
+            HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --quiet \
             berkeley-db \
             hwloc \
             jpeg-turbo \

.github/workflows/run-cts-pr.yml

@@ -110,7 +110,7 @@ jobs:
       shell: bash
       run: |
         HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 \
-            HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install \
+            HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --quiet \
             berkeley-db \
             hwloc \
             jpeg-turbo \
@@ -165,7 +165,7 @@ jobs:
       shell: bash
       run: |
         python -m pip install pandas==2.1.4 packaging
-        python conformance/diff.py -s conformance/conformance_expected_output.csv github.csv
+        python conformance/diff.py -s conformance/conformance_expected_output-v2.3.0.csv github.csv
 
     - name: Upload conformance output artifact
       uses: actions/upload-artifact@v4

.gitignore

@@ -11,3 +11,4 @@ NFIQ2/NFIQ2Algorithm/src/nfiq2/version.cpp
 
 modules/core/include/opencv2/core/cv_cpu_helper.h
 
+NFIQ2/NFIQ2Algorithm/doc/html

CMakeLists.txt

@@ -2,6 +2,8 @@ cmake_minimum_required (VERSION 3.3)
 
 project( NFIQ2_SUPERBUILD )
 
+string(REPLACE ";" "$<SEMICOLON>" EXTERNALPROJECT_SAFE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}")
+
 message(STATUS "NFIQ 2 Superbuild")
 
 option(BUILD_NFIQ2_CLI "Build the Command-line Interface for NFIQ2" ON)
@@ -177,6 +179,7 @@ set(OPENCV_CMAKE_ARGS
 	-DWITH_WEBP=OFF
 	-DWITH_OPENEXR=OFF
 	-DWITH_QUIRC=OFF
+	-DWITH_OBSENSOR=OFF
 	-DBUILD_LIST=core,ml,imgproc,imgcodecs)
 
 if("${TARGET_PLATFORM}" MATCHES "win*")
@@ -212,6 +215,7 @@ ExternalProject_Add(OpenCV
 		${IOS_CMAKE_ARGS}
 		${MULTI_CONFIG_ARGS}
 		-DCMAKE_INSTALL_PREFIX=${INSTALL_STAGING_DIR}
+		-DCMAKE_OSX_ARCHITECTURES=${EXTERNALPROJECT_SAFE_OSX_ARCHITECTURES}
 )
 
 if (BUILD_NFIQ2_CLI)
@@ -241,11 +245,13 @@ ExternalProject_Add(libbiomeval
 		${VCPKG_CMAKE_ARGS}
 		${MULTI_CONFIG_ARGS}
 		${EXTRA_BIOMEVAL_CMAKE_ARGS}
+		-DCMAKE_OSX_ARCHITECTURES=${EXTERNALPROJECT_SAFE_OSX_ARCHITECTURES}
 )
 
 ExternalProject_Add(nfir
 	SOURCE_DIR ${PROJECT_SOURCE_DIR}/NFIR
 	CMAKE_ARGS
+		-DCMAKE_OSX_ARCHITECTURES=${EXTERNALPROJECT_SAFE_OSX_ARCHITECTURES}
 		-DCMAKE_INSTALL_PREFIX=${INSTALL_STAGING_DIR}
 		-DOpenCV_DIR=${BUILD_PATH}/OpenCV-prefix/src/OpenCV-build
 		-DFORCE_WIN_STATIC_RUNTIME=ON
@@ -270,6 +276,7 @@ ExternalProject_Add(nfiq2
 		${VCPKG_CMAKE_ARGS}
 		${MULTI_CONFIG_ARGS}
 		${EMBEDDING_CMAKE_ARGS}
+		-DCMAKE_OSX_ARCHITECTURES=${EXTERNALPROJECT_SAFE_OSX_ARCHITECTURES}
 	BUILD_ALWAYS	YES
 )
 ExternalProject_Add_StepDependencies(nfiq2 build OpenCV FRFXLL FRFXLL_static)
@@ -288,6 +295,7 @@ ExternalProject_Add(nfiq2api
 		${ANDROID_CMAKE_ARGS}
 		${IOS_CMAKE_ARGS}
 		${EMBEDDING_CMAKE_ARGS}
+		-DCMAKE_OSX_ARCHITECTURES=${EXTERNALPROJECT_SAFE_OSX_ARCHITECTURES}
 	BUILD_ALWAYS	YES
 )
 ExternalProject_Add_StepDependencies(nfiq2api build nfiq2)
@@ -401,6 +409,15 @@ if (APPLE)
 	set(CPACK_PACKAGE_FILE_NAME "nfiq2-${CPACK_PACKAGE_VERSION}-macos-${OSX_VERS}-${MAC_ARCH}")
 	set(CPACK_PRODUCTBUILD_IDENTIFIER "gov.nist.nfiq2")
 
+#	set(CPACK_PRODUCTBUILD_RESOURCES_DIR "productbuild_resources")
+#	file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CPACK_PRODUCTBUILD_RESOURCES_DIR}")
+#	file(COPY "${ROOT_PATH}/cmake/nist_itl_two_color.svg" DESTINATION "${CPACK_PRODUCTBUILD_RESOURCES_DIR}")
+#	# https://developer.apple.com/library/archive/documentation/DeveloperTools/Reference/DistributionDefinitionRef/Chapters/Distribution_XML_Ref.html
+#	set(CPACK_PRODUCTBUILD_BACKGROUND "nist_itl_two_color.svg")
+#	set(CPACK_PRODUCTBUILD_BACKGROUND_MIME_TYPE "image/svg")
+#	set(CPACK_PRODUCTBUILD_BACKGROUND_ALIGNMENT "bottomleft")
+#	set(CPACK_PRODUCTBUILD_BACKGROUND_SCALING "none")
+
 	# macOS Code Signing
 	if (MACOS_CODESIGN)
 		if ("${MACOS_APPLICATION_SIGNING_IDENTITY}" STREQUAL "")

NFIQ2/NFIQ2Algorithm/CMakeLists.txt

@@ -61,25 +61,25 @@ set(SOURCE_FILES
     "src/nfiq2/nfiq2_modelinfo.cpp"
     "src/nfiq2/nfiq2_algorithm.cpp"
     "src/nfiq2/nfiq2_algorithm_impl.cpp"
-    "src/nfiq2/nfiq2_qualityfeatures.cpp"
-    "src/nfiq2/nfiq2_qualityfeatures_impl.cpp"
+    "src/nfiq2/nfiq2_qualitymeasures.cpp"
+    "src/nfiq2/nfiq2_qualitymeasures_impl.cpp"
     "src/nfiq2/nfiq2_timer.cpp"
     "src/nfiq2/nfiq2_exception.cpp"
     "src/nfiq2/version.cpp")
 
 set(FEATURES_FILES
-    "src/features/Module.cpp"
-    "src/features/FDAFeature.cpp"
-    "src/features/FJFXMinutiaeQualityFeatures.cpp"
-    "src/features/FeatureFunctions.cpp"
-    "src/features/FingerJetFXFeature.cpp"
-    "src/features/ImgProcROIFeature.cpp"
-    "src/features/LCSFeature.cpp"
-    "src/features/MuFeature.cpp"
-    "src/features/OCLHistogramFeature.cpp"
-    "src/features/OFFeature.cpp"
-    "src/features/QualityMapFeatures.cpp"
-    "src/features/RVUPHistogramFeature.cpp")
+    "src/quality_modules/Module.cpp"
+    "src/quality_modules/FDA.cpp"
+    "src/quality_modules/FJFXMinutiaeQuality.cpp"
+    "src/quality_modules/common_functions.cpp"
+    "src/quality_modules/FingerJetFX.cpp"
+    "src/quality_modules/ImgProcROI.cpp"
+    "src/quality_modules/LCS.cpp"
+    "src/quality_modules/Mu.cpp"
+    "src/quality_modules/OCLHistogram.cpp"
+    "src/quality_modules/OF.cpp"
+    "src/quality_modules/QualityMap.cpp"
+    "src/quality_modules/RVUPHistogram.cpp")
 
 set(PREDICTION_FILES
     "src/prediction/RandomForestML.cpp")
@@ -92,7 +92,7 @@ set(PUBLIC_HEADERS
     "include/nfiq2_modelinfo.hpp"
     "include/nfiq2_algorithm.hpp"
     "include/nfiq2_exception.hpp"
-    "include/nfiq2_qualityfeatures.hpp"
+    "include/nfiq2_qualitymeasures.hpp"
     "include/nfiq2_timer.hpp"
     "include/nfiq2_version.hpp")