# HG changeset patch # User mas01mc # Date 1290764128 0 # Node ID ddf08008d45b82f6f0037c2011e3705db564caa9 # Parent 8e796b7b7a47b20f8ba05c3551e81cf86203e580 A mostly cosmetic fix to query.cpp qpointers allocation, the byte-count vector_size was used a bit too liberally. diff -r 8e796b7b7a47 -r ddf08008d45b audioDB-internals.h --- 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 #include #include +#include #if defined(WIN32) #include #endif diff -r 8e796b7b7a47 -r ddf08008d45b query.cpp --- 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);