[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50626] branches/soc-2011-tomato/source/ blender: Silence compiler's warnings.

Sergey Sharybin sergey.vfx at gmail.com
Sat Sep 15 10:35:28 CEST 2012


Revision: 50626
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50626
Author:   nazgul
Date:     2012-09-15 08:35:26 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
Silence compiler's warnings.

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

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c	2012-09-15 07:53:34 UTC (rev 50625)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c	2012-09-15 08:35:26 UTC (rev 50626)
@@ -311,7 +311,7 @@
 
 /*********************** Sequencer color space functions  *************************/
 
-void BKE_sequencer_imbuf_assign_spaces(Scene *scene, ImBuf *ibuf)
+static void sequencer_imbuf_assign_spaces(Scene *scene, ImBuf *ibuf)
 {
 	IMB_colormanagement_imbuf_assign_float_space(ibuf, &scene->sequencer_colorspace_settings);
 }
@@ -1303,7 +1303,7 @@
 		ImBuf *ibuf = IMB_loadiffname(name, IB_rect, NULL);
 
 		if (ibuf)
-			BKE_sequencer_imbuf_assign_spaces(context.scene, ibuf);
+			sequencer_imbuf_assign_spaces(context.scene, ibuf);
 
 		return ibuf;
 	}
@@ -1981,7 +1981,7 @@
 		 * changing the cached image... */
 		ibuf = IMB_dupImBuf(ibuf);
 
-		BKE_sequencer_imbuf_assign_spaces(context.scene, ibuf);
+		sequencer_imbuf_assign_spaces(context.scene, ibuf);
 
 		if (nr == 0) {
 			BKE_sequencer_cache_put(context, seq, seq->start, SEQ_STRIPELEM_IBUF_STARTSTILL, ibuf);
@@ -2583,7 +2583,7 @@
 		case SEQ_TYPE_MOVIECLIP:
 		{
 			ibuf = seq_render_movieclip_strip(context, seq, nr);
-			BKE_sequencer_imbuf_assign_spaces(context.scene, ibuf);
+			sequencer_imbuf_assign_spaces(context.scene, ibuf);
 
 			if (ibuf && use_preprocess) {
 				ImBuf *i = IMB_dupImBuf(ibuf);
@@ -2608,7 +2608,7 @@
 	}
 
 	if (ibuf)
-		BKE_sequencer_imbuf_assign_spaces(context.scene, ibuf);
+		sequencer_imbuf_assign_spaces(context.scene, ibuf);
 
 	return ibuf;
 }
@@ -2653,7 +2653,7 @@
 
 	if (ibuf == NULL) {
 		ibuf = IMB_allocImBuf(context.rectx, context.recty, 32, IB_rect);
-		BKE_sequencer_imbuf_assign_spaces(context.scene, ibuf);
+		sequencer_imbuf_assign_spaces(context.scene, ibuf);
 	}
 
 	if (ibuf->x != context.rectx || ibuf->y != context.recty)

Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c	2012-09-15 07:53:34 UTC (rev 50625)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c	2012-09-15 08:35:26 UTC (rev 50626)
@@ -497,7 +497,7 @@
 	global_tot_display = tot_display;
 }
 
-void colormanage_free_config(void)
+static void colormanage_free_config(void)
 {
 	ColorSpace *colorspace;
 	ColorManagedDisplay *display;




More information about the Bf-blender-cvs mailing list