diff options
author | David Walter Seikel | 2013-01-13 18:54:10 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-01-13 18:54:10 +1000 |
commit | 959831f4ef5a3e797f576c3de08cd65032c997ad (patch) | |
tree | e7351908be5995f0b325b2ebeaa02d5a34b82583 /libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/gregbook/readpng.h | |
parent | Add info about changes to Irrlicht. (diff) | |
download | SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.zip SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.gz SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.bz2 SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.xz |
Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard.
Diffstat (limited to 'libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/gregbook/readpng.h')
-rw-r--r-- | libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/gregbook/readpng.h | 176 |
1 files changed, 88 insertions, 88 deletions
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/gregbook/readpng.h b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/gregbook/readpng.h index ec6b483..fad9fe3 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/gregbook/readpng.h +++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/gregbook/readpng.h | |||
@@ -1,88 +1,88 @@ | |||
1 | /*--------------------------------------------------------------------------- | 1 | /*--------------------------------------------------------------------------- |
2 | 2 | ||
3 | rpng - simple PNG display program readpng.h | 3 | rpng - simple PNG display program readpng.h |
4 | 4 | ||
5 | --------------------------------------------------------------------------- | 5 | --------------------------------------------------------------------------- |
6 | 6 | ||
7 | Copyright (c) 1998-2007 Greg Roelofs. All rights reserved. | 7 | Copyright (c) 1998-2007 Greg Roelofs. All rights reserved. |
8 | 8 | ||
9 | This software is provided "as is," without warranty of any kind, | 9 | This software is provided "as is," without warranty of any kind, |
10 | express or implied. In no event shall the author or contributors | 10 | express or implied. In no event shall the author or contributors |
11 | be held liable for any damages arising in any way from the use of | 11 | be held liable for any damages arising in any way from the use of |
12 | this software. | 12 | this software. |
13 | 13 | ||
14 | The contents of this file are DUAL-LICENSED. You may modify and/or | 14 | The contents of this file are DUAL-LICENSED. You may modify and/or |
15 | redistribute this software according to the terms of one of the | 15 | redistribute this software according to the terms of one of the |
16 | following two licenses (at your option): | 16 | following two licenses (at your option): |
17 | 17 | ||
18 | 18 | ||
19 | LICENSE 1 ("BSD-like with advertising clause"): | 19 | LICENSE 1 ("BSD-like with advertising clause"): |
20 | 20 | ||
21 | Permission is granted to anyone to use this software for any purpose, | 21 | Permission is granted to anyone to use this software for any purpose, |
22 | including commercial applications, and to alter it and redistribute | 22 | including commercial applications, and to alter it and redistribute |
23 | it freely, subject to the following restrictions: | 23 | it freely, subject to the following restrictions: |
24 | 24 | ||
25 | 1. Redistributions of source code must retain the above copyright | 25 | 1. Redistributions of source code must retain the above copyright |
26 | notice, disclaimer, and this list of conditions. | 26 | notice, disclaimer, and this list of conditions. |
27 | 2. Redistributions in binary form must reproduce the above copyright | 27 | 2. Redistributions in binary form must reproduce the above copyright |
28 | notice, disclaimer, and this list of conditions in the documenta- | 28 | notice, disclaimer, and this list of conditions in the documenta- |
29 | tion and/or other materials provided with the distribution. | 29 | tion and/or other materials provided with the distribution. |
30 | 3. All advertising materials mentioning features or use of this | 30 | 3. All advertising materials mentioning features or use of this |
31 | software must display the following acknowledgment: | 31 | software must display the following acknowledgment: |
32 | 32 | ||
33 | This product includes software developed by Greg Roelofs | 33 | This product includes software developed by Greg Roelofs |
34 | and contributors for the book, "PNG: The Definitive Guide," | 34 | and contributors for the book, "PNG: The Definitive Guide," |
35 | published by O'Reilly and Associates. | 35 | published by O'Reilly and Associates. |
36 | 36 | ||
37 | 37 | ||
38 | LICENSE 2 (GNU GPL v2 or later): | 38 | LICENSE 2 (GNU GPL v2 or later): |
39 | 39 | ||
40 | This program is free software; you can redistribute it and/or modify | 40 | This program is free software; you can redistribute it and/or modify |
41 | it under the terms of the GNU General Public License as published by | 41 | it under the terms of the GNU General Public License as published by |
42 | the Free Software Foundation; either version 2 of the License, or | 42 | the Free Software Foundation; either version 2 of the License, or |
43 | (at your option) any later version. | 43 | (at your option) any later version. |
44 | 44 | ||
45 | This program is distributed in the hope that it will be useful, | 45 | This program is distributed in the hope that it will be useful, |
46 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 46 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
47 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 47 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
48 | GNU General Public License for more details. | 48 | GNU General Public License for more details. |
49 | 49 | ||
50 | You should have received a copy of the GNU General Public License | 50 | You should have received a copy of the GNU General Public License |
51 | along with this program; if not, write to the Free Software Foundation, | 51 | along with this program; if not, write to the Free Software Foundation, |
52 | Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 52 | Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
53 | 53 | ||
54 | ---------------------------------------------------------------------------*/ | 54 | ---------------------------------------------------------------------------*/ |
55 | 55 | ||
56 | #ifndef TRUE | 56 | #ifndef TRUE |
57 | # define TRUE 1 | 57 | # define TRUE 1 |
58 | # define FALSE 0 | 58 | # define FALSE 0 |
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | #ifndef MAX | 61 | #ifndef MAX |
62 | # define MAX(a,b) ((a) > (b)? (a) : (b)) | 62 | # define MAX(a,b) ((a) > (b)? (a) : (b)) |
63 | # define MIN(a,b) ((a) < (b)? (a) : (b)) | 63 | # define MIN(a,b) ((a) < (b)? (a) : (b)) |
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | #ifdef DEBUG | 66 | #ifdef DEBUG |
67 | # define Trace(x) {fprintf x ; fflush(stderr); fflush(stdout);} | 67 | # define Trace(x) {fprintf x ; fflush(stderr); fflush(stdout);} |
68 | #else | 68 | #else |
69 | # define Trace(x) ; | 69 | # define Trace(x) ; |
70 | #endif | 70 | #endif |
71 | 71 | ||
72 | typedef unsigned char uch; | 72 | typedef unsigned char uch; |
73 | typedef unsigned short ush; | 73 | typedef unsigned short ush; |
74 | typedef unsigned long ulg; | 74 | typedef unsigned long ulg; |
75 | 75 | ||
76 | 76 | ||
77 | /* prototypes for public functions in readpng.c */ | 77 | /* prototypes for public functions in readpng.c */ |
78 | 78 | ||
79 | void readpng_version_info(void); | 79 | void readpng_version_info(void); |
80 | 80 | ||
81 | int readpng_init(FILE *infile, ulg *pWidth, ulg *pHeight); | 81 | int readpng_init(FILE *infile, ulg *pWidth, ulg *pHeight); |
82 | 82 | ||
83 | int readpng_get_bgcolor(uch *bg_red, uch *bg_green, uch *bg_blue); | 83 | int readpng_get_bgcolor(uch *bg_red, uch *bg_green, uch *bg_blue); |
84 | 84 | ||
85 | uch *readpng_get_image(double display_exponent, int *pChannels, | 85 | uch *readpng_get_image(double display_exponent, int *pChannels, |
86 | ulg *pRowbytes); | 86 | ulg *pRowbytes); |
87 | 87 | ||
88 | void readpng_cleanup(int free_image_data); | 88 | void readpng_cleanup(int free_image_data); |