rubysdl 2.1.2 → 2.1.3

data/rubysdl_image.c

@@ -25,7 +25,6 @@ static VALUE Surface_s_load(VALUE klass, VALUE filename)
 {
   SDL_Surface *surface;
   
-  rb_secure(4);
   ExportFilenameStringValue(filename);
 
   surface = IMG_Load(RSTRING_PTR(filename));
@@ -45,12 +44,13 @@ static VALUE Surface_s_loadFromIO(VALUE class,VALUE io)
     rb_raise(eSDLError,"Couldn't load image from IO: %s",
 	     SDL_GetError());
   }
+
+  RB_GC_GUARD(guard);
   return Surface_create(surface);
 }
 static VALUE Surface_s_loadFromString(VALUE class,VALUE str)
 {
   SDL_Surface *surface;
-  rb_secure(4);
   SafeStringValue(str);
   
   surface = IMG_Load_RW(SDL_RWFromConstMem(RSTRING_PTR(str),

data/rubysdl_joystick.c

@@ -70,7 +70,6 @@ static VALUE Joystick_s_alloc(VALUE klass)
 static VALUE Joystick_initialize(VALUE self, VALUE index)
 {
   Joystick* joy = GetJoystick(self);
-  rb_secure(4);
   
   joy->joystick = SDL_JoystickOpen(NUM2INT(index));
   if( joy->joystick == NULL ){
@@ -83,13 +82,11 @@ static VALUE Joystick_initialize(VALUE self, VALUE index)
 /* class methods */
 static VALUE Joystick_s_poll(VALUE klass)
 {
-  rb_secure(4);
   return INT2BOOL(SDL_JoystickEventState(SDL_QUERY) == SDL_ENABLE);
 }
 
 static VALUE Joystick_s_set_poll(VALUE klass, VALUE poll)
 {
-  rb_secure(4);
   
   if(RTEST(poll))
     SDL_JoystickEventState(SDL_ENABLE);
@@ -100,26 +97,22 @@ static VALUE Joystick_s_set_poll(VALUE klass, VALUE poll)
 
 static VALUE Joystick_s_num(VALUE klass)
 {
-  rb_secure(4);
   return INT2FIX(SDL_NumJoysticks());
 }
 
 static VALUE Joystick_s_indexName(VALUE klass, VALUE index)
 {
-  rb_secure(4);
   return rb_str_new2(SDL_JoystickName(NUM2INT(index)));
 }
 
 static VALUE Joystick_s_open_p(VALUE klass, VALUE index)
 {
-  rb_secure(4);
   return INT2BOOL(SDL_JoystickOpened(NUM2INT(index)));
 }
 
 static VALUE Joystick_s_open(VALUE klass, VALUE index)
 {
   VALUE newobj;
-  rb_secure(4);
   
   newobj = Joystick_s_alloc(klass);
   Joystick_initialize(newobj, index);
@@ -128,7 +121,6 @@ static VALUE Joystick_s_open(VALUE klass, VALUE index)
 
 static VALUE Joystick_s_update(VALUE klass)
 {
-  rb_secure(4);
   SDL_JoystickUpdate();
   return Qnil;
 }
@@ -137,7 +129,6 @@ static VALUE Joystick_s_update(VALUE klass)
 static VALUE Joystick_close(VALUE self)
 {
   Joystick* joy;
-  rb_secure(4);
   
   joy = GetJoystick(self);
   SDL_JoystickClose(joy->joystick);
@@ -147,7 +138,6 @@ static VALUE Joystick_close(VALUE self)
 static VALUE Joystick_index(VALUE self)
 {
   SDL_Joystick* joystick;
-  rb_secure(4);
   
   joystick = Get_SDL_Joystick(self);
   return INT2FIX(SDL_JoystickIndex(joystick));
@@ -156,7 +146,6 @@ static VALUE Joystick_index(VALUE self)
 static VALUE Joystick_numAxes(VALUE self)
 {
   SDL_Joystick* joystick;
-  rb_secure(4);
   
   joystick = Get_SDL_Joystick(self);
   return INT2FIX(SDL_JoystickNumAxes(joystick));
@@ -165,7 +154,6 @@ static VALUE Joystick_numAxes(VALUE self)
 static VALUE Joystick_numBalls(VALUE self)
 {
   SDL_Joystick *joystick;
-  rb_secure(4);
   
   joystick = Get_SDL_Joystick(self);
   return INT2FIX(SDL_JoystickNumBalls(joystick));
@@ -174,7 +162,6 @@ static VALUE Joystick_numBalls(VALUE self)
 static VALUE Joystick_numHats(VALUE self)
 {
   SDL_Joystick *joystick;
-  rb_secure(4);
   joystick = Get_SDL_Joystick(self);
   return INT2FIX(SDL_JoystickNumHats(joystick));
 }
@@ -182,7 +169,6 @@ static VALUE Joystick_numHats(VALUE self)
 static VALUE Joystick_numButtons(VALUE self)
 {
   SDL_Joystick *joystick;
-  rb_secure(4);
   
   joystick = Get_SDL_Joystick(self);
   return INT2FIX(SDL_JoystickNumButtons(joystick));
@@ -191,7 +177,6 @@ static VALUE Joystick_numButtons(VALUE self)
 static VALUE Joystick_getAxis(VALUE self, VALUE axis)
 {
   SDL_Joystick *joystick;
-  rb_secure(4);
   
   joystick = Get_SDL_Joystick(self);
   return INT2NUM(SDL_JoystickGetAxis(joystick, NUM2INT(axis)));
@@ -200,7 +185,6 @@ static VALUE Joystick_getAxis(VALUE self, VALUE axis)
 static VALUE Joystick_getHat(VALUE self, VALUE hat)
 {
   SDL_Joystick *joystick;
-  rb_secure(4);
   
   joystick = Get_SDL_Joystick(self);
   return UINT2NUM(SDL_JoystickGetHat(joystick, NUM2INT(hat)));
@@ -209,7 +193,6 @@ static VALUE Joystick_getHat(VALUE self, VALUE hat)
 static VALUE Joystick_getButton(VALUE self, VALUE button)
 {
   SDL_Joystick *joystick;
-  rb_secure(4);
   
   joystick = Get_SDL_Joystick(self);
   return INT2BOOL(SDL_JoystickGetButton(joystick, NUM2INT(button)));
@@ -220,7 +203,6 @@ static VALUE Joystick_getBall(VALUE self, VALUE ball)
   SDL_Joystick *joystick;
   int dx,dy;
 
-  rb_secure(4);
   
   joystick = Get_SDL_Joystick(self);
   if( SDL_JoystickGetBall(joystick, NUM2INT(ball), &dx, &dy) == -1 )

data/rubysdl_kanji.c

@@ -80,7 +80,6 @@ static VALUE Font_s_open(VALUE klass, VALUE filename, VALUE size)
 {
   Kanji_Font* font;
 
-  rb_secure(4);
   ExportFilenameStringValue(filename);
   
   font = Kanji_OpenFont(RSTRING_PTR(filename), NUM2INT(size));
@@ -92,7 +91,6 @@ static VALUE Font_close(VALUE self)
 {
   KFont* kfont;
   
-  rb_secure(4);
   kfont = Get_KFont(self);
   if (kfont->font)
     Kanji_CloseFont(kfont->font);
@@ -116,7 +114,6 @@ static VALUE Font_getCodingSystem(VALUE self)
 
 static VALUE Font_add(VALUE self, VALUE filename)
 {
-  rb_secure(4);
   ExportFilenameStringValue(filename);
   if(Kanji_AddFont(Get_Kanji_Font(self), RSTRING_PTR(filename)) == -1)
     rb_raise(eSDLError, "Couldn't use font: %s", RSTRING_PTR(filename));
@@ -126,7 +123,6 @@ static VALUE Font_add(VALUE self, VALUE filename)
 static VALUE Font_textwidth(VALUE self, VALUE text)
 {
   Kanji_Font* font;
-  rb_secure(4);
   font = Get_Kanji_Font(self);
   ExportStringValueToEnc(text, get_enc(font));
   return INT2FIX(Kanji_FontWidth(font, RSTRING_PTR(text)));
@@ -148,7 +144,6 @@ static void Font_put(VALUE self, VALUE surface, VALUE text,
 {
   SDL_Color color;
   Kanji_Font* font;
-  rb_secure(4);
   font = Get_Kanji_Font(self);
   ExportStringValueToEnc(text, get_enc(font));
   color.r = NUM2INT(r);color.g = NUM2INT(g); color.b = NUM2INT(b);

data/rubysdl_main.c

@@ -23,7 +23,6 @@
 
 static VALUE sdl_s_init(VALUE mod, VALUE flags)
 {
-  rb_secure(4);
   if( SDL_Init(NUM2UINT(flags)) < 0 )
     rb_raise(eSDLError, "Couldn't initialize SDL: %s", SDL_GetError());
   return Qnil;
@@ -43,7 +42,6 @@ static VALUE sdl_s_inited_system(VALUE mod, VALUE flags)
 
 static VALUE sdl_s_putenv(VALUE mod, VALUE var)
 {
-  rb_secure(4);
   SafeStringValue(var);
   
   if( putenv(StringValueCStr(var)) < 0 ){

data/rubysdl_mixer.c

@@ -108,7 +108,6 @@ static VALUE Mixer_s_driverName(VALUE mod)
 static VALUE Mixer_s_open(VALUE mod, VALUE frequency, VALUE format,
 			   VALUE channels, VALUE chunksize)
 {
-  rb_secure(4);
   
   if(Mix_opened()){
     rb_raise(eSDLError, "already initialize SDL::Mixer");
@@ -123,7 +122,6 @@ static VALUE Mixer_s_open(VALUE mod, VALUE frequency, VALUE format,
 
 static VALUE Mixer_s_close(VALUE mod)
 {
-  rb_secure(4);
   Mix_CloseAudio();
   return Qnil;
 }
@@ -143,7 +141,6 @@ static VALUE Mixer_s_spec(VALUE mod)
 
 static VALUE Mixer_s_allocateChannels(VALUE mod, VALUE numchannels)
 {
-  rb_secure(4);
   return INT2FIX( Mix_AllocateChannels(NUM2INT(numchannels)) );  
 }
 
@@ -151,7 +148,6 @@ static VALUE Mixer_s_allocateChannels(VALUE mod, VALUE numchannels)
 static VALUE Mixer_s_playChannel(VALUE mod, VALUE channel, VALUE wave, VALUE loops)
 {
   int play_channel;
-  rb_secure(4);
 
   play_channel = Mix_PlayChannel(NUM2INT(channel),
                                  Get_Mix_Chunk(wave),
@@ -243,7 +239,6 @@ static VALUE Wave_s_load(VALUE class, VALUE filename)
 {
   Mix_Chunk *chunk;
   
-  rb_secure(4);
   ExportFilenameStringValue(filename);
   
   chunk = Mix_LoadWAV(RSTRING_PTR(filename));
@@ -268,7 +263,6 @@ static VALUE Wave_s_loadFromIO(VALUE class, VALUE io)
 static VALUE Wave_s_loadFromString(VALUE class, VALUE str)
 {
   Mix_Chunk *wave;
-  rb_secure(4);
   SafeStringValue(str);
   
   wave = Mix_LoadWAV_RW(SDL_RWFromConstMem(RSTRING_PTR(str),
@@ -285,7 +279,6 @@ static VALUE Wave_s_loadFromString(VALUE class, VALUE str)
 /* Volume setting functions and methods : volume in 0..128 */
 static VALUE Mixer_s_setVolume(VALUE mod, VALUE channel, VALUE volume)
 {
-  rb_secure(4);
   return INT2FIX(Mix_Volume(NUM2INT(channel), NUM2INT(volume)));
 }
 
@@ -297,28 +290,24 @@ static VALUE Wave_s_setVolume(VALUE self, VALUE volume)
 /* Halt,Pause function */
 static VALUE Mixer_s_halt(VALUE mod, VALUE channel)
 {
-  rb_secure(4);
   Mix_HaltChannel(NUM2INT(channel));
   return Qnil;
 }
 
 static VALUE Mixer_s_pause(VALUE mod, VALUE channel)
 {
-  rb_secure(4);
   Mix_Pause(NUM2INT(channel));
   return Qnil;
 }
 
 static VALUE Mixer_s_resume(VALUE mod, VALUE channel)
 {
-  rb_secure(4);
   Mix_Resume(NUM2INT(channel));
   return Qnil;
 }
 
 static VALUE Mixer_s_pause_p(VALUE mod, VALUE channel)
 {
-  rb_secure(4);
   return INT2FIX(Mix_Paused(NUM2INT(channel)));
 }
 static VALUE Mixer_s_fadeOut(VALUE mod, VALUE channel, VALUE ms)
@@ -340,14 +329,12 @@ static VALUE Mixer_s_fading(VALUE mod, VALUE which)
 #define MakeSimpleRubyFunc(rubyFunc, sdlFunc) \
 static VALUE rubyFunc(VALUE mod) \
 { \
-  rb_secure(4); \
   sdlFunc(); \
   return Qnil; \
 } \
 
 static VALUE Mixer_s_playMusic(VALUE mod, VALUE music, VALUE loops)
 {
-  rb_secure(4);
 
   Mix_PlayMusic(Get_Mix_Music(music), NUM2INT(loops));
   playing_music = music; /* to avoid gc problem */
@@ -356,7 +343,6 @@ static VALUE Mixer_s_playMusic(VALUE mod, VALUE music, VALUE loops)
 
 static VALUE Mixer_s_fadeInMusic(VALUE mod, VALUE music, VALUE loops, VALUE ms)
 {
-  rb_secure(4);
   Mix_FadeInMusic(Get_Mix_Music(music), NUM2INT(loops), NUM2INT(ms));
   playing_music = music; /* to avoid gc problem */
   return Qnil;
@@ -364,14 +350,12 @@ static VALUE Mixer_s_fadeInMusic(VALUE mod, VALUE music, VALUE loops, VALUE ms)
 
 static VALUE Mixer_s_setVolumeMusic(VALUE mod, VALUE volume)
 {
-  rb_secure(4);
   Mix_VolumeMusic( NUM2INT(volume) );
   return Qnil;
 }
 
 static VALUE Mixer_s_fadeOutMusic(VALUE mod, VALUE ms)
 {
-  rb_secure(4);
   Mix_FadeOutMusic(NUM2INT(ms));
   return Qnil;
 }
@@ -400,7 +384,6 @@ static VALUE Music_s_load(VALUE class, VALUE filename)
 {
   Mix_Music* music;
   
-  rb_secure(4);
   ExportFilenameStringValue(filename);
   
   music = Mix_LoadMUS(RSTRING_PTR(filename));
@@ -429,7 +412,8 @@ static VALUE Mixer_s_loadMusFromString(VALUE class, VALUE str)
   
   result = Music_create(music);
   rb_iv_set(result, "buf", buf);
-  
+
+  RB_GC_GUARD(result); RB_GC_GUARD(buf);
   return result;
 }
 #endif

data/rubysdl_mouse.c

@@ -25,7 +25,6 @@ static VALUE Mouse_s_state(VALUE mod)
 {
   int x,y;
   Uint8 result;
-  rb_secure(4);
   result = SDL_GetMouseState(&x, &y);
   return rb_ary_new3(5,INT2FIX(x), INT2FIX(y),
                      INT2BOOL(result&SDL_BUTTON_LMASK),
@@ -35,7 +34,6 @@ static VALUE Mouse_s_state(VALUE mod)
 
 static VALUE Mouse_s_warp(VALUE mod, VALUE x, VALUE y)
 {
-  rb_secure(4);
   SDL_WarpMouse(NUM2UINT(x), NUM2UINT(y));
   return Qnil;
 }
@@ -45,7 +43,6 @@ static VALUE Mouse_s_setCursor_imp(VALUE mod,VALUE data,VALUE mask,VALUE w,
 {
   SDL_Cursor *new_cursor;
 
-  rb_secure(4);
   SafeStringValue(data);
   SafeStringValue(mask);
 
@@ -76,7 +73,6 @@ static VALUE Mouse_s_setCursor_imp(VALUE mod,VALUE data,VALUE mask,VALUE w,
   
 static VALUE Mouse_s_show(VALUE mod)
 {
-  rb_secure(4);
   SDL_ShowCursor(1);
   return Qnil;
 }

data/rubysdl_rwops.c

@@ -27,6 +27,8 @@ static int rubyio_read(SDL_RWops* context, void* ptr, int size, int maxnum)
   StringValue(str);
   
   memcpy(ptr, RSTRING_PTR(str), RSTRING_LEN(str));
+
+  RB_GC_GUARD(io); RB_GC_GUARD(str);
   return RSTRING_LEN(str)/size;
 }
 
@@ -60,6 +62,8 @@ static int rubyio_pseudo_seek(SDL_RWops* context, int offset, int whence)
     SDL_SetError("Unknown value for 'whence'");
     return(-1);
   }
+
+  RB_GC_GUARD(io); RB_GC_GUARD(str);
   return NUM2INT(rb_funcall(io, rb_intern("tell"), 0));
 }
 

data/rubysdl_sdlskk.c

@@ -185,7 +185,6 @@ static VALUE Dictionary_s_new(VALUE klass)
 static VALUE Dictionary_load(VALUE self, VALUE filename, VALUE users)
 {
   SDLSKK_Dictionary* dict = Get_SDLSKK_Dictionary(self);
-  rb_secure(4);
   ExportFilenameStringValue(filename);
   
   if(!SDLSKK_Dict_load(dict, RSTRING_PTR(filename), RTEST(users)))
@@ -197,7 +196,6 @@ static VALUE Dictionary_load(VALUE self, VALUE filename, VALUE users)
 static VALUE Dictionary_save(VALUE self, VALUE filename)
 {
   SDLSKK_Dictionary* dict = Get_SDLSKK_Dictionary(self);
-  rb_secure(4);
   ExportFilenameStringValue(filename);
   
   if(!SDLSKK_Dict_save_user_dict(dict, RSTRING_PTR(filename)))
@@ -208,7 +206,6 @@ static VALUE Dictionary_save(VALUE self, VALUE filename)
 static VALUE RomKanaRuleTable_s_new(VALUE klass, VALUE table_file)
 {
   SDLSKK_RomKanaRuleTable* rule_table;
-  rb_secure(4);
   ExportFilenameStringValue(table_file);
   
   rule_table = SDLSKK_RomKanaRuleTable_new(RSTRING_PTR(table_file));

data/rubysdl_sge_video.c

@@ -55,20 +55,17 @@ static VALUE BMFont_create(sge_bmpFont* font)
 
 static VALUE Surface_s_autoLock_p(VALUE klass)
 {
-  rb_secure(4);
   return INT2BOOL(sge_getLock());
 }
 
 static VALUE Surface_s_autoLockON(VALUE klass)
 {
-  rb_secure(4);
   sge_Lock_ON();
   return Qnil;
 }
 
 static VALUE Surface_s_autoLockOFF(VALUE klass)
 {
-  rb_secure(4);
   sge_Lock_OFF();
   return Qnil;
 }
@@ -80,7 +77,6 @@ static VALUE Surface_drawLine(int argc, VALUE* argv, VALUE self)
   Uint32 color;
   SDL_Surface* surface;
   
-  rb_secure(4);
   rb_scan_args(argc, argv, "52", &x1_, &y1_, &x2_, &y2_, &color_, &aa_, &alpha_);
   surface = Get_SDL_Surface(self);
   
@@ -139,7 +135,6 @@ static VALUE Surface_drawCircle(int argc, VALUE* argv, VALUE self)
   Sint16 x, y, r;
   Uint32 color;
 
-  rb_secure(4);
   rb_scan_args(argc, argv, "43", &x_, &y_, &r_, &color_, &fill_, &aa_, &alpha_);
 
   surface = Get_SDL_Surface(self);
@@ -183,7 +178,6 @@ static VALUE Surface_drawEllipse(int argc, VALUE* argv, VALUE self)
   Sint16 x, y, rx, ry;
   Uint32 color;
 
-  rb_secure(4);
   rb_scan_args(argc, argv, "53", &x_, &y_, &rx_, &ry_, &color_,
                &fill_, &aa_, &alpha_);
 
@@ -231,7 +225,6 @@ static VALUE Surface_drawBezier(int argc, VALUE* argv, VALUE self)
   int level;
   int i;
   
-  rb_secure(4);
   /* WARNING:  third argument of rb_scan_args
      should be 10-2, but rb_scan_args cannot accept such
      an argument.
@@ -290,7 +283,6 @@ static VALUE Surface_s_transformDraw(VALUE klass, VALUE src, VALUE dst,
                                      VALUE qx, VALUE qy,
                                      VALUE flags)
 {
-  rb_secure(4);
   sge_transform(Get_SDL_Surface(src), Get_SDL_Surface(dst),
                 NUM2DBL(angle), NUM2DBL(xscale), NUM2DBL(yscale),
 		NUM2INT(px), NUM2INT(py), NUM2INT(qx), NUM2INT(qy),
@@ -303,7 +295,6 @@ static VALUE Surface_transform(VALUE self, VALUE bgcolor, VALUE angle,
 {
   SDL_Surface *surface, *result;
   
-  rb_secure(4);
   surface = Get_SDL_Surface(self);
   result = sge_transform_surface(surface, VALUE2COLOR(bgcolor, surface->format), 
 				 NUM2DBL(angle), NUM2DBL(xscale), 
@@ -316,7 +307,6 @@ static VALUE Surface_transform(VALUE self, VALUE bgcolor, VALUE angle,
 static VALUE Surface_makeCollisionMap(VALUE self)
 {
   sge_cdata * cdata;
-  rb_secure(4);
   cdata = sge_make_cmap(Get_SDL_Surface(self));
   if(cdata == NULL)
     rb_raise(eSDLError, "Couldn't Create CollisionMap: %s", SDL_GetError());
@@ -370,7 +360,6 @@ static VALUE CollisionMap_set(VALUE self, VALUE vx, VALUE vy, VALUE vw, VALUE vh
   sge_cdata * cdata = Get_sge_cdata(self);
   Sint16 x,  y,  w,  h;
 
-  rb_secure(4);
   x = NUM2INT(vx);
   y = NUM2INT(vy);
   w = NUM2INT(vw);
@@ -387,7 +376,6 @@ static VALUE CollisionMap_clear(VALUE self, VALUE vx, VALUE vy, VALUE vw, VALUE
   sge_cdata * cdata = Get_sge_cdata(self);
   Sint16 x,  y,  w,  h;
 
-  rb_secure(4);
   x = NUM2INT(vx);
   y = NUM2INT(vy);
   w = NUM2INT(vw);
@@ -415,7 +403,6 @@ static VALUE BMFont_open(VALUE klass,  VALUE file,  VALUE flags)
 
 {
   sge_bmpFont* font;
-  rb_secure(4);
   ExportFilenameStringValue(file);
   
   font = sge_BF_OpenFont(RSTRING_PTR(file), NUM2UINT(flags));
@@ -468,7 +455,6 @@ static VALUE BMFont_textout(VALUE self,
                             VALUE x,  VALUE y)
 
 {
-  rb_secure(4);
   SafeStringValue(string);
   
   sge_BF_textout(Get_SDL_Surface(surface), Get_sge_bmpFont(self),