Made some changes to ensure consistency with references when it comes to the Garbage Collector

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1713 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
groogy 2010-11-25 17:52:50 +00:00
parent 0d7c966d5e
commit 191776fbec
4 changed files with 6 additions and 1 deletions

View File

@ -126,7 +126,7 @@ static VALUE Font_GetImage( VALUE self, VALUE aCharacterSize )
Data_Get_Struct( self, sf::Font, object ); Data_Get_Struct( self, sf::Font, object );
const sf::Image& image = object->GetImage( FIX2UINT( aCharacterSize ) ); const sf::Image& image = object->GetImage( FIX2UINT( aCharacterSize ) );
VALUE rbImage = Data_Wrap_Struct( globalImageClass, 0, 0, const_cast<sf::Image *>( &image ) ); VALUE rbImage = Data_Wrap_Struct( globalImageClass, 0, 0, const_cast<sf::Image *>( &image ) );
rb_iv_set( rbImage, "@__owner__", self ); rb_iv_set( rbImage, "@__owner_ref", self );
return rbImage; return rbImage;
} }

View File

@ -160,6 +160,7 @@ static VALUE RenderImage_GetImage( VALUE self )
const sf::Image &image = object->GetImage(); const sf::Image &image = object->GetImage();
VALUE rbData = Data_Wrap_Struct( globalImageClass, 0, 0, const_cast< sf::Image * >( &image ) ); VALUE rbData = Data_Wrap_Struct( globalImageClass, 0, 0, const_cast< sf::Image * >( &image ) );
rb_obj_call_init( rbData, 0, 0 ); rb_obj_call_init( rbData, 0, 0 );
rb_iv_set( rbData, "@__owner_ref", self );
return rbData; return rbData;
} }

View File

@ -167,6 +167,7 @@ static VALUE RenderTarget_GetView( VALUE self )
const sf::View &view = object->GetView(); const sf::View &view = object->GetView();
VALUE rbData = Data_Wrap_Struct( globalViewClass, 0, 0, const_cast< sf::View * >( &view ) ); VALUE rbData = Data_Wrap_Struct( globalViewClass, 0, 0, const_cast< sf::View * >( &view ) );
rb_obj_call_init( rbData, 0, 0 ); rb_obj_call_init( rbData, 0, 0 );
rb_iv_set( rbData, "@__owner_ref", self );
return rbData; return rbData;
} }
@ -184,6 +185,7 @@ static VALUE RenderTarget_GetDefaultView( VALUE self )
const sf::View &view = object->GetDefaultView(); const sf::View &view = object->GetDefaultView();
VALUE rbData = Data_Wrap_Struct( globalViewClass, 0, 0, const_cast< sf::View * >( &view ) ); VALUE rbData = Data_Wrap_Struct( globalViewClass, 0, 0, const_cast< sf::View * >( &view ) );
rb_obj_call_init( rbData, 0, 0 ); rb_obj_call_init( rbData, 0, 0 );
rb_iv_set( rbData, "@__owner_ref", self );
return rbData; return rbData;
} }

View File

@ -221,6 +221,7 @@ static VALUE Window_GetInput( VALUE self )
Data_Get_Struct( self, sf::Window, object ); Data_Get_Struct( self, sf::Window, object );
VALUE rbData = Data_Wrap_Struct( globalInputClass, 0, 0, const_cast< sf::Input * >( &object->GetInput() ) ); VALUE rbData = Data_Wrap_Struct( globalInputClass, 0, 0, const_cast< sf::Input * >( &object->GetInput() ) );
rb_obj_call_init( rbData, 0, 0 ); rb_obj_call_init( rbData, 0, 0 );
rb_iv_set( rbData, "@__owner_ref", self );
return rbData; return rbData;
} }
@ -238,6 +239,7 @@ static VALUE Window_GetSettings( VALUE self )
Data_Get_Struct( self, sf::Window, object ); Data_Get_Struct( self, sf::Window, object );
VALUE rbData = Data_Wrap_Struct( globalContextSettingsClass, 0, 0, const_cast<sf::ContextSettings *>( &object->GetSettings() ) ); VALUE rbData = Data_Wrap_Struct( globalContextSettingsClass, 0, 0, const_cast<sf::ContextSettings *>( &object->GetSettings() ) );
rb_obj_call_init( rbData, 0, 0 ); rb_obj_call_init( rbData, 0, 0 );
rb_iv_set( rbData, "@__owner_ref", self );
return rbData; return rbData;
} }