diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makefile.beos | 2 | ||||
| -rw-r--r-- | scripts/makefile.dec | 2 | ||||
| -rw-r--r-- | scripts/makefile.hpux | 4 | ||||
| -rw-r--r-- | scripts/makefile.knr | 4 | ||||
| -rw-r--r-- | scripts/makefile.linux | 6 | ||||
| -rw-r--r-- | scripts/makefile.mips | 4 | ||||
| -rw-r--r-- | scripts/makefile.sco | 6 | ||||
| -rw-r--r-- | scripts/makefile.sgi | 4 | ||||
| -rw-r--r-- | scripts/makefile.solaris | 21 | ||||
| -rw-r--r-- | scripts/makefile.std | 4 | ||||
| -rw-r--r-- | scripts/makefile.sunos | 4 | ||||
| -rw-r--r-- | scripts/pngdef.pas | 44 | ||||
| -rw-r--r-- | scripts/pngos2.def | 14 |
13 files changed, 104 insertions, 15 deletions
diff --git a/scripts/makefile.beos b/scripts/makefile.beos index b4d035ef1..b764fcc1d 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -31,7 +31,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.5d +PNGMIN = 1.0.5h PNGVER = $(PNGMAJ).$(PNGMIN) # where make install puts libpng.a, libpng.so*, and png.h diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 5baafdeac..0e14dfe49 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -14,7 +14,7 @@ ZLIBINC=../zlib # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.5d +PNGMIN = 1.0.5h PNGVER = $(PNGMAJ).$(PNGMIN) CC=cc diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 780bfe5db..1a98fdd3e 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -47,6 +47,10 @@ install: libpng.a clean: rm -f *.o libpng.a pngtest pngout.png +DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO +writelock: + chmod a-w *.[ch35] $(DOCS) scripts/* + # DO NOT DELETE THIS LINE -- make depend depends on it. png.o: png.h pngconf.h diff --git a/scripts/makefile.knr b/scripts/makefile.knr index 09cb0a2a0..09a74b6fc 100644 --- a/scripts/makefile.knr +++ b/scripts/makefile.knr @@ -58,6 +58,10 @@ install: libpng.a clean: rm -f *.o libpng.a pngtest pngout.png ansi2knr +DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO +writelock: + chmod a-w *.[ch35] $(DOCS) scripts/* + # DO NOT DELETE THIS LINE -- make depend depends on it. png.o: png.h pngconf.h diff --git a/scripts/makefile.linux b/scripts/makefile.linux index c85d01ec2..0ea7d3e27 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -34,7 +34,7 @@ RANLIB=ranlib # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.5d +PNGMIN = 1.0.5h PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -86,6 +86,10 @@ install: libpng.a libpng.so.$(PNGVER) clean: /bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png +DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO +writelock: + chmod a-w *.[ch35] $(DOCS) scripts/* + # DO NOT DELETE THIS LINE -- make depend depends on it. png.o png.pic.o: png.h pngconf.h diff --git a/scripts/makefile.mips b/scripts/makefile.mips index 06ca02ff3..8db26277f 100644 --- a/scripts/makefile.mips +++ b/scripts/makefile.mips @@ -42,6 +42,10 @@ install: libpng.a clean: rm -f *.o libpng.a pngtest pngout.png +DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO +writelock: + chmod a-w *.[ch35] $(DOCS) scripts/* + # DO NOT DELETE THIS LINE -- make depend depends on it. png.o: png.h pngconf.h diff --git a/scripts/makefile.sco b/scripts/makefile.sco index fc572afe4..176a5364e 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -25,7 +25,7 @@ RANLIB=echo # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.5d +PNGMIN = 1.0.5h PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -77,6 +77,10 @@ install: libpng.a libpng.so.$(PNGVER) clean: /bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png +DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO +writelock: + chmod a-w *.[ch35] $(DOCS) scripts/* + # DO NOT DELETE THIS LINE -- make depend depends on it. png.o png.pic.o: png.h pngconf.h diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index e3739b533..010f5f7c3 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -50,6 +50,10 @@ install: libpng.a clean: rm -f *.o libpng.a pngtest pngout.png +DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO +writelock: + chmod a-w *.[ch35] $(DOCS) scripts/* + # DO NOT DELETE THIS LINE -- make depend depends on it. png.o: png.h pngconf.h diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 054cd55b5..b79690714 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -6,11 +6,16 @@ CC=gcc -# The commands "CC" and "LD" must NOT refer to /usr/ucb/cc and /usr/ucb/ld. -# If they do, you need to adjust your PATH environment variable to put -# /usr/ccs/bin ahead of /usr/ucb. The environment variable LD_LIBRARY_PATH -# should not be set at all. If it is, things are likely to break because -# of the libucb dependency that is created. +case "`type ld`" in *ucb*) echo " +# WARNING: +# The commands "CC" and "LD" must NOT refer to /usr/ucb/cc and +# /usr/ucb/ld. If they do, you need to adjust your PATH environment +# variable to put /usr/ccs/bin ahead of /usr/ucb. The environment +# variable LD_LIBRARY_PATH should not be set at all. If it is, +# things are likely to break because of the libucb dependency that +# is created. +" ;; +esac # Where make install puts libpng.a, libpng.so*, and png.h prefix=/usr/local @@ -37,7 +42,7 @@ RANLIB=echo # read libpng.txt or png.h to see why PNGMAJ is 2. You should not # have to change it. PNGMAJ = 2 -PNGMIN = 1.0.5d +PNGMIN = 1.0.5h PNGVER = $(PNGMAJ).$(PNGMIN) INCPATH=$(prefix)/include @@ -89,6 +94,10 @@ install: libpng.a libpng.so.$(PNGVER) clean: /bin/rm -f *.o libpng.a libpng.so* pngtest pngout.png +DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO +writelock: + chmod a-w *.[ch35] $(DOCS) scripts/* + # DO NOT DELETE THIS LINE -- make depend depends on it. png.o png.pic.o: png.h pngconf.h diff --git a/scripts/makefile.std b/scripts/makefile.std index 6afe481e1..824744985 100644 --- a/scripts/makefile.std +++ b/scripts/makefile.std @@ -47,6 +47,10 @@ install: libpng.a clean: rm -f *.o libpng.a pngtest pngout.png +DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO +writelock: + chmod a-w *.[ch35] $(DOCS) scripts/* + # DO NOT DELETE THIS LINE -- make depend depends on it. png.o: png.h pngconf.h diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos index f2ce329dc..220393153 100644 --- a/scripts/makefile.sunos +++ b/scripts/makefile.sunos @@ -51,6 +51,10 @@ install: libpng.a clean: rm -f *.o libpng.a pngtest pngout.png +DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO +writelock: + chmod a-w *.[ch35] $(DOCS) scripts/* + # DO NOT DELETE THIS LINE -- make depend depends on it. png.o: png.h pngconf.h diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas index 984137d38..81f04068a 100644 --- a/scripts/pngdef.pas +++ b/scripts/pngdef.pas @@ -3,7 +3,7 @@ unit pngdef; interface const - PNG_LIBPNG_VER_STRING = '1.0.5d'; + PNG_LIBPNG_VER_STRING = '1.0.5h'; PNG_LIBPNG_VER = 10006; type @@ -179,10 +179,10 @@ const PNG_RESOLUTION_METER = 1; // pixels/meter // These are for the sRGB chunk. These values should NOT be changed. - PNG_sRGB_INTENT_SATURATION = 0; - PNG_sRGB_INTENT_PERCEPTUAL = 1; - PNG_sRGB_INTENT_ABSOLUTE = 2; - PNG_sRGB_INTENT_RELATIVE = 3; + PNG_sRGB_INTENT_PERCEPTUAL = 0; + PNG_sRGB_INTENT_RELATIVE = 1; + PNG_sRGB_INTENT_SATURATION = 2; + PNG_sRGB_INTENT_ABSOLUTE = 3; // Handle alpha and tRNS by replacing with a background color. PNG_BACKGROUND_GAMMA_UNKNOWN = 0; @@ -334,6 +334,10 @@ function png_get_oFFs(png_ptr: png_structp; info_ptr: png_infop; var offset_x, offset_y: png_uint_32; var unit_type: int): png_uint_32; stdcall; +function png_get_sCAL(png_ptr: png_structp; info_ptr: png_infop; + var unit:int; var width: png_uint_32; height: png_uint_32): + png_uint_32; + stdcall function png_get_pCAL(png_ptr: png_structp; info_ptr: png_infop; var purpose: png_charp; var X0, X1: png_int_32; var typ, nparams: int; var units: png_charp; @@ -600,6 +604,28 @@ procedure png_write_row(png_ptr: png_structp; row: png_bytep); procedure png_write_rows(png_ptr: png_structp; row: png_bytepp; num_rows: png_uint_32); stdcall; +procedure png_get_iCCP(png_ptr: png_structp; info_ptr: png_infop; + name: png_charpp; compression_type: int *; profile: png_charpp; + proflen: png_int_32): png_bytep; + stdcall; +procedure png_get_spalettes(png_ptr: png_structp; + info_ptr: png_infop; entries: png_spalette_pp): png_uint_32; + stdcall; +procedure png_free_pCAL(png_ptr: png_structp; info_ptr: png_infop); + stdcall; +procedure png_set_iCCP(png_ptr: png_structp; info_ptr: png_infop; + name: png_charp; compression_type: int; profile: png_charp; + proflen: int); + stdcall; +procedure png_free_iCCP(png_ptr: png_structp; info_ptr: png_infop); + stdcall; +procedure png_free_text(png_ptr: png_structp; info_ptr: png_infop); + stdcall; +procedure png_set_spalettes(png_ptr: png_structp; info_ptr: png_infop; + entries: png_spalette_p; nentries: int); + stdcall; +procedure png_free_sPLT(png_ptr: png_structp; info_ptr: png_infop); + stdcall; implementation @@ -725,5 +751,13 @@ procedure png_write_info; external pngDLL; procedure png_write_info_before_PLTE; external pngDLL; procedure png_write_row; external pngDLL; procedure png_write_rows; external pngDLL; +procedure png_get_iCCP; external pngDLL; +procedure png_get_spalettes; external pngDLL; +procedure png_free_pCAL; external pngDLL; +procedure png_set_iCCP; external pngDLL; +procedure png_free_iCCP; external pngDLL; +procedure png_free_text; external pngDLL; +procedure png_set_spalettes; external pngDLL; +procedure png_free_sPLT; external pngDLL; end. diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 611918c5f..9edb8bfca 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -279,6 +279,16 @@ EXPORTS png_pass_dsp_mask ; png_pass_width ; png_pass_height + png_get_iCCP + png_get_sCAL + png_get_spalettes + png_free_pCAL + png_set_iCCP + png_free_iCCP + png_free_text + png_free_sCAL + png_set_spalettes + png_free_sPLT png_IHDR png_IDAT @@ -288,10 +298,14 @@ EXPORTS png_cHRM png_gAMA png_hIST + png_iCCP + png_iTXt png_oFFs png_pCAL png_pHYs png_sBIT + png_sCAL + png_sPLT png_sRGB png_tEXt png_tIME |