# HG changeset patch # User mas01mc # Date 1290759308 0 # Node ID be4fa5716df59c5e44110698d3ca3b64bdfeb30b # Parent ee612b7bd9225a15bab626b32c83cb22d210c940 Minor, somewhat cosmetic but currently wasteful, memory arithmetic in qpointers allocation diff -r ee612b7bd922 -r be4fa5716df5 query.cpp --- a/query.cpp Fri Nov 26 08:05:48 2010 +0000 +++ b/query.cpp Fri Nov 26 08:15:08 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);