X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fcore_video.t;h=81001ef086b7ca175dab1b82279cbddcc904986e;hb=b3cdeb39a431b026168c4060bf74001fcee07493;hp=4c4e61d8a9dc4e9647dcba7b4aab71f0302f2a2d;hpb=69341787b9240e7450bc15ed0466218d37d8de20;p=sdlgit%2FSDL_perl.git

diff --git a/t/core_video.t b/t/core_video.t
index 4c4e61d..81001ef 100644
--- a/t/core_video.t
+++ b/t/core_video.t
@@ -9,7 +9,7 @@ use Data::Dumper;
 use Test::More;
 use SDL::Rect;
 
-plan ( tests => 17 );
+plan ( tests => 21 );
 
 use_ok( 'SDL::Video' ); 
 
@@ -26,17 +26,21 @@ my @done =
 	flip
 	set_colors
 	set_palette
+	set_gamma
+	set_gamma_ramp
+	map_RGB
+	map_RGBA
 	/;
 
 can_ok ('SDL::Video', @done); 
 
 #testing get_video_surface
-SDL::Init(SDL_INIT_VIDEO);                                                                          
+SDL::init(SDL_INIT_VIDEO);                                                                          
                                                                                                     
 my $display = SDL::Video::set_video_mode(640,480,32, SDL_SWSURFACE );
 
 if(!$display){
-	 plan skip_all => 'Couldn\'t set video mode: '. SDL::GetError();
+	 plan skip_all => 'Couldn\'t set video mode: '. SDL::geterror();
     }
 
 #diag('Testing SDL::Video');
@@ -71,11 +75,14 @@ is( ($value == 0)  ||  ($value == -1), 1,  '[flip] returns 0 or -1'  );
 $value = SDL::Video::set_colors($display, 0, SDL::Color->new(0,0,0));
 is(  $value , 0,  '[set_colors] returns 0 trying to write to 32 bit display'  );
 
-$value = SDL::Video::set_palette($display, 0x01|0x02, 0);
+$value = SDL::Video::set_palette($display, SDL_LOGPAL|SDL_PHYSPAL, 0);
 
 is(  $value , 0,  '[set_palette] returns 0 trying to write to 32 bit surface'  );
 
+my $zero = [0,0,0,0]; 
+SDL::Video::set_gamma_ramp($zero, $zero, $zero);  pass '[set_gamma_ramp] ran';
 
+SDL::Video::set_gamma( 1.0, 1.0, 1.0 ); pass '[set_gamma] ran ';
 
 my @b_w_colors;
 
@@ -85,13 +92,13 @@ for(my $i=0;$i<256;$i++){
 my $hwdisplay = SDL::Video::set_video_mode(640,480,8, SDL_HWSURFACE );
 
 if(!$hwdisplay){
-	 plan skip_all => 'Couldn\'t set video mode: '. SDL::GetError();
+	 plan skip_all => 'Couldn\'t set video mode: '. SDL::geterror();
     }
 
 $value = SDL::Video::set_colors($hwdisplay, 0);
 is(  $value , 0,  '[set_colors] returns 0 trying to send empty colors to 8 bit surface'  );
 
-$value = SDL::Video::set_palette($hwdisplay, 0x01|0x02, 0);
+$value = SDL::Video::set_palette($hwdisplay, SDL_LOGPAL|SDL_PHYSPAL, 0);
 
 is(  $value , 0,  '[set_palette] returns 0 trying to send empty colors to 8 bit surface'  );
 
@@ -99,20 +106,16 @@ is(  $value , 0,  '[set_palette] returns 0 trying to send empty colors to 8 bit
 $value = SDL::Video::set_colors($hwdisplay, 0, @b_w_colors);
 is( $value , 1,  '[set_colors] returns '.$value  );
 
-$value = SDL::Video::set_palette($hwdisplay, 0x01|0x02, 0, @b_w_colors );
+$value = SDL::Video::set_palette($hwdisplay, SDL_LOGPAL|SDL_PHYSPAL, 0, @b_w_colors );
 
 is(  $value , 1,  '[set_palette] returns 1'  );
 
 
-
-
+is( SDL::Video::map_RGB($hwdisplay->format, 10, 10 ,10) > 0, 1, '[map_RGB] maps correctly to 8-bit surface');
+is( SDL::Video::map_RGBA($hwdisplay->format, 10, 10 ,10, 10) > 0, 1, '[map_RGBA] maps correctly to 8-bit surface');
 
 my @left = qw/
-	set_gamma
 	get_gamma_ramp
-	set_gmmma_ramp
-	map_RGB
-	map_RGBA
 	get_RGB
 	get_RGBA
 	create_RGB_surface_from