[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50884] trunk/blender/source/blender: code cleanup: make naming more consistent
Sergey Sharybin
sergey.vfx at gmail.com
Tue Sep 25 12:21:51 CEST 2012
Revision: 50884
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50884
Author: nazgul
Date: 2012-09-25 10:21:51 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
code cleanup: make naming more consistent
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/imbuf/IMB_colormanagement.h
trunk/blender/source/blender/imbuf/intern/colormanagement.c
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-09-25 10:18:58 UTC (rev 50883)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2012-09-25 10:21:51 UTC (rev 50884)
@@ -313,7 +313,7 @@
static void sequencer_imbuf_assign_spaces(Scene *scene, ImBuf *ibuf)
{
- IMB_colormanagement_imbuf_assign_float_space(ibuf, &scene->sequencer_colorspace_settings);
+ IMB_colormanagement_assign_float_colorspace(ibuf, scene->sequencer_colorspace_settings.name);
}
void BKE_sequencer_imbuf_to_sequencer_space(Scene *scene, ImBuf *ibuf, int make_float)
Modified: trunk/blender/source/blender/imbuf/IMB_colormanagement.h
===================================================================
--- trunk/blender/source/blender/imbuf/IMB_colormanagement.h 2012-09-25 10:18:58 UTC (rev 50883)
+++ trunk/blender/source/blender/imbuf/IMB_colormanagement.h 2012-09-25 10:21:51 UTC (rev 50884)
@@ -59,6 +59,7 @@
const char *IMB_colormanagement_role_colorspace_name_get(int role);
void IMB_colormanagement_check_is_data(struct ImBuf *ibuf, const char *name);
+void IMB_colormanagement_assign_float_colorspace(struct ImBuf *ibuf, const char *name);
void IMB_colormanagement_assign_rect_colorspace(struct ImBuf *ibuf, const char *name);
/* ** Color space transformation functions ** */
@@ -82,8 +83,6 @@
void IMB_colormanagement_pixel_to_display_space_v3(float result[3], const float pixel[3], const struct ColorManagedViewSettings *view_settings,
const struct ColorManagedDisplaySettings *display_settings);
-void IMB_colormanagement_imbuf_assign_float_space(struct ImBuf *ibuf, struct ColorManagedColorspaceSettings *colorspace_settings);
-
void IMB_colormanagement_imbuf_make_display_space(struct ImBuf *ibuf, const struct ColorManagedViewSettings *view_settings,
const struct ColorManagedDisplaySettings *display_settings);
Modified: trunk/blender/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/colormanagement.c 2012-09-25 10:18:58 UTC (rev 50883)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c 2012-09-25 10:21:51 UTC (rev 50884)
@@ -1081,6 +1081,18 @@
ibuf->colormanage_flag &= ~IMB_COLORMANAGE_IS_DATA;
}
+void IMB_colormanagement_assign_float_colorspace(ImBuf *ibuf, const char *name)
+{
+ ColorSpace *colorspace = colormanage_colorspace_get_named(name);
+
+ ibuf->float_colorspace = colorspace;
+
+ if (colorspace->is_data)
+ ibuf->colormanage_flag |= IMB_COLORMANAGE_IS_DATA;
+ else
+ ibuf->colormanage_flag &= ~IMB_COLORMANAGE_IS_DATA;
+}
+
void IMB_colormanagement_assign_rect_colorspace(ImBuf *ibuf, const char *name)
{
ColorSpace *colorspace = colormanage_colorspace_get_named(name);
@@ -1634,11 +1646,6 @@
IMB_colormanagement_processor_free(cm_processor);
}
-void IMB_colormanagement_imbuf_assign_float_space(ImBuf *ibuf, ColorManagedColorspaceSettings *colorspace_settings)
-{
- ibuf->float_colorspace = colormanage_colorspace_get_named(colorspace_settings->name);
-}
-
static void colormanagement_imbuf_make_display_space(ImBuf *ibuf, const ColorManagedViewSettings *view_settings,
const ColorManagedDisplaySettings *display_settings, int make_byte)
{
More information about the Bf-blender-cvs
mailing list