Merge branch 'fix/awhitening'

[aubio.git] / src / utils / hist.c

diff --git a/src/utils/hist.c b/src/utils/hist.c
index ee44d74..2dcc443 100644 (file)
--- a/src/utils/hist.c
+++ b/src/utils/hist.c
@@ -38,19 +38,23 @@ struct _aubio_hist_t {
 /**
  * Object creation/deletion calls
  */
-aubio_hist_t * new_aubio_hist (smpl_t ilow, smpl_t ihig, uint_t nelems){
+aubio_hist_t * new_aubio_hist (smpl_t flow, smpl_t fhig, uint_t nelems){
   aubio_hist_t * s = AUBIO_NEW(aubio_hist_t);
-  smpl_t step = (ihig-ilow)/(smpl_t)(nelems);
+  smpl_t step = (fhig-flow)/(smpl_t)(nelems);
   smpl_t accum = step;
   uint_t i;
+  if ((sint_t)nelems <= 0) {
+    AUBIO_FREE(s);
+    return NULL;
+  }
   s->nelems = nelems;
   s->hist = new_fvec(nelems);
   s->cent = new_fvec(nelems);
 
-  /* use scale to map ilow/ihig -> 0/nelems */
-  s->scaler = new_aubio_scale(ilow,ihig,0,nelems);
+  /* use scale to map flow/fhig -> 0/nelems */
+  s->scaler = new_aubio_scale(flow,fhig,0,nelems);
   /* calculate centers now once */
-  s->cent->data[0] = ilow + 0.5 * step;
+  s->cent->data[0] = flow + 0.5 * step;
   for (i=1; i < s->nelems; i++, accum+=step )
     s->cent->data[i] = s->cent->data[0] + accum;
 
@@ -137,7 +141,7 @@ void aubio_hist_weight (aubio_hist_t *s) {
   }
 }
 
-smpl_t aubio_hist_mean (aubio_hist_t *s) {
+smpl_t aubio_hist_mean (const aubio_hist_t *s) {
   uint_t j;
   smpl_t tmp = 0.0;
   for (j=0; j < s->nelems; j++)