Bug Fix

- RecognitionVocabularyTreeNister2006 was crashing when empty and clearDatabase() was called.
lessthanoptimal · Apr 25, 2024 · d91c6a6 · d91c6a6
1 parent b6ff12e
commit d91c6a6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...nition/src/main/java/boofcv/alg/scene/nister2006/RecognitionVocabularyTreeNister2006.java b/...nition/src/main/java/boofcv/alg/scene/nister2006/RecognitionVocabularyTreeNister2006.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Peter Abeles. All Rights Reserved.
+ * Copyright (c) 2024, Peter Abeles. All Rights Reserved.
  *
  * This file is part of BoofCV (http://boofcv.org).
  *
@@ -127,7 +127,8 @@ public void clearImages() {
 
 		// Removes the old leaf data and replaces it with empty structures
 		invertedFiles.reset();
-		invertedFiles.resize(tree.nodes.size);
+		if (tree != null)
+			invertedFiles.resize(tree.nodes.size);
 	}
 
 	/**

diff --git a/...fcv-recognition/src/test/java/boofcv/abst/scene/GenericFeatureSceneRecognitionChecks.java b/...fcv-recognition/src/test/java/boofcv/abst/scene/GenericFeatureSceneRecognitionChecks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, Peter Abeles. All Rights Reserved.
+ * Copyright (c) 2024, Peter Abeles. All Rights Reserved.
  *
  * This file is part of BoofCV (http://boofcv.org).
  *
@@ -122,6 +122,13 @@ public abstract class GenericFeatureSceneRecognitionChecks<TD extends TupleDesc<
 		assertFalse(alg.query(getFeatures(1, images), ( id ) -> true, 3, matches));
 	}
 
+	/**
+	 * Test added after a bunch was found where it would blow up if you cleared the database without anything in it
+	 */
+	@Test void clearDatabase_empty() {
+		createAlg().clearDatabase();
+	}
+
 	private FeatureSceneRecognition.Features<TD> getFeatures( int imageIdx, List<List<TD>> images ) {
 		return new FeatureSceneRecognition.Features<>() {
 			@Override public Point2D_F64 getPixel( int index ) {