[Wavelet-commit] Wavelet AviReader.cc,1.4,1.5 AviWriter.cc,1.5,1.6 CoeffInformation.cc,1.3,1.4 ColorBuffer.cc,1.5,1.6 ColorImage.cc,1.6,1.7 ColorVideo.cc,1.11,1.12 ColumnVector.cc,1.1,1.2 FileName.cc,1.5,1.6 Filter.cc,1.2,1.3 FullVector.cc,1.2,1.3 GreymapFile.cc,1.2,1.3 GreymapReader.cc,1.1,1.2 GreymapWriter.cc,1.1,1.2 Histogram.cc,1.4,1.5 Image.cc,1.21,1.22 ImageComparison.cc,1.5,1.6 ImageDenoiser.cc,1.5,1.6 ImageInformation.cc,1.3,1.4 ImageVector.cc,1.2,1.3 JpgReader.cc,1.2,1.3 MirrorPosition.cc,1.2,1.3 PfcReader.cc,1.4,1.5 PfcWriter.cc,1.3,1.4 PfgReader.cc,1.4,1.5 PfgWriter.cc,1.3,1.4 PgmReader.cc,1.1,1.2 PixmapFile.cc,1.2,1.3 PixmapReader.cc,1.1,1.2 PixmapWriter.cc,1.1,1.2 PpmReader.cc,1.3,1.4 PyramidTransform.cc,1.4,1.5 RawReader.cc,1.2,1.3 RowVector.cc,1.2,1.3 StandardTransform.cc,1.1,1.2 StillImage.cc,1.6,1.7 VidReader.cc,1.5,1.6 VideoFile.cc,1.2,1.3 VideoFrame.cc,1.3,1.4 VideoReader.cc,1.1,1.2 VideoWriter.cc,1.1,1.2 Wavelet.cc,1.3,1.4 WaveletTransform.cc,1.5,1.6

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

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

Modified Files:
	AviReader.cc AviWriter.cc CoeffInformation.cc ColorBuffer.cc 
	ColorImage.cc ColorVideo.cc ColumnVector.cc FileName.cc 
	Filter.cc FullVector.cc GreymapFile.cc GreymapReader.cc 
	GreymapWriter.cc Histogram.cc Image.cc ImageComparison.cc 
	ImageDenoiser.cc ImageInformation.cc ImageVector.cc 
	JpgReader.cc MirrorPosition.cc PfcReader.cc PfcWriter.cc 
	PfgReader.cc PfgWriter.cc PgmReader.cc PixmapFile.cc 
	PixmapReader.cc PixmapWriter.cc PpmReader.cc 
	PyramidTransform.cc RawReader.cc RowVector.cc 
	StandardTransform.cc StillImage.cc VidReader.cc VideoFile.cc 
	VideoFrame.cc VideoReader.cc VideoWriter.cc Wavelet.cc 
	WaveletTransform.cc 
Log Message:
adapted namespace stuff for openwatcom

Index: ImageVector.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/ImageVector.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ImageVector.cc	22 Mar 2005 15:51:21 -0000	1.2
--- ImageVector.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 15,19 ****
  #include <stdexcept>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 15,19 ----
  #include <stdexcept>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: VideoReader.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/VideoReader.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VideoReader.cc	18 Oct 2004 11:20:19 -0000	1.1
--- VideoReader.cc	10 Aug 2005 09:35:23 -0000	1.2
***************
*** 13,17 ****
  #include <fstream>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 13,17 ----
  #include <fstream>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: GreymapReader.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/GreymapReader.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GreymapReader.cc	18 Oct 2004 11:20:19 -0000	1.1
--- GreymapReader.cc	10 Aug 2005 09:35:23 -0000	1.2
***************
*** 13,17 ****
  #include <fstream>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 13,17 ----
  #include <fstream>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: PgmReader.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/PgmReader.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PgmReader.cc	18 Oct 2004 11:20:19 -0000	1.1
--- PgmReader.cc	10 Aug 2005 09:35:23 -0000	1.2
***************
*** 12,16 ****
  #include <stdio.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 12,16 ----
  #include <stdio.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: PpmReader.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/PpmReader.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PpmReader.cc	18 Feb 2005 12:12:24 -0000	1.3
--- PpmReader.cc	10 Aug 2005 09:35:23 -0000	1.4
***************
*** 13,17 ****
  #include <stdio.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 13,17 ----
  #include <stdio.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: RawReader.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/RawReader.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RawReader.cc	18 Feb 2005 12:12:24 -0000	1.2
--- RawReader.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 12,16 ****
  #include <stdio.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 12,16 ----
  #include <stdio.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: ImageComparison.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/ImageComparison.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ImageComparison.cc	22 Mar 2005 17:28:20 -0000	1.5
--- ImageComparison.cc	10 Aug 2005 09:35:23 -0000	1.6
***************
*** 17,21 ****
  #include "WImage/miscdefs.h"
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 17,21 ----
  #include "WImage/miscdefs.h"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: PixmapWriter.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/PixmapWriter.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PixmapWriter.cc	18 Oct 2004 11:20:19 -0000	1.1
--- PixmapWriter.cc	10 Aug 2005 09:35:23 -0000	1.2
***************
*** 19,23 ****
  #include <float.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 19,23 ----
  #include <float.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: WaveletTransform.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/WaveletTransform.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** WaveletTransform.cc	22 Mar 2005 17:28:20 -0000	1.5
--- WaveletTransform.cc	10 Aug 2005 09:35:23 -0000	1.6
***************
*** 20,24 ****
  #endif
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 20,24 ----
  #endif
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: FullVector.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/FullVector.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FullVector.cc	22 Mar 2005 15:51:21 -0000	1.2
--- FullVector.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 15,19 ****
  #include <stdexcept>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 15,19 ----
  #include <stdexcept>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: StillImage.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/StillImage.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StillImage.cc	22 Mar 2005 17:28:20 -0000	1.6
--- StillImage.cc	10 Aug 2005 09:35:23 -0000	1.7
***************
*** 30,34 ****
  #endif
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 30,34 ----
  #endif
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: Filter.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/Filter.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Filter.cc	18 Feb 2005 12:12:24 -0000	1.2
--- Filter.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 33,37 ****
  #include "Wave/Filter.hh"
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 33,37 ----
  #include "Wave/Filter.hh"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: RowVector.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/RowVector.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RowVector.cc	22 Mar 2005 15:51:21 -0000	1.2
--- RowVector.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 15,19 ****
  #include <stdexcept>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 15,19 ----
  #include <stdexcept>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: ImageDenoiser.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/ImageDenoiser.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ImageDenoiser.cc	22 Mar 2005 17:28:20 -0000	1.5
--- ImageDenoiser.cc	10 Aug 2005 09:35:23 -0000	1.6
***************
*** 17,21 ****
  #include "WImage/miscdefs.h"
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 17,21 ----
  #include "WImage/miscdefs.h"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: Wavelet.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/Wavelet.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Wavelet.cc	22 Mar 2005 15:51:21 -0000	1.3
--- Wavelet.cc	10 Aug 2005 09:35:23 -0000	1.4
***************
*** 24,28 ****
  #include "WImage/tools.h"
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 24,28 ----
  #include "WImage/tools.h"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: AviWriter.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/AviWriter.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AviWriter.cc	18 Feb 2005 12:12:23 -0000	1.5
--- AviWriter.cc	10 Aug 2005 09:35:23 -0000	1.6
***************
*** 13,17 ****
  #include <iostream>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 13,17 ----
  #include <iostream>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: ColorVideo.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/ColorVideo.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ColorVideo.cc	22 Mar 2005 15:51:21 -0000	1.11
--- ColorVideo.cc	10 Aug 2005 09:35:23 -0000	1.12
***************
*** 24,28 ****
  #include <assert.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 24,28 ----
  #include <assert.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: VidReader.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/VidReader.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VidReader.cc	18 Feb 2005 12:12:24 -0000	1.5
--- VidReader.cc	10 Aug 2005 09:35:23 -0000	1.6
***************
*** 13,17 ****
  #include <stdio.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 13,17 ----
  #include <stdio.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: Image.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/Image.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Image.cc	15 Jul 2005 08:43:53 -0000	1.21
--- Image.cc	10 Aug 2005 09:35:23 -0000	1.22
***************
*** 22,26 ****
  #include "WImage/miscdefs.h"
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 22,26 ----
  #include "WImage/miscdefs.h"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: ColumnVector.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/ColumnVector.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ColumnVector.cc	18 Oct 2004 11:20:19 -0000	1.1
--- ColumnVector.cc	10 Aug 2005 09:35:23 -0000	1.2
***************
*** 12,16 ****
  #include <stdexcept>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 12,16 ----
  #include <stdexcept>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: CoeffInformation.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/CoeffInformation.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CoeffInformation.cc	22 Mar 2005 15:51:21 -0000	1.3
--- CoeffInformation.cc	10 Aug 2005 09:35:23 -0000	1.4
***************
*** 15,19 ****
  #endif
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 15,19 ----
  #endif
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: PfcWriter.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/PfcWriter.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PfcWriter.cc	18 Feb 2005 12:12:24 -0000	1.3
--- PfcWriter.cc	10 Aug 2005 09:35:23 -0000	1.4
***************
*** 12,16 ****
  #include <pfi.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 12,16 ----
  #include <pfi.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: StandardTransform.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/StandardTransform.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StandardTransform.cc	18 Oct 2004 11:20:19 -0000	1.1
--- StandardTransform.cc	10 Aug 2005 09:35:23 -0000	1.2
***************
*** 12,16 ****
  #include "WImage/debug.h"
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 12,16 ----
  #include "WImage/debug.h"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: GreymapWriter.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/GreymapWriter.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GreymapWriter.cc	18 Oct 2004 11:20:19 -0000	1.1
--- GreymapWriter.cc	10 Aug 2005 09:35:23 -0000	1.2
***************
*** 19,23 ****
  #include <float.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 19,23 ----
  #include <float.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: JpgReader.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/JpgReader.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JpgReader.cc	18 Feb 2005 12:12:24 -0000	1.2
--- JpgReader.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 19,23 ****
  #include <iostream>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 19,23 ----
  #include <iostream>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: Histogram.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/Histogram.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Histogram.cc	22 Mar 2005 17:28:20 -0000	1.4
--- Histogram.cc	10 Aug 2005 09:35:23 -0000	1.5
***************
*** 21,25 ****
  #endif
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 21,25 ----
  #endif
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: GreymapFile.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/GreymapFile.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GreymapFile.cc	18 Feb 2005 12:12:24 -0000	1.2
--- GreymapFile.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 12,16 ****
  #include <stdexcept>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 12,16 ----
  #include <stdexcept>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: PixmapReader.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/PixmapReader.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PixmapReader.cc	18 Oct 2004 11:20:19 -0000	1.1
--- PixmapReader.cc	10 Aug 2005 09:35:23 -0000	1.2
***************
*** 13,17 ****
  #include <fstream>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 13,17 ----
  #include <fstream>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: PfcReader.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/PfcReader.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PfcReader.cc	18 Feb 2005 12:12:24 -0000	1.4
--- PfcReader.cc	10 Aug 2005 09:35:23 -0000	1.5
***************
*** 13,17 ****
  #include <stdio.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 13,17 ----
  #include <stdio.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: AviReader.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/AviReader.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AviReader.cc	18 Feb 2005 12:12:23 -0000	1.4
--- AviReader.cc	10 Aug 2005 09:35:23 -0000	1.5
***************
*** 16,20 ****
  }
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 16,20 ----
  }
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: PixmapFile.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/PixmapFile.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PixmapFile.cc	18 Feb 2005 12:12:24 -0000	1.2
--- PixmapFile.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 12,16 ****
  #include <stdexcept>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 12,16 ----
  #include <stdexcept>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: PfgWriter.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/PfgWriter.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PfgWriter.cc	15 Nov 2004 15:27:14 -0000	1.3
--- PfgWriter.cc	10 Aug 2005 09:35:23 -0000	1.4
***************
*** 12,16 ****
  #include <pfi.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 12,16 ----
  #include <pfi.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: VideoFrame.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/VideoFrame.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VideoFrame.cc	22 Mar 2005 15:51:21 -0000	1.3
--- VideoFrame.cc	10 Aug 2005 09:35:23 -0000	1.4
***************
*** 29,33 ****
  #include <assert.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 29,33 ----
  #include <assert.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: ColorBuffer.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/ColorBuffer.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ColorBuffer.cc	22 Mar 2005 17:28:19 -0000	1.5
--- ColorBuffer.cc	10 Aug 2005 09:35:23 -0000	1.6
***************
*** 22,26 ****
  #endif
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 22,26 ----
  #endif
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: ColorImage.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/ColorImage.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ColorImage.cc	22 Mar 2005 17:28:20 -0000	1.6
--- ColorImage.cc	10 Aug 2005 09:35:23 -0000	1.7
***************
*** 43,47 ****
  #endif
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 43,47 ----
  #endif
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: VideoFile.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/VideoFile.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VideoFile.cc	18 Feb 2005 12:12:24 -0000	1.2
--- VideoFile.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 11,15 ****
  #include <stdexcept>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 11,15 ----
  #include <stdexcept>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: VideoWriter.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/VideoWriter.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VideoWriter.cc	18 Oct 2004 11:20:19 -0000	1.1
--- VideoWriter.cc	10 Aug 2005 09:35:23 -0000	1.2
***************
*** 19,23 ****
  #include <float.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 19,23 ----
  #include <float.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: PyramidTransform.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/PyramidTransform.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PyramidTransform.cc	22 Mar 2005 17:28:20 -0000	1.4
--- PyramidTransform.cc	10 Aug 2005 09:35:23 -0000	1.5
***************
*** 19,23 ****
  #endif
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 19,23 ----
  #endif
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: PfgReader.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/PfgReader.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PfgReader.cc	18 Feb 2005 12:12:24 -0000	1.4
--- PfgReader.cc	10 Aug 2005 09:35:23 -0000	1.5
***************
*** 13,17 ****
  #include <stdio.h>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 13,17 ----
  #include <stdio.h>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: FileName.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/FileName.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FileName.cc	22 Mar 2005 17:28:20 -0000	1.5
--- FileName.cc	10 Aug 2005 09:35:23 -0000	1.6
***************
*** 18,22 ****
  #include "WImage/miscdefs.h"
  
! #ifndef __WATCOMC__
  using namespace std;
  #else
--- 18,22 ----
  #include "WImage/miscdefs.h"
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #else

Index: MirrorPosition.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/MirrorPosition.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MirrorPosition.cc	22 Mar 2005 15:51:21 -0000	1.2
--- MirrorPosition.cc	10 Aug 2005 09:35:23 -0000	1.3
***************
*** 14,18 ****
  #endif
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 14,18 ----
  #endif
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: ImageInformation.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/ImageInformation.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ImageInformation.cc	22 Mar 2005 15:51:21 -0000	1.3
--- ImageInformation.cc	10 Aug 2005 09:35:23 -0000	1.4
***************
*** 16,20 ****
  #endif
   
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 16,20 ----
  #endif
   
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif