[Wavelet-commit] Wavelet ColorImage.cc,1.7,1.8 ColorVideo.cc,1.13,1.14 INSTALL.Watcomc,1.2,1.3 Image.cc,1.22,1.23

[Herbert M. D. <he...@us...>]

Update of /cvsroot/wavelet/Wavelet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22422

Modified Files:
	ColorImage.cc ColorVideo.cc INSTALL.Watcomc Image.cc 
Log Message:
Use ColorVideo::destroy() in ~ColorVideo(), fixed a minor
memory leak, some syntactic stuff.


Index: ColorImage.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/ColorImage.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ColorImage.cc	10 Aug 2005 09:35:23 -0000	1.7
--- ColorImage.cc	15 Aug 2005 10:18:08 -0000	1.8
***************
*** 206,210 ****
    PixmapWriter *pw = NULL;
    bool ispixel = true;
!   ImageArray <coeff> *coeffs = coeffs = NEW (ImageArray <coeff> (0, 0));
    
    switch (ftype)
--- 206,210 ----
    PixmapWriter *pw = NULL;
    bool ispixel = true;
!   ImageArray <coeff> *coeffs = NEW (ImageArray <coeff> (0, 0));
    
    switch (ftype)

Index: INSTALL.Watcomc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/INSTALL.Watcomc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** INSTALL.Watcomc	29 Mar 2005 11:36:34 -0000	1.2
--- INSTALL.Watcomc	15 Aug 2005 10:18:08 -0000	1.3
***************
*** 16,19 ****
--- 16,23 ----
  wmake.exe etc.) needs to be set.
  
+ The software has been tested with OpenWatcom 1.1 an 1.2 and
+ a patched STLPort 4.5.3 (the patch is part of this package's 
+ source distribution). Builds with OW 1.3 have so far failed.
+ 
  
  Building Procedure

Index: ColorVideo.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/ColorVideo.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ColorVideo.cc	15 Aug 2005 08:46:06 -0000	1.13
--- ColorVideo.cc	15 Aug 2005 10:18:08 -0000	1.14
***************
*** 67,76 ****
  ColorVideo::~ColorVideo (void)
  {
!   for (int i = 0; i < m_colors; i++)
!     {
!       DELETE(m_arrays[i]);
!     }
!   
!   DELETE(m_arrays);
  }
  
--- 67,71 ----
  ColorVideo::~ColorVideo (void)
  {
!   destroy ();
  }
  
***************
*** 250,254 ****
  {
    VideoReader *vr = NULL;
-   ImageArray <coeff> *coeffs = coeffs = NEW (ImageArray <coeff> (0, 0));
    int frames = to - from;
  
--- 245,248 ----

Index: Image.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/Image.cc,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Image.cc	10 Aug 2005 09:35:23 -0000	1.22
--- Image.cc	15 Aug 2005 10:18:08 -0000	1.23
***************
*** 255,259 ****
    coeff normCoeff = (coeff)norm;
  
!   coeff * replaceTable = replaceTable = NEW (coeff[norm + 1]);
  
    for (int i = 0; i <= norm; i++)
--- 255,259 ----
    coeff normCoeff = (coeff)norm;
  
!   coeff * replaceTable = NEW (coeff[norm + 1]);
  
    for (int i = 0; i <= norm; i++)