diff --git a/libpng-1.2.36.txt b/libpng-1.2.37beta01.txt similarity index 99% rename from libpng-1.2.36.txt rename to libpng-1.2.37beta01.txt index a455662e..8b7211e5 100644 --- a/libpng-1.2.36.txt +++ b/libpng-1.2.37beta01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.36 - May 6, 2009 + libpng version 1.2.37beta01 - May 7, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -9,7 +9,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.36 - May 6, 2009 + libpng versions 0.97, January 1998, through 1.2.37beta01 - May 7, 2009 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2009 Glenn Randers-Pehrson @@ -2947,13 +2947,13 @@ when the Intel assembler code was removed due to a licensing issue. IX. (Omitted) X. Y2K Compliance in libpng -May 6, 2009 +May 7, 2009 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.2.36 are Y2K compliant. It is my belief that earlier +upward through 1.2.37beta01 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index b39d8175..a11cdbb1 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -1,4 +1,4 @@ - + project(PNG) # Copyright (C) 2007 Glenn Randers-Pehrson @@ -184,7 +184,6 @@ install_targets(/lib ${PNG_LIB_NAME}) if(PNG_STATIC) install_targets(/lib ${PNG_LIB_NAME_STATIC}) endif(PNG_STATIC) - install(FILES png.h pngconf.h DESTINATION include) install(FILES png.h pngconf.h DESTINATION include/${PNGLIB_NAME}) install(FILES libpng.3 libpngpf.3 DESTINATION man/man3) diff --git a/scripts/descrip.mms b/scripts/descrip.mms index 3584b0d7..f3a8d7ba 100644 --- a/scripts/descrip.mms +++ b/scripts/descrip.mms @@ -1,6 +1,6 @@ cc_defs = /inc=$(ZLIBSRC) -c_deb = +c_deb = .ifdef __DECC__ pref = /prefix=all @@ -29,7 +29,7 @@ test : pngtest.exe run pngtest clean : - delete *.obj;*,*.exe;* + delete *.obj;*,*.exe; # Other dependencies. @@ -44,9 +44,9 @@ pngerror.obj : png.h, pngconf.h pngmem.obj : png.h, pngconf.h pngrio.obj : png.h, pngconf.h pngwio.obj : png.h, pngconf.h -pngtest.obj : png.h, pngconf.h pngtrans.obj : png.h, pngconf.h pngwrite.obj : png.h, pngconf.h pngwtran.obj : png.h, pngconf.h pngwutil.obj : png.h, pngconf.h +pngtest.obj : png.h, pngconf.h diff --git a/scripts/makefile.acorn b/scripts/makefile.acorn index 470cf89b..a0e577b2 100644 --- a/scripts/makefile.acorn +++ b/scripts/makefile.acorn @@ -6,11 +6,10 @@ CCflags = -c -depend !Depend -IC:,Zlib: -g -throwback -DRISCOS -fnah C++flags = -c -depend !Depend -IC: -throwback Linkflags = -aif -c++ -o $@ ObjAsmflags = -throwback -NoCache -depend !Depend -CMHGflags = +CMHGflags = LibFileflags = -c -l -o $@ Squeezeflags = -o $@ - # Final targets: @.libpng-lib: @.o.png @.o.pngerror @.o.pngrio @.o.pngwio @.o.pngmem \ @.o.pngpread @.o.pngset @.o.pngget @.o.pngread @.o.pngrtran \ diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 22341310..5415272f 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -1,5 +1,5 @@ # makefile for libpng using gcc (generic, static library) -# Copyright (C) 2002, 2006, 2008 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006-2009 Glenn Randers-Pehrson # Copyright (C) 2000 Cosmin Truta # Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc) # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. @@ -54,7 +54,7 @@ A=.a E= # Variables -OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ +OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \ pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O) @@ -94,20 +94,20 @@ install: $(LIBNAME)$(A) clean: $(RM_F) *.o $(LIBNAME)$(A) pngtest pngout.png -png$(O): png.h pngconf.h +png$(O): png.h pngconf.h pngerror$(O): png.h pngconf.h -pngget$(O): png.h pngconf.h -pngmem$(O): png.h pngconf.h +pngget$(O): png.h pngconf.h +pngmem$(O): png.h pngconf.h pngpread$(O): png.h pngconf.h -pngread$(O): png.h pngconf.h -pngrio$(O): png.h pngconf.h +pngread$(O): png.h pngconf.h +pngrio$(O): png.h pngconf.h pngrtran$(O): png.h pngconf.h pngrutil$(O): png.h pngconf.h -pngset$(O): png.h pngconf.h -pngtest$(O): png.h pngconf.h +pngset$(O): png.h pngconf.h pngtrans$(O): png.h pngconf.h -pngwio$(O): png.h pngconf.h +pngwio$(O): png.h pngconf.h pngwrite$(O): png.h pngconf.h pngwtran$(O): png.h pngconf.h pngwutil$(O): png.h pngconf.h +pngtest$(O): png.h pngconf.h diff --git a/scripts/makefile.bc32 b/scripts/makefile.bc32 index 04407dd1..4b96231b 100644 --- a/scripts/makefile.bc32 +++ b/scripts/makefile.bc32 @@ -11,7 +11,6 @@ ## Where zlib.h, zconf.h and zlib.lib are ZLIB_DIR=..\zlib - ## Compiler, linker and lib stuff CC=bcc32 LD=bcc32 @@ -49,7 +48,6 @@ CFLAGS=-I$(ZLIB_DIR) -O2 -d -k- -w $(TARGET_CPU) $(CDEBUG) # -M generate map file LDFLAGS=-L$(ZLIB_DIR) -M $(LDEBUG) - ## Variables OBJS = \ png.obj \ @@ -87,7 +85,6 @@ LIBOBJS = \ LIBNAME=libpng.lib - ## Implicit rules # Braces let make "batch" calls to the compiler, # 2 calls instead of 12; space is important. @@ -100,7 +97,6 @@ LIBNAME=libpng.lib .obj.exe: $(LD) $(LDFLAGS) $*.obj $(LIBNAME) zlib.lib $(NOEHLIB) - ## Major targets all: libpng pngtest @@ -111,25 +107,24 @@ pngtest: pngtest.exe test: pngtest.exe pngtest - ## Minor Targets -png.obj: png.c -pngerror.obj: pngerror.c -pngget.obj: pngget.c -pngmem.obj: pngmem.c -pngpread.obj: pngpread.c -pngread.obj: pngread.c -pngrio.obj: pngrio.c -pngrtran.obj: pngrtran.c -pngrutil.obj: pngrutil.c -pngset.obj: pngset.c -pngtrans.obj: pngtrans.c -pngwio.obj: pngwio.c -pngwrite.obj: pngwrite.c -pngwtran.obj: pngwtran.c -pngwutil.obj: pngwutil.c - +png.obj: png.c png.h pngconf.h +pngerror.obj: pngerror.c png.h pngconf.h +pngget.obj: pngget.c png.h pngconf.h +pngmem.obj: pngmem.c png.h pngconf.h +pngpread.obj: pngpread.c png.h pngconf.h +pngread.obj: pngread.c png.h pngconf.h +pngrio.obj: pngrio.c png.h pngconf.h +pngrtran.obj: pngrtran.c png.h pngconf.h +pngrutil.obj: pngrutil.c png.h pngconf.h +pngset.obj: pngset.c png.h pngconf.h +pngtrans.obj: pngtrans.c png.h pngconf.h +pngwio.obj: pngwio.c png.h pngconf.h +pngwrite.obj: pngwrite.c png.h pngconf.h +pngwtran.obj: pngwtran.c png.h pngconf.h +pngwutil.obj: pngwutil.c png.h pngconf.h +pngtest.obj: pngtest.c png.h pngconf.h $(LIBNAME): $(OBJS) -del $(LIBNAME) @@ -137,7 +132,6 @@ $(LIBNAME): $(OBJS) $(LIBOBJS), libpng | - # Cleanup clean: -del *.obj @@ -148,5 +142,4 @@ clean: -del *.tds -del pngout.png - # End of makefile for libpng diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 4e7ccd2f..82e42342 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -223,4 +223,5 @@ pngwrite.o pngwrite.pic.o: png.h pngconf.h pngwtran.o pngwtran.pic.o: png.h pngconf.h pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpread.o pngpread.pic.o: png.h pngconf.h + pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.bor b/scripts/makefile.bor index a5651aa3..0a8ef001 100644 --- a/scripts/makefile.bor +++ b/scripts/makefile.bor @@ -12,7 +12,6 @@ ## Where zlib.h, zconf.h and zlib_MODEL.lib are ZLIB_DIR=..\zlib - ## Compiler, linker and lib stuff CC=bcc LD=bcc @@ -57,8 +56,8 @@ CFLAGS=-O2 -Z -X- -w -I$(ZLIB_DIR) -$(TARGET_CPU) $(MODEL_ARG) $(CDEBUG) # -M generate map file LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG) - ## Variables + OBJS = \ png.obj \ pngerror.obj \ @@ -95,8 +94,8 @@ LIBOBJS = \ LIBNAME=libpng$(MODEL).lib - ## Implicit rules + # Braces let make "batch" calls to the compiler, # 2 calls instead of 12; space is important. .c.obj: @@ -105,8 +104,8 @@ LIBNAME=libpng$(MODEL).lib .c.exe: $(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB) - ## Major targets + all: libpng pngtest libpng: $(LIBNAME) @@ -116,25 +115,23 @@ pngtest: pngtest$(MODEL).exe test: pngtest$(MODEL).exe pngtest$(MODEL) - ## Minor Targets -png.obj: png.c -pngerror.obj: pngerror.c -pngget.obj: pngget.c -pngmem.obj: pngmem.c -pngpread.obj: pngpread.c -pngread.obj: pngread.c -pngrio.obj: pngrio.c -pngrtran.obj: pngrtran.c -pngrutil.obj: pngrutil.c -pngset.obj: pngset.c -pngtrans.obj: pngtrans.c -pngwio.obj: pngwio.c -pngwrite.obj: pngwrite.c -pngwtran.obj: pngwtran.c -pngwutil.obj: pngwutil.c - +png.obj: png.c png.h pngconf.h +pngerror.obj: pngerror.c png.h pngconf.h +pngget.obj: pngget.c png.h pngconf.h +pngmem.obj: pngmem.c png.h pngconf.h +pngpread.obj: pngpread.c png.h pngconf.h +pngread.obj: pngread.c png.h pngconf.h +pngrio.obj: pngrio.c png.h pngconf.h +pngrtran.obj: pngrtran.c png.h pngconf.h +pngrutil.obj: pngrutil.c png.h pngconf.h +pngset.obj: pngset.c png.h pngconf.h +pngtrans.obj: pngtrans.c png.h pngconf.h +pngwio.obj: pngwio.c png.h pngconf.h +pngwrite.obj: pngwrite.c png.h pngconf.h +pngwtran.obj: pngwtran.c png.h pngconf.h +pngwutil.obj: pngwutil.c png.h pngconf.h $(LIBNAME): $(OBJS) -del $(LIBNAME) @@ -142,14 +139,12 @@ $(LIBNAME): $(OBJS) $(LIBOBJS), libpng$(MODEL) | - pngtest$(MODEL).obj: pngtest.c $(CC) $(CFLAGS) -opngtest$(MODEL) -c pngtest.c pngtest$(MODEL).exe: pngtest$(MODEL).obj $(LD) $(LDFLAGS) pngtest$(MODEL).obj $(LIBNAME) zlib_$(MODEL).lib $(NOEHLIB) - # Clean up anything else you want clean: -del *.obj @@ -158,5 +153,4 @@ clean: -del *.lst -del *.map - # End of makefile for libpng diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index d2911893..e406dc02 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -176,7 +176,7 @@ pngtest-stat$(EXE): pngtest.o $(STATLIB) pngtest.pic.o: pngtest.c $(CC) $(CFLAGS) -c $< -o $@ -pngtest.o: pngtest.c +pngtest.o: pngtest.c png.h pngconf.h $(CC) $(CFLAGS) -c $< -o $@ test: test-static test-shared diff --git a/scripts/makefile.dec b/scripts/makefile.dec index ccd77658..99fdd91b 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -205,10 +205,10 @@ pngget.o: png.h pngconf.h pngread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h +pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2 index 09045c27..ac6ffd89 100644 --- a/scripts/makefile.dj2 +++ b/scripts/makefile.dj2 @@ -1,5 +1,5 @@ # DJGPP (DOS gcc) makefile for libpng -# Copyright (C) 2002 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h @@ -47,9 +47,9 @@ pngread.o: png.h pngconf.h pngpread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h +pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd index 59f36444..f10f1e64 100644 --- a/scripts/makefile.freebsd +++ b/scripts/makefile.freebsd @@ -1,5 +1,5 @@ # makefile for libpng under FreeBSD -# Copyright (C) 2002, 2007 Glenn Randers-Pehrson and Andrey A. Chernov +# Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov # For conditions of distribution and use, see copyright notice in png.h PREFIX?= /usr/local diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc index b2675a4b..83aec8b0 100644 --- a/scripts/makefile.gcc +++ b/scripts/makefile.gcc @@ -31,9 +31,9 @@ A=.a EXE= # Variables -OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ - pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \ - pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O) +OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \ + pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \ + pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O) # Targets all: static @@ -61,20 +61,20 @@ pngtest$(EXE): pngtest$(O) libpng$(A) clean: $(RM_F) *$(O) libpng$(A) pngtest$(EXE) pngout.png -png$(O): png.h pngconf.h +png$(O): png.h pngconf.h pngerror$(O): png.h pngconf.h -pngget$(O): png.h pngconf.h -pngmem$(O): png.h pngconf.h +pngget$(O): png.h pngconf.h +pngmem$(O): png.h pngconf.h pngpread$(O): png.h pngconf.h -pngread$(O): png.h pngconf.h -pngrio$(O): png.h pngconf.h +pngread$(O): png.h pngconf.h +pngrio$(O): png.h pngconf.h pngrtran$(O): png.h pngconf.h pngrutil$(O): png.h pngconf.h -pngset$(O): png.h pngconf.h -pngtest$(O): png.h pngconf.h +pngset$(O): png.h pngconf.h pngtrans$(O): png.h pngconf.h -pngwio$(O): png.h pngconf.h +pngwio$(O): png.h pngconf.h pngwrite$(O): png.h pngconf.h pngwtran$(O): png.h pngconf.h pngwutil$(O): png.h pngconf.h +pngtest$(O): png.h pngconf.h diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index b556f80a..12a01f24 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -64,11 +64,11 @@ CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -W -Wall -O \ ### for gcc 2.95.2 on 686: #CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -W -Wall -O \ # -mcpu=i686 -malign-double -ffast-math -fstrict-aliasing \ -# $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer +# $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer ### for gcc 2.7.2.3 on 486 and up: #CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -W -Wall -O \ # -m486 -malign-double -ffast-math \ -# $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer +# $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index de69e5d0..600bdb9d 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -1,5 +1,5 @@ # makefile for libpng, HPUX (10.20 and 11.00) using the ANSI/C product. -# Copyright (C) 1999-2002 Glenn Randers-Pehrson +# Copyright (C) 1999-2002, 2006, 2009 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42 # contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard # For conditions of distribution and use, see copyright notice in png.h @@ -227,9 +227,10 @@ pngget.o: png.h pngconf.h pngread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h + +pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index fe4940fe..78c7f7b1 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -224,9 +224,10 @@ pngget.o: png.h pngconf.h pngread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h + +pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc index f09a62c9..cd8af797 100644 --- a/scripts/makefile.ibmc +++ b/scripts/makefile.ibmc @@ -1,5 +1,6 @@ # Makefile for libpng (static) # IBM C version 3.x for Win32 and OS/2 +# Copyright (C) 2006 Glenn Randers-Pehrson # Copyright (C) 2000 Cosmin Truta # For conditions of distribution and use, see copyright notice in png.h # Notes: @@ -53,19 +54,20 @@ clean: $(RM) pngtest$(E) $(RM) pngout.png -png$(O): png.h pngconf.h +png$(O): png.h pngconf.h pngerror$(O): png.h pngconf.h -pngget$(O): png.h pngconf.h -pngmem$(O): png.h pngconf.h +pngget$(O): png.h pngconf.h +pngmem$(O): png.h pngconf.h pngpread$(O): png.h pngconf.h -pngread$(O): png.h pngconf.h -pngrio$(O): png.h pngconf.h +pngread$(O): png.h pngconf.h +pngrio$(O): png.h pngconf.h pngrtran$(O): png.h pngconf.h pngrutil$(O): png.h pngconf.h -pngset$(O): png.h pngconf.h -pngtest$(O): png.h pngconf.h +pngset$(O): png.h pngconf.h pngtrans$(O): png.h pngconf.h -pngwio$(O): png.h pngconf.h +pngwio$(O): png.h pngconf.h pngwrite$(O): png.h pngconf.h pngwtran$(O): png.h pngconf.h pngwutil$(O): png.h pngconf.h + +pngtest$(O): png.h pngconf.h diff --git a/scripts/makefile.intel b/scripts/makefile.intel index b0b523af..5c29e51b 100644 --- a/scripts/makefile.intel +++ b/scripts/makefile.intel @@ -1,12 +1,14 @@ # Makefile for libpng # Microsoft Visual C++ with Intel C/C++ Compiler 4.0 and later +# Copyright (C) 2006 Glenn Randers-Pehrson # Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is # copyright 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h # To use, do "nmake /f scripts\makefile.intel" +# ------------------- Intel C/C++ Compiler 4.0 and later ------------------- # Where the zlib library and include files are located ZLIBLIB=..\zlib @@ -26,7 +28,6 @@ CALLING=r # __fastcall # -------------------------------------------------------------------------- - CC=icl -c CFLAGS=-O2 -G$(CPU)$(CALLING) -Qip -Qunroll4 -I$(ZLIBINC) -nologo LD=link @@ -73,9 +74,6 @@ pngrio$(O): png.h pngconf.h pngwio$(O): png.h pngconf.h $(CC) $(CFLAGS) $*.c $(ERRFILE) -pngtest$(O): png.h pngconf.h - $(CC) $(CFLAGS) $*.c $(ERRFILE) - pngtrans$(O): png.h pngconf.h $(CC) $(CFLAGS) $*.c $(ERRFILE) @@ -95,6 +93,9 @@ libpng.lib: $(OBJS) pngtest.exe: pngtest.obj libpng.lib $(LD) $(LDFLAGS) /OUT:pngtest.exe pngtest.obj libpng.lib $(ZLIBLIB)\zlib.lib +pngtest$(O): png.h pngconf.h + $(CC) $(CFLAGS) $*.c $(ERRFILE) + test: pngtest.exe pngtest.exe diff --git a/scripts/makefile.knr b/scripts/makefile.knr index 44ee538a..0d17359d 100644 --- a/scripts/makefile.knr +++ b/scripts/makefile.knr @@ -1,5 +1,5 @@ # makefile for libpng -# Copyright (C) 2002 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. # For conditions of distribution and use, see copyright notice in png.h @@ -58,7 +58,7 @@ pngtest: pngtest.o libpng.a test: pngtest ./pngtest -install: libpng.a +install: libpng.a png.h pngconf.h -@mkdir $(DESTDIR)$(INCPATH) -@mkdir $(DESTDIR)$(INCPATH)/libpng -@mkdir $(DESTDIR)$(LIBPATH) @@ -92,8 +92,9 @@ pngread.o: png.h pngconf.h pngpread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h + +pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 100b5d7e..286e3449 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -74,7 +74,7 @@ DI=$(DESTDIR)$(INCPATH) DL=$(DESTDIR)$(LIBPATH) DM=$(DESTDIR)$(MANPATH) -OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ +OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \ pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \ pngwtran.o pngmem.o pngerror.o pngpread.o diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 14a6b194..6d7c50ec 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -284,6 +284,3 @@ pngwutil.o pngwutil.pic.o: png.h pngconf.h pngwutil.c pngpread.o pngpread.pic.o: png.h pngconf.h pngpread.c pngtest.o pngtest.pic.o: png.h pngconf.h pngtest.c - - - diff --git a/scripts/makefile.mips b/scripts/makefile.mips index f1a557df..5bf9cf99 100644 --- a/scripts/makefile.mips +++ b/scripts/makefile.mips @@ -76,8 +76,9 @@ pngread.o: png.h pngconf.h pngpread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h + +pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.msc b/scripts/makefile.msc index 1cbfd914..89a2c4a5 100644 --- a/scripts/makefile.msc +++ b/scripts/makefile.msc @@ -1,5 +1,6 @@ # makefile for libpng # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. +# Copyright (C) 2006, 2009 Glenn Randers-Pehrson # For conditions of distribution and use, see copyright notice in png.h # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib @@ -55,9 +56,6 @@ pngrio$(O): png.h pngconf.h pngwio$(O): png.h pngconf.h $(CC) -c $(CFLAGS) $*.c $(ERRFILE) -pngtest$(O): png.h pngconf.h - $(CC) -c $(CFLAGS) $*.c $(ERRFILE) - pngtrans$(O): png.h pngconf.h $(CC) -c $(CFLAGS) $*.c $(ERRFILE) @@ -76,6 +74,9 @@ libpng.lib: $(OBJS1) $(OBJS2) $(OBJS3) lib libpng $(OBJS2); lib libpng $(OBJS3); +pngtest$(O): png.h pngconf.h + $(CC) -c $(CFLAGS) $*.c $(ERRFILE) + pngtest.exe: pngtest.obj libpng.lib $(LD) $(LDFLAGS) pngtest.obj,,,libpng.lib ..\zlib\zlib.lib ; diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 75e7b954..7dafdad4 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -2,7 +2,7 @@ # make obj && make depend && make && make test # make includes && make install # Copyright (C) 2002 Patrick R.L. Welche -# Copyright (C) 2007 Glenn Randers-Pehrson +# Copyright (C) 2007, 2009 Glenn Randers-Pehrson # For conditions of distribution and use, see copyright notice in png.h # You should also run makefile.netbsd @@ -23,7 +23,8 @@ MAN= libpng.3 libpngpf.3 png.5 CPPFLAGS+=-I${.CURDIR} -# something like this for mmx assembler, but it core dumps for me at the moment +# We should be able to do something like this instead of the manual +# uncommenting, but it core dumps for me at the moment: # .if ${MACHINE_ARCH} == "i386" # CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK # MKLINT= no diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd index 645f68de..5894829c 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -2,7 +2,7 @@ # make obj && make depend && make && make test # make includes && make install # Copyright (C) 2002 Patrick R.L. Welche -# Copyright (C) 2007 Glenn Randers-Pehrson +# Copyright (C) 2007, 2009 Glenn Randers-Pehrson # For conditions of distribution and use, see copyright notice in png.h # You should also run makefile.ne0bsd @@ -23,7 +23,8 @@ MAN= libpng.3 libpngpf.3 png.5 CPPFLAGS+=-I${.CURDIR} -# something like this for mmx assembler, but it core dumps for me at the moment +# We should be able to do something like this instead of the manual +# uncommenting, but it core dumps for me at the moment: # .if ${MACHINE_ARCH} == "i386" # CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK # MKLINT= no diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx index 9e8c3aca..0286e6eb 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -233,20 +233,20 @@ writelock: # DO NOT DELETE THIS LINE -- make depend depends on it. -png.o png.pic.o: png.h pngconf.h -pngerror.o pngerror.pic.o: png.h pngconf.h -pngrio.o pngrio.pic.o: png.h pngconf.h -pngwio.o pngwio.pic.o: png.h pngconf.h -pngmem.o pngmem.pic.o: png.h pngconf.h -pngset.o pngset.pic.o: png.h pngconf.h -pngget.o pngget.pic.o: png.h pngconf.h -pngread.o pngread.pic.o: png.h pngconf.h -pngrtran.o pngrtran.pic.o: png.h pngconf.h -pngrutil.o pngrutil.pic.o: png.h pngconf.h -pngtrans.o pngtrans.pic.o: png.h pngconf.h -pngwrite.o pngwrite.pic.o: png.h pngconf.h -pngwtran.o pngwtran.pic.o: png.h pngconf.h -pngwutil.o pngwutil.pic.o: png.h pngconf.h -pngpread.o pngpread.pic.o: png.h pngconf.h +png.o png.pic.o: png.h pngconf.h png.c +pngerror.o pngerror.pic.o: png.h pngconf.h pngerror.c +pngrio.o pngrio.pic.o: png.h pngconf.h pngrio.c +pngwio.o pngwio.pic.o: png.h pngconf.h pngwio.c +pngmem.o pngmem.pic.o: png.h pngconf.h pngmem.c +pngset.o pngset.pic.o: png.h pngconf.h pngset.c +pngget.o pngget.pic.o: png.h pngconf.h pngget.c +pngread.o pngread.pic.o: png.h pngconf.h pngread.c +pngrtran.o pngrtran.pic.o: png.h pngconf.h pngrtran.c +pngrutil.o pngrutil.pic.o: png.h pngconf.h pngrutil.c +pngtrans.o pngtrans.pic.o: png.h pngconf.h pngtrans.c +pngwrite.o pngwrite.pic.o: png.h pngconf.h pngwrite.c +pngwtran.o pngwtran.pic.o: png.h pngconf.h pngwtran.c +pngwutil.o pngwutil.pic.o: png.h pngconf.h pngwutil.c +pngpread.o pngpread.pic.o: png.h pngconf.h pngpread.c -pngtest.o: png.h pngconf.h +pngtest.o: png.h pngconf.h pngtest.c diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 2a3631a2..a2db6a63 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -18,7 +18,7 @@ SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ HDRS= png.h pngconf.h CFLAGS+= -W -Wall -CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_CODE +CPPFLAGS+= -I${.CURDIR} -DPNG_NO_MMX_CODE NOPROFILE= Yes diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 13b5511a..dfae678c 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -212,10 +212,8 @@ test-installed: ./pngtesti pngtest.png clean: - $(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc libpng-config \ - $(LIBSO) $(LIBSOMAJ)* \ - $(OLDSOVER) \ - so_locations + $(RM_F) libpng.a pngtest pngtesti pngout.png libpng.pc \ + so_locations libpng-config $(LIBSO) $(LIBSOMAJ)* $(OLDSOVER) DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO writelock: @@ -233,10 +231,10 @@ pngget.o: png.h pngconf.h pngread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h +pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 8658949d..be775e08 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -236,10 +236,10 @@ pngget.o: png.h pngconf.h pngread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h +pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 8ac3250c..d5c4c9f3 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -43,8 +43,7 @@ ZLIBINC=/usr/local/include WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -CFLAGS=-I$(ZLIBINC) -W -Wall -O \ - -DPNG_NO_MMX_CODE; \ +CFLAGS=-I$(ZLIBINC) -W -Wall -O -DPNG_NO_MMX_CODE; \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm diff --git a/scripts/makefile.std b/scripts/makefile.std index 9b1925d6..de665e63 100644 --- a/scripts/makefile.std +++ b/scripts/makefile.std @@ -83,10 +83,10 @@ pngget.o: png.h pngconf.h pngread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h +pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos index ff195912..0f0a2264 100644 --- a/scripts/makefile.sunos +++ b/scripts/makefile.sunos @@ -88,10 +88,10 @@ pngget.o: png.h pngconf.h pngread.o: png.h pngconf.h pngrtran.o: png.h pngconf.h pngrutil.o: png.h pngconf.h -pngtest.o: png.h pngconf.h pngtrans.o: png.h pngconf.h pngwrite.o: png.h pngconf.h pngwtran.o: png.h pngconf.h pngwutil.o: png.h pngconf.h pngpread.o: png.h pngconf.h +pngtest.o: png.h pngconf.h diff --git a/scripts/makefile.vcawin32 b/scripts/makefile.vcawin32 index 99f54305..0966711d 100644 --- a/scripts/makefile.vcawin32 +++ b/scripts/makefile.vcawin32 @@ -1,17 +1,18 @@ # makefile for libpng +# Copyright (C) 2006,2009 Glenn Randers-Pehrson # Copyright (C) 1998 Tim Wegner # For conditions of distribution and use, see copyright notice in png.h # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib # To use, do "nmake /f scripts\makefile.vcawin32" -# -------- Microsoft Visual C++ 5.0 and later, uses assembler code -------- +# -------- Microsoft Visual C++ 2.0 and later, no assembler code -------- # If you don't want to use assembler (MMX) code, use makefile.vcwin32 instead. # Compiler, linker, librarian, and other tools CC = cl LD = link AR = lib -CFLAGS = -DPNG_USE_PNGVCRD -nologo -MD -O2 -W3 -I..\zlib +CFLAGS = -nologo -DPNG_USE_PNGVCRD -MD -O2 -W3 -I..\zlib LDFLAGS = -nologo ARFLAGS = -nologo RM = del @@ -64,9 +65,6 @@ pngrio$(O): png.h pngconf.h pngwio$(O): png.h pngconf.h $(CC) -c $(CFLAGS) $*.c $(ERRFILE) -pngtest$(O): png.h pngconf.h - $(CC) -c $(CFLAGS) $*.c $(ERRFILE) - pngtrans$(O): png.h pngconf.h $(CC) -c $(CFLAGS) $*.c $(ERRFILE) @@ -83,6 +81,9 @@ libpng.lib: $(OBJS) -$(RM) $@ $(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE) +pngtest$(O): png.h pngconf.h + $(CC) -c $(CFLAGS) $*.c $(ERRFILE) + pngtest.exe: pngtest$(O) libpng.lib $(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE) diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32 index fc6ece67..81842321 100644 --- a/scripts/makefile.vcwin32 +++ b/scripts/makefile.vcwin32 @@ -1,5 +1,6 @@ # makefile for libpng # Copyright (C) 1998 Tim Wegner +# Copyright (C) 2006,2009 Glenn Randers-Pehrson # For conditions of distribution and use, see copyright notice in png.h # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib # To use, do "nmake /f scripts\makefile.vcwin32" @@ -64,9 +65,6 @@ pngrio$(O): png.h pngconf.h pngwio$(O): png.h pngconf.h $(CC) -c $(CFLAGS) $*.c $(ERRFILE) -pngtest$(O): png.h pngconf.h - $(CC) -c $(CFLAGS) $*.c $(ERRFILE) - pngtrans$(O): png.h pngconf.h $(CC) -c $(CFLAGS) $*.c $(ERRFILE) @@ -83,6 +81,9 @@ libpng.lib: $(OBJS) -$(RM) $@ $(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE) +pngtest$(O): png.h pngconf.h + $(CC) -c $(CFLAGS) $*.c $(ERRFILE) + pngtest.exe: pngtest$(O) libpng.lib $(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE) diff --git a/scripts/makevms.com b/scripts/makevms.com index b9e38955..36d11906 100644 --- a/scripts/makevms.com +++ b/scripts/makevms.com @@ -55,8 +55,6 @@ $ then $ dele pngtest.obj;* $ CALL MAKE png.OBJ "cc ''CCOPT' png" - png.c png.h pngconf.h -$ CALL MAKE pngpread.OBJ "cc ''CCOPT' pngpread" - - pngpread.c png.h pngconf.h $ CALL MAKE pngset.OBJ "cc ''CCOPT' pngset" - pngset.c png.h pngconf.h $ CALL MAKE pngget.OBJ "cc ''CCOPT' pngget" - @@ -64,7 +62,7 @@ $ CALL MAKE pngget.OBJ "cc ''CCOPT' pngget" - $ CALL MAKE pngread.OBJ "cc ''CCOPT' pngread" - pngread.c png.h pngconf.h $ CALL MAKE pngpread.OBJ "cc ''CCOPT' pngpread" - - pngpread.c png.h pngconf.h + pngpread.c png.h pngconf.h $ CALL MAKE pngrtran.OBJ "cc ''CCOPT' pngrtran" - pngrtran.c png.h pngconf.h $ CALL MAKE pngrutil.OBJ "cc ''CCOPT' pngrutil" - diff --git a/scripts/pngw32.def b/scripts/pngw32.def index c9b24cc8..e47591c5 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -189,6 +189,7 @@ EXPORTS ; Added at version 1.0.12 ; For compatibility with 1.0.7-1.0.11 ; png_info_init @174 +; png_read_init_3, png_info_init_3, and png_write_init_3 are deprecated. png_read_init_3 @175 png_write_init_3 @176 png_info_init_3 @177