[Bf-blender-cvs] [b8bdca8c0a3] blender-v2.79a-release: Fix T53499: Cannot load DPX files

[Sergey Sharybin]

Commit: b8bdca8c0a3d6c09e1ddd7bb28828444d3c91230
Author: Sergey Sharybin
Date:   Thu Dec 7 14:07:57 2017 +0100
Branches: blender-v2.79a-release
https://developer.blender.org/rBb8bdca8c0a3d6c09e1ddd7bb28828444d3c91230

Fix T53499: Cannot load DPX files

The issue was caused by unspecified color transfer. New behavior gives same
result as other viewers here, so likely is fine :)

===================================================================

M	source/blender/imbuf/intern/cineon/logImageCore.c

===================================================================

diff --git a/source/blender/imbuf/intern/cineon/logImageCore.c b/source/blender/imbuf/intern/cineon/logImageCore.c
index 600642f5e44..7b5dec4da41 100644
--- a/source/blender/imbuf/intern/cineon/logImageCore.c
+++ b/source/blender/imbuf/intern/cineon/logImageCore.c
@@ -1020,6 +1020,7 @@ static int convertRGBA_RGB(float *src, float *dst, LogImageFile *logImage,
 	float *dst_ptr = dst;
 
 	switch (logElement.transfer) {
+		case transfer_Unspecified:
 		case transfer_UserDefined:
 		case transfer_Linear:
 		case transfer_Logarithmic: {
@@ -1054,6 +1055,7 @@ static int convertRGBA_RGB(float *src, float *dst, LogImageFile *logImage,
 		}
 
 		default:
+			if (verbose) printf("DPX/Cineon: Unknown transfer %d.\n", logElement.transfer);
 			return 1;
 	}
 }
@@ -1066,6 +1068,7 @@ static int convertRGB_RGBA(float *src, float *dst, LogImageFile *logImage,
 	float *dst_ptr = dst;
 
 	switch (logElement.transfer) {
+		case transfer_Unspecified:
 		case transfer_UserDefined:
 		case transfer_Linear:
 		case transfer_Logarithmic: {
@@ -1100,6 +1103,7 @@ static int convertRGB_RGBA(float *src, float *dst, LogImageFile *logImage,
 		}
 
 		default:
+			if (verbose) printf("DPX/Cineon: Unknown transfer %d.\n", logElement.transfer);
 			return 1;
 	}
 }