4 files changed, 218 insertions, 218 deletions

diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/README b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/README
index f8a8b6d..ff9aa45 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/README
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/README
@@ -1,10 +1,10 @@
-This demonstrates the use of PNG_USER_CONFIG and pngusr.h

-

-The makefile builds a minimal write-only decoder with embedded libpng

-and zlib.

-

-Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC

-on the make command line.

-

-If you prefer to use the shared libraries, go to contrib/pngminus

-and build the pnm2png application there.

+This demonstrates the use of PNG_USER_CONFIG and pngusr.h
+
+The makefile builds a minimal write-only decoder with embedded libpng
+and zlib.
+
+Specify the location of the zlib source (1.2.1 or later) as ZLIBSRC
+on the make command line.
+
+If you prefer to use the shared libraries, go to contrib/pngminus
+and build the pnm2png application there.
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/makefile b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/makefile
index 7374a6c..d6f39e2 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/makefile
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/makefile
@@ -1,149 +1,149 @@
-# Makefile for PngMinus (pnm2pngm)

-# Linux / Unix

-

-#CC=cc

-CC=gcc

-LD=$(CC)

-

-# If awk fails try

-# make AWK=nawk

-

-# If cpp fails try

-# make CPP=/lib/cpp

-

-RM=rm -f

-COPY=cp

-

-CFLAGS=-DPNG_USER_CONFIG -DNO_GZIP -I. -O1

-

-C=.c

-O=.o

-L=.a

-E=

-

-# Where to find the source code:

-PNGSRC =../../..

-ZLIBSRC=$(PNGSRC)/../zlib

-PROGSRC=$(PNGSRC)/contrib/pngminus

-

-# Zlib

-ZSRCS  = adler32$(C) compress$(C) crc32$(C) deflate$(C) \

-         trees$(C) zutil$(C)

-

-# Standard headers

-#ZH     = zlib.h crc32.h deflate.h trees.h zutil.h

-ZH     = zlib.h crc32.h deflate.h trees.h zutil.h

-

-# Machine generated headers

-ZCONF  = zconf.h

-

-# Headers callers use

-ZINC   = zlib.h $(ZCONF)

-

-# Headers the Zlib source uses

-ZHDRS  = $(ZH) $(ZCONF)

-

-# compress is not required; it is needed to link the zlib

-# code because deflate defines an unused API function deflateBound

-# which itself calls compressBound from compress.

-ZOBJS  = adler32$(O) compress$(O) crc32$(O) deflate$(O) \

-         trees$(O) zutil$(O)

-

-# libpng

-PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \

-        pngset$(C) pngtrans$(C) pngwio$(C) pngwrite$(C) \

-        pngwtran$(C) pngwutil$(C)

-

-# Standard headers

-PNGH   =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h

-

-# Machine generated headers

-PNGCONF=pnglibconf.h

-

-# Headers callers use

-PNGINC= png.h pngconf.h pngusr.h $(PNGCONF)

-

-# Headers the PNG library uses

-PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h

-

-PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \

-        pngset$(O) pngtrans$(O) pngwio$(O) pngwrite$(O) \

-        pngwtran$(O) pngwutil$(O)

-

-PROGSRCS= pnm2pngm$(C)

-PROGHDRS=

-PROGDOCS=

-PROGOBJS= pnm2pngm$(O)

-

-OBJS    = $(PROGOBJS) $(PNGOBJS) $(ZOBJS)

-

-# implicit make rules -------------------------------------------------------

-

-.c$(O):

-        $(CC) -c $(CFLAGS) $<

-

-# dependencies

-

-all: pnm2pngm$(E)

-

-pnm2pngm$(E): $(OBJS)

-        $(LD) -o pnm2pngm$(E) $(OBJS)

-

-# The DFA_XTRA setting turns all libpng options off then

-# turns on those required for this minimal build.

-# The CPP_FLAGS setting causes pngusr.h to be included in

-# both the build of pnglibconf.h and, subsequently, when

-# building libpng itself.

-$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak\

-        $(PNGSRC)/scripts/pnglibconf.dfa \

-        $(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa

-        $(RM) pnglibconf.h pnglibconf.dfn

-        $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\

-            srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG"\

-            DFA_XTRA="pngusr.dfa" $@

-

-clean:

-        $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\

-            srcdir=$(PNGSRC) clean

-        $(RM) pnm2pngm$(O)

-        $(RM) pnm2pngm$(E)

-        $(RM) $(OBJS)

-

-# distclean also removes the copied source and headers

-distclean: clean

-        $(RM) -r scripts # historical reasons

-        $(RM) $(PNGSRCS) $(PNGH)

-        $(RM) $(ZSRCS) $(ZH) $(ZCONF)

-        $(RM) $(PROGSRCS) $(PROGHDRS) $(PROGDOCS)

-

-# Header file dependencies:

-$(PROGOBJS): $(PROGHDRS) $(PNGINC) $(ZINC)

-$(PNGOBJS): $(PNGHDRS) $(ZINC)

-$(ZOBJS): $(ZHDRS)

-

-# Gather the source code from the respective directories

-$(PNGSRCS) $(PNGH): $(PNGSRC)/$@

-        $(RM) $@

-        $(COPY) $(PNGSRC)/$@ $@

-

-# No dependency on the ZLIBSRC target so that it only needs

-# to be specified once.

-$(ZSRCS) $(ZH):

-        $(RM) $@

-        $(COPY) $(ZLIBSRC)/$@ $@

-

-# The unconfigured zconf.h varies in name according to the

-# zlib release

-$(ZCONF):

-        $(RM) $@

-        @for f in zconf.h.in zconf.in.h zconf.h; do\

-            test -r $(ZLIBSRC)/$$f &&\

-            echo $(COPY) $(ZLIBSRC)/$$f $@ &&\

-            $(COPY) $(ZLIBSRC)/$$f $@ && exit 0;\

-        done; echo copy: $(ZLIBSRC)/zconf.h not found; exit 1

-

-pnm2pngm.c: $(PROGSRC)/pnm2png.c

-        $(RM) $@

-        $(COPY) $(PROGSRC)/pnm2png.c $@

-

-# End of makefile for pnm2pngm

+# Makefile for PngMinus (pnm2pngm)
+# Linux / Unix
+
+#CC=cc
+CC=gcc
+LD=$(CC)
+
+# If awk fails try
+# make AWK=nawk
+
+# If cpp fails try
+# make CPP=/lib/cpp
+
+RM=rm -f
+COPY=cp
+
+CFLAGS=-DPNG_USER_CONFIG -DNO_GZIP -I. -O1
+
+C=.c
+O=.o
+L=.a
+E=
+
+# Where to find the source code:
+PNGSRC =../../..
+ZLIBSRC=$(PNGSRC)/../zlib
+PROGSRC=$(PNGSRC)/contrib/pngminus
+
+# Zlib
+ZSRCS  = adler32$(C) compress$(C) crc32$(C) deflate$(C) \
+         trees$(C) zutil$(C)
+
+# Standard headers
+#ZH     = zlib.h crc32.h deflate.h trees.h zutil.h
+ZH     = zlib.h crc32.h deflate.h trees.h zutil.h
+
+# Machine generated headers
+ZCONF  = zconf.h
+
+# Headers callers use
+ZINC   = zlib.h $(ZCONF)
+
+# Headers the Zlib source uses
+ZHDRS  = $(ZH) $(ZCONF)
+
+# compress is not required; it is needed to link the zlib
+# code because deflate defines an unused API function deflateBound
+# which itself calls compressBound from compress.
+ZOBJS  = adler32$(O) compress$(O) crc32$(O) deflate$(O) \
+         trees$(O) zutil$(O)
+
+# libpng
+PNGSRCS=png$(C) pngerror$(C) pngget$(C) pngmem$(C) \
+        pngset$(C) pngtrans$(C) pngwio$(C) pngwrite$(C) \
+        pngwtran$(C) pngwutil$(C)
+
+# Standard headers
+PNGH   =png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h
+
+# Machine generated headers
+PNGCONF=pnglibconf.h
+
+# Headers callers use
+PNGINC= png.h pngconf.h pngusr.h $(PNGCONF)
+
+# Headers the PNG library uses
+PNGHDRS=$(PNGH) $(PNGCONF) pngusr.h
+
+PNGOBJS=png$(O) pngerror$(O) pngget$(O) pngmem$(O) \
+        pngset$(O) pngtrans$(O) pngwio$(O) pngwrite$(O) \
+        pngwtran$(O) pngwutil$(O)
+
+PROGSRCS= pnm2pngm$(C)
+PROGHDRS=
+PROGDOCS=
+PROGOBJS= pnm2pngm$(O)
+
+OBJS    = $(PROGOBJS) $(PNGOBJS) $(ZOBJS)
+
+# implicit make rules -------------------------------------------------------
+
+.c$(O):
+        $(CC) -c $(CFLAGS) $<
+
+# dependencies
+
+all: pnm2pngm$(E)
+
+pnm2pngm$(E): $(OBJS)
+        $(LD) -o pnm2pngm$(E) $(OBJS)
+
+# The DFA_XTRA setting turns all libpng options off then
+# turns on those required for this minimal build.
+# The CPP_FLAGS setting causes pngusr.h to be included in
+# both the build of pnglibconf.h and, subsequently, when
+# building libpng itself.
+$(PNGCONF): $(PNGSRC)/scripts/pnglibconf.mak\
+        $(PNGSRC)/scripts/pnglibconf.dfa \
+        $(PNGSRC)/scripts/options.awk pngusr.h pngusr.dfa
+        $(RM) pnglibconf.h pnglibconf.dfn
+        $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
+            srcdir=$(PNGSRC) CPPFLAGS="-DPNG_USER_CONFIG"\
+            DFA_XTRA="pngusr.dfa" $@
+
+clean:
+        $(MAKE) $(MAKEFLAGS) -f $(PNGSRC)/scripts/pnglibconf.mak\
+            srcdir=$(PNGSRC) clean
+        $(RM) pnm2pngm$(O)
+        $(RM) pnm2pngm$(E)
+        $(RM) $(OBJS)
+
+# distclean also removes the copied source and headers
+distclean: clean
+        $(RM) -r scripts # historical reasons
+        $(RM) $(PNGSRCS) $(PNGH)
+        $(RM) $(ZSRCS) $(ZH) $(ZCONF)
+        $(RM) $(PROGSRCS) $(PROGHDRS) $(PROGDOCS)
+
+# Header file dependencies:
+$(PROGOBJS): $(PROGHDRS) $(PNGINC) $(ZINC)
+$(PNGOBJS): $(PNGHDRS) $(ZINC)
+$(ZOBJS): $(ZHDRS)
+
+# Gather the source code from the respective directories
+$(PNGSRCS) $(PNGH): $(PNGSRC)/$@
+        $(RM) $@
+        $(COPY) $(PNGSRC)/$@ $@
+
+# No dependency on the ZLIBSRC target so that it only needs
+# to be specified once.
+$(ZSRCS) $(ZH):
+        $(RM) $@
+        $(COPY) $(ZLIBSRC)/$@ $@
+
+# The unconfigured zconf.h varies in name according to the
+# zlib release
+$(ZCONF):
+        $(RM) $@
+        @for f in zconf.h.in zconf.in.h zconf.h; do\
+            test -r $(ZLIBSRC)/$$f &&\
+            echo $(COPY) $(ZLIBSRC)/$$f $@ &&\
+            $(COPY) $(ZLIBSRC)/$$f $@ && exit 0;\
+        done; echo copy: $(ZLIBSRC)/zconf.h not found; exit 1
+
+pnm2pngm.c: $(PROGSRC)/pnm2png.c
+        $(RM) $@
+        $(COPY) $(PROGSRC)/pnm2png.c $@
+
+# End of makefile for pnm2pngm
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.dfa b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.dfa
index 448f821..ee88443 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.dfa
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.dfa
@@ -1,35 +1,35 @@
-# pngminim/encoder/pngusr.dfa

-#

-# Copyright (c) 2010-2011 Glenn Randers-Pehrson

-#

-# This code is released under the libpng license.

-# For conditions of distribution and use, see the disclaimer

-# and license in png.h

-

-# First all the build options off:

-

-everything = off

-

-# Switch on the write code - this makes a minimalist encoder

-

-option WRITE on

-

-# You must choose fixed or floating point arithmetic:

-# option FLOATING_POINT on

-

-option FIXED_POINT on

-

-# You must chose the internal fixed point implementation or to

-# use the system floating point.  The latter is considerably

-# smaller (by about 1kbyte on an x86 system):

-# option FLOATING_ARITHMETIC on

-

-option FLOATING_ARITHMETIC off

-

-# Your program will probably need other options.  The example

-# program here, pnm2pngm, requires the following.  Take a look

-# at pnglibconf.h to find out the full set of what has to be

-# enabled to make the following work.

-

-option SETJMP on

-option STDIO on

+# pngminim/encoder/pngusr.dfa
+#
+# Copyright (c) 2010-2011 Glenn Randers-Pehrson
+#
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+
+# First all the build options off:
+
+everything = off
+
+# Switch on the write code - this makes a minimalist encoder
+
+option WRITE on
+
+# You must choose fixed or floating point arithmetic:
+# option FLOATING_POINT on
+
+option FIXED_POINT on
+
+# You must chose the internal fixed point implementation or to
+# use the system floating point.  The latter is considerably
+# smaller (by about 1kbyte on an x86 system):
+# option FLOATING_ARITHMETIC on
+
+option FLOATING_ARITHMETIC off
+
+# Your program will probably need other options.  The example
+# program here, pnm2pngm, requires the following.  Take a look
+# at pnglibconf.h to find out the full set of what has to be
+# enabled to make the following work.
+
+option SETJMP on
+option STDIO on
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.h b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.h
index bafbf13..2033aad 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.h
+++ b/libraries/irrlicht-1.8/source/Irrlicht/libpng/contrib/pngminim/encoder/pngusr.h
@@ -1,24 +1,24 @@
-/* minwrpngconf.h: headers to make a minimal png-write-only library

- *

- * Copyright (c) 2007, 2010-2011 Glenn Randers-Pehrson

- *

- * This code is released under the libpng license.

- * For conditions of distribution and use, see the disclaimer

- * and license in png.h

- *

- * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson

- */

-

-#ifndef MINWRPNGCONF_H

-#define MINWRPNGCONF_H

-

-/* To include pngusr.h set -DPNG_USER_CONFIG in CPPFLAGS */

-

-/* List options to turn off features of the build that do not

- * affect the API (so are not recorded in pnglibconf.h)

- */

-

-#define PNG_NO_WARNINGS

-#define PNG_ALIGN_TYPE PNG_ALIGN_NONE

-

-#endif /* MINWRPNGCONF_H */

+/* minwrpngconf.h: headers to make a minimal png-write-only library
+ *
+ * Copyright (c) 2007, 2010-2011 Glenn Randers-Pehrson
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
+ * Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
+ */
+
+#ifndef MINWRPNGCONF_H
+#define MINWRPNGCONF_H
+
+/* To include pngusr.h set -DPNG_USER_CONFIG in CPPFLAGS */
+
+/* List options to turn off features of the build that do not
+ * affect the API (so are not recorded in pnglibconf.h)
+ */
+
+#define PNG_NO_WARNINGS
+#define PNG_ALIGN_TYPE PNG_ALIGN_NONE
+
+#endif /* MINWRPNGCONF_H */