diff options
| author | N.N. <sevyves@users.sourceforge.net> | 2009-08-30 20:38:26 +0000 |
|---|---|---|
| committer | N.N. <sevyves@users.sourceforge.net> | 2009-08-30 20:38:26 +0000 |
| commit | 98f00d5f6e0db2e39779e0ab2e05ce3b78209fa0 (patch) | |
| tree | 985449502b34c4dfa9a9e19f0309f722fe5d2918 /pix_opencv_hist_compare.cc | |
| parent | f29ff03b88ab33d418c575a28447d65167d054bb (diff) | |
added adaptive threshold + fix help patches ( frame 15 )
svn path=/trunk/externals/pix_opencv/; revision=12148
Diffstat (limited to 'pix_opencv_hist_compare.cc')
| -rwxr-xr-x | pix_opencv_hist_compare.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pix_opencv_hist_compare.cc b/pix_opencv_hist_compare.cc index 865b090..ccdb50c 100755 --- a/pix_opencv_hist_compare.cc +++ b/pix_opencv_hist_compare.cc @@ -194,14 +194,14 @@ void pix_opencv_hist_compare :: processRGBAImage(imageStruct &image) cvCalcHist( planes, hist, 0, 0 ); //Compute histogram cvNormalizeHist( hist, 1.0 ); //Normalize it - double tato[MAX_HISTOGRAMS_TO_COMPARE]; - t_atom datalist[MAX_HISTOGRAMS_TO_COMPARE]; + double tato[nbsaved]; + t_atom datalist[nbsaved]; int nearest = -1; double max = 0; int n; if ( nbsaved > 0 ) - for (n=0; n<MAX_HISTOGRAMS_TO_COMPARE; n++) { + for (n=0; n<nbsaved; n++) { tato[n] = cvCompareHist(hist, saved_hist[n], CV_COMP_INTERSECT); SETFLOAT(&datalist[n], tato[n]); if (tato[n]>max) { @@ -212,7 +212,7 @@ void pix_opencv_hist_compare :: processRGBAImage(imageStruct &image) if ( nbsaved > 0 ) { outlet_float(m_dataout, (float)nearest); - outlet_list( m_measureout, 0, MAX_HISTOGRAMS_TO_COMPARE , datalist ); + outlet_list( m_measureout, 0, nbsaved , datalist ); } else outlet_float(m_dataout, -1.0); @@ -326,14 +326,14 @@ void pix_opencv_hist_compare :: processRGBImage(imageStruct &image) cvCalcHist( planes, hist, 0, 0 ); //Compute histogram cvNormalizeHist( hist, 1.0 ); //Normalize it - double tato[MAX_HISTOGRAMS_TO_COMPARE]; - t_atom datalist[MAX_HISTOGRAMS_TO_COMPARE]; + double tato[nbsaved]; + t_atom datalist[nbsaved]; int nearest = -1; double max = 0; int n; if ( nbsaved > 0 ) - for (n=0; n<MAX_HISTOGRAMS_TO_COMPARE; n++) { + for (n=0; n<nbsaved; n++) { tato[n] = cvCompareHist(hist, saved_hist[n], CV_COMP_INTERSECT); SETFLOAT(&datalist[n], tato[n]); if (tato[n]>max) { @@ -344,7 +344,7 @@ void pix_opencv_hist_compare :: processRGBImage(imageStruct &image) if ( nbsaved > 0 ) { outlet_float(m_dataout, (float)nearest); - outlet_list( m_measureout, 0, MAX_HISTOGRAMS_TO_COMPARE , datalist ); + outlet_list( m_measureout, 0, nbsaved , datalist ); } else outlet_float(m_dataout, -1.0); @@ -464,14 +464,14 @@ void pix_opencv_hist_compare :: processGrayImage(imageStruct &image) cvCalcHist( planes, hist, 0, 0 ); //Compute histogram cvNormalizeHist( hist, 1.0 ); //Normalize it - double tato[MAX_HISTOGRAMS_TO_COMPARE]; - t_atom datalist[MAX_HISTOGRAMS_TO_COMPARE]; + double tato[nbsaved]; + t_atom datalist[nbsaved]; int nearest = -1; double max = 0; int n; if ( nbsaved > 0 ) - for (n=0; n<MAX_HISTOGRAMS_TO_COMPARE; n++) { + for (n=0; n<nbsaved; n++) { tato[n] = cvCompareHist(hist, saved_hist[n], CV_COMP_INTERSECT); SETFLOAT(&datalist[n], tato[n]); if (tato[n]>max) { @@ -482,7 +482,7 @@ void pix_opencv_hist_compare :: processGrayImage(imageStruct &image) if ( nbsaved > 0 ) { outlet_float(m_dataout, (float)nearest); - outlet_list( m_measureout, 0, MAX_HISTOGRAMS_TO_COMPARE , datalist ); + outlet_list( m_measureout, 0, nbsaved , datalist ); } else outlet_float(m_dataout, -1.0); |