[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50593] branches/soc-2011-tomato/source/ blender/imbuf: Color Management: remove unused functions

Sergey Sharybin sergey.vfx at gmail.com
Fri Sep 14 16:36:53 CEST 2012


Revision: 50593
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50593
Author:   nazgul
Date:     2012-09-14 14:36:53 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
Color Management: remove unused functions

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/imbuf/IMB_colormanagement.h
    branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c

Modified: branches/soc-2011-tomato/source/blender/imbuf/IMB_colormanagement.h
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/IMB_colormanagement.h	2012-09-14 14:36:47 UTC (rev 50592)
+++ branches/soc-2011-tomato/source/blender/imbuf/IMB_colormanagement.h	2012-09-14 14:36:53 UTC (rev 50593)
@@ -85,18 +85,12 @@
 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_pixel_to_role_v4(float pixel[4], int role);
-void IMB_colormanagement_pixel_from_role_v4(float pixel[4], int role);
-
 void IMB_colormanagement_imbuf_assign_spaces(struct ImBuf *ibuf, struct ColorManagedColorspaceSettings *colorspace_settings);
-void IMB_colormanagement_imbuf_assign_default_spaces(struct ImBuf *ibuf);
 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);
 
-void IMB_colormanagement_imbuf_make_colorspace(struct ImBuf *ibuf, const char *to_colorspace, int flag);
-
 /* ** Public display buffers interfaces ** */
 
 unsigned char *IMB_display_buffer_acquire(struct ImBuf *ibuf, const struct ColorManagedViewSettings *view_settings,

Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c	2012-09-14 14:36:47 UTC (rev 50592)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c	2012-09-14 14:36:53 UTC (rev 50593)
@@ -1613,46 +1613,6 @@
 	IMB_colormanagement_processor_free(cm_processor);
 }
 
-void IMB_colormanagement_pixel_to_role_v4(float pixel[4], int role)
-{
-#ifdef WITH_OCIO
-		ConstProcessorRcPtr *processor;
-		const char *from_colorspace = global_role_scene_linear;
-		const char *to_colorspace = IMB_colormanagement_role_colorspace_name_get(role);
-
-		processor = create_colorspace_transform_processor(from_colorspace, to_colorspace);
-
-		if (processor) {
-			OCIO_processorApplyRGBA(processor, pixel);
-
-			OCIO_processorRelease(processor);
-		}
-#else
-	(void) pixel;
-	(void) role;
-#endif
-}
-
-void IMB_colormanagement_pixel_from_role_v4(float pixel[4], int role)
-{
-#ifdef WITH_OCIO
-		ConstProcessorRcPtr *processor;
-		const char *from_colorspace = IMB_colormanagement_role_colorspace_name_get(role);
-		const char *to_colorspace = global_role_scene_linear;
-
-		processor = create_colorspace_transform_processor(from_colorspace, to_colorspace);
-
-		if (processor) {
-			OCIO_processorApplyRGBA(processor, pixel);
-
-			OCIO_processorRelease(processor);
-		}
-#else
-	(void) pixel;
-	(void) role;
-#endif
-}
-
 void IMB_colormanagement_imbuf_assign_spaces(ImBuf *ibuf, ColorManagedColorspaceSettings *colorspace_settings)
 {
 #ifdef WITH_OCIO
@@ -1680,11 +1640,6 @@
 #endif
 }
 
-void IMB_colormanagement_imbuf_assign_default_spaces(ImBuf *ibuf)
-{
-	IMB_colormanagement_imbuf_assign_spaces(ibuf, NULL);
-}
-
 void IMB_colormanagement_imbuf_assign_float_space(ImBuf *ibuf, ColorManagedColorspaceSettings *colorspace_settings)
 {
 	ibuf->float_colorspace = colormanage_colorspace_get_named(colorspace_settings->name);
@@ -1714,16 +1669,6 @@
 #endif
 }
 
-void IMB_colormanagement_imbuf_make_colorspace(ImBuf *ibuf, const char *to_colorspace, int flag)
-{
-	int predivide = ibuf->flags & IB_cm_predivide;
-
-	if (ibuf->rect_float && (flag & IB_rectfloat)) {
-		IMB_colormanagement_transform(ibuf->rect_float, ibuf->x, ibuf->y, ibuf->channels,
-		                              global_role_scene_linear, to_colorspace, predivide);
-	}
-}
-
 static void imbuf_verify_float(ImBuf *ibuf)
 {
 	/* multiple threads could request for display buffer at once and in case




More information about the Bf-blender-cvs mailing list