$NetBSD: patch-aa,v 1.6 2006/07/06 20:51:25 adam Exp $ --- pngcrush.c.orig 2006-07-06 22:32:25.000000000 +0200 +++ pngcrush.c 2006-07-06 22:41:02.000000000 +0200 @@ -444,9 +444,6 @@ int png_crc_error(png_structp png_ptr); int png_crc_finish(png_structp png_ptr, png_uint_32 skip); -png_uint_32 png_get_uint_31(png_structp png_ptr, png_bytep buf); -png_uint_32 png_get_uint_32(png_bytep buf); -void png_save_uint_32(png_bytep buf, png_uint_32 i); #ifdef PNG_USER_MEM_SUPPORTED png_voidp png_debug_malloc(png_structp png_ptr, png_uint_32 size); @@ -482,38 +479,6 @@ * ============================================================ */ -#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED -/* Grab an unsigned 32-bit integer from a buffer in big-endian format. */ -png_uint_32 /* PRIVATE */ -png_get_uint_32(png_bytep buf) -{ - png_uint_32 i = ((png_uint_32)(*buf) << 24) + - ((png_uint_32)(*(buf + 1)) << 16) + - ((png_uint_32)(*(buf + 2)) << 8) + - (png_uint_32)(*(buf + 3)); - - return (i); -} -#else -# define png_get_uint_32(buf) ( *((png_uint_32p) (buf))) -#endif -png_uint_32 /* PRIVATE */ -png_get_uint_31(png_structp png_ptr, png_bytep buf) -{ - png_uint_32 i = png_get_uint_32(buf); - if (i > PNG_UINT_31_MAX) - png_error(png_ptr, "PNG unsigned integer out of range.\n"); - return (i); -} -void /* PRIVATE */ -png_save_uint_32(png_bytep buf, png_uint_32 i) -{ - buf[0] = (png_byte)((i >> 24) & 0xff); - buf[1] = (png_byte)((i >> 16) & 0xff); - buf[2] = (png_byte)((i >> 8) & 0xff); - buf[3] = (png_byte)(i & 0xff); -} - /* Reset the CRC variable to 32 bits of 1's. Care must be taken * in case CRC is > 32 bits to leave the top bits 0. */