diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000..631ff93b43 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/applications/src/main/java/boofcv/app/CameraCalibrationMonoAssisted.java b/applications/src/main/java/boofcv/app/CameraCalibrationMonoAssisted.java index fc0d7f5f4f..60e3830460 100644 --- a/applications/src/main/java/boofcv/app/CameraCalibrationMonoAssisted.java +++ b/applications/src/main/java/boofcv/app/CameraCalibrationMonoAssisted.java @@ -19,7 +19,7 @@ package boofcv.app; import boofcv.io.webcamcapture.OpenWebcamDialog; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; diff --git a/applications/src/main/java/boofcv/app/CreateAztecCodeDocument.java b/applications/src/main/java/boofcv/app/CreateAztecCodeDocument.java index e8b301c7ed..4aa8fe63b8 100644 --- a/applications/src/main/java/boofcv/app/CreateAztecCodeDocument.java +++ b/applications/src/main/java/boofcv/app/CreateAztecCodeDocument.java @@ -27,7 +27,7 @@ import boofcv.generate.Unit; import boofcv.gui.BoofSwingUtil; import org.apache.commons.io.FilenameUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.Option; @@ -59,7 +59,7 @@ public class CreateAztecCodeDocument extends BaseMarkerDocument { @Option(name = "--Structure", usage = "The marker's structure. COMPACT or FULL") protected String _structure = "FULL"; - public @Nullable AztecCode.Structure structure = null; + public AztecCode.@Nullable Structure structure = null; @Option(name = "--SaveCorners", usage = "Save location of marker corners in the document to corners.txt") boolean saveCorners = false; diff --git a/applications/src/main/java/boofcv/app/CreateCalibrationTargetGenerator.java b/applications/src/main/java/boofcv/app/CreateCalibrationTargetGenerator.java index 4f6450f566..c49b3c54ca 100644 --- a/applications/src/main/java/boofcv/app/CreateCalibrationTargetGenerator.java +++ b/applications/src/main/java/boofcv/app/CreateCalibrationTargetGenerator.java @@ -28,7 +28,7 @@ import org.apache.pdfbox.pdmodel.font.PDType1Font; import org.apache.pdfbox.printing.PDFPageable; import org.apache.pdfbox.util.Matrix; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.*; import java.awt.print.PrinterException; @@ -73,7 +73,7 @@ public class CreateCalibrationTargetGenerator { public float UNIT_TO_POINTS; public static final float CM_TO_POINTS = 72.0f/2.54f; - public CreateCalibrationTargetGenerator( String documentName, PaperSize paper, int rows, int cols, Unit units ) { + public CreateCalibrationTargetGenerator( @Nullable String documentName, PaperSize paper, int rows, int cols, Unit units ) { this.paper = paper; this.rows = rows; this.cols = cols; diff --git a/applications/src/main/java/boofcv/app/CreateFiducialSquareImageGui.java b/applications/src/main/java/boofcv/app/CreateFiducialSquareImageGui.java index a3920c6be4..99f270e4b9 100644 --- a/applications/src/main/java/boofcv/app/CreateFiducialSquareImageGui.java +++ b/applications/src/main/java/boofcv/app/CreateFiducialSquareImageGui.java @@ -25,7 +25,7 @@ import boofcv.io.image.ConvertBufferedImage; import boofcv.io.image.UtilImageIO; import boofcv.struct.image.GrayU8; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.image.BufferedImage; diff --git a/applications/src/main/java/boofcv/app/CreateMicroQrDocument.java b/applications/src/main/java/boofcv/app/CreateMicroQrDocument.java index a1e54973c7..d3ed587bd8 100644 --- a/applications/src/main/java/boofcv/app/CreateMicroQrDocument.java +++ b/applications/src/main/java/boofcv/app/CreateMicroQrDocument.java @@ -29,7 +29,7 @@ import boofcv.generate.Unit; import boofcv.gui.BoofSwingUtil; import org.apache.commons.io.FilenameUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.Option; @@ -58,7 +58,7 @@ public class CreateMicroQrDocument extends BaseMarkerDocument { @Option(name = "-e", aliases = {"--Error"}, usage = "Error correction level. Options: L,M,Q. Robustness: 7%, 15%, 25%, respectively ") protected String _error = ""; - public @Nullable MicroQrCode.ErrorLevel error; + public MicroQrCode.@Nullable ErrorLevel error; @Option(name = "-v", aliases = {"--Version"}, usage = "Micro QR-Code version. Determines size and amount of data. If unspecified it will be automatically selected based on the data. Values 1 to 4.") @@ -67,7 +67,7 @@ public class CreateMicroQrDocument extends BaseMarkerDocument { @Option(name = "-n", aliases = {"--Encoding"}, usage = "Type of data that can be encoded. Default is auto select. Options: NUMERIC, ALPHANUMERIC, BYTE, KANJI") protected String _encoding = "AUTO"; - public @Nullable QrCode.Mode encoding; + public QrCode.@Nullable Mode encoding; @Option(name = "--SaveCorners", usage = "Save location of marker corners in the document to corners.txt") boolean saveCorners = false; diff --git a/applications/src/main/java/boofcv/app/CreateQrCodeDocument.java b/applications/src/main/java/boofcv/app/CreateQrCodeDocument.java index 11ba863dca..d6f0d4ebf0 100644 --- a/applications/src/main/java/boofcv/app/CreateQrCodeDocument.java +++ b/applications/src/main/java/boofcv/app/CreateQrCodeDocument.java @@ -28,7 +28,7 @@ import boofcv.generate.Unit; import boofcv.gui.BoofSwingUtil; import org.apache.commons.io.FilenameUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser; import org.kohsuke.args4j.Option; @@ -58,7 +58,7 @@ public class CreateQrCodeDocument extends BaseMarkerDocument { @Option(name = "-e", aliases = {"--Error"}, usage = "Error correction level. Options: L,M,Q,H. Robustness: 7%, 15%, 25%, 30%, respectively ") protected String _error = "M"; - public @Nullable QrCode.ErrorLevel error; + public QrCode.@Nullable ErrorLevel error; @Option(name = "-v", aliases = {"--Version"}, usage = "QR-Code version. Determines size and amount of data. If unspecified it will be automatically selected based on the data. Values 1 to 40.") @@ -67,7 +67,7 @@ public class CreateQrCodeDocument extends BaseMarkerDocument { @Option(name = "-n", aliases = {"--Encoding"}, usage = "Type of data that can be encoded. Default is auto select. Options: NUMERIC, ALPHANUMERIC, BYTE, KANJI") protected String _encoding = "AUTO"; - public @Nullable QrCode.Mode encoding; + public QrCode.@Nullable Mode encoding; private static void printHelpExit( CmdLineParser parser ) { parser.getProperties().withUsageWidth(120); diff --git a/applications/src/main/java/boofcv/app/FiducialDetection.java b/applications/src/main/java/boofcv/app/FiducialDetection.java index f92e51009a..af450cee5d 100644 --- a/applications/src/main/java/boofcv/app/FiducialDetection.java +++ b/applications/src/main/java/boofcv/app/FiducialDetection.java @@ -45,7 +45,7 @@ import georegression.struct.se.Se3_F64; import georegression.struct.so.Quaternion_F64; import org.ddogleg.struct.DogArray_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.*; import java.awt.image.BufferedImage; diff --git a/applications/src/main/java/boofcv/app/calib/ImageSelectorAndSaver.java b/applications/src/main/java/boofcv/app/calib/ImageSelectorAndSaver.java index 64ae3af47f..8a3d600355 100644 --- a/applications/src/main/java/boofcv/app/calib/ImageSelectorAndSaver.java +++ b/applications/src/main/java/boofcv/app/calib/ImageSelectorAndSaver.java @@ -31,7 +31,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageType; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.image.BufferedImage; import java.io.File; diff --git a/applications/src/main/java/boofcv/app/fiducials/CreateSquareFiducialDocumentPDF.java b/applications/src/main/java/boofcv/app/fiducials/CreateSquareFiducialDocumentPDF.java index dcfba4368b..3dfa26ed6b 100644 --- a/applications/src/main/java/boofcv/app/fiducials/CreateSquareFiducialDocumentPDF.java +++ b/applications/src/main/java/boofcv/app/fiducials/CreateSquareFiducialDocumentPDF.java @@ -24,7 +24,7 @@ import boofcv.pdf.PdfFiducialEngine; import boofcv.struct.image.GrayU8; import org.ddogleg.struct.DogArray_I64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.IOException; @@ -42,7 +42,7 @@ public class CreateSquareFiducialDocumentPDF extends CreateFiducialDocumentPDF { @Nullable DogArray_I64 binaryPatterns; int gridWidth; - @Nullable java.util.List imagePatterns; + java.util.@Nullable List imagePatterns; String markerType = ""; diff --git a/applications/src/main/java/boofcv/app/micrqr/CreateMicroQrControlPanel.java b/applications/src/main/java/boofcv/app/micrqr/CreateMicroQrControlPanel.java index 620639d695..c28d4952e2 100644 --- a/applications/src/main/java/boofcv/app/micrqr/CreateMicroQrControlPanel.java +++ b/applications/src/main/java/boofcv/app/micrqr/CreateMicroQrControlPanel.java @@ -25,7 +25,7 @@ import boofcv.generate.Unit; import boofcv.gui.BoofSwingUtil; import boofcv.gui.StandardAlgConfigPanel; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.event.DocumentEvent; @@ -58,9 +58,9 @@ public class CreateMicroQrControlPanel extends StandardAlgConfigPanel implements int version = -1; String message = "Enter Text Here"; - @Nullable MicroQrCode.ErrorLevel error = null; + MicroQrCode.@Nullable ErrorLevel error = null; @Nullable MicroQrCodeMaskPattern mask = null; - @Nullable QrCode.Mode mode = null; + QrCode.@Nullable Mode mode = null; PaperSize paperSize; boolean fillGrid = false; public boolean drawGrid = false; diff --git a/applications/src/main/java/boofcv/app/qrcode/CreateQrCodeControlPanel.java b/applications/src/main/java/boofcv/app/qrcode/CreateQrCodeControlPanel.java index d3045856ce..63da9f7a06 100644 --- a/applications/src/main/java/boofcv/app/qrcode/CreateQrCodeControlPanel.java +++ b/applications/src/main/java/boofcv/app/qrcode/CreateQrCodeControlPanel.java @@ -24,7 +24,7 @@ import boofcv.generate.Unit; import boofcv.gui.BoofSwingUtil; import boofcv.gui.StandardAlgConfigPanel; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.event.DocumentEvent; @@ -57,9 +57,9 @@ public class CreateQrCodeControlPanel extends StandardAlgConfigPanel implements int version = -1; String message = "Enter Text Here"; - @Nullable QrCode.ErrorLevel error = null; + QrCode.@Nullable ErrorLevel error = null; @Nullable QrCodeMaskPattern mask = null; - @Nullable QrCode.Mode mode = null; + QrCode.@Nullable Mode mode = null; PaperSize paperSize; boolean fillGrid = false; public boolean drawGrid = false; diff --git a/build.gradle b/build.gradle index ee0af61cec..f050b4f7e6 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat plugins { id "com.peterabeles.gversion" version "1.10.3" apply false id "net.ltgt.errorprone" version "3.0.1" apply false - id "com.diffplug.spotless" version "6.9.1" apply false + id "com.diffplug.spotless" version "7.0.2" apply false } ext.libpath = file('./').absolutePath @@ -30,10 +30,9 @@ project.ext.nullaway_version = '0.10.11' project.ext.auto64to32_version = '3.2.2' project.ext.snakeyaml_version = '2.3' project.ext.jmh_version = '1.36' -project.ext.jetnull_version = '23.0.0' project.ext.jsr250_version = '1.0' -project.ext.jsr305_version = '3.0.2' project.ext.trove4j_version = '3.0.3' +project.ext.jspecify_version = '1.0.0' // Which native platforms are supported can be specified in the command line. Otherwise // the default is to support all of them @@ -77,10 +76,8 @@ subprojects { // To make ErrorProne and Kotlin plugins happy configurations.configureEach { resolutionStrategy { - force "org.jetbrains:annotations:$project.jetnull_version" force "com.google.guava:guava:$project.guava_version" force "com.google.errorprone:error_prone_annotations:$project.errorprone_version" - force "com.google.code.findbugs:jsr305:$project.jsr305_version" force 'org.checkerframework:checker-qual:2.10.0' } } @@ -110,7 +107,9 @@ subprojects { sourceSets { // no auto generated code is allowed in this sourceSet. This is to get around cyclical dependencies // See docs/AutoGeneratedCode.md - noauto { java { srcDir 'src/noauto/java' } } + noauto { + java { srcDir 'src/noauto/java' } + } // Ensures the code in noauto is also published main { output.dir(noauto.output) } @@ -137,11 +136,18 @@ subprojects { api("net.sf.trove4j:trove4j:${project.trove4j_version}") compileOnly "org.projectlombok:lombok:${project.lombok_version}" - compileOnly "org.jetbrains:annotations:$project.jetnull_version" // @Nullable + compileOnly "org.jspecify:jspecify:$project.jspecify_version" + + // Static analysis annotations + + noautoCompileOnly("org.jspecify:jspecify:$project.jspecify_version") +// noautoApi("org.jspecify:jspecify:$project.jspecify_version") + + implementation("org.jspecify:jspecify:$project.jspecify_version") + compileOnly "javax.annotation:jsr250-api:$project.jsr250_version" // @Generated noautoCompileOnly "org.projectlombok:lombok:${project.lombok_version}" - noautoCompileOnly "org.jetbrains:annotations:$project.jetnull_version" // @Nullable compileOnly "javax.annotation:jsr250-api:$project.jsr250_version" // @Generated testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version" @@ -272,7 +278,7 @@ subprojects { } spotless { - ratchetFrom 'origin/SNAPSHOT' +// ratchetFrom 'origin/SNAPSHOT' format 'misc', { // define the files to apply `misc` to @@ -280,20 +286,19 @@ subprojects { // define the steps to apply to those files trimTrailingWhitespace() - indentWithTabs() + leadingSpacesToTabs() endWithNewline() } java { // There is currently no good way to exclude files that contain "@Generated" or are not versions. // This should catch most of them with a few false positives. target('**/java/boofcv/**/*.java') - targetExclude('**/*_MT*.java', '**/*_F32.java', '**/generated/*') + targetExclude('**/*_MT*.java', '**/*_F32.java', '**/generated/*', '**/java/boofcv/All.java') toggleOffOn('formatter:off', 'formatter:on') removeUnusedImports() endWithNewline() - - licenseHeaderFile "${project.rootDir}/misc/copyright.txt" + licenseHeaderFile("${project.rootDir}/misc/copyright.txt") } } diff --git a/demonstrations/src/main/java/boofcv/demonstrations/calibration/CalibrateMonocularPlanarApp.java b/demonstrations/src/main/java/boofcv/demonstrations/calibration/CalibrateMonocularPlanarApp.java index 072efdd3eb..f7efd50658 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/calibration/CalibrateMonocularPlanarApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/calibration/CalibrateMonocularPlanarApp.java @@ -59,7 +59,7 @@ import org.apache.commons.io.FilenameUtils; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.filechooser.FileNameExtensionFilter; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/calibration/CalibrateStereoPlanarApp.java b/demonstrations/src/main/java/boofcv/demonstrations/calibration/CalibrateStereoPlanarApp.java index 23fecec7c1..cbca139a4c 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/calibration/CalibrateStereoPlanarApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/calibration/CalibrateStereoPlanarApp.java @@ -54,7 +54,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_B; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/calibration/CommonDetectCalibrationApp.java b/demonstrations/src/main/java/boofcv/demonstrations/calibration/CommonDetectCalibrationApp.java index 3903eca4d3..8c9c1c2c85 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/calibration/CommonDetectCalibrationApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/calibration/CommonDetectCalibrationApp.java @@ -43,7 +43,7 @@ import georegression.struct.point.Point2D_F32; import georegression.struct.point.Point2D_F64; import georegression.struct.shapes.Polygon2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/calibration/DetectCalibrationPanel.java b/demonstrations/src/main/java/boofcv/demonstrations/calibration/DetectCalibrationPanel.java index c39fbf6063..48a6ed8e98 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/calibration/DetectCalibrationPanel.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/calibration/DetectCalibrationPanel.java @@ -24,7 +24,7 @@ import boofcv.gui.BoofSwingUtil; import boofcv.gui.StandardAlgConfigPanel; import boofcv.gui.ViewedImageInfoPanel; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.event.ChangeEvent; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/distort/DeformImageKeyPointsApp.java b/demonstrations/src/main/java/boofcv/demonstrations/distort/DeformImageKeyPointsApp.java index 41e33ee56d..50e4806f43 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/distort/DeformImageKeyPointsApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/distort/DeformImageKeyPointsApp.java @@ -36,7 +36,7 @@ import boofcv.struct.image.ImageType; import boofcv.struct.image.Planar; import georegression.struct.point.Point2D_F32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/enhance/DenoiseVisualizeApp.java b/demonstrations/src/main/java/boofcv/demonstrations/enhance/DenoiseVisualizeApp.java index 9ffa7cd4d5..c7ab1bb4d7 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/enhance/DenoiseVisualizeApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/enhance/DenoiseVisualizeApp.java @@ -45,7 +45,7 @@ import boofcv.struct.image.ImageGray; import boofcv.struct.wavelet.WaveletDescription; import boofcv.struct.wavelet.WlCoef; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/feature/describe/VisualizeHogDescriptorApp.java b/demonstrations/src/main/java/boofcv/demonstrations/feature/describe/VisualizeHogDescriptorApp.java index 9be126b872..754a2e0a4b 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/feature/describe/VisualizeHogDescriptorApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/feature/describe/VisualizeHogDescriptorApp.java @@ -31,7 +31,7 @@ import boofcv.struct.image.ImageType; import georegression.geometry.UtilPoint2D_I32; import georegression.struct.point.Point2D_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.*; import java.awt.event.MouseAdapter; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/feature/describe/VisualizeRegionDescriptionApp.java b/demonstrations/src/main/java/boofcv/demonstrations/feature/describe/VisualizeRegionDescriptionApp.java index 497f910732..6ed156bfeb 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/feature/describe/VisualizeRegionDescriptionApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/feature/describe/VisualizeRegionDescriptionApp.java @@ -35,7 +35,7 @@ import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; import georegression.struct.point.Point2D_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/intensity/IntensityFeaturePyramidApp.java b/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/intensity/IntensityFeaturePyramidApp.java index e0852e1123..09fdd5fc2a 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/intensity/IntensityFeaturePyramidApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/intensity/IntensityFeaturePyramidApp.java @@ -39,7 +39,7 @@ import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; import boofcv.struct.pyramid.PyramidFloat; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/intensity/IntensityPointFeatureApp.java b/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/intensity/IntensityPointFeatureApp.java index 71cc2288e8..23d3c32e72 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/intensity/IntensityPointFeatureApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/intensity/IntensityPointFeatureApp.java @@ -44,7 +44,7 @@ import boofcv.struct.QueueCorner; import boofcv.struct.image.*; import georegression.struct.point.Point2D_I16; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.event.ChangeEvent; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/interest/DetectPointsInsidePyramidApp.java b/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/interest/DetectPointsInsidePyramidApp.java index 0b9ee65617..d1d845e142 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/interest/DetectPointsInsidePyramidApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/interest/DetectPointsInsidePyramidApp.java @@ -32,7 +32,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; import boofcv.struct.pyramid.PyramidFloat; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.image.BufferedImage; import java.util.ArrayList; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/line/DetectLineApp.java b/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/line/DetectLineApp.java index e0f0212e6b..b7adb4ec44 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/line/DetectLineApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/line/DetectLineApp.java @@ -37,7 +37,7 @@ import boofcv.struct.image.ImageType; import georegression.struct.line.LineParametric2D_F32; import georegression.struct.line.LineSegment2D_F32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.event.ChangeEvent; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/line/VisualizeLineRansac.java b/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/line/VisualizeLineRansac.java index 0d703d9539..e588001e9e 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/line/VisualizeLineRansac.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/feature/detect/line/VisualizeLineRansac.java @@ -45,7 +45,7 @@ import org.ddogleg.fitting.modelset.ModelManager; import org.ddogleg.fitting.modelset.ModelMatcherPost; import org.ddogleg.fitting.modelset.ransac.Ransac; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.*; import java.awt.image.BufferedImage; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/fiducial/VisualizeSquareBinaryFiducial.java b/demonstrations/src/main/java/boofcv/demonstrations/fiducial/VisualizeSquareBinaryFiducial.java index 5559a94202..48c48202e8 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/fiducial/VisualizeSquareBinaryFiducial.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/fiducial/VisualizeSquareBinaryFiducial.java @@ -43,7 +43,7 @@ import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageType; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/fiducial/VisualizeSquareFiducial.java b/demonstrations/src/main/java/boofcv/demonstrations/fiducial/VisualizeSquareFiducial.java index 6298f1b36b..da2cd69731 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/fiducial/VisualizeSquareFiducial.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/fiducial/VisualizeSquareFiducial.java @@ -48,7 +48,7 @@ import georegression.struct.point.Point2D_F64; import georegression.struct.shapes.Quadrilateral_F64; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/recognition/DemoSceneRecognitionSimilarImagesApp.java b/demonstrations/src/main/java/boofcv/demonstrations/recognition/DemoSceneRecognitionSimilarImagesApp.java index f8b24cffe4..d8202b8e3e 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/recognition/DemoSceneRecognitionSimilarImagesApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/recognition/DemoSceneRecognitionSimilarImagesApp.java @@ -44,7 +44,7 @@ import gnu.trove.map.hash.TIntIntHashMap; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.event.ListSelectionEvent; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/recognition/MouseSelectImageFeatures.java b/demonstrations/src/main/java/boofcv/demonstrations/recognition/MouseSelectImageFeatures.java index 38e94bb9dd..d1da04067c 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/recognition/MouseSelectImageFeatures.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/recognition/MouseSelectImageFeatures.java @@ -24,7 +24,7 @@ import org.ddogleg.struct.DogArray_B; import org.ddogleg.struct.DogArray_I32; import org.ejml.UtilEjml; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/sfm/d2/ImageMotionInfoPanel.java b/demonstrations/src/main/java/boofcv/demonstrations/sfm/d2/ImageMotionInfoPanel.java index e428f0b40d..bbd75ddce7 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/sfm/d2/ImageMotionInfoPanel.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/sfm/d2/ImageMotionInfoPanel.java @@ -22,7 +22,7 @@ import boofcv.gui.StandardAlgConfigPanel; import boofcv.gui.controls.ControlPanelPointTrackers; import lombok.Getter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.border.EtchedBorder; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/sfm/d2/Motion2DPanel.java b/demonstrations/src/main/java/boofcv/demonstrations/sfm/d2/Motion2DPanel.java index a781228a5b..a6b3c48c2d 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/sfm/d2/Motion2DPanel.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/sfm/d2/Motion2DPanel.java @@ -27,7 +27,7 @@ import georegression.struct.shapes.Quadrilateral_F64; import georegression.transform.homography.HomographyPointOps_F64; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.*; import java.awt.image.BufferedImage; @@ -73,7 +73,7 @@ public void setInliers( java.util.List list ) { inliers.copyAll(list, ( s, d ) -> d.setTo(s)); } - public synchronized void setAllTracks( @Nullable java.util.List list ) { + public synchronized void setAllTracks( java.util.@Nullable List list ) { allTracks.reset(); allTracks.copyAll(list, ( s, d ) -> d.setTo(s)); } diff --git a/demonstrations/src/main/java/boofcv/demonstrations/sfm/d3/VisualOdometryPanel.java b/demonstrations/src/main/java/boofcv/demonstrations/sfm/d3/VisualOdometryPanel.java index c34cae3ce5..22ce40b482 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/sfm/d3/VisualOdometryPanel.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/sfm/d3/VisualOdometryPanel.java @@ -23,7 +23,7 @@ import georegression.geometry.GeometryMath_F64; import georegression.struct.point.Vector3D_F64; import georegression.struct.se.Se3_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.border.EtchedBorder; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/sfm/d3/VisualOdometryPanel2.java b/demonstrations/src/main/java/boofcv/demonstrations/sfm/d3/VisualOdometryPanel2.java index cf8eba9634..2af4d84f40 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/sfm/d3/VisualOdometryPanel2.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/sfm/d3/VisualOdometryPanel2.java @@ -23,7 +23,7 @@ import georegression.geometry.GeometryMath_F64; import georegression.struct.point.Vector3D_F64; import georegression.struct.se.Se3_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.event.ChangeEvent; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/sfm/d3/VisualizeMonocularPlaneVisualOdometryApp.java b/demonstrations/src/main/java/boofcv/demonstrations/sfm/d3/VisualizeMonocularPlaneVisualOdometryApp.java index 4118bbdfd9..d11e799ed7 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/sfm/d3/VisualizeMonocularPlaneVisualOdometryApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/sfm/d3/VisualizeMonocularPlaneVisualOdometryApp.java @@ -49,7 +49,7 @@ import georegression.struct.point.Point3D_F64; import georegression.struct.se.Se3_F64; import georegression.transform.se.SePointOps_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/shapes/DetectBlackPolygonControlPanel.java b/demonstrations/src/main/java/boofcv/demonstrations/shapes/DetectBlackPolygonControlPanel.java index ef777ff456..c30fb5271d 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/shapes/DetectBlackPolygonControlPanel.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/shapes/DetectBlackPolygonControlPanel.java @@ -25,7 +25,7 @@ import boofcv.gui.StandardAlgConfigPanel; import boofcv.gui.controls.JConfigLength; import boofcv.struct.ConnectRule; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.event.ChangeEvent; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/shapes/ShapeFitContourApp.java b/demonstrations/src/main/java/boofcv/demonstrations/shapes/ShapeFitContourApp.java index 15ffd5df9c..e4ba5c49c4 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/shapes/ShapeFitContourApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/shapes/ShapeFitContourApp.java @@ -39,7 +39,7 @@ import boofcv.struct.image.ImageType; import georegression.struct.curve.EllipseRotated_F64; import georegression.struct.point.Point2D_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/demonstrations/src/main/java/boofcv/demonstrations/transform/wavelet/WaveletVisualizeApp.java b/demonstrations/src/main/java/boofcv/demonstrations/transform/wavelet/WaveletVisualizeApp.java index 34b8ee8e3d..a8e07e8076 100644 --- a/demonstrations/src/main/java/boofcv/demonstrations/transform/wavelet/WaveletVisualizeApp.java +++ b/demonstrations/src/main/java/boofcv/demonstrations/transform/wavelet/WaveletVisualizeApp.java @@ -35,7 +35,7 @@ import boofcv.struct.image.ImageGray; import boofcv.struct.wavelet.WaveletDescription; import boofcv.struct.wavelet.WlCoef; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/demonstrations/src/main/java/boofcv/gui/DemonstrationBase.java b/demonstrations/src/main/java/boofcv/gui/DemonstrationBase.java index 69c3489503..0554511239 100644 --- a/demonstrations/src/main/java/boofcv/gui/DemonstrationBase.java +++ b/demonstrations/src/main/java/boofcv/gui/DemonstrationBase.java @@ -32,7 +32,7 @@ import boofcv.misc.BoofMiscOps; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -632,7 +632,7 @@ protected void openVideo( boolean reopen, String... filePaths ) { for (int which = 0; which < filePaths.length; which++) { CacheSequenceStream cache = inputStreams.get(which); - @Nullable SimpleImageSequence sequence = null; + SimpleImageSequence sequence = null; if (new File(filePaths[which]).isDirectory()) { // If it's a directly, try loading an image sequence diff --git a/integration/boofcv-WebcamCapture/src/main/java/boofcv/io/webcamcapture/OpenWebcamDialog.java b/integration/boofcv-WebcamCapture/src/main/java/boofcv/io/webcamcapture/OpenWebcamDialog.java index 7f91b19214..489f0c0fe6 100644 --- a/integration/boofcv-WebcamCapture/src/main/java/boofcv/io/webcamcapture/OpenWebcamDialog.java +++ b/integration/boofcv-WebcamCapture/src/main/java/boofcv/io/webcamcapture/OpenWebcamDialog.java @@ -21,7 +21,7 @@ import boofcv.gui.BoofSwingUtil; import boofcv.gui.StandardAlgConfigPanel; import com.github.sarxos.webcam.Webcam; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-WebcamCapture/src/main/java/boofcv/io/webcamcapture/UtilWebcamCapture.java b/integration/boofcv-WebcamCapture/src/main/java/boofcv/io/webcamcapture/UtilWebcamCapture.java index 1ea31f25af..8075bb4e10 100644 --- a/integration/boofcv-WebcamCapture/src/main/java/boofcv/io/webcamcapture/UtilWebcamCapture.java +++ b/integration/boofcv-WebcamCapture/src/main/java/boofcv/io/webcamcapture/UtilWebcamCapture.java @@ -19,7 +19,7 @@ package boofcv.io.webcamcapture; import com.github.sarxos.webcam.Webcam; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.*; import java.util.List; diff --git a/integration/boofcv-android/build.gradle b/integration/boofcv-android/build.gradle index 841ef81017..1620c3ac49 100644 --- a/integration/boofcv-android/build.gradle +++ b/integration/boofcv-android/build.gradle @@ -41,12 +41,6 @@ repositories { maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" } } -configurations.configureEach { - resolutionStrategy { - force "org.jetbrains:annotations:$project.jetnull_version" - } -} - dependencies { api project(':main:boofcv-ip') api project(':main:boofcv-feature') @@ -61,9 +55,10 @@ dependencies { implementation "androidx.navigation:navigation-ui-ktx:$fragment_version" testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.2.0' - - compileOnly "org.jetbrains:annotations:$project.jetnull_version" // @Nullable - + + // Static analysis annotations + api("org.jspecify:jspecify:$project.jspecify_version") + implementation "androidx.annotation:annotation:1.7.1" annotationProcessor("com.pkware.jabel:jabel-javac-plugin:${project.jabel_version}") diff --git a/integration/boofcv-android/src/main/java/boofcv/android/ConvertBitmap.java b/integration/boofcv-android/src/main/java/boofcv/android/ConvertBitmap.java index f4b21bfd22..096dcc78e8 100644 --- a/integration/boofcv-android/src/main/java/boofcv/android/ConvertBitmap.java +++ b/integration/boofcv-android/src/main/java/boofcv/android/ConvertBitmap.java @@ -22,7 +22,7 @@ import boofcv.alg.color.ColorFormat; import boofcv.struct.image.*; import org.ddogleg.struct.DogArray_I8; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.nio.ByteBuffer; diff --git a/integration/boofcv-android/src/main/java/boofcv/android/ConvertCameraImage.java b/integration/boofcv-android/src/main/java/boofcv/android/ConvertCameraImage.java index 7f0243ac64..cb551925c2 100644 --- a/integration/boofcv-android/src/main/java/boofcv/android/ConvertCameraImage.java +++ b/integration/boofcv-android/src/main/java/boofcv/android/ConvertCameraImage.java @@ -24,7 +24,7 @@ import boofcv.core.encoding.ConvertYuv420_888; import boofcv.struct.image.ImageBase; import org.ddogleg.struct.DogArray_I8; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import java.nio.ByteBuffer; diff --git a/integration/boofcv-android/src/main/java/boofcv/android/VisualizeImageData.java b/integration/boofcv-android/src/main/java/boofcv/android/VisualizeImageData.java index 46f5439865..a90673bdea 100644 --- a/integration/boofcv-android/src/main/java/boofcv/android/VisualizeImageData.java +++ b/integration/boofcv-android/src/main/java/boofcv/android/VisualizeImageData.java @@ -27,7 +27,7 @@ import georegression.struct.point.Point2D_I32; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I8; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/integration/boofcv-android/src/main/java/boofcv/android/camera2/CameraID.java b/integration/boofcv-android/src/main/java/boofcv/android/camera2/CameraID.java index 12dd547bae..0e80dd368c 100644 --- a/integration/boofcv-android/src/main/java/boofcv/android/camera2/CameraID.java +++ b/integration/boofcv-android/src/main/java/boofcv/android/camera2/CameraID.java @@ -18,7 +18,7 @@ package boofcv.android.camera2; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/integration/boofcv-javacv/src/main/java/boofcv/javacv/ConvertIplImage.java b/integration/boofcv-javacv/src/main/java/boofcv/javacv/ConvertIplImage.java index cc1b55c799..78ee4543cf 100644 --- a/integration/boofcv-javacv/src/main/java/boofcv/javacv/ConvertIplImage.java +++ b/integration/boofcv-javacv/src/main/java/boofcv/javacv/ConvertIplImage.java @@ -20,7 +20,7 @@ import boofcv.core.image.GeneralizedImageOps; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.nio.*; diff --git a/integration/boofcv-kotlin/build.gradle b/integration/boofcv-kotlin/build.gradle index aa8744e62e..af6ec236da 100644 --- a/integration/boofcv-kotlin/build.gradle +++ b/integration/boofcv-kotlin/build.gradle @@ -4,7 +4,6 @@ plugins { configurations.all { resolutionStrategy { - force "org.jetbrains:annotations:$project.jetnull_version" force "org.jetbrains.kotlin:kotlin-stdlib:1.7.22" force "org.jetbrains.kotlin:kotlin-stdlib-common:1.7.22" } @@ -12,7 +11,6 @@ configurations.all { configurations { [annotationProcessor, testAnnotationProcessor].each { - it.resolutionStrategy.force "com.google.code.findbugs:jsr305:$project.jsr305_version" it.resolutionStrategy.force "com.google.errorprone:error_prone_annotations:$project.errorprone_version" it.resolutionStrategy.force "com.google.guava:guava:$project.guava_version" it.resolutionStrategy.force "org.checkerframework:checker-qual:2.10.0" diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/ApplicationLauncherApp.java b/integration/boofcv-swing/src/main/java/boofcv/gui/ApplicationLauncherApp.java index 59014460c2..e412e6752e 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/ApplicationLauncherApp.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/ApplicationLauncherApp.java @@ -24,7 +24,7 @@ import boofcv.misc.BoofMiscOps; import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea; import org.fife.ui.rsyntaxtextarea.SyntaxConstants; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.event.DocumentEvent; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/BoofSwingUtil.java b/integration/boofcv-swing/src/main/java/boofcv/gui/BoofSwingUtil.java index a5c7f2add4..fa31c830d6 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/BoofSwingUtil.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/BoofSwingUtil.java @@ -43,7 +43,7 @@ import org.apache.commons.io.FilenameUtils; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.VerbosePrint; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; @@ -178,7 +178,7 @@ public static File ensureSuffix( File f, String suffix ) { return response; } - public static @Nullable OpenStereoSequencesChooser.Selected openStereoChooser( + public static OpenStereoSequencesChooser.@Nullable Selected openStereoChooser( Window parent, @Nullable Class owner, boolean isSequence, boolean justImages ) { Preferences prefs; if (owner == null) { @@ -277,7 +277,7 @@ public static void saveDefaultPath( @Nullable Object parent, @Nullable String ke @Nullable Component parent, boolean openFile, String defaultPath, - @Nullable BoofLambdas.MassageString massageName, + BoofLambdas.@Nullable MassageString massageName, FileTypes... filters ) { if (preferenceName == null && parent != null) { diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/JavaRuntimeLauncher.java b/integration/boofcv-swing/src/main/java/boofcv/gui/JavaRuntimeLauncher.java index 5c54fe85f3..e147ecc8dd 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/JavaRuntimeLauncher.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/JavaRuntimeLauncher.java @@ -18,7 +18,7 @@ package boofcv.gui; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.BufferedReader; import java.io.IOException; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/PointCloudViewerPanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/PointCloudViewerPanel.java index 594065ed8e..cb546241a7 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/PointCloudViewerPanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/PointCloudViewerPanel.java @@ -25,7 +25,7 @@ import georegression.struct.point.Point3D_F64; import lombok.Getter; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/StandardAlgConfigPanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/StandardAlgConfigPanel.java index 441a3e6e02..37bb6d403a 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/StandardAlgConfigPanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/StandardAlgConfigPanel.java @@ -23,7 +23,7 @@ import boofcv.gui.controls.JSpinnerNumber; import boofcv.misc.BoofLambdas; import boofcv.struct.ConfigLength; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.border.EtchedBorder; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/binary/VisualizeBinaryData.java b/integration/boofcv-swing/src/main/java/boofcv/gui/binary/VisualizeBinaryData.java index c40db61dcf..b753139608 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/binary/VisualizeBinaryData.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/binary/VisualizeBinaryData.java @@ -25,7 +25,7 @@ import boofcv.struct.image.GrayS32; import boofcv.struct.image.GrayU8; import georegression.struct.point.Point2D_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.*; import java.awt.geom.Line2D; @@ -40,7 +40,7 @@ */ public class VisualizeBinaryData { public static BufferedImage renderContours( List edges, - @Nullable int[] colors, + int @Nullable [] colors, int width, int height, @Nullable BufferedImage out ) { if (out == null) { @@ -114,7 +114,7 @@ public static BufferedImage renderContours( List contours, int colorExt * @return Rendered contours */ public static BufferedImage renderContours( List contours, - @Nullable int[] colorExternal, int colorInternal, + int @Nullable [] colorExternal, int colorInternal, int width, int height, @Nullable BufferedImage out ) { if (out == null) { out = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); @@ -162,7 +162,7 @@ public static void render( List contours, int[] colors, BufferedImage o } } - public static int[] checkColors( @Nullable int[] colors, int size ) { + public static int[] checkColors( int @Nullable [] colors, int size ) { if (colors == null) { colors = new int[size]; Random rand = new Random(123); diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/DisplayCalibrationPanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/DisplayCalibrationPanel.java index f36dae7f58..96c6ef8069 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/DisplayCalibrationPanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/DisplayCalibrationPanel.java @@ -31,7 +31,7 @@ import georegression.struct.point.Point2D_F64; import lombok.Getter; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/DisplayFisheyeCalibrationPanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/DisplayFisheyeCalibrationPanel.java index 2e5a18a584..5311c355fe 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/DisplayFisheyeCalibrationPanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/DisplayFisheyeCalibrationPanel.java @@ -42,7 +42,7 @@ import georegression.struct.point.Vector3D_F32; import georegression.struct.so.Rodrigues_F32; import org.ejml.data.FMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/DisplayPinholeCalibrationPanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/DisplayPinholeCalibrationPanel.java index 53ecae80ee..dedf814e05 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/DisplayPinholeCalibrationPanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/DisplayPinholeCalibrationPanel.java @@ -37,7 +37,7 @@ import org.ejml.data.DMatrixRMaj; import org.ejml.data.FMatrixRMaj; import org.ejml.ops.ConvertMatrixData; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/UtilCalibrationGui.java b/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/UtilCalibrationGui.java index 7982a3ad5e..744aee2a56 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/UtilCalibrationGui.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/calibration/UtilCalibrationGui.java @@ -35,7 +35,7 @@ import boofcv.struct.geo.PointIndex2D_F64; import georegression.struct.point.Point2D_F32; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.*; import java.awt.geom.AffineTransform; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/controls/ControlPanelHybridTracker.java b/integration/boofcv-swing/src/main/java/boofcv/gui/controls/ControlPanelHybridTracker.java index ce6849e7b2..76647c63c6 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/controls/ControlPanelHybridTracker.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/controls/ControlPanelHybridTracker.java @@ -32,7 +32,7 @@ import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; import boofcv.struct.pyramid.ConfigDiscreteLevels; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/controls/ControlPanelPointTrackerKlt.java b/integration/boofcv-swing/src/main/java/boofcv/gui/controls/ControlPanelPointTrackerKlt.java index 82f3d37c1e..dd03ff1f2a 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/controls/ControlPanelPointTrackerKlt.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/controls/ControlPanelPointTrackerKlt.java @@ -26,7 +26,7 @@ import boofcv.gui.feature.ControlPanelPointDetector; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/controls/ControlPanelPointTrackers.java b/integration/boofcv-swing/src/main/java/boofcv/gui/controls/ControlPanelPointTrackers.java index 238c117189..796b2b6778 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/controls/ControlPanelPointTrackers.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/controls/ControlPanelPointTrackers.java @@ -25,7 +25,7 @@ import boofcv.gui.StandardAlgConfigPanel; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/controls/JPyramidLevels.java b/integration/boofcv-swing/src/main/java/boofcv/gui/controls/JPyramidLevels.java index 3da7d4287f..295e01a737 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/controls/JPyramidLevels.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/controls/JPyramidLevels.java @@ -20,7 +20,7 @@ import boofcv.gui.BoofSwingUtil; import boofcv.struct.pyramid.ConfigDiscreteLevels; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/d3/PointCloudViewerPanelSwing.java b/integration/boofcv-swing/src/main/java/boofcv/gui/d3/PointCloudViewerPanelSwing.java index f570867f49..66daed1971 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/d3/PointCloudViewerPanelSwing.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/d3/PointCloudViewerPanelSwing.java @@ -43,7 +43,7 @@ import org.ddogleg.struct.BigDogArray_I32; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_B; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -88,7 +88,7 @@ public class PointCloudViewerPanelSwing extends JPanel // If true then fog is rendered. This makes points fade to background color at a distance boolean fog; - @Nullable PointCloudViewer.Colorizer colorizer; + PointCloudViewer.@Nullable Colorizer colorizer; // intrinsic camera parameters float hfov = UtilAngle.radian(50); @@ -307,7 +307,7 @@ private void projectScene() { } private void renderCloud( CameraPinhole intrinsic, - final @Nullable PointCloudViewer.Colorizer colorizer, + final PointCloudViewer.@Nullable Colorizer colorizer, float maxDistanceSq ) { if (!rendering.lock.isLocked()) throw new RuntimeException("Must be locked already"); diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/d3/PointCloudViewerSwing.java b/integration/boofcv-swing/src/main/java/boofcv/gui/d3/PointCloudViewerSwing.java index ad8e25ed97..79773931cf 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/d3/PointCloudViewerSwing.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/d3/PointCloudViewerSwing.java @@ -31,7 +31,7 @@ import georegression.struct.se.Se3_F64; import org.ddogleg.struct.BigDogArray_I32; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.util.List; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/FileBrowser.java b/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/FileBrowser.java index 20d5ed2b36..648c936599 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/FileBrowser.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/FileBrowser.java @@ -19,7 +19,7 @@ package boofcv.gui.dialogs; import boofcv.gui.BoofSwingUtil; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.border.EmptyBorder; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/FilePreviewChooser.java b/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/FilePreviewChooser.java index 91fd1ca33d..6913527a20 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/FilePreviewChooser.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/FilePreviewChooser.java @@ -28,7 +28,7 @@ import boofcv.struct.image.InterleavedU8; import lombok.Getter; import lombok.Setter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.event.AncestorEvent; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/JSpringPanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/JSpringPanel.java index ff45d86b3d..696bbe2571 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/JSpringPanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/JSpringPanel.java @@ -18,7 +18,7 @@ package boofcv.gui.dialogs; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.event.ChangeListener; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/OpenImageSetDialog.java b/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/OpenImageSetDialog.java index e02d682afd..f8d9345894 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/OpenImageSetDialog.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/OpenImageSetDialog.java @@ -22,7 +22,7 @@ import boofcv.gui.image.ImagePanel; import boofcv.io.UtilIO; import boofcv.io.image.UtilImageIO; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import javax.swing.event.ListSelectionEvent; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/OpenStereoSequencesChooser.java b/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/OpenStereoSequencesChooser.java index 93157ae880..b0dfb31af3 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/OpenStereoSequencesChooser.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/dialogs/OpenStereoSequencesChooser.java @@ -25,7 +25,7 @@ import boofcv.io.image.UtilImageIO; import boofcv.misc.BoofLambdas; import boofcv.struct.calib.StereoParameters; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/edge/VisualizeEdgeFeatures.java b/integration/boofcv-swing/src/main/java/boofcv/gui/edge/VisualizeEdgeFeatures.java index 931b77efcc..c6db6b15de 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/edge/VisualizeEdgeFeatures.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/edge/VisualizeEdgeFeatures.java @@ -22,7 +22,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayS8; import boofcv.struct.image.GrayU8; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.*; import java.awt.image.BufferedImage; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/AssociationPanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/AssociationPanel.java index 8100609e42..99bf37507f 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/AssociationPanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/AssociationPanel.java @@ -22,7 +22,7 @@ import boofcv.struct.geo.AssociatedPair; import georegression.struct.point.Point2D_F64; import org.ddogleg.struct.FastAccess; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.*; import java.awt.event.MouseListener; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/CompareTwoImagePanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/CompareTwoImagePanel.java index a4d5d385a0..9c214b8207 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/CompareTwoImagePanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/CompareTwoImagePanel.java @@ -22,7 +22,7 @@ import georegression.struct.point.Point2D_F64; import georegression.struct.point.Point2D_I32; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelAssociateGreedy.java b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelAssociateGreedy.java index 00408a1ebf..9a708f783c 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelAssociateGreedy.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelAssociateGreedy.java @@ -21,7 +21,7 @@ import boofcv.factory.feature.associate.ConfigAssociateGreedy; import boofcv.gui.StandardAlgConfigPanel; import lombok.Getter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelAssociateNearestNeighbor.java b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelAssociateNearestNeighbor.java index 9149076c13..0adf9092a3 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelAssociateNearestNeighbor.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelAssociateNearestNeighbor.java @@ -20,7 +20,7 @@ import boofcv.factory.feature.associate.ConfigAssociateNearestNeighbor; import boofcv.gui.StandardAlgConfigPanel; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelDescribeBrief.java b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelDescribeBrief.java index 218e943242..ac8937523e 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelDescribeBrief.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelDescribeBrief.java @@ -20,7 +20,7 @@ import boofcv.abst.feature.describe.ConfigBrief; import boofcv.gui.StandardAlgConfigPanel; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelDescribeSift.java b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelDescribeSift.java index b0a20bbb54..ba8d597ab1 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelDescribeSift.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelDescribeSift.java @@ -20,7 +20,7 @@ import boofcv.abst.feature.describe.ConfigSiftDescribe; import boofcv.gui.StandardAlgConfigPanel; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelFastHessian.java b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelFastHessian.java index 4e0ec62125..fcd1ae09e5 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelFastHessian.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelFastHessian.java @@ -21,7 +21,7 @@ import boofcv.abst.feature.detect.interest.ConfigFastHessian; import boofcv.factory.feature.detect.selector.SelectLimitTypes; import boofcv.gui.StandardAlgConfigPanel; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelSiftDetector.java b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelSiftDetector.java index bc9aabf540..c0621004f7 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelSiftDetector.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ControlPanelSiftDetector.java @@ -23,7 +23,7 @@ import boofcv.factory.feature.detect.selector.SelectLimitTypes; import boofcv.gui.StandardAlgConfigPanel; import boofcv.gui.image.ShowImages; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ScaleSpacePyramidPointPanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ScaleSpacePyramidPointPanel.java index 2e1f087a4b..e3ab8f17c0 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ScaleSpacePyramidPointPanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/ScaleSpacePyramidPointPanel.java @@ -24,7 +24,7 @@ import boofcv.struct.feature.ScalePoint; import boofcv.struct.image.ImageGray; import boofcv.struct.pyramid.PyramidFloat; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/SelectRegionDescriptionPanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/SelectRegionDescriptionPanel.java index 893a09459e..d787b2074c 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/SelectRegionDescriptionPanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/SelectRegionDescriptionPanel.java @@ -22,7 +22,7 @@ import georegression.geometry.UtilPoint2D_I32; import georegression.struct.point.Point2D_I32; import lombok.Setter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/TupleDescPanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/TupleDescPanel.java index 32d86bf768..1d4352661c 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/TupleDescPanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/TupleDescPanel.java @@ -19,7 +19,7 @@ package boofcv.gui.feature; import boofcv.struct.feature.TupleDesc; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -49,7 +49,7 @@ public synchronized void paintComponent( Graphics g ) { Graphics2D g2 = (Graphics2D)g; - @Nullable TupleDesc desc = this.desc; + TupleDesc desc = this.desc; if (desc == null) { g2.setColor(Color.WHITE); g2.fillRect(0, 0, getWidth(), getHeight()); diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/VisualizeRegions.java b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/VisualizeRegions.java index 3a49b1b092..c290f98cb6 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/feature/VisualizeRegions.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/feature/VisualizeRegions.java @@ -23,7 +23,7 @@ import boofcv.struct.image.GrayS32; import boofcv.struct.image.GrayU8; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.image.BufferedImage; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/image/AnimatePanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/image/AnimatePanel.java index 61b340a97f..f44158572f 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/image/AnimatePanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/image/AnimatePanel.java @@ -19,7 +19,7 @@ package boofcv.gui.image; import boofcv.misc.BoofMiscOps; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/image/ImageBinaryLabeledPanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/image/ImageBinaryLabeledPanel.java index f7c0b39567..dc3b9840a9 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/image/ImageBinaryLabeledPanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/image/ImageBinaryLabeledPanel.java @@ -21,7 +21,7 @@ import boofcv.alg.filter.binary.BinaryImageOps; import boofcv.gui.binary.VisualizeBinaryData; import boofcv.struct.image.GrayS32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/image/ImagePanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/image/ImagePanel.java index e975236d80..0aa4729279 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/image/ImagePanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/image/ImagePanel.java @@ -19,7 +19,7 @@ package boofcv.gui.image; import boofcv.gui.BoofSwingUtil; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -56,7 +56,7 @@ public ImagePanel( BufferedImage img ) { this(img, ScaleOptions.NONE); } - public ImagePanel( final BufferedImage img, ScaleOptions scaling ) { + public ImagePanel( final @Nullable BufferedImage img, ScaleOptions scaling ) { this(true); this.img = img; this.scaling = scaling; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/image/ImageZoomPanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/image/ImageZoomPanel.java index 00d3741827..9af854d587 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/image/ImageZoomPanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/image/ImageZoomPanel.java @@ -20,7 +20,7 @@ import boofcv.io.image.ConvertBufferedImage; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/image/PlaybackImageSequence.java b/integration/boofcv-swing/src/main/java/boofcv/gui/image/PlaybackImageSequence.java index 733aa4dabf..3442041b78 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/image/PlaybackImageSequence.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/image/PlaybackImageSequence.java @@ -20,7 +20,7 @@ import boofcv.io.image.SimpleImageSequence; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.image.BufferedImage; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/image/SelectInputImageToolBar.java b/integration/boofcv-swing/src/main/java/boofcv/gui/image/SelectInputImageToolBar.java index 1cdaacbbdb..15ee577264 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/image/SelectInputImageToolBar.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/image/SelectInputImageToolBar.java @@ -18,7 +18,7 @@ package boofcv.gui.image; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -64,7 +64,7 @@ public void addImage( final String menuName, final Object cookie ) { SwingUtilities.invokeLater(() -> imageMenu.addItem(menuName)); } - public void setListener( Listener listener ) { + public void setListener( @Nullable Listener listener ) { this.listener = listener; } diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/image/VisualizeImageData.java b/integration/boofcv-swing/src/main/java/boofcv/gui/image/VisualizeImageData.java index faa117c07e..c1cf493a84 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/image/VisualizeImageData.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/image/VisualizeImageData.java @@ -24,7 +24,7 @@ import boofcv.io.image.ConvertBufferedImage; import boofcv.io.image.ConvertRaster; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.image.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/mesh/FirstPersonCameraControl.java b/integration/boofcv-swing/src/main/java/boofcv/gui/mesh/FirstPersonCameraControl.java index 123888198f..97332c40bd 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/mesh/FirstPersonCameraControl.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/mesh/FirstPersonCameraControl.java @@ -26,7 +26,7 @@ import lombok.Setter; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/mesh/MeshViewerPanel.java b/integration/boofcv-swing/src/main/java/boofcv/gui/mesh/MeshViewerPanel.java index 1a90903559..2377660744 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/mesh/MeshViewerPanel.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/mesh/MeshViewerPanel.java @@ -34,7 +34,7 @@ import lombok.Setter; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/integration/boofcv-swing/src/main/java/boofcv/gui/settings/GlobalSettingsControls.java b/integration/boofcv-swing/src/main/java/boofcv/gui/settings/GlobalSettingsControls.java index 91d91e7b3e..37aa1f0ab7 100644 --- a/integration/boofcv-swing/src/main/java/boofcv/gui/settings/GlobalSettingsControls.java +++ b/integration/boofcv-swing/src/main/java/boofcv/gui/settings/GlobalSettingsControls.java @@ -22,7 +22,7 @@ import boofcv.gui.StandardAlgConfigPanel; import boofcv.gui.dialogs.JSpringPanel; import com.github.weisj.darklaf.LafManager; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/main/autocode/src/main/java/boofcv/generate/CodeGeneratorBase.java b/main/autocode/src/main/java/boofcv/generate/CodeGeneratorBase.java index 897f1dbc8d..3787d84fc4 100644 --- a/main/autocode/src/main/java/boofcv/generate/CodeGeneratorBase.java +++ b/main/autocode/src/main/java/boofcv/generate/CodeGeneratorBase.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.Setter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.*; import java.nio.charset.Charset; diff --git a/main/boofcv-feature/src/generate/java/boofcv/alg/feature/detect/intensity/impl/GenerateImplIntegralImageFeatureIntensity.java b/main/boofcv-feature/src/generate/java/boofcv/alg/feature/detect/intensity/impl/GenerateImplIntegralImageFeatureIntensity.java index c548941541..0315e0bba6 100644 --- a/main/boofcv-feature/src/generate/java/boofcv/alg/feature/detect/intensity/impl/GenerateImplIntegralImageFeatureIntensity.java +++ b/main/boofcv-feature/src/generate/java/boofcv/alg/feature/detect/intensity/impl/GenerateImplIntegralImageFeatureIntensity.java @@ -40,7 +40,7 @@ private void printPreamble() { "import boofcv.alg.transform.ii.IntegralImageOps;\n" + "import boofcv.alg.transform.ii.IntegralKernel;\n" + "import boofcv.struct.image.*;\n" + - "import org.jetbrains.annotations.Nullable;\n" + + "import org.jspecify.annotations.Nullable;\n" + "import javax.annotation.Generated;\n" + "//CONCURRENT_INLINE import boofcv.concurrency.BoofConcurrency;\n" + "//CONCURRENT_INLINE import static boofcv.alg.feature.detect.intensity.impl.ImplIntegralImageFeatureIntensity.computeHessian;\n" + diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/associate/AssociateDescriptionHashSets.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/associate/AssociateDescriptionHashSets.java index 797d504b88..06ff9e01a7 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/associate/AssociateDescriptionHashSets.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/associate/AssociateDescriptionHashSets.java @@ -22,7 +22,7 @@ import gnu.trove.map.TIntIntMap; import gnu.trove.map.hash.TIntIntHashMap; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Feature set aware association algorithm for use when there is a large sparse set of unique set ID's. Internally diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detdesc/DetectDescribeFusion.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detdesc/DetectDescribeFusion.java index f32ceaa2dd..9b1e041875 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detdesc/DetectDescribeFusion.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detdesc/DetectDescribeFusion.java @@ -28,7 +28,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_F64; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Wrapper class around independent feature detectors, region orientation, and descriptors, that allow diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/NonMaxLimiter.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/NonMaxLimiter.java index e1e40d45b9..9da8e880e1 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/NonMaxLimiter.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/NonMaxLimiter.java @@ -28,7 +28,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Adds the ability to specify the maximum number of points that you wish to return. The selected diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/NonMaxSuppression.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/NonMaxSuppression.java index cc26c830b3..7f38d7e8c5 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/NonMaxSuppression.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/NonMaxSuppression.java @@ -21,7 +21,7 @@ import boofcv.struct.ListIntPoint2D; import boofcv.struct.QueueCorner; import boofcv.struct.image.GrayF32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/WrapperNonMaxCandidate.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/WrapperNonMaxCandidate.java index 988ab58541..c4f601ebfb 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/WrapperNonMaxCandidate.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/WrapperNonMaxCandidate.java @@ -22,7 +22,7 @@ import boofcv.struct.ListIntPoint2D; import boofcv.struct.QueueCorner; import boofcv.struct.image.GrayF32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Wrapper around the {@link boofcv.alg.feature.detect.extract.NonMaxCandidate} class. diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/WrapperNonMaximumBlock.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/WrapperNonMaximumBlock.java index 4b356f246c..a57428b0cc 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/WrapperNonMaximumBlock.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/WrapperNonMaximumBlock.java @@ -22,7 +22,7 @@ import boofcv.struct.ListIntPoint2D; import boofcv.struct.QueueCorner; import boofcv.struct.image.GrayF32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Wrapper around the {@link boofcv.alg.feature.detect.extract.NonMaxBlock} class. diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/WrapperNonMaximumNaive.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/WrapperNonMaximumNaive.java index a9c12af38b..8be0474814 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/WrapperNonMaximumNaive.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/extract/WrapperNonMaximumNaive.java @@ -22,7 +22,7 @@ import boofcv.struct.ListIntPoint2D; import boofcv.struct.QueueCorner; import boofcv.struct.image.GrayF32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/BaseGeneralFeatureIntensity.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/BaseGeneralFeatureIntensity.java index 7122421c70..1acf048d67 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/BaseGeneralFeatureIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/BaseGeneralFeatureIntensity.java @@ -21,7 +21,7 @@ import boofcv.alg.misc.GImageMiscOps; import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides some basic functionality for implementing {@link GeneralFeatureIntensity}. diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/GeneralFeatureIntensity.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/GeneralFeatureIntensity.java index f737d92792..360e42f8ac 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/GeneralFeatureIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/GeneralFeatureIntensity.java @@ -21,7 +21,7 @@ import boofcv.struct.ListIntPoint2D; import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Extracts corners from a the image and or its gradient. This is a generalized interface and lacks some of the functionality diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperFastCornerIntensity.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperFastCornerIntensity.java index 22b35c1a06..24857d2642 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperFastCornerIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperFastCornerIntensity.java @@ -21,7 +21,7 @@ import boofcv.alg.feature.detect.intensity.FastCornerDetector; import boofcv.struct.ListIntPoint2D; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Wrapper around {@link FastCornerDetector} for {@link GeneralFeatureIntensity}. diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperGradientCornerIntensity.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperGradientCornerIntensity.java index 20cb5cd6a1..f2843055a3 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperGradientCornerIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperGradientCornerIntensity.java @@ -21,7 +21,7 @@ import boofcv.alg.feature.detect.intensity.GradientCornerIntensity; import boofcv.struct.ListIntPoint2D; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperHessianDerivBlobIntensity.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperHessianDerivBlobIntensity.java index 00cce5f003..fa43e6eda5 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperHessianDerivBlobIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperHessianDerivBlobIntensity.java @@ -22,7 +22,7 @@ import boofcv.struct.ListIntPoint2D; import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperHessianThreeImageDetIntensity.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperHessianThreeImageDetIntensity.java index 68378d794f..df09739601 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperHessianThreeImageDetIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperHessianThreeImageDetIntensity.java @@ -27,7 +27,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Computes the Hessian determinant directory from the input image. Ignores other derivatives passed on diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperKitRosCornerIntensity.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperKitRosCornerIntensity.java index 3c980ad942..83ec68a281 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperKitRosCornerIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperKitRosCornerIntensity.java @@ -22,7 +22,7 @@ import boofcv.struct.ListIntPoint2D; import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperLaplacianBlobIntensity.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperLaplacianBlobIntensity.java index e4e1aa949e..bab9811686 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperLaplacianBlobIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperLaplacianBlobIntensity.java @@ -25,7 +25,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Wrapper around {@link DerivativeLaplacian} for {@link BaseGeneralFeatureIntensity}. diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperMedianCornerIntensity.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperMedianCornerIntensity.java index eac6e6f417..17c4ab0ce1 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperMedianCornerIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/intensity/WrapperMedianCornerIntensity.java @@ -23,7 +23,7 @@ import boofcv.struct.ListIntPoint2D; import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/interest/GeneralToInterestPoint.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/interest/GeneralToInterestPoint.java index 803e90bc85..5d83599831 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/interest/GeneralToInterestPoint.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/interest/GeneralToInterestPoint.java @@ -28,7 +28,7 @@ import georegression.struct.point.Point2D_F64; import georegression.struct.point.Point2D_I16; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Wrapper around {@link boofcv.alg.feature.detect.interest.GeneralFeatureDetector} to make it compatible with {@link InterestPointDetector}. diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/line/DetectLineHoughFootSubimage.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/line/DetectLineHoughFootSubimage.java index fa5c73e06e..d7199d8fa7 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/line/DetectLineHoughFootSubimage.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/line/DetectLineHoughFootSubimage.java @@ -31,7 +31,7 @@ import boofcv.struct.image.ImageGray; import georegression.struct.line.LineParametric2D_F32; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/line/DetectLineSegmentsGridRansac.java b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/line/DetectLineSegmentsGridRansac.java index 2b17b541d9..8181a9bd10 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/line/DetectLineSegmentsGridRansac.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/feature/detect/line/DetectLineSegmentsGridRansac.java @@ -30,7 +30,7 @@ import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; import georegression.struct.line.LineSegment2D_F32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrack.java b/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrack.java index 75bb2000f9..3654502c50 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrack.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrack.java @@ -19,7 +19,7 @@ package boofcv.abst.tracker; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTracker.java b/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTracker.java index f16a999896..4313e6b83c 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTracker.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTracker.java @@ -20,7 +20,7 @@ import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerDda.java b/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerDda.java index 46aaa23bd8..b79e947b3c 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerDda.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerDda.java @@ -22,7 +22,7 @@ import boofcv.struct.feature.TupleDesc; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerDefault.java b/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerDefault.java index 710111f709..78cc27d070 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerDefault.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerDefault.java @@ -20,7 +20,7 @@ import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerHybrid.java b/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerHybrid.java index 48ca30c6a4..e583d3844a 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerHybrid.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerHybrid.java @@ -31,7 +31,7 @@ import boofcv.struct.pyramid.ConfigDiscreteLevels; import boofcv.struct.pyramid.PyramidDiscrete; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerKltPyramid.java b/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerKltPyramid.java index c6f9d77eca..ae46d19b94 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerKltPyramid.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerKltPyramid.java @@ -33,7 +33,7 @@ import georegression.struct.point.Point2D_I16; import lombok.Getter; import lombok.Setter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerUtils.java b/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerUtils.java index 0ae130be98..871da08278 100644 --- a/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerUtils.java +++ b/main/boofcv-feature/src/main/java/boofcv/abst/tracker/PointTrackerUtils.java @@ -18,7 +18,7 @@ package boofcv.abst.tracker; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/background/stationary/BackgroundStationaryGmm.java b/main/boofcv-feature/src/main/java/boofcv/alg/background/stationary/BackgroundStationaryGmm.java index c1817b907d..9b55d55e31 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/background/stationary/BackgroundStationaryGmm.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/background/stationary/BackgroundStationaryGmm.java @@ -24,7 +24,7 @@ import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

Implementation of {@link BackgroundAlgorithmGmm} for stationary images.

diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/background/stationary/BackgroundStationaryGmm_MB.java b/main/boofcv-feature/src/main/java/boofcv/alg/background/stationary/BackgroundStationaryGmm_MB.java index 66391a0534..e3febf5d02 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/background/stationary/BackgroundStationaryGmm_MB.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/background/stationary/BackgroundStationaryGmm_MB.java @@ -23,7 +23,7 @@ import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageMultiBand; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; //CONCURRENT_INLINE import boofcv.concurrency.BoofConcurrency; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/background/stationary/BackgroundStationaryGmm_SB.java b/main/boofcv-feature/src/main/java/boofcv/alg/background/stationary/BackgroundStationaryGmm_SB.java index 50f45f4c55..18207639f8 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/background/stationary/BackgroundStationaryGmm_SB.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/background/stationary/BackgroundStationaryGmm_SB.java @@ -23,7 +23,7 @@ import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; //CONCURRENT_INLINE import boofcv.concurrency.BoofConcurrency; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/describe/llah/LlahFeature.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/describe/llah/LlahFeature.java index b6d8b8644e..3ab328c1d3 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/describe/llah/LlahFeature.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/describe/llah/LlahFeature.java @@ -18,7 +18,7 @@ package boofcv.alg.feature.describe.llah; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Arrays; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/edge/CannyEdge.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/edge/CannyEdge.java index a3cbf8c24b..d0d16455e2 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/edge/CannyEdge.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/edge/CannyEdge.java @@ -27,7 +27,7 @@ import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; import georegression.struct.point.Point2D_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; import java.util.Objects; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/edge/CannyEdgeDynamic.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/edge/CannyEdgeDynamic.java index 66a4580496..4b63eb0312 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/edge/CannyEdgeDynamic.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/edge/CannyEdgeDynamic.java @@ -24,7 +24,7 @@ import boofcv.alg.misc.ImageStatistics; import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Canny edge detector where the thresholds are computed dynamically based upon the magnitude of the largest edge diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlock.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlock.java index 5f00696b0c..ba1d618a70 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlock.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlock.java @@ -20,7 +20,7 @@ import boofcv.struct.QueueCorner; import boofcv.struct.image.GrayF32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlockSearchRelaxed.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlockSearchRelaxed.java index c8f2e7a476..ced57f4cdc 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlockSearchRelaxed.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlockSearchRelaxed.java @@ -21,7 +21,7 @@ import boofcv.struct.QueueCorner; import boofcv.struct.image.GrayF32; import georegression.struct.point.Point2D_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlockSearchStrict.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlockSearchStrict.java index 7c57f2561d..0876c59b90 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlockSearchStrict.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlockSearchStrict.java @@ -20,7 +20,7 @@ import boofcv.struct.QueueCorner; import boofcv.struct.image.GrayF32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlock_MT.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlock_MT.java index 66f5798ad2..5b37277a44 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlock_MT.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxBlock_MT.java @@ -21,7 +21,7 @@ import boofcv.concurrency.BoofConcurrency; import boofcv.struct.QueueCorner; import boofcv.struct.image.GrayF32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; /** diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxCandidate.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxCandidate.java index ab2ac2bd3c..c7b6922b30 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxCandidate.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/extract/NonMaxCandidate.java @@ -22,7 +22,7 @@ import boofcv.struct.image.GrayF32; import georegression.struct.point.Point2D_I16; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/GIntegralImageFeatureIntensity.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/GIntegralImageFeatureIntensity.java index 2869d20f39..74a0dafe8e 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/GIntegralImageFeatureIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/GIntegralImageFeatureIntensity.java @@ -22,7 +22,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayS32; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Functions for computing feature intensity on an image. Image type agnostic. diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/IntegralImageFeatureIntensity.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/IntegralImageFeatureIntensity.java index d721ade663..309bda36b6 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/IntegralImageFeatureIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/IntegralImageFeatureIntensity.java @@ -24,7 +24,7 @@ import boofcv.concurrency.BoofConcurrency; import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayS32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Routines for computing the intensity of the fast hessian features in an image. diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/impl/ImplIntegralImageFeatureIntensity.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/impl/ImplIntegralImageFeatureIntensity.java index 2d49575c47..df1cc06193 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/impl/ImplIntegralImageFeatureIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/impl/ImplIntegralImageFeatureIntensity.java @@ -24,7 +24,7 @@ //CONCURRENT_INLINE import boofcv.concurrency.BoofConcurrency; import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayS32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.annotation.Generated; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/impl/ImplIntegralImageFeatureIntensity_MT.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/impl/ImplIntegralImageFeatureIntensity_MT.java index 2084ab46ab..3e2681e43c 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/impl/ImplIntegralImageFeatureIntensity_MT.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/impl/ImplIntegralImageFeatureIntensity_MT.java @@ -23,7 +23,7 @@ import boofcv.concurrency.BoofConcurrency; import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayS32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.annotation.Generated; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/impl/ImplSsdCornerNaive.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/impl/ImplSsdCornerNaive.java index b0f33eba77..062853c823 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/impl/ImplSsdCornerNaive.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/intensity/impl/ImplSsdCornerNaive.java @@ -24,7 +24,7 @@ import boofcv.struct.convolve.Kernel2D_S32; import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Naive implementation of {@link boofcv.alg.feature.detect.intensity.ShiTomasiCornerIntensity} which performs computations in a straight diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/interest/EasyGeneralFeatureDetector.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/interest/EasyGeneralFeatureDetector.java index 093782984e..8ddb2816f4 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/interest/EasyGeneralFeatureDetector.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/interest/EasyGeneralFeatureDetector.java @@ -26,7 +26,7 @@ import boofcv.struct.QueueCorner; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/interest/GeneralFeatureDetector.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/interest/GeneralFeatureDetector.java index 3447a22c8e..3a42964aa5 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/interest/GeneralFeatureDetector.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/interest/GeneralFeatureDetector.java @@ -28,7 +28,7 @@ import lombok.Getter; import lombok.Setter; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/line/ImageLinePruneMerge.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/line/ImageLinePruneMerge.java index 22c7362bb3..97177f6b96 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/line/ImageLinePruneMerge.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/line/ImageLinePruneMerge.java @@ -25,7 +25,7 @@ import georegression.struct.line.LineSegment2D_F32; import georegression.struct.point.Point2D_F32; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.Collections; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/line/LineImageOps.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/line/LineImageOps.java index dd69610de5..4518812028 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/line/LineImageOps.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/line/LineImageOps.java @@ -28,7 +28,7 @@ import georegression.struct.line.LineSegment2D_F32; import georegression.struct.point.Point2D_F32; import org.ddogleg.sorting.QuickSort_F32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.Iterator; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/ConvertLimitToIntensity.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/ConvertLimitToIntensity.java index 572b36fbcc..528eb30a42 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/ConvertLimitToIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/ConvertLimitToIntensity.java @@ -21,7 +21,7 @@ import boofcv.struct.image.GrayF32; import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Converts {@link FeatureSelectLimit} into {@link FeatureSelectLimitIntensity}. diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectLimit.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectLimit.java index 22889f7f1c..c22f7b6398 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectLimit.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectLimit.java @@ -20,7 +20,7 @@ import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Selects a subset of the features inside the image until it hits the requested number. diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectLimitIntensity.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectLimitIntensity.java index 088ecf442d..77711bf472 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectLimitIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectLimitIntensity.java @@ -21,7 +21,7 @@ import boofcv.struct.image.GrayF32; import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Selects features inside the image until it hits a limit. Feature intensity is available to aide in the selection diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectN.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectN.java index 83c8f98e80..5297d5afd5 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectN.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectN.java @@ -20,7 +20,7 @@ import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Selects features periodically in the order they were detected until it hits the limit. This is better than just diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectNBest.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectNBest.java index a9858f4216..0feee6ba1a 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectNBest.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectNBest.java @@ -23,7 +23,7 @@ import org.ddogleg.sorting.QuickSelect; import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Selects and sorts up to the N best features based on their intensity. diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectRandom.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectRandom.java index 11ed79e483..e199b5b781 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectRandom.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectRandom.java @@ -22,7 +22,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Random; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectUniform.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectUniform.java index 16fef30e4e..066e842c85 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectUniform.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectUniform.java @@ -26,7 +26,7 @@ import georegression.struct.point.Point2D_I16; import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectUniformBest.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectUniformBest.java index bccd23dace..5d4065cca3 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectUniformBest.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/FeatureSelectUniformBest.java @@ -27,7 +27,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/SampleIntensity.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/SampleIntensity.java index 41ae918904..81587f9238 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/SampleIntensity.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/SampleIntensity.java @@ -19,7 +19,7 @@ package boofcv.alg.feature.detect.selector; import boofcv.struct.image.GrayF32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Samples the intensity at the specified point. diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/SampleIntensityImage.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/SampleIntensityImage.java index b1f79478f3..d12dc84574 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/SampleIntensityImage.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/SampleIntensityImage.java @@ -22,7 +22,7 @@ import georegression.struct.point.Point2D_F32; import georegression.struct.point.Point2D_F64; import georegression.struct.point.Point2D_I16; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Classes for sampling the intensity image diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/SampleIntensityScalePoint.java b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/SampleIntensityScalePoint.java index e485e9acb9..31961ef37d 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/SampleIntensityScalePoint.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/feature/detect/selector/SampleIntensityScalePoint.java @@ -20,7 +20,7 @@ import boofcv.struct.feature.ScalePoint; import boofcv.struct.image.GrayF32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Uses the intensity value in {@link ScalePoint} to return the intensity diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/segmentation/fh04/SegmentFelzenszwalbHuttenlocher04.java b/main/boofcv-feature/src/main/java/boofcv/alg/segmentation/fh04/SegmentFelzenszwalbHuttenlocher04.java index d63a1b3525..b362c57ba8 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/segmentation/fh04/SegmentFelzenszwalbHuttenlocher04.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/segmentation/fh04/SegmentFelzenszwalbHuttenlocher04.java @@ -29,7 +29,7 @@ import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/segmentation/ms/SegmentMeanShift.java b/main/boofcv-feature/src/main/java/boofcv/alg/segmentation/ms/SegmentMeanShift.java index a009f2c771..e01284c646 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/segmentation/ms/SegmentMeanShift.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/segmentation/ms/SegmentMeanShift.java @@ -27,7 +27,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.Stoppable; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ShapeFittingOps.java b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ShapeFittingOps.java index d1680c1a3a..d92912d558 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ShapeFittingOps.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ShapeFittingOps.java @@ -34,7 +34,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_F64; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/edge/BaseIntegralEdge.java b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/edge/BaseIntegralEdge.java index 45332ba614..e76faaf0c0 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/edge/BaseIntegralEdge.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/edge/BaseIntegralEdge.java @@ -28,7 +28,7 @@ import boofcv.struct.distort.PixelTransform; import boofcv.struct.image.ImageGray; import georegression.struct.point.Point2D_F32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Base class for computing line integrals along lines/edges. diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/edge/EdgeIntensityPolygon.java b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/edge/EdgeIntensityPolygon.java index 049d7693e1..90c2d8430b 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/edge/EdgeIntensityPolygon.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/edge/EdgeIntensityPolygon.java @@ -23,7 +23,7 @@ import georegression.struct.point.Point2D_F32; import georegression.struct.point.Point2D_F64; import georegression.struct.shapes.Polygon2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Looks at the difference in pixel values along the edge of a polygon and decides if its a false positive or not. diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ellipse/BinaryEllipseDetector.java b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ellipse/BinaryEllipseDetector.java index 70ba6fd63d..48e86a512a 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ellipse/BinaryEllipseDetector.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ellipse/BinaryEllipseDetector.java @@ -28,7 +28,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ellipse/BinaryEllipseDetectorPixel.java b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ellipse/BinaryEllipseDetectorPixel.java index c06161cd9b..f1cd157aca 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ellipse/BinaryEllipseDetectorPixel.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/ellipse/BinaryEllipseDetectorPixel.java @@ -42,7 +42,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/DetectPolygonBinaryGrayRefine.java b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/DetectPolygonBinaryGrayRefine.java index 1db8ca5bb0..27940289bf 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/DetectPolygonBinaryGrayRefine.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/DetectPolygonBinaryGrayRefine.java @@ -28,7 +28,7 @@ import georegression.struct.point.Point2D_I32; import georegression.struct.shapes.Polygon2D_F64; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/DetectPolygonFromContour.java b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/DetectPolygonFromContour.java index b2fca66551..e69b314d04 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/DetectPolygonFromContour.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/DetectPolygonFromContour.java @@ -39,7 +39,7 @@ import org.ddogleg.struct.DogArray_B; import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.VerbosePrint; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/RefinePolygonToGray.java b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/RefinePolygonToGray.java index 0153eab39b..71b0cd6ada 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/RefinePolygonToGray.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/RefinePolygonToGray.java @@ -22,7 +22,7 @@ import boofcv.struct.image.ImageGray; import georegression.struct.point.Point2D_F32; import georegression.struct.shapes.Polygon2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Refines a polygon using the gray scale image. This results in a more accurate fit than just the contour alone diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/RefinePolygonToGrayLine.java b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/RefinePolygonToGrayLine.java index d32a12ceb2..f2ef9fdd25 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/RefinePolygonToGrayLine.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polygon/RefinePolygonToGrayLine.java @@ -28,7 +28,7 @@ import georegression.struct.point.Point2D_F64; import georegression.struct.shapes.Polygon2D_F64; import lombok.Getter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polyline/splitmerge/PolylineSplitMerge.java b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polyline/splitmerge/PolylineSplitMerge.java index 1d44a0786a..050ce509a3 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polyline/splitmerge/PolylineSplitMerge.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polyline/splitmerge/PolylineSplitMerge.java @@ -32,7 +32,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.DogLinkedList; import org.ddogleg.struct.DogLinkedList.Element; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; import java.util.Objects; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polyline/splitmerge/SplitMergeLineFit.java b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polyline/splitmerge/SplitMergeLineFit.java index cc5e18feb2..61c0c0abde 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polyline/splitmerge/SplitMergeLineFit.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/shapes/polyline/splitmerge/SplitMergeLineFit.java @@ -24,7 +24,7 @@ import georegression.struct.point.Point2D_I32; import org.ddogleg.struct.DogArray_B; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/tracker/klt/KltTracker.java b/main/boofcv-feature/src/main/java/boofcv/alg/tracker/klt/KltTracker.java index 07e4012851..9d2a8116a3 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/tracker/klt/KltTracker.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/tracker/klt/KltTracker.java @@ -24,7 +24,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; import lombok.Getter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/main/boofcv-feature/src/main/java/boofcv/alg/tracker/klt/PyramidKltTracker.java b/main/boofcv-feature/src/main/java/boofcv/alg/tracker/klt/PyramidKltTracker.java index b245ca5b7e..ff733c9d00 100644 --- a/main/boofcv-feature/src/main/java/boofcv/alg/tracker/klt/PyramidKltTracker.java +++ b/main/boofcv-feature/src/main/java/boofcv/alg/tracker/klt/PyramidKltTracker.java @@ -20,7 +20,7 @@ import boofcv.struct.image.ImageGray; import boofcv.struct.pyramid.ImagePyramid; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/background/FactoryBackgroundModel.java b/main/boofcv-feature/src/main/java/boofcv/factory/background/FactoryBackgroundModel.java index a25398269e..bf0a52638b 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/background/FactoryBackgroundModel.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/background/FactoryBackgroundModel.java @@ -26,7 +26,7 @@ import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; import georegression.struct.InvertibleTransform; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating implementations of {@link BackgroundModelStationary} and {@link boofcv.alg.background.BackgroundModelMoving} diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/associate/FactoryAssociation.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/associate/FactoryAssociation.java index 7b06f857e0..60702f1ef3 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/associate/FactoryAssociation.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/associate/FactoryAssociation.java @@ -29,7 +29,7 @@ import org.ddogleg.nn.FactoryNearestNeighbor; import org.ddogleg.nn.NearestNeighbor; import org.ddogleg.nn.alg.KdTreeDistance; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates algorithms for associating {@link boofcv.struct.feature.TupleDesc_F64} features. diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/dense/FactoryDescribeImageDense.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/dense/FactoryDescribeImageDense.java index 71f7791a7c..5111976e77 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/dense/FactoryDescribeImageDense.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/dense/FactoryDescribeImageDense.java @@ -33,7 +33,7 @@ import boofcv.struct.image.ImageDataType; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating {@link DescribeImageDense}. diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/describe/FactoryDescribeAlgs.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/describe/FactoryDescribeAlgs.java index 29f4a20041..4a28ee806b 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/describe/FactoryDescribeAlgs.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/describe/FactoryDescribeAlgs.java @@ -31,7 +31,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates algorithms for describing point features. @@ -42,7 +42,7 @@ public class FactoryDescribeAlgs { public static > - DescribePointSurf surfSpeed( @Nullable ConfigSurfDescribe.Fast config, Class imageType ) { + DescribePointSurf surfSpeed( ConfigSurfDescribe.@Nullable Fast config, Class imageType ) { if (config == null) config = new ConfigSurfDescribe.Fast(); config.checkValidity(); @@ -53,7 +53,7 @@ DescribePointSurf surfSpeed( @Nullable ConfigSurfDescribe.Fast config, Class< } public static > - DescribePointSurfMod surfStability( @Nullable ConfigSurfDescribe.Stability config, Class imageType ) { + DescribePointSurfMod surfStability( ConfigSurfDescribe.@Nullable Stability config, Class imageType ) { if (config == null) config = new ConfigSurfDescribe.Stability(); config.checkValidity(); diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/describe/FactoryDescribePoint.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/describe/FactoryDescribePoint.java index c578786706..5feb8e0f9d 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/describe/FactoryDescribePoint.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/describe/FactoryDescribePoint.java @@ -29,7 +29,7 @@ import boofcv.struct.feature.TupleDesc; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating implementations of {@link DescribePointRadiusAngle}. @@ -73,7 +73,7 @@ DescribePoint generic( ConfigDescribePoint config, ImageType imageType } public static , II extends ImageGray> - DescribeSurf_Point surfFast( @Nullable ConfigSurfDescribe.Fast configSurf, + DescribeSurf_Point surfFast( ConfigSurfDescribe.@Nullable Fast configSurf, ConfigOrientation2 configOrientation, double regionRadius, Class imageType ) { Class integralType = GIntegralImageOps.getIntegralType(imageType); @@ -85,7 +85,7 @@ DescribeSurf_Point surfFast( @Nullable ConfigSurfDescribe.Fast configSurf } public static , II extends ImageGray> - DescribeSurf_Point surfStable( @Nullable ConfigSurfDescribe.Stability config, + DescribeSurf_Point surfStable( ConfigSurfDescribe.@Nullable Stability config, ConfigOrientation2 configOrientation, double regionRadius, Class imageType ) { Class integralType = GIntegralImageOps.getIntegralType(imageType); diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/describe/FactoryDescribePointRadiusAngle.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/describe/FactoryDescribePointRadiusAngle.java index cddeb8a3e9..90fd7f8652 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/describe/FactoryDescribePointRadiusAngle.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/describe/FactoryDescribePointRadiusAngle.java @@ -35,7 +35,7 @@ import boofcv.struct.feature.TupleDesc_B; import boofcv.struct.feature.TupleDesc_F64; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Random; @@ -100,7 +100,7 @@ DescribePointRadiusAngle wrapIf( DescribePointRadiusAngle alg, ImageType< * @see DescribePointSurf */ public static , II extends ImageGray> - DescribePointRadiusAngle surfFast( @Nullable ConfigSurfDescribe.Fast config, Class imageType ) { + DescribePointRadiusAngle surfFast( ConfigSurfDescribe.@Nullable Fast config, Class imageType ) { Class integralType = GIntegralImageOps.getIntegralType(imageType); DescribePointSurf alg = FactoryDescribeAlgs.surfSpeed(config, integralType); @@ -117,7 +117,7 @@ DescribePointRadiusAngle surfFast( @Nullable ConfigSurfDescrib * @see DescribePointSurfPlanar */ public static , II extends ImageGray> - DescribePointRadiusAngle surfColorFast( @Nullable ConfigSurfDescribe.Fast config, ImageType imageType ) { + DescribePointRadiusAngle surfColorFast( ConfigSurfDescribe.@Nullable Fast config, ImageType imageType ) { Class bandType = imageType.getImageClass(); Class integralType = GIntegralImageOps.getIntegralType(bandType); @@ -146,7 +146,7 @@ DescribePointRadiusAngle surfColorFast( @Nullable ConfigSurfDe * @see DescribePointSurf */ public static , II extends ImageGray> - DescribePointRadiusAngle surfStable( @Nullable ConfigSurfDescribe.Stability config, Class imageType ) { + DescribePointRadiusAngle surfStable( ConfigSurfDescribe.@Nullable Stability config, Class imageType ) { Class integralType = GIntegralImageOps.getIntegralType(imageType); @@ -164,7 +164,7 @@ DescribePointRadiusAngle surfStable( @Nullable ConfigSurfDescr * @see DescribePointSurfPlanar */ public static , II extends ImageGray> - DescribePointRadiusAngle surfColorStable( @Nullable ConfigSurfDescribe.Stability config, ImageType imageType ) { + DescribePointRadiusAngle surfColorStable( ConfigSurfDescribe.@Nullable Stability config, ImageType imageType ) { Class bandType = imageType.getImageClass(); Class integralType = GIntegralImageOps.getIntegralType(bandType); diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detdesc/FactoryDetectDescribe.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detdesc/FactoryDetectDescribe.java index cac3cbf1c4..1402a924cc 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detdesc/FactoryDetectDescribe.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detdesc/FactoryDetectDescribe.java @@ -50,7 +50,7 @@ import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageMultiBand; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates instances of {@link DetectDescribePoint} for different feature detectors/describers. @@ -171,7 +171,7 @@ DetectDescribePoint sift( @Nullable ConfigCompleteSift config, */ public static , II extends ImageGray> DetectDescribePoint surfFast( @Nullable ConfigFastHessian configDetector, - @Nullable ConfigSurfDescribe.Fast configDesc, + ConfigSurfDescribe.@Nullable Fast configDesc, @Nullable ConfigAverageIntegral configOrientation, Class imageType ) { @@ -205,7 +205,7 @@ DetectDescribePoint surfFast( @Nullable ConfigFastHessian conf */ public static , II extends ImageGray> DetectDescribePoint surfColorFast( @Nullable ConfigFastHessian configDetector, - @Nullable ConfigSurfDescribe.Fast configDesc, + ConfigSurfDescribe.@Nullable Fast configDesc, @Nullable ConfigAverageIntegral configOrientation, ImageType imageType ) { @@ -262,7 +262,7 @@ DetectDescribePoint surfColorFast( @Nullable ConfigFastHessian */ public static , II extends ImageGray> DetectDescribePoint surfStable( @Nullable ConfigFastHessian configDetector, - @Nullable ConfigSurfDescribe.Stability configDescribe, + ConfigSurfDescribe.@Nullable Stability configDescribe, @Nullable ConfigSlidingIntegral configOrientation, Class imageType ) { @@ -297,7 +297,7 @@ DetectDescribePoint surfStable( @Nullable ConfigFastHessian co */ public static , II extends ImageGray> DetectDescribePoint surfColorStable( @Nullable ConfigFastHessian configDetector, - @Nullable ConfigSurfDescribe.Stability configDescribe, + ConfigSurfDescribe.@Nullable Stability configDescribe, @Nullable ConfigSlidingIntegral configOrientation, ImageType imageType ) { diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detdesc/FactoryDetectDescribeAlgs.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detdesc/FactoryDetectDescribeAlgs.java index 41fbd99503..93fb94819d 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detdesc/FactoryDetectDescribeAlgs.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detdesc/FactoryDetectDescribeAlgs.java @@ -32,7 +32,7 @@ import boofcv.concurrency.BoofConcurrency; import boofcv.factory.feature.detect.interest.FactoryInterestPointAlgs; import boofcv.struct.image.GrayF32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for specific implementations of Detect and Describe feature algorithms. diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/extract/BOverrideFactoryFeatureExtractor.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/extract/BOverrideFactoryFeatureExtractor.java index d6f8beff55..68a45b21e9 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/extract/BOverrideFactoryFeatureExtractor.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/extract/BOverrideFactoryFeatureExtractor.java @@ -22,7 +22,7 @@ import boofcv.abst.feature.detect.extract.NonMaxSuppression; import boofcv.override.BOverrideClass; import boofcv.override.BOverrideManager; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Location of override functions related to {@link FactoryFeatureExtractor}. diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/extract/FactoryFeatureExtractor.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/extract/FactoryFeatureExtractor.java index f802fd2279..cd647feb12 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/extract/FactoryFeatureExtractor.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/extract/FactoryFeatureExtractor.java @@ -28,7 +28,7 @@ import boofcv.factory.feature.detect.selector.FactorySelectLimit; import boofcv.struct.image.ImageGray; import georegression.struct.point.Point2D_I16; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates {@link boofcv.abst.feature.detect.extract.NonMaxSuppression} for finding local maximums in feature intensity images. diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/interest/FactoryDetectPoint.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/interest/FactoryDetectPoint.java index 52b0cf36ff..bde82be819 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/interest/FactoryDetectPoint.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/interest/FactoryDetectPoint.java @@ -36,7 +36,7 @@ import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; import georegression.struct.point.Point2D_I16; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/interest/FactoryInterestPoint.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/interest/FactoryInterestPoint.java index 885e5d1c9b..5e48e145a3 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/interest/FactoryInterestPoint.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/interest/FactoryInterestPoint.java @@ -38,7 +38,7 @@ import boofcv.struct.image.ImageGray; import boofcv.struct.pyramid.PyramidFloat; import georegression.struct.point.Point2D_I16; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

Factory for creating interest point detectors which conform to the {@link InterestPointDetector} diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/interest/FactoryInterestPointAlgs.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/interest/FactoryInterestPointAlgs.java index 4c477adde5..ee71373a1a 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/interest/FactoryInterestPointAlgs.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/interest/FactoryInterestPointAlgs.java @@ -42,7 +42,7 @@ import boofcv.struct.feature.ScalePoint; import boofcv.struct.image.ImageGray; import georegression.struct.point.Point2D_I16; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for non-generic specific implementations of interest point detection algorithms. diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/line/FactoryDetectLine.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/line/FactoryDetectLine.java index d3b8a0d42a..0fa520b18c 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/line/FactoryDetectLine.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/line/FactoryDetectLine.java @@ -28,7 +28,7 @@ import boofcv.factory.filter.derivative.FactoryDerivative; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating high level implementations of {@link DetectLine} and {@link DetectLineSegment}. For more access diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/line/FactoryDetectLineAlgs.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/line/FactoryDetectLineAlgs.java index 31eca0cc1b..a63a436697 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/line/FactoryDetectLineAlgs.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/line/FactoryDetectLineAlgs.java @@ -35,7 +35,7 @@ import georegression.struct.line.LinePolar2D_F32; import org.ddogleg.fitting.modelset.ModelMatcherPost; import org.ddogleg.fitting.modelset.ransac.Ransac; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating line and line segment detectors. diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/selector/FactorySelectLimit.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/selector/FactorySelectLimit.java index 9e078fe9e9..2394af6487 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/selector/FactorySelectLimit.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/detect/selector/FactorySelectLimit.java @@ -23,7 +23,7 @@ import georegression.struct.point.Point2D_F32; import georegression.struct.point.Point2D_F64; import georegression.struct.point.Point2D_I16; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory that creates {@link FeatureSelectLimitIntensity} diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/feature/orientation/FactoryOrientationAlgs.java b/main/boofcv-feature/src/main/java/boofcv/factory/feature/orientation/FactoryOrientationAlgs.java index 95e0394533..65ba0f3e10 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/feature/orientation/FactoryOrientationAlgs.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/feature/orientation/FactoryOrientationAlgs.java @@ -25,7 +25,7 @@ import boofcv.alg.feature.orientation.*; import boofcv.alg.feature.orientation.impl.*; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates specific implementations of local region orientation estimators. diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/flow/FactoryDenseOpticalFlow.java b/main/boofcv-feature/src/main/java/boofcv/factory/flow/FactoryDenseOpticalFlow.java index a81eff2281..1338c4cc4c 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/flow/FactoryDenseOpticalFlow.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/flow/FactoryDenseOpticalFlow.java @@ -36,7 +36,7 @@ import boofcv.struct.image.ImageType; import boofcv.struct.pyramid.ConfigDiscreteLevels; import boofcv.struct.pyramid.PyramidDiscrete; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates implementations of {@link DenseOpticalFlow}. diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/segmentation/FactoryImageSegmentation.java b/main/boofcv-feature/src/main/java/boofcv/factory/segmentation/FactoryImageSegmentation.java index 2584a8e81f..268af1cb6f 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/segmentation/FactoryImageSegmentation.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/segmentation/FactoryImageSegmentation.java @@ -25,7 +25,7 @@ import boofcv.alg.segmentation.watershed.WatershedVincentSoille1991; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for {@link ImageSuperpixels} algorithms, which are used to segment the image into super pixels. diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/segmentation/FactorySegmentationAlg.java b/main/boofcv-feature/src/main/java/boofcv/factory/segmentation/FactorySegmentationAlg.java index bad329a6d7..356fc31f68 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/segmentation/FactorySegmentationAlg.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/segmentation/FactorySegmentationAlg.java @@ -33,7 +33,7 @@ import boofcv.struct.border.BorderType; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for low level segmentation algorithms. diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/shape/ConfigPolygonDetector.java b/main/boofcv-feature/src/main/java/boofcv/factory/shape/ConfigPolygonDetector.java index 17b0f98245..644f6ab92a 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/shape/ConfigPolygonDetector.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/shape/ConfigPolygonDetector.java @@ -21,7 +21,7 @@ import boofcv.alg.shapes.edge.EdgeIntensityPolygon; import boofcv.alg.shapes.polygon.DetectPolygonFromContour; import boofcv.struct.Configuration; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Configuration for {@link DetectPolygonFromContour} for use in {@link FactoryShapeDetector}. diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/shape/FactoryPointsToPolyline.java b/main/boofcv-feature/src/main/java/boofcv/factory/shape/FactoryPointsToPolyline.java index 4131c82595..ef07b1e8fd 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/shape/FactoryPointsToPolyline.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/shape/FactoryPointsToPolyline.java @@ -20,7 +20,7 @@ import boofcv.abst.shapes.polyline.*; import boofcv.alg.shapes.polyline.splitmerge.SplitMergeLineFit; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating instances of {@link PointsToPolyline} diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/shape/FactoryShapeDetector.java b/main/boofcv-feature/src/main/java/boofcv/factory/shape/FactoryShapeDetector.java index 1a97f63dad..9cbdb734fb 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/shape/FactoryShapeDetector.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/shape/FactoryShapeDetector.java @@ -27,7 +27,7 @@ import boofcv.alg.shapes.polygon.*; import boofcv.factory.filter.binary.FactoryBinaryContourFinder; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for detecting higher level shapes diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/tracker/FactoryPointTracker.java b/main/boofcv-feature/src/main/java/boofcv/factory/tracker/FactoryPointTracker.java index f6fb80225c..9809cc73e7 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/tracker/FactoryPointTracker.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/tracker/FactoryPointTracker.java @@ -68,7 +68,7 @@ import boofcv.struct.image.ImageType; import boofcv.struct.pyramid.ConfigDiscreteLevels; import boofcv.struct.pyramid.PyramidDiscrete; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Random; diff --git a/main/boofcv-feature/src/main/java/boofcv/factory/tracker/FactoryTrackerAlg.java b/main/boofcv-feature/src/main/java/boofcv/factory/tracker/FactoryTrackerAlg.java index 4b7d4b27e6..b469a96414 100644 --- a/main/boofcv-feature/src/main/java/boofcv/factory/tracker/FactoryTrackerAlg.java +++ b/main/boofcv-feature/src/main/java/boofcv/factory/tracker/FactoryTrackerAlg.java @@ -32,7 +32,7 @@ import boofcv.factory.interpolate.FactoryInterpolation; import boofcv.struct.feature.TupleDesc; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating feature trackers algorithms. diff --git a/main/boofcv-feature/src/test/java/boofcv/alg/feature/detect/selector/ChecksFeatureSelectLimitIntensity.java b/main/boofcv-feature/src/test/java/boofcv/alg/feature/detect/selector/ChecksFeatureSelectLimitIntensity.java index 3b715f3cc7..27004a879d 100644 --- a/main/boofcv-feature/src/test/java/boofcv/alg/feature/detect/selector/ChecksFeatureSelectLimitIntensity.java +++ b/main/boofcv-feature/src/test/java/boofcv/alg/feature/detect/selector/ChecksFeatureSelectLimitIntensity.java @@ -24,7 +24,7 @@ import georegression.struct.point.Point2D_I16; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/main/boofcv-feature/src/test/java/boofcv/alg/feature/detect/selector/TestConvertFeatureSelectLimitToIntensity.java b/main/boofcv-feature/src/test/java/boofcv/alg/feature/detect/selector/TestConvertFeatureSelectLimitToIntensity.java index c463117845..882c142e85 100644 --- a/main/boofcv-feature/src/test/java/boofcv/alg/feature/detect/selector/TestConvertFeatureSelectLimitToIntensity.java +++ b/main/boofcv-feature/src/test/java/boofcv/alg/feature/detect/selector/TestConvertFeatureSelectLimitToIntensity.java @@ -24,7 +24,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/BundleAdjustmentCamera.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/BundleAdjustmentCamera.java index 075ba38f44..72565248e0 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/BundleAdjustmentCamera.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/BundleAdjustmentCamera.java @@ -19,7 +19,7 @@ package boofcv.abst.geo.bundle; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Map; @@ -83,7 +83,7 @@ default void setCameraState( BundleCameraState state ) {} void jacobian( double camX, double camY, double camZ, double[] pointX, double[] pointY, boolean computeIntrinsic, - @Nullable double[] calibX, @Nullable double[] calibY ); + double @Nullable [] calibX, double @Nullable [] calibY ); /** * Returns the number of intrinsic parameters for this model. If the camera is known then the number of parameters diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/BundleAdjustmentSchur.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/BundleAdjustmentSchur.java index f11a5c71f2..79615e15ec 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/BundleAdjustmentSchur.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/BundleAdjustmentSchur.java @@ -22,7 +22,7 @@ import org.ddogleg.optimization.functions.FunctionNtoM; import org.ddogleg.optimization.functions.SchurJacobian; import org.ejml.data.DMatrix; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Set; diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/MetricBundleAdjustmentUtils.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/MetricBundleAdjustmentUtils.java index ee73ecc5f0..8e18fe1863 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/MetricBundleAdjustmentUtils.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/MetricBundleAdjustmentUtils.java @@ -28,7 +28,7 @@ import org.ddogleg.optimization.ConfigNonLinearLeastSquares; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Set; diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/PruneStructureFromSceneMetric.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/PruneStructureFromSceneMetric.java index f6ab2e4507..ecf95c3fae 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/PruneStructureFromSceneMetric.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/PruneStructureFromSceneMetric.java @@ -29,7 +29,7 @@ import org.ddogleg.nn.NnData; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.*; diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/SceneObservations.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/SceneObservations.java index 1a1a40081e..ceaa41e81d 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/SceneObservations.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/SceneObservations.java @@ -23,7 +23,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Storage for feature observation in each view. Input for bundle adjustment. When possible arrays are used to diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/SceneStructureCommon.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/SceneStructureCommon.java index e82538ae09..24172fc947 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/SceneStructureCommon.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/SceneStructureCommon.java @@ -30,7 +30,7 @@ import lombok.Getter; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/SceneStructureMetric.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/SceneStructureMetric.java index 89cbd3e747..283263b7d3 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/SceneStructureMetric.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/bundle/SceneStructureMetric.java @@ -26,7 +26,7 @@ import georegression.transform.se.SePointOps_F64; import lombok.Getter; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/CalibrateMonoPlanar.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/CalibrateMonoPlanar.java index 7a624c4fbb..4e1cf46ea2 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/CalibrateMonoPlanar.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/CalibrateMonoPlanar.java @@ -33,7 +33,7 @@ import georegression.struct.se.Se3_F64; import lombok.Getter; import org.ddogleg.struct.VerbosePrint; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.File; import java.io.PrintStream; diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/CalibrateMultiPlanar.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/CalibrateMultiPlanar.java index 478d6db464..ccd4f4a21f 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/CalibrateMultiPlanar.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/CalibrateMultiPlanar.java @@ -49,7 +49,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.FastArray; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/CalibrateStereoPlanar.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/CalibrateStereoPlanar.java index c5098cc3c5..abd9558aed 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/CalibrateStereoPlanar.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/CalibrateStereoPlanar.java @@ -40,7 +40,7 @@ import org.ddogleg.struct.DogArray_B; import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.VerbosePrint; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/DetectMultiFiducialCalibration.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/DetectMultiFiducialCalibration.java index 81ab777837..46df6fd089 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/DetectMultiFiducialCalibration.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/DetectMultiFiducialCalibration.java @@ -22,7 +22,7 @@ import boofcv.alg.geo.calibration.CalibrationObservation; import boofcv.struct.image.GrayF32; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.HashMap; diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/DetectSingleFiducialCalibration.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/DetectSingleFiducialCalibration.java index a2177aa643..b13c479478 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/DetectSingleFiducialCalibration.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/DetectSingleFiducialCalibration.java @@ -22,7 +22,7 @@ import boofcv.alg.geo.calibration.CalibrationObservation; import boofcv.struct.image.GrayF32; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/MultiToSingleFiducialCalibration.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/MultiToSingleFiducialCalibration.java index 3dbe1416b5..b6828589b0 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/MultiToSingleFiducialCalibration.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/calibration/MultiToSingleFiducialCalibration.java @@ -24,7 +24,7 @@ import georegression.struct.point.Point2D_F64; import lombok.Getter; import lombok.Setter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/optimization/ResidualsEpipolarMatrixN.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/optimization/ResidualsEpipolarMatrixN.java index 8e1494c0b5..f5369658fa 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/optimization/ResidualsEpipolarMatrixN.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/optimization/ResidualsEpipolarMatrixN.java @@ -23,7 +23,7 @@ import org.ddogleg.fitting.modelset.ModelCodec; import org.ddogleg.optimization.functions.FunctionNtoM; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-geo/src/main/java/boofcv/abst/geo/selfcalib/ProjectiveToMetricCameraDualQuadratic.java b/main/boofcv-geo/src/main/java/boofcv/abst/geo/selfcalib/ProjectiveToMetricCameraDualQuadratic.java index d22f0b687b..0e58a2514c 100644 --- a/main/boofcv-geo/src/main/java/boofcv/abst/geo/selfcalib/ProjectiveToMetricCameraDualQuadratic.java +++ b/main/boofcv-geo/src/main/java/boofcv/abst/geo/selfcalib/ProjectiveToMetricCameraDualQuadratic.java @@ -42,7 +42,7 @@ import org.ejml.data.DMatrix3; import org.ejml.data.DMatrixRMaj; import org.ejml.dense.row.CommonOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/cloud/DisparityToColorPointCloud.java b/main/boofcv-geo/src/main/java/boofcv/alg/cloud/DisparityToColorPointCloud.java index dd4d432a5f..db54ae703f 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/cloud/DisparityToColorPointCloud.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/cloud/DisparityToColorPointCloud.java @@ -32,7 +32,7 @@ import org.ejml.data.DMatrixRMaj; import org.ejml.data.FMatrixRMaj; import org.ejml.ops.ConvertMatrixData; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/cloud/PointCloudUtils_F64.java b/main/boofcv-geo/src/main/java/boofcv/alg/cloud/PointCloudUtils_F64.java index 4c505c006a..3792b97ce9 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/cloud/PointCloudUtils_F64.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/cloud/PointCloudUtils_F64.java @@ -27,7 +27,7 @@ import org.ddogleg.nn.NnData; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/distort/LensDistortionOps_F64.java b/main/boofcv-geo/src/main/java/boofcv/alg/distort/LensDistortionOps_F64.java index e282f8d136..728463a75c 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/distort/LensDistortionOps_F64.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/distort/LensDistortionOps_F64.java @@ -27,7 +27,7 @@ import georegression.struct.shapes.RectangleLength2D_F64; import org.ejml.data.DMatrixRMaj; import org.ejml.dense.row.CommonOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/AddBrownNtoN_F64.java b/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/AddBrownNtoN_F64.java index 58f3143fd3..a59dbe30ef 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/AddBrownNtoN_F64.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/AddBrownNtoN_F64.java @@ -20,7 +20,7 @@ import boofcv.struct.distort.Point2Transform2_F64; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Given an undistorted normalized pixel coordinate, compute the distorted normalized coordinate. @@ -39,7 +39,7 @@ public AddBrownNtoN_F64() {} * * @param radial Radial distortion parameters */ - public AddBrownNtoN_F64 setDistortion( @Nullable /**/double[] radial, /**/double t1, /**/double t2 ) { + public AddBrownNtoN_F64 setDistortion( /**/double @Nullable [] radial, /**/double t1, /**/double t2 ) { params = new RadialTangential_F64(radial, t1, t2); return this; } diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/AddBrownPtoN_F64.java b/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/AddBrownPtoN_F64.java index 7248e69df2..4f675e4be6 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/AddBrownPtoN_F64.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/AddBrownPtoN_F64.java @@ -20,7 +20,7 @@ import boofcv.struct.distort.Point2Transform2_F64; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Given an undistorted pixel coordinate, compute the distorted normalized image coordinate. @@ -65,7 +65,7 @@ public AddBrownPtoN_F64 setK( /**/double fx, /**/double fy, /**/double skew, /** * * @param radial Radial distortion parameters */ - public AddBrownPtoN_F64 setDistortion( @Nullable /**/double[] radial, /**/double t1, /**/double t2 ) { + public AddBrownPtoN_F64 setDistortion( /**/double @Nullable [] radial, /**/double t1, /**/double t2 ) { params = new RadialTangential_F64(radial, t1, t2); return this; } diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/RadialTangential_F64.java b/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/RadialTangential_F64.java index cb8f9cbc03..e5bca4eda5 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/RadialTangential_F64.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/RadialTangential_F64.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.Setter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Distortion parameters for radial and tangential model @@ -48,11 +48,11 @@ public RadialTangential_F64( int numRadial ) { public RadialTangential_F64() { } - public RadialTangential_F64( @Nullable /**/double[] radial, /**/double t1, /**/double t2 ) { + public RadialTangential_F64( /**/double @Nullable [] radial, /**/double t1, /**/double t2 ) { this.setTo(radial, t1, t2); } - public void setTo( @Nullable /**/double[] radial, /**/double t1, /**/double t2 ) { + public void setTo( /**/double @Nullable [] radial, /**/double t1, /**/double t2 ) { if (radial == null) this.radial = new double[0]; else { diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/RemoveBrownNtoN_F64.java b/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/RemoveBrownNtoN_F64.java index bc3c9c2fcd..9cbc5007fa 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/RemoveBrownNtoN_F64.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/RemoveBrownNtoN_F64.java @@ -21,7 +21,7 @@ import boofcv.struct.distort.Point2Transform2_F64; import georegression.misc.GrlConstants; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Converts the observed distorted normalized image coordinates into undistorted normalized image coordinates. @@ -46,7 +46,7 @@ public void setTolerance( double tol ) { this.tol = tol; } - public RemoveBrownNtoN_F64 setDistortion( @Nullable /**/double[] radial, /**/double t1, /**/double t2 ) { + public RemoveBrownNtoN_F64 setDistortion( /**/double @Nullable [] radial, /**/double t1, /**/double t2 ) { params = new RadialTangential_F64(radial, t1, t2); return this; } diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/RemoveBrownPtoN_F64.java b/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/RemoveBrownPtoN_F64.java index 1797e0d0e2..3a08039173 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/RemoveBrownPtoN_F64.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/distort/brown/RemoveBrownPtoN_F64.java @@ -22,7 +22,7 @@ import boofcv.struct.distort.Point2Transform2_F64; import georegression.misc.GrlConstants; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import static boofcv.alg.distort.brown.RemoveBrownNtoN_F64.removeRadial; @@ -84,7 +84,7 @@ public RemoveBrownPtoN_F64 setK( /**/double fx, /**/double fy, /**/double skew, return this; } - public RemoveBrownPtoN_F64 setDistortion( @Nullable /**/double[] radial, /**/double t1, /**/double t2 ) { + public RemoveBrownPtoN_F64 setDistortion( /**/double @Nullable [] radial, /**/double t1, /**/double t2 ) { if (params != null && radial != null && params.radial.length == radial.length) { System.arraycopy(radial, 0, params.radial, 0, radial.length); return this; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/distort/kanbra/KannalaBrandtPtoS_F64.java b/main/boofcv-geo/src/main/java/boofcv/alg/distort/kanbra/KannalaBrandtPtoS_F64.java index e4d37da62f..acbd4e50bc 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/distort/kanbra/KannalaBrandtPtoS_F64.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/distort/kanbra/KannalaBrandtPtoS_F64.java @@ -36,7 +36,7 @@ import org.ejml.data.DMatrix2x2; import org.ejml.dense.fixed.CommonOps_DDF2; import org.ejml.dense.fixed.MatrixFeatures_DDF2; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Arrays; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/MultiViewOps.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/MultiViewOps.java index cdb98559a5..e85f5c1a9a 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/MultiViewOps.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/MultiViewOps.java @@ -69,7 +69,7 @@ import org.ejml.dense.row.SingularOps_DDRM; import org.ejml.dense.row.factory.DecompositionFactory_DDRM; import org.ejml.interfaces.decomposition.SingularValueDecomposition_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/NormalizationPoint2D.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/NormalizationPoint2D.java index e30cb38d96..9b49d022d8 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/NormalizationPoint2D.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/NormalizationPoint2D.java @@ -24,7 +24,7 @@ import georegression.struct.point.Point3D_F64; import org.ejml.data.DMatrix3x3; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Describes how to normalize a set of points such that they have zero mean and variance. This is equivalent diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/PerspectiveOps.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/PerspectiveOps.java index d709af1209..3fc30a7788 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/PerspectiveOps.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/PerspectiveOps.java @@ -44,7 +44,7 @@ import org.ejml.data.DMatrixRMaj; import org.ejml.data.FMatrixRMaj; import org.ejml.dense.row.CommonOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/RectifyImageOps.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/RectifyImageOps.java index 21d68f4e94..7f47294fea 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/RectifyImageOps.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/RectifyImageOps.java @@ -30,7 +30,7 @@ import boofcv.struct.image.ImageDimension; import org.ejml.data.DMatrixRMaj; import org.ejml.data.FMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/WorldToCameraToPixel.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/WorldToCameraToPixel.java index 6413cd8f42..d1baf0d08e 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/WorldToCameraToPixel.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/WorldToCameraToPixel.java @@ -30,7 +30,7 @@ import georegression.struct.se.Se3_F64; import georegression.transform.se.SePointOps_F64; import lombok.Getter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Convenience class which will take a point in world coordinates, translate it to camera reference frame, diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/BundleAdjustmentOps.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/BundleAdjustmentOps.java index b34c192486..f345e2b05f 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/BundleAdjustmentOps.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/BundleAdjustmentOps.java @@ -28,7 +28,7 @@ import boofcv.struct.calib.CameraPinhole; import boofcv.struct.calib.CameraPinholeBrown; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Operations related to Bundle Adjustment. diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/BundleAdjustmentProjectiveSchurJacobian.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/BundleAdjustmentProjectiveSchurJacobian.java index bcc26f9539..7164c5da49 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/BundleAdjustmentProjectiveSchurJacobian.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/BundleAdjustmentProjectiveSchurJacobian.java @@ -28,7 +28,7 @@ import org.ejml.data.DMatrix; import org.ejml.data.DMatrixRMaj; import org.ejml.data.ReshapeMatrix; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Computes the Jacobian for {@link BundleAdjustmentSchur} for generic matrices. @@ -251,7 +251,7 @@ public void processInternal( double[] input, DMatrix leftPoint, DMatrix rightVie static void partialCameraMatrix( double X, double Y, double Z, DMatrixRMaj P, double[] pointGradX, double[] pointGradY, double[] pointGradZ, - @Nullable double[] camGradX, @Nullable double[] camGradY, @Nullable double[] camGradZ ) { + double @Nullable [] camGradX, double @Nullable [] camGradY, double @Nullable [] camGradZ ) { double P11 = P.data[0], P12 = P.data[1], P13 = P.data[2]; double P21 = P.data[4], P22 = P.data[5], P23 = P.data[6]; double P31 = P.data[8], P32 = P.data[9], P33 = P.data[10]; @@ -285,7 +285,7 @@ static void partialCameraMatrix( double X, double Y, double Z, static void partialCameraMatrixH( double X, double Y, double Z, double W, DMatrixRMaj P, double[] pointGradX, double[] pointGradY, double[] pointGradZ, - @Nullable double[] camGradX, @Nullable double[] camGradY, @Nullable double[] camGradZ ) { + double @Nullable [] camGradX, double @Nullable [] camGradY, double @Nullable [] camGradZ ) { double P11 = P.data[0], P12 = P.data[1], P13 = P.data[2], P14 = P.data[3]; double P21 = P.data[4], P22 = P.data[5], P23 = P.data[6], P24 = P.data[7]; double P31 = P.data[8], P32 = P.data[9], P33 = P.data[10], P34 = P.data[11]; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleCameraProjective.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleCameraProjective.java index a9b2baa37a..a2624cf055 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleCameraProjective.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleCameraProjective.java @@ -20,7 +20,7 @@ import boofcv.abst.geo.bundle.BundleAdjustmentCamera; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.HashMap; import java.util.Map; @@ -44,7 +44,7 @@ public void project( double camX, double camY, double camZ, Point2D_F64 output ) } @Override - public void jacobian( double camX, double camY, double camZ, double[] pointX, double[] pointY, boolean computeIntrinsic, @Nullable double[] calibX, @Nullable double[] calibY ) { + public void jacobian( double camX, double camY, double camZ, double[] pointX, double[] pointY, boolean computeIntrinsic, double @Nullable [] calibX, double @Nullable [] calibY ) { pointX[0] = 1/camZ; pointX[1] = 0; pointX[2] = -camX/(camZ*camZ); diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleDummyCamera.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleDummyCamera.java index 19966e7ea4..eae0c968c1 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleDummyCamera.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleDummyCamera.java @@ -20,7 +20,7 @@ import boofcv.abst.geo.bundle.BundleAdjustmentCamera; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Map; @@ -47,7 +47,7 @@ public class BundleDummyCamera implements BundleAdjustmentCamera { @Override public void jacobian( double camX, double camY, double camZ, double[] pointX, double[] pointY, - boolean computeIntrinsic, @Nullable double[] calibX, @Nullable double[] calibY ) { + boolean computeIntrinsic, double @Nullable [] calibX, double @Nullable [] calibY ) { throw new RuntimeException("Camera model not initialized correctly"); } diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleKannalaBrandt.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleKannalaBrandt.java index cd89232745..5040597842 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleKannalaBrandt.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleKannalaBrandt.java @@ -24,7 +24,7 @@ import georegression.geometry.UtilPoint3D_F64; import georegression.struct.point.Point2D_F64; import lombok.Getter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.IOException; import java.io.UncheckedIOException; @@ -184,7 +184,7 @@ public void configure( boolean zeroSkew, int numSymmetric, int numAsymmetric ) { @Override public void jacobian( final double camX, final double camY, final double camZ, double[] pointX, double[] pointY, - boolean computeIntrinsic, @Nullable double[] calibX, @Nullable double[] calibY ) { + boolean computeIntrinsic, double @Nullable [] calibX, double @Nullable [] calibY ) { // Compute intermediate variables used in forward projection model double norm2 = camX*camX + camY*camY + camZ*camZ; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinhole.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinhole.java index c7aa39fb9d..24e3f81238 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinhole.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinhole.java @@ -21,7 +21,7 @@ import boofcv.abst.geo.bundle.BundleAdjustmentCamera; import boofcv.struct.calib.CameraPinhole; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.IOException; import java.io.UncheckedIOException; @@ -99,7 +99,7 @@ public void project( double camX, double camY, double camZ, Point2D_F64 output ) @Override public void jacobian( double camX, double camY, double camZ, double[] inputX, double[] inputY, boolean computeIntrinsic, - @Nullable double[] calibX, @Nullable double[] calibY ) { + double @Nullable [] calibX, double @Nullable [] calibY ) { double nx = camX/camZ; double ny = camY/camZ; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinholeBrown.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinholeBrown.java index a036506950..0adb8894e7 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinholeBrown.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinholeBrown.java @@ -23,7 +23,7 @@ import georegression.struct.point.Point2D_F64; import org.ejml.FancyPrint; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.IOException; import java.io.UncheckedIOException; @@ -200,7 +200,7 @@ public void project( double camX, double camY, double camZ, Point2D_F64 output ) @Override public void jacobian( double camX, double camY, double camZ, double[] inputX, double[] inputY, - boolean computeIntrinsic, @Nullable double[] calibX, @Nullable double[] calibY ) { + boolean computeIntrinsic, double @Nullable [] calibX, double @Nullable [] calibY ) { double nx = camX/camZ; double ny = camY/camZ; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinholeSimplified.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinholeSimplified.java index 522b697bac..9b059292f1 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinholeSimplified.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinholeSimplified.java @@ -21,7 +21,7 @@ import boofcv.abst.geo.bundle.BundleAdjustmentCamera; import georegression.struct.point.Point2D_F64; import org.ejml.FancyPrint; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.IOException; import java.io.UncheckedIOException; @@ -92,7 +92,7 @@ public void project( double camX, double camY, double camZ, Point2D_F64 output ) @Override public void jacobian( double X, double Y, double Z, double[] inputX, double[] inputY, boolean computeIntrinsic, - @Nullable double[] calibX, @Nullable double[] calibY ) { + double @Nullable [] calibX, double @Nullable [] calibY ) { double normX = X/Z; double normY = Y/Z; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinholeSnavely.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinholeSnavely.java index 4f8da0d822..a6988dadd9 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinholeSnavely.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundlePinholeSnavely.java @@ -19,7 +19,7 @@ package boofcv.alg.geo.bundle.cameras; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Bundler and Bundle Adjustment in the Large use a different coordinate system. This @@ -36,7 +36,7 @@ public void project( double camX, double camY, double camZ, Point2D_F64 output ) @Override public void jacobian( double X, double Y, double Z, double[] inputX, double[] inputY, - boolean computeIntrinsic, @Nullable double[] calibX, @Nullable double[] calibY ) { + boolean computeIntrinsic, double @Nullable [] calibX, double @Nullable [] calibY ) { Z = -Z; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleUniversalOmni.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleUniversalOmni.java index acf4f62dda..50d2edc81d 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleUniversalOmni.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleUniversalOmni.java @@ -23,7 +23,7 @@ import georegression.struct.point.Point2D_F64; import org.ejml.data.DMatrix3x3; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.IOException; import java.io.UncheckedIOException; @@ -213,7 +213,7 @@ public void project( double x, double y, double z, Point2D_F64 output ) { public void jacobian( double camX, double camY, double camZ, double[] inputX, double[] inputY, boolean computeIntrinsic, - @Nullable double[] calibX, @Nullable double[] calibY ) { + double @Nullable [] calibX, double @Nullable [] calibY ) { // requires unit spherical coordinates double n2 = camX*camX + camY*camY + camZ*camZ; double n = Math.sqrt(n2); diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleZoomSimplified.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleZoomSimplified.java index 583e0b5d22..c7b49e1967 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleZoomSimplified.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/bundle/cameras/BundleZoomSimplified.java @@ -22,7 +22,7 @@ import boofcv.abst.geo.bundle.BundleCameraState; import georegression.struct.point.Point2D_F64; import org.ejml.FancyPrint; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.IOException; import java.io.UncheckedIOException; @@ -96,7 +96,7 @@ public void project( double camX, double camY, double camZ, Point2D_F64 output ) @Override public void jacobian( double X, double Y, double Z, double[] inputX, double[] inputY, boolean computeIntrinsic, - @Nullable double[] calibX, @Nullable double[] calibY ) { + double @Nullable [] calibX, double @Nullable [] calibY ) { double focalLength = fOff + zoom*fScale; double normX = X/Z; double normY = Y/Z; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/CalibrationObservationSet.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/CalibrationObservationSet.java index 4137289c02..4f5b3e6139 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/CalibrationObservationSet.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/CalibrationObservationSet.java @@ -19,7 +19,7 @@ package boofcv.alg.geo.calibration; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Set of observed calibration targets in a single frame from a single camera diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/CalibrationPlanarGridZhang99.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/CalibrationPlanarGridZhang99.java index 01d96c20d7..27d0a9540c 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/CalibrationPlanarGridZhang99.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/CalibrationPlanarGridZhang99.java @@ -39,7 +39,7 @@ import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/SynchronizedCalObs.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/SynchronizedCalObs.java index aae96e7830..a9a1d5f213 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/SynchronizedCalObs.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/SynchronizedCalObs.java @@ -19,7 +19,7 @@ package boofcv.alg.geo.calibration; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * All observations that were captured at the same instance. diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/Zhang99ComputeTargetHomography.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/Zhang99ComputeTargetHomography.java index 956a6d547e..f6eb73a276 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/Zhang99ComputeTargetHomography.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/calibration/Zhang99ComputeTargetHomography.java @@ -25,7 +25,7 @@ import georegression.struct.point.Point2D_F64; import lombok.Setter; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/f/FundamentalExtractEpipoles.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/f/FundamentalExtractEpipoles.java index fb0d886941..2819577ab6 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/f/FundamentalExtractEpipoles.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/f/FundamentalExtractEpipoles.java @@ -23,7 +23,7 @@ import org.ejml.dense.row.SingularOps_DDRM; import org.ejml.dense.row.factory.DecompositionFactory_DDRM; import org.ejml.interfaces.decomposition.SingularValueDecomposition_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyDirectLinearTransform.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyDirectLinearTransform.java index c3dac637b1..1dd13e8876 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyDirectLinearTransform.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyDirectLinearTransform.java @@ -34,7 +34,7 @@ import org.ejml.dense.row.linsol.svd.SolveNullSpaceSvd_DDRM; import org.ejml.interfaces.SolveNullSpace; import org.ejml.simple.SimpleMatrix; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; import java.util.Objects; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyInducedStereo2Line.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyInducedStereo2Line.java index d402622e1b..26fd6ebf13 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyInducedStereo2Line.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyInducedStereo2Line.java @@ -30,7 +30,7 @@ import georegression.struct.point.Vector3D_F64; import org.ejml.data.DMatrixRMaj; import org.ejml.dense.row.CommonOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyInducedStereo3Pts.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyInducedStereo3Pts.java index a0fd1acf9e..ea75973c19 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyInducedStereo3Pts.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyInducedStereo3Pts.java @@ -29,7 +29,7 @@ import org.ejml.data.DMatrixRMaj; import org.ejml.dense.row.factory.LinearSolverFactory_DDRM; import org.ejml.interfaces.linsol.LinearSolverDense; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyInducedStereoLinePt.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyInducedStereoLinePt.java index e1684e73bf..03f30ac066 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyInducedStereoLinePt.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyInducedStereoLinePt.java @@ -25,7 +25,7 @@ import georegression.struct.point.Point3D_F64; import org.ejml.data.DMatrixRMaj; import org.ejml.dense.row.CommonOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyRadial6Pts.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyRadial6Pts.java index 8d019d2f3a..8ea8ef2e46 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyRadial6Pts.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/h/HomographyRadial6Pts.java @@ -35,7 +35,7 @@ import org.ejml.dense.row.factory.LinearSolverFactory_DDRM; import org.ejml.interfaces.decomposition.SingularValueDecomposition_F64; import org.ejml.interfaces.linsol.LinearSolver; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/impl/ImplPerspectiveOps_F64.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/impl/ImplPerspectiveOps_F64.java index de96149a0f..483fb3c048 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/impl/ImplPerspectiveOps_F64.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/impl/ImplPerspectiveOps_F64.java @@ -36,7 +36,7 @@ import org.ejml.data.DMatrixRMaj; import org.ejml.dense.fixed.CommonOps_DDF3; import org.ejml.dense.row.CommonOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link PerspectiveOps} functions for 64-bit floats diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/RefineDualQuadraticAlgebraicError.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/RefineDualQuadraticAlgebraicError.java index c87f5eab58..7039c781d2 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/RefineDualQuadraticAlgebraicError.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/RefineDualQuadraticAlgebraicError.java @@ -35,7 +35,7 @@ import org.ejml.data.DMatrixRMaj; import org.ejml.dense.row.CommonOps_DDRM; import org.ejml.dense.row.NormOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Set; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/RefineTwoViewPinholeRotation.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/RefineTwoViewPinholeRotation.java index 612ce81f71..59fd720e7d 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/RefineTwoViewPinholeRotation.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/RefineTwoViewPinholeRotation.java @@ -38,7 +38,7 @@ import org.ddogleg.util.VerboseUtils; import org.ejml.data.DMatrixRMaj; import org.ejml.dense.row.CommonOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/ResolveSignAmbiguityPositiveDepth.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/ResolveSignAmbiguityPositiveDepth.java index 6b7b2e8401..b65d9dbbd0 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/ResolveSignAmbiguityPositiveDepth.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/ResolveSignAmbiguityPositiveDepth.java @@ -33,7 +33,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/SelfCalibrationEssentialGuessAndCheck.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/SelfCalibrationEssentialGuessAndCheck.java index f2b6337771..1c0a23503c 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/SelfCalibrationEssentialGuessAndCheck.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/SelfCalibrationEssentialGuessAndCheck.java @@ -28,7 +28,7 @@ import org.ejml.dense.row.CommonOps_DDRM; import org.ejml.dense.row.factory.DecompositionFactory_DDRM; import org.ejml.interfaces.decomposition.SingularValueDecomposition_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Arrays; diff --git a/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/SelfCalibrationPraticalGuessAndCheckFocus.java b/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/SelfCalibrationPraticalGuessAndCheckFocus.java index ddb901015e..1b032914e6 100644 --- a/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/SelfCalibrationPraticalGuessAndCheckFocus.java +++ b/main/boofcv-geo/src/main/java/boofcv/alg/geo/selfcalib/SelfCalibrationPraticalGuessAndCheckFocus.java @@ -26,7 +26,7 @@ import org.ddogleg.util.VerboseUtils; import org.ejml.data.DMatrixRMaj; import org.ejml.dense.row.CommonOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-geo/src/main/java/boofcv/factory/geo/FactoryMultiView.java b/main/boofcv-geo/src/main/java/boofcv/factory/geo/FactoryMultiView.java index 511c98ccd6..b7866fbddf 100644 --- a/main/boofcv-geo/src/main/java/boofcv/factory/geo/FactoryMultiView.java +++ b/main/boofcv-geo/src/main/java/boofcv/factory/geo/FactoryMultiView.java @@ -55,7 +55,7 @@ import org.ddogleg.struct.DogArray; import org.ejml.data.DMatrixRMaj; import org.ejml.data.DMatrixSparseCSC; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating abstracted algorithms related to multi-view geometry diff --git a/main/boofcv-geo/src/main/java/boofcv/factory/geo/FactoryMultiViewRobust.java b/main/boofcv-geo/src/main/java/boofcv/factory/geo/FactoryMultiViewRobust.java index 74d2b080b3..3181748099 100644 --- a/main/boofcv-geo/src/main/java/boofcv/factory/geo/FactoryMultiViewRobust.java +++ b/main/boofcv-geo/src/main/java/boofcv/factory/geo/FactoryMultiViewRobust.java @@ -44,7 +44,7 @@ import org.ddogleg.fitting.modelset.ransac.Ransac_MT; import org.ddogleg.struct.Factory; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating robust false-positive tolerant estimation algorithms in multi-view geometry. These diff --git a/main/boofcv-geo/src/main/java/boofcv/struct/calib/CameraModel.java b/main/boofcv-geo/src/main/java/boofcv/struct/calib/CameraModel.java index 62e563570d..52137dccd7 100644 --- a/main/boofcv-geo/src/main/java/boofcv/struct/calib/CameraModel.java +++ b/main/boofcv-geo/src/main/java/boofcv/struct/calib/CameraModel.java @@ -20,7 +20,7 @@ import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageDimension; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.Serializable; diff --git a/main/boofcv-geo/src/main/java/boofcv/struct/calib/CameraPinholeBrown.java b/main/boofcv-geo/src/main/java/boofcv/struct/calib/CameraPinholeBrown.java index 2f7a3b3a8e..7b77a82152 100644 --- a/main/boofcv-geo/src/main/java/boofcv/struct/calib/CameraPinholeBrown.java +++ b/main/boofcv-geo/src/main/java/boofcv/struct/calib/CameraPinholeBrown.java @@ -21,7 +21,7 @@ import lombok.Getter; import lombok.Setter; import org.ejml.FancyPrint; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.Serializable; import java.util.Arrays; @@ -45,7 +45,7 @@ public class CameraPinholeBrown extends CameraPinhole implements Serializable { /** radial distortion parameters */ - public @Nullable double[] radial; + public double @Nullable [] radial; /** tangential distortion parameters */ public @Getter @Setter double t1, t2; @@ -86,7 +86,7 @@ public CameraPinholeBrown fsetK( double fx, double fy, return (CameraPinholeBrown)super.fsetK(fx, fy, skew, cx, cy, width, height); } - public CameraPinholeBrown fsetRadial( @Nullable double... radial ) { + public CameraPinholeBrown fsetRadial( double @Nullable ... radial ) { if (radial == null) { this.radial = null; } else if (this.radial == null || this.radial.length != radial.length) @@ -156,7 +156,7 @@ public boolean isDistorted( double tol ) { return Math.abs(t1) > tol || Math.abs(t2) > tol; } - public @Nullable double[] getRadial() { + public double @Nullable [] getRadial() { return radial; } @@ -201,7 +201,7 @@ public String toString() { return txt; } - public static String toStringArray( FancyPrint fp, String name, @Nullable double[] param ) { + public static String toStringArray( FancyPrint fp, String name, double @Nullable [] param ) { if (param == null || param.length == 0) return ""; String txt = ","; diff --git a/main/boofcv-geo/src/main/java/boofcv/struct/calib/MultiCameraCalibParams.java b/main/boofcv-geo/src/main/java/boofcv/struct/calib/MultiCameraCalibParams.java index b4e4f79209..b5e8c7e327 100644 --- a/main/boofcv-geo/src/main/java/boofcv/struct/calib/MultiCameraCalibParams.java +++ b/main/boofcv-geo/src/main/java/boofcv/struct/calib/MultiCameraCalibParams.java @@ -23,7 +23,7 @@ import georegression.struct.se.Se3_F64; import georegression.struct.se.SpecialEuclideanOps_F64; import lombok.Getter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.Serializable; import java.util.ArrayList; diff --git a/main/boofcv-geo/src/test/java/boofcv/alg/geo/bundle/cameras/GenericChecksBundleAdjustmentCamera.java b/main/boofcv-geo/src/test/java/boofcv/alg/geo/bundle/cameras/GenericChecksBundleAdjustmentCamera.java index 3d8db263a0..5de92aa686 100644 --- a/main/boofcv-geo/src/test/java/boofcv/alg/geo/bundle/cameras/GenericChecksBundleAdjustmentCamera.java +++ b/main/boofcv-geo/src/test/java/boofcv/alg/geo/bundle/cameras/GenericChecksBundleAdjustmentCamera.java @@ -27,7 +27,7 @@ import org.ddogleg.optimization.functions.FunctionNtoMxN; import org.ejml.UtilEjml; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/main/boofcv-geo/src/test/java/boofcv/alg/geo/bundle/jacobians/TestBundleCameraNumericJacobian.java b/main/boofcv-geo/src/test/java/boofcv/alg/geo/bundle/jacobians/TestBundleCameraNumericJacobian.java index 447933b902..c5a53dbaa9 100644 --- a/main/boofcv-geo/src/test/java/boofcv/alg/geo/bundle/jacobians/TestBundleCameraNumericJacobian.java +++ b/main/boofcv-geo/src/test/java/boofcv/alg/geo/bundle/jacobians/TestBundleCameraNumericJacobian.java @@ -22,7 +22,7 @@ import boofcv.testing.BoofStandardJUnit; import georegression.struct.point.Point2D_F64; import org.ejml.UtilEjml; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -98,7 +98,7 @@ public void project( double camX, double camY, double camZ, Point2D_F64 output ) @Override public void jacobian( double camX, double camY, double camZ, double[] pointX, double[] pointY, boolean computeIntrinsic, - @Nullable double[] calibX, @Nullable double[] calibY ) { + double @Nullable [] calibX, double @Nullable [] calibY ) { pointX[0] = 1.0/camZ; pointX[1] = 0; pointX[2] = -(camX + a)/(camZ*camZ); diff --git a/main/boofcv-geo/src/test/java/boofcv/alg/geo/triangulate/CommonTriangulationChecks.java b/main/boofcv-geo/src/test/java/boofcv/alg/geo/triangulate/CommonTriangulationChecks.java index fbaec8463f..feff264b36 100644 --- a/main/boofcv-geo/src/test/java/boofcv/alg/geo/triangulate/CommonTriangulationChecks.java +++ b/main/boofcv-geo/src/test/java/boofcv/alg/geo/triangulate/CommonTriangulationChecks.java @@ -29,7 +29,7 @@ import georegression.struct.point.Point4D_F64; import georegression.struct.se.Se3_F64; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-io/src/main/java/boofcv/io/MediaManager.java b/main/boofcv-io/src/main/java/boofcv/io/MediaManager.java index c679055ed7..57550e758a 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/MediaManager.java +++ b/main/boofcv-io/src/main/java/boofcv/io/MediaManager.java @@ -21,7 +21,7 @@ import boofcv.io.image.SimpleImageSequence; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.image.BufferedImage; import java.io.Reader; diff --git a/main/boofcv-io/src/main/java/boofcv/io/MirrorStream.java b/main/boofcv-io/src/main/java/boofcv/io/MirrorStream.java index f75d0b6b36..d5ddd6b71f 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/MirrorStream.java +++ b/main/boofcv-io/src/main/java/boofcv/io/MirrorStream.java @@ -18,6 +18,8 @@ package boofcv.io; +import org.jspecify.annotations.NonNull; + import java.io.OutputStream; import java.io.PrintStream; @@ -32,7 +34,7 @@ public class MirrorStream extends OutputStream { PrintStream outA, outB; public MirrorStream( PrintStream outA, PrintStream outB ) {this.outA = outA; this.outB = outB;} @Override public void write( int b ) {outA.write(b); outB.write(b);} - @Override public void write( byte[] b, int off, int len ) {outA.write(b, off, len); outB.write(b, off, len);} + @Override public void write( byte@NonNull[] b, int off, int len ) {outA.write(b, off, len); outB.write(b, off, len);} @Override public void flush() {outA.flush(); outB.flush();} @Override public void close() {outA.close(); outB.close();} //@formatter:on diff --git a/main/boofcv-io/src/main/java/boofcv/io/SerializeConfigYaml.java b/main/boofcv-io/src/main/java/boofcv/io/SerializeConfigYaml.java index f418dcf338..e9f2301623 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/SerializeConfigYaml.java +++ b/main/boofcv-io/src/main/java/boofcv/io/SerializeConfigYaml.java @@ -21,7 +21,7 @@ import boofcv.BoofVersion; import boofcv.io.serialize.SerializeFieldsYamlBase; import boofcv.struct.Configuration; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.yaml.snakeyaml.Yaml; import java.io.IOException; diff --git a/main/boofcv-io/src/main/java/boofcv/io/UtilIO.java b/main/boofcv-io/src/main/java/boofcv/io/UtilIO.java index 0b685e0455..a684c423e4 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/UtilIO.java +++ b/main/boofcv-io/src/main/java/boofcv/io/UtilIO.java @@ -32,7 +32,8 @@ import georegression.struct.so.Quaternion_F64; import georegression.struct.so.Rodrigues_F64; import org.apache.commons.io.FilenameUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.NonNull; +import org.jspecify.annotations.Nullable; import org.yaml.snakeyaml.Yaml; import javax.swing.*; @@ -578,7 +579,7 @@ public static void save( Object o, String fileName ) { } public static T load( String fileName ) { - @Nullable URL url = UtilIO.ensureURL(fileName); + URL url = UtilIO.ensureURL(fileName); if (url == null) throw new RuntimeException("Unknown path=" + fileName); @@ -865,14 +866,14 @@ public static List listSmart( String pathPattern, boolean sort, BoofLamb PathMatcher pathMatcher = FileSystems.getDefault().getPathMatcher(pathPattern); Files.walkFileTree(Paths.get(baseDirectory), new SimpleFileVisitor<>() { - @Override public FileVisitResult visitFile( Path path, BasicFileAttributes attrs ) { + @Override public @NonNull FileVisitResult visitFile( @NonNull Path path, @NonNull BasicFileAttributes attrs ) { if (pathMatcher.matches(path) && filter.keep(path)) { results.add(path.toString()); } return FileVisitResult.CONTINUE; } - @Override public FileVisitResult visitFileFailed( Path file, IOException exc ) { + @Override public @NonNull FileVisitResult visitFileFailed( @NonNull Path file, @NonNull IOException exc ) { return FileVisitResult.CONTINUE; } }); diff --git a/main/boofcv-io/src/main/java/boofcv/io/calibration/CalibrationIO.java b/main/boofcv-io/src/main/java/boofcv/io/calibration/CalibrationIO.java index ee2c96fbed..b8f112a7ea 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/calibration/CalibrationIO.java +++ b/main/boofcv-io/src/main/java/boofcv/io/calibration/CalibrationIO.java @@ -28,7 +28,7 @@ import georegression.struct.se.Se3_F64; import org.apache.commons.io.IOUtils; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; diff --git a/main/boofcv-io/src/main/java/boofcv/io/geo/MultiViewIO.java b/main/boofcv-io/src/main/java/boofcv/io/geo/MultiViewIO.java index 778e7757e9..83470e7fd9 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/geo/MultiViewIO.java +++ b/main/boofcv-io/src/main/java/boofcv/io/geo/MultiViewIO.java @@ -39,7 +39,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.FastAccess; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.yaml.snakeyaml.Yaml; import java.io.*; @@ -339,7 +339,7 @@ private static Map encodeObservationView( SceneObservations.View } private static SceneStructureCommon.Point decodeScenePoint( Map map, - @Nullable SceneStructureCommon.Point p ) + SceneStructureCommon.@Nullable Point p ) throws IOException { List coordinate = getOrThrow(map, "coordinate"); List views = getOrThrow(map, "views"); @@ -378,7 +378,7 @@ private static Map encodeSceneCamera( SceneStructureCommon.Camer } private static SceneStructureCommon.Camera decodeSceneCamera( Map map, - @Nullable SceneStructureCommon.Camera c ) + SceneStructureCommon.@Nullable Camera c ) throws IOException { if (c == null) c = new SceneStructureCommon.Camera(); diff --git a/main/boofcv-io/src/main/java/boofcv/io/image/ConvertBufferedImage.java b/main/boofcv-io/src/main/java/boofcv/io/image/ConvertBufferedImage.java index bfba8712ad..c314350c19 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/image/ConvertBufferedImage.java +++ b/main/boofcv-io/src/main/java/boofcv/io/image/ConvertBufferedImage.java @@ -20,7 +20,7 @@ import boofcv.core.image.GeneralizedImageOps; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.awt.*; diff --git a/main/boofcv-io/src/main/java/boofcv/io/image/ConvertLabeledImageFormats.java b/main/boofcv-io/src/main/java/boofcv/io/image/ConvertLabeledImageFormats.java index 9a2f018b26..b48926aff6 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/image/ConvertLabeledImageFormats.java +++ b/main/boofcv-io/src/main/java/boofcv/io/image/ConvertLabeledImageFormats.java @@ -21,7 +21,7 @@ import boofcv.struct.image.GrayS32; import boofcv.struct.image.GrayU8; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.*; import java.awt.image.BufferedImage; diff --git a/main/boofcv-io/src/main/java/boofcv/io/image/UtilImageIO.java b/main/boofcv-io/src/main/java/boofcv/io/image/UtilImageIO.java index d8407267c5..3b6081c4e9 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/image/UtilImageIO.java +++ b/main/boofcv-io/src/main/java/boofcv/io/image/UtilImageIO.java @@ -24,7 +24,7 @@ import boofcv.struct.image.*; import org.apache.commons.io.FilenameUtils; import org.ddogleg.struct.DogArray_I8; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.imageio.IIOImage; import javax.imageio.ImageIO; diff --git a/main/boofcv-io/src/main/java/boofcv/io/points/PointCloudIO.java b/main/boofcv-io/src/main/java/boofcv/io/points/PointCloudIO.java index 7846a386eb..bcfddbbbad 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/points/PointCloudIO.java +++ b/main/boofcv-io/src/main/java/boofcv/io/points/PointCloudIO.java @@ -30,7 +30,7 @@ import org.apache.commons.io.FilenameUtils; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.*; import java.nio.ByteOrder; diff --git a/main/boofcv-io/src/main/java/boofcv/io/points/StlDataStructure.java b/main/boofcv-io/src/main/java/boofcv/io/points/StlDataStructure.java index 63270f75aa..01f859d171 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/points/StlDataStructure.java +++ b/main/boofcv-io/src/main/java/boofcv/io/points/StlDataStructure.java @@ -26,7 +26,7 @@ import georegression.struct.point.Vector3D_F64; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

Data structure used to store 3D objects that is native to the STL file format [1,2]. One deviation is diff --git a/main/boofcv-io/src/main/java/boofcv/io/points/impl/ObjFileWriter.java b/main/boofcv-io/src/main/java/boofcv/io/points/impl/ObjFileWriter.java index c06ff0a6e8..44ca43d0cc 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/points/impl/ObjFileWriter.java +++ b/main/boofcv-io/src/main/java/boofcv/io/points/impl/ObjFileWriter.java @@ -19,7 +19,7 @@ package boofcv.io.points.impl; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.IOException; import java.io.Writer; diff --git a/main/boofcv-io/src/main/java/boofcv/io/points/impl/ObjLoadFromFiles.java b/main/boofcv-io/src/main/java/boofcv/io/points/impl/ObjLoadFromFiles.java index d36f642e4c..22d5ebc60c 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/points/impl/ObjLoadFromFiles.java +++ b/main/boofcv-io/src/main/java/boofcv/io/points/impl/ObjLoadFromFiles.java @@ -21,7 +21,7 @@ import boofcv.struct.mesh.VertexMesh; import lombok.Getter; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/main/boofcv-io/src/main/java/boofcv/io/points/impl/PlyCodec.java b/main/boofcv-io/src/main/java/boofcv/io/points/impl/PlyCodec.java index 23800d27fb..03464e80fc 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/points/impl/PlyCodec.java +++ b/main/boofcv-io/src/main/java/boofcv/io/points/impl/PlyCodec.java @@ -28,7 +28,7 @@ import georegression.struct.point.Point3D_F32; import georegression.struct.point.Point3D_F64; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.IOException; import java.io.InputStream; diff --git a/main/boofcv-io/src/main/java/boofcv/io/recognition/RecognitionIO.java b/main/boofcv-io/src/main/java/boofcv/io/recognition/RecognitionIO.java index 3243771b14..b9085ef4d0 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/recognition/RecognitionIO.java +++ b/main/boofcv-io/src/main/java/boofcv/io/recognition/RecognitionIO.java @@ -42,7 +42,7 @@ import org.ddogleg.struct.BigDogArray_I32; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.FastAccess; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/main/boofcv-io/src/main/java/boofcv/io/serialize/SerializeFieldsYamlBase.java b/main/boofcv-io/src/main/java/boofcv/io/serialize/SerializeFieldsYamlBase.java index 501f49dc99..782a6f53b7 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/serialize/SerializeFieldsYamlBase.java +++ b/main/boofcv-io/src/main/java/boofcv/io/serialize/SerializeFieldsYamlBase.java @@ -22,7 +22,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; diff --git a/main/boofcv-io/src/main/java/boofcv/io/video/BoofMjpegVideo.java b/main/boofcv-io/src/main/java/boofcv/io/video/BoofMjpegVideo.java index ee625f77c5..0418181bf5 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/video/BoofMjpegVideo.java +++ b/main/boofcv-io/src/main/java/boofcv/io/video/BoofMjpegVideo.java @@ -22,7 +22,7 @@ import boofcv.io.wrapper.images.MjpegStreamSequence; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.FileNotFoundException; diff --git a/main/boofcv-io/src/main/java/boofcv/io/video/DynamicVideoInterface.java b/main/boofcv-io/src/main/java/boofcv/io/video/DynamicVideoInterface.java index 3db2769679..9b1366213f 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/video/DynamicVideoInterface.java +++ b/main/boofcv-io/src/main/java/boofcv/io/video/DynamicVideoInterface.java @@ -25,7 +25,7 @@ import boofcv.io.wrapper.images.LoadFileImageSequence; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.File; import java.io.IOException; diff --git a/main/boofcv-io/src/main/java/boofcv/io/video/VideoInterface.java b/main/boofcv-io/src/main/java/boofcv/io/video/VideoInterface.java index 204fa8987e..6603234dad 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/video/VideoInterface.java +++ b/main/boofcv-io/src/main/java/boofcv/io/video/VideoInterface.java @@ -21,7 +21,7 @@ import boofcv.io.image.SimpleImageSequence; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Abstract interface for loading video streams. diff --git a/main/boofcv-io/src/main/java/boofcv/io/video/VideoMjpegCodec.java b/main/boofcv-io/src/main/java/boofcv/io/video/VideoMjpegCodec.java index c3f5b3efce..61af8ef1c3 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/video/VideoMjpegCodec.java +++ b/main/boofcv-io/src/main/java/boofcv/io/video/VideoMjpegCodec.java @@ -18,7 +18,7 @@ package boofcv.io.video; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.*; import java.util.ArrayList; @@ -57,7 +57,7 @@ public List read( InputStream streamIn ) { /** * Read a single frame at a time */ - public @Nullable byte[] readFrame( DataInputStream in ) { + public byte @Nullable [] readFrame( DataInputStream in ) { try { if (findMarker(in, SOI) && in.available() > 0) { return readJpegData(in, EOI); diff --git a/main/boofcv-io/src/main/java/boofcv/io/wrapper/DefaultMediaManager.java b/main/boofcv-io/src/main/java/boofcv/io/wrapper/DefaultMediaManager.java index 129e054693..123543c389 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/wrapper/DefaultMediaManager.java +++ b/main/boofcv-io/src/main/java/boofcv/io/wrapper/DefaultMediaManager.java @@ -26,7 +26,7 @@ import boofcv.io.video.VideoInterface; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.*; import java.awt.image.BufferedImage; diff --git a/main/boofcv-io/src/main/java/boofcv/io/wrapper/images/LoadFileImageSequence.java b/main/boofcv-io/src/main/java/boofcv/io/wrapper/images/LoadFileImageSequence.java index e411492454..fa54e29a55 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/wrapper/images/LoadFileImageSequence.java +++ b/main/boofcv-io/src/main/java/boofcv/io/wrapper/images/LoadFileImageSequence.java @@ -23,7 +23,7 @@ import boofcv.io.image.UtilImageIO; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.*; import java.awt.geom.AffineTransform; diff --git a/main/boofcv-io/src/main/java/boofcv/io/wrapper/images/LoadFileImageSequence2.java b/main/boofcv-io/src/main/java/boofcv/io/wrapper/images/LoadFileImageSequence2.java index 9fe2e049e5..9c5d43cbb8 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/wrapper/images/LoadFileImageSequence2.java +++ b/main/boofcv-io/src/main/java/boofcv/io/wrapper/images/LoadFileImageSequence2.java @@ -26,7 +26,7 @@ import boofcv.struct.image.ImageType; import lombok.Getter; import lombok.Setter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.awt.image.BufferedImage; import java.util.List; diff --git a/main/boofcv-io/src/main/java/boofcv/io/wrapper/images/MjpegStreamSequence.java b/main/boofcv-io/src/main/java/boofcv/io/wrapper/images/MjpegStreamSequence.java index 2345bd1370..4a6d3b3afa 100644 --- a/main/boofcv-io/src/main/java/boofcv/io/wrapper/images/MjpegStreamSequence.java +++ b/main/boofcv-io/src/main/java/boofcv/io/wrapper/images/MjpegStreamSequence.java @@ -23,7 +23,7 @@ import boofcv.io.video.VideoMjpegCodec; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; diff --git a/main/boofcv-io/src/main/java/boofcv/visualize/PointCloudViewer.java b/main/boofcv-io/src/main/java/boofcv/visualize/PointCloudViewer.java index 93ed889913..174a6a2c60 100644 --- a/main/boofcv-io/src/main/java/boofcv/visualize/PointCloudViewer.java +++ b/main/boofcv-io/src/main/java/boofcv/visualize/PointCloudViewer.java @@ -26,7 +26,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.swing.*; import java.util.List; diff --git a/main/boofcv-io/src/main/java/boofcv/visualize/RenderMesh.java b/main/boofcv-io/src/main/java/boofcv/visualize/RenderMesh.java index 9f05000cdb..cca8ce2094 100644 --- a/main/boofcv-io/src/main/java/boofcv/visualize/RenderMesh.java +++ b/main/boofcv-io/src/main/java/boofcv/visualize/RenderMesh.java @@ -50,7 +50,7 @@ import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Set; diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/DisparitySmootherSpeckleFilter.java b/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/DisparitySmootherSpeckleFilter.java index e18bc874f0..a6413613ca 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/DisparitySmootherSpeckleFilter.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/DisparitySmootherSpeckleFilter.java @@ -23,7 +23,7 @@ import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageGray; import lombok.Getter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Set; diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/StereoDisparity.java b/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/StereoDisparity.java index e6cdc42b50..e79f855b1e 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/StereoDisparity.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/StereoDisparity.java @@ -22,7 +22,7 @@ import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/WrapBaseBlockMatch.java b/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/WrapBaseBlockMatch.java index 57d22831a3..041afc9207 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/WrapBaseBlockMatch.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/WrapBaseBlockMatch.java @@ -23,7 +23,7 @@ import boofcv.core.image.GeneralizedImageOps; import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Base class for wrapped block matching algorithms. diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/WrapDisparitySgm.java b/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/WrapDisparitySgm.java index 32f0f05562..6a686da457 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/WrapDisparitySgm.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/abst/disparity/WrapDisparitySgm.java @@ -23,7 +23,7 @@ import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; public class WrapDisparitySgm> implements StereoDisparity { diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/DisparityBlockMatchRowFormat.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/DisparityBlockMatchRowFormat.java index c212b1037b..05cf7e097a 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/DisparityBlockMatchRowFormat.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/DisparityBlockMatchRowFormat.java @@ -29,7 +29,7 @@ import boofcv.struct.image.ImageType; import lombok.Getter; import lombok.Setter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/DisparitySelect.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/DisparitySelect.java index bcf84be7a1..32ec2dc747 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/DisparitySelect.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/DisparitySelect.java @@ -21,7 +21,7 @@ import boofcv.alg.disparity.DisparityBlockMatch; import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/SelectDisparityBasicWta.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/SelectDisparityBasicWta.java index 6eb3c4e4e6..0723f8d32e 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/SelectDisparityBasicWta.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/SelectDisparityBasicWta.java @@ -20,7 +20,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/SelectDisparityWithChecksWta.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/SelectDisparityWithChecksWta.java index 8da3bd5a2d..695cf95cc9 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/SelectDisparityWithChecksWta.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/SelectDisparityWithChecksWta.java @@ -20,7 +20,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBMBestFive_F32.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBMBestFive_F32.java index 3c4584cf04..242720be52 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBMBestFive_F32.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBMBestFive_F32.java @@ -27,7 +27,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import pabeles.concurrency.IntRangeObjectConsumer; diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBMBestFive_S32.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBMBestFive_S32.java index 6e45ea8310..4cab77ada6 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBMBestFive_S32.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBMBestFive_S32.java @@ -26,7 +26,7 @@ import boofcv.misc.Compare_S32; import boofcv.struct.border.ImageBorder; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import pabeles.concurrency.IntRangeObjectConsumer; diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBM_F32.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBM_F32.java index c740aa9f96..0c1bcd109c 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBM_F32.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBM_F32.java @@ -26,7 +26,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import pabeles.concurrency.IntRangeObjectConsumer; diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBM_S32.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBM_S32.java index c0ca93d6d5..ce0faf8bf6 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBM_S32.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/score/DisparityScoreBM_S32.java @@ -24,7 +24,7 @@ import boofcv.concurrency.BoofConcurrency; import boofcv.struct.border.ImageBorder; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import pabeles.concurrency.IntRangeObjectConsumer; diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectCorrelationWithChecks_F32.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectCorrelationWithChecks_F32.java index bb473b0e1d..a2f6d9e653 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectCorrelationWithChecks_F32.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectCorrelationWithChecks_F32.java @@ -24,7 +24,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectCorrelationWta_F32_U8.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectCorrelationWta_F32_U8.java index 82d7f5900a..3dae148c7a 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectCorrelationWta_F32_U8.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectCorrelationWta_F32_U8.java @@ -23,7 +23,7 @@ import boofcv.misc.Compare_F32; import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayU8; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectErrorWithChecks_F32.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectErrorWithChecks_F32.java index 27b4ddc539..e39b5deb61 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectErrorWithChecks_F32.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectErrorWithChecks_F32.java @@ -24,7 +24,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectErrorWithChecks_S32.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectErrorWithChecks_S32.java index d3a391a68e..a8715dee62 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectErrorWithChecks_S32.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/block/select/SelectErrorWithChecks_S32.java @@ -24,7 +24,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/sgm/cost/SgmCostFromBlocks.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/sgm/cost/SgmCostFromBlocks.java index 28b1300e0b..a27e8e689b 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/sgm/cost/SgmCostFromBlocks.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/disparity/sgm/cost/SgmCostFromBlocks.java @@ -25,7 +25,7 @@ import boofcv.alg.disparity.sgm.SgmDisparityCost; import boofcv.misc.Compare_S32; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Computes the error for SGM using {@link BlockRowScore block matching}. diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/distort/LensDistortionOps.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/distort/LensDistortionOps.java index 45a12c5f98..b39783a001 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/distort/LensDistortionOps.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/distort/LensDistortionOps.java @@ -28,7 +28,7 @@ import boofcv.struct.distort.PointToPixelTransform_F32; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Operations for manipulating lens distortion which do not have F32 and F64 equivalents. diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/BundleToRectificationStereoParameters.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/BundleToRectificationStereoParameters.java index 7a99c6f060..d2619c9e9b 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/BundleToRectificationStereoParameters.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/BundleToRectificationStereoParameters.java @@ -37,7 +37,7 @@ import org.ejml.data.FMatrixRMaj; import org.ejml.dense.row.MatrixFeatures_DDRM; import org.ejml.ops.ConvertMatrixData; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import static boofcv.misc.BoofMiscOps.checkTrue; diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/MultiBaselineDisparityErrors.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/MultiBaselineDisparityErrors.java index 446643510e..349101f4bb 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/MultiBaselineDisparityErrors.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/MultiBaselineDisparityErrors.java @@ -33,7 +33,7 @@ import org.ejml.data.DMatrixRMaj; import org.ejml.dense.row.CommonOps_DDRM; import org.ejml.ops.DConvertMatrixStruct; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Set; diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/MultiBaselineStereoIndependent.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/MultiBaselineStereoIndependent.java index 416d7fbc88..4c33915ed0 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/MultiBaselineStereoIndependent.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/MultiBaselineStereoIndependent.java @@ -41,7 +41,7 @@ import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Objects; @@ -142,7 +142,7 @@ public class MultiBaselineStereoIndependent> impl @Nullable PrintStream verbose = null; @Nullable @Getter @Setter PrintStream verboseProfiling = null; - public MultiBaselineStereoIndependent( LookUpImages lookUpImages, ImageType imageType ) { + public MultiBaselineStereoIndependent( @Nullable LookUpImages lookUpImages, ImageType imageType ) { this(imageType); this.lookUpImages = lookUpImages; } diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/MultiViewStereoOps.java b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/MultiViewStereoOps.java index dbe2591369..22fe81ee14 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/MultiViewStereoOps.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/alg/mvs/MultiViewStereoOps.java @@ -34,7 +34,7 @@ import georegression.struct.se.Se3_F64; import georegression.transform.se.SePointOps_F64; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/factory/disparity/FactoryStereoDisparity.java b/main/boofcv-ip-multiview/src/main/java/boofcv/factory/disparity/FactoryStereoDisparity.java index de2e4f5123..4cf2438032 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/factory/disparity/FactoryStereoDisparity.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/factory/disparity/FactoryStereoDisparity.java @@ -34,7 +34,7 @@ import boofcv.core.image.border.FactoryImageBorder; import boofcv.factory.transform.census.FactoryCensusTransform; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip-multiview/src/main/java/boofcv/factory/disparity/FactoryStereoDisparityAlgs.java b/main/boofcv-ip-multiview/src/main/java/boofcv/factory/disparity/FactoryStereoDisparityAlgs.java index 83c24d75a0..bca00eef57 100644 --- a/main/boofcv-ip-multiview/src/main/java/boofcv/factory/disparity/FactoryStereoDisparityAlgs.java +++ b/main/boofcv-ip-multiview/src/main/java/boofcv/factory/disparity/FactoryStereoDisparityAlgs.java @@ -34,7 +34,7 @@ import boofcv.core.image.border.FactoryImageBorder; import boofcv.factory.transform.census.FactoryCensusTransform; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import static boofcv.factory.disparity.FactoryStereoDisparity.*; diff --git a/main/boofcv-ip-multiview/src/test/java/boofcv/alg/mvs/TestMultiViewStereoOps.java b/main/boofcv-ip-multiview/src/test/java/boofcv/alg/mvs/TestMultiViewStereoOps.java index 3556da57f8..fbb5e2511d 100644 --- a/main/boofcv-ip-multiview/src/test/java/boofcv/alg/mvs/TestMultiViewStereoOps.java +++ b/main/boofcv-ip-multiview/src/test/java/boofcv/alg/mvs/TestMultiViewStereoOps.java @@ -45,7 +45,7 @@ import georegression.struct.se.Se3_F64; import georegression.struct.se.SpecialEuclideanOps_F64; import org.ejml.dense.row.CommonOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/binary/impl/GenerateImplThresholdImageOps.java b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/binary/impl/GenerateImplThresholdImageOps.java index 546f979aae..cb1c47415e 100644 --- a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/binary/impl/GenerateImplThresholdImageOps.java +++ b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/binary/impl/GenerateImplThresholdImageOps.java @@ -51,7 +51,7 @@ private void printPreamble() { "import pabeles.concurrency.GrowArray;\n" + "import org.ddogleg.struct.DogArray_F32;\n" + "import org.ddogleg.struct.DogArray_I32;\n" + - "import org.jetbrains.annotations.Nullable;\n" + + "import org.jspecify.annotations.Nullable;\n" + "import boofcv.struct.image.*;\n" + "import boofcv.alg.filter.blur.BlurImageOps;\n" + "import boofcv.struct.ConfigLength;\n" + diff --git a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/blur/GenerateBlurImageOps.java b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/blur/GenerateBlurImageOps.java index b1599674df..6b70021794 100644 --- a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/blur/GenerateBlurImageOps.java +++ b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/blur/GenerateBlurImageOps.java @@ -65,7 +65,7 @@ private void printPreamble() { "import org.ddogleg.struct.DogArray_F32;\n" + "import org.ddogleg.struct.DogArray_F64;\n" + "import org.ddogleg.struct.DogArray_I32;\n" + - "import org.jetbrains.annotations.Nullable;\n" + + "import org.jspecify.annotations.Nullable;\n" + "import pabeles.concurrency.GrowArray;\n" + "\n" + "import javax.annotation.Generated;\n" + diff --git a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/blur/impl/GenerateImplMedianSortEdgeNaive.java b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/blur/impl/GenerateImplMedianSortEdgeNaive.java index 043238ec1f..8474fdcd49 100644 --- a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/blur/impl/GenerateImplMedianSortEdgeNaive.java +++ b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/blur/impl/GenerateImplMedianSortEdgeNaive.java @@ -41,7 +41,7 @@ private void printPreamble() { "import boofcv.struct.image.*;\n" + "import org.ddogleg.sorting.QuickSelect;\n" + "import org.ddogleg.struct.*;\n" + - "import org.jetbrains.annotations.Nullable;\n" + + "import org.jspecify.annotations.Nullable;\n" + "\n" + "import javax.annotation.Generated;\n" + "\n" + diff --git a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/GenerateConvolveImageMean.java b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/GenerateConvolveImageMean.java index c96e3b41a5..9ac6a11b65 100644 --- a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/GenerateConvolveImageMean.java +++ b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/GenerateConvolveImageMean.java @@ -67,7 +67,7 @@ private void printPreamble() { "import org.ddogleg.struct.DogArray_F32;\n" + "import org.ddogleg.struct.DogArray_F64;\n" + "import org.ddogleg.struct.DogArray_I32;\n" + - "import org.jetbrains.annotations.Nullable;\n" + + "import org.jspecify.annotations.Nullable;\n" + "\n" + "/**\n" + " *

Convolves a mean filter across the image. The mean value of all the pixels are computed inside the kernel.

\n" + diff --git a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/GenerateConvolveImageNoBorder.java b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/GenerateConvolveImageNoBorder.java index d65bae3774..85941198b4 100644 --- a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/GenerateConvolveImageNoBorder.java +++ b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/GenerateConvolveImageNoBorder.java @@ -66,7 +66,7 @@ private void printPreamble() { "import boofcv.struct.convolve.*;\n" + "import boofcv.struct.image.*;\n" + "import org.ddogleg.struct.DogArray_I32;\n" + - "import org.jetbrains.annotations.Nullable;\n" + + "import org.jspecify.annotations.Nullable;\n" + "\n"+ "import javax.annotation.Generated;\n"); diff --git a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateConvolveImageStandard_SB.java b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateConvolveImageStandard_SB.java index 67956381ad..68d0a5ffed 100644 --- a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateConvolveImageStandard_SB.java +++ b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateConvolveImageStandard_SB.java @@ -70,7 +70,7 @@ private void printPreamble() { "import boofcv.struct.convolve.*;\n" + "import boofcv.struct.image.*;\n" + "import org.ddogleg.struct.DogArray_I32;\n" + - "import org.jetbrains.annotations.Nullable;\n" + + "import org.jspecify.annotations.Nullable;\n" + "\n" + "import javax.annotation.Generated;\n" + "import java.util.Arrays;\n"); diff --git a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateConvolvedUnrolled_SB.java b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateConvolvedUnrolled_SB.java index c7cf975f4a..46c3834910 100644 --- a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateConvolvedUnrolled_SB.java +++ b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateConvolvedUnrolled_SB.java @@ -129,7 +129,7 @@ public void printPreamble( String nameConcurrent ) { "import boofcv.misc.BoofMiscOps;\n" + "import boofcv.struct.convolve.*;\n" + "import pabeles.concurrency.GrowArray;\n" + - "import org.jetbrains.annotations.Nullable;\n"); + "import org.jspecify.annotations.Nullable;\n"); if (typeInput.compareTo(typeOutput) != 0) out.print("import boofcv.struct.image." + typeOutput + ";\n"); out.print("import boofcv.struct.image." + typeInput + ";\n"+ diff --git a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateImplConvolveBox.java b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateImplConvolveBox.java index 6268e680cf..e02825f4dd 100644 --- a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateImplConvolveBox.java +++ b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateImplConvolveBox.java @@ -59,7 +59,7 @@ public void printPreamble() { "import org.ddogleg.struct.DogArray_F32;\n" + "import org.ddogleg.struct.DogArray_F64;\n" + "import org.ddogleg.struct.DogArray_I32;\n" + - "import org.jetbrains.annotations.Nullable;\n"); + "import org.jspecify.annotations.Nullable;\n"); out.print("\n//CONCURRENT_INLINE import boofcv.concurrency.BoofConcurrency;\n"); diff --git a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateImplConvolveMean.java b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateImplConvolveMean.java index 9c41b93f80..2ff487a974 100644 --- a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateImplConvolveMean.java +++ b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/convolve/noborder/GenerateImplConvolveMean.java @@ -55,7 +55,7 @@ public void printPreamble() { "import org.ddogleg.struct.DogArray_F32;\n" + "import org.ddogleg.struct.DogArray_F64;\n" + "import org.ddogleg.struct.DogArray_I32;\n" + - "import org.jetbrains.annotations.Nullable;\n" + + "import org.jspecify.annotations.Nullable;\n" + "\n" + "//CONCURRENT_INLINE import boofcv.concurrency.BoofConcurrency;\n"); diff --git a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/misc/GenerateImageLambdaFilters.java b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/misc/GenerateImageLambdaFilters.java index 113ac05798..a2d3eb60aa 100644 --- a/main/boofcv-ip/src/generate/java/boofcv/alg/filter/misc/GenerateImageLambdaFilters.java +++ b/main/boofcv-ip/src/generate/java/boofcv/alg/filter/misc/GenerateImageLambdaFilters.java @@ -42,7 +42,7 @@ public class GenerateImageLambdaFilters extends CodeGeneratorBase { private void printPreamble() { out.print("import boofcv.struct.image.*;\n" + - "import org.jetbrains.annotations.Nullable;\n" + + "import org.jspecify.annotations.Nullable;\n" + "\n" + "import javax.annotation.Generated;\n" + "\n" + diff --git a/main/boofcv-ip/src/generate/java/boofcv/alg/misc/GenerateImageBandMath.java b/main/boofcv-ip/src/generate/java/boofcv/alg/misc/GenerateImageBandMath.java index 5e41f24748..2c4fd1e43e 100644 --- a/main/boofcv-ip/src/generate/java/boofcv/alg/misc/GenerateImageBandMath.java +++ b/main/boofcv-ip/src/generate/java/boofcv/alg/misc/GenerateImageBandMath.java @@ -54,7 +54,7 @@ private void printPreamble() { "import boofcv.concurrency.BoofConcurrency;\n" + "\n" + "import javax.annotation.Generated;\n" + - "import org.jetbrains.annotations.Nullable;\n" + + "import org.jspecify.annotations.Nullable;\n" + "\n" + "/**\n" + " * Collection of functions that project Bands of Planar images onto\n" + diff --git a/main/boofcv-ip/src/generate/java/boofcv/alg/misc/GenerateImageMiscOps.java b/main/boofcv-ip/src/generate/java/boofcv/alg/misc/GenerateImageMiscOps.java index 8a88f25a84..882ff83048 100644 --- a/main/boofcv-ip/src/generate/java/boofcv/alg/misc/GenerateImageMiscOps.java +++ b/main/boofcv-ip/src/generate/java/boofcv/alg/misc/GenerateImageMiscOps.java @@ -56,7 +56,7 @@ private void printPreamble() { "import boofcv.struct.border.ImageBorder_F64;\n" + "import boofcv.struct.border.ImageBorder_S32;\n" + "import boofcv.struct.border.ImageBorder_S64;\n" + - "import org.jetbrains.annotations.Nullable;\n" + + "import org.jspecify.annotations.Nullable;\n" + "import javax.annotation.Generated;\n" + "\n" + "import java.util.Random;\n" + diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/distort/FDistort.java b/main/boofcv-ip/src/main/java/boofcv/abst/distort/FDistort.java index 368e15a175..5680eb5958 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/distort/FDistort.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/distort/FDistort.java @@ -39,7 +39,7 @@ import georegression.struct.affine.Affine2D_F64; import georegression.struct.point.Point2D_F32; import lombok.Getter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryContourFinderLinearExternal.java b/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryContourFinderLinearExternal.java index e86018cf45..ca805b6927 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryContourFinderLinearExternal.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryContourFinderLinearExternal.java @@ -27,7 +27,7 @@ import boofcv.struct.image.GrayU8; import georegression.struct.point.Point2D_I32; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryContourHelper.java b/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryContourHelper.java index f8687a2735..d0a14224c4 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryContourHelper.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryContourHelper.java @@ -19,7 +19,7 @@ package boofcv.abst.filter.binary; import boofcv.struct.image.GrayU8; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; @@ -32,7 +32,7 @@ */ public class BinaryContourHelper { // if not null then the binary image will be modified by the contour algorithm and will be padded - @Nullable BinaryContourInterface.Padded padded; + BinaryContourInterface.@Nullable Padded padded; // contains a sub image without padding @Nullable GrayU8 subimage; GrayU8 binary = new GrayU8(1,1); diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryContourInterface.java b/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryContourInterface.java index 8cab32a18d..a90cf64992 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryContourInterface.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryContourInterface.java @@ -23,7 +23,7 @@ import boofcv.struct.ConnectRule; import georegression.struct.point.Point2D_I32; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryLabelContourFinderChang2004.java b/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryLabelContourFinderChang2004.java index 8333efd771..dc55b1d137 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryLabelContourFinderChang2004.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/BinaryLabelContourFinderChang2004.java @@ -26,7 +26,7 @@ import boofcv.struct.image.GrayU8; import georegression.struct.point.Point2D_I32; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/InputToBinarySwitch.java b/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/InputToBinarySwitch.java index 0f8ec87884..079865f7ca 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/InputToBinarySwitch.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/filter/binary/InputToBinarySwitch.java @@ -23,7 +23,7 @@ import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * {@link InputToBinary} which will convert the input image into the specified type prior to processing. diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/filter/blur/BlurStorageFilter.java b/main/boofcv-ip/src/main/java/boofcv/abst/filter/blur/BlurStorageFilter.java index 297d7cc466..ef8ee221dd 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/filter/blur/BlurStorageFilter.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/filter/blur/BlurStorageFilter.java @@ -25,7 +25,7 @@ import boofcv.struct.image.ImageType; import lombok.Getter; import lombok.Setter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; /** diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/filter/convolve/GenericConvolve.java b/main/boofcv-ip/src/main/java/boofcv/abst/filter/convolve/GenericConvolve.java index d7dda06936..dfbf7a425e 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/filter/convolve/GenericConvolve.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/filter/convolve/GenericConvolve.java @@ -24,7 +24,7 @@ import boofcv.struct.convolve.KernelBase; import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransform.java b/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransform.java index ddd610b85d..309759e67e 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransform.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransform.java @@ -25,7 +25,7 @@ import boofcv.struct.image.ImageType; import georegression.struct.point.Point2D_I32; import org.ddogleg.struct.FastAccess; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Filter implementation of {@link boofcv.alg.transform.census.CensusTransform}. diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformD33U8.java b/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformD33U8.java index 0a9ae4643e..50e7ff0c09 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformD33U8.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformD33U8.java @@ -23,7 +23,7 @@ import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Census {@link GCensusTransform#dense3x3} transform with output in {@link GrayU8} image. diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformD55S32.java b/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformD55S32.java index a7c350a849..1994f89da4 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformD55S32.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformD55S32.java @@ -23,7 +23,7 @@ import boofcv.struct.image.GrayS32; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Census {@link GCensusTransform#dense5x5} transform with output in {@link GrayS32} image. diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformSampleIU16.java b/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformSampleIU16.java index 6508841041..58574476f4 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformSampleIU16.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformSampleIU16.java @@ -26,7 +26,7 @@ import georegression.struct.point.Point2D_I32; import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.FastAccess; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Census transform which saves output in a {@link InterleavedU16}. diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformSampleS64.java b/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformSampleS64.java index e6334d8045..12a9b5d4e2 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformSampleS64.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/transform/census/FilterCensusTransformSampleS64.java @@ -26,7 +26,7 @@ import georegression.struct.point.Point2D_I32; import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.FastAccess; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Census transform which saves output in a {@link GrayS64}. diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/transform/wavelet/WaveletTransform.java b/main/boofcv-ip/src/main/java/boofcv/abst/transform/wavelet/WaveletTransform.java index ed1b82fb1b..17d4b2cdec 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/transform/wavelet/WaveletTransform.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/transform/wavelet/WaveletTransform.java @@ -22,7 +22,7 @@ import boofcv.struct.image.ImageGray; import boofcv.struct.wavelet.WaveletDescription; import boofcv.struct.wavelet.WlCoef; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/transform/wavelet/impl/WaveletTransformFloat32.java b/main/boofcv-ip/src/main/java/boofcv/abst/transform/wavelet/impl/WaveletTransformFloat32.java index f8f89ed608..2194361d2e 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/transform/wavelet/impl/WaveletTransformFloat32.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/transform/wavelet/impl/WaveletTransformFloat32.java @@ -26,7 +26,7 @@ import boofcv.struct.image.ImageDimension; import boofcv.struct.wavelet.WaveletDescription; import boofcv.struct.wavelet.WlCoef_F32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of {@link boofcv.abst.transform.wavelet.WaveletTransform} for {@link GrayF32}. diff --git a/main/boofcv-ip/src/main/java/boofcv/abst/transform/wavelet/impl/WaveletTransformInt.java b/main/boofcv-ip/src/main/java/boofcv/abst/transform/wavelet/impl/WaveletTransformInt.java index 33208c17ce..af15a82998 100644 --- a/main/boofcv-ip/src/main/java/boofcv/abst/transform/wavelet/impl/WaveletTransformInt.java +++ b/main/boofcv-ip/src/main/java/boofcv/abst/transform/wavelet/impl/WaveletTransformInt.java @@ -28,7 +28,7 @@ import boofcv.struct.image.ImageDimension; import boofcv.struct.wavelet.WaveletDescription; import boofcv.struct.wavelet.WlCoef_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/denoise/wavelet/UtilDenoiseWavelet.java b/main/boofcv-ip/src/main/java/boofcv/alg/denoise/wavelet/UtilDenoiseWavelet.java index 95aaad8ee7..e2ef26d3be 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/denoise/wavelet/UtilDenoiseWavelet.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/denoise/wavelet/UtilDenoiseWavelet.java @@ -21,7 +21,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; import org.ddogleg.sorting.QuickSelect; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Various functions useful for denoising wavelet transforms. @@ -49,7 +49,7 @@ public class UtilDenoiseWavelet { * @param storage Used to temporarily store the absolute value of each element in the subband. * @return estimated noise variance. */ - public static float estimateNoiseStdDev( GrayF32 subband, @Nullable float[] storage ) { + public static float estimateNoiseStdDev( GrayF32 subband, float @Nullable [] storage ) { storage = subbandAbsVal(subband, storage); int N = subband.width*subband.height; @@ -60,7 +60,7 @@ public static float estimateNoiseStdDev( GrayF32 subband, @Nullable float[] stor * Computes the absolute value of each element in the subband image are places it into * 'coef' */ - public static float[] subbandAbsVal( GrayF32 subband, @Nullable float[] coef ) { + public static float[] subbandAbsVal( GrayF32 subband, float @Nullable [] coef ) { if (coef == null) { coef = new float[subband.width*subband.height]; } diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/distort/impl/DistortSupport.java b/main/boofcv-ip/src/main/java/boofcv/alg/distort/impl/DistortSupport.java index 31a968b70f..de30a6377e 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/distort/impl/DistortSupport.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/distort/impl/DistortSupport.java @@ -31,7 +31,7 @@ import georegression.struct.se.Se2_F32; import georegression.transform.ConvertTransform_F32; import georegression.transform.InvertibleTransformSequence; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides low level functions that {@link boofcv.abst.distort.FDistort} can call. diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/enhance/EnhanceImageOps.java b/main/boofcv-ip/src/main/java/boofcv/alg/enhance/EnhanceImageOps.java index 45343ee535..8c94a23853 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/enhance/EnhanceImageOps.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/enhance/EnhanceImageOps.java @@ -30,7 +30,7 @@ import boofcv.struct.convolve.Kernel2D_S32; import boofcv.struct.image.*; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; /** diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/enhance/GEnhanceImageOps.java b/main/boofcv-ip/src/main/java/boofcv/alg/enhance/GEnhanceImageOps.java index 00634dba24..1ad9634fbf 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/enhance/GEnhanceImageOps.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/enhance/GEnhanceImageOps.java @@ -21,7 +21,7 @@ import boofcv.alg.InputSanityCheck; import boofcv.struct.image.*; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; /** diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/BinaryImageOps.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/BinaryImageOps.java index f4c5bfaa1f..ad0aef5eed 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/BinaryImageOps.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/BinaryImageOps.java @@ -31,7 +31,7 @@ import boofcv.struct.image.GrayU8; import georegression.struct.point.Point2D_I32; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/GThresholdImageOps.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/GThresholdImageOps.java index 3c534fe3fb..9e3de14ccd 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/GThresholdImageOps.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/GThresholdImageOps.java @@ -29,7 +29,7 @@ import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.DogArray_I32; import org.ejml.UtilEjml; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; /** diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/ThresholdImageOps.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/ThresholdImageOps.java index 7d55358e06..7ebe0b6c77 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/ThresholdImageOps.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/ThresholdImageOps.java @@ -26,7 +26,7 @@ import boofcv.struct.image.*; import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; /** diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/impl/ImplThresholdImageOps.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/impl/ImplThresholdImageOps.java index ce0290f9be..a3f75edabf 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/impl/ImplThresholdImageOps.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/binary/impl/ImplThresholdImageOps.java @@ -23,7 +23,7 @@ import boofcv.struct.image.*; import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import javax.annotation.Generated; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/BOverrideBlurImageOps.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/BOverrideBlurImageOps.java index 471e7e2ba6..bebeea73af 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/BOverrideBlurImageOps.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/BOverrideBlurImageOps.java @@ -22,7 +22,7 @@ import boofcv.override.BOverrideManager; import boofcv.struct.border.ImageBorder; import boofcv.struct.image.ImageBase; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Override for blur image ops functions diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/BlurImageOps.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/BlurImageOps.java index 6b77578071..4a16d99dfe 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/BlurImageOps.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/BlurImageOps.java @@ -38,7 +38,7 @@ import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.DogArray_F64; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import javax.annotation.Generated; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/GBlurImageOps.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/GBlurImageOps.java index 6b6a1ba0ad..77037c2f38 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/GBlurImageOps.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/GBlurImageOps.java @@ -26,7 +26,7 @@ import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.DogArray_F64; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; /** diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/impl/ImplMedianSortEdgeNaive.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/impl/ImplMedianSortEdgeNaive.java index 3979820ddd..5c6c2243df 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/impl/ImplMedianSortEdgeNaive.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/impl/ImplMedianSortEdgeNaive.java @@ -24,7 +24,7 @@ import org.ddogleg.sorting.QuickSelect; import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.annotation.Generated; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/impl/ImplMedianSortNaive.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/impl/ImplMedianSortNaive.java index 19acea4e8c..a91837e5cf 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/impl/ImplMedianSortNaive.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/blur/impl/ImplMedianSortNaive.java @@ -26,7 +26,7 @@ import org.ddogleg.sorting.QuickSelect; import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; //CONCURRENT_INLINE import boofcv.concurrency.BoofConcurrency; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/BOverrideConvolveImage.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/BOverrideConvolveImage.java index eeca0570a4..3910499833 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/BOverrideConvolveImage.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/BOverrideConvolveImage.java @@ -24,7 +24,7 @@ import boofcv.struct.convolve.Kernel1D; import boofcv.struct.convolve.Kernel2D; import boofcv.struct.image.ImageBase; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Override for {@link ConvolveImage}. diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/BOverrideConvolveImageMean.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/BOverrideConvolveImageMean.java index 0d5f22a598..977d050b4e 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/BOverrideConvolveImageMean.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/BOverrideConvolveImageMean.java @@ -21,7 +21,7 @@ import boofcv.override.BOverrideClass; import boofcv.override.BOverrideManager; import boofcv.struct.image.ImageBase; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Override for {@link ConvolveImageMean} diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/BOverrideConvolveImageNormalized.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/BOverrideConvolveImageNormalized.java index bb4dae13d1..4e43956b9f 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/BOverrideConvolveImageNormalized.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/BOverrideConvolveImageNormalized.java @@ -23,7 +23,7 @@ import boofcv.struct.convolve.Kernel1D; import boofcv.struct.convolve.Kernel2D; import boofcv.struct.image.ImageBase; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Override for normalized convolutions diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/ConvolveImageBox.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/ConvolveImageBox.java index 8094e25d9a..5b10ae78f4 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/ConvolveImageBox.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/ConvolveImageBox.java @@ -30,7 +30,7 @@ import boofcv.struct.image.*; import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; /** diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/ConvolveImageMean.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/ConvolveImageMean.java index 79f1b524a3..2e316de185 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/ConvolveImageMean.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/ConvolveImageMean.java @@ -34,7 +34,7 @@ import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.DogArray_F64; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import javax.annotation.Generated; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/ConvolveImageNoBorder.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/ConvolveImageNoBorder.java index 8543e90b6f..86dc50a6a3 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/ConvolveImageNoBorder.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/ConvolveImageNoBorder.java @@ -24,7 +24,7 @@ import boofcv.struct.convolve.*; import boofcv.struct.image.*; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import javax.annotation.Generated; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageStandard_SB.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageStandard_SB.java index f4f49a14ee..302e27c721 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageStandard_SB.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageStandard_SB.java @@ -22,7 +22,7 @@ import boofcv.struct.convolve.*; import boofcv.struct.image.*; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import javax.annotation.Generated; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_S16_I16_Div.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_S16_I16_Div.java index c2950d9a8f..b11bba006d 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_S16_I16_Div.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_S16_I16_Div.java @@ -24,7 +24,7 @@ import boofcv.struct.image.GrayI16; import boofcv.struct.image.GrayS16; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import javax.annotation.Generated; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_S32_S32_Div.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_S32_S32_Div.java index 96ab370953..2162857ccf 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_S32_S32_Div.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_S32_S32_Div.java @@ -23,7 +23,7 @@ import boofcv.struct.convolve.Kernel2D_S32; import boofcv.struct.image.GrayS32; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import javax.annotation.Generated; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_U16_I16_Div.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_U16_I16_Div.java index e60fec9b33..d795f410f9 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_U16_I16_Div.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_U16_I16_Div.java @@ -24,7 +24,7 @@ import boofcv.struct.image.GrayI16; import boofcv.struct.image.GrayU16; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import javax.annotation.Generated; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_U8_I8_Div.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_U8_I8_Div.java index 25992382e5..55d2e906ca 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_U8_I8_Div.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ConvolveImageUnrolled_SB_U8_I8_Div.java @@ -24,7 +24,7 @@ import boofcv.struct.image.GrayI8; import boofcv.struct.image.GrayU8; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import javax.annotation.Generated; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ImplConvolveBox.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ImplConvolveBox.java index d10d42892e..21aeb74ff5 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ImplConvolveBox.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ImplConvolveBox.java @@ -23,7 +23,7 @@ import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.DogArray_F64; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import javax.annotation.Generated; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ImplConvolveMean.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ImplConvolveMean.java index b015ee5008..b21d7cd38a 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ImplConvolveMean.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/convolve/noborder/ImplConvolveMean.java @@ -23,7 +23,7 @@ import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.DogArray_F64; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import javax.annotation.Generated; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/DerivativeLaplacian.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/DerivativeLaplacian.java index 3cd6f915c0..31e6e58d31 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/DerivativeLaplacian.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/DerivativeLaplacian.java @@ -29,7 +29,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayS16; import boofcv.struct.image.GrayU8; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientPrewitt.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientPrewitt.java index eaf581c676..2fcb1647af 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientPrewitt.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientPrewitt.java @@ -33,7 +33,7 @@ import boofcv.struct.image.GrayS16; import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Operations for computing Prewitt image gradient. diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientScharr.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientScharr.java index e78745cf51..d7aabc5ae6 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientScharr.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientScharr.java @@ -33,7 +33,7 @@ import boofcv.struct.image.GrayS16; import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Implementation of the standard 3x3 Scharr operator. (1/32)*[-1;0;1]**[3 10 3] = (1/3)*[-3 10 -3;0 0 0;3 10 3]. diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientSobel.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientSobel.java index b2b79fa339..35d70529bc 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientSobel.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientSobel.java @@ -35,7 +35,7 @@ import boofcv.struct.image.GrayS16; import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientThree.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientThree.java index 94623b17d9..85a23d8d7d 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientThree.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientThree.java @@ -29,7 +29,7 @@ import boofcv.struct.convolve.Kernel1D_F32; import boofcv.struct.convolve.Kernel1D_S32; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientTwo0.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientTwo0.java index b01a8357a1..c7dbda5d58 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientTwo0.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientTwo0.java @@ -32,7 +32,7 @@ import boofcv.struct.image.GrayS16; import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientTwo1.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientTwo1.java index 57e9f18d19..7faf71dd33 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientTwo1.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/GradientTwo1.java @@ -32,7 +32,7 @@ import boofcv.struct.image.GrayS16; import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianFromGradient.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianFromGradient.java index a600d9b48d..dd6576c6ed 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianFromGradient.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianFromGradient.java @@ -28,7 +28,7 @@ import boofcv.struct.border.ImageBorder_S32; import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayS16; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianSobel.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianSobel.java index 53659950bc..1e8a79c9f0 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianSobel.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianSobel.java @@ -30,7 +30,7 @@ import boofcv.struct.image.GrayS16; import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianThree.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianThree.java index 286003b825..4ead8df1d2 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianThree.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianThree.java @@ -32,7 +32,7 @@ import boofcv.struct.image.GrayS16; import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianThreeDeterminant.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianThreeDeterminant.java index bbabbe2d4e..6f693a36bc 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianThreeDeterminant.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/derivative/HessianThreeDeterminant.java @@ -27,7 +27,7 @@ import boofcv.struct.image.GrayF32; import boofcv.struct.image.GrayS16; import boofcv.struct.image.GrayU8; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/filter/misc/ImageLambdaFilters.java b/main/boofcv-ip/src/main/java/boofcv/alg/filter/misc/ImageLambdaFilters.java index e62e364fe4..285f572b80 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/filter/misc/ImageLambdaFilters.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/filter/misc/ImageLambdaFilters.java @@ -19,7 +19,7 @@ package boofcv.alg.filter.misc; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.annotation.Generated; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/misc/GImageBandMath.java b/main/boofcv-ip/src/main/java/boofcv/alg/misc/GImageBandMath.java index aff2839a1d..f547470bdc 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/misc/GImageBandMath.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/misc/GImageBandMath.java @@ -19,7 +19,7 @@ package boofcv.alg.misc; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Collection of functions that project Bands of Planar images onto diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/misc/GImageMiscOps.java b/main/boofcv-ip/src/main/java/boofcv/alg/misc/GImageMiscOps.java index 6e69f726a4..9b9e9bb3c4 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/misc/GImageMiscOps.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/misc/GImageMiscOps.java @@ -21,7 +21,7 @@ import boofcv.misc.BoofMiscOps; import boofcv.struct.border.*; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Random; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/misc/ImageBandMath.java b/main/boofcv-ip/src/main/java/boofcv/alg/misc/ImageBandMath.java index 7abbf252cf..03b359d6d9 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/misc/ImageBandMath.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/misc/ImageBandMath.java @@ -22,7 +22,7 @@ import boofcv.alg.misc.impl.ImplImageBandMath_MT; import boofcv.concurrency.BoofConcurrency; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.annotation.Generated; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/misc/ImageMiscOps.java b/main/boofcv-ip/src/main/java/boofcv/alg/misc/ImageMiscOps.java index 7d57fbe2cf..4c751488fa 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/misc/ImageMiscOps.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/misc/ImageMiscOps.java @@ -28,7 +28,7 @@ import boofcv.struct.border.ImageBorder_S32; import boofcv.struct.border.ImageBorder_S64; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import javax.annotation.Generated; import java.util.Random; diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/misc/ImageNormalization.java b/main/boofcv-ip/src/main/java/boofcv/alg/misc/ImageNormalization.java index 906b361d38..07b0392d2a 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/misc/ImageNormalization.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/misc/ImageNormalization.java @@ -19,7 +19,7 @@ package boofcv.alg.misc; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Functions related to adjusting input pixels to ensure they have a known and fixed range. Can handle the diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/transform/census/CensusTransform.java b/main/boofcv-ip/src/main/java/boofcv/alg/transform/census/CensusTransform.java index c86cd2f0be..9ba2aa0f1d 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/transform/census/CensusTransform.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/transform/census/CensusTransform.java @@ -31,7 +31,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.FastAccess; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

The Census Transform [1] computes a bit mask for each pixel in the image. If a neighboring pixel is greater than the diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/transform/census/GCensusTransform.java b/main/boofcv-ip/src/main/java/boofcv/alg/transform/census/GCensusTransform.java index 76a68dd223..a04fb58758 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/transform/census/GCensusTransform.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/transform/census/GCensusTransform.java @@ -25,7 +25,7 @@ import georegression.struct.point.Point2D_I32; import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.FastAccess; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

The Census Transform [1] computes a bit mask for each pixel in the image. If a neighboring pixel is greater than the diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/transform/ii/DerivativeIntegralImage.java b/main/boofcv-ip/src/main/java/boofcv/alg/transform/ii/DerivativeIntegralImage.java index e935feaf19..bc191e18cc 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/transform/ii/DerivativeIntegralImage.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/transform/ii/DerivativeIntegralImage.java @@ -20,7 +20,7 @@ import boofcv.struct.image.GrayF32; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Functions related to image derivatives in integral images. diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/transform/ii/GIntegralImageOps.java b/main/boofcv-ip/src/main/java/boofcv/alg/transform/ii/GIntegralImageOps.java index 5341ba9be7..e3b7bb5798 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/transform/ii/GIntegralImageOps.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/transform/ii/GIntegralImageOps.java @@ -19,7 +19,7 @@ package boofcv.alg.transform.ii; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Provides a mechanism to call {@link IntegralImageOps} with unknown types at compile time. diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/transform/ii/IntegralImageOps.java b/main/boofcv-ip/src/main/java/boofcv/alg/transform/ii/IntegralImageOps.java index 98ce6e6421..aa8f72f26c 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/transform/ii/IntegralImageOps.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/transform/ii/IntegralImageOps.java @@ -25,7 +25,7 @@ import boofcv.concurrency.BoofConcurrency; import boofcv.struct.ImageRectangle; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/transform/pyramid/PyramidDiscreteAverage.java b/main/boofcv-ip/src/main/java/boofcv/alg/transform/pyramid/PyramidDiscreteAverage.java index 5e25e92693..1c629d7bff 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/transform/pyramid/PyramidDiscreteAverage.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/transform/pyramid/PyramidDiscreteAverage.java @@ -24,7 +24,7 @@ import boofcv.struct.pyramid.ConfigDiscreteLevels; import boofcv.struct.pyramid.ImagePyramid; import boofcv.struct.pyramid.PyramidDiscrete; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates an image pyramid by down sampling square regions using {@link AverageDownSampleOps}. diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/transform/pyramid/PyramidDiscreteSampleBlur.java b/main/boofcv-ip/src/main/java/boofcv/alg/transform/pyramid/PyramidDiscreteSampleBlur.java index f6df8a8018..8af69ec0e0 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/transform/pyramid/PyramidDiscreteSampleBlur.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/transform/pyramid/PyramidDiscreteSampleBlur.java @@ -27,7 +27,7 @@ import boofcv.struct.pyramid.ConfigDiscreteLevels; import boofcv.struct.pyramid.ImagePyramid; import boofcv.struct.pyramid.PyramidDiscrete; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-ip/src/main/java/boofcv/alg/transform/wavelet/UtilWavelet.java b/main/boofcv-ip/src/main/java/boofcv/alg/transform/wavelet/UtilWavelet.java index e47f962f3e..8c8c4198a9 100644 --- a/main/boofcv-ip/src/main/java/boofcv/alg/transform/wavelet/UtilWavelet.java +++ b/main/boofcv-ip/src/main/java/boofcv/alg/transform/wavelet/UtilWavelet.java @@ -25,7 +25,7 @@ import boofcv.struct.image.*; import boofcv.struct.wavelet.WlBorderCoef; import boofcv.struct.wavelet.WlCoef; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Various functions which are useful when working with or computing wavelet transforms. diff --git a/main/boofcv-ip/src/main/java/boofcv/core/encoding/ConvertYuv420_888.java b/main/boofcv-ip/src/main/java/boofcv/core/encoding/ConvertYuv420_888.java index 2a42db9e0f..5a97d6e44d 100644 --- a/main/boofcv-ip/src/main/java/boofcv/core/encoding/ConvertYuv420_888.java +++ b/main/boofcv-ip/src/main/java/boofcv/core/encoding/ConvertYuv420_888.java @@ -24,7 +24,7 @@ import boofcv.misc.BoofMiscOps; import boofcv.struct.image.*; import org.ddogleg.struct.DogArray_I8; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import java.nio.ByteBuffer; diff --git a/main/boofcv-ip/src/main/java/boofcv/factory/denoise/FactoryDenoiseWaveletAlg.java b/main/boofcv-ip/src/main/java/boofcv/factory/denoise/FactoryDenoiseWaveletAlg.java index 8776fc3cfd..396dc8263f 100644 --- a/main/boofcv-ip/src/main/java/boofcv/factory/denoise/FactoryDenoiseWaveletAlg.java +++ b/main/boofcv-ip/src/main/java/boofcv/factory/denoise/FactoryDenoiseWaveletAlg.java @@ -26,7 +26,7 @@ import boofcv.alg.denoise.wavelet.ShrinkThresholdSoft_F32; import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating wavelet based image denoising classes. diff --git a/main/boofcv-ip/src/main/java/boofcv/factory/filter/binary/BOverrideFactoryBinaryContourFinder.java b/main/boofcv-ip/src/main/java/boofcv/factory/filter/binary/BOverrideFactoryBinaryContourFinder.java index 63a4520659..2066854ce0 100644 --- a/main/boofcv-ip/src/main/java/boofcv/factory/filter/binary/BOverrideFactoryBinaryContourFinder.java +++ b/main/boofcv-ip/src/main/java/boofcv/factory/filter/binary/BOverrideFactoryBinaryContourFinder.java @@ -21,7 +21,7 @@ import boofcv.abst.filter.binary.BinaryLabelContourFinder; import boofcv.override.BOverrideClass; import boofcv.override.BOverrideManager; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Override for {@link FactoryBinaryContourFinder}.+ diff --git a/main/boofcv-ip/src/main/java/boofcv/factory/filter/binary/BOverrideFactoryThresholdBinary.java b/main/boofcv-ip/src/main/java/boofcv/factory/filter/binary/BOverrideFactoryThresholdBinary.java index e2ba45a145..101860ba22 100644 --- a/main/boofcv-ip/src/main/java/boofcv/factory/filter/binary/BOverrideFactoryThresholdBinary.java +++ b/main/boofcv-ip/src/main/java/boofcv/factory/filter/binary/BOverrideFactoryThresholdBinary.java @@ -23,7 +23,7 @@ import boofcv.override.BOverrideManager; import boofcv.struct.ConfigLength; import boofcv.struct.image.ImageGray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Override functions which allows external code to be called instead of BoofCV for thresholding operations. diff --git a/main/boofcv-ip/src/main/java/boofcv/factory/filter/blur/FactoryBlurFilter.java b/main/boofcv-ip/src/main/java/boofcv/factory/filter/blur/FactoryBlurFilter.java index 8d13c2272b..66429729f6 100644 --- a/main/boofcv-ip/src/main/java/boofcv/factory/filter/blur/FactoryBlurFilter.java +++ b/main/boofcv-ip/src/main/java/boofcv/factory/filter/blur/FactoryBlurFilter.java @@ -23,7 +23,7 @@ import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating different blur image filters. diff --git a/main/boofcv-ip/src/main/java/boofcv/factory/filter/derivative/FactoryDerivative.java b/main/boofcv-ip/src/main/java/boofcv/factory/filter/derivative/FactoryDerivative.java index fde0dce640..88b3a52920 100644 --- a/main/boofcv-ip/src/main/java/boofcv/factory/filter/derivative/FactoryDerivative.java +++ b/main/boofcv-ip/src/main/java/boofcv/factory/filter/derivative/FactoryDerivative.java @@ -24,7 +24,7 @@ import boofcv.struct.border.ImageBorder_F32; import boofcv.struct.border.ImageBorder_S32; import boofcv.struct.image.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.Method; diff --git a/main/boofcv-ip/src/main/java/boofcv/factory/filter/derivative/FactoryDerivativeSparse.java b/main/boofcv-ip/src/main/java/boofcv/factory/filter/derivative/FactoryDerivativeSparse.java index a2fb3df5c8..ca3212601f 100644 --- a/main/boofcv-ip/src/main/java/boofcv/factory/filter/derivative/FactoryDerivativeSparse.java +++ b/main/boofcv-ip/src/main/java/boofcv/factory/filter/derivative/FactoryDerivativeSparse.java @@ -37,7 +37,7 @@ import boofcv.struct.image.ImageGray; import boofcv.struct.sparse.GradientValue; import boofcv.struct.sparse.SparseImageGradient; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates filters for performing sparse derivative calculations. diff --git a/main/boofcv-learning/src/main/java/boofcv/alg/bow/LearnSceneFromFiles.java b/main/boofcv-learning/src/main/java/boofcv/alg/bow/LearnSceneFromFiles.java index bd937c332b..58765a6000 100644 --- a/main/boofcv-learning/src/main/java/boofcv/alg/bow/LearnSceneFromFiles.java +++ b/main/boofcv-learning/src/main/java/boofcv/alg/bow/LearnSceneFromFiles.java @@ -20,7 +20,7 @@ import boofcv.struct.learning.ClassificationHistogram; import boofcv.struct.learning.Confusion; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.File; import java.util.*; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/AztecCodePreciseDetector.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/AztecCodePreciseDetector.java index 6f2c5a2af4..747f168a34 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/AztecCodePreciseDetector.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/AztecCodePreciseDetector.java @@ -30,7 +30,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/CalibrationFiducialDetector.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/CalibrationFiducialDetector.java index cbf3f5aab3..0d35ef9b6b 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/CalibrationFiducialDetector.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/CalibrationFiducialDetector.java @@ -35,7 +35,7 @@ import georegression.struct.point.Point2D_F64; import georegression.struct.shapes.Polygon2D_F64; import org.ejml.UtilEjml; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/ECoCheck_to_FiducialDetector.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/ECoCheck_to_FiducialDetector.java index de131e5b8a..e4334acf1f 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/ECoCheck_to_FiducialDetector.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/ECoCheck_to_FiducialDetector.java @@ -41,7 +41,7 @@ import org.ejml.data.DMatrixRMaj; import org.ejml.dense.fixed.CommonOps_DDF3; import org.ejml.ops.DConvertMatrixStruct; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; import java.util.Objects; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/FiducialDetector.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/FiducialDetector.java index 098a5bcd91..d017f76d8e 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/FiducialDetector.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/FiducialDetector.java @@ -24,7 +24,7 @@ import georegression.struct.point.Point2D_F64; import georegression.struct.se.Se3_F64; import georegression.struct.shapes.Polygon2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Interface for detecting fiducial markers and their location in the image. Optionally, some implementations diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/FiducialDetectorPnP.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/FiducialDetectorPnP.java index 297f654ebd..2a9b3b1060 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/FiducialDetectorPnP.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/FiducialDetectorPnP.java @@ -30,7 +30,7 @@ import georegression.struct.point.Point2D_F64; import georegression.struct.se.Se3_F64; import org.ddogleg.struct.DogArray_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/MicroQrCodeDetectorPnP.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/MicroQrCodeDetectorPnP.java index cf04673a08..5907a130ad 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/MicroQrCodeDetectorPnP.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/MicroQrCodeDetectorPnP.java @@ -32,7 +32,7 @@ import georegression.transform.homography.HomographyPointOps_F64; import lombok.Getter; import org.ejml.UtilEjml; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/MicroQrCodePreciseDetector.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/MicroQrCodePreciseDetector.java index 2e7826e28d..b6340e22f8 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/MicroQrCodePreciseDetector.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/MicroQrCodePreciseDetector.java @@ -33,7 +33,7 @@ import lombok.Getter; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/QrCodeDetectorPnP.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/QrCodeDetectorPnP.java index e6ebb12c19..28289a748c 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/QrCodeDetectorPnP.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/QrCodeDetectorPnP.java @@ -31,7 +31,7 @@ import georegression.struct.se.Se3_F64; import georegression.struct.shapes.Polygon2D_F64; import org.ejml.UtilEjml; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/QrCodePreciseDetector.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/QrCodePreciseDetector.java index 39980aed56..9b44d09fa4 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/QrCodePreciseDetector.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/QrCodePreciseDetector.java @@ -28,7 +28,7 @@ import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageGray; import lombok.Getter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/SquareBase_to_FiducialDetector.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/SquareBase_to_FiducialDetector.java index 38e406c166..6292ca38ee 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/SquareBase_to_FiducialDetector.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/SquareBase_to_FiducialDetector.java @@ -33,7 +33,7 @@ import georegression.struct.se.Se3_F64; import georegression.struct.shapes.Polygon2D_F64; import georegression.struct.shapes.Quadrilateral_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/Uchiya_to_FiducialDetector.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/Uchiya_to_FiducialDetector.java index 104c562102..5602d23137 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/Uchiya_to_FiducialDetector.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/Uchiya_to_FiducialDetector.java @@ -32,7 +32,7 @@ import lombok.Getter; import lombok.Setter; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorChessboardBinary.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorChessboardBinary.java index 2c56dcafa7..a98572f8c2 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorChessboardBinary.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorChessboardBinary.java @@ -33,7 +33,7 @@ import boofcv.struct.image.GrayF32; import georegression.struct.point.Point2D_F32; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorChessboardX.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorChessboardX.java index 6062080cb2..b39d5ff521 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorChessboardX.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorChessboardX.java @@ -31,7 +31,7 @@ import georegression.struct.point.Point2D_F64; import lombok.Getter; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorCircleHexagonalGrid.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorCircleHexagonalGrid.java index 6018bd52dc..2226271430 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorCircleHexagonalGrid.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorCircleHexagonalGrid.java @@ -38,7 +38,7 @@ import georegression.struct.point.Point2D_F32; import georegression.struct.point.Point2D_F64; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorCircleRegularGrid.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorCircleRegularGrid.java index e4f0c0009c..adcdb42494 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorCircleRegularGrid.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorCircleRegularGrid.java @@ -37,7 +37,7 @@ import georegression.struct.point.Point2D_F32; import georegression.struct.point.Point2D_F64; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorMultiECoCheck.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorMultiECoCheck.java index 002d70b19e..76e03c8653 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorMultiECoCheck.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorMultiECoCheck.java @@ -32,7 +32,7 @@ import gnu.trove.map.hash.TIntObjectHashMap; import lombok.Getter; import org.ddogleg.struct.FastAccess; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorSquareGrid.java b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorSquareGrid.java index 681929f6c7..f6f79252e4 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorSquareGrid.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/fiducial/calib/CalibrationDetectorSquareGrid.java @@ -33,7 +33,7 @@ import boofcv.struct.image.GrayF32; import georegression.struct.point.Point2D_F32; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/scene/FeatureSceneRecognition.java b/main/boofcv-recognition/src/main/java/boofcv/abst/scene/FeatureSceneRecognition.java index 7d6bdb2ad1..cc409a54f6 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/scene/FeatureSceneRecognition.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/scene/FeatureSceneRecognition.java @@ -24,7 +24,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.VerbosePrint; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Iterator; import java.util.List; @@ -77,7 +77,7 @@ public interface FeatureSceneRecognition> extends Verbo * that means matches is empty. This is strictly a convenience. */ boolean query( Features query, - @Nullable BoofLambdas.Filter filter, + BoofLambdas.@Nullable Filter filter, int limit, DogArray matches ); /** diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/scene/SceneRecognition.java b/main/boofcv-recognition/src/main/java/boofcv/abst/scene/SceneRecognition.java index 261b90ad43..73f8ff9e77 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/scene/SceneRecognition.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/scene/SceneRecognition.java @@ -23,7 +23,7 @@ import boofcv.struct.image.ImageType; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.VerbosePrint; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Iterator; import java.util.List; @@ -73,7 +73,7 @@ public interface SceneRecognition> extends VerbosePrint { * @return true if at least one valid match was found or false if no valid matches could be found. If false * that means matches is empty. This is strictly a convenience. */ - boolean query( T queryImage, @Nullable BoofLambdas.Filter filter, int limit, DogArray matches ); + boolean query( T queryImage, BoofLambdas.@Nullable Filter filter, int limit, DogArray matches ); /** * Returns a list of image IDs in the database diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/scene/WrapFeatureToSceneRecognition.java b/main/boofcv-recognition/src/main/java/boofcv/abst/scene/WrapFeatureToSceneRecognition.java index 40c1047462..8aff87ddbd 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/scene/WrapFeatureToSceneRecognition.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/scene/WrapFeatureToSceneRecognition.java @@ -27,7 +27,7 @@ import lombok.Getter; import lombok.Setter; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Iterator; @@ -89,7 +89,7 @@ public WrapFeatureToSceneRecognition( DetectDescribePoint detector, } @Override - public boolean query( Image queryImage, @Nullable BoofLambdas.Filter filter, int limit, DogArray matches ) { + public boolean query( Image queryImage, BoofLambdas.@Nullable Filter filter, int limit, DogArray matches ) { detector.detect(queryImage); return recognizer.query(wrappedDetector, filter, limit, matches); } diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/scene/ann/FeatureSceneRecognitionNearestNeighbor.java b/main/boofcv-recognition/src/main/java/boofcv/abst/scene/ann/FeatureSceneRecognitionNearestNeighbor.java index 97d4ede285..7d0d0bf333 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/scene/ann/FeatureSceneRecognitionNearestNeighbor.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/scene/ann/FeatureSceneRecognitionNearestNeighbor.java @@ -37,7 +37,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.Factory; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-recognition/src/main/java/boofcv/abst/scene/nister2006/FeatureSceneRecognitionNister2006.java b/main/boofcv-recognition/src/main/java/boofcv/abst/scene/nister2006/FeatureSceneRecognitionNister2006.java index 3ca633a523..2866dfee6d 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/abst/scene/nister2006/FeatureSceneRecognitionNister2006.java +++ b/main/boofcv-recognition/src/main/java/boofcv/abst/scene/nister2006/FeatureSceneRecognitionNister2006.java @@ -37,7 +37,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.Factory; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; @@ -219,7 +219,7 @@ public void setDatabase( RecognitionVocabularyTreeNister2006 db ) { return storage; } - @Override public boolean query( Features query, @Nullable BoofLambdas.Filter filter, + @Override public boolean query( Features query, BoofLambdas.@Nullable Filter filter, int limit, DogArray matches ) { // Default is no matches matches.resize(0); diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecDecoder.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecDecoder.java index 088a9b1fe3..ab033169f4 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecDecoder.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecDecoder.java @@ -24,7 +24,7 @@ import lombok.Getter; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Objects; @@ -40,7 +40,7 @@ public class AztecDecoder extends AztecMessageErrorCorrection implements Verbose // Specifies the encoding mode for the active character set Mode current = Mode.UPPER; // If not latched (shift mode) then it will switch back to this mode after 1 character - @Nullable AztecCode.Mode shiftMode = null; + AztecCode.@Nullable Mode shiftMode = null; // if lacked it won't revert to the old mode boolean latched; // Results of decoded diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecDecoderImage.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecDecoderImage.java index 4cdc7229a6..13ac6bfe0a 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecDecoderImage.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecDecoderImage.java @@ -34,7 +34,7 @@ import lombok.Getter; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Set; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecEncoderAutomatic.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecEncoderAutomatic.java index 79d9a0fc78..aca4b72e36 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecEncoderAutomatic.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecEncoderAutomatic.java @@ -22,7 +22,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.nio.charset.StandardCharsets; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecFinderPatternDetector.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecFinderPatternDetector.java index 7d685ce3f2..de9ee9edd3 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecFinderPatternDetector.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecFinderPatternDetector.java @@ -33,7 +33,7 @@ import org.ddogleg.nn.NnData; import org.ddogleg.struct.DogArray; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecGenerator.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecGenerator.java index 7d336a17e6..3032df7fa8 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecGenerator.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/aztec/AztecGenerator.java @@ -27,7 +27,7 @@ import georegression.struct.point.Point2D_I16; import georegression.struct.shapes.Polygon2D_F64; import lombok.Getter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/ConfigCalibrationTarget.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/ConfigCalibrationTarget.java index be5be7f0a3..033d62b87c 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/ConfigCalibrationTarget.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/ConfigCalibrationTarget.java @@ -24,7 +24,7 @@ import boofcv.factory.fiducial.ConfigHammingChessboard; import boofcv.factory.fiducial.ConfigHammingGrid; import boofcv.struct.Configuration; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Describes the calibration target. diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/chess/ChessboardCornerClusterFinder.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/chess/ChessboardCornerClusterFinder.java index 5c86e7147a..dab5caebd6 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/chess/ChessboardCornerClusterFinder.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/chess/ChessboardCornerClusterFinder.java @@ -33,7 +33,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.*; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/chess/ChessboardCornerClusterToGrid.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/chess/ChessboardCornerClusterToGrid.java index 1352bc765c..97d03a7650 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/chess/ChessboardCornerClusterToGrid.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/chess/ChessboardCornerClusterToGrid.java @@ -28,7 +28,7 @@ import org.ddogleg.struct.DogArray_B; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.*; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/chess/ChessboardCornerGraph.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/chess/ChessboardCornerGraph.java index fdbbf74725..8664044735 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/chess/ChessboardCornerGraph.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/chess/ChessboardCornerGraph.java @@ -21,7 +21,7 @@ import boofcv.alg.feature.detect.chess.ChessboardCorner; import boofcv.core.graph.FeatureGraph2D; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/circle/EllipseClustersIntoGrid.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/circle/EllipseClustersIntoGrid.java index 989a9be583..0d6395cd36 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/circle/EllipseClustersIntoGrid.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/circle/EllipseClustersIntoGrid.java @@ -25,7 +25,7 @@ import org.ddogleg.sorting.QuickSortComparator; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/circle/EllipseClustersIntoHexagonalGrid.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/circle/EllipseClustersIntoHexagonalGrid.java index c6257210fc..0529e8d425 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/circle/EllipseClustersIntoHexagonalGrid.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/circle/EllipseClustersIntoHexagonalGrid.java @@ -21,7 +21,7 @@ import boofcv.alg.fiducial.calib.circle.EllipsesIntoClusters.Node; import georegression.metric.UtilAngle; import georegression.struct.curve.EllipseRotated_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/ecocheck/ECoCheckDetector.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/ecocheck/ECoCheckDetector.java index f807a27e5a..34b3282ff4 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/ecocheck/ECoCheckDetector.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/ecocheck/ECoCheckDetector.java @@ -42,7 +42,7 @@ import lombok.Getter; import org.ddogleg.struct.*; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Collections; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/squares/SquareCrossClustersIntoGrids.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/squares/SquareCrossClustersIntoGrids.java index ab2fb52770..03f0497288 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/squares/SquareCrossClustersIntoGrids.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/squares/SquareCrossClustersIntoGrids.java @@ -19,7 +19,7 @@ package boofcv.alg.fiducial.calib.squares; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/squares/SquareNode.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/squares/SquareNode.java index caa76ba6f5..4e4cce0983 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/squares/SquareNode.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/calib/squares/SquareNode.java @@ -22,7 +22,7 @@ import georegression.struct.shapes.Polygon2D_F64; import org.ddogleg.nn.alg.KdTreeDistance; import org.ddogleg.struct.DogArray_B; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Graph representation of square blobs. Each blob can be connected to at most 4 other shapes which are directly diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/dots/UchiyaMarkerTracker.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/dots/UchiyaMarkerTracker.java index 5873bda143..730ae99a3b 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/dots/UchiyaMarkerTracker.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/dots/UchiyaMarkerTracker.java @@ -39,7 +39,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.VerbosePrint; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrCodeDecoderBits.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrCodeDecoderBits.java index 45c8bf2a50..ce25f304bc 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrCodeDecoderBits.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrCodeDecoderBits.java @@ -27,7 +27,7 @@ import org.ddogleg.struct.DogArray_I8; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Objects; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrCodeDecoderImage.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrCodeDecoderImage.java index c5eb5f5367..f5221897ff 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrCodeDecoderImage.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrCodeDecoderImage.java @@ -29,7 +29,7 @@ import org.ddogleg.struct.DogArray_F32; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrCodeEncoder.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrCodeEncoder.java index ea9e3c01ca..fe944a13e8 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrCodeEncoder.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrCodeEncoder.java @@ -29,7 +29,7 @@ import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; import org.ejml.data.BMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.nio.charset.Charset; @@ -98,7 +98,7 @@ public MicroQrCodeEncoder setVersion( int version ) { return this; } - public MicroQrCodeEncoder setError( @Nullable MicroQrCode.ErrorLevel level ) { + public MicroQrCodeEncoder setError( MicroQrCode.@Nullable ErrorLevel level ) { autoErrorCorrection = level == null; if (level != null) qr.error = level; @@ -407,7 +407,7 @@ private void autoSelectVersionAndError() { if (qr.version == 1) { qr.error = MicroQrCode.ErrorLevel.DETECT; } else if (autoErrorCorrection) { - @Nullable MicroQrCode.ErrorLevel selected = null; + MicroQrCode.@Nullable ErrorLevel selected = null; int encodedDataBits = bitsAtVersion(qr.version); // ErrorLevel is ordered from most to least correction diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrPose3DUtils.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrPose3DUtils.java index db9e9650ec..bcf1b6fa97 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrPose3DUtils.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/microqr/MicroQrPose3DUtils.java @@ -24,7 +24,7 @@ import boofcv.struct.geo.PointIndex2D_F64; import georegression.struct.point.Point2D_F64; import georegression.struct.point.Point3D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCode.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCode.java index b9df5d07a0..8b7cf8e881 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCode.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCode.java @@ -23,7 +23,7 @@ import georegression.struct.point.Point2D_I32; import georegression.struct.shapes.Polygon2D_F64; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.*; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeAlignmentPatternLocator.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeAlignmentPatternLocator.java index 4e947d2516..af129be80a 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeAlignmentPatternLocator.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeAlignmentPatternLocator.java @@ -21,7 +21,7 @@ import boofcv.alg.distort.LensDistortionNarrowFOV; import boofcv.struct.image.ImageGray; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Searches the image for alignment patterns. First it computes a transform that removes perspective distortion diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeBinaryGridReader.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeBinaryGridReader.java index 9d573941c9..86af9669f3 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeBinaryGridReader.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeBinaryGridReader.java @@ -31,7 +31,7 @@ import georegression.struct.shapes.Polygon2D_F64; import lombok.Getter; import org.ddogleg.struct.DogArray_F32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Reads binary values from the qr code's grid. Top left corner of the qr code is it's origin. +x = right and +y = down diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeCodecBitsUtils.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeCodecBitsUtils.java index 328bc4a9d7..414916ce48 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeCodecBitsUtils.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeCodecBitsUtils.java @@ -21,7 +21,7 @@ import org.ddogleg.struct.DogArray_I8; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.io.UnsupportedEncodingException; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeDecoderBits.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeDecoderBits.java index 6f33a8bdfe..8f3b9b9402 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeDecoderBits.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeDecoderBits.java @@ -23,7 +23,7 @@ import org.ddogleg.struct.DogArray_I8; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Objects; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeDecoderImage.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeDecoderImage.java index 37dfa56a5f..165efc0e7e 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeDecoderImage.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeDecoderImage.java @@ -28,7 +28,7 @@ import lombok.Getter; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_F32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeEncoder.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeEncoder.java index 809a021a09..48c9b295da 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeEncoder.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodeEncoder.java @@ -21,7 +21,7 @@ import georegression.struct.point.Point2D_I32; import org.ddogleg.struct.DogArray_I8; import org.ejml.ops.CommonOps_BDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; @@ -86,7 +86,7 @@ public QrCodeEncoder setVersion( int version ) { return this; } - public QrCodeEncoder setError( @Nullable QrCode.ErrorLevel level ) { + public QrCodeEncoder setError( QrCode.@Nullable ErrorLevel level ) { autoErrorCorrection = level == null; if (level != null) qr.error = level; @@ -422,7 +422,7 @@ private void autoSelectVersionAndError() { // the version is set but the error correction level isn't. Pick the one with // the most error correction that can which can store all the data if (autoErrorCorrection) { - @Nullable QrCode.ErrorLevel error = null; + QrCode.@Nullable ErrorLevel error = null; QrCode.VersionInfo v = QrCode.VERSION_INFO[qr.version]; int dataBits = bitsAtVersion(qr.version); int totalBytes = bitsToBytes(dataBits); diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodePositionPatternDetector.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodePositionPatternDetector.java index baafb656b5..2bf33c94b5 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodePositionPatternDetector.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodePositionPatternDetector.java @@ -30,7 +30,7 @@ import lombok.Getter; import org.ddogleg.struct.DogArray; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodePositionPatternGraphGenerator.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodePositionPatternGraphGenerator.java index 6e225f3212..b66f1c15a0 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodePositionPatternGraphGenerator.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrCodePositionPatternGraphGenerator.java @@ -30,7 +30,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrPose3DUtils.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrPose3DUtils.java index 7a43ef3b28..10a0c902e9 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrPose3DUtils.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/QrPose3DUtils.java @@ -24,7 +24,7 @@ import boofcv.struct.geo.PointIndex2D_F64; import georegression.struct.point.Point2D_F64; import georegression.struct.point.Point3D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/SquareLocatorPatternDetectorBase.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/SquareLocatorPatternDetectorBase.java index 9519e91927..c341295fc6 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/SquareLocatorPatternDetectorBase.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/qrcode/SquareLocatorPatternDetectorBase.java @@ -37,7 +37,7 @@ import lombok.Setter; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Set; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/square/BaseDetectFiducialSquare.java b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/square/BaseDetectFiducialSquare.java index 694ddec7be..f551ead895 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/square/BaseDetectFiducialSquare.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/fiducial/square/BaseDetectFiducialSquare.java @@ -56,7 +56,7 @@ import org.ejml.UtilEjml; import org.ejml.data.DMatrixRMaj; import org.ejml.ops.DConvertMatrixStruct; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/scene/ann/RecognitionNearestNeighborInvertedFile.java b/main/boofcv-recognition/src/main/java/boofcv/alg/scene/ann/RecognitionNearestNeighborInvertedFile.java index a9c6184955..2ab22f1753 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/scene/ann/RecognitionNearestNeighborInvertedFile.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/scene/ann/RecognitionNearestNeighborInvertedFile.java @@ -29,7 +29,7 @@ import org.ddogleg.nn.NearestNeighbor; import org.ddogleg.nn.NnData; import org.ddogleg.struct.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; @@ -200,7 +200,7 @@ void computeImageDescriptor( float totalUniqueWordsSeenByImage ) { * @param limit Maximum number of matches it will return. * @return The best matching image with score from the database */ - public boolean query( List queryImage, @Nullable BoofLambdas.FilterInt filter, int limit ) { + public boolean query( List queryImage, BoofLambdas.@Nullable FilterInt filter, int limit ) { matches.reset(); // Can't BowMatch to anything if it's empty diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/scene/bow/BowUtils.java b/main/boofcv-recognition/src/main/java/boofcv/alg/scene/bow/BowUtils.java index 9b192e7780..eb20f16634 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/scene/bow/BowUtils.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/scene/bow/BowUtils.java @@ -21,7 +21,7 @@ import boofcv.misc.BoofLambdas; import org.ddogleg.sorting.QuickSelect; import org.ddogleg.struct.FastAccess; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Collections; @@ -36,7 +36,7 @@ public class BowUtils { * Sorting everything was taking 300 to 500 ms before and after it was taking 15 to 45 ms. */ public static void filterAndSortMatches( - FastAccess matches, @Nullable BoofLambdas.FilterInt filter, int limit ) { + FastAccess matches, BoofLambdas.@Nullable FilterInt filter, int limit ) { if (filter !=null) { // Iterate until the limit the best 'limit' matches pass the filter int startIdx = 0; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/scene/nister2006/RecognitionVocabularyTreeNister2006.java b/main/boofcv-recognition/src/main/java/boofcv/alg/scene/nister2006/RecognitionVocabularyTreeNister2006.java index 6e9087ec22..3e486e9551 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/scene/nister2006/RecognitionVocabularyTreeNister2006.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/scene/nister2006/RecognitionVocabularyTreeNister2006.java @@ -29,7 +29,7 @@ import lombok.Getter; import lombok.Setter; import org.ddogleg.struct.*; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.GrowArray; import java.io.PrintStream; @@ -162,7 +162,7 @@ public void addImage( int imageID, List imageFeatures ) { * @param limit Maximum number of matches it will return. * @return The best matching image with score from the database */ - public boolean query( List queryImage, @Nullable BoofLambdas.FilterInt filter, int limit ) { + public boolean query( List queryImage, BoofLambdas.@Nullable FilterInt filter, int limit ) { matches.reset(); // Can't BowMatch to anything if it's empty diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/scene/vocabtree/LearnHierarchicalTree.java b/main/boofcv-recognition/src/main/java/boofcv/alg/scene/vocabtree/LearnHierarchicalTree.java index 375df048f8..bb53f2e2c8 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/scene/vocabtree/LearnHierarchicalTree.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/scene/vocabtree/LearnHierarchicalTree.java @@ -29,7 +29,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/template/TemplateCorrelationFFT.java b/main/boofcv-recognition/src/main/java/boofcv/alg/template/TemplateCorrelationFFT.java index d19ffd3088..b765abf3b9 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/template/TemplateCorrelationFFT.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/template/TemplateCorrelationFFT.java @@ -25,7 +25,7 @@ import boofcv.alg.transform.fft.DiscreteFourierTransformOps; import boofcv.struct.image.GrayF32; import boofcv.struct.image.InterleavedF32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Correlation based template matching which uses FFT diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/template/TemplateIntensityImage.java b/main/boofcv-recognition/src/main/java/boofcv/alg/template/TemplateIntensityImage.java index af10857294..972d15ca9c 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/template/TemplateIntensityImage.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/template/TemplateIntensityImage.java @@ -21,7 +21,7 @@ import boofcv.alg.misc.GImageMiscOps; import boofcv.struct.image.GrayF32; import boofcv.struct.image.ImageBase; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Class which computes the templates' intensity across the entire image diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/template/TemplateSqDiffNormed.java b/main/boofcv-recognition/src/main/java/boofcv/alg/template/TemplateSqDiffNormed.java index 800ab62229..a192e055ab 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/template/TemplateSqDiffNormed.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/template/TemplateSqDiffNormed.java @@ -22,7 +22,7 @@ import boofcv.struct.image.GrayU8; import boofcv.struct.image.ImageBase; import org.ejml.UtilEjml; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.Objects; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/tracker/tld/TldDetection.java b/main/boofcv-recognition/src/main/java/boofcv/alg/tracker/tld/TldDetection.java index 532347fe62..78ac32a006 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/tracker/tld/TldDetection.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/tracker/tld/TldDetection.java @@ -24,7 +24,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_F64; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-recognition/src/main/java/boofcv/alg/tracker/tld/TldTracker.java b/main/boofcv-recognition/src/main/java/boofcv/alg/tracker/tld/TldTracker.java index 60033095d3..eda664dca8 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/alg/tracker/tld/TldTracker.java +++ b/main/boofcv-recognition/src/main/java/boofcv/alg/tracker/tld/TldTracker.java @@ -29,7 +29,6 @@ import boofcv.struct.pyramid.PyramidDiscrete; import georegression.struct.shapes.Rectangle2D_F64; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; import java.util.Objects; import java.util.Random; @@ -338,7 +337,7 @@ protected boolean hypothesisFusion( boolean trackingWorked, boolean detectionWor double confidenceTarget; if (trackingWorked) { - @Nullable TldRegion detectedRegion = detection.getBest(); + TldRegion detectedRegion = detection.getBest(); // get the scores from tracking and detection double scoreTrack = template.computeConfidence(trackerRegion_I32); diff --git a/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/ConfigMicroQrCode.java b/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/ConfigMicroQrCode.java index e7462755e4..0fc804e525 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/ConfigMicroQrCode.java +++ b/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/ConfigMicroQrCode.java @@ -27,7 +27,7 @@ import boofcv.struct.ConfigLength; import boofcv.struct.Configuration; import boofcv.struct.ConnectRule; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Configuration for {@link boofcv.abst.fiducial.MicroQrCodePreciseDetector} diff --git a/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/ConfigQrCode.java b/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/ConfigQrCode.java index afa7820083..e71c1948a4 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/ConfigQrCode.java +++ b/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/ConfigQrCode.java @@ -27,7 +27,7 @@ import boofcv.struct.ConfigLength; import boofcv.struct.Configuration; import boofcv.struct.ConnectRule; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Configuration for {@link boofcv.abst.fiducial.QrCodePreciseDetector} diff --git a/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/FactoryFiducial.java b/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/FactoryFiducial.java index d5fc1a0896..e006f5af37 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/FactoryFiducial.java +++ b/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/FactoryFiducial.java @@ -46,7 +46,7 @@ import boofcv.struct.image.ImageType; import georegression.struct.homography.Homography2D_F64; import org.ddogleg.fitting.modelset.ransac.Ransac; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating fiducial detectors which implement {@link FiducialDetector}. diff --git a/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/FactoryFiducialCalibration.java b/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/FactoryFiducialCalibration.java index bcfdfcd7e5..ab86ade19a 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/FactoryFiducialCalibration.java +++ b/main/boofcv-recognition/src/main/java/boofcv/factory/fiducial/FactoryFiducialCalibration.java @@ -25,7 +25,7 @@ import boofcv.alg.fiducial.calib.chess.DetectChessboardBinaryPattern; import boofcv.alg.fiducial.calib.ecocheck.ECoCheckDetector; import boofcv.struct.image.GrayF32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Creates detectors of calibration targets. These detectors return found key points in the image and diff --git a/main/boofcv-recognition/src/main/java/boofcv/factory/scene/FactorySceneRecognition.java b/main/boofcv-recognition/src/main/java/boofcv/factory/scene/FactorySceneRecognition.java index 71befb35a2..8161f3cb86 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/factory/scene/FactorySceneRecognition.java +++ b/main/boofcv-recognition/src/main/java/boofcv/factory/scene/FactorySceneRecognition.java @@ -37,7 +37,7 @@ import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; import org.ddogleg.struct.Factory; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating {@link SceneRecognition} and related. diff --git a/main/boofcv-recognition/src/main/java/boofcv/factory/tracker/FactoryTrackerObjectQuad.java b/main/boofcv-recognition/src/main/java/boofcv/factory/tracker/FactoryTrackerObjectQuad.java index a3d33a859c..7f90ce51d3 100644 --- a/main/boofcv-recognition/src/main/java/boofcv/factory/tracker/FactoryTrackerObjectQuad.java +++ b/main/boofcv-recognition/src/main/java/boofcv/factory/tracker/FactoryTrackerObjectQuad.java @@ -35,7 +35,7 @@ import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageGray; import boofcv.struct.image.ImageType; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for implementations of {@link TrackerObjectQuad}, a high level interface for tracking user specified diff --git a/main/boofcv-recognition/src/test/java/boofcv/alg/fiducial/qrcode/TestQrCodeCodecBitsUtils.java b/main/boofcv-recognition/src/test/java/boofcv/alg/fiducial/qrcode/TestQrCodeCodecBitsUtils.java index 312ccbde11..91f3c7d312 100644 --- a/main/boofcv-recognition/src/test/java/boofcv/alg/fiducial/qrcode/TestQrCodeCodecBitsUtils.java +++ b/main/boofcv-recognition/src/test/java/boofcv/alg/fiducial/qrcode/TestQrCodeCodecBitsUtils.java @@ -19,7 +19,7 @@ package boofcv.alg.fiducial.qrcode; import boofcv.testing.BoofStandardJUnit; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertArrayEquals; diff --git a/main/boofcv-recognition/src/test/java/boofcv/alg/fiducial/qrcode/TestQrCodePositionPatternDetector.java b/main/boofcv-recognition/src/test/java/boofcv/alg/fiducial/qrcode/TestQrCodePositionPatternDetector.java index 09fb19549b..4693fd56af 100644 --- a/main/boofcv-recognition/src/test/java/boofcv/alg/fiducial/qrcode/TestQrCodePositionPatternDetector.java +++ b/main/boofcv-recognition/src/test/java/boofcv/alg/fiducial/qrcode/TestQrCodePositionPatternDetector.java @@ -30,7 +30,7 @@ import boofcv.testing.BoofStandardJUnit; import georegression.struct.affine.Affine2D_F64; import georegression.struct.shapes.Polygon2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import java.awt.*; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesData.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesData.java index 9865f0fa68..202a023b1b 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesData.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesData.java @@ -23,7 +23,7 @@ import boofcv.struct.feature.AssociatedIndex; import georegression.struct.point.Point2D_F64; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.*; @@ -106,7 +106,7 @@ public void setRelationship( String viewA, String viewB, List m } @Override - public void findSimilar( String target, @Nullable BoofLambdas.Filter filter, List similarImages ) { + public void findSimilar( String target, BoofLambdas.@Nullable Filter filter, List similarImages ) { similarImages.clear(); Info info = Objects.requireNonNull(imageMap.get(target)); for (int i = 0; i < info.similarViews.size(); i++) { @@ -159,7 +159,7 @@ public static class Info { public final List relationships = new ArrayList<>(); public final DogArray features = new DogArray<>(Point2D_F64::new); - public @Nullable SimilarImagesData.Relationship findRelated( String id ) { + public SimilarImagesData.@Nullable Relationship findRelated( String id ) { for (int i = 0; i < relationships.size(); i++) { if (relationships.get(i).id.equals(id)) return relationships.get(i); diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesFromTracks.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesFromTracks.java index 6d6e6abd8b..f20f7ef9ad 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesFromTracks.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesFromTracks.java @@ -30,7 +30,7 @@ import gnu.trove.map.hash.TLongIntHashMap; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.FastAccess; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.*; @@ -214,7 +214,7 @@ public List getImageIDs() { } @Override - public void findSimilar( String target, @Nullable BoofLambdas.Filter filter, List similarImages ) { + public void findSimilar( String target, BoofLambdas.@Nullable Filter filter, List similarImages ) { similarImages.clear(); Frame f = Objects.requireNonNull(frameMap.get(target), "Unknown image"); diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesSceneRecognition.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesSceneRecognition.java index e21e4d805e..1f259022e6 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesSceneRecognition.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesSceneRecognition.java @@ -40,7 +40,7 @@ import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.*; @@ -217,7 +217,7 @@ private void learnModel() { } @Override public void findSimilar( String target, - @Nullable BoofLambdas.Filter filter, + BoofLambdas.@Nullable Filter filter, List similarImages ) { similarImages.clear(); int imageIndex = imageToIndex.get(target); diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesTrackThenMatch.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesTrackThenMatch.java index 2d4cd86fa7..8501a2ec91 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesTrackThenMatch.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/similar/SimilarImagesTrackThenMatch.java @@ -36,7 +36,7 @@ import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.*; @@ -198,7 +198,7 @@ public void finishedTracking() { } @Override public void findSimilar( String target, - @Nullable BoofLambdas.Filter filter, + BoofLambdas.@Nullable Filter filter, List similarImages ) { // discard old results viewId_to_pairs.clear(); @@ -264,7 +264,7 @@ public void finishedTracking() { * Creates a filter which will preemptively remove invalid matches so that only distant valid matches are * considered */ - private BoofLambdas.Filter filterQuery( @Nullable BoofLambdas.Filter filter, + private BoofLambdas.Filter filterQuery( BoofLambdas.@Nullable Filter filter, int frameIdx, Frame frameTarget ) { return ( id ) -> { int matchedFrameIdx = Integer.parseInt(id); diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/EpipolarScore3D.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/EpipolarScore3D.java index f0870743f0..a4bb13d45a 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/EpipolarScore3D.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/EpipolarScore3D.java @@ -23,7 +23,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.VerbosePrint; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/GeneratePairwiseImageGraph.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/GeneratePairwiseImageGraph.java index 448047cd2f..9e0d7b2c91 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/GeneratePairwiseImageGraph.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/GeneratePairwiseImageGraph.java @@ -28,7 +28,7 @@ import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.*; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/GenerateStereoPairGraphFromScene.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/GenerateStereoPairGraphFromScene.java index 8b3645f133..4fa5f74c2e 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/GenerateStereoPairGraphFromScene.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/GenerateStereoPairGraphFromScene.java @@ -36,7 +36,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.VerbosePrint; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Objects; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/InitializeCommonMetric.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/InitializeCommonMetric.java index d85f3f36ac..54c2404a78 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/InitializeCommonMetric.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/InitializeCommonMetric.java @@ -34,7 +34,7 @@ import org.ddogleg.struct.FastArray; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Objects; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/InitializeCommonProjective.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/InitializeCommonProjective.java index 2fc6badd6b..467ef929a7 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/InitializeCommonProjective.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/InitializeCommonProjective.java @@ -42,7 +42,7 @@ import org.ddogleg.util.VerboseUtils; import org.ejml.data.DMatrixRMaj; import org.ejml.dense.row.MatrixFeatures_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/LookUpSimilarImages.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/LookUpSimilarImages.java index 8d1b47688b..a736a135d0 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/LookUpSimilarImages.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/LookUpSimilarImages.java @@ -22,7 +22,7 @@ import boofcv.struct.feature.AssociatedIndex; import georegression.struct.point.Point2D_F64; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; @@ -50,7 +50,7 @@ public interface LookUpSimilarImages { * @param similarImages (Output) Storage for IDs of similar images. Cleared upon each call * @throws IllegalArgumentException If the target is not known */ - void findSimilar( String target, @Nullable BoofLambdas.Filter filter, List similarImages ); + void findSimilar( String target, BoofLambdas.@Nullable Filter filter, List similarImages ); /** * Looks up pixel observations of features in the specified view. diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/MetricFromUncalibratedPairwiseGraph.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/MetricFromUncalibratedPairwiseGraph.java index 325e40adf2..fed377ea04 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/MetricFromUncalibratedPairwiseGraph.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/MetricFromUncalibratedPairwiseGraph.java @@ -26,7 +26,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/MetricMergeScenes.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/MetricMergeScenes.java index 2d47332b1d..4652b49716 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/MetricMergeScenes.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/MetricMergeScenes.java @@ -27,7 +27,7 @@ import org.ddogleg.struct.FastArray; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Collections; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/MetricSanityChecks.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/MetricSanityChecks.java index 5a5d06db9d..71c3094834 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/MetricSanityChecks.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/MetricSanityChecks.java @@ -37,7 +37,7 @@ import org.ddogleg.struct.DogArray_B; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/PairwiseGraphUtils.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/PairwiseGraphUtils.java index 7732d7491f..b2df7fd610 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/PairwiseGraphUtils.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/PairwiseGraphUtils.java @@ -47,7 +47,7 @@ import org.ddogleg.struct.FastArray; import org.ejml.data.DMatrixRMaj; import org.ejml.dense.row.CommonOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/PairwiseImageGraph.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/PairwiseImageGraph.java index 5955c5493c..26e24ca9cb 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/PairwiseImageGraph.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/PairwiseImageGraph.java @@ -21,7 +21,7 @@ import boofcv.struct.feature.AssociatedIndex; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.HashMap; import java.util.List; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/ReconstructionFromPairwiseGraph.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/ReconstructionFromPairwiseGraph.java index e8026a8af8..52bc07f40a 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/ReconstructionFromPairwiseGraph.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/ReconstructionFromPairwiseGraph.java @@ -27,7 +27,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.*; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/RefineMetricGraphSubset.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/RefineMetricGraphSubset.java index 68991c5c2b..21328f093e 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/RefineMetricGraphSubset.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/RefineMetricGraphSubset.java @@ -26,7 +26,7 @@ import org.ddogleg.struct.DogArray_B; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.*; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/RefineMetricWorkingGraph.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/RefineMetricWorkingGraph.java index 5abd3d9592..3ecefa8ebb 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/RefineMetricWorkingGraph.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/RefineMetricWorkingGraph.java @@ -41,7 +41,7 @@ import org.ddogleg.struct.FastArray; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/ResolveSceneScaleAmbiguity.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/ResolveSceneScaleAmbiguity.java index 612e38c8e6..89ce628891 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/ResolveSceneScaleAmbiguity.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/ResolveSceneScaleAmbiguity.java @@ -29,7 +29,7 @@ import org.ddogleg.struct.DogArray_F64; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SceneMergingOperations.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SceneMergingOperations.java index 6e221f24f2..8b5ebebd2d 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SceneMergingOperations.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SceneMergingOperations.java @@ -33,7 +33,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SceneWorkingGraph.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SceneWorkingGraph.java index b0d1ad582f..31583a673b 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SceneWorkingGraph.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SceneWorkingGraph.java @@ -30,7 +30,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.FastArray; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.*; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SelectNeighborsAroundView.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SelectNeighborsAroundView.java index ca209ff419..506ed31672 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SelectNeighborsAroundView.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SelectNeighborsAroundView.java @@ -25,7 +25,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_F64; import org.ddogleg.struct.VerbosePrint; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.*; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SparseSceneToDenseCloud.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SparseSceneToDenseCloud.java index efdc4377b0..fdcce386a1 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SparseSceneToDenseCloud.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/SparseSceneToDenseCloud.java @@ -30,7 +30,7 @@ import gnu.trove.map.TIntObjectMap; import lombok.Getter; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/ThreeViewEstimateMetricScene.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/ThreeViewEstimateMetricScene.java index afe4334b9e..a9ee954952 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/ThreeViewEstimateMetricScene.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/ThreeViewEstimateMetricScene.java @@ -45,7 +45,7 @@ import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; import org.ejml.dense.row.CommonOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/EstimateViewKnownCalibration.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/EstimateViewKnownCalibration.java index be60b4ea7a..b442bea000 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/EstimateViewKnownCalibration.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/EstimateViewKnownCalibration.java @@ -36,7 +36,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/EstimateViewSelfCalibrate.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/EstimateViewSelfCalibrate.java index 48f989dd2e..f5227ab769 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/EstimateViewSelfCalibrate.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/EstimateViewSelfCalibrate.java @@ -31,7 +31,7 @@ import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Set; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/EstimateViewUtils.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/EstimateViewUtils.java index 16603c563b..546d9396e7 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/EstimateViewUtils.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/EstimateViewUtils.java @@ -34,7 +34,7 @@ import georegression.struct.point.Point4D_F64; import georegression.struct.se.Se3_F64; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/ExpandByOneView.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/ExpandByOneView.java index e9abc28e11..3a7bc0f63d 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/ExpandByOneView.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/ExpandByOneView.java @@ -27,7 +27,7 @@ import lombok.Setter; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/MetricExpandByOneView.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/MetricExpandByOneView.java index d55fab7476..19e8ec05c0 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/MetricExpandByOneView.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/expand/MetricExpandByOneView.java @@ -24,7 +24,7 @@ import georegression.struct.se.Se3_F64; import org.ddogleg.struct.DogArray_I32; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/score3d/ScoreFundamentalHomographyCompatibility.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/score3d/ScoreFundamentalHomographyCompatibility.java index be3ddf8827..ed26898513 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/score3d/ScoreFundamentalHomographyCompatibility.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/score3d/ScoreFundamentalHomographyCompatibility.java @@ -35,7 +35,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.util.VerboseUtils; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/score3d/ScoreFundamentalVsRotation.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/score3d/ScoreFundamentalVsRotation.java index 24b40985ec..33fab8693c 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/score3d/ScoreFundamentalVsRotation.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/score3d/ScoreFundamentalVsRotation.java @@ -37,7 +37,7 @@ import org.ddogleg.util.VerboseUtils; import org.ejml.data.DMatrixRMaj; import org.ejml.dense.row.CommonOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/score3d/ScoreRatioFundamentalHomography.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/score3d/ScoreRatioFundamentalHomography.java index b39493eca4..9f650af3a8 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/score3d/ScoreRatioFundamentalHomography.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/score3d/ScoreRatioFundamentalHomography.java @@ -30,7 +30,7 @@ import org.ddogleg.util.VerboseUtils; import org.ejml.data.DMatrixRMaj; import org.ejml.ops.DConvertMatrixStruct; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/spawn/MetricSpawnSceneFromView.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/spawn/MetricSpawnSceneFromView.java index 6886927ebe..0ee7ef05c7 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/spawn/MetricSpawnSceneFromView.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/structure/spawn/MetricSpawnSceneFromView.java @@ -28,7 +28,7 @@ import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/alg/video/SelectFramesForReconstruction3D.java b/main/boofcv-reconstruction/src/main/java/boofcv/alg/video/SelectFramesForReconstruction3D.java index a2e88583f2..30ecd915fc 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/alg/video/SelectFramesForReconstruction3D.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/alg/video/SelectFramesForReconstruction3D.java @@ -41,7 +41,7 @@ import org.ddogleg.struct.*; import org.ddogleg.util.VerboseUtils; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-reconstruction/src/main/java/boofcv/factory/structure/FactorySceneReconstruction.java b/main/boofcv-reconstruction/src/main/java/boofcv/factory/structure/FactorySceneReconstruction.java index 3d5b800f18..84c27dcc9c 100644 --- a/main/boofcv-reconstruction/src/main/java/boofcv/factory/structure/FactorySceneReconstruction.java +++ b/main/boofcv-reconstruction/src/main/java/boofcv/factory/structure/FactorySceneReconstruction.java @@ -55,7 +55,7 @@ import georegression.struct.homography.Homography2D_F64; import org.ddogleg.fitting.modelset.ModelMatcher; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for operations related to scene reconstruction diff --git a/main/boofcv-reconstruction/src/test/java/boofcv/alg/similar/FeatureSceneRecognitionAbstract.java b/main/boofcv-reconstruction/src/test/java/boofcv/alg/similar/FeatureSceneRecognitionAbstract.java index 1fa17f9b30..52d91db5f3 100644 --- a/main/boofcv-reconstruction/src/test/java/boofcv/alg/similar/FeatureSceneRecognitionAbstract.java +++ b/main/boofcv-reconstruction/src/test/java/boofcv/alg/similar/FeatureSceneRecognitionAbstract.java @@ -24,7 +24,7 @@ import boofcv.struct.feature.TupleDesc; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Iterator; diff --git a/main/boofcv-reconstruction/src/test/java/boofcv/alg/similar/TestSimilarImagesSceneRecognition.java b/main/boofcv-reconstruction/src/test/java/boofcv/alg/similar/TestSimilarImagesSceneRecognition.java index be7c02b3fa..178ac26f68 100644 --- a/main/boofcv-reconstruction/src/test/java/boofcv/alg/similar/TestSimilarImagesSceneRecognition.java +++ b/main/boofcv-reconstruction/src/test/java/boofcv/alg/similar/TestSimilarImagesSceneRecognition.java @@ -34,7 +34,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.FastAccess; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import java.util.ArrayList; @@ -178,7 +178,7 @@ public HelperRecognizer( int numViews ) { @Override public boolean query( Features query, - @Nullable BoofLambdas.Filter filter, + BoofLambdas.@Nullable Filter filter, int limit, DogArray matches ) { matches.reset(); diff --git a/main/boofcv-reconstruction/src/test/java/boofcv/alg/structure/TestSparseSceneToDenseCloud.java b/main/boofcv-reconstruction/src/test/java/boofcv/alg/structure/TestSparseSceneToDenseCloud.java index c84889f3fe..1ed5c8d85c 100644 --- a/main/boofcv-reconstruction/src/test/java/boofcv/alg/structure/TestSparseSceneToDenseCloud.java +++ b/main/boofcv-reconstruction/src/test/java/boofcv/alg/structure/TestSparseSceneToDenseCloud.java @@ -31,7 +31,7 @@ import georegression.struct.se.Se3_F64; import gnu.trove.map.TIntObjectMap; import gnu.trove.map.hash.TIntObjectHashMap; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import static boofcv.misc.BoofMiscOps.uniform; diff --git a/main/boofcv-reconstruction/src/test/java/boofcv/alg/structure/score3d/CommonEpipolarScore3DChecks.java b/main/boofcv-reconstruction/src/test/java/boofcv/alg/structure/score3d/CommonEpipolarScore3DChecks.java index 4cf9bef662..3c96343726 100644 --- a/main/boofcv-reconstruction/src/test/java/boofcv/alg/structure/score3d/CommonEpipolarScore3DChecks.java +++ b/main/boofcv-reconstruction/src/test/java/boofcv/alg/structure/score3d/CommonEpipolarScore3DChecks.java @@ -33,7 +33,7 @@ import org.ejml.UtilEjml; import org.ejml.data.DMatrixRMaj; import org.ejml.dense.row.NormOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/main/boofcv-reconstruction/src/test/java/boofcv/alg/video/TestSelectFramesForReconstruction3D.java b/main/boofcv-reconstruction/src/test/java/boofcv/alg/video/TestSelectFramesForReconstruction3D.java index 126913643e..a7e0784111 100644 --- a/main/boofcv-reconstruction/src/test/java/boofcv/alg/video/TestSelectFramesForReconstruction3D.java +++ b/main/boofcv-reconstruction/src/test/java/boofcv/alg/video/TestSelectFramesForReconstruction3D.java @@ -34,7 +34,7 @@ import org.ddogleg.struct.FastAccess; import org.ejml.UtilEjml; import org.ejml.data.DMatrixRMaj; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import java.io.PrintStream; diff --git a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/AccessPointTracks.java b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/AccessPointTracks.java index 17492335fa..e2dcec4f17 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/AccessPointTracks.java +++ b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/AccessPointTracks.java @@ -19,7 +19,7 @@ package boofcv.abst.sfm; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d2/PlToGrayMotion2D.java b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d2/PlToGrayMotion2D.java index c416d9fad3..5baa671dc2 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d2/PlToGrayMotion2D.java +++ b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d2/PlToGrayMotion2D.java @@ -25,7 +25,7 @@ import boofcv.struct.image.Planar; import georegression.struct.InvertibleTransform; import georegression.struct.point.Point2D_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d2/WrapImageMotionPtkSmartRespawn.java b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d2/WrapImageMotionPtkSmartRespawn.java index 9d7ee9f80f..53b77496f7 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d2/WrapImageMotionPtkSmartRespawn.java +++ b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d2/WrapImageMotionPtkSmartRespawn.java @@ -26,7 +26,7 @@ import georegression.struct.InvertibleTransform; import georegression.struct.point.Point2D_F64; import org.ddogleg.struct.DogArray_B; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/MonoOverhead_to_MonocularPlaneVisualOdometry.java b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/MonoOverhead_to_MonocularPlaneVisualOdometry.java index 93a0fb55a1..6a45f6496b 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/MonoOverhead_to_MonocularPlaneVisualOdometry.java +++ b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/MonoOverhead_to_MonocularPlaneVisualOdometry.java @@ -32,7 +32,7 @@ import georegression.struct.se.Se3_F64; import georegression.transform.se.SePointOps_F64; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/MonoPlaneInfinity_to_MonocularPlaneVisualOdometry.java b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/MonoPlaneInfinity_to_MonocularPlaneVisualOdometry.java index af6ce013c1..050acd71b1 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/MonoPlaneInfinity_to_MonocularPlaneVisualOdometry.java +++ b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/MonoPlaneInfinity_to_MonocularPlaneVisualOdometry.java @@ -29,7 +29,7 @@ import georegression.struct.point.Point2D_F64; import georegression.struct.point.Point3D_F64; import georegression.struct.se.Se3_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/MonocularPlaneVisualOdometryScaleInput.java b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/MonocularPlaneVisualOdometryScaleInput.java index 9527b20c1d..594a7b73a8 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/MonocularPlaneVisualOdometryScaleInput.java +++ b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/MonocularPlaneVisualOdometryScaleInput.java @@ -25,7 +25,7 @@ import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; import georegression.struct.se.Se3_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Set; diff --git a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/PyramidDirectColorDepth_to_DepthVisualOdometry.java b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/PyramidDirectColorDepth_to_DepthVisualOdometry.java index d47b07d6ba..5e7ab4a1a1 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/PyramidDirectColorDepth_to_DepthVisualOdometry.java +++ b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/PyramidDirectColorDepth_to_DepthVisualOdometry.java @@ -38,7 +38,7 @@ import georegression.struct.point.Point2D_F32; import georegression.struct.se.Se3_F32; import georegression.struct.se.Se3_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Set; diff --git a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/StereoVisualOdometryScaleInput.java b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/StereoVisualOdometryScaleInput.java index 9bfc6f0dfe..60bf5f946a 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/StereoVisualOdometryScaleInput.java +++ b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/StereoVisualOdometryScaleInput.java @@ -24,7 +24,7 @@ import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; import georegression.struct.se.Se3_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Set; diff --git a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/VisOdomPixelDepthPnP_to_DepthVisualOdometry.java b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/VisOdomPixelDepthPnP_to_DepthVisualOdometry.java index 11bf0de2b3..861daf44b8 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/VisOdomPixelDepthPnP_to_DepthVisualOdometry.java +++ b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/VisOdomPixelDepthPnP_to_DepthVisualOdometry.java @@ -36,7 +36,7 @@ import georegression.struct.point.Point3D_F64; import georegression.struct.point.Point4D_F64; import georegression.struct.se.Se3_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/WrapVisOdomDualTrackPnP.java b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/WrapVisOdomDualTrackPnP.java index becc8510ae..e8ade61d93 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/WrapVisOdomDualTrackPnP.java +++ b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/WrapVisOdomDualTrackPnP.java @@ -34,7 +34,7 @@ import georegression.struct.point.Point3D_F64; import georegression.struct.se.Se3_F64; import lombok.Getter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.List; diff --git a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/WrapVisOdomMonoStereoDepthPnP.java b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/WrapVisOdomMonoStereoDepthPnP.java index dbb90afdb4..0bdccfd1df 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/WrapVisOdomMonoStereoDepthPnP.java +++ b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/WrapVisOdomMonoStereoDepthPnP.java @@ -31,7 +31,7 @@ import georegression.struct.point.Point3D_F64; import georegression.struct.point.Point4D_F64; import georegression.struct.se.Se3_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/WrapVisOdomQuadPnP.java b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/WrapVisOdomQuadPnP.java index 67ee7d6e0f..8ff87f1651 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/WrapVisOdomQuadPnP.java +++ b/main/boofcv-sfm/src/main/java/boofcv/abst/sfm/d3/WrapVisOdomQuadPnP.java @@ -35,7 +35,7 @@ import georegression.transform.se.SePointOps_F64; import lombok.Getter; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-sfm/src/main/java/boofcv/alg/mvs/ColorizeMultiViewStereoResults.java b/main/boofcv-sfm/src/main/java/boofcv/alg/mvs/ColorizeMultiViewStereoResults.java index f7f725d7ce..c4120d32d0 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/alg/mvs/ColorizeMultiViewStereoResults.java +++ b/main/boofcv-sfm/src/main/java/boofcv/alg/mvs/ColorizeMultiViewStereoResults.java @@ -37,7 +37,7 @@ import lombok.Getter; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; @@ -112,7 +112,7 @@ public void processMvsCloud( SceneStructureMetric scene, int idx1 = mvs.getDisparityCloud().viewPointIdx.get(centerIdx + 1); // State of the camera in this view - @Nullable BundleCameraState state = observations != null ? observations.getView(centerIdx).cameraState : null; + BundleCameraState state = observations != null ? observations.getView(centerIdx).cameraState : null; // Setup the camera projection model using bundle adjustment model directly BundleAdjustmentOps.convert(scene.getViewCamera(center.metric).model, state, image.width, image.height, intrinsic); @@ -169,7 +169,7 @@ public void processScenePoints( SceneStructureMetric scene, SceneStructureMetric.View v = scene.views.get(viewIdx); // State of the camera in this view - @Nullable BundleCameraState state = observations != null ? observations.getView(viewIdx).cameraState : null; + BundleCameraState state = observations != null ? observations.getView(viewIdx).cameraState : null; // Setup the camera projection model using bundle adjustment model directly BundleAdjustmentOps.convert(scene.getViewCamera(v).model, state, image.width, image.height, intrinsic); diff --git a/main/boofcv-sfm/src/main/java/boofcv/alg/mvs/MultiViewStereoFromKnownSceneStructure.java b/main/boofcv-sfm/src/main/java/boofcv/alg/mvs/MultiViewStereoFromKnownSceneStructure.java index 9b984abf17..e0d678761e 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/alg/mvs/MultiViewStereoFromKnownSceneStructure.java +++ b/main/boofcv-sfm/src/main/java/boofcv/alg/mvs/MultiViewStereoFromKnownSceneStructure.java @@ -45,7 +45,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.*; diff --git a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/FactoryStitchingTransform.java b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/FactoryStitchingTransform.java index 43a41b9e9c..066ae5782f 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/FactoryStitchingTransform.java +++ b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/FactoryStitchingTransform.java @@ -27,7 +27,7 @@ import georegression.struct.homography.Homography2D_F32; import georegression.struct.homography.Homography2D_F64; import georegression.struct.point.Point2D_F32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating {@link StitchingTransform} of different motion models. diff --git a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/ImageMotionPointTrackerKey.java b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/ImageMotionPointTrackerKey.java index 16bb3c7dc2..90d7bbd5b5 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/ImageMotionPointTrackerKey.java +++ b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/ImageMotionPointTrackerKey.java @@ -25,7 +25,7 @@ import georegression.struct.InvertibleTransform; import org.ddogleg.fitting.modelset.ModelFitter; import org.ddogleg.fitting.modelset.ModelMatcher; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/StitchingFromMotion2D.java b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/StitchingFromMotion2D.java index ac5d076afb..00e5de2842 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/StitchingFromMotion2D.java +++ b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/StitchingFromMotion2D.java @@ -30,7 +30,7 @@ import georegression.struct.point.Point2D_F32; import georegression.struct.shapes.Quadrilateral_F64; import georegression.struct.shapes.RectangleLength2D_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Stitches together sequences of images using {@link ImageMotion2D}, typically used for image stabilization diff --git a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/StitchingTransform.java b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/StitchingTransform.java index 6481d8e185..0234d91feb 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/StitchingTransform.java +++ b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d2/StitchingTransform.java @@ -22,7 +22,7 @@ import georegression.struct.InvertibleTransform; import georegression.struct.homography.Homography2D_F64; import georegression.struct.point.Point2D_F32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * TODO Comment diff --git a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomBundlePnPBase.java b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomBundlePnPBase.java index 63eb197dd3..aa7f90c0ef 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomBundlePnPBase.java +++ b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomBundlePnPBase.java @@ -40,7 +40,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomDualTrackPnP.java b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomDualTrackPnP.java index d7348a4e67..3c6e466bbc 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomDualTrackPnP.java +++ b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomDualTrackPnP.java @@ -49,7 +49,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomMonoDepthPnP.java b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomMonoDepthPnP.java index 3f27d06a01..a0fecab1c7 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomMonoDepthPnP.java +++ b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomMonoDepthPnP.java @@ -40,7 +40,7 @@ import lombok.Getter; import org.ddogleg.fitting.modelset.ModelMatcher; import org.ddogleg.struct.DogArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomStereoQuadPnP.java b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomStereoQuadPnP.java index 610367b2f5..2a7cd3c642 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomStereoQuadPnP.java +++ b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/VisOdomStereoQuadPnP.java @@ -51,7 +51,7 @@ import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.VerbosePrint; import org.ddogleg.util.VerboseUtils; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/structure/MaxGeoKeyFrameManager.java b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/structure/MaxGeoKeyFrameManager.java index a15eb8218b..dc94e4854c 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/structure/MaxGeoKeyFrameManager.java +++ b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/structure/MaxGeoKeyFrameManager.java @@ -34,7 +34,7 @@ import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.FastAccess; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Set; diff --git a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/structure/TickTockKeyFrameManager.java b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/structure/TickTockKeyFrameManager.java index a696aa73a0..a079f667d8 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/structure/TickTockKeyFrameManager.java +++ b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/structure/TickTockKeyFrameManager.java @@ -22,7 +22,7 @@ import boofcv.alg.sfm.d3.structure.VisOdomBundleAdjustment.BCamera; import org.ddogleg.struct.DogArray_I32; import org.ddogleg.struct.FastAccess; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.Set; diff --git a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/structure/VisOdomBundleAdjustment.java b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/structure/VisOdomBundleAdjustment.java index 67f382c069..dc740b137c 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/structure/VisOdomBundleAdjustment.java +++ b/main/boofcv-sfm/src/main/java/boofcv/alg/sfm/d3/structure/VisOdomBundleAdjustment.java @@ -35,7 +35,7 @@ import org.ddogleg.struct.DogArray; import org.ddogleg.struct.Factory; import org.ddogleg.struct.FastArray; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.PrintStream; import java.util.ArrayList; diff --git a/main/boofcv-sfm/src/main/java/boofcv/factory/sfm/FactoryVisualOdometry.java b/main/boofcv-sfm/src/main/java/boofcv/factory/sfm/FactoryVisualOdometry.java index 8b2731a858..3c2dccbaef 100644 --- a/main/boofcv-sfm/src/main/java/boofcv/factory/sfm/FactoryVisualOdometry.java +++ b/main/boofcv-sfm/src/main/java/boofcv/factory/sfm/FactoryVisualOdometry.java @@ -69,7 +69,7 @@ import georegression.struct.se.Se2_F64; import georegression.struct.se.Se3_F64; import org.ddogleg.fitting.modelset.ransac.Ransac; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Factory for creating visual odometry algorithms. diff --git a/main/boofcv-sfm/src/test/java/boofcv/abst/sfm/d3/TestMonocularPlaneVisualOdometryScaleInput.java b/main/boofcv-sfm/src/test/java/boofcv/abst/sfm/d3/TestMonocularPlaneVisualOdometryScaleInput.java index 670396f534..53b6c4331b 100644 --- a/main/boofcv-sfm/src/test/java/boofcv/abst/sfm/d3/TestMonocularPlaneVisualOdometryScaleInput.java +++ b/main/boofcv-sfm/src/test/java/boofcv/abst/sfm/d3/TestMonocularPlaneVisualOdometryScaleInput.java @@ -24,7 +24,7 @@ import boofcv.struct.image.ImageType; import boofcv.testing.BoofStandardJUnit; import georegression.struct.se.Se3_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import java.io.PrintStream; diff --git a/main/boofcv-sfm/src/test/java/boofcv/abst/sfm/d3/TestStereoVisualOdometryScaleInput.java b/main/boofcv-sfm/src/test/java/boofcv/abst/sfm/d3/TestStereoVisualOdometryScaleInput.java index e15e482c11..57196b6f81 100644 --- a/main/boofcv-sfm/src/test/java/boofcv/abst/sfm/d3/TestStereoVisualOdometryScaleInput.java +++ b/main/boofcv-sfm/src/test/java/boofcv/abst/sfm/d3/TestStereoVisualOdometryScaleInput.java @@ -26,7 +26,7 @@ import georegression.geometry.ConvertRotation3D_F64; import georegression.struct.EulerType; import georegression.struct.se.Se3_F64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import java.io.PrintStream; diff --git a/main/boofcv-simulation/src/main/java/boofcv/simulation/PointTrackerPerfectCloud.java b/main/boofcv-simulation/src/main/java/boofcv/simulation/PointTrackerPerfectCloud.java index 63d11c2db9..3eb4e45ad3 100644 --- a/main/boofcv-simulation/src/main/java/boofcv/simulation/PointTrackerPerfectCloud.java +++ b/main/boofcv-simulation/src/main/java/boofcv/simulation/PointTrackerPerfectCloud.java @@ -41,7 +41,7 @@ import gnu.trove.set.hash.TLongHashSet; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I64; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-types/src/main/java/boofcv/BoofTesting.java b/main/boofcv-types/src/main/java/boofcv/BoofTesting.java index b478099115..d021b19a1e 100644 --- a/main/boofcv-types/src/main/java/boofcv/BoofTesting.java +++ b/main/boofcv-types/src/main/java/boofcv/BoofTesting.java @@ -26,7 +26,7 @@ import org.ejml.UtilEjml; import org.ejml.data.DMatrixRMaj; import org.ejml.dense.row.CommonOps_DDRM; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/main/boofcv-types/src/main/java/boofcv/alg/InputSanityCheck.java b/main/boofcv-types/src/main/java/boofcv/alg/InputSanityCheck.java index f8084b62c0..dc88747c45 100644 --- a/main/boofcv-types/src/main/java/boofcv/alg/InputSanityCheck.java +++ b/main/boofcv-types/src/main/java/boofcv/alg/InputSanityCheck.java @@ -21,7 +21,7 @@ import boofcv.core.image.GeneralizedImageOps; import boofcv.struct.image.*; import boofcv.struct.pyramid.ImagePyramid; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Operations for basic sanity checks on function arguments. Checks if the contract is being obeyed by the caller. diff --git a/main/boofcv-types/src/main/java/boofcv/generate/PaperSize.java b/main/boofcv-types/src/main/java/boofcv/generate/PaperSize.java index b7d9ce3e5e..1291622162 100644 --- a/main/boofcv-types/src/main/java/boofcv/generate/PaperSize.java +++ b/main/boofcv-types/src/main/java/boofcv/generate/PaperSize.java @@ -19,7 +19,7 @@ package boofcv.generate; import lombok.Getter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.ArrayList; import java.util.List; diff --git a/main/boofcv-types/src/main/java/boofcv/misc/BoofMiscOps.java b/main/boofcv-types/src/main/java/boofcv/misc/BoofMiscOps.java index 23dd2e54b0..189dee8517 100644 --- a/main/boofcv-types/src/main/java/boofcv/misc/BoofMiscOps.java +++ b/main/boofcv-types/src/main/java/boofcv/misc/BoofMiscOps.java @@ -30,7 +30,7 @@ import org.ejml.data.DMatrix2x2; import org.ejml.data.DMatrixRMaj; import org.ejml.data.FMatrix2x2; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import pabeles.concurrency.ConcurrencyOps; import pabeles.concurrency.GrowArray; @@ -584,7 +584,7 @@ public static void print( GrayI a ) { System.out.println(); } - public static int[] convertArray( double[] input, @Nullable int[] output ) { + public static int[] convertArray( double[] input, int @Nullable [] output ) { if (output == null) output = new int[input.length]; @@ -595,7 +595,7 @@ public static int[] convertArray( double[] input, @Nullable int[] output ) { return output; } - public static long[] convertArray( double[] input, @Nullable long[] output ) { + public static long[] convertArray( double[] input, long @Nullable [] output ) { if (output == null) output = new long[input.length]; @@ -606,7 +606,7 @@ public static long[] convertArray( double[] input, @Nullable long[] output ) { return output; } - public static float[] convertArray( double[] input, @Nullable float[] output ) { + public static float[] convertArray( double[] input, float @Nullable [] output ) { if (output == null) output = new float[input.length]; @@ -617,7 +617,7 @@ public static float[] convertArray( double[] input, @Nullable float[] output ) { return output; } - public static double[] convertArray( float[] input, @Nullable double[] output ) { + public static double[] convertArray( float[] input, double @Nullable [] output ) { if (output == null) output = new double[input.length]; @@ -628,7 +628,7 @@ public static double[] convertArray( float[] input, @Nullable double[] output ) return output; } - public static int[] convertArray( float[] input, @Nullable int[] output ) { + public static int[] convertArray( float[] input, int @Nullable [] output ) { if (output == null) output = new int[input.length]; @@ -639,7 +639,7 @@ public static int[] convertArray( float[] input, @Nullable int[] output ) { return output; } - public static float[] convertArray( int[] input, @Nullable float[] output ) { + public static float[] convertArray( int[] input, float @Nullable [] output ) { if (output == null) output = new float[input.length]; @@ -1054,7 +1054,7 @@ public static void convertMatrix( DMatrix2x2 src, DMatrixRMaj dst ) { /** * Copies src into dst. If dst is not the correct size then a new instance is created and that returned. */ - public static double[] copySmart( double[] src, @Nullable double[] dst ) { + public static double[] copySmart( double[] src, double @Nullable [] dst ) { if (dst == null || dst.length != src.length) { dst = new double[src.length]; } diff --git a/main/boofcv-types/src/main/java/boofcv/misc/VariableLockSet.java b/main/boofcv-types/src/main/java/boofcv/misc/VariableLockSet.java index 190c759a67..ff60805135 100644 --- a/main/boofcv-types/src/main/java/boofcv/misc/VariableLockSet.java +++ b/main/boofcv-types/src/main/java/boofcv/misc/VariableLockSet.java @@ -18,7 +18,7 @@ package boofcv.misc; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; diff --git a/main/boofcv-types/src/main/java/boofcv/struct/mesh/VertexMesh.java b/main/boofcv-types/src/main/java/boofcv/struct/mesh/VertexMesh.java index a2b80982b5..5c814928d2 100644 --- a/main/boofcv-types/src/main/java/boofcv/struct/mesh/VertexMesh.java +++ b/main/boofcv-types/src/main/java/boofcv/struct/mesh/VertexMesh.java @@ -28,7 +28,7 @@ import georegression.struct.point.Vector3D_F64; import org.ddogleg.struct.DogArray; import org.ddogleg.struct.DogArray_I32; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.util.List; diff --git a/main/boofcv-types/src/main/java/boofcv/struct/pyramid/PyramidDiscrete.java b/main/boofcv-types/src/main/java/boofcv/struct/pyramid/PyramidDiscrete.java index fe657c05c4..fa5832311f 100644 --- a/main/boofcv-types/src/main/java/boofcv/struct/pyramid/PyramidDiscrete.java +++ b/main/boofcv-types/src/main/java/boofcv/struct/pyramid/PyramidDiscrete.java @@ -21,7 +21,7 @@ import boofcv.struct.image.ImageBase; import boofcv.struct.image.ImageType; import lombok.Getter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

diff --git a/main/boofcv-types/src/noauto/java/boofcv/struct/image/ImageBase.java b/main/boofcv-types/src/noauto/java/boofcv/struct/image/ImageBase.java index b2d81bd9dd..0d02a97e89 100644 --- a/main/boofcv-types/src/noauto/java/boofcv/struct/image/ImageBase.java +++ b/main/boofcv-types/src/noauto/java/boofcv/struct/image/ImageBase.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.Setter; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.io.Serializable; diff --git a/main/boofcv-types/src/noauto/java/boofcv/struct/image/ImageGray.java b/main/boofcv-types/src/noauto/java/boofcv/struct/image/ImageGray.java index 0c6c01f53b..65a846f83f 100644 --- a/main/boofcv-types/src/noauto/java/boofcv/struct/image/ImageGray.java +++ b/main/boofcv-types/src/noauto/java/boofcv/struct/image/ImageGray.java @@ -18,7 +18,7 @@ package boofcv.struct.image; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.Array; diff --git a/main/boofcv-types/src/noauto/java/boofcv/struct/image/ImageInterleaved.java b/main/boofcv-types/src/noauto/java/boofcv/struct/image/ImageInterleaved.java index 1c8a2e60a0..2e8ec4c1d5 100644 --- a/main/boofcv-types/src/noauto/java/boofcv/struct/image/ImageInterleaved.java +++ b/main/boofcv-types/src/noauto/java/boofcv/struct/image/ImageInterleaved.java @@ -18,7 +18,7 @@ package boofcv.struct.image; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.Array; diff --git a/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedF32.java b/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedF32.java index acbcdeeca1..1bb8ed302d 100644 --- a/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedF32.java +++ b/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedF32.java @@ -18,7 +18,7 @@ package boofcv.struct.image; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

@@ -61,7 +61,7 @@ public InterleavedF32( int width, int height, int numBands ) { * @param storage If not null then the pixel's value is written here. If null a new array is created. * @return The pixel's value. */ - public float[] get( int x, int y, @Nullable float[] storage ) { + public float[] get( int x, int y, float @Nullable [] storage ) { if (!isInBounds(x, y)) throw new ImageAccessException("Requested pixel is out of bounds"); diff --git a/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedF64.java b/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedF64.java index 334fedce99..add9b38366 100644 --- a/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedF64.java +++ b/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedF64.java @@ -18,7 +18,7 @@ package boofcv.struct.image; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

@@ -61,7 +61,7 @@ public InterleavedF64( int width, int height, int numBands ) { * @param storage If not null then the pixel's value is written here. If null a new array is created. * @return The pixel's value. */ - public double[] get( int x, int y, @Nullable double[] storage ) { + public double[] get( int x, int y, double @Nullable [] storage ) { if (!isInBounds(x, y)) throw new ImageAccessException("Requested pixel is out of bounds"); diff --git a/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedI16.java b/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedI16.java index 957f07897f..1f8953a90b 100644 --- a/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedI16.java +++ b/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedI16.java @@ -18,7 +18,7 @@ package boofcv.struct.image; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

@@ -63,7 +63,7 @@ public ImageDataType getDataType() { * @param storage If not null then the pixel's value is written here. If null a new array is created. * @return The pixel's value. */ - public short[] get( int x, int y, @Nullable short[] storage ) { + public short[] get( int x, int y, short @Nullable [] storage ) { if (!isInBounds(x, y)) throw new ImageAccessException("Requested pixel is out of bounds"); diff --git a/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedI8.java b/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedI8.java index 3203f15787..cebc75e9b1 100644 --- a/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedI8.java +++ b/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedI8.java @@ -18,7 +18,7 @@ package boofcv.struct.image; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

@@ -63,7 +63,7 @@ public ImageDataType getDataType() { * @param storage If not null then the pixel's value is written here. If null a new array is created. * @return The pixel's value. */ - public byte[] get( int x, int y, @Nullable byte[] storage ) { + public byte[] get( int x, int y, byte @Nullable [] storage ) { if (!isInBounds(x, y)) throw new ImageAccessException("Requested pixel is out of bounds"); diff --git a/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedInteger.java b/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedInteger.java index 9c9c7dc352..dd50ec8f51 100644 --- a/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedInteger.java +++ b/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedInteger.java @@ -18,7 +18,7 @@ package boofcv.struct.image; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** * Base class for integer interleaved images. @@ -48,7 +48,7 @@ protected InterleavedInteger() {} * @param storage If not null then the pixel's value is written here. If null a new array is created. * @return The pixel's value. */ - public int[] get( int x, int y, @Nullable int[] storage ) { + public int[] get( int x, int y, int @Nullable [] storage ) { if (!isInBounds(x, y)) throw new ImageAccessException("Requested pixel is out of bounds"); diff --git a/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedS64.java b/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedS64.java index be5b06a0bb..098e8a9735 100644 --- a/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedS64.java +++ b/main/boofcv-types/src/noauto/java/boofcv/struct/image/InterleavedS64.java @@ -18,7 +18,7 @@ package boofcv.struct.image; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; /** *

@@ -63,7 +63,7 @@ public ImageDataType getDataType() { * @param storage If not null then the pixel's value is written here. If null a new array is created. * @return The pixel's value. */ - public long[] get( int x, int y, @Nullable long[] storage ) { + public long[] get( int x, int y, long @Nullable [] storage ) { if (!isInBounds(x, y)) throw new ImageAccessException("Requested pixel is out of bounds"); diff --git a/main/boofcv-types/src/noauto/java/boofcv/struct/image/Planar.java b/main/boofcv-types/src/noauto/java/boofcv/struct/image/Planar.java index 992dbf9a25..3779c59590 100644 --- a/main/boofcv-types/src/noauto/java/boofcv/struct/image/Planar.java +++ b/main/boofcv-types/src/noauto/java/boofcv/struct/image/Planar.java @@ -18,7 +18,7 @@ package boofcv.struct.image; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import java.lang.reflect.Array; diff --git a/main/boofcv-types/src/test/java/boofcv/struct/image/TestImageGray.java b/main/boofcv-types/src/test/java/boofcv/struct/image/TestImageGray.java index 60c8e507db..9ba81042ac 100644 --- a/main/boofcv-types/src/test/java/boofcv/struct/image/TestImageGray.java +++ b/main/boofcv-types/src/test/java/boofcv/struct/image/TestImageGray.java @@ -19,7 +19,7 @@ package boofcv.struct.image; import boofcv.testing.BoofStandardJUnit; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/main/boofcv-types/src/test/java/boofcv/struct/image/TestImageInterleaved.java b/main/boofcv-types/src/test/java/boofcv/struct/image/TestImageInterleaved.java index eb0667717e..d98a627326 100644 --- a/main/boofcv-types/src/test/java/boofcv/struct/image/TestImageInterleaved.java +++ b/main/boofcv-types/src/test/java/boofcv/struct/image/TestImageInterleaved.java @@ -19,7 +19,7 @@ package boofcv.struct.image; import boofcv.testing.BoofStandardJUnit; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; diff --git a/main/boofcv-types/src/test/java/boofcv/testing/BoofStandardJUnit.java b/main/boofcv-types/src/test/java/boofcv/testing/BoofStandardJUnit.java index ac11dfec00..3e6c593db9 100644 --- a/main/boofcv-types/src/test/java/boofcv/testing/BoofStandardJUnit.java +++ b/main/boofcv-types/src/test/java/boofcv/testing/BoofStandardJUnit.java @@ -27,6 +27,7 @@ import org.ejml.data.FMatrix; import org.ejml.ops.MatrixFeatures_D; import org.ejml.ops.MatrixFeatures_F; +import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -413,7 +414,7 @@ public MirrorStream( PrintStream out ) { out.write(b); } - @Override public void write( byte[] b, int off, int len ) throws IOException { + @Override public void write( byte @NonNull [] b, int off, int len ) throws IOException { used = true; out.write(b, off, len); }