summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-07-24 19:30:18 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-07-24 19:30:18 -0500
commitd5c9bdd202f657a6f6144d0a38b8a31ef6569538 (patch)
treeca2955b7be1b0ef68fcd04b56c81ea09d7cf9c65 /slideshow
parent279273d3142595b658c786c7e4ba27736e17a2a9 (diff)
cString is deprecated use cStringUsingEncoding instead
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m
index 360e8cf5e903..87fdaf3d417b 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m
@@ -87,7 +87,7 @@
/* Load and compile both shaders */
if (vertexString) {
vertex_shader = glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
- vertex_string = (GLcharARB *) [vertexString cString];
+ vertex_string = (GLcharARB *) [vertexString cStringUsingEncoding:NSASCIIStringEncoding];
glShaderSourceARB(vertex_shader, 1, &vertex_string, NULL);
glCompileShaderARB(vertex_shader);
glGetObjectParameterivARB(vertex_shader, GL_OBJECT_COMPILE_STATUS_ARB, &vertex_compiled);
@@ -99,7 +99,7 @@
if (fragmentString) {
fragment_shader = glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);
- fragment_string = [fragmentString cString];
+ fragment_string = [fragmentString cStringUsingEncoding:NSASCIIStringEncoding];
glShaderSourceARB(fragment_shader, 1, &fragment_string, NULL);
glCompileShaderARB(fragment_shader);
glGetObjectParameterivARB(fragment_shader, GL_OBJECT_COMPILE_STATUS_ARB, &fragment_compiled);