Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Renomenado os membros da struct em todos os lugares...
  • Loading branch information
brunobuss committed Jul 6, 2011
1 parent 919b375 commit 385b107
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions src/histograma.cpp
Expand Up @@ -119,13 +119,13 @@ void calcHistogram(Mat &imagem, vector<acmPoint> &pontos) {

for(it = pontos.begin(); it != pontos.end(); ++it) {
calcHistogramScore(imagem, *it);
if(maior_score < it->vhistograma || maior_score == -1) maior_score = it->vhistograma;
if(maior_score < it->scoreHistogram || maior_score == -1) maior_score = it->scoreHistogram;
}

//Normaliza:
for(it = pontos.begin(); it != pontos.end(); ++it) {
it->vhistograma = 1 - (it->vhistograma/maior_score);
if(it->vhistograma < 0.0) it->vhistograma = 0.0;
it->scoreHistogram = 1 - (it->scoreHistogram/maior_score);
if(it->scoreHistogram < 0.0) it->scoreHistogram = 0.0;
it->calculaScore();
}

Expand Down
2 changes: 1 addition & 1 deletion src/hough.cpp
Expand Up @@ -109,7 +109,7 @@ void houghC1(Mat &gray, int minr, int maxr , int cannyt, vector<acmPoint> &outpu
vnorm = calcVNorm(acm.m[rad],j,i,acm.ncol,acm.nrow,rad + minr);

if(vnorm > thVNorm){
if(outputMinHeap.size() < thNCirc || outputMinHeap.begin()->vnorm < vnorm){
if(outputMinHeap.size() < thNCirc || outputMinHeap.begin()->scoreCircular < vnorm){
// add acmPoint
outputMinHeap.insert(acmPoint(rad + minr , j, i, vnorm));

Expand Down

0 comments on commit 385b107

Please sign in to comment.