Mercurial > hg > audiodb
changeset 226:b83f0fd53a2c audiodb-debian
Merge trunk changes -r275:289 into audiodb-debian branch
(+ new debian/changelog)
| author | mas01cr |
|---|---|
| date | Wed, 05 Dec 2007 14:11:04 +0000 |
| parents | 92bad288da28 |
| children | 15b8ff55ea5b |
| files | audioDB.cpp audioDB.h debian/changelog |
| diffstat | 3 files changed, 40 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/audioDB.cpp Wed Dec 05 14:06:21 2007 +0000 +++ b/audioDB.cpp Wed Dec 05 14:11:04 2007 +0000 @@ -2006,6 +2006,22 @@ trackIndexOffset=trackOffset/dbH->dim; // numVectors offset + if (trackTable[track] * sizeof(double) * dbH->dim > data_buffer_size) { + if(data_buffer) { + free(data_buffer); + } + { + data_buffer_size = trackTable[track] * sizeof(double) * dbH->dim; + void *tmp = malloc(data_buffer_size); + if (tmp == NULL) { + error("error allocating data buffer"); + } + data_buffer = (double *) tmp; + } + } + + read(dbfid, data_buffer, trackTable[track] * sizeof(double) * dbH->dim); + if(sequenceLength<=trackTable[track]){ // test for short sequences if(verbosity>7) { @@ -2025,22 +2041,6 @@ assert(DD[j]); } - if (trackTable[track] * sizeof(double) * dbH->dim > data_buffer_size) { - if(data_buffer) { - free(data_buffer); - } - { - data_buffer_size = trackTable[track] * sizeof(double) * dbH->dim; - void *tmp = malloc(data_buffer_size); - if (tmp == NULL) { - error("error allocating data buffer"); - } - data_buffer = (double *) tmp; - } - } - - read(dbfid, data_buffer, trackTable[track] * sizeof(double) * dbH->dim); - // Dot product for(j=0; j<numVectors; j++) for(k=0; k<trackTable[track]; k++){ @@ -2500,6 +2500,22 @@ trackIndexOffset=trackOffset/dbH->dim; // numVectors offset + if (trackTable[track] * sizeof(double) * dbH->dim > data_buffer_size) { + if(data_buffer) { + free(data_buffer); + } + { + data_buffer_size = trackTable[track] * sizeof(double) * dbH->dim; + void *tmp = malloc(data_buffer_size); + if (tmp == NULL) { + error("error allocating data buffer"); + } + data_buffer = (double *) tmp; + } + } + + read(dbfid, data_buffer, trackTable[track] * sizeof(double) * dbH->dim); + if(sequenceLength<=trackTable[track]){ // test for short sequences if(verbosity>7) { @@ -2519,22 +2535,6 @@ assert(DD[j]); } - if (trackTable[track] * sizeof(double) * dbH->dim > data_buffer_size) { - if(data_buffer) { - free(data_buffer); - } - { - data_buffer_size = trackTable[track] * sizeof(double) * dbH->dim; - void *tmp = malloc(data_buffer_size); - if (tmp == NULL) { - error("error allocating data buffer"); - } - data_buffer = (double *) tmp; - } - } - - read(dbfid, data_buffer, trackTable[track] * sizeof(double) * dbH->dim); - // Dot product for(j=0; j<numVectors; j++) for(k=0; k<trackTable[track]; k++){
--- a/audioDB.h Wed Dec 05 14:06:21 2007 +0000 +++ b/audioDB.h Wed Dec 05 14:11:04 2007 +0000 @@ -59,7 +59,7 @@ //#define O2_DEFAULTDBSIZE (1000000000U) // 1GB table size //#define O2_MAXFILES (1000000) -#define O2_MAXFILES (10000U) // 10,000 files +#define O2_MAXFILES (20000U) // 10,000 files #define O2_MAXFILESTR (256U) #define O2_FILETABLESIZE (O2_MAXFILESTR) #define O2_TRACKTABLESIZE (sizeof(unsigned))
--- a/debian/changelog Wed Dec 05 14:06:21 2007 +0000 +++ b/debian/changelog Wed Dec 05 14:11:04 2007 +0000 @@ -1,3 +1,10 @@ +audiodb (1.0-19) unstable; urgency=low + + * Updated to svn version #289 + * Fixes too-small maxfiles and file position given short track bugs. + + -- Christophe Rhodes <c.rhodes@gold.ac.uk> Wed, 5 Dec 2007 14:08:36 +0000 + audiodb (1.0-18) unstable; urgency=low * Updated to svn version #274