diff --git a/source/dcv/imgproc/filter.d b/source/dcv/imgproc/filter.d index 4263087..ae6a047 100644 --- a/source/dcv/imgproc/filter.d +++ b/source/dcv/imgproc/filter.d @@ -29,7 +29,7 @@ $(DL Module contains: $(LINK2 #bilateralFilter,bilateralFilter) $(LINK2 #medianFilter,medianFilter) $(LINK2 #calcHistogram,calcHistogram) - $(LINK2 #histEqual,histEqual) + $(LINK2 #histEqualize,histEqualize) $(LINK2 #erode,erode) $(LINK2 #dilate,dilate) $(LINK2 #open,open) @@ -908,7 +908,7 @@ void main() Image image = imread("dcv/examples/data/lena.png"); auto slice = image.sliced.rgb2gray; - auto equalized = slice.histEqual(slice.byElement.calcHistogram); + auto equalized = slice.histEqualize(slice.byElement.calcHistogram); slice.imshow("Original"); equalized.imshow("Equalized"); @@ -937,7 +937,7 @@ Params: Returns: Copy of input image slice with its histogram values equalized. */ -Slice!(N, T*) histEqual(T, HistogramType, size_t N)(Slice!(N, T*) slice, HistogramType histogram, +Slice!(N, T*) histEqualize(T, HistogramType, size_t N)(Slice!(N, T*) slice, HistogramType histogram, Slice!(N, T*) prealloc = emptySlice!(N, T)) in { @@ -985,6 +985,8 @@ body return prealloc; } +deprecated("Use dcv.imgproc.filter.histEqualize") alias histEqual = histEqualize; + /** Perform morphological $(LINK3 https://en.wikipedia.org/wiki/Erosion_(morphology),erosion). diff --git a/tests/performance-tests/source/performance/measure.d b/tests/performance-tests/source/performance/measure.d index 526c100..994fc00 100644 --- a/tests/performance-tests/source/performance/measure.d +++ b/tests/performance-tests/source/performance/measure.d @@ -328,14 +328,14 @@ auto run_dcv_imgproc_filter_bilateralFilter_3() { auto image = slice!float(imsize, imsize); auto result = slice!float(imsize, imsize); - return evalBenchmark(&bilateralFilter!(neumann, typeof(image), float, 2), image, 0.84, 3, result, taskPool); + return evalBenchmark(&bilateralFilter!(neumann, typeof(image), float, 2), image, 0.84, 0.84, 3, result, taskPool); } auto run_dcv_imgproc_filter_bilateralFilter_5() { auto image = slice!float(imsize, imsize); auto result = slice!float(imsize, imsize); - return evalBenchmark(&bilateralFilter!(neumann, typeof(image), float, 2), image, 0.84, 5, result, taskPool); + return evalBenchmark(&bilateralFilter!(neumann, typeof(image), float, 2), image, 0.84, 0.84, 5, result, taskPool); } auto run_dcv_imgproc_filter_medianFilter_3() @@ -352,12 +352,12 @@ auto run_dcv_imgproc_filter_medianFilter_5() return evalBenchmark(&medianFilter!(neumann, float, float, 2), image, 5, result, taskPool); } -auto run_dcv_imgproc_filter_histEqual() +auto run_dcv_imgproc_filter_histEqualize() { auto image = slice!ubyte(imsize, imsize); auto result = slice!ubyte(imsize, imsize); int[256] histogram; - return evalBenchmark(&histEqual!(ubyte, int[256], 2), image, histogram, result); + return evalBenchmark(&histEqualize!(ubyte, int[256], 2), image, histogram, result); } auto run_dcv_imgproc_filter_erode()