Dave Bodenstab <dav### [at] sbcglobalnet> wrote:

> I grabbed the source directly from this link when applying Mr. Bourke's and my
patches:
>
>    ftp://ftp.povray.org/pub/povray/Official/Unix/povray-3.6.1.tar.bz2


I found winmerge lastnight and had a look at the unix code.

Here is the first render patch I found. The header should stay until the patch
to remove it.

Maybe should start a new thread -windows source patch upgrades- or something
like that, if I can isolate more.

Is there another list of changes?
http://www.povray.org/download/features/3.6.1.php


unclippedcolor.patch.txt (chormann)

--- F:/povray-3.6/source/render.cpp Sun Jul 18 05:16:26 2004
+++ F:/povray-3.6.1/source/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)

Post a reply to this message