[Wavelet-commit] Wavelet/WImage GreymapReader.hh,1.3,1.4 GreymapWriter.hh,1.3,1.4 PfcReader.hh,1.3,1.4 PfcWriter.hh,1.3,1.4 PfgReader.hh,1.3,1.4 PfgWriter.hh,1.3,1.4 PgmReader.hh,1.3,1.4 PgmWriter.hh,1.3,1.4 PixmapReader.hh,1.3,1.4 PixmapWriter.hh,1.3,1.4 PpmReader.hh,1.3,1.4 PpmWriter.hh,1.3,1.4 RawReader.hh,1.3,1.4 RawWriter.hh,1.3,1.4 VidReader.hh,1.7,1.8 VidWriter.hh,1.5,1.6 VideoReader.hh,1.5,1.6 VideoWriter.hh,1.4,1.5

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

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

Modified Files:
	GreymapReader.hh GreymapWriter.hh PfcReader.hh PfcWriter.hh 
	PfgReader.hh PfgWriter.hh PgmReader.hh PgmWriter.hh 
	PixmapReader.hh PixmapWriter.hh PpmReader.hh PpmWriter.hh 
	RawReader.hh RawWriter.hh VidReader.hh VidWriter.hh 
	VideoReader.hh VideoWriter.hh 
Log Message:
Fixed memory leaks found by Florian Stumpf and Johan Ehlers.


Index: GreymapReader.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/GreymapReader.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GreymapReader.hh	12 Jul 2005 14:52:18 -0000	1.3
--- GreymapReader.hh	15 Aug 2005 16:24:23 -0000	1.4
***************
*** 36,39 ****
--- 36,43 ----
    GreymapReader (char const *name, ImageArray<coeff> &data) 
      : GreymapFile (name, data) {}
+ 
+   /** Destructor - does nothing. */
+   virtual ~GreymapReader (void) {}
+ 
    /** Read the image. All steps independent of the file format will be 
     * performed, like testing for file readability etc. 

Index: PfgWriter.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/PfgWriter.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PfgWriter.hh	12 Jul 2005 14:52:18 -0000	1.3
--- PfgWriter.hh	15 Aug 2005 16:24:23 -0000	1.4
***************
*** 34,37 ****
--- 34,40 ----
      : GreymapWriter (name, data) {}
  
+   /** Destructor - does nothing. */
+   virtual ~PfgWriter (void) {}
+ 
  protected: 
    /** Write a PFG image file. This is the method that does the actual

Index: VidWriter.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/VidWriter.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VidWriter.hh	12 Jul 2005 14:52:19 -0000	1.5
--- VidWriter.hh	15 Aug 2005 16:24:23 -0000	1.6
***************
*** 38,41 ****
--- 38,44 ----
      : VideoWriter (name, arrays, colors) { m_skip = skip; }
  
+   /** Destructor - does nothing. */
+   virtual ~VidWriter (void) {}
+ 
  protected: 
    /** Write a VID video file. This is the method that does the actual

Index: RawWriter.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/RawWriter.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RawWriter.hh	12 Jul 2005 14:52:19 -0000	1.3
--- RawWriter.hh	15 Aug 2005 16:24:23 -0000	1.4
***************
*** 36,39 ****
--- 36,42 ----
      : GreymapWriter (name, data) { header (offs); }
  
+   /** Destructor - does nothing. */
+   virtual ~RawWriter (void) {}
+ 
    /** Set the offset. 
     * @param offs

Index: PgmWriter.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/PgmWriter.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PgmWriter.hh	12 Jul 2005 14:52:18 -0000	1.3
--- PgmWriter.hh	15 Aug 2005 16:24:23 -0000	1.4
***************
*** 34,37 ****
--- 34,40 ----
      : GreymapWriter (name, data) {}
  
+   /** Destructor - does nothing. */
+   virtual ~PgmWriter (void) {}
+ 
  protected: 
    /** Write a PGM image file. This is the method that does the actual

Index: PixmapReader.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/PixmapReader.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PixmapReader.hh	12 Jul 2005 14:52:18 -0000	1.3
--- PixmapReader.hh	15 Aug 2005 16:24:23 -0000	1.4
***************
*** 37,40 ****
--- 37,44 ----
    PixmapReader (char const *name, Image *images[], int channels) 
      : PixmapFile (name, images, channels) {}
+ 
+   /** Destructor - does nothing. */
+   virtual ~PixmapReader (void) {}
+ 
    /** Read the image. All steps independent of the file format will be 
     * performed, like testing for file readability etc. 

Index: PpmWriter.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/PpmWriter.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PpmWriter.hh	12 Jul 2005 14:52:19 -0000	1.3
--- PpmWriter.hh	15 Aug 2005 16:24:23 -0000	1.4
***************
*** 34,37 ****
--- 34,40 ----
      : PixmapWriter (name, images, 3) {}
  
+   /** Destructor - does nothing. */
+   virtual ~PpmWriter (void) {}
+ 
  protected: 
    /** Write a PPM image file. This is the method that does the actual

Index: PfgReader.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/PfgReader.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PfgReader.hh	12 Jul 2005 14:52:18 -0000	1.3
--- PfgReader.hh	15 Aug 2005 16:24:23 -0000	1.4
***************
*** 31,34 ****
--- 31,37 ----
    PfgReader (char const * name, ImageArray<coeff> &data)
      : GreymapReader (name, data) {}
+ 
+   /** Destructor - does nothing. */
+   virtual ~PfgReader (void) {}
    
  protected:

Index: VideoReader.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/VideoReader.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VideoReader.hh	12 Jul 2005 14:52:19 -0000	1.5
--- VideoReader.hh	15 Aug 2005 16:24:23 -0000	1.6
***************
*** 40,43 ****
--- 40,47 ----
                 int channels, int from, int to) 
      : VideoFile (name, arrays, channels, to - from) {m_to = to; m_from = from;}
+ 
+   /** Destructor - does nothing. */
+   virtual ~VideoReader (void) {}
+ 
    /** Read the video . All steps independent of the file format will be 
     * performed, like testing for file readability etc. 

Index: VidReader.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/VidReader.hh,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** VidReader.hh	12 Jul 2005 14:52:19 -0000	1.7
--- VidReader.hh	15 Aug 2005 16:24:23 -0000	1.8
***************
*** 40,43 ****
--- 40,46 ----
               int rawy, int rawx, int colors, int from, int to, int skip = 0);
    
+   /** Destructor - does nothing. */
+   virtual ~VidReader (void) {}
+ 
    /** Return the number of frames in a file. 
     * @param fname the file name.

Index: PfcWriter.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/PfcWriter.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PfcWriter.hh	12 Jul 2005 14:52:18 -0000	1.3
--- PfcWriter.hh	15 Aug 2005 16:24:23 -0000	1.4
***************
*** 38,41 ****
--- 38,44 ----
      : PixmapWriter (name, images, colors) { colormodel (cmodel); }
  
+   /** Destructor - does nothing. */
+   virtual ~PfcWriter (void) {}
+ 
  protected: 
    /** Write a PFC image file. This is the method that does the actual

Index: PgmReader.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/PgmReader.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PgmReader.hh	12 Jul 2005 14:52:18 -0000	1.3
--- PgmReader.hh	15 Aug 2005 16:24:23 -0000	1.4
***************
*** 32,35 ****
--- 32,38 ----
      : GreymapReader (name, data) {}
  
+   /** Destructor - does nothing. */
+   virtual ~PgmReader (void) {}
+ 
  protected:
    /** Read the PGM file format. This does the actual work of reading and

Index: RawReader.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/RawReader.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RawReader.hh	12 Jul 2005 14:52:19 -0000	1.3
--- RawReader.hh	15 Aug 2005 16:24:23 -0000	1.4
***************
*** 41,44 ****
--- 41,47 ----
    { header (offs); rows (y); cols (x); }
  
+   /** Destructor - does nothing. */
+   virtual ~RawReader (void) {}
+ 
    /** Set the offset. 
     * @param offs

Index: PpmReader.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/PpmReader.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PpmReader.hh	12 Jul 2005 14:52:19 -0000	1.3
--- PpmReader.hh	15 Aug 2005 16:24:23 -0000	1.4
***************
*** 32,35 ****
--- 32,38 ----
      : PixmapReader (name, images, 3) { }
  
+   /** Destructor - does nothing. */
+   virtual ~PpmReader (void) {}
+ 
  protected:
    /** Read the PPM file format. This does the actual work of reading and

Index: PixmapWriter.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/PixmapWriter.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PixmapWriter.hh	12 Jul 2005 14:52:18 -0000	1.3
--- PixmapWriter.hh	15 Aug 2005 16:24:23 -0000	1.4
***************
*** 36,39 ****
--- 36,43 ----
    PixmapWriter (char const *name, Image *images[], int channels)
      : PixmapFile (name, images, channels) {}
+ 
+   /** Destructor - does nothing. */
+   virtual ~PixmapWriter (void) {}
+ 
    /** Write the image. All steps independent of the file format will be 
     * performed, like testing for file writeability etc. 

Index: VideoWriter.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/VideoWriter.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VideoWriter.hh	12 Jul 2005 14:52:19 -0000	1.4
--- VideoWriter.hh	15 Aug 2005 16:24:23 -0000	1.5
***************
*** 36,39 ****
--- 36,43 ----
    VideoWriter (char const *name, VideoArray < coeff > *arrays[], int colors)
      : VideoFile (name, arrays, colors, arrays[0]->frames ()) {}
+ 
+   /** Destructor - does nothing. */
+   virtual ~VideoWriter (void) {}
+ 
    /** Write the video . All steps independent of the file format will be 
     * performed, like testing for file writeability etc. 

Index: GreymapWriter.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/GreymapWriter.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GreymapWriter.hh	12 Jul 2005 14:52:18 -0000	1.3
--- GreymapWriter.hh	15 Aug 2005 16:24:23 -0000	1.4
***************
*** 36,39 ****
--- 36,43 ----
    GreymapWriter (char const *name, ImageArray<coeff> &data)
      : GreymapFile (name, data) {}
+ 
+   /** Destructor - does nothing. */
+   virtual ~GreymapWriter (void) {}
+ 
    /** Write the image. All steps independent of the file format will be 
     * performed, like testing for file writeability etc. 

Index: PfcReader.hh
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WImage/PfcReader.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PfcReader.hh	12 Jul 2005 14:52:18 -0000	1.3
--- PfcReader.hh	15 Aug 2005 16:24:23 -0000	1.4
***************
*** 34,37 ****
--- 34,40 ----
      : PixmapReader (name, images, colors) { }
  
+   /** Destructor - does nothing. */
+   virtual ~PfcReader (void) {}
+ 
  protected:
    /** Read the PFC file format. This does the actual work of reading and