[cudalegacy] Fix warnings about tautologies

[cudalegacy] Possibly fix assertion to use something more meaningful `totalDetections <= totalMaxDetections`

[cudalegacy] Fix warnings about tautologies
[cudalegacy] Possibly fix assertion to use something more meaningful `totalDetections <= totalMaxDetections`
ac627d22 · Marcin Tolysz · GitHub · a8c7a56b · ac627d22
Unverified Commit ac627d22 authored Oct 06, 2019 by Marcin Tolysz Committed by GitHub Oct 06, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

NCVHaarObjectDetection.cu modules/cudalegacy/src/cuda/NCVHaarObjectDetection.cu +2 -2

No files found.
--- a/modules/cudalegacy/src/cuda/NCVHaarObjectDetection.cu
+++ b/modules/cudalegacy/src/cuda/NCVHaarObjectDetection.cu
@@ -1414,7 +1414,7 @@ NCVStatus ncvGrowDetectionsVector_device(NCVVector<Ncv32u> &pixelMask,

    ncvAssertReturn(totalMaxDetections <= hypotheses.length() &&
                    numPixelMaskDetections <= pixelMask.length() &&
-                    totalMaxDetections <= totalMaxDetections, NCV_INCONSISTENT_INPUT);
+                    totalDetections <= totalMaxDetections, NCV_INCONSISTENT_INPUT);

    NCVStatus ncvStat = NCV_SUCCESS;
    Ncv32u numDetsToCopy = numPixelMaskDetections;
@@ -1994,7 +1994,7 @@ NCVStatus ncvGrowDetectionsVector_host(NCVVector<Ncv32u> &pixelMask,
    ncvAssertReturn(curScale > 0, NCV_INVALID_SCALE);
    ncvAssertReturn(totalMaxDetections <= hypotheses.length() &&
                    numPixelMaskDetections <= pixelMask.length() &&
-                    totalMaxDetections <= totalMaxDetections, NCV_INCONSISTENT_INPUT);
+                    totalDetections <= totalMaxDetections, NCV_INCONSISTENT_INPUT);

    NCVStatus ncvStat = NCV_SUCCESS;
    Ncv32u numDetsToCopy = numPixelMaskDetections;