support for colorspace conversion when saving srgb float buffers (from the sequencer) as openexr.

1 files changed, 29 insertions, 16 deletions

diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 22af379d949..a0969979817 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -229,29 +229,44 @@ static int imb_save_openexr_half(struct ImBuf *ibuf, char *name, int flags)
 											sizeof(float), sizeof(float) * -width));
 		if(ibuf->rect_float) {
 			float *from;
-			
-			for (int i = ibuf->y-1; i >= 0; i--) 
-			{
-				from= ibuf->rect_float + channels*i*width;
-				
-				for (int j = ibuf->x; j > 0; j--) 
+
+			if(ibuf->profile == IB_PROFILE_LINEAR_RGB) {
+				for (int i = ibuf->y-1; i >= 0; i--)
 				{
-					to->r = from[0];
-					to->g = from[1];
-					to->b = from[2];
-					to->a = (channels >= 4)? from[3]: 1.0f;
-					to++; from += 4;
+					from= ibuf->rect_float + channels*i*width;
+
+					for (int j = ibuf->x; j > 0; j--)
+					{
+						to->r = from[0];
+						to->g = from[1];
+						to->b = from[2];
+						to->a = (channels >= 4)? from[3]: 1.0f;
+						to++; from += 4;
+					}
+				}
+			}
+			else {
+				for (int i = ibuf->y-1; i >= 0; i--)
+				{
+					from= ibuf->rect_float + channels*i*width;
+
+					for (int j = ibuf->x; j > 0; j--)
+					{
+						to->r = srgb_to_linearrgb(from[0]);
+						to->g = srgb_to_linearrgb(from[1]);
+						to->b = srgb_to_linearrgb(from[2]);
+						to->a = (channels >= 4)? from[3]: 1.0f;
+						to++; from += 4;
+					}
 				}
 			}
 		}
 		else {
 			unsigned char *from;
 
-			if(ibuf->profile != IB_PROFILE_NONE) {
+			if(ibuf->profile == IB_PROFILE_LINEAR_RGB) {
 				for (int i = ibuf->y-1; i >= 0; i--)
 				{
-					from= (unsigned char *)ibuf->rect + channels*i*width;
-
 					for (int j = ibuf->x; j > 0; j--)
 					{
 						to->r = (float)(from[0])/255.0;
@@ -265,8 +280,6 @@ static int imb_save_openexr_half(struct ImBuf *ibuf, char *name, int flags)
 			else {
 				for (int i = ibuf->y-1; i >= 0; i--)
 				{
-					from= (unsigned char *)ibuf->rect + channels*i*width;
-
 					for (int j = ibuf->x; j > 0; j--)
 					{
 						to->r = srgb_to_linearrgb((float)from[0] / 255.0);