--- atmosph.cpp	Sun Jul 18 05:16:24 2004
+++ atmosph.cpp	Mon Aug 02 18:11:36 2004
@@ -22,16 +22,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/atmosph.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "atmosph.h"
 #include "chi2.h"
 #include "colour.h"
--- bbox.cpp	Sun Jul 18 05:16:24 2004
+++ bbox.cpp	Mon Aug 02 18:11:36 2004
@@ -30,16 +30,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/bbox.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "matrices.h"
 #include "objects.h"
--- bcyl.cpp	Sun Jul 18 05:16:24 2004
+++ bcyl.cpp	Mon Aug 02 18:11:36 2004
@@ -23,16 +23,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/bcyl.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bcyl.h"
 
 BEGIN_POV_NAMESPACE
--- benchmark.cpp	Sun Jul 18 05:16:24 2004
+++ benchmark.cpp	Mon Aug 02 18:11:36 2004
@@ -23,17 +23,18 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/benchmark.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
-#include "stdio.h"
+#include <stdio.h>
+
 #include "frame.h"
 #include "povray.h"
-#include "povproto.h"
+#include "benchmark.h"
 
 BEGIN_POV_NAMESPACE
 
--- bezier.cpp	Sun Jul 18 05:16:24 2004
+++ bezier.cpp	Mon Aug 02 18:11:36 2004
@@ -25,16 +25,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/bezier.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bezier.h"
 #include "matrices.h"
 #include "objects.h"
--- blob.cpp	Sun Jul 18 05:16:24 2004
+++ blob.cpp	Mon Aug 02 18:11:36 2004
@@ -27,10 +27,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/blob.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -95,7 +95,6 @@
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "blob.h"
 #include "bbox.h"
 #include "bsphere.h"
--- boxes.cpp	Sun Jul 18 05:16:26 2004
+++ boxes.cpp	Mon Aug 02 18:11:36 2004
@@ -24,17 +24,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/boxes.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "boxes.h"
 #include "matrices.h"
--- bsphere.cpp	Sun Jul 18 05:16:26 2004
+++ bsphere.cpp	Mon Aug 02 18:11:36 2004
@@ -22,16 +22,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/bsphere.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bsphere.h"
 #include "povray.h"
 
--- camera.cpp	Sun Jul 18 05:16:26 2004
+++ camera.cpp	Mon Aug 02 18:11:36 2004
@@ -22,16 +22,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/camera.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "camera.h"
 #include "matrices.h"
 #include "normal.h"
--- chi2.cpp	Sun Jul 18 05:16:26 2004
+++ chi2.cpp	Mon Aug 02 18:11:36 2004
@@ -28,15 +28,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/chi2.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
-#include "povproto.h"
+#include "userio.h"
 #include "chi2.h"
 
 BEGIN_POV_NAMESPACE
--- colour.cpp	Sun Jul 18 05:16:26 2004
+++ colour.cpp	Mon Aug 02 18:11:36 2004
@@ -22,16 +22,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/colour.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "colour.h"
 #include "pigment.h"
 #include "normal.h"
--- colutils.cpp	Sun Jul 18 05:16:26 2004
+++ colutils.cpp	Mon Aug 02 18:11:36 2004
@@ -22,17 +22,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/colutils.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include <time.h>
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "chi2.h"
 #include "colour.h"
@@ -158,19 +157,92 @@
 
 void extract_colors(COLOUR Colour, unsigned char *Red, unsigned char  *Green, unsigned char  *Blue, unsigned char  *Alpha, DBL *grey)
 {
+  COLOUR ColourG;
+
+  Clip_Colour(ColourG, Colour);
+  gamma_correct(ColourG);
+
   if (opts.PaletteOption == GREY)
   {
-    *grey = Colour[pRED] * GREY_SCALE(Colour);
+    *grey = ColourG[pRED] * GREY_SCALE(ColourG);
 
     *Red = *Green = *Blue = (unsigned char)((*grey) * maxclr);
   }
   else
   {
-    *Red   = (unsigned char)(Colour[pRED]    * maxclr);
-    *Green = (unsigned char)(Colour[pGREEN]  * maxclr);
-    *Blue  = (unsigned char)(Colour[pBLUE]   * maxclr);
-    *Alpha = (unsigned char)(Colour[pTRANSM] * maxclr);
+    *Red   = (unsigned char)(ColourG[pRED]    * maxclr);
+    *Green = (unsigned char)(ColourG[pGREEN]  * maxclr);
+    *Blue  = (unsigned char)(ColourG[pBLUE]   * maxclr);
+    *Alpha = (unsigned char)(ColourG[pTRANSM] * maxclr);
+  }
+}
+
+/*****************************************************************************
+*
+* FUNCTION
+*
+*   extract_colors_nocorrect
+*
+* INPUT
+*
+*   Colour, Red, Green, Blue, Alpha, grey
+*   
+* OUTPUT
+*
+*   Red, Green, Blue, Alpha, grey
+*   
+* RETURNS
+*   
+* AUTHOR
+*
+*   Christoph Hormann
+*   
+* DESCRIPTION
+*
+*   Create appropriate rgba values without gamma correction and clipping.
+*   Used for reading images in continued trace.
+*
+* CHANGES
+*
+*   Jul 2004 : Creation based on extract_colors()
+*
+******************************************************************************/
+
+void extract_colors_nocorrect(COLOUR Colour, unsigned char *Red, unsigned char  *Green, unsigned char  *Blue, unsigned char  *Alpha, DBL *grey)
+{
+  int RedU, GreenU, BlueU, AlphaU;
+
+  if (opts.PaletteOption == GREY)
+  {
+    *grey = Colour[pRED] * GREY_SCALE(Colour);
+
+    RedU = GreenU = BlueU = (int)((*grey) * maxclr);
+    AlphaU = 0;
+  }
+  else
+  {
+    RedU   = (int)(Colour[pRED]    * maxclr);
+    GreenU = (int)(Colour[pGREEN]  * maxclr);
+    BlueU  = (int)(Colour[pBLUE]   * maxclr);
+    AlphaU = (int)(Colour[pTRANSM] * maxclr);
   }
+
+  if (RedU > UCHAR_MAX) RedU = UCHAR_MAX;
+  else if (RedU < 0) RedU = 0;
+
+  if (GreenU > UCHAR_MAX) GreenU = UCHAR_MAX;
+  else if (GreenU < 0) GreenU = 0;
+
+  if (BlueU > UCHAR_MAX) BlueU = UCHAR_MAX;
+  else if (BlueU < 0) BlueU = 0;
+
+  if (AlphaU > UCHAR_MAX) AlphaU = UCHAR_MAX;
+  else if (AlphaU < 0) AlphaU = 0;
+
+  *Red   = RedU;
+  *Green = GreenU;
+  *Blue  = BlueU;
+  *Alpha = AlphaU;
 }
 
 
@@ -301,6 +373,45 @@
   }
   else
     c[pRED] = c[pGREEN] = c[pBLUE] = 0.0;
+}
+
+/*****************************************************************************
+*
+* FUNCTION
+*
+*   prepare_output_line
+*
+* INPUT
+*
+*   Line - input/output line
+*
+* OUTPUT
+*
+* RETURNS
+*
+* AUTHOR
+*
+*   Christoph Hormann
+*
+* DESCRIPTION
+*
+*   Clip and gamma correct a line for file output
+*
+* CHANGES
+*
+*   Mar 2003 : Creation.
+*
+******************************************************************************/
+
+void prepare_output_line(COLOUR *Line)
+{
+  int i;
+
+  for (i = 0; i <= Frame.Screen_Width ; i++)
+  {
+    Clip_Colour(Line[i], Line[i]);
+    gamma_correct(Line[i]);
+  }
 }
 
 END_POV_NAMESPACE
--- cones.cpp	Sun Jul 18 05:16:26 2004
+++ cones.cpp	Mon Aug 02 18:11:36 2004
@@ -24,17 +24,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/cones.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "cones.h"
 #include "matrices.h"
--- csg.cpp	Sun Jul 18 05:16:26 2004
+++ csg.cpp	Mon Aug 02 18:11:36 2004
@@ -22,17 +22,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/csg.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "csg.h"
 #include "hfield.h"
--- discs.cpp	Sun Jul 18 05:16:26 2004
+++ discs.cpp	Mon Aug 02 18:11:36 2004
@@ -24,17 +24,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/discs.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "discs.h"
 #include "matrices.h"
--- express.cpp	Sun Jul 18 05:16:26 2004
+++ express.cpp	Mon Aug 02 18:11:36 2004
@@ -23,17 +23,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/express.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include <ctype.h>
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "parse.h"
 #include "parstxtr.h"
 #include "parsestr.h"
--- fncode.cpp	Sun Jul 18 05:16:26 2004
+++ fncode.cpp	Mon Aug 02 18:11:36 2004
@@ -25,10 +25,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/fncode.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -40,7 +40,6 @@
 #include <algorithm>
 
 #include "frame.h"
-#include "povproto.h"
 #include "povray.h"
 #include "fncode.h"
 #include "fnpovfpu.h"
--- fnintern.cpp	Sun Jul 18 05:16:26 2004
+++ fnintern.cpp	Mon Aug 02 18:11:36 2004
@@ -27,15 +27,14 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/fnintern.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
-#include "povproto.h"
 #include "povray.h"
 #include "texture.h"
 #include "vector.h"
--- fnpovfpu.cpp	Sun Jul 18 05:16:26 2004
+++ fnpovfpu.cpp	Mon Aug 02 18:11:36 2004
@@ -25,10 +25,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/fnpovfpu.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -233,7 +233,6 @@
 #define SUPPORT_INTEGER_INSTRUCTIONS 0
 
 #include "frame.h"
-#include "povproto.h"
 #include "povray.h"
 #include "fnpovfpu.h"
 #include "fnintern.h"
--- fnsyntax.cpp	Sun Jul 18 05:16:26 2004
+++ fnsyntax.cpp	Mon Aug 02 18:11:36 2004
@@ -25,17 +25,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/fnsyntax.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include <limits.h>
 
 #include "frame.h"
-#include "povproto.h"
 #include "parse.h"
 #include "povray.h"
 #include "tokenize.h"
--- fpmetric.cpp	Sun Jul 18 05:16:26 2004
+++ fpmetric.cpp	Mon Aug 02 18:11:36 2004
@@ -25,10 +25,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/fpmetric.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -40,7 +40,6 @@
 #include "objects.h"
 #include "boxes.h"
 #include "spheres.h"
-#include "povproto.h"
 #include "vector.h"
 #include "matrices.h"
 #include "bbox.h"
--- fractal.cpp	Sun Jul 18 05:16:26 2004
+++ fractal.cpp	Mon Aug 02 18:11:36 2004
@@ -24,17 +24,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/fractal.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "matrices.h"
 #include "objects.h"
--- function.cpp	Sun Jul 18 05:16:26 2004
+++ function.cpp	Mon Aug 02 18:11:36 2004
@@ -25,17 +25,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/function.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include <limits.h>
 
 #include "frame.h"
-#include "povproto.h"
 #include "isosurf.h"
 #include "parse.h"
 #include "povray.h"
--- gif.cpp	Sun Jul 18 05:16:26 2004
+++ gif.cpp	Mon Aug 02 18:11:36 2004
@@ -25,10 +25,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/gif.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -44,7 +44,6 @@
  */
 
 #include "frame.h"
-#include "povproto.h"
 #include "gif.h"
 #include "gifdecod.h"
 #include "povray.h"
--- gifdecod.cpp	Sun Jul 18 05:16:26 2004
+++ gifdecod.cpp	Mon Aug 02 18:11:36 2004
@@ -25,10 +25,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/gifdecod.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -84,7 +84,6 @@
 */
 
 #include "frame.h"
-#include "povproto.h"
 #include "gif.h"
 #include "gifdecod.h"
 #include "povray.h"
--- hcmplx.cpp	Sun Jul 18 05:16:26 2004
+++ hcmplx.cpp	Mon Aug 02 18:11:36 2004
@@ -24,17 +24,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/hcmplx.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "fractal.h"
 #include "spheres.h"
 #include "hcmplx.h"
--- hfield.cpp	Sun Jul 18 05:16:26 2004
+++ hfield.cpp	Mon Aug 02 18:11:36 2004
@@ -31,10 +31,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/hfield.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -59,7 +59,6 @@
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "hfield.h"
 #include "image.h"
 #include "matrices.h"
--- histogra.cpp	Sun Jul 18 05:16:26 2004
+++ histogra.cpp	Mon Aug 02 18:11:36 2004
@@ -22,17 +22,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/histogra.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include <time.h>
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "chi2.h"
 #include "colour.h"
--- iff.cpp	Sun Jul 18 05:16:26 2004
+++ iff.cpp	Mon Aug 02 18:11:36 2004
@@ -22,15 +22,14 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/iff.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
-#include "povproto.h"
 #include "iff.h"
 #include "povray.h"
 #include "pov_util.h"
--- image.cpp	Sun Jul 18 05:16:26 2004
+++ image.cpp	Mon Aug 02 18:11:36 2004
@@ -23,16 +23,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/image.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "texture.h"
 #include "image.h"
 #include "matrices.h"
--- interior.cpp	Sun Jul 18 05:16:26 2004
+++ interior.cpp	Mon Aug 02 18:11:36 2004
@@ -22,16 +22,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/interior.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "chi2.h"
 #include "colour.h"
 #include "povray.h"
--- isosurf.cpp	Sun Jul 18 05:16:26 2004
+++ isosurf.cpp	Mon Aug 02 18:11:36 2004
@@ -25,10 +25,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/isosurf.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -38,7 +38,6 @@
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "boxes.h"
 #include "bbox.h"
 #include "spheres.h"
--- jpeg_pov.cpp	Sun Jul 18 05:16:26 2004
+++ jpeg_pov.cpp	Mon Aug 02 18:11:36 2004
@@ -24,10 +24,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/jpeg_pov.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -130,7 +130,6 @@
 
 #include "frame.h"
 #include <setjmp.h>
-#include "povproto.h"
 #include "povray.h"
 #include "optout.h"
 #include "jpeg_pov.h"
--- lathe.cpp	Sun Jul 18 05:16:26 2004
+++ lathe.cpp	Mon Aug 02 18:11:36 2004
@@ -24,10 +24,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/lathe.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -117,7 +117,6 @@
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "bcyl.h"
 #include "lathe.h"
--- lbuffer.cpp	Sun Jul 18 05:16:26 2004
+++ lbuffer.cpp	Mon Aug 02 18:11:36 2004
@@ -24,16 +24,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/lbuffer.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "point.h"
 #include "povray.h"
 #include "bbox.h"
--- lightgrp.cpp	Sun Jul 18 05:16:26 2004
+++ lightgrp.cpp	Mon Aug 02 18:11:36 2004
@@ -22,15 +22,14 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/lightgrp.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
-#include "povproto.h"
 #include "lightgrp.h"
 #include "povray.h"
 #include "point.h"
--- lighting.cpp	Sun Jul 18 05:16:26 2004
+++ lighting.cpp	Mon Aug 02 18:11:36 2004
@@ -23,16 +23,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/lighting.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "blob.h"
 #include "bbox.h"
 #include "colour.h"
--- mathutil.cpp	Sun Jul 18 05:16:26 2004
+++ mathutil.cpp	Mon Aug 02 18:11:36 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/mathutil.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
--- matrices.cpp	Sun Jul 18 05:16:26 2004
+++ matrices.cpp	Mon Aug 02 18:11:36 2004
@@ -22,16 +22,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/matrices.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
+#include "userio.h"
 #include "vector.h"
-#include "povproto.h"
 #include "matrices.h"
 
 BEGIN_POV_NAMESPACE
--- media.cpp	Sun Jul 18 05:16:26 2004
+++ media.cpp	Mon Aug 02 18:11:36 2004
@@ -22,16 +22,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/media.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "chi2.h"
 #include "colour.h"
 #include "povray.h"
--- mesh.cpp	Sun Jul 18 05:16:26 2004
+++ mesh.cpp	Mon Aug 02 18:11:36 2004
@@ -24,10 +24,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/mesh.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -55,7 +55,6 @@
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "matrices.h"
 #include "objects.h"
--- normal.cpp	Sun Jul 18 05:16:26 2004
+++ normal.cpp	Mon Aug 02 18:11:36 2004
@@ -23,10 +23,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/normal.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -39,7 +39,6 @@
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "texture.h"
 #include "image.h"
 #include "matrices.h"
--- objects.cpp	Sun Jul 18 05:16:26 2004
+++ objects.cpp	Mon Aug 02 18:11:36 2004
@@ -22,17 +22,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/objects.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "interior.h"
 #include "objects.h"
 #include "texture.h"
--- octree.cpp	Sun Jul 18 05:16:26 2004
+++ octree.cpp	Mon Aug 02 18:11:36 2004
@@ -24,10 +24,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/octree.cpp $
- * $Revision: #3 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #4 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -52,7 +52,6 @@
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "povray.h"
 #include "octree.h"
 #include "radiosit.h"
--- optout.cpp	Sun Jul 18 05:16:26 2004
+++ optout.cpp	Mon Aug 02 18:11:36 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/optout.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -35,7 +35,6 @@
 #include <algorithm>
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "atmosph.h"
 #include "bezier.h"
 #include "blob.h"
--- parse.cpp	Sun Jul 18 05:16:26 2004
+++ parse.cpp	Mon Aug 02 18:11:36 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/parse.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -35,7 +35,6 @@
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "parse.h"
 #include "parstxtr.h"
 #include "parsestr.h"
--- parsestr.cpp	Sun Jul 18 05:16:26 2004
+++ parsestr.cpp	Mon Aug 02 18:11:36 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/parsestr.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -39,7 +39,6 @@
 #include "pov_mem.h"
 #include "tokenize.h"
 #include "povray.h"
-#include "povproto.h"
 
 BEGIN_POV_NAMESPACE
 
--- parstxtr.cpp	Sun Jul 18 05:16:26 2004
+++ parstxtr.cpp	Mon Aug 02 18:11:36 2004
@@ -22,16 +22,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/parstxtr.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "parse.h"
 #include "parstxtr.h"
 #include "parsestr.h"
--- pattern.cpp	Sun Jul 18 05:16:26 2004
+++ pattern.cpp	Mon Aug 02 18:11:36 2004
@@ -23,10 +23,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/pattern.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -38,7 +38,6 @@
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "matrices.h"
 #include "pattern.h"
 #include "povray.h"
--- pgm.cpp	Sun Jul 18 05:16:26 2004
+++ pgm.cpp	Mon Aug 02 18:11:36 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/pgm.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -41,7 +41,6 @@
 *****************************************************************************/
 
 #include "frame.h"
-#include "povproto.h"
 #include "povray.h"
 #include "pgm.h"
 #include "ppm.h"
--- photons.cpp	Sun Jul 18 05:16:26 2004
+++ photons.cpp	Mon Aug 02 18:11:38 2004
@@ -24,20 +24,19 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/photons.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 
 #include "frame.h"
+#include "userio.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "texture.h"  /* for FRAND() */
-#include "povproto.h"    /* for Warning() */
 #include "matrices.h"
 #include "objects.h"
 #include "csg.h"
--- pigment.cpp	Sun Jul 18 05:16:26 2004
+++ pigment.cpp	Mon Aug 02 18:11:38 2004
@@ -23,10 +23,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/pigment.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -37,8 +37,8 @@
 */
 
 #include "frame.h"
+#include "userio.h"
 #include "vector.h"
-#include "povproto.h"
 #include "texture.h"
 #include "colour.h"   
 #include "image.h"    
--- planes.cpp	Sun Jul 18 05:16:26 2004
+++ planes.cpp	Mon Aug 02 18:11:38 2004
@@ -22,17 +22,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/planes.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "matrices.h"
 #include "objects.h"
 #include "planes.h"
--- png_pov.cpp	Sun Jul 18 05:16:26 2004
+++ png_pov.cpp	Mon Aug 02 18:11:38 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/png_pov.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -46,7 +46,6 @@
 *****************************************************************************/
 
 #include "frame.h"
-#include "povproto.h"
 #include "povray.h"
 #include "optout.h"
 #include "png.h"
--- point.cpp	Sun Jul 18 05:16:26 2004
+++ point.cpp	Mon Aug 02 18:11:38 2004
@@ -22,16 +22,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/point.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "point.h"
 #include "matrices.h"
 #include "objects.h"
--- poly.cpp	Sun Jul 18 05:16:26 2004
+++ poly.cpp	Mon Aug 02 18:11:38 2004
@@ -25,16 +25,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/poly.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "polysolv.h"
 #include "matrices.h"
--- polygon.cpp	Sun Jul 18 05:16:26 2004
+++ polygon.cpp	Mon Aug 02 18:11:38 2004
@@ -24,10 +24,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/polygon.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -56,7 +56,6 @@
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "matrices.h"
 #include "objects.h"
 #include "polygon.h"
--- polysolv.cpp	Sun Jul 18 05:16:26 2004
+++ polysolv.cpp	Mon Aug 02 18:11:38 2004
@@ -23,16 +23,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/polysolv.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "povray.h"
-#include "povproto.h"
 #include "vector.h"
 #include "polysolv.h"
 
--- pov_mem.cpp	Sun Jul 18 05:16:26 2004
+++ pov_mem.cpp	Mon Aug 02 18:11:38 2004
@@ -23,15 +23,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/pov_mem.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
-#include "povproto.h"           /* Error() */
+#include "userio.h"           /* Error() */
 
 #include "pov_mem.h"
 #include "parse.h"              /* MAError() */
--- pov_util.cpp	Sun Jul 18 05:16:26 2004
+++ pov_util.cpp	Mon Aug 02 18:11:38 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/pov_util.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -35,8 +35,6 @@
 #include "frame.h"
 #include "pov_util.h"
 #include "povray.h"
-#include "povproto.h"
-#include "povproto.h"
 
 BEGIN_POV_NAMESPACE
 
--- povmsend.cpp	Sun Jul 18 05:16:26 2004
+++ povmsend.cpp	Mon Aug 02 18:11:38 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/povmsend.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -35,7 +35,6 @@
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "parse.h"
 #include "povray.h"
 #include "tokenize.h"
--- povmsrec.cpp	Sun Jul 18 05:16:26 2004
+++ povmsrec.cpp	Mon Aug 02 18:11:38 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/povmsrec.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -34,7 +34,6 @@
 #include <algorithm>
 
 #include "frame.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "lighting.h"
 #include "pov_mem.h"        /*POV_FREE*/
--- povray.cpp	Sun Jul 18 05:16:26 2004
+++ povray.cpp	Mon Aug 02 18:11:38 2004
@@ -23,10 +23,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/povray.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -35,7 +35,6 @@
 #include <algorithm>
 
 #include "frame.h"
-#include "povproto.h"
 #include "bezier.h"
 #include "blob.h"
 #include "bbox.h"
--- ppm.cpp	Sun Jul 18 05:16:26 2004
+++ ppm.cpp	Mon Aug 02 18:11:38 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/ppm.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -45,7 +45,6 @@
 *****************************************************************************/
 
 #include "frame.h"
-#include "povproto.h"
 #include "povray.h"
 #include "optout.h"
 #include "pgm.h"
--- prism.cpp	Sun Jul 18 05:16:26 2004
+++ prism.cpp	Mon Aug 02 18:11:38 2004
@@ -24,10 +24,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/prism.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -111,7 +111,6 @@
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "matrices.h"
 #include "objects.h"
--- quadrics.cpp	Sun Jul 18 05:16:26 2004
+++ quadrics.cpp	Mon Aug 02 18:11:38 2004
@@ -22,17 +22,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/quadrics.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "objects.h"
 #include "matrices.h"
--- quatern.cpp	Sun Jul 18 05:16:26 2004
+++ quatern.cpp	Mon Aug 02 18:11:38 2004
@@ -25,17 +25,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/quatern.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "fractal.h"
 #include "quatern.h"
 #include "spheres.h"
--- rad_data.cpp	Sun Jul 18 05:16:26 2004
+++ rad_data.cpp	Mon Aug 02 18:11:38 2004
@@ -24,10 +24,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/rad_data.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
--- radiosit.cpp	Sun Jul 18 05:16:26 2004
+++ radiosit.cpp	Mon Aug 02 18:11:38 2004
@@ -24,10 +24,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/radiosit.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -62,7 +62,6 @@
 #include "lighting.h"
 #include "vector.h"
 #include "povray.h"
-#include "povproto.h"
 #include "render.h"
 #include "texture.h"
 #include "octree.h"
--- ray.cpp	Sun Jul 18 05:16:26 2004
+++ ray.cpp	Mon Aug 02 18:11:38 2004
@@ -22,16 +22,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/ray.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "povray.h"
 #include "interior.h"
 #include "ray.h"
--- rendctrl.cpp	Sun Jul 18 05:16:26 2004
+++ rendctrl.cpp	Mon Aug 02 18:11:38 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/rendctrl.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -34,7 +34,6 @@
 #include <algorithm>
 
 #include "frame.h"
-#include "povproto.h"
 #include "bezier.h"
 #include "blob.h"
 #include "bbox.h"
--- render.cpp	Sun Jul 18 05:16:26 2004
+++ render.cpp	Mon Aug 02 18:11:38 2004
@@ -26,10 +26,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/render.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #4 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -38,7 +38,6 @@
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "chi2.h"
 #include "colour.h"
@@ -1446,7 +1445,7 @@
   int x, y, xx, xxx, yy, skip_odd_lines;
   int sub_pixel_size, antialias_line = true;
   long size;
-  COLOUR clippedColour, unclippedColour;
+  COLOUR unclippedColour;
   PIXEL *First_Row, *Last_Row, *TempRow;
   PIXEL **Block;
   PIXEL TempPixel;
@@ -1591,9 +1590,7 @@
 
       POV_PRE_PIXEL (x, Current_Line_Number, unclippedColour)
       trace_sub_pixel(1, Block, x, Current_Line_Number, 0, 0, sub_pixel_size, sub_pixel_size, sub_pixel_size, unclippedColour, antialias_line);
-      Clip_Colour(clippedColour, unclippedColour);
-      gamma_correct(clippedColour);
-      POV_POST_PIXEL (x, Current_Line_Number, clippedColour)
+      POV_POST_PIXEL (x, Current_Line_Number, unclippedColour)
 
       /* Do histogram stuff. */
 
@@ -1604,12 +1601,12 @@
 
       /* Store colour in current line */
 
-      Assign_Colour(Current_Line[x], clippedColour);
+      Assign_Colour(Current_Line[x], unclippedColour);
       
       /* Display pixel */
       POV_ASSIGN_PIXEL_UNCLIPPED (x, Current_Line_Number, unclippedColour)
-      plot_pixel(x, Current_Line_Number, clippedColour);
-      POV_ASSIGN_PIXEL (x, Current_Line_Number, clippedColour)
+      plot_pixel(x, Current_Line_Number, unclippedColour);
+      POV_ASSIGN_PIXEL (x, Current_Line_Number, unclippedColour)
 
       /* Store current block in rows */
 
@@ -2114,8 +2111,6 @@
   /* Average pixel's color. */
   Scale_Colour(result,result,(1.0/samples));
 
-  Clip_Colour(result, result);
-  gamma_correct(result);
 }
 
 
@@ -2451,7 +2446,8 @@
 
         Trace(Ray, C, 1.0);
 
-        Clip_Colour(C, C);
+        /* Commented out Jul 2004 C.H. */
+        /*Clip_Colour(C, C);*/
 
         Add_Colour(Colour, Colour, C);
       }
@@ -2589,7 +2585,6 @@
 * DESCRIPTION
 *
 *   Trace a primary ray regarding focal blur and vista buffer.
-*   The color of the pixel is clipped and the number of pixels is increased.
 *
 * CHANGES
 *
@@ -2645,9 +2640,6 @@
   }
 
   Assign_Colour(ColourClipped, ColourUnclipped);
-
-  Clip_Colour(ColourClipped, ColourUnclipped);
-  gamma_correct(ColourClipped);
 
   /* Do histogram stuff. */
   if (opts.histogram_on)
--- renderio.cpp	Sun Jul 18 05:16:26 2004
+++ renderio.cpp	Mon Aug 02 18:11:38 2004
@@ -22,17 +22,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/renderio.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include <time.h>
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "chi2.h"
 #include "colour.h"
@@ -117,7 +116,7 @@
     {
       for (x = 0; x < Frame.Screen_Width ; x++)
       {
-        extract_colors(Previous_Line[x], &Red, &Green, &Blue, &Alpha, &grey);
+        extract_colors_nocorrect(Previous_Line[x], &Red, &Green, &Blue, &Alpha, &grey);
         if (Display_Started && x >= opts.First_Column && x < opts.Last_Column)
         {
           POV_DISPLAY_PLOT(opts.Preview_RefCon, x, Output_File->Line() - 1, Red, Green, Blue, Alpha);
@@ -689,7 +688,10 @@
   }
 
   if (opts.Options & DISKWRITE)
+  {
+    prepare_output_line(Line);
     Output_File->Write_Line(Line);
+  }
 
   if (Display_Started)
   {
--- sor.cpp	Sun Jul 18 05:16:26 2004
+++ sor.cpp	Mon Aug 02 18:11:38 2004
@@ -24,10 +24,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/sor.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -94,7 +94,6 @@
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "polysolv.h"
 #include "matrices.h"
--- spheres.cpp	Sun Jul 18 05:16:26 2004
+++ spheres.cpp	Mon Aug 02 18:11:38 2004
@@ -22,17 +22,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/spheres.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "matrices.h"
 #include "objects.h"
--- sphsweep.cpp	Sun Jul 18 05:16:26 2004
+++ sphsweep.cpp	Mon Aug 02 18:11:38 2004
@@ -25,10 +25,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/sphsweep.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -75,7 +75,6 @@
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "matrices.h"
 #include "objects.h"
--- splines.cpp	Sun Jul 18 05:16:26 2004
+++ splines.cpp	Mon Aug 02 18:11:38 2004
@@ -24,15 +24,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/splines.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
-#include "povproto.h"
+#include "userio.h"
 #include "splines.h"
 
 BEGIN_POV_NAMESPACE
--- statspov.cpp	Sun Jul 18 05:16:26 2004
+++ statspov.cpp	Mon Aug 02 18:11:38 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/statspov.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -34,7 +34,6 @@
 #include <stdarg.h>
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "atmosph.h"
 #include "bezier.h"
 #include "blob.h"
--- super.cpp	Sun Jul 18 05:16:26 2004
+++ super.cpp	Mon Aug 02 18:11:38 2004
@@ -25,10 +25,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/super.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -62,7 +62,6 @@
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "matrices.h"
 #include "objects.h"
--- targa.cpp	Sun Jul 18 05:16:26 2004
+++ targa.cpp	Mon Aug 02 18:11:38 2004
@@ -23,10 +23,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/targa.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -53,7 +53,6 @@
 *****************************************************************************/
 
 #include "frame.h"
-#include "povproto.h"
 #include "povray.h"
 #include "targa.h"
 #include "optout.h"
--- texture.cpp	Sun Jul 18 05:16:28 2004
+++ texture.cpp	Mon Aug 02 18:11:38 2004
@@ -26,10 +26,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/texture.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -42,7 +42,6 @@
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "texture.h"
 #include "image.h"
 #include "matrices.h"
--- tiff_pov.cpp	Sun Jul 18 05:16:28 2004
+++ tiff_pov.cpp	Mon Aug 02 18:11:38 2004
@@ -22,17 +22,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/tiff_pov.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include <assert.h>
 
-#include "povproto.h"
 #include "povray.h"
 #include "tiff_pov.h"
 #include "pov_util.h"
--- tokenize.cpp	Sun Jul 18 05:16:28 2004
+++ tokenize.cpp	Mon Aug 02 18:11:38 2004
@@ -28,17 +28,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/tokenize.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include <ctype.h>
 #include "frame.h"
 #include "povray.h"
-#include "povproto.h"
 #include "parse.h"
 #include "parsestr.h"
 #include "povray.h"
@@ -923,28 +922,33 @@
      Destroy_Table(Table_Index--);
   }
 
-  if (Input_File->In_File != NULL)
+  if(Input_File->In_File != NULL)
   {
     delete Input_File->In_File;
     Input_File->In_File = NULL;
-    Got_EOF=false;
+    Got_EOF = false;
   }
 
-  while (Include_File_Index >= 0)
+  while(Include_File_Index >= 0)
   {
     Input_File = &Include_Files[Include_File_Index--];
 
-    if (Input_File->In_File != NULL)
+    if(Input_File->In_File != NULL)
     {
       delete Input_File->In_File;
       Input_File->In_File = NULL;
-      Got_EOF=false;
+      Got_EOF = false;
     }
   }
 
-  if (Cond_Stack!=NULL)
+  if(Cond_Stack != NULL)
   {
-    POV_FREE (Cond_Stack);
+    for(int i = 0; i <= CS_Index; i++)
+    {
+      if((Cond_Stack[i].Cond_Type == INVOKING_MACRO_COND) && (Cond_Stack[i].Macro_Same_Flag == false))
+        delete Cond_Stack[i].Macro_File;
+    }
+    POV_FREE(Cond_Stack);
 
     Cond_Stack = NULL;
   }
--- torus.cpp	Sun Jul 18 05:16:28 2004
+++ torus.cpp	Mon Aug 02 18:11:38 2004
@@ -24,10 +24,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/torus.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -44,7 +44,6 @@
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "polysolv.h"
 #include "matrices.h"
--- triangle.cpp	Sun Jul 18 05:16:28 2004
+++ triangle.cpp	Mon Aug 02 18:11:38 2004
@@ -22,17 +22,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/triangle.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "matrices.h"
 #include "objects.h"
 #include "triangle.h"
--- truetype.cpp	Sun Jul 18 05:16:28 2004
+++ truetype.cpp	Mon Aug 02 18:11:38 2004
@@ -24,17 +24,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/truetype.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "povray.h"
 #include "vector.h"
-#include "povproto.h"
 #include "bbox.h"
 #include "matrices.h"
 #include "objects.h"
--- txttest.cpp	Sun Jul 18 05:16:28 2004
+++ txttest.cpp	Mon Aug 02 18:11:38 2004
@@ -23,10 +23,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/txttest.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -39,7 +39,6 @@
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "texture.h"
 #include "povray.h"    /* [DB 9/94] */
 #include "txttest.h"   /* [DB 9/94] */
--- userdisp.cpp	Sun Jul 18 05:16:28 2004
+++ userdisp.cpp	Mon Aug 02 18:11:38 2004
@@ -22,17 +22,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/userdisp.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include <stdarg.h>
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "parse.h"
 #include "povray.h"
 #include "tokenize.h"
--- userio.cpp	Sun Jul 18 05:16:28 2004
+++ userio.cpp	Mon Aug 02 18:11:38 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/userio.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -34,7 +34,6 @@
 #include <algorithm>
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "parse.h"
 #include "povray.h"
 #include "tokenize.h"
--- vbuffer.cpp	Sun Jul 18 05:16:28 2004
+++ vbuffer.cpp	Mon Aug 02 18:11:38 2004
@@ -24,16 +24,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/vbuffer.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "povray.h"
 #include "bbox.h"
 #include "boxes.h"
--- vlbuffer.cpp	Sun Jul 18 05:16:28 2004
+++ vlbuffer.cpp	Mon Aug 02 18:11:38 2004
@@ -24,16 +24,15 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/vlbuffer.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
 #include "vector.h"
-#include "povproto.h"
 #include "povray.h"
 #include "bbox.h"
 #include "vlbuffer.h"
--- warps.cpp	Sun Jul 18 05:16:28 2004
+++ warps.cpp	Mon Aug 02 18:11:40 2004
@@ -23,16 +23,16 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/warps.cpp $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
 #include "frame.h"
+#include "userio.h"
 #include "vector.h"
-#include "povproto.h"
 #include "matrices.h"
 #include "warps.h"
 #include "pattern.h"
--- colutils.h	Sun Jul 18 05:16:26 2004
+++ colutils.h	Mon Aug 02 18:11:36 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/colutils.h $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -37,6 +37,7 @@
 
 void gamma_correct(COLOUR Colour);
 void extract_colors(COLOUR Colour, unsigned char *Red, unsigned char  *Green, unsigned char  *Blue, unsigned char  *Alpha, DBL *grey);
+void extract_colors_nocorrect(COLOUR Colour, unsigned char *Red, unsigned char  *Green, unsigned char  *Blue, unsigned char  *Alpha, DBL *grey);
 
 /* ------------------------------------------------------ */
 /* small colour */
@@ -45,6 +46,8 @@
 
 void photonRgbe2colour(COLOUR c, SMALL_COLOUR rgbe);
 void colour2photonRgbe(SMALL_COLOUR rgbe, COLOUR c);
+
+void prepare_output_line(COLOUR *Line);
 
 END_POV_NAMESPACE
 
--- fncode.h	Sun Jul 18 05:16:26 2004
+++ fncode.h	Mon Aug 02 18:11:36 2004
@@ -24,10 +24,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/fncode.h $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -36,11 +36,11 @@
 #define FNCODE_H
 
 #include "frame.h"
+#include "userio.h"
 #include "function.h"
 #include "fnsyntax.h"
 #include "parse.h"
 #include "tokenize.h"
-#include "povproto.h"
 #include "textstream.h"
 
 BEGIN_POV_NAMESPACE
--- optout.h	Sun Jul 18 05:36:32 2004
+++ optout.h	Mon Aug 02 18:15:56 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/optout.h $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -49,10 +49,10 @@
 /* These are used by OPTOUT.C and the machine specific modules */
 
 #define POV_RAY_IS_OFFICIAL 0
-#define POV_RAY_VERSION "3.6.0"
+#define POV_RAY_VERSION "3.6.1"
 #define POV_RAY_COPYRIGHT "Copyright 1991-2003 Persistence of Vision Team\nCopyright 2003-2004 Persistence of Vision Raytracer Pty. Ltd."
-#define OFFICIAL_VERSION_NUMBER 360
-#define OFFICIAL_VERSION_NUMBER_HEX 0x0360
+#define OFFICIAL_VERSION_NUMBER 361
+#define OFFICIAL_VERSION_NUMBER_HEX 0x0361
 
 #define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:"
 #ifndef DISTRIBUTION_MESSAGE_2
--- userio.h	Sun Jul 18 05:16:28 2004
+++ userio.h	Mon Aug 02 18:11:38 2004
@@ -22,10 +22,10 @@
  * DKBTrace Ver 2.0-2.12 were written by David K. Buck & Aaron A. Collins.
  *---------------------------------------------------------------------------
  * $File: //depot/povray/3.6-release/source/userio.h $
- * $Revision: #2 $
- * $Change: 2939 $
- * $DateTime: 2004/07/04 13:43:26 $
- * $Author: root $
+ * $Revision: #3 $
+ * $Change: 3032 $
+ * $DateTime: 2004/08/02 18:43:41 $
+ * $Author: chrisc $
  * $Log$
  *****************************************************************************/
 
@@ -96,6 +96,13 @@
 /*****************************************************************************
 * Global functions
 ******************************************************************************/
+
+int CDECL Debug_Info(const char *format, ...);
+int CDECL Warning(unsigned int level, const char *format,...);
+int CDECL WarningAt(unsigned int level, const char *filename, long line, unsigned long offset, const char *format, ...);
+int CDECL Error(const char *format,...);
+int CDECL PossibleError(const char *format,...);
+int CDECL ErrorAt(const char *filename, long line, unsigned long offset, const char *format, ...);
 
 void FlushDebugMessageBuffer();
 
--- Makefile.in	Sun Jul 18 07:10:32 2004
+++ Makefile.in	Mon Aug 02 18:20:10 2004
@@ -76,6 +76,7 @@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 COMPILED_BY = @COMPILED_BY@
+CPLUS_INCLUDE_PATH = @CPLUS_INCLUDE_PATH@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -83,6 +84,7 @@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
+C_INCLUDE_PATH = @C_INCLUDE_PATH@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -125,6 +127,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+VERSION_BASE = @VERSION_BASE@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
@@ -177,7 +180,7 @@
 
 # Source files.
 libpovray_a_SOURCES = \
-atmosph.cpp atmosph.h bbox.cpp bbox.h bcyl.cpp bcyl.h benchmark.cpp bezier.cpp bezier.h blob.cpp blob.h boxes.cpp boxes.h bsphere.cpp bsphere.h camera.cpp camera.h chi2.cpp chi2.h colour.cpp colour.h colutils.cpp colutils.h cones.cpp cones.h csg.cpp csg.h discs.cpp discs.h express.cpp express.h fncode.cpp fncode.h fnintern.cpp fnintern.h fnpovfpu.cpp fnpovfpu.h fnsyntax.cpp fnsyntax.h fpmetric.cpp fpmetric.h fractal.cpp fractal.h frame.h function.cpp function.h gif.cpp gifdecod.cpp gifdecod.h gif.h hcmplx.cpp hcmplx.h hfield.cpp hfield.h histogra.cpp histogra.h iff.cpp iff.h image.cpp image.h interior.cpp interior.h isosurf.cpp isosurf.h jpeg_pov.cpp jpeg_pov.h lathe.cpp lathe.h lbuffer.cpp lbuffer.h lightgrp.cpp lightgrp.h lighting.cpp lighting.h mathutil.cpp mathutil.h matrices.cpp matrices.h media.cpp media.h mesh.cpp mesh.h normal.cpp normal.h objects.cpp objects.h octree.cpp octree.h optout.cpp optout.h parse.cpp parse.h parsestr.cpp parsestr.h parstxtr.cpp parstxtr.h pattern.cpp pattern.h pgm.cpp pgm.h photons.cpp photons.h pigment.cpp pigment.h planes.cpp planes.h png_pov.cpp png_pov.h point.cpp point.h poly.cpp polygon.cpp polygon.h poly.h polysolv.cpp polysolv.h pov_mem.cpp pov_mem.h povmsend.cpp povmsend.h povmsrec.cpp povmsrec.h povproto.h povray.cpp povray.h pov_util.cpp pov_util.h ppm.cpp ppm.h prism.cpp prism.h quadrics.cpp quadrics.h quatern.cpp quatern.h rad_data.cpp radiosit.cpp radiosit.h ray.cpp ray.h rendctrl.cpp rendctrl.h render.cpp render.h renderio.cpp renderio.h sor.cpp sor.h spheres.cpp spheres.h sphsweep.cpp sphsweep.h splines.cpp splines.h statspov.cpp statspov.h super.cpp super.h targa.cpp targa.h texture.cpp texture.h tiff_pov.cpp tiff_pov.h tokenize.cpp tokenize.h torus.cpp torus.h triangle.cpp triangle.h truetype.cpp truetype.h txttest.cpp txttest.h userdisp.cpp userdisp.h userio.cpp userio.h vbuffer.cpp vbuffer.h vector.h vlbuffer.cpp vlbuffer.h warps.cpp warps.h
+atmosph.cpp atmosph.h bbox.cpp bbox.h bcyl.cpp bcyl.h benchmark.cpp benchmark.h bezier.cpp bezier.h blob.cpp blob.h boxes.cpp boxes.h bsphere.cpp bsphere.h camera.cpp camera.h chi2.cpp chi2.h colour.cpp colour.h colutils.cpp colutils.h cones.cpp cones.h csg.cpp csg.h discs.cpp discs.h express.cpp express.h fncode.cpp fncode.h fnintern.cpp fnintern.h fnpovfpu.cpp fnpovfpu.h fnsyntax.cpp fnsyntax.h fpmetric.cpp fpmetric.h fractal.cpp fractal.h frame.h function.cpp function.h gif.cpp gifdecod.cpp gifdecod.h gif.h hcmplx.cpp hcmplx.h hfield.cpp hfield.h histogra.cpp histogra.h iff.cpp iff.h image.cpp image.h interior.cpp interior.h isosurf.cpp isosurf.h jpeg_pov.cpp jpeg_pov.h lathe.cpp lathe.h lbuffer.cpp lbuffer.h lightgrp.cpp lightgrp.h lighting.cpp lighting.h mathutil.cpp mathutil.h matrices.cpp matrices.h media.cpp media.h mesh.cpp mesh.h normal.cpp normal.h objects.cpp objects.h octree.cpp octree.h optout.cpp optout.h parse.cpp parse.h parsestr.cpp parsestr.h parstxtr.cpp parstxtr.h pattern.cpp pattern.h pgm.cpp pgm.h photons.cpp photons.h pigment.cpp pigment.h planes.cpp planes.h png_pov.cpp png_pov.h point.cpp point.h poly.cpp polygon.cpp polygon.h poly.h polysolv.cpp polysolv.h pov_mem.cpp pov_mem.h povmsend.cpp povmsend.h povmsrec.cpp povmsrec.h povray.cpp povray.h pov_util.cpp pov_util.h ppm.cpp ppm.h prism.cpp prism.h quadrics.cpp quadrics.h quatern.cpp quatern.h rad_data.cpp radiosit.cpp radiosit.h ray.cpp ray.h rendctrl.cpp rendctrl.h render.cpp render.h renderio.cpp renderio.h sor.cpp sor.h spheres.cpp spheres.h sphsweep.cpp sphsweep.h splines.cpp splines.h statspov.cpp statspov.h super.cpp super.h targa.cpp targa.h texture.cpp texture.h tiff_pov.cpp tiff_pov.h tokenize.cpp tokenize.h torus.cpp torus.h triangle.cpp triangle.h truetype.cpp truetype.h txttest.cpp txttest.h userdisp.cpp userdisp.h userio.cpp userio.h vbuffer.cpp vbuffer.h vector.h vlbuffer.cpp vlbuffer.h warps.cpp warps.h
 
 
 # Include paths for headers.