Mercurial > hg > audiodb

changeset 762:ddf08008d45b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
A mostly cosmetic fix to query.cpp qpointers allocation, the byte-count vector_size was used a bit too liberally.
author mas01mc
date Fri, 26 Nov 2010 09:35:28 +0000
parents 8e796b7b7a47
children 77f7bc99dfd6
files audioDB-internals.h query.cpp
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/audioDB-internals.h	Fri Nov 26 09:27:40 2010 +0000
+++ b/audioDB-internals.h	Fri Nov 26 09:35:28 2010 +0000
@@ -18,6 +18,7 @@
 #include <math.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdio.h>
 #if defined(WIN32)
 #include <windows.h>
 #endif
--- a/query.cpp	Fri Nov 26 09:27:40 2010 +0000
+++ b/query.cpp	Fri Nov 26 09:35:28 2010 +0000
@@ -248,16 +248,16 @@
   qpointers->nvectors = nvectors;
 
   size_t vector_size = nvectors * sizeof(double) * d->dim;
-  *vector_data = new double[vector_size];
+  *vector_data = new double[vector_size / sizeof(double) ];
   memcpy(*vector_data, d->data, vector_size);
 
-  qpointers->l2norm_data = new double[vector_size / d->dim];
+  qpointers->l2norm_data = new double[vector_size / (sizeof(double)*d->dim)];
   audiodb_l2norm_buffer(*vector_data, d->dim, nvectors, qpointers->l2norm_data);
   audiodb_sequence_sum(qpointers->l2norm_data, nvectors, sequence_length);
   audiodb_sequence_sqrt(qpointers->l2norm_data, nvectors, sequence_length);
 
   if(d->power) {
-    qpointers->power_data = new double[vector_size / d->dim];
+    qpointers->power_data = new double[vector_size / (sizeof(double)*d->dim)];
     memcpy(qpointers->power_data, d->power, vector_size / d->dim);
     audiodb_sequence_sum(qpointers->power_data, nvectors, sequence_length);
     audiodb_sequence_average(qpointers->power_data, nvectors, sequence_length);