[Scummvm-git-logs] scummvm master -> bc908dd840c58fccdee455a831989dc4e186a47e
bluegr
bluegr at gmail.com
Sun Jan 12 00:15:22 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
bc908dd840 GRAPHICS: Revert unwanted changes to copyright comments
Commit: bc908dd840c58fccdee455a831989dc4e186a47e
https://github.com/scummvm/scummvm/commit/bc908dd840c58fccdee455a831989dc4e186a47e
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-01-12T02:14:48+02:00
Commit Message:
GRAPHICS: Revert unwanted changes to copyright comments
Changed paths:
graphics/transparent_surface.cpp
diff --git a/graphics/transparent_surface.cpp b/graphics/transparent_surface.cpp
index 1ad1ed6..eb8d3fe 100644
--- a/graphics/transparent_surface.cpp
+++ b/graphics/transparent_surface.cpp
@@ -749,30 +749,43 @@ void TransparentSurface::setAlphaMode(AlphaType mode) {
/*
+
The below two functions are adapted from SDL_rotozoom.c,
taken from SDL_gfx-2.0.18.
+
Its copyright notice:
+
=============================================================================
SDL_rotozoom.c: rotozoomer, zoomer and shrinker for 32bit or 8bit surfaces
+
Copyright (C) 2001-2012 Andreas Schiffler
+
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
+
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
+
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
+
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
+
3. This notice may not be removed or altered from any source
distribution.
+
Andreas Schiffler -- aschiffler at ferzkopp dot net
=============================================================================
+
+
The functions have been adapted for different structures and coordinate
systems.
+
*/
More information about the Scummvm-git-logs
mailing list