aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2011-02-02 16:40:39 +0000
committerFilippos Karapetis2011-02-02 16:40:39 +0000
commite6f2f7e615ded18db50b878ac6cbe27b318d0218 (patch)
treefeef343c80d9c150d96daa705cabc7a851888ad6
parentd3e30f303896ab0fd075fb4537343e591372f387 (diff)
downloadscummvm-rg350-e6f2f7e615ded18db50b878ac6cbe27b318d0218.tar.gz
scummvm-rg350-e6f2f7e615ded18db50b878ac6cbe27b318d0218.tar.bz2
scummvm-rg350-e6f2f7e615ded18db50b878ac6cbe27b318d0218.zip
GRAPHICS: Updated the copyright information regarding LodePNG. Removed the obsolete reference to ysflight, as no code is actually used from or based on that project
svn-id: r55726
-rw-r--r--graphics/png.cpp30
-rw-r--r--graphics/png.h4
2 files changed, 31 insertions, 3 deletions
diff --git a/graphics/png.cpp b/graphics/png.cpp
index cf19969b46..d0fe64bf25 100644
--- a/graphics/png.cpp
+++ b/graphics/png.cpp
@@ -33,6 +33,36 @@
#include "common/util.h"
#include "common/zlib.h"
+// PNG decoder, based on the W3C specs:
+// http://www.w3.org/TR/PNG/
+// Parts of the code have been adapted from LodePNG, by Lode Vandevenne:
+// http://members.gamedev.net/lode/projects/LodePNG/
+
+/*
+LodePNG version 20101211
+
+Copyright (c) 2005-2010 Lode Vandevenne
+
+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.
+*/
+
namespace Graphics {
enum PNGChunks {
diff --git a/graphics/png.h b/graphics/png.h
index 4de55d869b..6b695b5beb 100644
--- a/graphics/png.h
+++ b/graphics/png.h
@@ -35,10 +35,8 @@
// PNG decoder, based on the W3C specs:
// http://www.w3.org/TR/PNG/
-// and lodePNG:
+// Parts of the code have been adapted from LodePNG, by Lode Vandevenne:
// http://members.gamedev.net/lode/projects/LodePNG/
-// and the ysflight PNG decoder:
-// http://homepage3.nifty.com/ysflight/pngdecoder/pngdecodere.html
// All the numbers are BE: http://www.w3.org/TR/PNG/#7Integers-and-byte-order