[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47000] branches/soc-2012-swiss_cheese/ source/blender/blenfont: gcc fixes 2

[Jason Wilkins]

Revision: 47000
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47000
Author:   jwilkins
Date:     2012-05-25 03:36:07 +0000 (Fri, 25 May 2012)
Log Message:
-----------
gcc fixes 2

difference between (void) and ()

pointer type difference (GLenum* <-> GLint*)

too many arguments for gpuEnd()

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/source/blender/blenfont/BLF_api.h
    branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c

Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/BLF_api.h
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/BLF_api.h	2012-05-25 03:28:24 UTC (rev 46999)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/BLF_api.h	2012-05-25 03:36:07 UTC (rev 47000)
@@ -78,8 +78,8 @@
 
 /* Draw large blocks of text more efficiently by
    explicitely reserving OpenGL for that purpose*/
-void BLF_draw_lock();
-void BLF_draw_unlock();
+void BLF_draw_lock(void);
+void BLF_draw_unlock(void);
 
 /* This function return the bounding box of the string
  * and are not multiplied by the aspect.

Modified: branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c
===================================================================
--- branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c	2012-05-25 03:28:24 UTC (rev 46999)
+++ branches/soc-2012-swiss_cheese/source/blender/blenfont/intern/blf.c	2012-05-25 03:36:07 UTC (rev 47000)
@@ -484,8 +484,8 @@
 void BLF_draw_lock(void)
 {
 	if (!gpuImmediateIsLocked()) {
-		GLint  texCoordSizes[1] = { 2 };
-		GLenum texUnitMap[1];
+		GLint texCoordSizes[1] = { 2 };
+		GLint texUnitMap[1];
 
 		glGetIntegerv(GL_ACTIVE_TEXTURE, texUnitMap);
 
@@ -500,7 +500,7 @@
 	}
 }
 
-void BLF_draw_unlock()
+void BLF_draw_unlock(void)
 {
 	if (gpuImmediateIsLocked()) {
 		gpuImmediateUnlock();
@@ -556,7 +556,7 @@
 
 static void blf_draw__end(GLint mode, GLint param)
 {
-	gpuEnd(GL_QUADS);
+	gpuEnd();
 	BLF_draw_unlock();
 
 	/* and restore the original value. */