[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58432] trunk/blender: edit to r58425, BLI_math is available here, better not copy, paste from linearrgb_to_srgb.

[Campbell Barton]

Revision: 58432
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58432
Author:   campbellbarton
Date:     2013-07-20 00:35:41 +0000 (Sat, 20 Jul 2013)
Log Message:
-----------
edit to r58425, BLI_math is available here, better not copy,paste from linearrgb_to_srgb.
also remove redundant check in AUD_FFMPEGReader::seek.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58425

Modified Paths:
--------------
    trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
    trunk/blender/source/gameengine/Ketsji/KX_FontObject.cpp

Modified: trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp	2013-07-20 00:21:16 UTC (rev 58431)
+++ trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp	2013-07-20 00:35:41 UTC (rev 58432)
@@ -347,10 +347,6 @@
 		uint64_t st_time = m_formatCtx->start_time;
 		uint64_t seek_pos = ((uint64_t)position) * ((uint64_t)AV_TIME_BASE) / ((uint64_t)m_specs.rate);
 
-		if (seek_pos < 0) {
-			seek_pos = 0;
-		}
-
 		if (st_time != AV_NOPTS_VALUE) {
 			seek_pos += st_time;
 		}

Modified: trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/ghost/SConscript	2013-07-20 00:21:16 UTC (rev 58431)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/SConscript	2013-07-20 00:35:41 UTC (rev 58432)
@@ -43,7 +43,7 @@
     '#intern/guardedalloc',
     '#intern/moto/include',
     '#intern/container',
-	'#intern/audaspace/intern',
+    '#intern/audaspace/intern',
     '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer',
     '#source/gameengine/BlenderRoutines',
     '#source/gameengine/Converter',

Modified: trunk/blender/source/gameengine/Ketsji/KX_FontObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_FontObject.cpp	2013-07-20 00:21:16 UTC (rev 58431)
+++ trunk/blender/source/gameengine/Ketsji/KX_FontObject.cpp	2013-07-20 00:35:41 UTC (rev 58432)
@@ -178,19 +178,12 @@
 
 	/* Font Objects don't use the glsl shader, this color management code is copied from gpu_shader_material.glsl */
 	float color[4];
-	for (int i = 0; i < 3; i++) {
-		if (m_do_color_management) {
-			float c = m_color[i];
-			if(c < 0.0031308)
-				c = (c < 0.0) ? 0.0: c * 12.92;
-			else
-				c = 1.055 * pow(c, 1.0f/2.4f) - 0.055;
-			color[i] = c;
-		}
-		else
-			color[i] = m_color[i];
+	if (m_do_color_management) {
+		linearrgb_to_srgb_v4(color, m_color);
 	}
-	color[3] = m_color[3];
+	else {
+		copy_v4_v4(color, m_color);
+	}
 
 	/* HARDCODED MULTIPLICATION FACTOR - this will affect the render resolution directly */
 	const float RES = BGE_FONT_RES * m_resolution;