ruby-opengl2 0.60.3 → 0.60.4

data/ext/gl/gl-ext-gremedy.c

@@ -23,7 +23,7 @@ static VALUE gl_StringMarkerGREMEDY(VALUE obj,VALUE arg1)
 {
 	LOAD_GL_FUNC(glStringMarkerGREMEDY,"GL_GREMEDY_string_marker")
 	Check_Type(arg1,T_STRING);
-	fptr_glStringMarkerGREMEDY(RSTRING_LEN(arg1),RSTRING_PTR(arg1));
+	fptr_glStringMarkerGREMEDY((GLsizei)RSTRING_LEN(arg1),RSTRING_PTR(arg1));
 	CHECK_GLERROR
 	return Qnil;
 }

data/ext/gl/gl-ext-nv.c

@@ -30,9 +30,9 @@ static VALUE gl_GetFenceivNV(VALUE obj,VALUE arg1,VALUE arg2)
 {
 	GLint ret = 0;
 	LOAD_GL_FUNC(glGetFenceivNV,"GL_NV_fence")
-	fptr_glGetFenceivNV(NUM2INT(arg1),NUM2INT(arg2),&ret);
+	fptr_glGetFenceivNV((GLuint)NUM2INT(arg1),(GLenum)NUM2INT(arg2),&ret);
 	CHECK_GLERROR
-	return cond_GLBOOL2RUBY(NUM2INT(arg2),ret);
+	return cond_GLBOOL2RUBY((GLenum)NUM2INT(arg2),ret);
 }
 
 /* #233 GL_NV_vertex_program */
@@ -41,7 +41,7 @@ static VALUE gl_LoadProgramNV(VALUE obj,VALUE arg1,VALUE arg2,VALUE arg3)
 {
 	LOAD_GL_FUNC(glLoadProgramNV,"GL_NV_vertex_program")
 	Check_Type(arg3,T_STRING);
-	fptr_glLoadProgramNV(NUM2INT(arg1),NUM2UINT(arg2),RSTRING_LEN(arg3),(GLubyte *)RSTRING_PTR(arg3));
+	fptr_glLoadProgramNV((GLenum)NUM2INT(arg1),(GLuint)NUM2UINT(arg2),(GLsizei)RSTRING_LEN(arg3),(GLubyte *)RSTRING_PTR(arg3));
 	CHECK_GLERROR
 	return Qnil;
 }
@@ -51,9 +51,9 @@ static VALUE gl_GetProgramivNV(VALUE obj,VALUE arg1,VALUE arg2)
 {
 	GLint ret = 0;
 	LOAD_GL_FUNC(glGetProgramivNV,"GL_NV_vertex_program")
-	fptr_glGetProgramivNV(NUM2INT(arg1),NUM2INT(arg2),&ret);
+	fptr_glGetProgramivNV((GLuint)NUM2INT(arg1),(GLenum)NUM2INT(arg2),&ret);
 	CHECK_GLERROR
-	return cond_GLBOOL2RUBY(NUM2INT(arg2),ret);
+	return cond_GLBOOL2RUBY((GLenum)NUM2INT(arg2),ret);
 }
 
 static void (APIENTRY * fptr_glGetProgramStringNV)(GLuint,GLenum,void *string);
@@ -66,14 +66,14 @@ static VALUE gl_GetProgramStringNV(VALUE obj,VALUE arg1,VALUE arg2)
 	LOAD_GL_FUNC(glGetProgramStringNV,"GL_NV_vertex_program")
 	LOAD_GL_FUNC(glGetProgramivNV,"GL_NV_vertex_program")
 
-	fptr_glGetProgramivNV(NUM2INT(arg1),GL_PROGRAM_LENGTH_NV,&len);
+	fptr_glGetProgramivNV((GLuint)NUM2INT(arg1),GL_PROGRAM_LENGTH_NV,&len);
 	CHECK_GLERROR
 	if (len<=0)
 		return rb_str_new2("");
 	
 	buffer = ALLOC_N(GLchar,len+1);
 	memset(buffer,0,sizeof(GLchar) * (len+1));
-		fptr_glGetProgramStringNV(NUM2INT(arg1),NUM2INT(arg2),buffer);
+		fptr_glGetProgramStringNV((GLuint)NUM2INT(arg1),(GLenum)NUM2INT(arg2),buffer);
 	ret_buffer = rb_str_new2(buffer);
 	xfree(buffer);
 
@@ -92,7 +92,7 @@ static VALUE gl_ExecuteProgramNV(VALUE obj,VALUE arg1,VALUE arg2,VALUE arg3)
 	GLfloat params[4] = {0,0,0,0};
 	LOAD_GL_FUNC(glExecuteProgramNV,"GL_NV_vertex_program")
 	ary2cflt(arg3,params,4);
-	fptr_glExecuteProgramNV(NUM2UINT(arg1),NUM2UINT(arg2),params);
+	fptr_glExecuteProgramNV((GLenum)NUM2UINT(arg1),(GLuint)NUM2UINT(arg2),params);
 	CHECK_GLERROR
 	return Qnil;
 }
@@ -158,7 +158,7 @@ VALUE obj,arg1,arg2,arg3; \
 	_type_ cary[4]; \
 	LOAD_GL_FUNC(gl##_name_,_extension_) \
 	_conv_(arg3,cary,4); \
-	fptr_gl##_name_(NUM2UINT(arg1),NUM2UINT(arg2),cary); \
+	fptr_gl##_name_((GLenum)NUM2UINT(arg1),(GLuint)NUM2UINT(arg2),cary); \
 	CHECK_GLERROR \
 	return Qnil; \
 }
@@ -174,7 +174,7 @@ VALUE obj,arg1,arg2,arg3; \
 { \
 	_type_ cary[4] = {0.0,0.0,0.0,0.0}; \
 	LOAD_GL_FUNC(gl##_name_,_extension_) \
-	fptr_gl##_name_(NUM2UINT(arg1),NUM2UINT(arg2),NUM2UINT(arg3),cary); \
+	fptr_gl##_name_((GLenum)NUM2UINT(arg1),(GLuint)NUM2UINT(arg2),(GLenum)NUM2UINT(arg3),cary); \
 	RET_ARRAY_OR_SINGLE(4,RETCONV_##_type_,cary) \
 }
 
@@ -189,14 +189,14 @@ gl_##_name_(obj,arg1,arg2,arg3) \
 VALUE obj,arg1,arg2,arg3; \
 { \
 	_type_ *cary; \
-	int len; \
+	long len; \
 	LOAD_GL_FUNC(gl##_name_,_extension_) \
 	len = RARRAY_LEN(rb_Array(arg3)); \
 	if (len<=0 || (len % 4) != 0) \
 		rb_raise(rb_eArgError, "Parameter array size must be multiplication of 4"); \
 	cary = ALLOC_N(_type_,len); \
 	_conv_(arg3,cary,len); \
-	fptr_gl##_name_(NUM2UINT(arg1),NUM2UINT(arg2),len / 4, cary); \
+	fptr_gl##_name_((GLenum)NUM2UINT(arg1),(GLuint)NUM2UINT(arg2),len / 4, cary); \
 	xfree(cary); \
 	CHECK_GLERROR \
 	return Qnil; \
@@ -258,7 +258,7 @@ VALUE obj,arg1,arg2; \
 { \
 	GLuint index; \
 	_type_ *cary; \
-	int len; \
+	long len; \
 	LOAD_GL_FUNC(gl##_name_,_extension_)  \
 	len = RARRAY_LEN(rb_Array(arg2)); \
 	if (len<=0 || (len % _size_) != 0) \
@@ -266,7 +266,7 @@ VALUE obj,arg1,arg2; \
 	cary = ALLOC_N(_type_,len); \
 	index = (GLuint)NUM2UINT(arg1); \
 	_conv_(arg2,cary,len); \
-	fptr_gl##_name_(index,len / _size_,cary); \
+	fptr_gl##_name_(index,(GLsizei)(len / _size_),cary); \
 	xfree(cary); \
 	CHECK_GLERROR \
 	return Qnil; \
@@ -340,7 +340,7 @@ static VALUE gl_GetTrackMatrixivNV(VALUE obj,VALUE arg1,VALUE arg2,VALUE arg3)
 {
 	GLint ret = 0;
 	LOAD_GL_FUNC(glGetTrackMatrixivNV,"GL_NV_vertex_program")
-	fptr_glGetTrackMatrixivNV(NUM2UINT(arg1),NUM2UINT(arg2),NUM2UINT(arg3),&ret);
+	fptr_glGetTrackMatrixivNV((GLenum)NUM2UINT(arg1),(GLuint)NUM2UINT(arg2),(GLenum)NUM2UINT(arg3),&ret);
 	CHECK_GLERROR
 	return INT2NUM(ret);
 }
@@ -352,14 +352,14 @@ static VALUE gl_RequestResidentProgramsNV(VALUE obj,VALUE arg1)
 	if (TYPE(arg1)==T_ARRAY) {
 		GLsizei n;
 		GLuint *programs;
-		n = RARRAY_LEN(arg1);
+		n = (GLsizei)RARRAY_LEN(arg1);
 		programs = ALLOC_N(GLuint,n);
 		ary2cuint(arg1,programs,n); 
 		fptr_glRequestResidentProgramsNV( n, programs);
 		xfree(programs);
 	} else {
 		GLuint program;
-		program = NUM2INT(arg1);
+		program = (GLuint)NUM2INT(arg1);
 		fptr_glRequestResidentProgramsNV( 1, &program);
 	}
 	CHECK_GLERROR
@@ -378,7 +378,7 @@ static VALUE gl_AreProgramsResidentNV(VALUE obj,VALUE arg1)
 	int i;
 	LOAD_GL_FUNC(glAreProgramsResidentNV,"GL_NV_vertex_program")
 	ary = rb_Array(arg1);
-	size = RARRAY_LEN(ary);
+	size = (GLsizei)RARRAY_LEN(ary);
 	programs = ALLOC_N(GLuint,size);
 	residences = ALLOC_N(GLboolean,size);
 	ary2cuint(ary,programs,size);	
@@ -410,9 +410,9 @@ static VALUE gl_##_name_(VALUE obj,VALUE arg1,VALUE arg2) \
 { \
 	_type_ ret = 0; \
 	LOAD_GL_FUNC(gl##_name_,"GL_NV_occlusion_query") \
-	fptr_gl##_name_(NUM2INT(arg1),NUM2INT(arg2),&ret); \
+	fptr_gl##_name_((GLuint)NUM2INT(arg1),(GLenum)NUM2INT(arg2),&ret); \
 	CHECK_GLERROR \
-	return _conv_(NUM2INT(arg2),ret); \
+	return _conv_((GLenum)NUM2INT(arg2),ret); \
 }
 
 GETOCCLUSIONQUERY_FUNC(GetOcclusionQueryivNV,GLint,cond_GLBOOL2RUBY)
@@ -428,7 +428,7 @@ static VALUE gl_PointParameterivNV(VALUE obj,VALUE arg1,VALUE arg2)
 	GLint param = 0;
 	LOAD_GL_FUNC(glPointParameterivNV,"GL_NV_point_sprite")
 	ary2cint(arg2,&param,1);
-	fptr_glPointParameterivNV(NUM2UINT(arg1),&param);
+	fptr_glPointParameterivNV((GLenum)NUM2UINT(arg1),&param);
 	CHECK_GLERROR
 	return Qnil;
 }
@@ -442,7 +442,7 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5,arg6; \
 { \
 	LOAD_GL_FUNC(gl##_name_,_extension_) \
 	Check_Type(arg2,T_STRING); \
-	fptr_gl##_name_(NUM2UINT(arg1),RSTRING_LEN(arg2),(GLubyte *)RSTRING_PTR(arg2),_conv_(arg3),_conv_(arg4),_conv_(arg5),_conv_(arg6)); \
+	fptr_gl##_name_((GLuint)NUM2UINT(arg1),(GLsizei)RSTRING_LEN(arg2),(GLubyte *)RSTRING_PTR(arg2),_conv_(arg3),_conv_(arg4),_conv_(arg5),_conv_(arg6)); \
 	CHECK_GLERROR \
 	return Qnil; \
 }
@@ -461,7 +461,7 @@ VALUE obj,arg1,arg2,arg3; \
 	LOAD_GL_FUNC(gl##_name_,_extension_) \
 	Check_Type(arg2,T_STRING); \
 	_conv_(arg3,cary,4); \
-	fptr_gl##_name_(NUM2UINT(arg1),RSTRING_LEN(arg2),(GLubyte *)RSTRING_PTR(arg2),cary); \
+	fptr_gl##_name_((GLuint)NUM2UINT(arg1),(GLsizei)RSTRING_LEN(arg2),(GLubyte *)RSTRING_PTR(arg2),cary); \
 	CHECK_GLERROR \
 	return Qnil; \
 }
@@ -479,7 +479,7 @@ VALUE obj,arg1,arg2; \
 	_type_ cary[4] = {0.0,0.0,0.0,0.0}; \
 	LOAD_GL_FUNC(gl##_name_,_extension_) \
 	Check_Type(arg2,T_STRING); \
-	fptr_gl##_name_(NUM2UINT(arg1),RSTRING_LEN(arg2),(GLubyte *)RSTRING_PTR(arg2),cary); \
+	fptr_gl##_name_((GLuint)NUM2UINT(arg1),(GLsizei)RSTRING_LEN(arg2),(GLubyte *)RSTRING_PTR(arg2),cary); \
 	RET_ARRAY_OR_SINGLE(4,RETCONV_##_type_,cary) \
 }
 
@@ -518,7 +518,7 @@ VALUE obj,arg1,arg2; \
 { \
 	_type_ cary[4] = {0.0,0.0,0.0,0.0}; \
 	LOAD_GL_FUNC(gl##_name_,_extension_) \
-	fptr_gl##_name_(NUM2UINT(arg1),NUM2UINT(arg2),cary); \
+	fptr_gl##_name_((GLenum)NUM2UINT(arg1),(GLuint)NUM2UINT(arg2),cary); \
 	RET_ARRAY_OR_SINGLE(4,RETCONV_##_type_,cary) \
 }
 

data/ext/gl/gl.c

@@ -78,7 +78,7 @@ const char *GetOpenglExtensions(void)
 		const char *estr = (const char *) glGetString(GL_EXTENSIONS);
 		CHECK_GLERROR
 		if (estr) {
-			int len = strlen(estr);
+			size_t len = strlen(estr);
 			opengl_extensions = ALLOC_N(GLchar,len+1+1); /* terminating null and added space */
 			strcpy(opengl_extensions,estr);
 			opengl_extensions[len] = ' '; /* add space char for easy searchs */
@@ -94,7 +94,7 @@ GLboolean CheckExtension(const char *name)
 {
 	const char *extensions;
 	char *name_tmp;
-	int name_len;
+	size_t name_len;
 	GLboolean res;
 	
 	extensions = GetOpenglExtensions();

data/ext/gl/mkrf.log

@@ -0,0 +1,2 @@
+# Logfile created on 2012-08-03 16:02:49 +0200 by logger.rb/31641
+I, [2012-08-03T16:02:49.356924 #22495]  INFO -- : Rakefile written

data/ext/gl/mkrf_conf.rb

@@ -20,6 +20,10 @@ require 'rbconfig'
 RUBYVER = " -DRUBY_VERSION=" + RUBY_VERSION.split(".").join
 
 Mkrf::Generator.new( 'gl' ) do |g|
+  puts "*" * 10
+  #Config::CONFIG["CC"] = `which gcc`.chomp
+  p Config::CONFIG
+  puts "*" * 10
 	case RUBY_PLATFORM
 	when /darwin/
 		g.cflags << RUBYVER

data/ext/glu/Rakefile

@@ -0,0 +1,43 @@
+# Generated by mkrf
+require 'rake/clean'
+
+CLEAN.include('*.o')
+CLOBBER.include('glu.bundle', 'mkrf.log')
+
+SRC = FileList['*.c']
+OBJ = SRC.ext('o')
+CC = 'clang'
+
+ADDITIONAL_OBJECTS = ''
+
+LDSHARED = "clang -dynamic -bundle  -framework OpenGL"
+
+LIBPATH =  "-L/Users/p4010/.rvm/rubies/ruby-1.9.3-p194/lib "
+
+INCLUDES = "-I/Users/p4010/.rvm/rubies/ruby-1.9.3-p194/include/ruby-1.9.1 -I/Users/p4010/.rvm/rubies/ruby-1.9.3-p194/include/ruby-1.9.1/x86_64-darwin12.0.0 -I/Users/p4010/.rvm/rubies/ruby-1.9.3-p194/lib/ruby/1.9.1/x86_64-darwin12.0.0 -I/Users/p4010/.rvm/rubies/ruby-1.9.3-p194/lib/ruby/site_ruby/1.9.1 -I."
+
+LIBS = "-lpthread -ldl -lobjc"
+
+CFLAGS = "-fno-common  -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Werror=pointer-arith -Werror=write-strings -Werror=declaration-after-statement -Werror=shorten-64-to-32 -Werror=implicit-function-declaration  -fno-common -pipe  -DRUBY_VERSION=193 "
+
+RUBYARCHDIR = "#{ENV["RUBYARCHDIR"]}"
+LIBRUBYARG_SHARED = "-lruby.1.9.1"
+
+task :default => ['glu.bundle']
+
+rule '.o' => '.c' do |t|
+  sh "#{CC} #{CFLAGS} #{INCLUDES} -c #{t.source}"
+end
+
+desc "Build this extension"
+file 'glu.bundle' => OBJ do
+  sh "#{LDSHARED} #{LIBPATH} -o glu.bundle #{OBJ} #{ADDITIONAL_OBJECTS} #{LIBS} #{LIBRUBYARG_SHARED}"
+end
+
+desc "Install this extension"
+task :install => 'glu.bundle' do
+  makedirs "#{RUBYARCHDIR}"
+  install "glu.bundle", "#{RUBYARCHDIR}"
+end
+
+

data/ext/glu/glu.c

@@ -310,7 +310,7 @@ VALUE obj;
 	
 	switch (rb_scan_args(argc, argv, "52", &args[0], &args[1], &args[2], &args[3], &args[4], &args[5], &args[6])) {
 		case 5:
-			uknot_count = RARRAY_LEN(args[1]);
+			uknot_count = (GLint)RARRAY_LEN(args[1]);
 			uorder = (GLenum)NUM2INT(args[3]);
 			type = (GLenum)NUM2INT(args[4]);
 			u_stride = get_curve_dim(type);
@@ -401,11 +401,11 @@ VALUE obj;
 	
 	switch (rb_scan_args(argc, argv, "74", &args[0], &args[1], &args[2], &args[3], &args[4], &args[5], &args[6], &args[7], &args[8], &args[9], &args[10])) {
 		case 7:
-			sknot_count = RARRAY_LEN(args[1]);
+			sknot_count = (GLint)RARRAY_LEN(args[1]);
 			sknot = ALLOC_N(GLfloat, sknot_count);
 			ary2cflt(args[1], sknot, sknot_count);
 
-			tknot_count = RARRAY_LEN(args[2]);
+			tknot_count = (GLint)RARRAY_LEN(args[2]);
 			tknot = ALLOC_N(GLfloat, tknot_count);
 			ary2cflt(args[2], tknot, tknot_count);
 
@@ -497,8 +497,8 @@ VALUE obj;
 	
 	switch (rb_scan_args(argc, argv, "32", &args[0], &args[1], &args[2], &args[3], &args[4])) {
 		case 3:
-			count = RARRAY_LEN(args[1]);
-			type = NUM2INT(args[2]);
+			count = (GLint)RARRAY_LEN(args[1]);
+			type = (GLenum)NUM2INT(args[2]);
 			stride = (type == GLU_MAP1_TRIM_2 ? 2 : 3);
 
 			array = ALLOC_N(GLfloat, count*stride);
@@ -506,9 +506,9 @@ VALUE obj;
 			ary2cflt(ary_ctl1, array, count*stride);
 			break;
 		case 5:
-			count = NUM2INT(args[1]);
-			stride = NUM2INT(args[3]);
-			type = NUM2INT(args[4]);
+			count = (GLint)NUM2INT(args[1]);
+			stride = (GLint)NUM2INT(args[3]);
+			type = (GLint)NUM2INT(args[4]);
 
 			array = ALLOC_N(GLfloat, count*stride);
 			ary_ctl1 = rb_funcall(args[2],rb_intern("flatten"),0);

data/ext/glu/mkrf.log

@@ -0,0 +1,2 @@
+# Logfile created on 2012-08-03 17:30:27 +0200 by logger.rb/31641
+I, [2012-08-03T17:30:27.827119 #23428]  INFO -- : Rakefile written

data/ext/glut/Rakefile

@@ -0,0 +1,43 @@
+# Generated by mkrf
+require 'rake/clean'
+
+CLEAN.include('*.o')
+CLOBBER.include('glut.bundle', 'mkrf.log')
+
+SRC = FileList['*.c']
+OBJ = SRC.ext('o')
+CC = 'clang'
+
+ADDITIONAL_OBJECTS = ''
+
+LDSHARED = "clang -dynamic -bundle  -framework GLUT -framework OpenGL -framework Cocoa"
+
+LIBPATH =  "-L/Users/p4010/.rvm/rubies/ruby-1.9.3-p194/lib "
+
+INCLUDES = "-I/Users/p4010/.rvm/rubies/ruby-1.9.3-p194/include/ruby-1.9.1 -I/Users/p4010/.rvm/rubies/ruby-1.9.3-p194/include/ruby-1.9.1/x86_64-darwin12.0.0 -I/Users/p4010/.rvm/rubies/ruby-1.9.3-p194/lib/ruby/1.9.1/x86_64-darwin12.0.0 -I/Users/p4010/.rvm/rubies/ruby-1.9.3-p194/lib/ruby/site_ruby/1.9.1 -I."
+
+LIBS = "-lpthread -ldl -lobjc"
+
+CFLAGS = "-fno-common  -O3 -ggdb -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Werror=pointer-arith -Werror=write-strings -Werror=declaration-after-statement -Werror=shorten-64-to-32 -Werror=implicit-function-declaration  -fno-common -pipe  -DRUBY_VERSION=193 "
+
+RUBYARCHDIR = "#{ENV["RUBYARCHDIR"]}"
+LIBRUBYARG_SHARED = "-lruby.1.9.1"
+
+task :default => ['glut.bundle']
+
+rule '.o' => '.c' do |t|
+  sh "#{CC} #{CFLAGS} #{INCLUDES} -c #{t.source}"
+end
+
+desc "Build this extension"
+file 'glut.bundle' => OBJ do
+  sh "#{LDSHARED} #{LIBPATH} -o glut.bundle #{OBJ} #{ADDITIONAL_OBJECTS} #{LIBS} #{LIBRUBYARG_SHARED}"
+end
+
+desc "Install this extension"
+task :install => 'glut.bundle' do
+  makedirs "#{RUBYARCHDIR}"
+  install "glut.bundle", "#{RUBYARCHDIR}"
+end
+
+

data/ext/glut/glut.c

@@ -22,7 +22,7 @@
 
 #include "../common/common.h"
 
-static int callId; /* 'call' method id */
+static unsigned long callId; /* 'call' method id */
 
 /*
   macros for registering callbacks -
@@ -90,7 +90,7 @@ static VALUE glut_Init( int argc, VALUE * argv, VALUE obj)
 	/* converts commandline parameters from ruby to C, passes them
 	to glutInit and returns the parameters stripped of glut-specific
 	commands ("-display","-geometry" etc.) */
-	largc = RARRAY_LEN(orig_arg);
+	largc = (int)RARRAY_LEN(orig_arg);
 	largv = ALLOCA_N(char*, largc);
 	for (i = 0; i < largc; i++)
 		largv[i] = StringValuePtr(RARRAY_PTR(orig_arg)[i]);
@@ -130,8 +130,8 @@ glut_InitWindowPosition(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
 	int x,y;
-	x = NUM2INT(arg1);
-	y = NUM2INT(arg2);
+	x = (int)NUM2INT(arg1);
+	y = (int)NUM2INT(arg2);
 	glutInitWindowPosition(x,y);
 	return Qnil;
 }
@@ -142,8 +142,8 @@ glut_InitWindowSize(obj, arg1, arg2)
 VALUE obj,arg1,arg2;
 {
 	int width,height;
-	width = NUM2INT(arg1);
-	height = NUM2INT(arg2);
+	width = (int)NUM2INT(arg1);
+	height = (int)NUM2INT(arg2);
 	glutInitWindowSize(width,height);
 	return Qnil;
 }
@@ -203,7 +203,7 @@ VALUE obj,arg1,arg2;
 	int pollinterval;
 	if (!rb_obj_is_kind_of(arg1,rb_cProc) && !NIL_P(arg1))
 		rb_raise(rb_eTypeError, "glutJoystickFunc:%s", rb_class2name(CLASS_OF(arg1)));
-	pollinterval=NUM2INT(arg2);
+	pollinterval=(int)NUM2INT(arg2);
 	win = glutGetWindow();
 	if (win == 0)
 		rb_raise(rb_eRuntimeError, "glutJoystickFunc needs current window");
@@ -238,11 +238,11 @@ VALUE obj,arg1,arg2,arg3,arg4,arg5;
 {
 	int win, x, y, width, height;
 	int ret;
-	win = NUM2INT(arg1);
-	x = NUM2INT(arg2);
-	y = NUM2INT(arg3);
-	width = NUM2INT(arg4);
-	height = NUM2INT(arg5);
+	win =    (int)NUM2INT(arg1);
+	x =      (int)NUM2INT(arg2);
+	y =      (int)NUM2INT(arg3);
+	width =  (int)NUM2INT(arg4);
+	height = (int)NUM2INT(arg5);
 	ret = glutCreateSubWindow(win, x, y, width, height);
 	return INT2NUM(ret);
 }
@@ -252,7 +252,7 @@ glut_DestroyWindow(obj,arg1)
 VALUE obj,arg1;
 {
 	int win;
-	win = NUM2INT(arg1);
+	win = (int)NUM2INT(arg1);
 	glutDestroyWindow(win);
 	return Qnil;
 }
@@ -276,7 +276,7 @@ glut_SetWindow(obj,arg1)
 VALUE obj,arg1;
 {
 	int win;
-	win = NUM2INT(arg1);
+	win = (int)NUM2INT(arg1);
 	glutSetWindow(win);
 	return Qnil;
 }
@@ -307,8 +307,8 @@ glut_PositionWindow(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
 	int x,y;
-	x = NUM2INT(arg1);
-	y = NUM2INT(arg2);
+	x = (int)NUM2INT(arg1);
+	y = (int)NUM2INT(arg2);
 	glutPositionWindow(x,y);
 	return Qnil;
 }
@@ -319,8 +319,8 @@ glut_ReshapeWindow(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
 	int width,height;
-	width = NUM2INT(arg1);
-	height = NUM2INT(arg2);
+	width =  (int)NUM2INT(arg1);
+	height = (int)NUM2INT(arg2);
 	glutReshapeWindow(width, height);
 	return Qnil;
 }
@@ -339,7 +339,7 @@ glut_SetCursor(obj,arg1)
 VALUE obj,arg1;
 {
 	int cursor;
-	cursor = NUM2INT(arg1);
+	cursor = (int)NUM2INT(arg1);
 	glutSetCursor(cursor);
 	return Qnil;
 }
@@ -349,8 +349,8 @@ glut_WarpPointer(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
 	int x,y;
-	x = NUM2INT(arg1);
-	y = NUM2INT(arg2);
+	x = (int)NUM2INT(arg1);
+	y = (int)NUM2INT(arg2);
 	glutWarpPointer(x,y);
 	return Qnil;
 }
@@ -407,7 +407,7 @@ glut_DestroyMenu(obj,arg1)
 VALUE obj,arg1;
 {
 	int menu;
-	menu = NUM2INT(arg1);
+	menu = (int)NUM2INT(arg1);
 	glutDestroyMenu(menu);
 	//rb_hash_aset(g_menucallback, menu, Qnil);
 	//rb_hash_aset(g_menuargs, menu, Qnil);
@@ -429,7 +429,7 @@ static VALUE
 glut_SetMenu(obj,arg1)
 VALUE obj,arg1;
 {
-	glutSetMenu(NUM2INT(arg1));
+	glutSetMenu((int)NUM2INT(arg1));
 	return Qnil;
 }
 
@@ -439,7 +439,7 @@ glut_AddMenuEntry(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
 	Check_Type(arg1,T_STRING);
-	glutAddMenuEntry(RSTRING_PTR(arg1), NUM2INT(arg2));
+	glutAddMenuEntry(RSTRING_PTR(arg1), (int)NUM2INT(arg2));
 	return Qnil;
 }
 
@@ -449,7 +449,7 @@ glut_AddSubMenu(obj,arg1,arg2)
 VALUE obj,arg1,arg2;
 {
 	Check_Type(arg1,T_STRING);
-	glutAddSubMenu(RSTRING_PTR(arg1), NUM2INT(arg2));
+	glutAddSubMenu(RSTRING_PTR(arg1), (int)NUM2INT(arg2));
 	return Qnil;
 }
 
@@ -458,7 +458,7 @@ static VALUE glut_ChangeToMenuEntry(obj,arg1,arg2,arg3)
 VALUE obj,arg1,arg2,arg3;
 {
 	Check_Type(arg2,T_STRING);
-	glutChangeToMenuEntry(NUM2INT(arg1), RSTRING_PTR(arg2), NUM2INT(arg3));
+	glutChangeToMenuEntry((int)NUM2INT(arg1), RSTRING_PTR(arg2), (int)NUM2INT(arg3));
 	return Qnil;
 }
 
@@ -467,14 +467,14 @@ static VALUE glut_ChangeToSubMenu(obj,arg1,arg2,arg3)
 VALUE obj,arg1,arg2,arg3;
 {
 	Check_Type(arg2,T_STRING);
-	glutChangeToSubMenu(NUM2INT(arg1), RSTRING_PTR(arg2), NUM2INT(arg3));
+	glutChangeToSubMenu((int)NUM2INT(arg1), RSTRING_PTR(arg2), (int)NUM2INT(arg3));
 	return Qnil;
 }
 
 
 static VALUE glut_RemoveMenuItem( VALUE obj, VALUE arg1 )
 {
-	glutRemoveMenuItem(NUM2INT(arg1));
+	glutRemoveMenuItem((int)NUM2INT(arg1));
 	return Qnil;
 }
 
@@ -483,7 +483,7 @@ static VALUE
 glut_AttachMenu(obj,arg1)
 VALUE obj, arg1;
 {
-	glutAttachMenu(NUM2INT(arg1));
+	glutAttachMenu((int)NUM2INT(arg1));
 	return Qnil;
 }
 
@@ -492,7 +492,7 @@ static VALUE
 glut_DetachMenu(obj,arg1)
 VALUE obj, arg1;
 {
-	glutDetachMenu(NUM2INT(arg1));
+	glutDetachMenu((int)NUM2INT(arg1));
 	return Qnil;
 }
 
@@ -629,7 +629,7 @@ VALUE obj,arg1,arg2,arg3;
 	unsigned int millis;
 	int value;
 	millis = (unsigned int)NUM2INT(arg1);
-	value = NUM2INT(arg3);
+	value = (int)NUM2INT(arg3);
 	if (!rb_obj_is_kind_of(arg2,rb_cProc)) 
 		rb_raise(rb_eTypeError, "glutTimerFunc:%s", rb_class2name(CLASS_OF(arg2)));
 	timer_func = arg2;
@@ -767,7 +767,7 @@ int button, state, x, y;
 	VALUE func;
 	func = rb_ary_entry(TabletButtonFunc, glutGetWindow());
 	if (!NIL_P(func))
-		rb_funcall(func, 4, INT2NUM(button), INT2NUM(state), INT2NUM(x), INT2NUM(y));
+		rb_funcall(func, 4, (int)INT2NUM(button), INT2NUM(state), INT2NUM(x), INT2NUM(y));
 }
 
 
@@ -839,7 +839,7 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	GLfloat red;
 	GLfloat green;
 	GLfloat blue;
-	set = NUM2INT(arg1);
+	set = (int)NUM2INT(arg1);
 	red = (GLfloat)NUM2DBL(arg2);
 	green = (GLfloat)NUM2DBL(arg3);
 	blue = (GLfloat)NUM2DBL(arg4);
@@ -855,8 +855,8 @@ VALUE obj,arg1,arg2;
 	int ndx;
 	int component;
 	GLfloat ret;
-	ndx = NUM2INT(arg1);
-	component = NUM2INT(arg2);
+	ndx = (int)NUM2INT(arg1);
+	component = (int)NUM2INT(arg2);
 	ret = (GLfloat)glutGetColor(ndx, component);
 	return rb_float_new(ret);
 }
@@ -867,7 +867,7 @@ glut_CopyColormap(obj,arg1)
 VALUE obj,arg1;
 {
 	int win;
-	win = NUM2INT(arg1);
+	win = (int)NUM2INT(arg1);
 	glutCopyColormap(win);
 	return Qnil;
 }
@@ -971,8 +971,8 @@ VALUE obj,arg1,arg2;
 {
 	int character;
 	int font;
-	font = NUM2INT(arg1);
-	character = NUM2INT(arg2);
+	font = (int)NUM2INT(arg1);
+	character = (int)NUM2INT(arg2);
 	glutBitmapCharacter(bitmap_font_map(font),character);
 	return Qnil;
 }
@@ -984,8 +984,8 @@ VALUE obj,arg1,arg2;
 	int font;
 	int character;
 	int ret;
-	font = NUM2INT(arg1);
-	character = NUM2INT(arg2);
+	font = (int)NUM2INT(arg1);
+	character = (int)NUM2INT(arg2);
 	ret = glutBitmapWidth(bitmap_font_map(font), character);
 	return INT2NUM(ret);
 }
@@ -997,8 +997,8 @@ VALUE obj,arg1,arg2;
 {
 	int font;
 	int character;
-	font = NUM2INT(arg1);
-	character = NUM2INT(arg2);
+	font = (int)NUM2INT(arg1);
+	character = (int)NUM2INT(arg2);
 	glutStrokeCharacter(stroke_font_map(font), character);
 	return Qnil;
 }
@@ -1011,8 +1011,8 @@ VALUE obj,arg1,arg2;
 	int font;
 	int character;
 	int ret;
-	font = NUM2INT(arg1);
-	character = NUM2INT(arg2);
+	font = (int)NUM2INT(arg1);
+	character = (int)NUM2INT(arg2);
 	ret = glutStrokeWidth(stroke_font_map(font), character);
 	return INT2NUM(ret);
 }
@@ -1025,7 +1025,7 @@ VALUE obj,arg1,arg2;
 	int font;
 	int ret;
 	Check_Type(arg2,T_STRING);
-	font = NUM2INT(arg1);
+	font = (int)NUM2INT(arg1);
 	ret = glutBitmapLength(bitmap_font_map(font), (const unsigned char*)RSTRING_PTR(arg2));
 	return INT2NUM(ret);
 }
@@ -1038,7 +1038,7 @@ VALUE obj,arg1,arg2;
 	int font;
 	int ret;
 	Check_Type(arg2,T_STRING);
-	font = NUM2INT(arg1);
+	font = (int)NUM2INT(arg1);
 	ret = glutStrokeLength(stroke_font_map(font), (const unsigned char*)RSTRING_PTR(arg2));
 	return INT2NUM(ret);
 }
@@ -1218,10 +1218,10 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	int y;
 	int width;
 	int height;
-	x = NUM2INT(arg1);
-	y = NUM2INT(arg2);
-	width = NUM2INT(arg3);
-	height = NUM2INT(arg4);
+	x = (int)NUM2INT(arg1);
+	y = (int)NUM2INT(arg2);
+	width = (int)NUM2INT(arg3);
+	height = (int)NUM2INT(arg4);
 	glutVideoResize(x,y, width, height);
 	return Qnil;
 }
@@ -1234,10 +1234,10 @@ VALUE obj,arg1,arg2,arg3,arg4;
 	int y;
 	int width;
 	int height;
-	x = NUM2INT(arg1);
-	y = NUM2INT(arg2);
-	width = NUM2INT(arg3);
-	height = NUM2INT(arg4);
+	x = (int)NUM2INT(arg1);
+	y = (int)NUM2INT(arg2);
+	width = (int)NUM2INT(arg3);
+	height = (int)NUM2INT(arg4);
 	glutVideoPan(x,y, width, height);
 	return Qnil;
 }