rubysdl 2.1.1 → 2.1.2

data/rubysdl_ref.rd

@@ -278,6 +278,7 @@ Ruby/SDL
   * ((<SDL::PixelFormat#colorkey>)) -- Ʃ���ԥ�����Υԥ�������
   * ((<SDL::PixelFormat#alpha>)) -- �����ե������ΤΦ���
   * ((<SDL::PixelFormat#bpp>)) -- �����ե����γƥԥ������ɽ�魯�Τ˻Ȥ���ӥåȿ�
+  * ((<SDL::Surface#pitch>)) -- �����ե����γƥ������饤��ΥХ��ȿ�
   * ((<SDL::Surface.load>)) -- �����򥵡��ե����˥����ɤ��ޤ���
   * ((<SDL::Surface.load_from_io>)) -- Ruby��IO���֥������Ȥ�������򥵡��ե����˥����ɤ��ޤ���
   * ((<SDL::Surface#put_pixel>)) -- ���ꤷ�����֤�����񤭤ޤ���
@@ -406,6 +407,7 @@ Ruby/SDL
 * ((<SDL::Surface#pixels>)) -- �ºݤΥԥ�����ǡ������֤��ޤ�
 * ((<SDL::Surface#colorkey>)) -- Ʃ���ԥ�����Υԥ�������
 * ((<SDL::Surface#alpha>)) -- �����ե������ΤΦ���
+* ((<SDL::Surface#pitch>)) -- �����ե����γƥ������饤��ΥХ��ȿ�
 * ((<SDL::Surface.load>)) -- �����򥵡��ե����˥����ɤ��ޤ���
 * ((<SDL::Surface.load_from_io>)) -- Ruby��IO���֥������Ȥ�������򥵡��ե����˥����ɤ��ޤ���
 * ((<SDL::Surface#put_pixel>)) -- ���ꤷ�����֤�����񤭤ޤ���
@@ -1829,6 +1831,16 @@ R,G,B
     �����ե����γƥԥ������ɽ�魯�Τ˻Ȥ���ӥåȿ����֤��ޤ���
     �̾�8��16��24��32�Τ����줫�Ǥ���
 
+--- SDL::Surface#pitch
+
+    �����ե����γƥ������饤��˻Ȥ���Х��ȿ����֤��ޤ���
+    ((<SDL::Surface#pixels>)) ������������ǡ����β���ɬ�פȤʤ�ޤ���
+    �����褽 ((<SDL::Surface#bpp>)) * ((<SDL::Surface#w>)) / 8 ���ͤȤʤ�ޤ�����
+    �ѥǥ��󥰤Τ��ᾯ���������礭���ʤ��礬����ޤ���
+    
+    ((<SDL::Surface#pixels>)) ��������ǡ����ΥХ��ȿ��� ((<SDL::Surface#h>)) * pitch ��
+    �ʤ�ޤ���
+
 --- SDL::Surface.load(filename)
 
     �����Υե�����򥵡��ե����˥����ɤ��ޤ���
@@ -4572,6 +4584,10 @@ Ruby/SDL
 * OggVorbis (.ogg) ogg/vorbis �饤�֥�꤬ɬ��
 * MP3 (.mp3) SMPEG �饤�֥�꤬ɬ��
 
+���ߡ�MP3�κ����ˤ����꤬���뤳�Ȥ���ǧ����Ƥ��ޤ���
+�����餯SMPEG������ȹͤ�����ΤǤ�������������Ƥ��ޤ���
+OggVorbis������˻ȤäƤ���������
+
 == SDL::Mixer
 audio��Ϣ�Υ��饹��ؿ�����ĥ⥸�塼��Ǥ���
 

data/rubysdl_sdlskk.c

@@ -186,7 +186,7 @@ static VALUE Dictionary_load(VALUE self, VALUE filename, VALUE users)
 {
   SDLSKK_Dictionary* dict = Get_SDLSKK_Dictionary(self);
   rb_secure(4);
-  SafeStringValue(filename);
+  ExportFilenameStringValue(filename);
   
   if(!SDLSKK_Dict_load(dict, RSTRING_PTR(filename), RTEST(users)))
     rb_raise(eSDLError, "Couldn't load %s", RSTRING_PTR(filename));
@@ -198,7 +198,7 @@ static VALUE Dictionary_save(VALUE self, VALUE filename)
 {
   SDLSKK_Dictionary* dict = Get_SDLSKK_Dictionary(self);
   rb_secure(4);
-  SafeStringValue(self);
+  ExportFilenameStringValue(filename);
   
   if(!SDLSKK_Dict_save_user_dict(dict, RSTRING_PTR(filename)))
     rb_raise(eSDLError, "Couldn't save %s", RSTRING_PTR(filename));
@@ -209,7 +209,7 @@ static VALUE RomKanaRuleTable_s_new(VALUE klass, VALUE table_file)
 {
   SDLSKK_RomKanaRuleTable* rule_table;
   rb_secure(4);
-  SafeStringValue(table_file);
+  ExportFilenameStringValue(table_file);
   
   rule_table = SDLSKK_RomKanaRuleTable_new(RSTRING_PTR(table_file));
 
@@ -227,8 +227,8 @@ static VALUE Keybind_s_new(VALUE klass)
 static VALUE Keybind_set_key(VALUE self, VALUE key_str, VALUE cmd_str)
 {
   SDLSKK_Keybind_set_key(Get_SDLSKK_Keybind(self),
-                         StringValuePtr(key_str),
-                         StringValuePtr(cmd_str));
+                         StringValueCStr(key_str),
+                         StringValueCStr(cmd_str));
   return Qnil;
 }
 
@@ -240,7 +240,7 @@ static VALUE Keybind_set_default_key(VALUE self)
 
 static VALUE Keybind_unset_key(VALUE self, VALUE key_str)
 {
-  SDLSKK_Keybind_unset_key(Get_SDLSKK_Keybind(self), StringValuePtr(key_str));
+  SDLSKK_Keybind_unset_key(Get_SDLSKK_Keybind(self), StringValueCStr(key_str));
   return Qnil;
 }
 

data/rubysdl_sge_video.c

@@ -232,9 +232,14 @@ static VALUE Surface_drawBezier(int argc, VALUE* argv, VALUE self)
   int i;
   
   rb_secure(4);
-  /* WARNING:  ':' == '9' + 1
+  /* WARNING:  third argument of rb_scan_args
+     should be 10-2, but rb_scan_args cannot accept such
+     an argument.
   */
-  rb_scan_args(argc, argv, ":2",
+  if (argc < 10)
+    rb_raise(rb_eArgError, "wrong number of arguments (%d for 10)", argc);
+  
+  rb_scan_args(argc, argv, "93",
                &coords_[0], &coords_[1],
                &coords_[2], &coords_[3],
                &coords_[4], &coords_[5],
@@ -454,7 +459,7 @@ static VALUE BMFont_textSize(VALUE self, VALUE text)
   SDL_Rect rect;
   SafeStringValue(text);
   rect = sge_BF_TextSize(Get_sge_bmpFont(self),
-                         RSTRING_PTR(text));
+                         StringValueCStr(text));
   return rb_ary_new3(2, INT2FIX(rect.w), INT2FIX(rect.h));
 }
 
@@ -467,7 +472,7 @@ static VALUE BMFont_textout(VALUE self,
   SafeStringValue(string);
   
   sge_BF_textout(Get_SDL_Surface(surface), Get_sge_bmpFont(self),
-                 RSTRING_PTR(string), NUM2INT(x), NUM2INT(y));
+                 StringValueCStr(string), NUM2INT(x), NUM2INT(y));
   return Qnil;
 }
 

data/rubysdl_smpeg.c

@@ -92,7 +92,7 @@ static VALUE MPEG_s_load(VALUE klass, VALUE filename)
   char error_msg[2048];
   
   rb_secure(4);
-  SafeStringValue(filename);
+  ExportFilenameStringValue(filename);
   
   smpeg = SMPEG_new(RSTRING_PTR(filename), NULL, 0);
   if( SMPEG_error(smpeg) ){

data/rubysdl_ttf.c

@@ -81,8 +81,8 @@ static VALUE Font_s_open(int argc, VALUE *argv, VALUE class)
   
   rb_secure(4);
   rb_scan_args( argc, argv, "21", &filename, &size, &index );
-  
-  SafeStringValue(filename);
+
+  ExportFilenameStringValue(filename);
   
   if(NIL_P(index))
     font = TTF_OpenFont(RSTRING_PTR(filename), NUM2INT(size));
@@ -143,7 +143,7 @@ static VALUE Font_textSize(VALUE self, VALUE text)
 #ifdef ENABLE_M17N
   text = rb_str_export_to_enc(text, utf8_enc);
 #endif
-  TTF_SizeUTF8(Get_TTF_Font(self), RSTRING_PTR(text), &w, &h);
+  TTF_SizeUTF8(Get_TTF_Font(self), StringValueCStr(text), &w, &h);
   return rb_ary_new3(2, INT2FIX(w), INT2FIX(h));
 }
 
@@ -192,7 +192,7 @@ static VALUE render(VALUE self, VALUE text,
     text = rb_str_export_to_enc(text, utf8_enc);
 #endif
   surface = renderer(Get_TTF_Font(self),
-                     RSTRING_PTR(text),
+                     StringValueCStr(text),
                      rgb_to_SDL_Color(fgr, fgg, fgb),
                      rgb_to_SDL_Color(bgr, bgg, bgb));
   

data/sample/randrect.rb

@@ -26,11 +26,11 @@ srand
   screen.fillRect rand(src_w-dst_w), rand(src_h-dst_h), dst_w, dst_h, color
   screen.updateRect 0,0,0,0
 
-  while event = SDL::Event2.poll
+  while event = SDL::Event.poll
     case event
-    when SDL::Event2::Quit
+    when SDL::Event::Quit
       exit
-    when SDL::Event2::KeyDown
+    when SDL::Event::KeyDown
       exit if event.sym == SDL::Key::ESCAPE
     end
   end

data/sample/sgetest.rb

@@ -19,6 +19,7 @@ screen.draw_circle(100,100,50,[87,87,87])
 screen.draw_circle(300,300,30,Red, true)
 screen.draw_circle(230, 300, 30, Red, true, true)
 
+screen.draw_bezier(100, 100, 150, 200, 300, 150, 400, 200, 7, [255, 255,255], true, 128)
 screen.flip
 
 while true

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rubysdl
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  prerelease: false
+  segments: 
+  - 2
+  - 1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - Ohbayashi Ippei
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 +09:00
+date: 2012-04-08 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -131,21 +136,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rubysdl
-rubygems_version: 1.3.4
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The simple ruby extension library to use SDL