[Plib-cvs] CVS: plib/src/ssg ssg.h,1.131,1.132 ssgBase.cxx,1.18,1.19 ssgLoad.cxx,1.21,1.22 ssgLoad3d
Brought to you by:
sjbaker
Menu
▾
▴
[Plib-cvs] CVS: plib/src/ssg ssg.h,1.131,1.132 ssgBase.cxx,1.18,1.19 ssgLoad.cxx,1.21,1.22 ssgLoad3ds.cxx,1.31,1.32 ssgLoadAC.cxx,1.23,1.24 ssgLoadASE.cxx,1.41,1.42 ssgLoadATG.cxx,1.14,1.15 ssgLoadBMP.cxx,1.8,1.9 ssgLoadSGI.cxx,1.12,1.13 ssgLoadTexture.cxx,1.12,1.13 ssgOptimiser.cxx,1.20,1.21 ssgSaveAC.cxx,1.16,1.17 ssgSimpleList.cxx,1.10,1.11 ssgTexture.cxx,1.20,1.21
|
From: Sebastian U. <ud...@us...> - 2002-03-23 15:06:49
|
Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv29048/src/ssg
Modified Files:
ssg.h ssgBase.cxx ssgLoad.cxx ssgLoad3ds.cxx ssgLoadAC.cxx
ssgLoadASE.cxx ssgLoadATG.cxx ssgLoadBMP.cxx ssgLoadSGI.cxx
ssgLoadTexture.cxx ssgOptimiser.cxx ssgSaveAC.cxx
ssgSimpleList.cxx ssgTexture.cxx
Log Message:
Replaced some instances of "delete" with "delete []"
Index: ssg.h
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssg.h,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- ssg.h 1 Mar 2002 17:53:19 -0000 1.131
+++ ssg.h 23 Mar 2002 15:06:44 -0000 1.132
@@ -711,7 +711,7 @@
void setFilename(const char *fname)
{
- delete filename ;
+ delete [] filename ;
if ( fname == NULL )
filename = NULL ;
@@ -2518,19 +2518,19 @@
{
if (model_dir)
{
- delete model_dir;
+ delete [] model_dir;
model_dir = 0;
}
if (texture_dir)
{
- delete texture_dir;
+ delete [] texture_dir;
texture_dir = 0;
}
}
- const char* getModelDir ( void ) { return model_dir ; }
- const char* getTextureDir ( void ) { return texture_dir ; }
+ const char* getModelDir ( void ) const { return model_dir ; }
+ const char* getTextureDir ( void ) const { return texture_dir ; }
void setModelDir ( const char *s ) ;
void setTextureDir ( const char *s ) ;
Index: ssgBase.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgBase.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ssgBase.cxx 7 Nov 2001 23:51:09 -0000 1.18
+++ ssgBase.cxx 23 Mar 2002 15:06:45 -0000 1.19
@@ -77,7 +77,7 @@
deadBeefCheck () ;
assert ( refc == 0 ) ;
- delete name ;
+ delete [] name ;
/*
Set the type of deleted nodes to 0xDeadBeef so we'll
@@ -90,7 +90,7 @@
void ssgBase::setName ( const char *nm )
{
- delete name ;
+ delete [] name ;
if ( nm == NULL )
name = NULL ;
@@ -126,7 +126,7 @@
int ssgBase::load ( FILE *fd )
{
- delete name ;
+ delete [] name ;
name = NULL ;
_ssgReadString ( fd, &name ) ;
return ! _ssgReadError () ;
Index: ssgLoad.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoad.cxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ssgLoad.cxx 7 Nov 2001 23:51:09 -0000 1.21
+++ ssgLoad.cxx 23 Mar 2002 15:06:45 -0000 1.22
@@ -136,14 +136,14 @@
void ssgLoaderOptions::setModelDir ( const char *s )
{
- delete model_dir ;
+ delete [] model_dir ;
model_dir = new char [ strlen ( s ) + 1 ] ;
strcpy ( model_dir, s ) ;
}
void ssgLoaderOptions::setTextureDir ( const char *s )
{
- delete texture_dir ;
+ delete [] texture_dir ;
texture_dir = new char [ strlen ( s ) + 1 ] ;
strcpy ( texture_dir, s ) ;
}
Index: ssgLoad3ds.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoad3ds.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ssgLoad3ds.cxx 18 Dec 2001 16:35:59 -0000 1.31
+++ ssgLoad3ds.cxx 23 Mar 2002 15:06:45 -0000 1.32
@@ -989,7 +989,7 @@
add_leaf(material, listed_faces, face_indices);
- delete face_indices;
+ delete [] face_indices;
return PARSE_OK;
}
@@ -1210,10 +1210,10 @@
// clean up the materials array
for (i = 0; i < num_materials; i++) {
if (materials[i] -> name != NULL) {
- delete materials[i] -> name;
+ delete [] materials[i] -> name;
}
if (materials[i] -> tex_name != NULL) {
- delete materials[i] -> tex_name;
+ delete [] materials[i] -> tex_name;
}
delete materials[i];
Index: ssgLoadAC.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadAC.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ssgLoadAC.cxx 24 Jan 2002 16:55:47 -0000 1.23
+++ ssgLoadAC.cxx 23 Mar 2002 15:06:45 -0000 1.24
@@ -291,7 +291,7 @@
int obj_type = search ( obj_type_tags, s ) ;
*/
- delete current_tfname ;
+ delete [] current_tfname ;
current_tfname = NULL ;
char buffer [ 1024 ] ;
@@ -369,7 +369,7 @@
{
skip_quotes ( &s ) ;
- delete current_tfname ;
+ delete [] current_tfname ;
if ( s == NULL || s[0] == '\0' )
current_tfname = NULL ;
@@ -671,7 +671,7 @@
search ( top_tags, s ) ;
}
- delete current_tfname ;
+ delete [] current_tfname ;
current_tfname = NULL ;
delete [] vtab ;
fclose ( loader_fd ) ;
Index: ssgLoadASE.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadASE.cxx,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- ssgLoadASE.cxx 18 Dec 2001 16:35:59 -0000 1.41
+++ ssgLoadASE.cxx 23 Mar 2002 15:06:45 -0000 1.42
@@ -1635,8 +1635,8 @@
u32 i ;
for ( i = 0 ; i < num_materials ; i++ )
{
- delete materials[ i ] -> name ;
- delete materials[ i ] -> tfname ;
+ delete [] materials[ i ] -> name ;
+ delete [] materials[ i ] -> tfname ;
delete materials[ i ] ;
}
delete[] materials ;
Index: ssgLoadATG.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadATG.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ssgLoadATG.cxx 16 Dec 2001 18:24:43 -0000 1.14
+++ ssgLoadATG.cxx 23 Mar 2002 15:06:45 -0000 1.15
@@ -154,7 +154,7 @@
if ( 0 != usemtl[0] )
{
if ( _current_usemtl != NULL )
- delete _current_usemtl ;
+ delete [] _current_usemtl ;
_current_usemtl = new char [ strlen ( usemtl ) + 1 ] ;
strcpy ( _current_usemtl, usemtl ) ;
}
@@ -297,7 +297,7 @@
{
// bring _last_usemtl up to date
if ( _last_usemtl != NULL )
- delete _last_usemtl;
+ delete [] _last_usemtl;
_last_usemtl= new char [ strlen ( _current_usemtl ) + 1 ] ;
strcpy ( _last_usemtl, _current_usemtl ) ;
Index: ssgLoadBMP.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadBMP.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ssgLoadBMP.cxx 7 Nov 2001 23:51:10 -0000 1.8
+++ ssgLoadBMP.cxx 23 Mar 2002 15:06:45 -0000 1.9
@@ -266,7 +266,7 @@
default : break ;
}
- delete data ;
+ delete [] data ;
}
else
if ( bpp == 24 )
Index: ssgLoadSGI.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadSGI.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ssgLoadSGI.cxx 7 Nov 2001 23:51:10 -0000 1.12
+++ ssgLoadSGI.cxx 23 Mar 2002 15:06:45 -0000 1.13
@@ -337,10 +337,10 @@
fclose ( image_fd ) ;
image_fd = NULL ;
- delete rbuf ;
- delete gbuf ;
- delete bbuf ;
- delete abuf ;
+ delete [] rbuf ;
+ delete [] gbuf ;
+ delete [] bbuf ;
+ delete [] abuf ;
if ( info != NULL )
{
Index: ssgLoadTexture.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadTexture.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ssgLoadTexture.cxx 7 Nov 2001 23:51:10 -0000 1.12
+++ ssgLoadTexture.cxx 23 Mar 2002 15:06:45 -0000 1.13
@@ -125,7 +125,7 @@
if ( ww == 0 )
{
- delete texels [ 0 ] ;
+ delete [] texels [ 0 ] ;
xsize >>= 1 ;
ysize >>= 1 ;
@@ -159,7 +159,7 @@
GL_RGBA,
GL_UNSIGNED_BYTE, (GLvoid *) texels[i] ) ;
map_level++ ;
- delete texels [ i ] ;
+ delete [] texels [ i ] ;
}
return true ;
Index: ssgOptimiser.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgOptimiser.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ssgOptimiser.cxx 7 Nov 2001 23:51:10 -0000 1.20
+++ ssgOptimiser.cxx 23 Mar 2002 15:06:45 -0000 1.21
@@ -115,10 +115,10 @@
~OptVertexList ()
{
for ( int i = 0 ; i < vnum ; i++ )
- delete vlist [ i ] ;
+ delete [] vlist [ i ] ;
- delete vlist ;
- delete tlist ;
+ delete [] vlist ;
+ delete [] tlist ;
if (state != NULL) ssgDeRefDelete(state); //~T.G.
}
@@ -750,7 +750,7 @@
new_colours -> add ( list.vlist[new_vlist[m]]->colour ) ;
}
- delete new_vlist ;
+ delete [] new_vlist ;
ssgVtxTable *new_vtable = new ssgVtxTable ( GL_TRIANGLE_STRIP,
new_coords, new_normals, new_texcoords, new_colours ) ;
@@ -761,8 +761,8 @@
}
}
- delete slist ;
- delete cflist ;
+ delete [] slist ;
+ delete [] cflist ;
}
Index: ssgSaveAC.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgSaveAC.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ssgSaveAC.cxx 7 Nov 2001 23:51:10 -0000 1.16
+++ ssgSaveAC.cxx 23 Mar 2002 15:06:45 -0000 1.17
@@ -135,8 +135,8 @@
fprintf ( save_fd, "kids 0\n" ) ;
- delete[] vlist ;
- delete tlist ;
+ delete [] vlist ;
+ delete [] tlist ;
return TRUE ;
}
Index: ssgSimpleList.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgSimpleList.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ssgSimpleList.cxx 7 Nov 2001 23:51:10 -0000 1.10
+++ ssgSimpleList.cxx 23 Mar 2002 15:06:45 -0000 1.11
@@ -28,7 +28,7 @@
{
ssgBase::copy_from ( src, clone_flags ) ;
- delete list ;
+ delete [] list ;
size_of = src -> getSizeOf () ;
total = src -> getNum () ;
limit = total ;
@@ -149,7 +149,7 @@
int ssgSimpleList::load ( FILE *fd )
{
- delete list ;
+ delete [] list ;
_ssgReadUInt ( fd, &size_of ) ;
_ssgReadUInt ( fd, &total ) ;
limit = total ;
Index: ssgTexture.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgTexture.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ssgTexture.cxx 7 Nov 2001 23:51:10 -0000 1.20
+++ ssgTexture.cxx 23 Mar 2002 15:06:45 -0000 1.21
@@ -203,7 +203,7 @@
int ssgTexture::load ( FILE *fd )
{
- delete filename ;
+ delete [] filename ;
_ssgReadString ( fd, & filename ) ;
_ssgReadInt ( fd, & wrapu ) ;
|
