From: <fr...@us...> - 2010-01-15 13:43:22
|
Revision: 4113 http://fuse-emulator.svn.sourceforge.net/fuse-emulator/?rev=4113&view=rev Author: fredm Date: 2010-01-15 13:43:15 +0000 (Fri, 15 Jan 2010) Log Message: ----------- Export libspectrum_zlib_inflate() and libspectrum_zlib_compress() (patch #2927624) (Gergely Szasz and Fred). Modified Paths: -------------- trunk/libspectrum/hacking/ChangeLog trunk/libspectrum/internals.h trunk/libspectrum/libspectrum.h.in trunk/libspectrum/make-perl.c trunk/libspectrum/szx.c Modified: trunk/libspectrum/hacking/ChangeLog =================================================================== --- trunk/libspectrum/hacking/ChangeLog 2010-01-08 11:03:43 UTC (rev 4112) +++ trunk/libspectrum/hacking/ChangeLog 2010-01-15 13:43:15 UTC (rev 4113) @@ -746,3 +746,6 @@ order in SZX files (fixes bug #2857419; thanks, velesoft) (Fred). 20091022 wav.c: we expect mono sound files, tell audiofile to make the required adjustments (fixes bug #2883135; thanks, Gilberto Almeida) (Fred). +20100116 internals.h,libspectrum.h.in,make-perl.c,szx.c: export + libspectrum_zlib_inflate() and libspectrum_zlib_compress() (patch + #2927624) (Gergely Szasz and Fred). Modified: trunk/libspectrum/internals.h =================================================================== --- trunk/libspectrum/internals.h 2010-01-08 11:03:43 UTC (rev 4112) +++ trunk/libspectrum/internals.h 2010-01-15 13:43:15 UTC (rev 4113) @@ -81,13 +81,6 @@ size_t old_length, const char *old_filename ); libspectrum_error -libspectrum_zlib_inflate( const libspectrum_byte *gzptr, size_t gzlength, - libspectrum_byte **outptr, size_t *outlength ); -libspectrum_error -libspectrum_zlib_compress( const libspectrum_byte *data, size_t length, - libspectrum_byte **gzptr, size_t *gzlength ); - -libspectrum_error libspectrum_gzip_inflate( const libspectrum_byte *gzptr, size_t gzlength, libspectrum_byte **outptr, size_t *outlength ); Modified: trunk/libspectrum/libspectrum.h.in =================================================================== --- trunk/libspectrum/libspectrum.h.in 2010-01-08 11:03:43 UTC (rev 4112) +++ trunk/libspectrum/libspectrum.h.in 2010-01-15 13:43:15 UTC (rev 4113) @@ -70,9 +70,6 @@ /* glib replacement (if necessary) */ LIBSPECTRUM_GLIB_REPLACEMENT -/* Library capabilities */ -LIBSPECTRUM_CAPABILITIES - /* * General libspectrum routines */ @@ -97,6 +94,9 @@ } libspectrum_error; +/* Library capabilities */ +LIBSPECTRUM_CAPABILITIES + /* Initialisation */ libspectrum_error WIN32_DLL libspectrum_init( void ); Modified: trunk/libspectrum/make-perl.c =================================================================== --- trunk/libspectrum/make-perl.c 2010-01-08 11:03:43 UTC (rev 4112) +++ trunk/libspectrum/make-perl.c 2010-01-15 13:43:15 UTC (rev 4113) @@ -292,7 +292,14 @@ #ifdef HAVE_ZLIB_H printf( "\n/* we support snapshots etc. requiring zlib (e.g. compressed szx) */\n" ); - printf( "#define LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION (1)\n" ); + printf( "#define LIBSPECTRUM_SUPPORTS_ZLIB_COMPRESSION (1)\n\n" ); + printf( "/* zlib (de)compression routines */\n\n" ); + printf( "libspectrum_error WIN32_DLL\n" ); + printf( "libspectrum_zlib_inflate( const libspectrum_byte *gzptr, size_t gzlength,\n" ); + printf( " libspectrum_byte **outptr, size_t *outlength );\n\n" ); + printf( "libspectrum_error WIN32_DLL\n" ); + printf( "libspectrum_zlib_compress( const libspectrum_byte *data, size_t length,\n" ); + printf( " libspectrum_byte **gzptr, size_t *gzlength );\n\n" ); #endif /* #ifdef HAVE_ZLIB_H */ Modified: trunk/libspectrum/szx.c =================================================================== --- trunk/libspectrum/szx.c 2010-01-08 11:03:43 UTC (rev 4112) +++ trunk/libspectrum/szx.c 2010-01-15 13:43:15 UTC (rev 4113) @@ -408,7 +408,9 @@ const libspectrum_byte **buffer, const libspectrum_byte *end GCC_UNUSED, size_t data_length ) { +#ifdef HAVE_ZLIB_H libspectrum_error error; +#endif libspectrum_byte *rom_data = NULL; libspectrum_dword flags; const size_t expected_length = 0x4000; @@ -501,7 +503,9 @@ const libspectrum_byte **buffer, const libspectrum_byte *end GCC_UNUSED, size_t data_length ) { +#ifdef HAVE_ZLIB_H libspectrum_error error; +#endif libspectrum_byte *ram_data = NULL, *rom_data = NULL; libspectrum_dword flags; size_t disc_ram_length; @@ -690,7 +694,9 @@ const libspectrum_byte **buffer, const libspectrum_byte *end GCC_UNUSED, size_t data_length ) { +#ifdef HAVE_ZLIB_H libspectrum_error error; +#endif libspectrum_byte *ram_data = NULL, *rom_data = NULL; libspectrum_byte rom_type; libspectrum_dword flags; @@ -1664,7 +1670,9 @@ const libspectrum_byte **buffer, const libspectrum_byte *end GCC_UNUSED, size_t data_length ) { +#ifdef HAVE_ZLIB_H libspectrum_error error; +#endif libspectrum_word flags; libspectrum_byte *eprom_data = NULL; const size_t expected_length = 0x2000; @@ -2429,7 +2437,9 @@ write_rom_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr, size_t *length, int *out_flags, libspectrum_snap *snap, int compress ) { +#ifdef HAVE_ZLIB_H libspectrum_error error; +#endif size_t i, data_length = 0; size_t uncompressed_data_length = 0; libspectrum_byte *data, *rom_base; @@ -2640,7 +2650,9 @@ size_t *length, const char *id, const libspectrum_byte *data, size_t data_length, int page, int compress, int extra_flags ) { +#ifdef HAVE_ZLIB_H libspectrum_error error; +#endif libspectrum_byte *block_length, *flags, *compressed_data; int use_compression; @@ -2734,7 +2746,9 @@ write_b128_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr, size_t *length, libspectrum_snap *snap, int compress ) { +#ifdef HAVE_ZLIB_H libspectrum_error error; +#endif libspectrum_byte *rom_data = NULL; libspectrum_byte *compressed_rom_data = NULL; size_t block_size; @@ -2802,7 +2816,9 @@ write_if1_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr, size_t *length, libspectrum_snap *snap, int compress ) { +#ifdef HAVE_ZLIB_H libspectrum_error error; +#endif libspectrum_byte *rom_data = NULL; libspectrum_byte *compressed_rom_data = NULL; size_t block_size; @@ -2883,7 +2899,9 @@ write_opus_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr, size_t *length, libspectrum_snap *snap, int compress ) { +#ifdef HAVE_ZLIB_H libspectrum_error error; +#endif libspectrum_byte *rom_data, *ram_data; libspectrum_byte *compressed_rom_data = NULL, *compressed_ram_data = NULL; size_t disk_rom_length, disk_ram_length, block_size; @@ -2975,7 +2993,9 @@ write_plsd_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr, size_t *length, libspectrum_snap *snap, int compress ) { +#ifdef HAVE_ZLIB_H libspectrum_error error; +#endif libspectrum_byte *rom_data, *ram_data; libspectrum_byte *compressed_rom_data = NULL, *compressed_ram_data = NULL; size_t disk_rom_length, disk_ram_length, block_size; @@ -3209,7 +3229,9 @@ write_dide_chunk( libspectrum_byte **buffer, libspectrum_byte **ptr, size_t *length, libspectrum_snap *snap, int compress ) { +#ifdef HAVE_ZLIB_H libspectrum_error error; +#endif libspectrum_byte *eprom_data = NULL; libspectrum_byte *compressed_eprom_data = NULL; size_t block_size; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |