From d3701f3eda221f3553c2adf51643c5b6a6caf176 Mon Sep 17 00:00:00 2001 From: cxgeorge <> Date: Mon, 12 Mar 2001 01:08:29 +0000 Subject: [PATCH] delete => delete [] --- panda/src/dxgsg/dxGraphicsStateGuardian.cxx | 4 ++-- panda/src/dxgsg/dxTextureContext.cxx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/panda/src/dxgsg/dxGraphicsStateGuardian.cxx b/panda/src/dxgsg/dxGraphicsStateGuardian.cxx index 8f3d5492c9..5217de74d5 100644 --- a/panda/src/dxgsg/dxGraphicsStateGuardian.cxx +++ b/panda/src/dxgsg/dxGraphicsStateGuardian.cxx @@ -1651,7 +1651,7 @@ draw_sprite(const GeomSprite *geom) { _d3dDevice->DrawIndexedPrimitive(D3DPT_TRIANGLELIST, p_flags, _pFvfBufBasePtr, 4*nprims, _index_buf,QUADVERTLISTLEN*nprims,NULL); _pCurFvfBufPtr = NULL; - delete SpriteArray; + delete [] SpriteArray; // restore the matrices _d3dDevice->SetTransform(D3DTRANSFORMSTATE_WORLD, &OldD3DWorldMatrix); @@ -5032,7 +5032,7 @@ free_pointers() { } if (_pTexPixFmts != NULL) { - delete _pTexPixFmts; + delete [] _pTexPixFmts; _pTexPixFmts = NULL; } } diff --git a/panda/src/dxgsg/dxTextureContext.cxx b/panda/src/dxgsg/dxTextureContext.cxx index 30fcd3575a..db7350a40a 100644 --- a/panda/src/dxgsg/dxTextureContext.cxx +++ b/panda/src/dxgsg/dxTextureContext.cxx @@ -1628,14 +1628,14 @@ FillDDSurfTexturePixels(void) { hr = pCurDDSurf->GetAttachedSurface(&ddsCaps, &pMipLevel_DDSurf); if(FAILED(hr)) { dxgsg_cat.error() << "CreateTexture failed creating mipmaps: GetAttachedSurf hr = " << ConvD3DErrorToString(hr) << "\n"; - delete pMipMapPixBufSpace; + delete [] pMipMapPixBufSpace; pCurDDSurf->Release(); return hr; } hr = ConvertPixBuftoDDSurf((ConversionType)_PixBufConversionType,pLastMipLevelStart,pMipLevel_DDSurf); if(FAILED(hr)) { - delete pMipMapPixBufSpace; + delete [] pMipMapPixBufSpace; pCurDDSurf->Release(); return hr; } @@ -1648,7 +1648,7 @@ FillDDSurfTexturePixels(void) { // double elapsed_time = (double)(finish1 - start1) / CLOCKS_PER_SEC; // cerr << "mipmap gen takes " << elapsed_time << " secs for this texture\n"; - delete pMipMapPixBufSpace; + delete [] pMipMapPixBufSpace; pCurDDSurf->Release(); #ifdef _DEBUG