[Wavelet-commit] Wavelet/tools imgconvert.cc,1.5,1.6 pgmcompare.cc,1.4,1.5 pgmcount.cc,1.2,1.3 pgmdenoise.cc,1.2,1.3 pgmdiff.cc,1.2,1.3 pgmequalize.cc,1.3,1.4 pgmhist.cc,1.2,1.3 pgminmax.cc,1.2,1.3 pgmpixel.cc,1.2,1.3 pgmscale.cc,1.2,1.3 pgmstats.cc,1.2,1.3 ppm2grey.cc,1.2,1.3 vid2pgm.cc,1.4,1.5 video2grey.cc,1.12,1.13 wavepgm.cc,1.3,1.4 waveppm.cc,1.3,1.4

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

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

Modified Files:
	imgconvert.cc pgmcompare.cc pgmcount.cc pgmdenoise.cc 
	pgmdiff.cc pgmequalize.cc pgmhist.cc pgminmax.cc pgmpixel.cc 
	pgmscale.cc pgmstats.cc ppm2grey.cc vid2pgm.cc video2grey.cc 
	wavepgm.cc waveppm.cc 
Log Message:
adapted namespace stuff for openwatcom

Index: video2grey.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/tools/video2grey.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** video2grey.cc	18 Feb 2005 12:12:25 -0000	1.12
--- video2grey.cc	10 Aug 2005 09:35:23 -0000	1.13
***************
*** 13,17 ****
  #include <WImage.hh>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 13,17 ----
  #include <WImage.hh>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

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

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

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

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

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

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

Index: pgmequalize.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/tools/pgmequalize.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pgmequalize.cc	13 Jul 2005 13:15:07 -0000	1.3
--- pgmequalize.cc	10 Aug 2005 09:35:23 -0000	1.4
***************
*** 14,18 ****
  #include <WImage.hh>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 14,18 ----
  #include <WImage.hh>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

Index: vid2pgm.cc
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/tools/vid2pgm.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** vid2pgm.cc	29 Mar 2005 16:55:08 -0000	1.4
--- vid2pgm.cc	10 Aug 2005 09:35:23 -0000	1.5
***************
*** 13,17 ****
  #include <WImage.hh>
  
! #ifndef __WATCOMC__
  using namespace std;
  #endif
--- 13,17 ----
  #include <WImage.hh>
  
! #if !(defined __WATCOMC__ && __WATCOMC__ < 1230)
  using namespace std;
  #endif

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

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

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

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

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

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

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