diff --git a/src/EvaluateField/evaluateField.cc b/src/EvaluateField/evaluateField.cc index 9b4ec5a..b0daf5f 100644 --- a/src/EvaluateField/evaluateField.cc +++ b/src/EvaluateField/evaluateField.cc @@ -132,6 +132,12 @@ int main( int argc, char *argv[] ) outputVolume(volume, args.outputPath, output_type, signed_flag, real_min, real_max, args.command); + delete theSplines; + + delete_volume(volume); + if (args.use_mask) + delete_volume(mask_volume); + return(0); } diff --git a/src/ExtractTag/extracttag.c b/src/ExtractTag/extracttag.c index d81996c..5427b17 100644 --- a/src/ExtractTag/extracttag.c +++ b/src/ExtractTag/extracttag.c @@ -1366,6 +1366,7 @@ long int gen_seed(void) res = res - x * divisor; divisor /= 10; } + return res; } diff --git a/src/SplineSmooth/fieldIO.cc b/src/SplineSmooth/fieldIO.cc index eddac37..e9ab1ff 100644 --- a/src/SplineSmooth/fieldIO.cc +++ b/src/SplineSmooth/fieldIO.cc @@ -209,16 +209,22 @@ VIO_Status inputCompactField(VIO_STR filename, Spline **splines, if( mni_skip_expected_character( file, (char) ';' ) != VIO_OK ) return( VIO_ERROR ); + delete_string(version_name); + delete_string(line); /* read next field */ status = mni_input_string( file, &line, (char) '=', (char) 0 ); if( status != VIO_OK || mni_skip_expected_character( file, (char) '=' ) != VIO_OK ) - return( status ); + { + delete_string( line ); + return( status ); + } } /* --- read the type of field */ if(!equal_strings( line, TYPE_STRING )) return(VIO_ERROR); + delete_string( line ); if( mni_input_string( file, &type_name, (char) ';', (char) 0 ) != VIO_OK ) { @@ -430,6 +436,7 @@ loadEmptyFloatVolume(const MString filename, nc_type *data_type, VIO_BOOL *signe *data_type = get_volume_nc_data_type(volume, signed_flag); delete_volume_input( &input_info); + delete_volume(volume); // open this time using float type if (start_volume_input((char *)(const char *)filename, VIO_N_DIMENSIONS, diff --git a/src/VolumeHist/minchist.cc b/src/VolumeHist/minchist.cc index cb47ee6..2f94974 100644 --- a/src/VolumeHist/minchist.cc +++ b/src/VolumeHist/minchist.cc @@ -261,7 +261,15 @@ int main( int argc, char *argv[] ) } fclose(fp); } - + + delete [] class_min; + delete [] class_max; + delete_volume(volume); + if (args.mask_flag) + delete_volume(mask_volume); + for(i = 0; i < n_histograms; i++) + delete histogram[i]; + free(histogram); return(0); } diff --git a/src/VolumeStats/volumeStats.cc b/src/VolumeStats/volumeStats.cc index ac6d954..6cdc6ea 100644 --- a/src/VolumeStats/volumeStats.cc +++ b/src/VolumeStats/volumeStats.cc @@ -438,6 +438,9 @@ main(int argc, char *argv[]) } } + if (mask) + delete_volume(mask); + if (voxels) delete voxels;