dpx/cineon was using the OUTPUT settings when loading DPX - white point, blackpoint, gamma, log.

Allow DPX's with different color channel types to load, even if they are unsupported.

Saving log DPX's is broken, the header will always be written with log off because dpxCreate is called before the image presets are set. However there is no access to image presets before running dpxCreate() so log data is written but the header always sets it off.
Made a fix for this but couldn't test because it seems loading log images is also broken.

Enable verbose DPX output when '-d' debug flag is used.

2 files changed, 34 insertions, 7 deletions

diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.c b/source/blender/imbuf/intern/cineon/cineon_dpx.c
index 514d6b5522b..203eb8fe314 100644
--- a/source/blender/imbuf/intern/cineon/cineon_dpx.c
+++ b/source/blender/imbuf/intern/cineon/cineon_dpx.c
@@ -56,7 +56,6 @@ static void cineon_conversion_parameters(LogImageByteConversionParameters *param
 
 static struct ImBuf *imb_load_dpx_cineon(unsigned char *mem, int use_cineon, int size, int flags)
 {
-	LogImageByteConversionParameters conversion;
 	ImBuf *ibuf;
 	LogImageFile *image;
 	int x, y;
@@ -64,7 +63,7 @@ static struct ImBuf *imb_load_dpx_cineon(unsigned char *mem, int use_cineon, int
 	int width, height, depth;
 	float *frow;
 
-	cineon_conversion_parameters(&conversion);
+	logImageSetVerbose((G.f & G_DEBUG) ? 1:0);
 	
 	image = logImageOpenFromMem(mem, size, use_cineon);
 	
@@ -85,15 +84,13 @@ static struct ImBuf *imb_load_dpx_cineon(unsigned char *mem, int use_cineon, int
 		return NULL;
 	}
 	
-	logImageSetByteConversion(image, &conversion);
-
 	ibuf = IMB_allocImBuf(width, height, 32, IB_rectfloat | flags, 0);
 
 	row = MEM_mallocN(sizeof(unsigned short)*width*depth, "row in cineon_dpx.c");
 	frow = ibuf->rect_float+width*height*4;
 	
 	for (y = 0; y < height; y++) {
-		logImageGetRowBytes(image, row, y);
+		logImageGetRowBytes(image, row, y); /* checks image->params.doLogarithm and convert */
 		upix = row;
 		frow -= width*4;
 		
@@ -143,7 +140,7 @@ static int imb_save_dpx_cineon(ImBuf *buf, char *filename, int use_cineon, int f
 		}
 	}
 	
-	logImageSetVerbose(0);
+	logImageSetVerbose((G.f & G_DEBUG) ? 1:0);
 	logImage = logImageCreate(filename, use_cineon, width, height, depth);
 
 	if (!logImage) return 0;
diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c
index 8a9adc73cdc..37e7ef3fc33 100644
--- a/source/blender/imbuf/intern/cineon/dpxlib.c
+++ b/source/blender/imbuf/intern/cineon/dpxlib.c
@@ -477,19 +477,49 @@ intern_dpxOpen(int mode, const char* bytestuff, int bufsize) {
 
 	logImageGetByteConversionDefaults(&dpx->params);
 	/* The SMPTE define this code:
+	 *  0 - User-defined
+	 *  1 - Printing density
 	 *  2 - Linear
 	 *  3 - Logarithmic
+	 *  4 - Unspecified video
+	 *  5 - SMPTE 240M
+	 *  6 - CCIR 709-1
+	 *  7 - CCIR 601-2 system B or G
+	 *  8 - CCIR 601-2 system M
+	 *  9 - NTSC composite video
+	 *  10 - PAL composite video
+	 *  11 - Z linear
+	 *  12 - homogeneous
 	 *
 	 * Note that transfer_characteristics is U8, don't need
 	 * check the byte order.
 	 */
+	
 	switch (header.imageInfo.channel[0].transfer_characteristics) {
-		case 2:
+		case 1:
+		case 2: /* linear */
 			dpx->params.doLogarithm= 0;
 			break;
+		
 		case 3:
 			dpx->params.doLogarithm= 1;
 			break;
+		
+		/* TODO - Unsupported, but for now just load them,
+		 * colors may look wrong, but can solve color conversion later
+		 */
+		case 4: 
+		case 5:
+		case 6:
+		case 7:
+		case 8:
+		case 9:
+		case 10:
+		case 11:
+		case 12:
+			if (verbose) d_printf("Un-supported Transfer Characteristics: %d using linear color conversion\n", header.imageInfo.channel[0].transfer_characteristics);
+			dpx->params.doLogarithm= 0;
+			break;
 		default:
 			if (verbose) d_printf("Un-supported Transfer Characteristics: %d\n", header.imageInfo.channel[0].transfer_characteristics);
 			dpxClose(dpx);