Skip to content

Fix pixelateLine #372

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 3 commits into
base: master
Choose a base branch
from
Open

Fix pixelateLine #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6481d52
Fix pixelateLine
ppiastucki Jan 23, 2020
c18f57b
Merge branch 'master' of https://github.com/ppiastucki/depthmapX into…
pklampros Sep 2, 2020
2177abd
Merge branch 'ppiastucki-master' of https://github.com/pklampros/dept…
pklampros Sep 12, 2021
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
12 changes: 8 additions & 4 deletions mgraph440/pixelbase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,14 @@ PixelRefVector PixelBase::pixelateLine( Line l, int scalefactor ) const
else {
// Special case: exactly diagonal step (should only require one step):
// (Should actually never happen) (Doesn't: checked with RFH)
a.x += 1;
pixel_list.push_back( PixelRef(a.x,parity * a.y) );
a.y += 1;
pixel_list.push_back( PixelRef(a.x,parity * a.y) );
if (a.x < b.x) {
a.x += 1;
pixel_list.push_back( PixelRef(a.x,parity * a.y) );
}
if (a.y < b.y) {
a.y += 1;
pixel_list.push_back( PixelRef(a.x,parity * a.y) );
}
}
}
}
Expand Down
12 changes: 8 additions & 4 deletions salalib/spacepix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,14 @@ PixelRefVector PixelBase::pixelateLine(Line l, int scalefactor) const {
} else {
// Special case: exactly diagonal step (should only require one step):
// (Should actually never happen) (Doesn't: checked with RFH)
a.x += 1;
pixel_list.push_back(PixelRef(a.x, parity * a.y));
a.y += 1;
pixel_list.push_back(PixelRef(a.x, parity * a.y));
if (a.x < b.x) {
a.x += 1;
pixel_list.push_back(PixelRef(a.x, parity * a.y));
}
if (a.y < b.y) {
a.y += 1;
pixel_list.push_back(PixelRef(a.x, parity * a.y));
}
}
}
}
Expand Down