Tk Img Extensions
Check-in [11f8241fd0]
Not logged in
Odie Home Timeline Branches Tags Tickets Wiki Login
Tcl 2014 Conference, Portland/OR, US, Nov 10-14
Send your abstracts to tclconference@googlegroups.com by Sep 8.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Make the png_set_add_alpha function available through the stub table
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 11f8241fd0e6e58ec79ec77531cf6224da600d40
User & Date: nijtmans 2013-10-01 14:24:58.000
Context
2013-10-01
14:47
Eliminate a few compiler warnings, discovered by gcc 4.8.1 check-in: 31ff0acad8 user: nijtmans tags: trunk
14:24
Make the png_set_add_alpha function available through the stub table check-in: 11f8241fd0 user: nijtmans tags: trunk
13:41
Re-generate all "configure" scripts using autoconf-2.59 check-in: 669f43de72 user: nijtmans tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to libpng/pngtcl.decls.
︙︙
962
963
964
965
966
967
968



969
970
971

    void png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
}
declare 317 generic {!PNG_INTERNAL !PNG_PROGRESSIVE_READ_SUPPORTED !PNG_iTXt_SUPPORTED} {
    void png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
}
declare 318 {
    void png_info_init_3(png_infopp info_ptr, png_size_t png_info_struct_size)



}

#########################################################################








>
>
>




962
963
964
965
966
967
968
969
970
971
972
973
974

    void png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
}
declare 317 generic {!PNG_INTERNAL !PNG_PROGRESSIVE_READ_SUPPORTED !PNG_iTXt_SUPPORTED} {
    void png_push_read_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
}
declare 318 {
    void png_info_init_3(png_infopp info_ptr, png_size_t png_info_struct_size)
}
declare 319 generic {{!PNG_READ_FILLER_SUPPORTED !PNG_WRITE_FILLER_SUPPORTED}} {
    void png_set_add_alpha(png_structp png_ptr, png_uint_32 filler, int flags)
}

#########################################################################
Changes to libpng/pngtclDecls.h.
︙︙
1013
1014
1015
1016
1017
1018
1019



1020
1021
1022
1023
1024
1025
1026

				png_infop info_ptr, png_uint_32 length);
/* 317 */
PNG_IMPEXP void		png_push_read_iTXt(png_structp png_ptr,
				png_infop info_ptr, png_uint_32 length);
/* 318 */
PNG_IMPEXP void		png_info_init_3(png_infopp info_ptr,
				png_size_t png_info_struct_size);




typedef struct PngtclStubs {
    int magic;
    const struct PngtclStubHooks *hooks;

    png_uint_32 (*png_access_version_numberPtr) (void); /* 0 */
    void (*png_set_sig_bytesPtr) (png_structp png_ptr, int num_bytes); /* 1 */








>
>
>








1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029

				png_infop info_ptr, png_uint_32 length);
/* 317 */
PNG_IMPEXP void		png_push_read_iTXt(png_structp png_ptr,
				png_infop info_ptr, png_uint_32 length);
/* 318 */
PNG_IMPEXP void		png_info_init_3(png_infopp info_ptr,
				png_size_t png_info_struct_size);
/* 319 */
PNG_IMPEXP void		png_set_add_alpha(png_structp png_ptr,
				png_uint_32 filler, int flags);

typedef struct PngtclStubs {
    int magic;
    const struct PngtclStubHooks *hooks;

    png_uint_32 (*png_access_version_numberPtr) (void); /* 0 */
    void (*png_set_sig_bytesPtr) (png_structp png_ptr, int num_bytes); /* 1 */
︙︙
1337
1338
1339
1340
1341
1342
1343

1344
1345
1346
1347
1348
1349
1350

    void (*png_push_handle_tEXtPtr) (png_structp png_ptr, png_infop info_ptr, png_uint_32 length); /* 312 */
    void (*png_push_read_tEXtPtr) (png_structp png_ptr, png_infop info_ptr); /* 313 */
    void (*png_push_handle_zTXtPtr) (png_structp png_ptr, png_infop info_ptr, png_uint_32 length); /* 314 */
    void (*png_push_read_zTXtPtr) (png_structp png_ptr, png_infop info_ptr); /* 315 */
    void (*png_push_handle_iTXtPtr) (png_structp png_ptr, png_infop info_ptr, png_uint_32 length); /* 316 */
    void (*png_push_read_iTXtPtr) (png_structp png_ptr, png_infop info_ptr, png_uint_32 length); /* 317 */
    void (*png_info_init_3Ptr) (png_infopp info_ptr, png_size_t png_info_struct_size); /* 318 */

} PngtclStubs;

#ifdef __cplusplus
extern "C" {
#endif
PNG_IMPEXP const PngtclStubs *pngtclStubsPtr;
#ifdef __cplusplus








>








1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354

    void (*png_push_handle_tEXtPtr) (png_structp png_ptr, png_infop info_ptr, png_uint_32 length); /* 312 */
    void (*png_push_read_tEXtPtr) (png_structp png_ptr, png_infop info_ptr); /* 313 */
    void (*png_push_handle_zTXtPtr) (png_structp png_ptr, png_infop info_ptr, png_uint_32 length); /* 314 */
    void (*png_push_read_zTXtPtr) (png_structp png_ptr, png_infop info_ptr); /* 315 */
    void (*png_push_handle_iTXtPtr) (png_structp png_ptr, png_infop info_ptr, png_uint_32 length); /* 316 */
    void (*png_push_read_iTXtPtr) (png_structp png_ptr, png_infop info_ptr, png_uint_32 length); /* 317 */
    void (*png_info_init_3Ptr) (png_infopp info_ptr, png_size_t png_info_struct_size); /* 318 */
    void (*png_set_add_alphaPtr) (png_structp png_ptr, png_uint_32 filler, int flags); /* 319 */
} PngtclStubs;

#ifdef __cplusplus
extern "C" {
#endif
PNG_IMPEXP const PngtclStubs *pngtclStubsPtr;
#ifdef __cplusplus
︙︙
1976
1977
1978
1979
1980
1981
1982


1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993

	(pngtclStubsPtr->png_push_read_zTXtPtr) /* 315 */
#define png_push_handle_iTXt \
	(pngtclStubsPtr->png_push_handle_iTXtPtr) /* 316 */
#define png_push_read_iTXt \
	(pngtclStubsPtr->png_push_read_iTXtPtr) /* 317 */
#define png_info_init_3 \
	(pngtclStubsPtr->png_info_init_3Ptr) /* 318 */



#endif /* defined(USE_PNGTCL_STUBS) */

/* !END!: Do not edit above this line. */

#undef png_info_init
#define png_info_init(info_ptr) png_info_init_3(&info_ptr,\
    png_sizeof(png_info));

#endif /* _PNGTCLDECLS */









>
>












1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999

	(pngtclStubsPtr->png_push_read_zTXtPtr) /* 315 */
#define png_push_handle_iTXt \
	(pngtclStubsPtr->png_push_handle_iTXtPtr) /* 316 */
#define png_push_read_iTXt \
	(pngtclStubsPtr->png_push_read_iTXtPtr) /* 317 */
#define png_info_init_3 \
	(pngtclStubsPtr->png_info_init_3Ptr) /* 318 */
#define png_set_add_alpha \
	(pngtclStubsPtr->png_set_add_alphaPtr) /* 319 */

#endif /* defined(USE_PNGTCL_STUBS) */

/* !END!: Do not edit above this line. */

#undef png_info_init
#define png_info_init(info_ptr) png_info_init_3(&info_ptr,\
    png_sizeof(png_info));

#endif /* _PNGTCLDECLS */
Changes to libpng/pngtclStubInit.c.
︙︙
1286
1287
1288
1289
1290
1291
1292





1293
1294
1295

#endif /* !PNG_INTERNAL !PNG_PROGRESSIVE_READ_SUPPORTED !PNG_iTXt_SUPPORTED */
#if !defined(PNG_INTERNAL) || !defined(PNG_PROGRESSIVE_READ_SUPPORTED) || !defined(PNG_iTXt_SUPPORTED)
    0, /* 317 */
#else  /* !PNG_INTERNAL !PNG_PROGRESSIVE_READ_SUPPORTED !PNG_iTXt_SUPPORTED */
    png_push_read_iTXt, /* 317 */
#endif /* !PNG_INTERNAL !PNG_PROGRESSIVE_READ_SUPPORTED !PNG_iTXt_SUPPORTED */
    png_info_init_3, /* 318 */





};

/* !END!: Do not edit above this line. */








>
>
>
>
>




1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300

#endif /* !PNG_INTERNAL !PNG_PROGRESSIVE_READ_SUPPORTED !PNG_iTXt_SUPPORTED */
#if !defined(PNG_INTERNAL) || !defined(PNG_PROGRESSIVE_READ_SUPPORTED) || !defined(PNG_iTXt_SUPPORTED)
    0, /* 317 */
#else  /* !PNG_INTERNAL !PNG_PROGRESSIVE_READ_SUPPORTED !PNG_iTXt_SUPPORTED */
    png_push_read_iTXt, /* 317 */
#endif /* !PNG_INTERNAL !PNG_PROGRESSIVE_READ_SUPPORTED !PNG_iTXt_SUPPORTED */
    png_info_init_3, /* 318 */
#if !defined(PNG_READ_FILLER_SUPPORTED) && !defined(PNG_WRITE_FILLER_SUPPORTED)
    0, /* 319 */
#else  /* !PNG_READ_FILLER_SUPPORTED !PNG_WRITE_FILLER_SUPPORTED */
    png_set_add_alpha, /* 319 */
#endif /* !PNG_READ_FILLER_SUPPORTED !PNG_WRITE_FILLER_SUPPORTED */
};

/* !END!: Do not edit above this line. */