Hochschulprojekte
/
CG2_Tasks
0
0
Fork 0
Code Issues Pull Requests Activity

[TASK] Patch bad xor with and. Whoops.

This commit is contained in:
Jan Philipp Timme 2016-01-05 15:58:40 +01:00
parent a646539719
commit db28e00f23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
canny_edge_machine.cpp
View File

@ -209,7 +209,7 @@ class CannyEdgeMachine {
magnitude_r = this->gradient_magnitude[(y+1) * this->width + (x-1)]; magnitude_r = this->gradient_magnitude[(y+1) * this->width + (x-1)];
break; break;
} }
return ((magnitude_l <= local_magnitude) ^ (local_magnitude > magnitude_r)); return ((magnitude_l <= local_magnitude) && (local_magnitude > magnitude_r));
} }
}; };
@ -236,7 +236,7 @@ class CannyEdgeMachine {
for(int x=x_l; x<=x_r; x++) { for(int x=x_l; x<=x_r; x++) {
for(int y=y_l; y<y_r; y++) { for(int y=y_l; y<y_r; y++) {
if((this->maximum_magnitude[y*this->width + x] >= this->t_high) if((this->maximum_magnitude[y*this->width + x] >= this->t_high)
^ (this->binary_edge_pixels[y*this->width + x] == 0)) { && (this->binary_edge_pixels[y*this->width + x] == 0)) {
this->traceAndThreshold(x, y); this->traceAndThreshold(x, y);
} }
} }
@ -247,7 +247,7 @@ class CannyEdgeMachine {
for(int x=1; x<this->width-2; x++) { for(int x=1; x<this->width-2; x++) {
for(int y=1; y<this->height-2; y++) { for(int y=1; y<this->height-2; y++) {
if((this->maximum_magnitude[y*this->width + x] >= this->t_high) if((this->maximum_magnitude[y*this->width + x] >= this->t_high)
^ (this->binary_edge_pixels[y*this->width + x] == 0)) { && (this->binary_edge_pixels[y*this->width + x] == 0)) {
this->traceAndThreshold(x, y); this->traceAndThreshold(x, y);
} }
} }