From 0f0a1398e582eeaab8fba3a2ea0ffffad8f6228b Mon Sep 17 00:00:00 2001
From: Emil Martinec <ejmartin@uchicago.edu>
Date: Thu, 30 Jun 2011 14:21:32 -0500
Subject: [PATCH] Bugfix for highlight reconstruction.

---
 rtengine/hilite_recon.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rtengine/hilite_recon.cc b/rtengine/hilite_recon.cc
index 0df494ea1..d28545d2b 100644
--- a/rtengine/hilite_recon.cc
+++ b/rtengine/hilite_recon.cc
@@ -489,15 +489,15 @@ void RawImageSource :: HLRecovery_inpaint (float** red, float** green, float** b
 				int notclipped[3] = {pixel[0]<max[0] ? 1 : 0, pixel[1]<max[1] ? 1 : 0, pixel[2]<max[2] ? 1 : 0};
 				
 				if (notclipped[0]==0) {//red clipped
-					red[i][j]  = (clipfix[0]*MAX(1,((notclipped[1]*pixel[1] + notclipped[2]*pixel[2])/ \
+					red[i][j]  = MAX(red[i][j],(clipfix[0]*((notclipped[1]*pixel[1] + notclipped[2]*pixel[2])/ \
 																(notclipped[1]*clipfix[1] + notclipped[2]*clipfix[2]))));
 				}
 				if (notclipped[1]==0) {//green clipped
-					green[i][j] = (clipfix[1]*MAX(1,((notclipped[2]*pixel[2] + notclipped[0]*pixel[0])/ \
+					green[i][j] = MAX(green[i][j],(clipfix[1]*((notclipped[2]*pixel[2] + notclipped[0]*pixel[0])/ \
 																   (notclipped[2]*clipfix[2] + notclipped[0]*clipfix[0]))));
 				}
 				if (notclipped[2]==0) {//blue clipped
-					blue[i][j]  = (clipfix[2]*MAX(1,((notclipped[0]*pixel[0] + notclipped[1]*pixel[1])/ \
+					blue[i][j]  = MAX(blue[i][j],(clipfix[2]*((notclipped[0]*pixel[0] + notclipped[1]*pixel[1])/ \
 																 (notclipped[0]*clipfix[0] + notclipped[1]*clipfix[1]))));
 				}
 			}