cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[devel] Fixed indentation in pngconf.h

Browse Source 
Removed scripting cruft from scripts/makefile.mingw
Removed mention of now nonexistent files from scripts/README.txt
This commit is contained in:
Glenn Randers-Pehrson 2010-03-13 20:58:39 -06:00
parent d7da8bb121
commit c44253fa0c
3 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pngconf.h
View File

@ -387,9 +387,9 @@
*/ */
#ifndef PNG_NO_PEDANTIC_WARNINGS #ifndef PNG_NO_PEDANTIC_WARNINGS
#ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED # ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED
# define PNG_PEDANTIC_WARNINGS_SUPPORTED # define PNG_PEDANTIC_WARNINGS_SUPPORTED
#endif # endif
#endif #endif
#ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED #ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED
@ -633,11 +633,6 @@
# ifndef PNG_NO_READ_INVERT # ifndef PNG_NO_READ_INVERT
# define PNG_READ_INVERT_SUPPORTED # define PNG_READ_INVERT_SUPPORTED
# endif # endif
# if 0 /* removed from libpng-1.4.0 */
# ifndef PNG_NO_READ_DITHER
# define PNG_READ_DITHER_SUPPORTED
# endif
# endif /* 0 */
# ifndef PNG_NO_READ_BACKGROUND # ifndef PNG_NO_READ_BACKGROUND
# define PNG_READ_BACKGROUND_SUPPORTED # define PNG_READ_BACKGROUND_SUPPORTED
# endif # endif
@ -683,8 +678,8 @@
/* PNG_NO_SEQUENTIAL_READ_SUPPORTED is deprecated. */ /* PNG_NO_SEQUENTIAL_READ_SUPPORTED is deprecated. */
# if !defined(PNG_NO_SEQUENTIAL_READ) && \ # if !defined(PNG_NO_SEQUENTIAL_READ) && \
!defined(PNG_SEQUENTIAL_READ_SUPPORTED) && \ !defined(PNG_SEQUENTIAL_READ_SUPPORTED) && \
!defined(PNG_NO_SEQUENTIAL_READ_SUPPORTED) !defined(PNG_NO_SEQUENTIAL_READ_SUPPORTED)
# define PNG_SEQUENTIAL_READ_SUPPORTED # define PNG_SEQUENTIAL_READ_SUPPORTED
# endif # endif
@ -696,7 +691,7 @@
# endif # endif
# if !defined(PNG_NO_GET_INT_32) || defined(PNG_READ_oFFS_SUPPORTED) || \ # if !defined(PNG_NO_GET_INT_32) || defined(PNG_READ_oFFS_SUPPORTED) || \
defined(PNG_READ_pCAL_SUPPORTED) defined(PNG_READ_pCAL_SUPPORTED)
# ifndef PNG_GET_INT_32_SUPPORTED # ifndef PNG_GET_INT_32_SUPPORTED
# define PNG_GET_INT_32_SUPPORTED # define PNG_GET_INT_32_SUPPORTED
# endif # endif
@ -869,7 +864,7 @@
# define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d # define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d
#endif #endif
#ifndef PNG_STRING_NEWLINE #ifndef PNG_STRING_NEWLINE
#define PNG_STRING_NEWLINE "\n" # define PNG_STRING_NEWLINE "\n"
#endif #endif
/* These are currently experimental features, define them if you want */ /* These are currently experimental features, define them if you want */
@ -1209,7 +1204,7 @@
/* Need the time information for converting tIME chunks */ /* Need the time information for converting tIME chunks */
#ifdef PNG_CONVERT_tIME_SUPPORTED #ifdef PNG_CONVERT_tIME_SUPPORTED
/* "time.h" functions are not supported on WindowsCE */ /* "time.h" functions are not supported on WindowsCE */
# include <time.h> # include <time.h>
#endif #endif
@ -1266,11 +1261,11 @@ typedef unsigned char png_byte;
# endif # endif
# define USE_FAR_KEYWORD # define USE_FAR_KEYWORD
# endif /* LDATA != 1 */ # endif /* LDATA != 1 */
/* Possibly useful for moving data out of default segment. /* Possibly useful for moving data out of default segment.
* Uncomment it if you want. Could also define FARDATA as * Uncomment it if you want. Could also define FARDATA as
* const if your compiler supports it. (SJT) * const if your compiler supports it. (SJT)
# define FARDATA FAR # define FARDATA FAR
*/ */
# endif /* __WIN32__, __FLAT__, __CYGWIN__ */ # endif /* __WIN32__, __FLAT__, __CYGWIN__ */
#endif /* __BORLANDC__ */ #endif /* __BORLANDC__ */
@ -1345,7 +1340,7 @@ typedef char FAR * FAR * FAR * png_charppp;
* functions that are passed far data must be model-independent. * functions that are passed far data must be model-independent.
*/ */
/* memory model/platform independent fns */ /* Memory model/platform independent fns */
#ifndef PNG_ABORT #ifndef PNG_ABORT
# ifdef _WINDOWS_ # ifdef _WINDOWS_
# define PNG_ABORT() ExitProcess(0) # define PNG_ABORT() ExitProcess(0)

2
scripts/README.txt
View File

@ -15,7 +15,6 @@ Makefiles for libpng version 1.5.0beta14 - March 14, 2010
makefile.beos => beos makefile makefile.beos => beos makefile
makefile.bor => Borland makefile (uses bcc) makefile.bor => Borland makefile (uses bcc)
makefile.cegcc => minge32ce for Windows CE makefile makefile.cegcc => minge32ce for Windows CE makefile
makefile.cygwin => Cygwin/gcc makefile
makefile.darwin => Darwin makefile, can use on MacosX makefile.darwin => Darwin makefile, can use on MacosX
makefile.dec => DEC Alpha UNIX makefile makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile makefile.dj2 => DJGPP 2 makefile
@ -58,7 +57,6 @@ Other supporting scripts:
libpng-config-body.in => used by several makefiles to create libpng-config libpng-config-body.in => used by several makefiles to create libpng-config
libpng-config-head.in => used by several makefiles to create libpng-config libpng-config-head.in => used by several makefiles to create libpng-config
libpng.pc.in => Used by several makefiles to create libpng.pc libpng.pc.in => Used by several makefiles to create libpng.pc
pngwin.def => Module definitions for makefile.cygwin and mingw
pngwin.rc => Used by the visualc6 and visualc71 projects. pngwin.rc => Used by the visualc6 and visualc71 projects.
SCOPTIONS.ppc => Used with smakefile.ppc SCOPTIONS.ppc => Used with smakefile.ppc

2
scripts/makefile.mingw
View File

@ -153,7 +153,7 @@ $(STATLIB): $(OBJS)
$(AR) rc $@ $(OBJS) $(AR) rc $@ $(OBJS)
$(RANLIB) $@ $(RANLIB) $@
%14_%$(SHAREDDEF): libpng.def $(SHAREDDEF): libpng.def
cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \ cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \
sed -e 's/\([^;]*\);/;/' > $@ sed -e 's/\([^;]*\);/;/' > $@