Skip to content

Commit 3dbe628

Browse files
committed
Fix weighted sum to add the full image value
1 parent f988755 commit 3dbe628

7 files changed

+7
-7
lines changed

sobel_cpu.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ sobel(const cv::Mat &input, cv::Mat &output) {
5656

5757
// Compute MAG2 = X^2 + Y^2
5858
cv::Mat mag2;
59-
cv::addWeighted(x2, 0.5, y2, 0.5, 0, mag2);
59+
cv::addWeighted(x2, 1, y2, 1, 0, mag2);
6060

6161
// Compute MAG = √ (X^2 + Y^2)
6262
cv::Mat mag;

sobel_gpu_1_naive.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ sobel(const Filters &filters, const cv::Mat &input, cv::Mat &output) {
6969

7070
// MAG2 = X^2 + Y^2
7171
cv::cuda::GpuMat gpu_mag2;
72-
cv::cuda::addWeighted(gpu_x2, 0.5, gpu_y2, 0.5, 0, gpu_mag2);
72+
cv::cuda::addWeighted(gpu_x2, 1, gpu_y2, 1, 0, gpu_mag2);
7373

7474
// MAG = √(X^2 + Y^2)
7575
cv::cuda::GpuMat gpu_mag;

sobel_gpu_2_single_alloc.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ sobel(const Filters &filters, GpuMemories &gpu,
7777
cv::cuda::pow(gpu.y, 2, gpu.y2);
7878

7979
// MAG2 = X^2 + Y^2
80-
cv::cuda::addWeighted(gpu.x2, 0.5, gpu.y2, 0.5, 0, gpu.mag2);
80+
cv::cuda::addWeighted(gpu.x2, 1, gpu.y2, 1, 0, gpu.mag2);
8181

8282
// MAG = √(X^2 + Y^2)
8383
cv::cuda::sqrt(gpu.mag2, gpu.mag);

sobel_gpu_3_pinned_mem.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ sobel(const Filters &filters, GpuMemories &gpu,
7777
cv::cuda::pow(gpu.y, 2, gpu.y2);
7878

7979
// MAG2 = X^2 + Y^2
80-
cv::cuda::addWeighted(gpu.x2, 0.5, gpu.y2, 0.5, 0, gpu.mag2);
80+
cv::cuda::addWeighted(gpu.x2, 1, gpu.y2, 1, 0, gpu.mag2);
8181

8282
// MAG = √(X^2 + Y^2)
8383
cv::cuda::sqrt(gpu.mag2, gpu.mag);

sobel_gpu_4_shared_mem.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ sobel(const Filters &filters, GpuMemories &gpu) {
7575
cv::cuda::pow(gpu.y, 2, gpu.y2);
7676

7777
// MAG2 = X^2 + Y^2
78-
cv::cuda::addWeighted(gpu.x2, 0.5, gpu.y2, 0.5, 0, gpu.mag2);
78+
cv::cuda::addWeighted(gpu.x2, 1, gpu.y2, 1, 0, gpu.mag2);
7979

8080
// MAG = √(X^2 + Y^2)
8181
cv::cuda::sqrt(gpu.mag2, gpu.mag);

sobel_gpu_5_pinned_mem_streams.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ sobel(const Filters &filters, Streams &streams, GpuMemories &gpu,
8686
streams.y.waitForCompletion();
8787

8888
// MAG2 = X^2 + Y^2
89-
cv::cuda::addWeighted(gpu.x2, 0.5, gpu.y2, 0.5, 0, gpu.mag2, -1, streams.x);
89+
cv::cuda::addWeighted(gpu.x2, 1, gpu.y2, 1, 0, gpu.mag2, -1, streams.x);
9090

9191
// MAG = √(X^2 + Y^2)
9292
cv::cuda::sqrt(gpu.mag2, gpu.mag, streams.x);

sobel_gpu_5_shared_mem_streams.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ sobel(const Filters &filters, Streams &streams, GpuMemories &gpu) {
8484
streams.y.waitForCompletion();
8585

8686
// MAG2 = X^2 + Y^2
87-
cv::cuda::addWeighted(gpu.x2, 0.5, gpu.y2, 0.5, 0, gpu.mag2, -1, streams.x);
87+
cv::cuda::addWeighted(gpu.x2, 1, gpu.y2, 1, 0, gpu.mag2, -1, streams.x);
8888

8989
// MAG = √(X^2 + Y^2)
9090
cv::cuda::sqrt(gpu.mag2, gpu.mag, streams.x);

0 commit comments

Comments
 (0)