[Libreoffice-commits] .: 2 commits - slideshow/source

[Norbert Thiebaud]

 slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m |    4 ++--
 slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m   |    4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 2602beb750eb34e429b8b130e03f0a3a3a21ea7a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jul 24 19:48:51 2011 -0500

    remove half baked test without the appropriate include to make it works

diff --git a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
index b2c22c0..bead765 100644
--- a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
+++ b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
@@ -73,11 +73,7 @@
 - (void)prepareOpenGL
 {
     // for overriding to initialize OpenGL state, occurs after context creation
-#ifdef MAC_OS_X_VERSION_10_4
     long swapInt = 1;
-#else /* build target 10.5 */ 
-    int swapInt = 1;
-#endif
 
     [[self openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval]; // set to vbl sync
 
commit 58d297f8861fbf1319996f9f16b04ea75dd6d3f6
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jul 24 19:30:18 2011 -0500

    cString is deprecated use cStringUsingEncoding instead

diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m
index 360e8cf..87fdaf3 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);