[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49398] branches/soc-2011-tomato/source/ blender/blenkernel: Color management: initialize input color space for newly opening images

[Sergey Sharybin]

Revision: 49398
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49398
Author:   nazgul
Date:     2012-07-30 16:07:37 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Color management: initialize input color space for newly opening images

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h	2012-07-30 16:07:30 UTC (rev 49397)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_colortools.h	2012-07-30 16:07:37 UTC (rev 49398)
@@ -31,6 +31,7 @@
  *  \ingroup bke
  */
 
+struct ColorManagedColorspaceSettings;
 struct ColorManagedDisplaySettings;
 struct ColorManagedViewSettings;
 struct CurveMapping;
@@ -90,4 +91,8 @@
 void BKE_color_managed_view_settings_copy(struct ColorManagedViewSettings *new_settings,
                                           const struct ColorManagedViewSettings *settings);
 
+void BKE_color_managed_colorspace_settings_init(struct ColorManagedColorspaceSettings *colorspace_settings);
+void BKE_color_managed_colorspace_settings_copy(struct ColorManagedColorspaceSettings *colorspace_settings,
+                                                const struct ColorManagedColorspaceSettings *settings);
+
 #endif

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c	2012-07-30 16:07:30 UTC (rev 49397)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/colortools.c	2012-07-30 16:07:37 UTC (rev 49398)
@@ -1244,3 +1244,14 @@
 	new_settings->exposure = settings->exposure;
 	new_settings->gamma = settings->gamma;
 }
+
+void BKE_color_managed_colorspace_settings_init(ColorManagedColorspaceSettings *colorspace_settings)
+{
+	BLI_strncpy(colorspace_settings->name, "NONE", sizeof(colorspace_settings->name));
+}
+
+void BKE_color_managed_colorspace_settings_copy(ColorManagedColorspaceSettings *colorspace_settings,
+                                                const ColorManagedColorspaceSettings *settings)
+{
+	BLI_strncpy(colorspace_settings->name, settings->name, sizeof(colorspace_settings->name));
+}

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c	2012-07-30 16:07:30 UTC (rev 49397)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c	2012-07-30 16:07:37 UTC (rev 49398)
@@ -71,6 +71,7 @@
 #include "BLI_bpath.h"
 
 #include "BKE_bmfont.h"
+#include "BKE_colortools.h"
 #include "BKE_global.h"
 #include "BKE_icons.h"
 #include "BKE_image.h"
@@ -245,6 +246,8 @@
 
 		ima->source = source;
 		ima->type = type;
+
+		BKE_color_managed_colorspace_settings_init(&ima->colorspace_settings);
 	}
 	return ima;
 }
@@ -327,6 +330,8 @@
 	nima->aspx = ima->aspx;
 	nima->aspy = ima->aspy;
 
+	BKE_color_managed_colorspace_settings_copy(&nima->colorspace_settings, &ima->colorspace_settings);
+
 	return nima;
 }