Skip to content

Commit bb8d424

Browse files
committed
Merge pull request #568 from berak:hdf5_fix_delete
2 parents fb55f29 + d2dda7f commit bb8d424

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

modules/hdf/src/hdf5.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ vector<int> HDF5Impl::dsgetsize( String dslabel, int dims_flag ) const
367367
H5Dclose( dsdata );
368368
H5Sclose( fspace );
369369

370-
delete dims;
370+
delete [] dims;
371371

372372
return SizeVect;
373373
}
@@ -542,9 +542,9 @@ void HDF5Impl::dscreate( const int n_dims, const int* sizes, const int type,
542542
if ( channs > 1 )
543543
H5Tclose( dstype );
544544

545-
delete chunks;
546-
delete dsdims;
547-
delete maxdim;
545+
delete [] chunks;
546+
delete [] dsdims;
547+
delete [] maxdim;
548548

549549
H5Pclose( dsdcpl );
550550
H5Sclose( dspace );
@@ -659,9 +659,9 @@ void HDF5Impl::dsread( OutputArray Array, String dslabel,
659659
Mat matrix = Array.getMat();
660660
H5Dread( dsdata, dstype, dspace, fspace, H5P_DEFAULT, matrix.data );
661661

662-
delete dsdims;
663-
delete mxdims;
664-
delete foffset;
662+
delete [] dsdims;
663+
delete [] mxdims;
664+
delete [] foffset;
665665

666666
H5Tclose( dstype );
667667
H5Sclose( dspace );
@@ -759,9 +759,9 @@ void HDF5Impl::dswrite( InputArray Array, String dslabel,
759759
if ( matrix.channels() > 1 )
760760
H5Tclose( dstype );
761761

762-
delete dsizes;
763-
delete dsdims;
764-
delete offset;
762+
delete [] dsizes;
763+
delete [] dsdims;
764+
delete [] offset;
765765

766766
H5Sclose( dspace );
767767
H5Sclose( fspace );
@@ -894,10 +894,10 @@ void HDF5Impl::dsinsert( InputArray Array, String dslabel,
894894
if ( matrix.channels() > 1 )
895895
H5Tclose( dstype );
896896

897-
delete dsdims;
898-
delete offset;
899-
delete fsdims;
900-
delete nwdims;
897+
delete [] dsdims;
898+
delete [] offset;
899+
delete [] fsdims;
900+
delete [] nwdims;
901901

902902
H5Sclose( dspace );
903903
H5Sclose( fspace );
@@ -1122,7 +1122,7 @@ void HDF5Impl::kpinsert( const vector<KeyPoint> keypoints, String kplabel,
11221122
// write into dataset
11231123
H5Dwrite( dsdata, mmtype, dspace, fspace, H5P_DEFAULT, &keypoints[0] );
11241124

1125-
delete fsdims;
1125+
delete [] fsdims;
11261126

11271127
H5Tclose( mmtype );
11281128
H5Sclose( dspace );

0 commit comments

Comments
 (0)