comparison query.cpp @ 454:f3b0ddc1ead0 api-inversion

No more indata The mmap()ed version of the input data was never used, so zap it everywhere.
author mas01cr
date Wed, 24 Dec 2008 10:57:18 +0000
parents 16a903968d18
children 93ce12fe2f76
comparison
equal deleted inserted replaced
453:16a903968d18 454:f3b0ddc1ead0
656 // Open and check dimensions of feature file 656 // Open and check dimensions of feature file
657 strncpy(prefixedString, featureFileNameTable+pp.trackID*O2_FILETABLE_ENTRY_SIZE, O2_MAXFILESTR); 657 strncpy(prefixedString, featureFileNameTable+pp.trackID*O2_FILETABLE_ENTRY_SIZE, O2_MAXFILESTR);
658 prefix_name((char ** const) &prefixedString, adb_feature_root); 658 prefix_name((char ** const) &prefixedString, adb_feature_root);
659 if (prefixedString!=tmpStr) 659 if (prefixedString!=tmpStr)
660 delete[] tmpStr; 660 delete[] tmpStr;
661 initInputFile(prefixedString, false); // nommap, file pointer at correct position 661 initInputFile(prefixedString);
662 // Load the feature vector data for current track into data_buffer 662 // Load the feature vector data for current track into data_buffer
663 if(audiodb_read_data(adb, infid, pp.trackID, &data_buffer, &data_buffer_size)) 663 if(audiodb_read_data(adb, infid, pp.trackID, &data_buffer, &data_buffer_size))
664 error("failed to read data"); 664 error("failed to read data");
665 // Load power and calculate power and l2norm sequence sums 665 // Load power and calculate power and l2norm sequence sums
666 init_track_aux_data(pp.trackID, data_buffer, &dbpointers.l2norm_data, &dbpointers.l2norm, &dbpointers.power_data, &dbpointers.power); 666 init_track_aux_data(pp.trackID, data_buffer, &dbpointers.l2norm_data, &dbpointers.l2norm, &dbpointers.power_data, &dbpointers.power);