From 046d415f9816efeeea95e5a7e7aec922771ea204 Mon Sep 17 00:00:00 2001 From: Laurent Gomila Date: Sun, 17 Jun 2012 09:34:14 +0200 Subject: [PATCH] Fix compiler errors in debug --- src/SFML/Graphics/CircleShape.cpp | 4 ++-- src/SFML/Graphics/ConvexShape.cpp | 4 ++-- src/SFML/Graphics/RectangleShape.cpp | 4 ++-- src/SFML/Graphics/Shape.cpp | 4 ++-- src/SFML/Graphics/Sprite.cpp | 4 ++-- src/SFML/Graphics/Text.cpp | 4 ++-- src/SFML/Graphics/Transform.cpp | 2 +- src/SFML/Graphics/Transformable.cpp | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/SFML/Graphics/CircleShape.cpp b/src/SFML/Graphics/CircleShape.cpp index edb2fe4..3df9576 100644 --- a/src/SFML/Graphics/CircleShape.cpp +++ b/src/SFML/Graphics/CircleShape.cpp @@ -159,7 +159,7 @@ void sfCircleShape_scale(sfCircleShape* shape, sfVector2f factors) //////////////////////////////////////////////////////////// sfTransform sfCircleShape_getTransform(const sfCircleShape* shape) { - CSFML_CHECK_RETURN(shape, NULL); + CSFML_CHECK_RETURN(shape, sfTransform_Identity); shape->Transform = convertTransform(shape->This.getTransform()); return shape->Transform; @@ -169,7 +169,7 @@ sfTransform sfCircleShape_getTransform(const sfCircleShape* shape) //////////////////////////////////////////////////////////// sfTransform sfCircleShape_getInverseTransform(const sfCircleShape* shape) { - CSFML_CHECK_RETURN(shape, NULL); + CSFML_CHECK_RETURN(shape, sfTransform_Identity); shape->InverseTransform = convertTransform(shape->This.getInverseTransform()); return shape->InverseTransform; diff --git a/src/SFML/Graphics/ConvexShape.cpp b/src/SFML/Graphics/ConvexShape.cpp index dacb465..60f033a 100644 --- a/src/SFML/Graphics/ConvexShape.cpp +++ b/src/SFML/Graphics/ConvexShape.cpp @@ -156,7 +156,7 @@ void sfConvexShape_scale(sfConvexShape* shape, sfVector2f factors) //////////////////////////////////////////////////////////// sfTransform sfConvexShape_getTransform(const sfConvexShape* shape) { - CSFML_CHECK_RETURN(shape, NULL); + CSFML_CHECK_RETURN(shape, sfTransform_Identity); shape->Transform = convertTransform(shape->This.getTransform()); return shape->Transform; @@ -166,7 +166,7 @@ sfTransform sfConvexShape_getTransform(const sfConvexShape* shape) //////////////////////////////////////////////////////////// sfTransform sfConvexShape_getInverseTransform(const sfConvexShape* shape) { - CSFML_CHECK_RETURN(shape, NULL); + CSFML_CHECK_RETURN(shape, sfTransform_Identity); shape->InverseTransform = convertTransform(shape->This.getInverseTransform()); return shape->InverseTransform; diff --git a/src/SFML/Graphics/RectangleShape.cpp b/src/SFML/Graphics/RectangleShape.cpp index 7c86c24..f296ba2 100644 --- a/src/SFML/Graphics/RectangleShape.cpp +++ b/src/SFML/Graphics/RectangleShape.cpp @@ -156,7 +156,7 @@ void sfRectangleShape_scale(sfRectangleShape* shape, sfVector2f factors) //////////////////////////////////////////////////////////// sfTransform sfRectangleShape_getTransform(const sfRectangleShape* shape) { - CSFML_CHECK_RETURN(shape, NULL); + CSFML_CHECK_RETURN(shape, sfTransform_Identity); shape->Transform = convertTransform(shape->This.getTransform()); return shape->Transform; @@ -166,7 +166,7 @@ sfTransform sfRectangleShape_getTransform(const sfRectangleShape* shape) //////////////////////////////////////////////////////////// sfTransform sfRectangleShape_getInverseTransform(const sfRectangleShape* shape) { - CSFML_CHECK_RETURN(shape, NULL); + CSFML_CHECK_RETURN(shape, sfTransform_Identity); shape->InverseTransform = convertTransform(shape->This.getInverseTransform()); return shape->InverseTransform; diff --git a/src/SFML/Graphics/Shape.cpp b/src/SFML/Graphics/Shape.cpp index 0cc8f82..5c387d8 100644 --- a/src/SFML/Graphics/Shape.cpp +++ b/src/SFML/Graphics/Shape.cpp @@ -149,7 +149,7 @@ void sfShape_scale(sfShape* shape, sfVector2f factors) //////////////////////////////////////////////////////////// sfTransform sfShape_getTransform(const sfShape* shape) { - CSFML_CHECK_RETURN(shape, NULL); + CSFML_CHECK_RETURN(shape, sfTransform_Identity); shape->Transform = convertTransform(shape->This.getTransform()); return shape->Transform; @@ -159,7 +159,7 @@ sfTransform sfShape_getTransform(const sfShape* shape) //////////////////////////////////////////////////////////// sfTransform sfShape_getInverseTransform(const sfShape* shape) { - CSFML_CHECK_RETURN(shape, NULL); + CSFML_CHECK_RETURN(shape, sfTransform_Identity); shape->InverseTransform = convertTransform(shape->This.getInverseTransform()); return shape->InverseTransform; diff --git a/src/SFML/Graphics/Sprite.cpp b/src/SFML/Graphics/Sprite.cpp index 7b56c94..35f8ab4 100644 --- a/src/SFML/Graphics/Sprite.cpp +++ b/src/SFML/Graphics/Sprite.cpp @@ -160,7 +160,7 @@ void sfSprite_scale(sfSprite* sprite, sfVector2f factors) //////////////////////////////////////////////////////////// sfTransform sfSprite_getTransform(const sfSprite* sprite) { - CSFML_CHECK_RETURN(sprite, NULL); + CSFML_CHECK_RETURN(sprite, sfTransform_Identity); sprite->Transform = convertTransform(sprite->This.getTransform()); return sprite->Transform; @@ -170,7 +170,7 @@ sfTransform sfSprite_getTransform(const sfSprite* sprite) //////////////////////////////////////////////////////////// sfTransform sfSprite_getInverseTransform(const sfSprite* sprite) { - CSFML_CHECK_RETURN(sprite, NULL); + CSFML_CHECK_RETURN(sprite, sfTransform_Identity); sprite->InverseTransform = convertTransform(sprite->This.getInverseTransform()); return sprite->InverseTransform; diff --git a/src/SFML/Graphics/Text.cpp b/src/SFML/Graphics/Text.cpp index 23ad554..63554ee 100644 --- a/src/SFML/Graphics/Text.cpp +++ b/src/SFML/Graphics/Text.cpp @@ -160,7 +160,7 @@ void sfText_scale(sfText* text, sfVector2f factors) //////////////////////////////////////////////////////////// sfTransform sfText_getTransform(const sfText* text) { - CSFML_CHECK_RETURN(text, NULL); + CSFML_CHECK_RETURN(text, sfTransform_Identity); text->Transform = convertTransform(text->This.getTransform()); return text->Transform; @@ -170,7 +170,7 @@ sfTransform sfText_getTransform(const sfText* text) //////////////////////////////////////////////////////////// sfTransform sfText_getInverseTransform(const sfText* text) { - CSFML_CHECK_RETURN(text, NULL); + CSFML_CHECK_RETURN(text, sfTransform_Identity); text->InverseTransform = convertTransform(text->This.getInverseTransform()); return text->InverseTransform; diff --git a/src/SFML/Graphics/Transform.cpp b/src/SFML/Graphics/Transform.cpp index 4bc37ed..b976d79 100644 --- a/src/SFML/Graphics/Transform.cpp +++ b/src/SFML/Graphics/Transform.cpp @@ -65,7 +65,7 @@ void sfTransform_getMatrix(const sfTransform* transform, float* matrix) //////////////////////////////////////////////////////////// sfTransform sfTransform_getInverse(const sfTransform* transform) { - CSFML_CHECK(transform); + CSFML_CHECK_RETURN(transform, sfTransform_Identity); return convertTransform(convertTransform(*transform).getInverse()); } diff --git a/src/SFML/Graphics/Transformable.cpp b/src/SFML/Graphics/Transformable.cpp index d420ed7..b923c29 100644 --- a/src/SFML/Graphics/Transformable.cpp +++ b/src/SFML/Graphics/Transformable.cpp @@ -157,7 +157,7 @@ void sfTransformable_scale(sfTransformable* transformable, sfVector2f factors) //////////////////////////////////////////////////////////// sfTransform sfTransformable_getTransform(const sfTransformable* transformable) { - CSFML_CHECK_RETURN(transformable, NULL); + CSFML_CHECK_RETURN(transformable, sfTransform_Identity); transformable->Transform = convertTransform(transformable->This.getTransform()); return transformable->Transform; @@ -167,7 +167,7 @@ sfTransform sfTransformable_getTransform(const sfTransformable* transformable) //////////////////////////////////////////////////////////// sfTransform sfTransformable_getInverseTransform(const sfTransformable* transformable) { - CSFML_CHECK_RETURN(transformable, NULL); + CSFML_CHECK_RETURN(transformable, sfTransform_Identity); transformable->InverseTransform = convertTransform(transformable->This.getInverseTransform()); return transformable->InverseTransform;