Changeset 358

Show
Ignore:
Timestamp:
01/27/07 15:06:51 (2 years ago)
Author:
goodea
Message:

zlib and png?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/Makefile

    r262 r358  
    1 SUBDIRS=cc3_ilp jpeg-6b lua51 
     1SUBDIRS=cc3_ilp jpeg-6b lua51 zlib libpng-12 
    22 
    33# Build rules 

  • trunk/lib/libpng-12/Makefile

    r356 r358  
    77INCLUDES = png.h pngconf.h 
    88 
    9 LIBS = zlib 
     9LIBS += zlib 
    1010 
    1111 

  • trunk/lib/libpng-12/pngconf.h

    r355 r358  
    9090 
    9191#ifndef PNG_ZBUF_SIZE 
    92 #  define PNG_ZBUF_SIZE 8192 
     92#  define PNG_ZBUF_SIZE 2048 
    9393#endif 
    9494 
    …… 
    107107/* Enabled by default in 1.2.0.  You can disable this if you don't need to 
    108108   support PNGs that are embedded in MNG datastreams */ 
     109#define PNG_NO_MNG_FEATURES 
    109110#if !defined(PNG_1_0_X) && !defined(PNG_NO_MNG_FEATURES) 
    110111#  ifndef PNG_MNG_FEATURES_SUPPORTED 
    …… 
    113114#endif 
    114115 
     116#define PNG_NO_FLOATING_POINT_SUPPORTED 
    115117#ifndef PNG_NO_FLOATING_POINT_SUPPORTED 
    116118#  ifndef PNG_FLOATING_POINT_SUPPORTED 
    …… 
    125127 * libpng thus makes sure to check any memory allocation to verify it 
    126128 * will fit into memory. 
     129 */ 
    127130#define PNG_MAX_MALLOC_64K 
    128  */ 
    129131#if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K) 
    130132#  define PNG_MAX_MALLOC_64K 
    …… 
    532534#if defined(PNG_READ_SUPPORTED) 
    533535 
     536#define PNG_READ_TRANSFORMS_NOT_SUPPORTED 
    534537#if !defined(PNG_READ_TRANSFORMS_NOT_SUPPORTED) && \ 
    535538      !defined(PNG_NO_READ_TRANSFORMS) 
    …… 
    620623#if defined(PNG_WRITE_SUPPORTED) 
    621624 
     625#define PNG_WRITE_TRANSFORMS_NOT_SUPPORTED 
    622626# if !defined(PNG_WRITE_TRANSFORMS_NOT_SUPPORTED) && \ 
    623627    !defined(PNG_NO_WRITE_TRANSFORMS) 
    …… 
    658662#endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */ 
    659663 
     664#define PNG_NO_WRITE_INTERLACING_SUPPORTED 
    660665#if !defined(PNG_NO_WRITE_INTERLACING_SUPPORTED) && \ 
    661666    !defined(PNG_WRITE_INTERLACING_SUPPORTED) 
    …… 
    730735 * When MMX code is off, then optimized C replacement functions are used. 
    731736*/ 
     737 
     738#define PNG_NO_MMX_CODE 
    732739#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE) 
    733740#  ifndef PNG_ASSEMBLER_CODE_SUPPORTED 

  • trunk/lib/zlib/Makefile

    r354 r358  
    77        inffast.h trees.h 
    88 
    9 override CFLAGS+=-DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 
    10  
    119 
    1210include ../../include/common.mk 

  • trunk/lib/zlib/zconf.h

    r353 r358  
    88#ifndef ZCONF_H 
    99#define ZCONF_H 
     10 
    1011 
    1112/*