Skip to content

Commit 0afc55c

Browse files
Merge pull request #79 from ljubobratovicrelja/histEqual-rename
Renamed histEqual to histEqualize.
2 parents 37854a2 + 0fdbd9f commit 0afc55c

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

source/dcv/imgproc/filter.d

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ $(DL Module contains:
2929
$(LINK2 #bilateralFilter,bilateralFilter)
3030
$(LINK2 #medianFilter,medianFilter)
3131
$(LINK2 #calcHistogram,calcHistogram)
32-
$(LINK2 #histEqual,histEqual)
32+
$(LINK2 #histEqualize,histEqualize)
3333
$(LINK2 #erode,erode)
3434
$(LINK2 #dilate,dilate)
3535
$(LINK2 #open,open)
@@ -908,7 +908,7 @@ void main()
908908
Image image = imread("dcv/examples/data/lena.png");
909909
910910
auto slice = image.sliced.rgb2gray;
911-
auto equalized = slice.histEqual(slice.byElement.calcHistogram);
911+
auto equalized = slice.histEqualize(slice.byElement.calcHistogram);
912912
913913
slice.imshow("Original");
914914
equalized.imshow("Equalized");
@@ -937,7 +937,7 @@ Params:
937937
Returns:
938938
Copy of input image slice with its histogram values equalized.
939939
*/
940-
Slice!(N, T*) histEqual(T, HistogramType, size_t N)(Slice!(N, T*) slice, HistogramType histogram,
940+
Slice!(N, T*) histEqualize(T, HistogramType, size_t N)(Slice!(N, T*) slice, HistogramType histogram,
941941
Slice!(N, T*) prealloc = emptySlice!(N, T))
942942
in
943943
{
@@ -985,6 +985,8 @@ body
985985
return prealloc;
986986
}
987987

988+
deprecated("Use dcv.imgproc.filter.histEqualize") alias histEqual = histEqualize;
989+
988990
/**
989991
Perform morphological $(LINK3 https://en.wikipedia.org/wiki/Erosion_(morphology),erosion).
990992

tests/performance-tests/source/performance/measure.d

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,14 +328,14 @@ auto run_dcv_imgproc_filter_bilateralFilter_3()
328328
{
329329
auto image = slice!float(imsize, imsize);
330330
auto result = slice!float(imsize, imsize);
331-
return evalBenchmark(&bilateralFilter!(neumann, typeof(image), float, 2), image, 0.84, 3, result, taskPool);
331+
return evalBenchmark(&bilateralFilter!(neumann, typeof(image), float, 2), image, 0.84, 0.84, 3, result, taskPool);
332332
}
333333

334334
auto run_dcv_imgproc_filter_bilateralFilter_5()
335335
{
336336
auto image = slice!float(imsize, imsize);
337337
auto result = slice!float(imsize, imsize);
338-
return evalBenchmark(&bilateralFilter!(neumann, typeof(image), float, 2), image, 0.84, 5, result, taskPool);
338+
return evalBenchmark(&bilateralFilter!(neumann, typeof(image), float, 2), image, 0.84, 0.84, 5, result, taskPool);
339339
}
340340

341341
auto run_dcv_imgproc_filter_medianFilter_3()
@@ -352,12 +352,12 @@ auto run_dcv_imgproc_filter_medianFilter_5()
352352
return evalBenchmark(&medianFilter!(neumann, float, float, 2), image, 5, result, taskPool);
353353
}
354354

355-
auto run_dcv_imgproc_filter_histEqual()
355+
auto run_dcv_imgproc_filter_histEqualize()
356356
{
357357
auto image = slice!ubyte(imsize, imsize);
358358
auto result = slice!ubyte(imsize, imsize);
359359
int[256] histogram;
360-
return evalBenchmark(&histEqual!(ubyte, int[256], 2), image, histogram, result);
360+
return evalBenchmark(&histEqualize!(ubyte, int[256], 2), image, histogram, result);
361361
}
362362

363363
auto run_dcv_imgproc_filter_erode()

0 commit comments

Comments
 (0)