@@ -1850,7 +1850,7 @@ int rect_testUnionFRect(void *arg)
18501850 * \sa
18511851 * http://wiki.libsdl.org/SDL2/SDL_EncloseFPoints
18521852 */
1853- int rect_testEncloseFPointsUnionFRect (void * arg )
1853+ int rect_testEncloseFPoints (void * arg )
18541854{
18551855 const struct {
18561856 SDL_bool with_clip ;
@@ -1919,8 +1919,8 @@ int rect_testIntersectFRectAndLine(void *arg)
19191919 SDL_FPoint expected1 ;
19201920 SDL_FPoint expected2 ;
19211921 } cases [] = {
1922- { { 0 , 0 , 0 , 0 }, { -4.8f , -4.8f }, { 5.2f , 5.2f }, SDL_FALSE },
1923- { { 0 , 0 , 2 , 2 }, { -1 , -1 }, { 3.5f , 3.5f }, SDL_TRUE , { 0 , 0 }, { 1 , 1 } },
1922+ { { 0 , 0 , 0 , 0 }, { -4.8f , -4.8f }, { 5.2f , 5.2f }, SDL_FALSE },
1923+ { { 0 , 0 , 2 , 2 }, { -1 , -1 }, { 3.5f , 3.5f }, SDL_TRUE , { 0 , 0 }, { 1 , 1 } },
19241924 { { -4 , -4 , 14 , 14 }, { 8 , 22 }, { 8 , 33 }, SDL_FALSE }
19251925
19261926 };
@@ -1937,11 +1937,11 @@ int rect_testIntersectFRectAndLine(void *arg)
19371937 result = SDL_IntersectFRectAndLine (& cases [i ].rect , & p1 .x , & p1 .y , & p2 .x , & p2 .y );
19381938 SDLTest_AssertCheck (result == cases [i ].result , "Got %d, expected %d" , result , cases [i ].result );
19391939 if (cases [i ].result ) {
1940- SDLTest_AssertCheck (IsFPointEqual (& p1 , & cases [i ].p1 ) && IsFPointEqual ( & p2 , & cases [ i ]. p2 ),
1940+ SDLTest_AssertCheck (IsFPointEqual (& p1 , & cases [i ].expected1 ),
19411941 "Got p1={ %g, %g }, expected p1={ %g, %g }" ,
19421942 p1 .x , p1 .y ,
19431943 cases [i ].expected1 .x , cases [i ].expected1 .y );
1944- SDLTest_AssertCheck (IsFPointEqual (& p1 , & cases [i ].p1 ),
1944+ SDLTest_AssertCheck (IsFPointEqual (& p2 , & cases [i ].expected2 ),
19451945 "Got p2={ %g, %g }, expected p2={ %g, %g }" ,
19461946 p2 .x , p2 .y ,
19471947 cases [i ].expected2 .x , cases [i ].expected2 .y );
@@ -2093,19 +2093,19 @@ static const SDLTest_TestCaseReference rectTest32 = {
20932093};
20942094
20952095static const SDLTest_TestCaseReference rectTest33 = {
2096- (SDLTest_TestCaseFp )rect_testIntersectFRect , "rect_IntersectFRect " , "Tests SDL_IntersectFRect" , TEST_ENABLED
2096+ (SDLTest_TestCaseFp )rect_testIntersectFRect , "rect_testIntersectFRect " , "Tests SDL_IntersectFRect" , TEST_ENABLED
20972097};
20982098
20992099static const SDLTest_TestCaseReference rectTest34 = {
21002100 (SDLTest_TestCaseFp )rect_testUnionFRect , "rect_testUnionFRect" , "Tests SDL_UnionFRect" , TEST_ENABLED
21012101};
21022102
21032103static const SDLTest_TestCaseReference rectTest35 = {
2104- (SDLTest_TestCaseFp )rect_testUnionFRect , "rect_testEncloseFPointsUnionFRect " , "Tests SDL_EncloseFPoints" , TEST_ENABLED
2104+ (SDLTest_TestCaseFp )rect_testEncloseFPoints , "rect_testEncloseFPoints " , "Tests SDL_EncloseFPoints" , TEST_ENABLED
21052105};
21062106
21072107static const SDLTest_TestCaseReference rectTest36 = {
2108- (SDLTest_TestCaseFp )rect_testUnionFRect , "rect_testIntersectFRectAndLine" , "Tests SDL_IntersectFRectAndLine" , TEST_ENABLED
2108+ (SDLTest_TestCaseFp )rect_testIntersectFRectAndLine , "rect_testIntersectFRectAndLine" , "Tests SDL_IntersectFRectAndLine" , TEST_ENABLED
21092109};
21102110
21112111/* !
0 commit comments