[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51043] trunk/blender/source/blender/imbuf /intern/colormanagement.c: And this file was also missed in previous commit , pardon.

[Sergey Sharybin]

Revision: 51043
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51043
Author:   nazgul
Date:     2012-10-04 13:44:24 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
And this file was also missed in previous commit, pardon.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/colormanagement.c

Modified: trunk/blender/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/colormanagement.c	2012-10-04 13:41:22 UTC (rev 51042)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c	2012-10-04 13:44:24 UTC (rev 51043)
@@ -546,6 +546,8 @@
 
 	/* free views */
 	BLI_freelistN(&global_views);
+
+	OCIO_exit();
 }
 
 void colormanagement_init(void)
@@ -555,6 +557,8 @@
 	char configfile[FILE_MAX];
 	ConstConfigRcPtr *config = NULL;
 
+	OCIO_init();
+
 	ocio_env = getenv("OCIO");
 
 	if (ocio_env && ocio_env[0] != '\0')
@@ -571,7 +575,9 @@
 	}
 
 	if (config == NULL) {
-		config = OCIO_getDefaultConfig();
+		printf("Color management: using fallback mode for management\n");
+
+		config = OCIO_configCreateFallback();
 	}
 
 	if (config) {
@@ -638,19 +644,15 @@
 {
 	ConstConfigRcPtr *config = OCIO_getCurrentConfig();
 
-	if (config) {
-		const char *display = display_settings->display_device;
-		const char *view = view_settings->view_transform;
-		const char *colorspace_name;
+	const char *display = display_settings->display_device;
+	const char *view = view_settings->view_transform;
+	const char *colorspace_name;
 
-		colorspace_name = OCIO_configGetDisplayColorSpaceName(config, display, view);
+	colorspace_name = OCIO_configGetDisplayColorSpaceName(config, display, view);
 
-		OCIO_configRelease(config);
+	OCIO_configRelease(config);
 
-		return colorspace_name;
-	}
-
-	return NULL;
+	return colorspace_name;
 }
 
 static ColorSpace *display_transform_get_colorspace(const ColorManagedViewSettings *view_settings,
@@ -671,12 +673,6 @@
 	DisplayTransformRcPtr *dt;
 	ConstProcessorRcPtr *processor;
 
-	if (!config) {
-		/* there's no valid OCIO configuration, can't create processor */
-
-		return NULL;
-	}
-
 	dt = OCIO_createDisplayTransform();
 
 	/* assuming handling buffer was already converted to scene linear space */
@@ -726,12 +722,6 @@
 	ConstConfigRcPtr *config = OCIO_getCurrentConfig();
 	ConstProcessorRcPtr *processor;
 
-	if (!config) {
-		/* there's no valid OCIO configuration, can't create processor */
-
-		return NULL;
-	}
-
 	processor = OCIO_configGetProcessorWithNames(config, from_colorspace, to_colorspace);
 
 	OCIO_configRelease(config);
@@ -881,7 +871,7 @@
 {
 	ColorSpace *colorspace = colormanage_colorspace_get_named(from_colorspace);
 
-	if (colorspace && colorspace->is_data) {
+	if (colorspace->is_data) {
 		ibuf->colormanage_flag |= IMB_COLORMANAGE_IS_DATA;
 		return;
 	}
@@ -1074,7 +1064,7 @@
 {
 	ColorSpace *colorspace = colormanage_colorspace_get_named(name);
 
-	if (colorspace && colorspace->is_data)
+	if (colorspace->is_data)
 		ibuf->colormanage_flag |= IMB_COLORMANAGE_IS_DATA;
 	else
 		ibuf->colormanage_flag &= ~IMB_COLORMANAGE_IS_DATA;
@@ -1086,7 +1076,7 @@
 
 	ibuf->float_colorspace = colorspace;
 
-	if (colorspace && colorspace->is_data)
+	if (colorspace->is_data)
 		ibuf->colormanage_flag |= IMB_COLORMANAGE_IS_DATA;
 	else
 		ibuf->colormanage_flag &= ~IMB_COLORMANAGE_IS_DATA;
@@ -1098,7 +1088,7 @@
 
 	ibuf->rect_colorspace = colorspace;
 
-	if (colorspace && colorspace->is_data)
+	if (colorspace->is_data)
 		ibuf->colormanage_flag |= IMB_COLORMANAGE_IS_DATA;
 	else
 		ibuf->colormanage_flag &= ~IMB_COLORMANAGE_IS_DATA;
@@ -1898,12 +1888,6 @@
 	ConstConfigRcPtr *config = OCIO_getCurrentConfig();
 	const char *display_name;
 
-	if (!config) {
-		/* no valid OCIO configuration, can't get default display */
-
-		return NULL;
-	}
-
 	display_name = OCIO_configGetDefaultDisplay(config);
 
 	OCIO_configRelease(config);
@@ -2015,12 +1999,6 @@
 	ConstConfigRcPtr *config = OCIO_getCurrentConfig();
 	const char *name;
 
-	if (!config) {
-		/* no valid OCIO configuration, can't get default view */
-
-		return NULL;
-	}
-
 	name = OCIO_configGetDefaultView(config, display->name);
 
 	OCIO_configRelease(config);