@@ -526,6 +526,7 @@ ConvertToRgba32(SDL_Surface **surface_p)
526
526
if ((* surface_p )-> format -> format != SDL_PIXELFORMAT_RGBA32 ) {
527
527
SDL_Surface * temp ;
528
528
529
+ SDL_ClearError ();
529
530
temp = SDL_ConvertSurfaceFormat (* surface_p , SDL_PIXELFORMAT_RGBA32 );
530
531
SDLTest_AssertCheck (temp != NULL ,
531
532
"Converting to RGBA should succeed (%s)" ,
@@ -634,23 +635,29 @@ FormatLoadTest(const Format *format,
634
635
SDL_Surface * reference = NULL ;
635
636
SDL_Surface * surface = NULL ;
636
637
SDL_IOStream * src = NULL ;
637
- char * filename = GetTestFilename ( TEST_FILE_DIST , format -> sample ) ;
638
- char * refFilename = GetTestFilename ( TEST_FILE_DIST , format -> reference ) ;
638
+ char * filename = NULL ;
639
+ char * refFilename = NULL ;
639
640
int initResult = 0 ;
640
641
int diff ;
641
642
643
+ SDL_ClearError ();
644
+ filename = GetTestFilename (TEST_FILE_DIST , format -> sample );
642
645
if (!SDLTest_AssertCheck (filename != NULL ,
643
646
"Building filename should succeed (%s)" ,
644
647
SDL_GetError ())) {
645
648
goto out ;
646
649
}
650
+
651
+ SDL_ClearError ();
652
+ refFilename = GetTestFilename (TEST_FILE_DIST , format -> reference );
647
653
if (!SDLTest_AssertCheck (refFilename != NULL ,
648
654
"Building ref filename should succeed (%s)" ,
649
655
SDL_GetError ())) {
650
656
goto out ;
651
657
}
652
658
653
659
if (StrHasSuffix (format -> reference , ".bmp" )) {
660
+ SDL_ClearError ();
654
661
reference = SDL_LoadBMP (refFilename );
655
662
if (!SDLTest_AssertCheck (reference != NULL ,
656
663
"Loading reference should succeed (%s)" ,
@@ -660,6 +667,7 @@ FormatLoadTest(const Format *format,
660
667
}
661
668
else if (StrHasSuffix (format -> reference , ".png" )) {
662
669
#ifdef LOAD_PNG
670
+ SDL_ClearError ();
663
671
reference = IMG_Load (refFilename );
664
672
if (!SDLTest_AssertCheck (reference != NULL ,
665
673
"Loading reference should succeed (%s)" ,
@@ -670,6 +678,7 @@ FormatLoadTest(const Format *format,
670
678
}
671
679
672
680
if (format -> initFlag ) {
681
+ SDL_ClearError ();
673
682
initResult = IMG_Init (format -> initFlag );
674
683
if (!SDLTest_AssertCheck (initResult != 0 ,
675
684
"Initialization should succeed (%s)" ,
@@ -682,6 +691,7 @@ FormatLoadTest(const Format *format,
682
691
}
683
692
684
693
if (mode != LOAD_CONVENIENCE ) {
694
+ SDL_ClearError ();
685
695
src = SDL_IOFromFile (filename , "rb" );
686
696
SDLTest_AssertCheck (src != NULL ,
687
697
"Opening %s should succeed (%s)" ,
@@ -690,6 +700,7 @@ FormatLoadTest(const Format *format,
690
700
goto out ;
691
701
}
692
702
703
+ SDL_ClearError ();
693
704
switch (mode ) {
694
705
case LOAD_CONVENIENCE :
695
706
surface = IMG_Load (filename );
@@ -721,6 +732,7 @@ FormatLoadTest(const Format *format,
721
732
filename , format -> name , check );
722
733
}
723
734
735
+ SDL_ClearError ();
724
736
surface = IMG_Load_IO (src , SDL_TRUE );
725
737
src = NULL ; /* ownership taken */
726
738
break ;
@@ -795,7 +807,7 @@ static void
795
807
FormatSaveTest (const Format * format ,
796
808
SDL_bool rw )
797
809
{
798
- char * refFilename = GetTestFilename ( TEST_FILE_DIST , "sample.bmp" ) ;
810
+ char * refFilename = NULL ;
799
811
char filename [64 ] = { 0 };
800
812
SDL_Surface * reference = NULL ;
801
813
SDL_Surface * surface = NULL ;
@@ -809,12 +821,15 @@ FormatSaveTest(const Format *format,
809
821
rw ? "Rwops" : "" ,
810
822
format -> name );
811
823
824
+ SDL_ClearError ();
825
+ refFilename = GetTestFilename (TEST_FILE_DIST , "sample.bmp" );
812
826
if (!SDLTest_AssertCheck (refFilename != NULL ,
813
827
"Building ref filename should succeed (%s)" ,
814
828
SDL_GetError ())) {
815
829
goto out ;
816
830
}
817
831
832
+ SDL_ClearError ();
818
833
reference = SDL_LoadBMP (refFilename );
819
834
if (!SDLTest_AssertCheck (reference != NULL ,
820
835
"Loading reference should succeed (%s)" ,
@@ -823,6 +838,7 @@ FormatSaveTest(const Format *format,
823
838
}
824
839
825
840
if (format -> initFlag ) {
841
+ SDL_ClearError ();
826
842
initResult = IMG_Init (format -> initFlag );
827
843
if (!SDLTest_AssertCheck (initResult != 0 ,
828
844
"Initialization should succeed (%s)" ,
@@ -834,6 +850,7 @@ FormatSaveTest(const Format *format,
834
850
format -> initFlag , initResult );
835
851
}
836
852
853
+ SDL_ClearError ();
837
854
if (SDL_strcmp (format -> name , "AVIF" ) == 0 ) {
838
855
if (rw ) {
839
856
dest = SDL_IOFromFile (filename , "wb" );
@@ -866,6 +883,7 @@ FormatSaveTest(const Format *format,
866
883
SDLTest_AssertCheck (result == 0 , "Save %s (%s)" , filename , SDL_GetError ());
867
884
868
885
if (format -> canLoad ) {
886
+ SDL_ClearError ();
869
887
surface = IMG_Load (filename );
870
888
871
889
if (!SDLTest_AssertCheck (surface != NULL ,
0 commit comments