From cc32c232a49689ea6aa33d9b370f7d6d6d821ed3 Mon Sep 17 00:00:00 2001
From: natureh 510 <natureh.510@gmail.com>
Date: Sat, 16 Mar 2013 02:10:58 +0100
Subject: [PATCH] White balance was not applied for standard images at 1:1
 scale

---
 rtengine/image16.cc    | 6 +++---
 rtengine/image8.cc     | 6 +++---
 rtengine/imagefloat.cc | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/rtengine/image16.cc b/rtengine/image16.cc
index 62ab5248d..613971960 100644
--- a/rtengine/image16.cc
+++ b/rtengine/image16.cc
@@ -187,9 +187,9 @@ void Image16::getStdImage (ColorTemp ctemp, int tran, Imagefloat* image, Preview
                 if (src_x>=maxx)
                     continue;
 
-                lineR[dst_x] = r(src_y, src_x);
-                lineG[dst_x] = g(src_y, src_x);
-                lineB[dst_x] = b(src_y, src_x);
+                lineR[dst_x] = CLIP(rm2*r(src_y, src_x));
+                lineG[dst_x] = CLIP(gm2*g(src_y, src_x));
+                lineB[dst_x] = CLIP(bm2*b(src_y, src_x));
             }
         }
         else {
diff --git a/rtengine/image8.cc b/rtengine/image8.cc
index d24409845..ddf75cb47 100644
--- a/rtengine/image8.cc
+++ b/rtengine/image8.cc
@@ -161,9 +161,9 @@ void Image8::getStdImage (ColorTemp ctemp, int tran, Imagefloat* image, PreviewP
                 convertTo(r(src_y, src_x), r_);
                 convertTo(g(src_y, src_x), g_);
                 convertTo(b(src_y, src_x), b_);
-                lineR[dst_x] = r_;
-                lineG[dst_x] = g_;
-                lineB[dst_x] = b_;
+                lineR[dst_x] = CLIP(rm2*r_);
+                lineG[dst_x] = CLIP(gm2*g_);
+                lineB[dst_x] = CLIP(bm2*b_);
             }
         }
         else {
diff --git a/rtengine/imagefloat.cc b/rtengine/imagefloat.cc
index 96bb85340..fc096434c 100644
--- a/rtengine/imagefloat.cc
+++ b/rtengine/imagefloat.cc
@@ -178,9 +178,9 @@ void Imagefloat::getStdImage (ColorTemp ctemp, int tran, Imagefloat* image, Prev
                 if (src_x>=maxx)
                     continue;
 
-                lineR[dst_x] = r(src_y, src_x);
-                lineG[dst_x] = g(src_y, src_x);
-                lineB[dst_x] = b(src_y, src_x);
+                lineR[dst_x] = CLIP(rm2*r(src_y, src_x));
+                lineG[dst_x] = CLIP(gm2*g(src_y, src_x));
+                lineB[dst_x] = CLIP(bm2*b(src_y, src_x));
             }
         }
         else {