Skip to content

fix typo in box filter #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix typo in box filter #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24bd894
fix cpu box filter typo
hotstone1993 Feb 18, 2023
daaab7d
fix cuda box filter typo
hotstone1993 Feb 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Samples/2_Concepts_and_Techniques/boxFilter/boxFilter_cpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void hboxfilter_y(float *id, float *od, int w, int h, int r) {

for (int x = 0; x < w; x++) {
float t;
// do left edge
// do top edge
t = id[x] * r;

for (int y = 0; y < r + 1; y++) {
Expand All @@ -98,7 +98,7 @@ void hboxfilter_y(float *id, float *od, int w, int h, int r) {
od[c] = t * scale;
}

// do right edge
// do bottom edge
for (int y = h - r; y < h; y++) {
int c = y * w + x;
t += id[(h - 1) * w + x];
Expand Down
8 changes: 4 additions & 4 deletions Samples/2_Concepts_and_Techniques/boxFilter/boxFilter_kernel.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ __device__ void d_boxfilter_y(float *id, float *od, int w, int h, int r) {
float scale = 1.0f / (float)((r << 1) + 1);

float t;
// do left edge
// do top edge
t = id[0] * r;

for (int y = 0; y < (r + 1); y++) {
Expand All @@ -151,7 +151,7 @@ __device__ void d_boxfilter_y(float *id, float *od, int w, int h, int r) {
od[y * w] = t * scale;
}

// do right edge
// do bottom edge
for (int y = h - r; y < h; y++) {
t += id[(h - 1) * w];
t -= id[((y - r) * w) - w];
Expand Down Expand Up @@ -271,7 +271,7 @@ __global__ void d_boxfilter_rgba_y(unsigned int *id, unsigned int *od, int w,
float scale = 1.0f / (float)((r << 1) + 1);

float4 t;
// do left edge
// do top edge
t = rgbaIntToFloat(id[0]) * r;

for (int y = 0; y < (r + 1); y++) {
Expand All @@ -293,7 +293,7 @@ __global__ void d_boxfilter_rgba_y(unsigned int *id, unsigned int *od, int w,
od[y * w] = rgbaFloatToInt(t * scale);
}

// do right edge
// do bottom edge
for (int y = h - r; y < h; y++) {
t += rgbaIntToFloat(id[(h - 1) * w]);
t -= rgbaIntToFloat(id[((y - r) * w) - w]);
Expand Down