File fix-upstream-no-return-in-nonvoid-function.patch of Package sfml2
From: Ferdinand Thiessen <rpm@fthiessen.de>
Date: 2015-08-01 17:01:00 +0100
Subject: fix no return in nonvoid function in RenderTarget.cpp
References: gh#SFML/SFML#935
Upstream: submitted
RPMLint reports error because of serious compiler warnings caused by no return in nonvoid functions.
Fixed this by adding an error message and a default return if invalid argument is given.
diff -Naur SFML-2.3.1/src/SFML/Graphics/RenderTarget.cpp SFML-2.3.1-fixed/src/SFML/Graphics/RenderTarget.cpp
--- SFML-2.3.1/src/SFML/Graphics/RenderTarget.cpp 2015-06-27 13:40:35.000000000 +0200
+++ SFML-2.3.1-fixed/src/SFML/Graphics/RenderTarget.cpp 2015-08-01 17:08:16.869553477 +0200
@@ -53,6 +53,8 @@
case sf::BlendMode::DstAlpha: return GL_DST_ALPHA;
case sf::BlendMode::OneMinusDstAlpha: return GL_ONE_MINUS_DST_ALPHA;
}
+ sf::err() << "Invalid value for sf::BlendMode::Factor! Fallback to GL_ZERO." << std::endl;
+ return GL_ZERO;
}
@@ -64,6 +66,8 @@
case sf::BlendMode::Add: return GLEXT_GL_FUNC_ADD;
case sf::BlendMode::Subtract: return GLEXT_GL_FUNC_SUBTRACT;
}
+ sf::err() << "Invalid value for sf::BlendMode::Equation! Fallback to GLEXT_GL_FUNC_ADD." << std::endl;
+ return GLEXT_GL_FUNC_ADD;
}
}