Request 293 (accepted)

Overview

Request 293 (accepted)

update version 0.8.1 (fix youtube playback) and fix the bug that it goes into audio player section in kickoff menu.

Created by marguerite over 11 years ago
In state accepted

Submit smplayer

Submit package home:marguerite...hes:Essentials / smplayer to package Essentials / smplayer

smplayer.changes Changed

smplayer.spec Changed

smplayer-0.8.0.tar.bz2/clean_windows.bat Deleted

smplayer-0.8.0.tar.bz2/compile_windows.bat Deleted

smplayer-0.8.0.tar.bz2/compile_windows_portable.bat Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/CMakeLists.txt Deleted

@@ -1,199 +0,0 @@
-cmake_minimum_required(VERSION 2.4.4)
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
-
-project(zlib C)
-
-if(NOT DEFINED BUILD_SHARED_LIBS)
-    option(BUILD_SHARED_LIBS "Build a shared library form of zlib" ON)
-endif()
-
-include(CheckTypeSize)
-include(CheckFunctionExists)
-include(CheckIncludeFile)
-include(CheckCSourceCompiles)
-enable_testing()
-
-check_include_file(sys/types.h HAVE_SYS_TYPES_H)
-check_include_file(stdint.h    HAVE_STDINT_H)
-check_include_file(stddef.h    HAVE_STDDEF_H)
-
-#
-# Check to see if we have large file support
-#
-set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
-# We add these other definitions here because CheckTypeSize.cmake
-# in CMake 2.4.x does not automatically do so and we want
-# compatibility with CMake 2.4.x.
-if(HAVE_SYS_TYPES_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
-endif()
-if(HAVE_STDINT_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
-endif()
-if(HAVE_STDDEF_H)
-    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
-endif()
-check_type_size(off64_t OFF64_T)
-if(HAVE_OFF64_T)
-   add_definitions(-D_LARGEFILE64_SOURCE=1)
-endif()
-set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
-
-#
-# Check for fseeko
-#
-check_function_exists(fseeko HAVE_FSEEKO)
-if(NOT HAVE_FSEEKO)
-    add_definitions(-DNO_FSEEKO)
-endif()
-
-#
-# Check for unistd.h
-#
-check_include_file(unistd.h Z_HAVE_UNISTD_H)
-
-if(MSVC)
-    set(CMAKE_DEBUG_POSTFIX "d")
-    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
-endif()
-
-if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
-    # If we're doing an out of source build and the user has a zconf.h
-    # in their source tree...
-    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
-        message(FATAL_ERROR
-            "You must remove ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h "
-            "from the source tree.  This file is included with zlib "
-            "but CMake generates this file for you automatically "
-            "in the build directory.")
-  endif()
-endif()
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
-               ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-
-#============================================================================
-# zlib
-#============================================================================
-
-set(ZLIB_PUBLIC_HDRS
-    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
-    zlib.h
-)
-set(ZLIB_PRIVATE_HDRS
-    crc32.h
-    deflate.h
-    gzguts.h
-    inffast.h
-    inffixed.h
-    inflate.h
-    inftrees.h
-    trees.h
-    zutil.h
-)
-set(ZLIB_SRCS
-    adler32.c
-    compress.c
-    crc32.c
-    deflate.c
-    gzclose.c
-    gzlib.c
-    gzread.c
-    gzwrite.c
-    inflate.c
-    infback.c
-    inftrees.c
-    inffast.c
-    trees.c
-    uncompr.c
-    zutil.c
-)
-
-if(NOT MINGW)
-    set(ZLIB_SRCS ${ZLIB_SRCS}
-        win32/zlib1.rc # If present will override custom build rule below.
-    )
-endif()
-
-# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
-file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
-string(REGEX REPLACE ".*#define \t+ZLIB_VERSION \t+\"(0-9A-Za-z.+)\".*"
-    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
-
-if(MINGW)
-    # This gets us DLL resource information when compiling on MinGW.
-    if(NOT CMAKE_RC_COMPILER)
-        SET(CMAKE_RC_COMPILER windres.exe)
-    endif()
-
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-                       COMMAND ${CMAKE_RC_COMPILER}
-                            -D GCC_WINDRES
-                            -I ${CMAKE_CURRENT_SOURCE_DIR}
-                            -I ${CMAKE_CURRENT_BINARY_DIR}
-                            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
-                            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
-    set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
-endif(MINGW)
-
-add_library(zlib ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
-
-set_target_properties(zlib PROPERTIES SOVERSION 1)
-
-if(NOT CYGWIN)
-    # This property causes shared libraries on Linux to have the full version
-    # encoded into their final filename.  We disable this on Cygwin because
-    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
-    # seems to be the default.
-    #
-    # This has no effect with MSVC, on that platform the version info for
-    # the DLL comes from the resource file win32/zlib1.rc
-    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
-endif()
-
-if(UNIX)
-    # On unix-like platforms the library is almost always called libz
-   set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
-elseif(BUILD_SHARED_LIBS AND WIN32)
-    # Creates zlib1.dll when building shared library version
-    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
-endif()
-
-if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
-    install(TARGETS zlib
-        RUNTIME DESTINATION bin
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib )
-endif()
-if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
-    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION include)
-endif()
-if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
-    install(FILES zlib.3 DESTINATION share/man/man3)
-endif()
-
-#============================================================================
-# Example binaries
-#============================================================================
-
-add_executable(example test/example.c)
-target_link_libraries(example zlib)
-add_test(example example)
-
-add_executable(minigzip test/minigzip.c)
-target_link_libraries(minigzip zlib)
-
-if(HAVE_OFF64_T)
-    add_executable(example64 test/example.c)
-    target_link_libraries(example64 zlib)
-    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-    add_test(example64 example64)
-
-    add_executable(minigzip64 test/minigzip.c)
-    target_link_libraries(minigzip64 zlib)
-    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-endif()

smplayer-0.8.0.tar.bz2/zlib-1.2.6/ChangeLog Deleted

@@ -1,1347 +0,0 @@
-
- ChangeLog file for zlib
-
-Changes in 1.2.6 (29 Jan 2012)
-- Update the Pascal interface in contrib/pascal
-- Fix function numbers for gzgetc_ in zlibvc.def files
-- Fix configure.ac for contrib/minizip Schiffer
-- Fix large-entry detection in minizip on 64-bit systems Schiffer
-- Have ./configure use the compiler return code for error indication
-- Fix CMakeLists.txt for cross compilation McClure
-- Fix contrib/minizip/zip.c for 64-bit architectures Dalsnes
-- Fix compilation of contrib/minizip on FreeBSD Marquez
-- Correct suggested usages in win32/Makefile.msc Shachar, Horvath
-- Include io.h for Turbo C / Borland C on all platforms Truta
-- Make version explicit in contrib/minizip/configure.ac Bosmans
-- Avoid warning for no encryption in contrib/minizip/zip.c Vollant
-- Minor cleanup up contrib/minizip/unzip.c Vollant
-- Fix bug when compiling minizip with C++ Vollant
-- Protect for long name and extra fields in contrib/minizip Vollant
-- Avoid some warnings in contrib/minizip Vollant
-- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip
-- Add missing libs to minizip linker command
-- Add support for VPATH builds in contrib/minizip
-- Add an --enable-demos option to contrib/minizip/configure
-- Add the generation of configure.log by ./configure
-- Exit when required parameters not provided to win32/Makefile.gcc
-- Have gzputc return the character written instead of the argument
-- Use the -m option on ldconfig for BSD systems Tobias
-- Correct in zlib.map when deflateResetKeep was added
-
-Changes in 1.2.5.3 (15 Jan 2012)
-- Restore gzgetc function for binary compatibility
-- Do not use _lseeki64 under Borland C++ Truta
-- Update win32/Makefile.msc to build test/*.c Truta
-- Remove old/visualc6 given CMakefile and other alternatives
-- Update AS400 build files and documentation Monnerat
-- Update win32/Makefile.gcc to build test/*.c Truta
-- Permit stronger flushes after Z_BLOCK flushes
-- Avoid extraneous empty blocks when doing empty flushes
-- Permit Z_NULL arguments to deflatePending
-- Allow deflatePrime() to insert bits in the middle of a stream
-- Remove second empty static block for Z_PARTIAL_FLUSH
-- Write out all of the available bits when using Z_BLOCK
-- Insert the first two strings in the hash table after a flush
-
-Changes in 1.2.5.2 (17 Dec 2011)
-- fix ld error: unable to find version dependency 'ZLIB_1.2.5'
-- use relative symlinks for shared libs
-- Avoid searching past window for Z_RLE strategy
-- Assure that high-water mark initialization is always applied in deflate
-- Add assertions to fill_window() in deflate.c to match comments
-- Update python link in README
-- Correct spelling error in gzread.c
-- Fix bug in gzgets() for a concatenated empty gzip stream
-- Correct error in comment for gz_make()
-- Change gzread() and related to ignore junk after gzip streams
-- Allow gzread() and related to continue after gzclearerr()
-- Allow gzrewind() and gzseek() after a premature end-of-file
-- Simplify gzseek() now that raw after gzip is ignored
-- Change gzgetc() to a macro for speed (~40% speedup in testing)
-- Fix gzclose() to return the actual error last encountered
-- Always add large file support for windows
-- Include zconf.h for windows large file support
-- Include zconf.h.cmakein for windows large file support
-- Update zconf.h.cmakein on make distclean
-- Merge vestigial vsnprintf determination from zutil.h to gzguts.h
-- Clarify how gzopen() appends in zlib.h comments
-- Correct documentation of gzdirect() since junk at end now ignored
-- Add a transparent write mode to gzopen() when 'T' is in the mode
-- Update python link in zlib man page
-- Get inffixed.h and MAKEFIXED result to match
-- Add a ./config --solo option to make zlib subset with no libary use
-- Add undocumented inflateResetKeep() function for CAB file decoding
-- Add --cover option to ./configure for gcc coverage testing
-- Add #define ZLIB_CONST option to use const in the z_stream interface
-- Add comment to gzdopen() in zlib.h to use dup() when using fileno()
-- Note behavior of uncompress() to provide as much data as it can
-- Add files in contrib/minizip to aid in building libminizip
-- Split off AR options in Makefile.in and configure
-- Change ON macro to Z_ARG to avoid application conflicts
-- Facilitate compilation with Borland C++ for pragmas and vsnprintf
-- Include io.h for Turbo C / Borland C++
-- Move example.c and minigzip.c to test/
-- Simplify incomplete code table filling in inflate_table()
-- Remove code from inflate.c and infback.c that is impossible to execute
-- Test the inflate code with full coverage
-- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw)
-- Add deflateResetKeep and fix inflateResetKeep to retain dictionary
-- Fix gzwrite.c to accommodate reduced memory zlib compilation
-- Have inflate() with Z_FINISH avoid the allocation of a window
-- Do not set strm->adler when doing raw inflate
-- Fix gzeof() to behave just like feof() when read is not past end of file
-- Fix bug in gzread.c when end-of-file is reached
-- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF
-- Document gzread() capability to read concurrently written files
-- Remove hard-coding of resource compiler in CMakeLists.txt Blammo
-
-Changes in 1.2.5.1 (10 Sep 2011)
-- Update FAQ entry on shared builds (#13)
-- Avoid symbolic argument to chmod in Makefile.in
-- Fix bug and add consts in contrib/puff Oberhumer
-- Update contrib/puff/zeros.raw test file to have all block types
-- Add full coverage test for puff in contrib/puff/Makefile
-- Fix static-only-build install in Makefile.in
-- Fix bug in unzGetCurrentFileInfo() in contrib/minizip Kuno
-- Add libz.a dependency to shared in Makefile.in for parallel builds
-- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out
-- Replace $(...) with `...` in configure for non-bash sh Bowler
-- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure Groffen
-- Add solaris* to Linux* in configure to allow gcc use Groffen
-- Add *bsd* to Linux* case in configure Bar-Lev
-- Add inffast.obj to dependencies in win32/Makefile.msc
-- Correct spelling error in deflate.h Kohler
-- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc
-- Add test to configure for GNU C looking for gcc in output of $cc -v
-- Add zlib.pc generation to win32/Makefile.gcc Weigelt
-- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not
-- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense
-- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser)
-- Make stronger test in zconf.h to include unistd.h for LFS
-- Apply Darwin patches for 64-bit file offsets to contrib/minizip Slack
-- Fix zlib.h LFS support when Z_PREFIX used
-- Add updated as400 support (removed from old) Monnerat
-- Avoid deflate sensitivity to volatile input data
-- Avoid division in adler32_combine for NO_DIVIDE
-- Clarify the use of Z_FINISH with deflateBound() amount of space
-- Set binary for output file in puff.c
-- Use u4 type for crc_table to avoid conversion warnings
-- Apply casts in zlib.h to avoid conversion warnings
-- Add OF to prototypes for adler32_combine_ and crc32_combine_ Miller
-- Improve inflateSync() documentation to note indeterminancy
-- Add deflatePending() function to return the amount of pending output
-- Correct the spelling of "specification" in FAQ Randers-Pehrson
-- Add a check in configure for stdarg.h, use for gzprintf()
-- Check that pointers fit in ints when gzprint() compiled old style
-- Add dummy name before $(SHAREDLIBV) in Makefile Bar-Lev, Bowler
-- Delete line in configure that adds -L. libz.a to LDFLAGS Weigelt
-- Add debug records in assmebler code Londer
-- Update RFC references to use http://tools.ietf.org/html/... Li
-- Add --archs option, use of libtool to configure for Mac OS X Borstel
-
-Changes in 1.2.5 (19 Apr 2010)
-- Disable visibility attribute in win32/Makefile.gcc Bar-Lev
-- Default to libdir as sharedlibdir in configure Nieder
-- Update copyright dates on modified source files
-- Update trees.c to be able to generate modified trees.h
-- Exit configure for MinGW, suggesting win32/Makefile.gcc
-- Check for NULL path in gz_open Homurlu
-
-Changes in 1.2.4.5 (18 Apr 2010)
-- Set sharedlibdir in configure Torok
-- Set LDFLAGS in Makefile.in Bar-Lev
-- Avoid mkdir objs race condition in Makefile.in Bowler
-- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays
-- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C
-- Don't use hidden attribute when it is a warning generator (e.g. Solaris)
-
-Changes in 1.2.4.4 (18 Apr 2010)
-- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* Torok
-- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty
-- Try to use bash or ksh regardless of functionality of /bin/sh
-- Fix configure incompatibility with NetBSD sh
-- Remove attempt to run under bash or ksh since have better NetBSD fix
-- Fix win32/Makefile.gcc for MinGW Bar-Lev
-- Add diagnostic messages when using CROSS_PREFIX in configure
-- Added --sharedlibdir option to configure Weigelt
-- Use hidden visibility attribute when available Frysinger
-
-Changes in 1.2.4.3 (10 Apr 2010)
-- Only use CROSS_PREFIX in configure for ar and ranlib if they exist
-- Use CROSS_PREFIX for nm Bar-Lev
-- Assume _LARGEFILE64_SOURCE defined is equivalent to true
-- Avoid use of undefined symbols in #if with && and ||
-- Make *64 prototypes in gzguts.h consistent with functions
-- Add -shared load option for MinGW in configure Bowler
-- Move z_off64_t to public interface, use instead of off64_t
-- Remove ! from shell test in configure (not portable to Solaris)
-- Change +0 macro tests to -0 for possibly increased portability
-
-Changes in 1.2.4.2 (9 Apr 2010)
-- Add consistent carriage returns to readme.txt's in masmx86 and masmx64
-- Really provide prototypes for *64 functions when building without LFS
-- Only define unlink() in minigzip.c if unistd.h not included
-- Update README to point to contrib/vstudio project files
-- Move projects/vc6 to old/ and remove projects/
-- Include stdlib.h in minigzip.c for setmode() definition under WinCE
-- Clean up assembler builds in win32/Makefile.msc Rowe
-- Include sys/types.h for Microsoft for off_t definition
-- Fix memory leak on error in gz_open()
-- Symbolize nm as $NM in configure Weigelt
-- Use TEST_LDSHARED instead of LDSHARED to link test programs Weigelt
-- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined
-- Fix bug in gzeof() to take into account unused input data
-- Avoid initialization of structures with variables in puff.c
-- Updated win32/README-WIN32.txt Rowe
-
-Changes in 1.2.4.1 (28 Mar 2010)
-- Remove the use of a-z constructs for sed in configure gentoo 310225
-- Remove $(SHAREDLIB) from LIBS in Makefile.in Creech
-- Restore "for debugging" comment on sprintf() in gzlib.c
-- Remove fdopen for MVS from gzguts.h
-- Put new README-WIN32.txt in win32 Rowe
-- Add check for shell to configure and invoke another shell if needed
-- Fix big fat stinking bug in gzseek() on uncompressed files
-- Remove vestigial F_OPEN64 define in zutil.h
-- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE
-- Avoid errors on non-LFS systems when applications define LFS macros
-- Set EXE to ".exe" in configure for MINGW Kahle
-- Match crc32() in crc32.c exactly to the prototype in zlib.h Sherrill
-- Add prefix for cross-compilation in win32/makefile.gcc Bar-Lev
-- Add DLL install in win32/makefile.gcc Bar-Lev
-- Allow Linux* or linux* from uname in configure Bar-Lev
-- Allow ldconfig to be redefined in configure and Makefile.in Bar-Lev
-- Add cross-compilation prefixes to configure Bar-Lev
-- Match type exactly in gz_load() invocation in gzread.c
-- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func
-- Provide prototypes for *64 functions when building zlib without LFS
-- Don't use -lc when linking shared library on MinGW
-- Remove errno.h check in configure and vestigial errno code in zutil.h
-
-Changes in 1.2.4 (14 Mar 2010)
-- Fix VER3 extraction in configure for no fourth subversion
-- Update zlib.3, add docs to Makefile.in to make .pdf out of it
-- Add zlib.3.pdf to distribution
-- Don't set error code in gzerror() if passed pointer is NULL
-- Apply destination directory fixes to CMakeLists.txt Lowman
-- Move #cmakedefine's to a new zconf.in.cmakein
-- Restore zconf.h for builds that don't use configure or cmake
-- Add distclean to dummy Makefile for convenience
-- Update and improve INDEX, README, and FAQ
-- Update CMakeLists.txt for the return of zconf.h Lowman
-- Update contrib/vstudio/vc9 and vc10 Vollant
-- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc
-- Apply license and readme changes to contrib/asm686 Raiter
-- Check file name lengths and add -c option in minigzip.c Li
-- Update contrib/amd64 and contrib/masmx86/ Vollant
-- Avoid use of "eof" parameter in trees.c to not shadow library variable
-- Update make_vms.com for removal of zlibdefs.h Zinser
-- Update assembler code and vstudio projects in contrib Vollant
-- Remove outdated assembler code contrib/masm686 and contrib/asm586
-- Remove old vc7 and vc8 from contrib/vstudio
-- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION Rowe
-- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open()
-- Add contrib/gcc_gvmat64 for longest_match and inflate_fast Vollant
-- Remove *64 functions from win32/zlib.def (they're not 64-bit yet)
-- Fix bug in void-returning vsprintf() case in gzwrite.c
-- Fix name change from inflate.h in contrib/inflate86/inffas86.c
-- Check if temporary file exists before removing in make_vms.com Zinser
-- Fix make install and uninstall for --static option
-- Fix usage of _MSC_VER in gzguts.h and zutil.h Truta
-- Update readme.txt in contrib/masmx64 and masmx86 to assemble
-
-Changes in 1.2.3.9 (21 Feb 2010)
-- Expunge gzio.c
-- Move as400 build information to old
-- Fix updates in contrib/minizip and contrib/vstudio
-- Add const to vsnprintf test in configure to avoid warnings Weigelt
-- Delete zconf.h (made by configure) Weigelt
-- Change zconf.in.h to zconf.h.in per convention Weigelt
-- Check for NULL buf in gzgets()
-- Return empty string for gzgets() with len == 1 (like fgets())
-- Fix description of gzgets() in zlib.h for end-of-file, NULL return
-- Update minizip to 1.1 Vollant
-- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c
-- Note in zlib.h that gzerror() should be used to distinguish from EOF
-- Remove use of snprintf() from gzlib.c
-- Fix bug in gzseek()
-- Update contrib/vstudio, adding vc9 and vc10 Kuno, Vollant
-- Fix zconf.h generation in CMakeLists.txt Lowman
-- Improve comments in zconf.h where modified by configure
-
-Changes in 1.2.3.8 (13 Feb 2010)
-- Clean up text files (tabs, trailing whitespace, etc.) Oberhumer
-- Use z_off64_t in gz_zero() and gz_skip() to match state->skip
-- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t)
-- Revert to Makefile.in from 1.2.3.6 (live with the clutter)
-- Fix missing error return in gzflush(), add zlib.h note
-- Add *64 functions to zlib.map Levin
-- Fix signed/unsigned comparison in gz_comp()
-- Use SFLAGS when testing shared linking in configure
-- Add --64 option to ./configure to use -m64 with gcc
-- Fix ./configure --help to correctly name options
-- Have make fail if a test fails Levin
-- Avoid buffer overrun in contrib/masmx64/gvmat64.asm Simpson
-- Remove assembler object files from contrib
-
-Changes in 1.2.3.7 (24 Jan 2010)
-- Always gzopen() with O_LARGEFILE if available
-- Fix gzdirect() to work immediately after gzopen() or gzdopen()
-- Make gzdirect() more precise when the state changes while reading
-- Improve zlib.h documentation in many places
-- Catch memory allocation failure in gz_open()
-- Complete close operation if seek forward in gzclose_w() fails
-- Return Z_ERRNO from gzclose_r() if close() fails
-- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL
-- Return zero for gzwrite() errors to match zlib.h description
-- Return -1 on gzputs() error to match zlib.h description
-- Add zconf.in.h to allow recovery from configure modification Weigelt
-- Fix static library permissions in Makefile.in Weigelt
-- Avoid warnings in configure tests that hide functionality Weigelt
-- Add *BSD and DragonFly to Linux case in configure gentoo 123571
-- Change libzdll.a to libz.dll.a in win32/Makefile.gcc gentoo 288212
-- Avoid access of uninitialized data for first inflateReset2 call Gomes
-- Keep object files in subdirectories to reduce the clutter somewhat
-- Remove default Makefile and zlibdefs.h, add dummy Makefile
-- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_
-- Remove zlibdefs.h completely -- modify zconf.h instead
-
-Changes in 1.2.3.6 (17 Jan 2010)
-- Avoid void * arithmetic in gzread.c and gzwrite.c
-- Make compilers happier with const char * for gz_error message
-- Avoid unused parameter warning in inflate.c
-- Avoid signed-unsigned comparison warning in inflate.c
-- Indent #pragma's for traditional C
-- Fix usage of strwinerror() in glib.c, change to gz_strwinerror()
-- Correct email address in configure for system options
-- Update make_vms.com and add make_vms.com to contrib/minizip Zinser
-- Update zlib.map Brown
-- Fix Makefile.in for Solaris 10 make of example64 and minizip64 Torok
-- Apply various fixes to CMakeLists.txt Lowman
-- Add checks on len in gzread() and gzwrite()
-- Add error message for no more room for gzungetc()
-- Remove zlib version check in gzwrite()
-- Defer compression of gzprintf() result until need to
-- Use snprintf() in gzdopen() if available
-- Remove USE_MMAP configuration determination (only used by minigzip)
-- Remove examples/pigz.c (available separately)
-- Update examples/gun.c to 1.6
-
-Changes in 1.2.3.5 (8 Jan 2010)
-- Add space after #if in zutil.h for some compilers
-- Fix relatively harmless bug in deflate_fast() Exarevsky
-- Fix same problem in deflate_slow()
-- Add $(SHAREDLIBV) to LIBS in Makefile.in Brown
-- Add deflate_rle() for faster Z_RLE strategy run-length encoding
-- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding
-- Change name of "write" variable in inffast.c to avoid library collisions
-- Fix premature EOF from gzread() in gzio.c Brown
-- Use zlib header window size if windowBits is 0 in inflateInit2()
-- Remove compressBound() call in deflate.c to avoid linking compress.o
-- Replace use of errno in gz* with functions, support WinCE Alves
-- Provide alternative to perror() in minigzip.c for WinCE Alves
-- Don't use _vsnprintf on later versions of MSVC Lowman
-- Add CMake build script and input file Lowman
-- Update contrib/minizip to 1.1 Svensson, Vollant
-- Moved nintendods directory from contrib to .
-- Replace gzio.c with a new set of routines with the same functionality
-- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above
-- Update contrib/minizip to 1.1b
-- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h
-
-Changes in 1.2.3.4 (21 Dec 2009)
-- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility
-- Update comments in configure and Makefile.in for default --shared
-- Fix test -z's in configure Marquess
-- Build examplesh and minigzipsh when not testing
-- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h
-- Import LDFLAGS from the environment in configure
-- Fix configure to populate SFLAGS with discovered CFLAGS options
-- Adapt make_vms.com to the new Makefile.in Zinser
-- Add zlib2ansi script for C++ compilation Marquess
-- Add _FILE_OFFSET_BITS=64 test to make test (when applicable)
-- Add AMD64 assembler code for longest match to contrib Teterin
-- Include options from $SFLAGS when doing $LDSHARED
-- Simplify 64-bit file support by introducing z_off64_t type
-- Make shared object files in objs directory to work around old Sun cc
-- Use only three-part version number for Darwin shared compiles
-- Add rc option to ar in Makefile.in for when ./configure not run
-- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4*
-- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile
-- Protect against _FILE_OFFSET_BITS being defined when compiling zlib
-- Rename Makefile.in targets allstatic to static and allshared to shared
-- Fix static and shared Makefile.in targets to be independent
-- Correct error return bug in gz_open() by setting state Brown
-- Put spaces before ;;'s in configure for better sh compatibility
-- Add pigz.c (parallel implementation of gzip) to examples/
-- Correct constant in crc32.c to UL Leventhal
-- Reject negative lengths in crc32_combine()
-- Add inflateReset2() function to work like inflateEnd()/inflateInit2()
-- Include sys/types.h for _LARGEFILE64_SOURCE Brown
-- Correct typo in doc/algorithm.txt Janik
-- Fix bug in adler32_combine() Zhu
-- Catch missing-end-of-block-code error in all inflates and in puff
- Assures that random input to inflate eventually results in an error
-- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/
-- Update ENOUGH and its usage to reflect discovered bounds
-- Fix gzerror() error report on empty input file Brown
-- Add ush casts in trees.c to avoid pedantic runtime errors
-- Fix typo in zlib.h uncompress() description Reiss
-- Correct inflate() comments with regard to automatic header detection
-- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays)
-- Put new version of gzlog (2.0) in examples with interruption recovery
-- Add puff compile option to permit invalid distance-too-far streams
-- Add puff TEST command options, ability to read piped input
-- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but
- _LARGEFILE64_SOURCE not defined
-- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart
-- Fix deflateSetDictionary() to use all 32K for output consistency
-- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h)
-- Clear bytes after deflate lookahead to avoid use of uninitialized data
-- Change a limit in inftrees.c to be more transparent to Coverity Prevent
-- Update win32/zlib.def with exported symbols from zlib.h
-- Correct spelling errors in zlib.h Willem, Sobrado
-- Allow Z_BLOCK for deflate() to force a new block
-- Allow negative bits in inflatePrime() to delete existing bit buffer
-- Add Z_TREES flush option to inflate() to return at end of trees
-- Add inflateMark() to return current state information for random access
-- Add Makefile for NintendoDS to contrib Costa
-- Add -w in configure compile tests to avoid spurious warnings Beucler
-- Fix typos in zlib.h comments for deflateSetDictionary()
-- Fix EOF detection in transparent gzread() Maier
-
-Changes in 1.2.3.3 (2 October 2006)
-- Make --shared the default for configure, add a --static option
-- Add compile option to permit invalid distance-too-far streams
-- Add inflateUndermine() function which is required to enable above
-- Remove use of "this" variable name for C++ compatibility Marquess
-- Add testing of shared library in make test, if shared library built
-- Use ftello() and fseeko() if available instead of ftell() and fseek()
-- Provide two versions of all functions that use the z_off_t type for
- binary compatibility -- a normal version and a 64-bit offset version,
- per the Large File Support Extension when _LARGEFILE64_SOURCE is
- defined; use the 64-bit versions by default when _FILE_OFFSET_BITS
- is defined to be 64
-- Add a --uname= option to configure to perhaps help with cross-compiling
-
-Changes in 1.2.3.2 (3 September 2006)
-- Turn off silly Borland warnings Hay
-- Use off64_t and define _LARGEFILE64_SOURCE when present
-- Fix missing dependency on inffixed.h in Makefile.in
-- Rig configure --shared to build both shared and static Teredesai, Truta
-- Remove zconf.in.h and instead create a new zlibdefs.h file
-- Fix contrib/minizip/unzip.c non-encrypted after encrypted Vollant
-- Add treebuild.xml (see http://treebuild.metux.de/) Weigelt
-
-Changes in 1.2.3.1 (16 August 2006)
-- Add watcom directory with OpenWatcom make files Daniel
-- Remove #undef of FAR in zconf.in.h for MVS Fedtke
-- Update make_vms.com Zinser
-- Use -fPIC for shared build in configure Teredesai, Nicholson
-- Use only major version number for libz.so on IRIX and OSF1 Reinholdtsen
-- Use fdopen() (not _fdopen()) for Interix in zutil.h Bck
-- Add some FAQ entries about the contrib directory
-- Update the MVS question in the FAQ
-- Avoid extraneous reads after EOF in gzio.c Brown
-- Correct spelling of "successfully" in gzio.c Randers-Pehrson
-- Add comments to zlib.h about gzerror() usage Brown
-- Set extra flags in gzip header in gzopen() like deflate() does
-- Make configure options more compatible with double-dash conventions
- Weigelt
-- Clean up compilation under Solaris SunStudio cc Rowe, Reinholdtsen
-- Fix uninstall target in Makefile.in Truta
-- Add pkgconfig support Weigelt
-- Use $(DESTDIR) macro in Makefile.in Reinholdtsen, Weigelt
-- Replace set_data_type() with a more accurate detect_data_type() in
- trees.c, according to the txtvsbin.txt document Truta
-- Swap the order of #include <stdio.h> and #include "zlib.h" in
- gzio.c, example.c and minigzip.c Truta
-- Shut up annoying VS2005 warnings about standard C deprecation Rowe,
- Truta (where?)
-- Fix target "clean" from win32/Makefile.bor Truta
-- Create .pdb and .manifest files in win32/makefile.msc Ziegler, Rowe
-- Update zlib www home address in win32/DLL_FAQ.txt Truta
-- Update contrib/masmx86/inffas32.asm for VS2005 Vollant, Van Wassenhove
-- Enable browse info in the "Debug" and "ASM Debug" configurations in
- the Visual C++ 6 project, and set (non-ASM) "Debug" as default Truta
-- Add pkgconfig support Weigelt
-- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h,
- for use in win32/zlib1.rc Polushin, Rowe, Truta
-- Add a document that explains the new text detection scheme to
- doc/txtvsbin.txt Truta
-- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ Truta
-- Move algorithm.txt into doc/ Truta
-- Synchronize FAQ with website
-- Fix compressBound(), was low for some pathological cases Fearnley
-- Take into account wrapper variations in deflateBound()
-- Set examples/zpipe.c input and output to binary mode for Windows
-- Update examples/zlib_how.html with new zpipe.c (also web site)
-- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems
- that gcc became pickier in 4.0)
-- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain
- un-versioned, the patch adds versioning only for symbols introduced in
- zlib-1.2.0 or later. It also declares as local those symbols which are
- not designed to be exported." Levin
-- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure
-- Do not initialize global static by default in trees.c, add a response
- NO_INIT_GLOBAL_POINTERS to initialize them if needed Marquess
-- Don't use strerror() in gzio.c under WinCE Yakimov
-- Don't use errno.h in zutil.h under WinCE Yakimov
-- Move arguments for AR to its usage to allow replacing ar Marot
-- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla Randers-Pehrson
-- Improve inflateInit() and inflateInit2() documentation
-- Fix structure size comment in inflate.h
-- Change configure help option from --h* to --help Santos
-
-Changes in 1.2.3 (18 July 2005)
-- Apply security vulnerability fixes to contrib/infback9 as well
-- Clean up some text files (carriage returns, trailing space)
-- Update testzlib, vstudio, masmx64, and masmx86 in contrib Vollant
-
-Changes in 1.2.2.4 (11 July 2005)
-- Add inflatePrime() function for starting inflation at bit boundary
-- Avoid some Visual C warnings in deflate.c
-- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
- compile
-- Fix some spelling errors in comments Betts
-- Correct inflateInit2() error return documentation in zlib.h
-- Add zran.c example of compressed data random access to examples
- directory, shows use of inflatePrime()
-- Fix cast for assignments to strm->state in inflate.c and infback.c
-- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts Oberhumer
-- Move declarations of gf2 functions to right place in crc32.c Oberhumer
-- Add cast in trees.c t avoid a warning Oberhumer
-- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples Oberhumer
-- Update make_vms.com Zinser
-- Initialize state->write in inflateReset() since copied in inflate_fast()
-- Be more strict on incomplete code sets in inflate_table() and increase
- ENOUGH and MAXD -- this repairs a possible security vulnerability for
- invalid inflate input. Thanks to Tavis Ormandy and Markus Oberhumer for
- discovering the vulnerability and providing test cases.
-- Add ia64 support to configure for HP-UX Smith
-- Add error return to gzread() for format or i/o error Levin
-- Use malloc.h for OS/2 Necasek
-
-Changes in 1.2.2.3 (27 May 2005)
-- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
-- Typecast fread() return values in gzio.c Vollant
-- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
-- Fix crc check bug in gzread() after gzungetc() Heiner
-- Add the deflateTune() function to adjust internal compression parameters
-- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
-- Remove an incorrect assertion in examples/zpipe.c
-- Add C++ wrapper in infback9.h Donais
-- Fix bug in inflateCopy() when decoding fixed codes
-- Note in zlib.h how much deflateSetDictionary() actually uses
-- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
-- Add _WIN32_WCE to define WIN32 in zconf.in.h Spencer
-- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h Spencer
-- Add gzdirect() function to indicate transparent reads
-- Update contrib/minizip Vollant
-- Fix compilation of deflate.c when both ASMV and FASTEST Oberhumer
-- Add casts in crc32.c to avoid warnings Oberhumer
-- Add contrib/masmx64 Vollant
-- Update contrib/asm586, asm686, masmx86, testzlib, vstudio Vollant
-
-Changes in 1.2.2.2 (30 December 2004)
-- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
- avoid implicit memcpy calls (portability for no-library compilation)
-- Increase sprintf() buffer size in gzdopen() to allow for large numbers
-- Add INFLATE_STRICT to check distances against zlib header
-- Improve WinCE errno handling and comments Chang
-- Remove comment about no gzip header processing in FAQ
-- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
-- Add updated make_vms.com Coghlan, update README
-- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
- fitblk.c, gzlog.ch, gzjoin.c, and zlib_how.html.
-- Add FAQ entry and comments in deflate.c on uninitialized memory access
-- Add Solaris 9 make options in configure Gilbert
-- Allow strerror() usage in gzio.c for STDC
-- Fix DecompressBuf in contrib/delphi/ZLib.pas ManChesTer
-- Update contrib/masmx86/inffas32.asm and gvmat32.asm Vollant
-- Use z_off_t for adler32_combine() and crc32_combine() lengths
-- Make adler32() much faster for small len
-- Use OS_CODE in deflate() default gzip header
-
-Changes in 1.2.2.1 (31 October 2004)
-- Allow inflateSetDictionary() call for raw inflate
-- Fix inflate header crc check bug for file names and comments
-- Add deflateSetHeader() and gz_header structure for custom gzip headers
-- Add inflateGetheader() to retrieve gzip headers
-- Add crc32_combine() and adler32_combine() functions
-- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
-- Use zstreamp consistently in zlib.h (inflate_back functions)
-- Remove GUNZIP condition from definition of inflate_mode in inflate.h
- and in contrib/inflate86/inffast.S Truta, Anderson
-- Add support for AMD64 in contrib/inflate86/inffas86.c Anderson
-- Update projects/README.projects and projects/visualc6 Truta
-- Update win32/DLL_FAQ.txt Truta
-- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo Truta
-- Deprecate Z_ASCII; use Z_TEXT instead Truta
-- Use a new algorithm for setting strm->data_type in trees.c Truta
-- Do not define an exit() prototype in zutil.c unless DEBUG defined
-- Remove prototype of exit() from zutil.c, example.c, minigzip.c Truta
-- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
-- Fix Darwin build version identification Peterson
-
-Changes in 1.2.2 (3 October 2004)
-- Update zlib.h comments on gzip in-memory processing
-- Set adler to 1 in inflateReset() to support Java test suite Walles
-- Add contrib/dotzlib Ravn
-- Update win32/DLL_FAQ.txt Truta
-- Update contrib/minizip Vollant
-- Move contrib/visual-basic.txt to old/ Truta
-- Fix assembler builds in projects/visualc6/ Truta
-
-Changes in 1.2.1.2 (9 September 2004)
-- Update INDEX file
-- Fix trees.c to update strm->data_type (no one ever noticed!)
-- Fix bug in error case in inflate.c, infback.c, and infback9.c Brown
-- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
-- Add limited multitasking protection to DYNAMIC_CRC_TABLE
-- Add NO_vsnprintf for VMS in zutil.h Mozilla
-- Don't declare strerror() under VMS Mozilla
-- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
-- Update contrib/ada Anisimkov
-- Update contrib/minizip Vollant
-- Fix configure to not hardcode directories for Darwin Peterson
-- Fix gzio.c to not return error on empty files Brown
-- Fix indentation; update version in contrib/delphi/ZLib.pas and
- contrib/pascal/zlibpas.pas Truta
-- Update mkasm.bat in contrib/masmx86 Truta
-- Update contrib/untgz Truta
-- Add projects/README.projects Truta
-- Add project for MS Visual C++ 6.0 in projects/visualc6 Cadieux, Truta
-- Update win32/DLL_FAQ.txt Truta
-- Update list of Z_PREFIX symbols in zconf.h Randers-Pehrson, Truta
-- Remove an unnecessary assignment to curr in inftrees.c Truta
-- Add OS/2 to exe builds in configure Poltorak
-- Remove err dummy parameter in zlib.h Kientzle
-
-Changes in 1.2.1.1 (9 January 2004)
-- Update email address in README
-- Several FAQ updates
-- Fix a big fat bug in inftrees.c that prevented decoding valid
- dynamic blocks with only literals and no distance codes --
- Thanks to "Hot Emu" for the bug report and sample file
-- Add a note to puff.c on no distance codes case.
-
-Changes in 1.2.1 (17 November 2003)
-- Remove a tab in contrib/gzappend/gzappend.c
-- Update some interfaces in contrib for new zlib functions
-- Update zlib version number in some contrib entries
-- Add Windows CE definition for ptrdiff_t in zutil.h Mai, Truta
-- Support shared libraries on Hurd and KFreeBSD Brown
-- Fix error in NO_DIVIDE option of adler32.c
-
-Changes in 1.2.0.8 (4 November 2003)
-- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
-- Add experimental NO_DIVIDE #define in adler32.c
- - Possibly faster on some processors (let me know if it is)
-- Correct Z_BLOCK to not return on first inflate call if no wrap
-- Fix strm->data_type on inflate() return to correctly indicate EOB
-- Add deflatePrime() function for appending in the middle of a byte
-- Add contrib/gzappend for an example of appending to a stream
-- Update win32/DLL_FAQ.txt Truta
-- Delete Turbo C comment in README Truta
-- Improve some indentation in zconf.h Truta
-- Fix infinite loop on bad input in configure script Church
-- Fix gzeof() for concatenated gzip files Johnson
-- Add example to contrib/visual-basic.txt Michael B.
-- Add -p to mkdir's in Makefile.in vda
-- Fix configure to properly detect presence or lack of printf functions
-- Add AS400 support Monnerat
-- Add a little Cygwin support Wilson
-
-Changes in 1.2.0.7 (21 September 2003)
-- Correct some debug formats in contrib/infback9
-- Cast a type in a debug statement in trees.c
-- Change search and replace delimiter in configure from % to # Beebe
-- Update contrib/untgz to 0.2 with various fixes Truta
-- Add build support for Amiga Nikl
-- Remove some directories in old that have been updated to 1.2
-- Add dylib building for Mac OS X in configure and Makefile.in
-- Remove old distribution stuff from Makefile
-- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
-- Update links in README
-
-Changes in 1.2.0.6 (13 September 2003)
-- Minor FAQ updates
-- Update contrib/minizip to 1.00 Vollant
-- Remove test of gz functions in example.c when GZ_COMPRESS defined Truta
-- Update POSTINC comment for 68060 Nikl
-- Add contrib/infback9 with deflate64 decoding (unsupported)
-- For MVS define NO_vsnprintf and undefine FAR van Burik
-- Add pragma for fdopen on MVS van Burik
-
-Changes in 1.2.0.5 (8 September 2003)
-- Add OF to inflateBackEnd() declaration in zlib.h
-- Remember start when using gzdopen in the middle of a file
-- Use internal off_t counters in gz* functions to properly handle seeks
-- Perform more rigorous check for distance-too-far in inffast.c
-- Add Z_BLOCK flush option to return from inflate at block boundary
-- Set strm->data_type on return from inflate
- - Indicate bits unused, if at block boundary, and if in last block
-- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
-- Add condition so old NO_DEFLATE define still works for compatibility
-- FAQ update regarding the Windows DLL Truta
-- INDEX update: add qnx entry, remove aix entry Truta
-- Install zlib.3 into mandir Wilson
-- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update Truta
-- Adapt the zlib interface to the new DLL convention guidelines Truta
-- Introduce ZLIB_WINAPI macro to allow the export of functions using
- the WINAPI calling convention, for Visual Basic Vollant, Truta
-- Update msdos and win32 scripts and makefiles Truta
-- Export symbols by name, not by ordinal, in win32/zlib.def Truta
-- Add contrib/ada Anisimkov
-- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 Truta
-- Rename contrib/asm386 to contrib/masmx86 Truta, Vollant
-- Add contrib/masm686 Truta
-- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
- Truta, Vollant
-- Update contrib/delphi; rename to contrib/pascal; add example Truta
-- Remove contrib/delphi2; add a new contrib/delphi Truta
-- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
- and fix some method prototypes Truta
-- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
- Truta
-- Avoid the use of backslash (\) in contrib/minizip Vollant
-- Fix file time handling in contrib/untgz; update makefiles Truta
-- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
- Vollant
-- Remove contrib/vstudio/vc15_16 Vollant
-- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 Truta
-- Update README.contrib Truta
-- Invert the assignment order of match_head and s->prev... in
- INSERT_STRING Truta
-- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
- Truta
-- Compare function pointers with 0, not with NULL or Z_NULL Truta
-- Fix prototype of syncsearch in inflate.c Truta
-- Introduce ASMINF macro to be enabled when using an ASM implementation
- of inflate_fast Truta
-- Change NO_DEFLATE to NO_GZCOMPRESS Truta
-- Modify test_gzio in example.c to take a single file name as a
- parameter Truta
-- Exit the example.c program if gzopen fails Truta
-- Add type casts around strlen in example.c Truta
-- Remove casting to sizeof in minigzip.c; give a proper type
- to the variable compared with SUFFIX_LEN Truta
-- Update definitions of STDC and STDC99 in zconf.h Truta
-- Synchronize zconf.h with the new Windows DLL interface Truta
-- Use SYS16BIT instead of __32BIT__ to distinguish between
- 16- and 32-bit platforms Truta
-- Use far memory allocators in small 16-bit memory models for
- Turbo C Truta
-- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
- zlibCompileFlags Truta
-- Cygwin has vsnprintf Wilson
-- In Windows16, OS_CODE is 0, as in MSDOS Truta
-- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) Wilson
-
-Changes in 1.2.0.4 (10 August 2003)
-- Minor FAQ updates
-- Be more strict when checking inflateInit2's windowBits parameter
-- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
-- Add gzip wrapper option to deflateInit2 using windowBits
-- Add updated QNX rule in configure and qnx directory Bonnefoy
-- Make inflate distance-too-far checks more rigorous
-- Clean up FAR usage in inflate
-- Add casting to sizeof() in gzio.c and minigzip.c
-
-Changes in 1.2.0.3 (19 July 2003)
-- Fix silly error in gzungetc() implementation Vollant
-- Update contrib/minizip and contrib/vstudio Vollant
-- Fix printf format in example.c
-- Correct cdecl support in zconf.in.h Anisimkov
-- Minor FAQ updates
-
-Changes in 1.2.0.2 (13 July 2003)
-- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
-- Attempt to avoid warnings in crc32.c for pointer-int conversion
-- Add AIX to configure, remove aix directory Bakker
-- Add some casts to minigzip.c
-- Improve checking after insecure sprintf() or vsprintf() calls
-- Remove #elif's from crc32.c
-- Change leave label to inf_leave in inflate.c and infback.c to avoid
- library conflicts
-- Remove inflate gzip decoding by default--only enable gzip decoding by
- special request for stricter backward compatibility
-- Add zlibCompileFlags() function to return compilation information
-- More typecasting in deflate.c to avoid warnings
-- Remove leading underscore from _Capital #defines Truta
-- Fix configure to link shared library when testing
-- Add some Windows CE target adjustments Mai
-- Remove #define ZLIB_DLL in zconf.h Vollant
-- Add zlib.3 Rodgers
-- Update RFC URL in deflate.c and algorithm.txt Mai
-- Add zlib_dll_FAQ.txt to contrib Truta
-- Add UL to some constants Truta
-- Update minizip and vstudio Vollant
-- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
-- Expand use of NO_DUMMY_DECL to avoid all dummy structures
-- Added iostream3 to contrib Schwardt
-- Replace rewind() with fseek() for WinCE Truta
-- Improve setting of zlib format compression level flags
- - Report 0 for huffman and rle strategies and for level == 0 or 1
- - Report 2 only for level == 6
-- Only deal with 64K limit when necessary at compile time Truta
-- Allow TOO_FAR check to be turned off at compile time Truta
-- Add gzclearerr() function Souza
-- Add gzungetc() function
-
-Changes in 1.2.0.1 (17 March 2003)
-- Add Z_RLE strategy for run-length encoding Truta
- - When Z_RLE requested, restrict matches to distance one
- - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
-- Correct FASTEST compilation to allow level == 0
-- Clean up what gets compiled for FASTEST
-- Incorporate changes to zconf.in.h Vollant
- - Refine detection of Turbo C need for dummy returns
- - Refine ZLIB_DLL compilation
- - Include additional header file on VMS for off_t typedef
-- Try to use _vsnprintf where it supplants vsprintf Vollant
-- Add some casts in inffast.c
-- Enchance comments in zlib.h on what happens if gzprintf() tries to
- write more than 4095 bytes before compression
-- Remove unused state from inflateBackEnd()
-- Remove exit(0) from minigzip.c, example.c
-- Get rid of all those darn tabs
-- Add "check" target to Makefile.in that does the same thing as "test"
-- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
-- Update contrib/inflate86 Anderson
-- Update contrib/testzlib, contrib/vstudio, contrib/minizip Vollant
-- Add msdos and win32 directories with makefiles Truta
-- More additions and improvements to the FAQ
-
-Changes in 1.2.0 (9 March 2003)
-- New and improved inflate code
- - About 20% faster
- - Does not allocate 32K window unless and until needed
- - Automatically detects and decompresses gzip streams
- - Raw inflate no longer needs an extra dummy byte at end
- - Added inflateBack functions using a callback interface--even faster
- than inflate, useful for file utilities (gzip, zip)
- - Added inflateCopy() function to record state for random access on
- externally generated deflate streams (e.g. in gzip files)
- - More readable code (I hope)
-- New and improved crc32()
- - About 50% faster, thanks to suggestions from Rodney Brown
-- Add deflateBound() and compressBound() functions
-- Fix memory leak in deflateInit2()
-- Permit setting dictionary for raw deflate (for parallel deflate)
-- Fix const declaration for gzwrite()
-- Check for some malloc() failures in gzio.c
-- Fix bug in gzopen() on single-byte file 0x1f
-- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
- and next buffer doesn't start with 0x8b
-- Fix uncompress() to return Z_DATA_ERROR on truncated input
-- Free memory at end of example.c
-- Remove MAX #define in trees.c (conflicted with some libraries)
-- Fix static const's in deflate.c, gzio.c, and zutil.ch
-- Declare malloc() and free() in gzio.c if STDC not defined
-- Use malloc() instead of calloc() in zutil.c if int big enough
-- Define STDC for AIX
-- Add aix/ with approach for compiling shared library on AIX
-- Add HP-UX support for shared libraries in configure
-- Add OpenUNIX support for shared libraries in configure
-- Use $cc instead of gcc to build shared library
-- Make prefix directory if needed when installing
-- Correct Macintosh avoidance of typedef Byte in zconf.h
-- Correct Turbo C memory allocation when under Linux
-- Use libz.a instead of -lz in Makefile (assure use of compiled library)
-- Update configure to check for snprintf or vsnprintf functions and their
- return value, warn during make if using an insecure function
-- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
- is lost when library is used--resolution is to build new zconf.h
-- Documentation improvements (in zlib.h):
- - Document raw deflate and inflate
- - Update RFCs URL
- - Point out that zlib and gzip formats are different
- - Note that Z_BUF_ERROR is not fatal
- - Document string limit for gzprintf() and possible buffer overflow
- - Note requirement on avail_out when flushing
- - Note permitted values of flush parameter of inflate()
-- Add some FAQs (and even answers) to the FAQ
-- Add contrib/inflate86/ for x86 faster inflate
-- Add contrib/blast/ for PKWare Data Compression Library decompression
-- Add contrib/puff/ simple inflate for deflate format description
-
-Changes in 1.1.4 (11 March 2002)
-- ZFREE was repeated on same allocation on some error conditions.
- This creates a security problem described in
- http://www.zlib.org/advisory-2002-03-11.txt
-- Returned incorrect error (Z_MEM_ERROR) on some invalid data
-- Avoid accesses before window for invalid distances with inflate window
- less than 32K.
-- force windowBits > 8 to avoid a bug in the encoder for a window size
- of 256 bytes. (A complete fix will be available in 1.1.5).
-
-Changes in 1.1.3 (9 July 1998)
-- fix "an inflate input buffer bug that shows up on rare but persistent
- occasions" (Mark)
-- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
-- fix gzseek(..., SEEK_SET) in write mode
-- fix crc check after a gzeek (Frank Faubert)
-- fix miniunzip when the last entry in a zip file is itself a zip file
- (J Lillge)
-- add contrib/asm586 and contrib/asm686 (Brian Raiter)
- See http://www.muppetlabs.com/~breadbox/software/assembly.html
-- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
-- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
-- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
-- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
-- added a FAQ file
-
-- Support gzdopen on Mac with Metrowerks (Jason Linhart)
-- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
-- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
-- avoid some warnings with Borland C (Tom Tanner)
-- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
-- emulate utime() for WIN32 in contrib/untgz (Gilles Vollant)
-- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
-- use libdir and includedir in Makefile.in (Tim Mooney)
-- support shared libraries on OSF1 V4 (Tim Mooney)
-- remove so_locations in "make clean" (Tim Mooney)
-- fix maketree.c compilation error (Glenn, Mark)
-- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
-- new Makefile.riscos (Rich Walker)
-- initialize static descriptors in trees.c for embedded targets (Nick Smith)
-- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
-- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
-- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
-- fix maketree.c to allow clean compilation of inffixed.h (Mark)
-- fix parameter check in deflateCopy (Gunther Nikl)
-- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
-- Many portability patches by Christian Spieler:
- . zutil.c, zutil.h: added "const" for zmem*
- . Make_vms.com: fixed some typos
- . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
- . msdos/Makefile.msc: remove "default rtl link library" info from obj files
- . msdos/Makefile.*: use model-dependent name for the built zlib library
- . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
- new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
-- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
-- replace __far with _far for better portability (Christian Spieler, Tom Lane)
-- fix test for errno.h in configure (Tim Newsham)
-
-Changes in 1.1.2 (19 March 98)
-- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
- See http://www.winimage.com/zLibDll/unzip.html
-- preinitialize the inflate tables for fixed codes, to make the code
- completely thread safe (Mark)
-- some simplifications and slight speed-up to the inflate code (Mark)
-- fix gzeof on non-compressed files (Allan Schrum)
-- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
-- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
-- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
-- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
-- do not wrap extern "C" around system includes (Tom Lane)
-- mention zlib binding for TCL in README (Andreas Kupries)
-- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
-- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
-- allow "configure --prefix $HOME" (Tim Mooney)
-- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
-- move Makefile.sas to amiga/Makefile.sas
-
-Changes in 1.1.1 (27 Feb 98)
-- fix macros _tr_tally_* in deflate.h for debug mode (Glenn Randers-Pehrson)
-- remove block truncation heuristic which had very marginal effect for zlib
- (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
- compression ratio on some files. This also allows inlining _tr_tally for
- matches in deflate_slow.
-- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
-
-Changes in 1.1.0 (24 Feb 98)
-- do not return STREAM_END prematurely in inflate (John Bowler)
-- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
-- compile with -DFASTEST to get compression code optimized for speed only
-- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
-- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
- on Sun but significant on HP)
-
-- add a pointer to experimental unzip library in README (Gilles Vollant)
-- initialize variable gcc in configure (Chris Herborth)
-
-Changes in 1.0.9 (17 Feb 1998)
-- added gzputs and gzgets functions
-- do not clear eof flag in gzseek (Mark Diekhans)
-- fix gzseek for files in transparent mode (Mark Diekhans)
-- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
-- replace EXPORT with ZEXPORT to avoid conflict with other programs
-- added compress2 in zconf.h, zlib.def, zlib.dnt
-- new asm code from Gilles Vollant in contrib/asm386
-- simplify the inflate code (Mark):
- . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
- . ZALLOC the length list in inflate_trees_fixed() instead of using stack
- . ZALLOC the value area for huft_build() instead of using stack
- . Simplify Z_FINISH check in inflate()
-
-- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
-- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
-- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
- the declaration of FAR (Gilles VOllant)
-- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
-- read_buf buf parameter of type Bytef* instead of charf*
-- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
-- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
-- fix check for presence of directories in "make install" (Ian Willis)
-
-Changes in 1.0.8 (27 Jan 1998)
-- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
-- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
-- added compress2() to allow setting the compression level
-- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
-- use constant arrays for the static trees in trees.c instead of computing
- them at run time (thanks to Ken Raeburn for this suggestion). To create
- trees.h, compile with GEN_TREES_H and run "make test".
-- check return code of example in "make test" and display result
-- pass minigzip command line options to file_compress
-- simplifying code of inflateSync to avoid gcc 2.8 bug
-
-- support CC="gcc -Wall" in configure -s (QingLong)
-- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
-- fix test for shared library support to avoid compiler warnings
-- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
-- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
-- do not use fdopen for Metrowerks on Mac (Brad Pettit))
-- add checks for gzputc and gzputc in example.c
-- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
-- use const for the CRC table (Ken Raeburn)
-- fixed "make uninstall" for shared libraries
-- use Tracev instead of Trace in infblock.c
-- in example.c use correct compressed length for test_sync
-- suppress +vnocompatwarnings in configure for HPUX (not always supported)
-
-Changes in 1.0.7 (20 Jan 1998)
-- fix gzseek which was broken in write mode
-- return error for gzseek to negative absolute position
-- fix configure for Linux (Chun-Chung Chen)
-- increase stack space for MSC (Tim Wegner)
-- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
-- define EXPORTVA for gzprintf (Gilles Vollant)
-- added man page zlib.3 (Rick Rodgers)
-- for contrib/untgz, fix makedir() and improve Makefile
-
-- check gzseek in write mode in example.c
-- allocate extra buffer for seeks only if gzseek is actually called
-- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
-- add inflateSyncPoint in zconf.h
-- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
-
-Changes in 1.0.6 (19 Jan 1998)
-- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
- gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
-- Fix a deflate bug occurring only with compression level 0 (thanks to
- Andy Buckler for finding this one).
-- In minigzip, pass transparently also the first byte for .Z files.
-- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
-- check Z_FINISH in inflate (thanks to Marc Schluper)
-- Implement deflateCopy (thanks to Adam Costello)
-- make static libraries by default in configure, add --shared option.
-- move MSDOS or Windows specific files to directory msdos
-- suppress the notion of partial flush to simplify the interface
- (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
-- suppress history buffer provided by application to simplify the interface
- (this feature was not implemented anyway in 1.0.4)
-- next_in and avail_in must be initialized before calling inflateInit or
- inflateInit2
-- add EXPORT in all exported functions (for Windows DLL)
-- added Makefile.nt (thanks to Stephen Williams)
-- added the unsupported "contrib" directory:
- contrib/asm386/ by Gilles Vollant <info@winimage.com>
- 386 asm code replacing longest_match().
- contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
- A C++ I/O streams interface to the zlib gz* functions
- contrib/iostream2/ by Tyge Løvset <Tyge.Lovset@cmr.no>
- Another C++ I/O streams interface
- contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
- A very simple tar.gz file extractor using zlib
- contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
- How to use compress(), uncompress() and the gz* functions from VB.
-- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
- level) in minigzip (thanks to Tom Lane)
-
-- use const for rommable constants in deflate
-- added test for gzseek and gztell in example.c
-- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
-- add undocumented function zError to convert error code to string
- (for Tim Smithers)
-- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
-- Use default memcpy for Symantec MSDOS compiler.
-- Add EXPORT keyword for check_func (needed for Windows DLL)
-- add current directory to LD_LIBRARY_PATH for "make test"
-- create also a link for libz.so.1
-- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
-- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
-- added -soname for Linux in configure (Chun-Chung Chen,
-- assign numbers to the exported functions in zlib.def (for Windows DLL)
-- add advice in zlib.h for best usage of deflateSetDictionary
-- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
-- allow compilation with ANSI keywords only enabled for TurboC in large model
-- avoid "versionString"0 (Borland bug)
-- add NEED_DUMMY_RETURN for Borland
-- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
-- allow compilation with CC
-- defined STDC for OS/2 (David Charlap)
-- limit external names to 8 chars for MVS (Thomas Lund)
-- in minigzip.c, use static buffers only for 16-bit systems
-- fix suffix check for "minigzip -d foo.gz"
-- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
-- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
-- added makelcc.bat for lcc-win32 (Tom St Denis)
-- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
-- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
-- check for unistd.h in configure (for off_t)
-- remove useless check parameter in inflate_blocks_free
-- avoid useless assignment of s->check to itself in inflate_blocks_new
-- do not flush twice in gzclose (thanks to Ken Raeburn)
-- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
-- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
-- work around buggy fclose on pipes for HP/UX
-- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
-- fix configure if CC is already equal to gcc
-
-Changes in 1.0.5 (3 Jan 98)
-- Fix inflate to terminate gracefully when fed corrupted or invalid data
-- Use const for rommable constants in inflate
-- Eliminate memory leaks on error conditions in inflate
-- Removed some vestigial code in inflate
-- Update web address in README
-
-Changes in 1.0.4 (24 Jul 96)
-- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
- bit, so the decompressor could decompress all the correct data but went
- on to attempt decompressing extra garbage data. This affected minigzip too.
-- zlibVersion and gzerror return const char* (needed for DLL)
-- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
-- use z_error only for DEBUG (avoid problem with DLLs)
-
-Changes in 1.0.3 (2 Jul 96)
-- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
- small and medium models; this makes the library incompatible with previous
- versions for these models. (No effect in large model or on other systems.)
-- return OK instead of BUF_ERROR if previous deflate call returned with
- avail_out as zero but there is nothing to do
-- added memcmp for non STDC compilers
-- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
-- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
-- better check for 16-bit mode MSC (avoids problem with Symantec)
-
-Changes in 1.0.2 (23 May 96)
-- added Windows DLL support
-- added a function zlibVersion (for the DLL support)
-- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
-- Bytef is define's instead of typedef'd only for Borland C
-- avoid reading uninitialized memory in example.c
-- mention in README that the zlib format is now RFC1950
-- updated Makefile.dj2
-- added algorithm.doc
-
-Changes in 1.0.1 (20 May 96) 1.0 skipped to avoid confusion
-- fix array overlay in deflate.c which sometimes caused bad compressed data
-- fix inflate bug with empty stored block
-- fix MSDOS medium model which was broken in 0.99
-- fix deflateParams() which could generated bad compressed data.
-- Bytef is define'd instead of typedef'ed (work around Borland bug)
-- added an INDEX file
-- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
- Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
-- speed up adler32 for modern machines without auto-increment
-- added -ansi for IRIX in configure
-- static_init_done in trees.c is an int
-- define unlink as delete for VMS
-- fix configure for QNX
-- add configure branch for SCO and HPUX
-- avoid many warnings (unused variables, dead assignments, etc...)
-- no fdopen for BeOS
-- fix the Watcom fix for 32 bit mode (define FAR as empty)
-- removed redefinition of Byte for MKWERKS
-- work around an MWKERKS bug (incorrect merge of all .h files)
-
-Changes in 0.99 (27 Jan 96)
-- allow preset dictionary shared between compressor and decompressor
-- allow compression level 0 (no compression)
-- add deflateParams in zlib.h: allow dynamic change of compression level
- and compression strategy.
-- test large buffers and deflateParams in example.c
-- add optional "configure" to build zlib as a shared library
-- suppress Makefile.qnx, use configure instead
-- fixed deflate for 64-bit systems (detected on Cray)
-- fixed inflate_blocks for 64-bit systems (detected on Alpha)
-- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
-- always return Z_BUF_ERROR when deflate() has nothing to do
-- deflateInit and inflateInit are now macros to allow version checking
-- prefix all global functions and types with z_ with -DZ_PREFIX
-- make falloc completely reentrant (inftrees.c)
-- fixed very unlikely race condition in ct_static_init
-- free in reverse order of allocation to help memory manager
-- use zlib-1.0/* instead of zlib/* inside the tar.gz
-- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
- -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
-- allow gzread on concatenated .gz files
-- deflateEnd now returns Z_DATA_ERROR if it was premature
-- deflate is finally (?) fully deterministic (no matches beyond end of input)
-- Document Z_SYNC_FLUSH
-- add uninstall in Makefile
-- Check for __cpluplus in zlib.h
-- Better test in ct_align for partial flush
-- avoid harmless warnings for Borland C++
-- initialize hash_head in deflate.c
-- avoid warning on fdopen (gzio.c) for HP cc -Aa
-- include stdlib.h for STDC compilers
-- include errno.h for Cray
-- ignore error if ranlib doesn't exist
-- call ranlib twice for NeXTSTEP
-- use exec_prefix instead of prefix for libz.a
-- renamed ct_* as _tr_* to avoid conflict with applications
-- clear z->msg in inflateInit2 before any error return
-- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
-- fixed typo in zconf.h (_GNUC__ => __GNUC__)
-- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
-- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
-- in fcalloc, normalize pointer if size > 65520 bytes
-- don't use special fcalloc for 32 bit Borland C++
-- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
-- use Z_BINARY instead of BINARY
-- document that gzclose after gzdopen will close the file
-- allow "a" as mode in gzopen.
-- fix error checking in gzread
-- allow skipping .gz extra-field on pipes
-- added reference to Perl interface in README
-- put the crc table in FAR data (I dislike more and more the medium model :)
-- added get_crc_table
-- added a dimension to all arrays (Borland C can't count).
-- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
-- guard against multiple inclusion of *.h (for precompiled header on Mac)
-- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
-- don't use unsized arrays to avoid silly warnings by Visual C++:
- warning C4746: 'inflate_mask' : unsized array treated as '__far'
- (what's wrong with far data in far model?).
-- define enum out of inflate_blocks_state to allow compilation with C++
-
-Changes in 0.95 (16 Aug 95)
-- fix MSDOS small and medium model (now easier to adapt to any compiler)
-- inlined send_bits
-- fix the final (:-) bug for deflate with flush (output was correct but
- not completely flushed in rare occasions).
-- default window size is same for compression and decompression
- (it's now sufficient to set MAX_WBITS in zconf.h).
-- voidp -> voidpf and voidnp -> voidp (for consistency with other
- typedefs and because voidnp was not near in large model).
-
-Changes in 0.94 (13 Aug 95)
-- support MSDOS medium model
-- fix deflate with flush (could sometimes generate bad output)
-- fix deflateReset (zlib header was incorrectly suppressed)
-- added support for VMS
-- allow a compression level in gzopen()
-- gzflush now calls fflush
-- For deflate with flush, flush even if no more input is provided.
-- rename libgz.a as libz.a
-- avoid complex expression in infcodes.c triggering Turbo C bug
-- work around a problem with gcc on Alpha (in INSERT_STRING)
-- don't use inline functions (problem with some gcc versions)
-- allow renaming of Byte, uInt, etc... with #define.
-- avoid warning about (unused) pointer before start of array in deflate.c
-- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
-- avoid reserved word 'new' in trees.c
-
-Changes in 0.93 (25 June 95)
-- temporarily disable inline functions
-- make deflate deterministic
-- give enough lookahead for PARTIAL_FLUSH
-- Set binary mode for stdin/stdout in minigzip.c for OS/2
-- don't even use signed char in inflate (not portable enough)
-- fix inflate memory leak for segmented architectures
-
-Changes in 0.92 (3 May 95)
-- don't assume that char is signed (problem on SGI)
-- Clear bit buffer when starting a stored block
-- no memcpy on Pyramid
-- suppressed inftest.c
-- optimized fill_window, put longest_match inline for gcc
-- optimized inflate on stored blocks.
-- untabify all sources to simplify patches
-
-Changes in 0.91 (2 May 95)
-- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
-- Document the memory requirements in zconf.h
-- added "make install"
-- fix sync search logic in inflateSync
-- deflate(Z_FULL_FLUSH) now works even if output buffer too short
-- after inflateSync, don't scare people with just "lo world"
-- added support for DJGPP
-
-Changes in 0.9 (1 May 95)
-- don't assume that zalloc clears the allocated memory (the TurboC bug
- was Mark's bug after all :)
-- let again gzread copy uncompressed data unchanged (was working in 0.71)
-- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
-- added a test of inflateSync in example.c
-- moved MAX_WBITS to zconf.h because users might want to change that.
-- document explicitly that zalloc(64K) on MSDOS must return a normalized
- pointer (zero offset)
-- added Makefiles for Microsoft C, Turbo C, Borland C++
-- faster crc32()
-
-Changes in 0.8 (29 April 95)
-- added fast inflate (inffast.c)
-- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
- is incompatible with previous versions of zlib which returned Z_OK.
-- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
- (actually that was not a compiler bug, see 0.81 above)
-- gzread no longer reads one extra byte in certain cases
-- In gzio destroy(), don't reference a freed structure
-- avoid many warnings for MSDOS
-- avoid the ERROR symbol which is used by MS Windows
-
-Changes in 0.71 (14 April 95)
-- Fixed more MSDOS compilation problems :( There is still a bug with
- TurboC large model.
-
-Changes in 0.7 (14 April 95)
-- Added full inflate support.
-- Simplified the crc32() interface. The pre- and post-conditioning
- (one's complement) is now done inside crc32(). WARNING: this is
- incompatible with previous versions; see zlib.h for the new usage.
-
-Changes in 0.61 (12 April 95)
-- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
-
-Changes in 0.6 (11 April 95)
-- added minigzip.c
-- added gzdopen to reopen a file descriptor as gzFile
-- added transparent reading of non-gziped files in gzread.
-- fixed bug in gzread (don't read crc as data)
-- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
-- don't allocate big arrays in the stack (for MSDOS)
-- fix some MSDOS compilation problems
-
-Changes in 0.5:
-- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
- not yet Z_FULL_FLUSH.
-- support decompression but only in a single step (forced Z_FINISH)
-- added opaque object for zalloc and zfree.
-- added deflateReset and inflateReset
-- added a variable zlib_version for consistency checking.
-- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
- Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
-
-Changes in 0.4:
-- avoid "zip" everywhere, use zlib instead of ziplib.
-- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
- if compression method == 8.
-- added adler32 and crc32
-- renamed deflateOptions as deflateInit2, call one or the other but not both
-- added the method parameter for deflateInit2.
-- added inflateInit2
-- simplied considerably deflateInit and inflateInit by not supporting
- user-provided history buffer. This is supported only in deflateInit2
- and inflateInit2.
-
-Changes in 0.3:
-- prefix all macro names with Z_
-- use Z_FINISH instead of deflateEnd to finish compression.
-- added Z_HUFFMAN_ONLY
-- added gzerror()

smplayer-0.8.0.tar.bz2/zlib-1.2.6/INDEX Deleted

@@ -1,67 +0,0 @@
-CMakeLists.txt  cmake build file
-ChangeLog       history of changes
-FAQ             Frequently Asked Questions about zlib
-INDEX           this file
-Makefile        dummy Makefile that tells you to ./configure
-Makefile.in     template for Unix Makefile
-README          guess what
-configure       configure script for Unix
-make_vms.com    makefile for VMS
-test/example.c  zlib usages examples for build testing
-test/minigzip.c minimal gzip-like functionality for build testing
-test/infcover.c inf*.c code coverage for build coverage testing
-treebuild.xml   XML description of source file dependencies
-zconf.h.cmakein zconf.h template for cmake
-zconf.h.in      zconf.h template for configure
-zlib.3          Man page for zlib
-zlib.3.pdf      Man page in PDF format
-zlib.map        Linux symbol information
-zlib.pc.in      Template for pkg-config descriptor
-zlib2ansi       perl script to convert source files for C++ compilation
-
-amiga/          makefiles for Amiga SAS C
-as400/          makefiles for AS/400
-doc/            documentation for formats and algorithms
-msdos/          makefiles for MSDOS
-nintendods/     makefile for Nintendo DS
-old/            makefiles for various architectures and zlib documentation
-                files that have not yet been updated for zlib 1.2.x
-qnx/            makefiles for QNX
-watcom/         makefiles for OpenWatcom
-win32/          makefiles for Windows
-
-                zlib public header files (required for library use):
-zconf.h
-zlib.h
-
-                private source files used to build the zlib library:
-adler32.c
-compress.c
-crc32.c
-crc32.h
-deflate.c
-deflate.h
-gzclose.c
-gzguts.h
-gzlib.c
-gzread.c
-gzwrite.c
-infback.c
-inffast.c
-inffast.h
-inffixed.h
-inflate.c
-inflate.h
-inftrees.c
-inftrees.h
-trees.c
-trees.h
-uncompr.c
-zutil.c
-zutil.h
-
-                source files for sample programs
-See examples/README.examples
-
-                unsupported contributions by third parties
-See contrib/README.contrib

smplayer-0.8.0.tar.bz2/zlib-1.2.6/Makefile.in Deleted

@@ -1,285 +0,0 @@
-# Makefile for zlib
-# Copyright (C) 1995-2011 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile and test, type:
-# ./configure; make test
-# Normally configure builds both a static and a shared library.
-# If you want to build just a static library, use: ./configure --static
-
-# To use the asm code, type:
-# cp contrib/asm?86/match.S ./match.S
-# make LOC=-DASMV OBJA=match.o
-
-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
-# make install
-# To install in $HOME instead of /usr/local, use:
-# make install prefix=$HOME
-
-CC=cc
-
-CFLAGS=-O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
-#CFLAGS=-g -DDEBUG
-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-# -Wstrict-prototypes -Wmissing-prototypes
-
-SFLAGS=-O
-LDFLAGS=
-TEST_LDFLAGS=-L. libz.a
-LDSHARED=$(CC)
-CPP=$(CC) -E
-
-STATICLIB=libz.a
-SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.6
-SHAREDLIBM=libz.so.1
-LIBS=$(STATICLIB) $(SHAREDLIBV)
-
-AR=ar
-ARFLAGS=rc
-RANLIB=ranlib
-LDCONFIG=ldconfig
-LDSHAREDLIBC=-lc
-TAR=tar
-SHELL=/bin/sh
-EXE=
-
-prefix = /usr/local
-exec_prefix = ${prefix}
-libdir = ${exec_prefix}/lib
-sharedlibdir = ${libdir}
-includedir = ${prefix}/include
-mandir = ${prefix}/share/man
-man3dir = ${mandir}/man3
-pkgconfigdir = ${libdir}/pkgconfig
-tempfile := $(shell mktemp -u __XXXXXX)
-
-OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
-OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
-OBJC = $(OBJZ) $(OBJG)
-
-PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
-PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
-PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
-
-# to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
-OBJA =
-PIC_OBJA =
-
-OBJS = $(OBJC) $(OBJA)
-
-PIC_OBJS = $(PIC_OBJC) $(PIC_OBJA)
-
-all: static shared
-
-static: example$(EXE) minigzip$(EXE)
-
-shared: examplesh$(EXE) minigzipsh$(EXE)
-
-all64: example64$(EXE) minigzip64$(EXE)
-
-check: test
-
-test: all teststatic testshared
-
-teststatic: static
-	@if echo hello world | ./minigzip | ./minigzip -d && ./example; then \
-	 echo '		*** zlib test OK ***'; \
-	else \
-	 echo '		*** zlib test FAILED ***'; false; \
-	fi
-	-@rm -f foo.gz
-
-testshared: shared
-	@LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
-	LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \
-	DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
-	SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
-	if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh; then \
-	 echo '		*** zlib shared test OK ***'; \
-	else \
-	 echo '		*** zlib shared test FAILED ***'; false; \
-	fi
-	-@rm -f foo.gz
-
-test64: all64
-	@if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64; then \
-	 echo '		*** zlib 64-bit test OK ***'; \
-	else \
-	 echo '		*** zlib 64-bit test FAILED ***'; false; \
-	fi
-	-@rm -f foo.gz
-
-infcover.o: test/infcover.c zlib.h zconf.h
-	$(CC) $(CFLAGS) -I. -c -o $@ test/infcover.c
-
-infcover: infcover.o libz.a
-	$(CC) $(CFLAGS) -o $@ infcover.o libz.a
-
-cover: infcover
-	rm -f *.gcda
-	./infcover
-	gcov inf*.c
-
-libz.a: $(OBJS)
-	$(AR) $(ARFLAGS) $@ $(OBJS)
-	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
-
-match.o: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c _match.s
-	mv _match.o match.o
-	rm -f _match.s
-
-match.lo: match.S
-	$(CPP) match.S > _match.s
-	$(CC) -c -fPIC _match.s
-	mv _match.o match.lo
-	rm -f _match.s
-
-example.o: test/example.c zlib.h zconf.h
-	$(CC) $(CFLAGS) -I. -c -o $@ test/example.c
-
-minigzip.o: test/minigzip.c zlib.h zconf.h
-	$(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c
-
-example64.o: test/example.c zlib.h zconf.h
-	$(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/example.c
-
-minigzip64.o: test/minigzip.c zlib.h zconf.h
-	$(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/minigzip.c
-
-.SUFFIXES: .lo
-
-.c.lo:
-	-@mkdir objs 2>/dev/null || test -d objs
-	$(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $<
-	-@mv objs/$*.o $@
-
-placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
-	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
-	rm -f $(SHAREDLIB) $(SHAREDLIBM)
-	ln -s $@ $(SHAREDLIB)
-	ln -s $@ $(SHAREDLIBM)
-	-@rmdir objs
-
-example$(EXE): example.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
-
-minigzip$(EXE): minigzip.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
-
-examplesh$(EXE): example.o $(SHAREDLIBV)
-	$(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
-
-minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
-	$(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
-
-example64$(EXE): example64.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
-
-minigzip64$(EXE): minigzip64.o $(STATICLIB)
-	$(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
-
-install-libs: $(LIBS)
-	-@if ! -d $(DESTDIR)$(exec_prefix) ; then mkdir -p $(DESTDIR)$(exec_prefix); fi
-	-@if ! -d $(DESTDIR)$(libdir) ; then mkdir -p $(DESTDIR)$(libdir); fi
-	-@if ! -d $(DESTDIR)$(sharedlibdir) ; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
-	-@if ! -d $(DESTDIR)$(man3dir) ; then mkdir -p $(DESTDIR)$(man3dir); fi
-	-@if ! -d $(DESTDIR)$(pkgconfigdir) ; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
-	cp $(STATICLIB) $(DESTDIR)$(libdir)
-	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
-	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
-	-@if test -n "$(SHAREDLIBV)"; then \
-	 cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
-	 echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
-	 chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
-	 echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
-	 rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
-	 ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
-	 ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
-	 ($(LDCONFIG) || true) >/dev/null 2>&1; \
-	fi
-	cp zlib.3 $(DESTDIR)$(man3dir)
-	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
-	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
-	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
-# The ranlib in install is needed on NeXTSTEP which checks file times
-# ldconfig is for Linux
-
-install: install-libs
-	-@if ! -d $(DESTDIR)$(includedir) ; then mkdir -p $(DESTDIR)$(includedir); fi
-	cp zlib.h zconf.h $(DESTDIR)$(includedir)
-	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
-
-uninstall:
-	cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h
-	cd $(DESTDIR)$(libdir); rm -f libz.a; \
-	if test -n "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
-	 rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
-	fi
-	cd $(DESTDIR)$(man3dir); rm -f zlib.3
-	cd $(DESTDIR)$(pkgconfigdir); rm -f zlib.pc
-
-docs: zlib.3.pdf
-
-zlib.3.pdf: zlib.3
-	groff -mandoc -f H -T ps zlib.3 | ps2pdf - zlib.3.pdf
-
-zconf.h.cmakein: zconf.h.in
-	-@echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" > $(tempfile)
-	-@sed -f $(tempfile) zconf.h.in > zconf.h.cmakein
-	-@touch -r zconf.h.in zconf.h.cmakein
-	-@rm $(tempfile)
-
-zconf: zconf.h.in
-	cp -p zconf.h.in zconf.h
-
-mostlyclean: clean
-clean:
-	rm -f *.o *.lo *~ \
-	 example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
-	 example64$(EXE) minigzip64$(EXE) \
-	 infcover \
-	 libz.* foo.gz so_locations \
-	 _match.s maketree contrib/infback9/*.o
-	rm -rf objs
-	rm -f *.gcda *.gcno *.gcov
-	rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov
-
-maintainer-clean: distclean
-distclean: clean zconf zconf.h.cmakein docs
-	rm -f Makefile zlib.pc configure.log
-	-@rm -f .DS_Store
-	-@printf 'all:\n\t-@echo "Please use ./configure first. Thank you."\n' > Makefile
-	-@printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile
-	-@touch -r Makefile.in Makefile
-
-tags:
-	etags *.ch
-
-depend:
-	makedepend -- $(CFLAGS) -- *.ch
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-adler32.o zutil.o: zutil.h zlib.h zconf.h
-gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h
-compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h
-crc32.o: zutil.h zlib.h zconf.h crc32.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
-infback.o inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
-
-adler32.lo zutil.lo: zutil.h zlib.h zconf.h
-gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h
-compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h
-crc32.lo: zutil.h zlib.h zconf.h crc32.h
-deflate.lo: deflate.h zutil.h zlib.h zconf.h
-infback.lo inflate.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
-inffast.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inftrees.lo: zutil.h zlib.h zconf.h inftrees.h
-trees.lo: deflate.h zutil.h zlib.h zconf.h trees.h

smplayer-0.8.0.tar.bz2/zlib-1.2.6/README Deleted

@@ -1,115 +0,0 @@
-ZLIB DATA COMPRESSION LIBRARY
-
-zlib 1.2.6 is a general purpose data compression library. All the code is
-thread safe. The data format used by the zlib library is described by RFCs
-(Request for Comments) 1950 to 1952 in the files
-http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
-rfc1952 (gzip format).
-
-All functions of the compression library are documented in the file zlib.h
-(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example
-of the library is given in the file test/example.c which also tests that
-the library is working correctly. Another example is given in the file
-test/minigzip.c. The compression library itself is composed of all source
-files in the root directory.
-
-To compile all files and run the test program, follow the instructions given at
-the top of Makefile.in. In short "./configure; make test", and if that goes
-well, "make install" should work for most flavors of Unix. For Windows, use
-one of the special makefiles in win32/ or contrib/vstudio/ . For VMS, use
-make_vms.com.
-
-Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
-<info@winimage.com> for the Windows DLL version. The zlib home page is
-http://zlib.net/ . Before reporting a problem, please check this site to
-verify that you have the latest version of zlib; otherwise get the latest
-version and check whether the problem still exists or not.
-
-PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
-
-Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
-issue of Dr. Dobb's Journal; a copy of the article is available at
-http://marknelson.us/1997/01/01/zlib-engine/ .
-
-The changes made in version 1.2.6 are documented in the file ChangeLog.
-
-Unsupported third party contributions are provided in directory contrib/ .
-
-zlib is available in Java using the java.util.zip package, documented at
-http://java.sun.com/developer/technicalArticles/Programming/compression/ .
-
-A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available
-at CPAN (Comprehensive Perl Archive Network) sites, including
-http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
-
-A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
-available in Python 1.5 and later versions, see
-http://docs.python.org/library/zlib.html .
-
-zlib is built into tcl: http://wiki.tcl.tk/4610 .
-
-An experimental package to read and write files in .zip format, written on top
-of zlib by Gilles Vollant <info@winimage.com>, is available in the
-contrib/minizip directory of zlib.
-
-
-Notes for some targets:
-
-- For Windows DLL versions, please see win32/DLL_FAQ.txt
-
-- For 64-bit Irix, deflate.c must be compiled without any optimization. With
- -O, one libpng test fails. The test works in 32 bit mode (with the -n32
- compiler flag). The compiler bug has been reported to SGI.
-
-- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
- when compiled with cc.
-
-- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
- necessary to get gzprintf working correctly. This is done by configure.
-
-- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
- other compilers. Use "make test" to check your compiler.
-
-- gzdopen is not supported on RISCOS or BEOS.
-
-- For PalmOs, see http://palmzlib.sourceforge.net/
-
-
-Acknowledgments:
-
- The deflate format used by zlib was defined by Phil Katz. The deflate and
- zlib specifications were written by L. Peter Deutsch. Thanks to all the
- people who reported problems and suggested various improvements in zlib; they
- are too numerous to cite here.
-
-Copyright notice:
-
- (C) 1995-2012 Jean-loup Gailly and Mark Adler
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Jean-loup Gailly Mark Adler
- jloup@gzip.org madler@alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not* receiving
-lengthy legal documents to sign. The sources are provided for free but without
-warranty of any kind. The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include in
-the file ChangeLog history information documenting your changes. Please read
-the FAQ for more information on the distribution of modified source versions.

smplayer-0.8.0.tar.bz2/zlib-1.2.6/amiga Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/as400 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/as400/bndsrc Deleted

@@ -1,206 +0,0 @@
-STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.1.3 entry points.                                    */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-/********************************************************************/
-/*   *MODULE      ADLER32      ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("adler32")
-
-/********************************************************************/
-/*   *MODULE      COMPRESS     ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("compress")
-  EXPORT SYMBOL("compress2")
-
-/********************************************************************/
-/*   *MODULE      CRC32        ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("crc32")
-  EXPORT SYMBOL("get_crc_table")
-
-/********************************************************************/
-/*   *MODULE      DEFLATE      ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("deflate")
-  EXPORT SYMBOL("deflateEnd")
-  EXPORT SYMBOL("deflateSetDictionary")
-  EXPORT SYMBOL("deflateCopy")
-  EXPORT SYMBOL("deflateReset")
-  EXPORT SYMBOL("deflateParams")
-  EXPORT SYMBOL("deflatePrime")
-  EXPORT SYMBOL("deflateInit_")
-  EXPORT SYMBOL("deflateInit2_")
-
-/********************************************************************/
-/*   *MODULE      GZIO         ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("gzopen")
-  EXPORT SYMBOL("gzdopen")
-  EXPORT SYMBOL("gzsetparams")
-  EXPORT SYMBOL("gzread")
-  EXPORT SYMBOL("gzwrite")
-  EXPORT SYMBOL("gzprintf")
-  EXPORT SYMBOL("gzputs")
-  EXPORT SYMBOL("gzgets")
-  EXPORT SYMBOL("gzputc")
-  EXPORT SYMBOL("gzgetc")
-  EXPORT SYMBOL("gzflush")
-  EXPORT SYMBOL("gzseek")
-  EXPORT SYMBOL("gzrewind")
-  EXPORT SYMBOL("gztell")
-  EXPORT SYMBOL("gzeof")
-  EXPORT SYMBOL("gzclose")
-  EXPORT SYMBOL("gzerror")
-
-/********************************************************************/
-/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("inflate")
-  EXPORT SYMBOL("inflateEnd")
-  EXPORT SYMBOL("inflateSetDictionary")
-  EXPORT SYMBOL("inflateSync")
-  EXPORT SYMBOL("inflateReset")
-  EXPORT SYMBOL("inflateInit_")
-  EXPORT SYMBOL("inflateInit2_")
-  EXPORT SYMBOL("inflateSyncPoint")
-
-/********************************************************************/
-/*   *MODULE      UNCOMPR      ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("uncompress")
-
-/********************************************************************/
-/*   *MODULE      ZUTIL        ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("zlibVersion")
-  EXPORT SYMBOL("zError")
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.2.1 additional entry points.                         */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-/********************************************************************/
-/*   *MODULE      COMPRESS     ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("compressBound")
-
-/********************************************************************/
-/*   *MODULE      DEFLATE      ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("deflateBound")
-
-/********************************************************************/
-/*   *MODULE      GZIO         ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("gzungetc")
-  EXPORT SYMBOL("gzclearerr")
-
-/********************************************************************/
-/*   *MODULE      INFBACK      ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("inflateBack")
-  EXPORT SYMBOL("inflateBackEnd")
-  EXPORT SYMBOL("inflateBackInit_")
-
-/********************************************************************/
-/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("inflateCopy")
-
-/********************************************************************/
-/*   *MODULE      ZUTIL        ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("zlibCompileFlags")
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.2.5 additional entry points.                         */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-/********************************************************************/
-/*   *MODULE      ADLER32      ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("adler32_combine")
-  EXPORT SYMBOL("adler32_combine64")
-
-/********************************************************************/
-/*   *MODULE      CRC32        ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("crc32_combine")
-  EXPORT SYMBOL("crc32_combine64")
-
-/********************************************************************/
-/*   *MODULE      GZLIB        ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("gzbuffer")
-  EXPORT SYMBOL("gzoffset")
-  EXPORT SYMBOL("gzoffset64")
-  EXPORT SYMBOL("gzopen64")
-  EXPORT SYMBOL("gzseek64")
-  EXPORT SYMBOL("gztell64")
-
-/********************************************************************/
-/*   *MODULE      GZREAD       ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("gzclose_r")
-
-/********************************************************************/
-/*   *MODULE      GZWRITE      ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("gzclose_w")
-
-/********************************************************************/
-/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("inflateMark")
-  EXPORT SYMBOL("inflatePrime")
-  EXPORT SYMBOL("inflateReset2")
-  EXPORT SYMBOL("inflateUndermine")
-
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-/*   Version 1.2.6 additional entry points.                         */
-/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
-
-/********************************************************************/
-/*   *MODULE      DEFLATE      ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("deflateResetKeep")
-  EXPORT SYMBOL("deflatePending")
-
-/********************************************************************/
-/*   *MODULE      GZWRITE      ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("gzgetc_")
-  EXPORT SYMBOL("gzflags")
-
-/********************************************************************/
-/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
-/********************************************************************/
-
-  EXPORT SYMBOL("inflateResetKeep")
-
-ENDPGMEXP

smplayer-0.8.0.tar.bz2/zlib-1.2.6/as400/compile.clp Deleted

@@ -1,110 +0,0 @@
-/******************************************************************************/
-/*                                                                            */
-/*  ZLIB                                                                      */
-/*                                                                            */
-/*    Compile sources into modules and link them into a service program.      */
-/*                                                                            */
-/******************************************************************************/
-
-             PGM
-
-/*      Configuration adjustable parameters.                                  */
-
-             DCL        VAR(&SRCLIB) TYPE(*CHAR) LEN(10) +
-                          VALUE('ZLIB')                         /* Source library. */
-             DCL        VAR(&SRCFILE) TYPE(*CHAR) LEN(10) +
-                          VALUE('SOURCES')                      /* Source member file. */
-             DCL        VAR(&CTLFILE) TYPE(*CHAR) LEN(10) +
-                          VALUE('TOOLS')                        /* Control member file. */
-
-             DCL        VAR(&MODLIB) TYPE(*CHAR) LEN(10) +
-                          VALUE('ZLIB')                         /* Module library. */
-
-             DCL        VAR(&SRVLIB) TYPE(*CHAR) LEN(10) +
-                          VALUE('LGPL')                         /* Service program library. */
-
-             DCL        VAR(&CFLAGS) TYPE(*CHAR) +
-                          VALUE('OPTIMIZE(40)')                 /* Compile options. */
-
-             DCL        VAR(&TGTRLS) TYPE(*CHAR) +
-                          VALUE('V5R3M0')                       /* Target release. */
-
-
-/*      Working storage.                                                      */
-
-             DCL        VAR(&CMDLEN) TYPE(*DEC) LEN(15 5) VALUE(300)    /* Command length. */
-             DCL        VAR(&CMD) TYPE(*CHAR) LEN(512)
-             DCL        VAR(&FIXDCMD) TYPE(*CHAR) LEN(512)
-
-
-/*      Compile sources into modules.                                         */
-
-             CHGVAR     VAR(&FIXDCMD) VALUE('CRTCMOD' *BCAT &CFLAGS *BCAT      +
-                        'SYSIFCOPT(*IFS64IO)' *BCAT                            +
-                        'DEFINE(''_LARGEFILE64_SOURCE''' *BCAT                 +
-                        '''_LFS64_LARGEFILE=1'') TGTRLS(' *TCAT &TGTRLS *TCAT  +
-                        ') SRCFILE(' *TCAT &SRCLIB *TCAT '/' *TCAT             +
-                        &SRCFILE *TCAT ') MODULE(' *TCAT &MODLIB *TCAT '/')
-
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'ADLER32)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'COMPRESS)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'CRC32)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'DEFLATE)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'GZCLOSE)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'GZLIB)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'GZREAD)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'GZWRITE)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'INFBACK)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'INFFAST)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'INFLATE)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'INFTREES)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'TREES)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'UNCOMPR)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'ZUTIL)')
-             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
-
-
-/*      Link modules into a service program.                                  */
-
-             CRTSRVPGM  SRVPGM(&SRVLIB/ZLIB) +
-                          MODULE(&MODLIB/ADLER32     &MODLIB/COMPRESS    +
-                                 &MODLIB/CRC32       &MODLIB/DEFLATE     +
-                                 &MODLIB/GZCLOSE     &MODLIB/GZLIB       +
-                                 &MODLIB/GZREAD      &MODLIB/GZWRITE     +
-                                 &MODLIB/INFBACK     &MODLIB/INFFAST     +
-                                 &MODLIB/INFLATE     &MODLIB/INFTREES    +
-                                 &MODLIB/TREES       &MODLIB/UNCOMPR     +
-                                 &MODLIB/ZUTIL)                          +
-                          SRCFILE(&SRCLIB/&CTLFILE) SRCMBR(BNDSRC)       +
-                          TEXT('ZLIB 1.2.6') TGTRLS(&TGTRLS)
-
-             ENDPGM

smplayer-0.8.0.tar.bz2/zlib-1.2.6/as400/readme.txt Deleted

@@ -1,115 +0,0 @@
-        ZLIB version 1.2.6 for AS400 installation instructions
-
-I) From an AS400 *SAVF file:
-
-1)      Unpacking archive to an AS400 save file
-
-On the AS400:
-
-_       Create the ZLIB AS400 library:
-
-        CRTLIB LIB(ZLIB) TYPE(*PROD) TEXT('ZLIB compression API library')
-
-_       Create a work save file, for example:
-
-                CRTSAVF FILE(ZLIB/ZLIBSAVF)
-
-On a PC connected to the target AS400:
-
-_       Unpack the save file image to a PC file "ZLIBSAVF"
-_       Upload this file into the save file on the AS400, for example
-                using ftp in BINARY mode.
-
-
-2)      Populating the ZLIB AS400 source library
-
-On the AS400:
-
-_       Extract the saved objects into the ZLIB AS400 library using:
-
-RSTOBJ OBJ(*ALL) SAVLIB(ZLIB) DEV(*SAVF) SAVF(ZLIB/ZLIBSAVF) RSTLIB(ZLIB)
-
-
-3)      Customize installation:
-
-_       Edit CL member ZLIB/TOOLS(COMPILE) and change parameters if needed,
-                according to the comments.
-
-_       Compile this member with:
-
-        CRTCLPGM PGM(ZLIB/COMPILE) SRCFILE(ZLIB/TOOLS) SRCMBR(COMPILE)
-
-
-4)      Compile and generate the service program:
-
-_       This can now be done by executing:
-
-        CALL PGM(ZLIB/COMPILE)
-
-
-
-II) From the original source distribution:
-
-1)      On the AS400, create the source library:
-
-        CRTLIB LIB(ZLIB) TYPE(*PROD) TEXT('ZLIB compression API library')
-
-2)      Create the source files:
-
-        CRTSRCPF FILE(ZLIB/SOURCES) RCDLEN(112) TEXT('ZLIB library modules')
-        CRTSRCPF FILE(ZLIB/H)       RCDLEN(112) TEXT('ZLIB library includes')
-        CRTSRCPF FILE(ZLIB/TOOLS)   RCDLEN(112) TEXT('ZLIB library control utilities')
-
-3)      From the machine hosting the distribution files, upload them (with
-                FTP in text mode, for example) according to the following table:
-
-    Original    AS400   AS400    AS400 AS400
-    file        file    member   type  description
-                SOURCES                Original ZLIB C subprogram sources
-    adler32.c           ADLER32  C     ZLIB - Compute the Adler-32 checksum of a dta strm
-    compress.c          COMPRESS C     ZLIB - Compress a memory buffer
-    crc32.c             CRC32    C     ZLIB - Compute the CRC-32 of a data stream
-    deflate.c           DEFLATE  C     ZLIB - Compress data using the deflation algorithm
-    gzclose.c           GZCLOSE  C     ZLIB - Close .gz files
-    gzlib.c             GZLIB    C     ZLIB - Miscellaneous .gz files IO support
-    gzread.c            GZREAD   C     ZLIB - Read .gz files
-    gzwrite.c           GZWRITE  C     ZLIB - Write .gz files
-    infback.c           INFBACK  C     ZLIB - Inflate using a callback interface
-    inffast.c           INFFAST  C     ZLIB - Fast proc. literals & length/distance pairs
-    inflate.c           INFLATE  C     ZLIB - Interface to inflate modules
-    inftrees.c          INFTREES C     ZLIB - Generate Huffman trees for efficient decode
-    trees.c             TREES    C     ZLIB - Output deflated data using Huffman coding
-    uncompr.c           UNCOMPR  C     ZLIB - Decompress a memory buffer
-    zutil.c             ZUTIL    C     ZLIB - Target dependent utility functions
-                H                      Original ZLIB C and ILE/RPG include files
-    crc32.h             CRC32    C     ZLIB - CRC32 tables
-    deflate.h           DEFLATE  C     ZLIB - Internal compression state
-    gzguts.h            GZGUTS   C     ZLIB - Definitions for the gzclose module
-    inffast.h           INFFAST  C     ZLIB - Header to use inffast.c
-    inffixed.h          INFFIXED C     ZLIB - Table for decoding fixed codes
-    inflate.h           INFLATE  C     ZLIB - Internal inflate state definitions
-    inftrees.h          INFTREES C     ZLIB - Header to use inftrees.c
-    trees.h             TREES    C     ZLIB - Created automatically with -DGEN_TREES_H
-    zconf.h             ZCONF    C     ZLIB - Compression library configuration
-    zlib.h              ZLIB     C     ZLIB - Compression library C user interface
-    as400/zlib.inc      ZLIB.INC RPGLE ZLIB - Compression library ILE RPG user interface
-    zutil.h             ZUTIL    C     ZLIB - Internal interface and configuration
-                TOOLS                  Building source software & AS/400 README
-    as400/bndsrc        BNDSRC         Entry point exportation list
-    as400/compile.clp   COMPILE  CLP   Compile sources & generate service program
-    as400/readme.txt    README   TXT   Installation instructions
-
-4)      Continue as in I)3).
-
-
-
-
-Notes:  For AS400 ILE RPG programmers, a /copy member defining the ZLIB
-                API prototypes for ILE RPG can be found in ZLIB/H(ZLIB.INC).
-                Please read comments in this member for more information.
-
-        Remember that most foreign textual data are ASCII coded: this
-                implementation does not handle conversion from/to ASCII, so
-                text data code conversions must be done explicitely.
-
-        Mainly for the reason above, always open zipped files in binary mode.

smplayer-0.8.0.tar.bz2/zlib-1.2.6/as400/zlib.inc Deleted

@@ -1,447 +0,0 @@
-      *  ZLIB.INC - Interface to the general purpose compression library
-      *
-      *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
-      *  Version 1.2.6
-      *
-      *
-      *  WARNING:
-      *     Procedures inflateInit(), inflateInit2(), deflateInit(),
-      *         deflateInit2() and inflateBackInit() need to be called with
-      *         two additional arguments:
-      *         the package version string and the stream control structure.
-      *         size. This is needed because RPG lacks some macro feature.
-      *         Call these procedures as:
-      *             inflateInit(...: ZLIB_VERSION: %size(z_stream))
-      *
-      /if not defined(ZLIB_H_)
-      /define ZLIB_H_
-      *
-      **************************************************************************
-      *                               Constants
-      **************************************************************************
-      *
-      *  Versioning information.
-      *
-     D ZLIB_VERSION    C                   '1.2.6'
-     D ZLIB_VERNUM     C                   X'1260'
-     D ZLIB_VER_MAJOR  C                   1
-     D ZLIB_VER_MINOR  C                   2
-     D ZLIB_VER_REVISION...
-     D                 C                   6
-     D ZLIB_VER_SUBREVISION...
-     D                 C                   0
-      *
-      *  Other equates.
-      *
-     D Z_NO_FLUSH      C                   0
-     D Z_PARTIAL_FLUSH...
-     D                 C                   1
-     D Z_SYNC_FLUSH    C                   2
-     D Z_FULL_FLUSH    C                   3
-     D Z_FINISH        C                   4
-     D Z_BLOCK         C                   5
-     D Z_TREES         C                   6
-      *
-     D Z_OK            C                   0
-     D Z_STREAM_END    C                   1
-     D Z_NEED_DICT     C                   2
-     D Z_ERRNO         C                   -1
-     D Z_STREAM_ERROR  C                   -2
-     D Z_DATA_ERROR    C                   -3
-     D Z_MEM_ERROR     C                   -4
-     D Z_BUF_ERROR     C                   -5
-     DZ_VERSION_ERROR  C                   -6
-      *
-     D Z_NO_COMPRESSION...
-     D                 C                   0
-     D Z_BEST_SPEED    C                   1
-     D Z_BEST_COMPRESSION...
-     D                 C                   9
-     D Z_DEFAULT_COMPRESSION...
-     D                 C                   -1
-      *
-     D Z_FILTERED      C                   1
-     D Z_HUFFMAN_ONLY  C                   2
-     D Z_RLE           C                   3
-     D Z_DEFAULT_STRATEGY...
-     D                 C                   0
-      *
-     D Z_BINARY        C                   0
-     D Z_ASCII         C                   1
-     D Z_UNKNOWN       C                   2
-      *
-     D Z_DEFLATED      C                   8
-      *
-     D Z_NULL          C                   0
-      *
-      **************************************************************************
-      *                                 Types
-      **************************************************************************
-      *
-     D z_streamp       S               *                                        Stream struct ptr
-     D gzFile          S               *                                        File pointer
-     D z_off_t         S             10i 0                                      Stream offsets
-     D z_off64_t       S             20i 0                                      Stream offsets
-      *
-      **************************************************************************
-      *                               Structures
-      **************************************************************************
-      *
-      *  The GZIP encode/decode stream support structure.
-      *
-     D z_stream        DS                  align based(z_streamp)
-     D  zs_next_in                     *                                        Next input byte
-     D  zs_avail_in                  10U 0                                      Byte cnt at next_in
-     D  zs_total_in                  10U 0                                      Total bytes read
-     D  zs_next_out                    *                                        Output buffer ptr
-     D  zs_avail_out                 10U 0                                      Room left @ next_out
-     D  zs_total_out                 10U 0                                      Total bytes written
-     D  zs_msg                         *                                        Last errmsg or null
-     D  zs_state                       *                                        Internal state
-     D  zs_zalloc                      *   procptr                              Int. state allocator
-     D  zs_free                        *   procptr                              Int. state dealloc.
-     D  zs_opaque                      *                                        Private alloc. data
-     D  zs_data_type                 10i 0                                      ASC/BIN best guess
-     D  zs_adler                     10u 0                                      Uncompr. adler32 val
-     D                               10U 0                                      Reserved
-     D                               10U 0                                      Ptr. alignment
-      *
-      **************************************************************************
-      *                     Utility function prototypes
-      **************************************************************************
-      *
-     D compress        PR            10I 0 extproc('compress')
-     D  dest                      65535    options(*varsize)                    Destination buffer
-     D  destLen                      10U 0                                      Destination length
-     D  source                    65535    const options(*varsize)              Source buffer
-     D  sourceLen                    10u 0 value                                Source length
-      *
-     D compress2       PR            10I 0 extproc('compress2')
-     D  dest                      65535    options(*varsize)                    Destination buffer
-     D  destLen                      10U 0                                      Destination length
-     D  source                    65535    const options(*varsize)              Source buffer
-     D  sourceLen                    10U 0 value                                Source length
-     D  level                        10I 0 value                                Compression level
-      *
-     D compressBound   PR            10U 0 extproc('compressBound')
-     D  sourceLen                    10U 0 value
-      *
-     D uncompress      PR            10I 0 extproc('uncompress')
-     D  dest                      65535    options(*varsize)                    Destination buffer
-     D  destLen                      10U 0                                      Destination length
-     D  source                    65535    const options(*varsize)              Source buffer
-     D  sourceLen                    10U 0 value                                Source length
-      *
-      /if not defined(LARGE_FILES)
-     D gzopen          PR                  extproc('gzopen')
-     D                                     like(gzFile)
-     D  path                           *   value options(*string)               File pathname
-     D  mode                           *   value options(*string)               Open mode
-      /else
-     D gzopen          PR                  extproc('gzopen64')
-     D                                     like(gzFile)
-     D  path                           *   value options(*string)               File pathname
-     D  mode                           *   value options(*string)               Open mode
-      *
-     D gzopen64        PR                  extproc('gzopen64')
-     D                                     like(gzFile)
-     D  path                           *   value options(*string)               File pathname
-     D  mode                           *   value options(*string)               Open mode
-      /endif
-      *
-     D gzdopen         PR                  extproc('gzdopen')
-     D                                     like(gzFile)
-     D  fd                           10I 0 value                                File descriptor
-     D  mode                           *   value options(*string)               Open mode
-      *
-     D gzbuffer        PR            10I 0 extproc('gzbuffer')
-     D  file                               value like(gzFile)                   File pointer
-     D  size                         10U 0 value
-      *
-     D gzsetparams     PR            10I 0 extproc('gzsetparams')
-     D  file                               value like(gzFile)                   File pointer
-     D  level                        10I 0 value
-     D  strategy                     10I 0 value
-      *
-     D gzread          PR            10I 0 extproc('gzread')
-     D  file                               value like(gzFile)                   File pointer
-     D  buf                       65535    options(*varsize)                    Buffer
-     D  len                          10u 0 value                                Buffer length
-      *
-     D gzwrite         PR            10I 0 extproc('gzwrite')
-     D  file                               value like(gzFile)                   File pointer
-     D  buf                       65535    const options(*varsize)              Buffer
-     D  len                          10u 0 value                                Buffer length
-      *
-     D gzputs          PR            10I 0 extproc('gzputs')
-     D  file                               value like(gzFile)                   File pointer
-     D  s                              *   value options(*string)               String to output
-      *
-     D gzgets          PR              *   extproc('gzgets')
-     D  file                               value like(gzFile)                   File pointer
-     D  buf                       65535    options(*varsize)                    Read buffer
-     D  len                          10i 0 value                                Buffer length
-      *
-     D gzputc          PR            10i 0 extproc('gzputc')
-     D  file                               value like(gzFile)                   File pointer
-     D  c                            10I 0 value                                Character to write
-      *
-     D gzgetc          PR            10i 0 extproc('gzgetc')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzgetc_         PR            10i 0 extproc('gzgetc_')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzungetc        PR            10i 0 extproc('gzungetc')
-     D  c                            10I 0 value                                Character to push
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzflush         PR            10i 0 extproc('gzflush')
-     D  file                               value like(gzFile)                   File pointer
-     D  flush                        10I 0 value                                Type of flush
-      *
-      /if not defined(LARGE_FILES)
-     D gzseek          PR                  extproc('gzseek')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-     D  offset                             value like(z_off_t)                  Offset
-     D  whence                       10i 0 value                                Origin
-      /else
-     D gzseek          PR                  extproc('gzseek64')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-     D  offset                             value like(z_off_t)                  Offset
-     D  whence                       10i 0 value                                Origin
-      *
-     D gzseek64        PR                  extproc('gzseek64')
-     D                                     like(z_off64_t)
-     D  file                               value like(gzFile)                   File pointer
-     D  offset                             value like(z_off64_t)                Offset
-     D  whence                       10i 0 value                                Origin
-      /endif
-      *
-     D gzrewind        PR            10i 0 extproc('gzrewind')
-     D  file                               value like(gzFile)                   File pointer
-      *
-      /if not defined(LARGE_FILES)
-     D gztell          PR                  extproc('gztell')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-      /else
-     D gztell          PR                  extproc('gztell64')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gztell64        PR                  extproc('gztell64')
-     D                                     like(z_off64_t)
-     D  file                               value like(gzFile)                   File pointer
-      /endif
-      *
-      /if not defined(LARGE_FILES)
-     D gzoffset        PR                  extproc('gzoffset')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-      /else
-     D gzoffset        PR                  extproc('gzoffset64')
-     D                                     like(z_off_t)
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzoffset64      PR                  extproc('gzoffset64')
-     D                                     like(z_off64_t)
-     D  file                               value like(gzFile)                   File pointer
-      /endif
-      *
-     D gzeof           PR            10i 0 extproc('gzeof')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzclose_r       PR            10i 0 extproc('gzclose_r')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzclose_w       PR            10i 0 extproc('gzclose_w')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzclose         PR            10i 0 extproc('gzclose')
-     D  file                               value like(gzFile)                   File pointer
-      *
-     D gzerror         PR              *   extproc('gzerror')                   Error string
-     D  file                               value like(gzFile)                   File pointer
-     D  errnum                       10I 0                                      Error code
-      *
-     D gzclearerr      PR                  extproc('gzclearerr')
-     D  file                               value like(gzFile)                   File pointer
-      *
-      **************************************************************************
-      *                        Basic function prototypes
-      **************************************************************************
-      *
-     D zlibVersion     PR              *   extproc('zlibVersion')               Version string
-      *
-     D deflateInit     PR            10I 0 extproc('deflateInit_')              Init. compression
-     D  strm                               like(z_stream)                       Compression stream
-     D  level                        10I 0 value                                Compression level
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D deflate         PR            10I 0 extproc('deflate')                   Compress data
-     D  strm                               like(z_stream)                       Compression stream
-     D  flush                        10I 0 value                                Flush type required
-      *
-     D deflateEnd      PR            10I 0 extproc('deflateEnd')                Termin. compression
-     D  strm                               like(z_stream)                       Compression stream
-      *
-     D inflateInit     PR            10I 0 extproc('inflateInit_')              Init. expansion
-     D  strm                               like(z_stream)                       Expansion stream
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D inflate         PR            10I 0 extproc('inflate')                   Expand data
-     D  strm                               like(z_stream)                       Expansion stream
-     D  flush                        10I 0 value                                Flush type required
-      *
-     D inflateEnd      PR            10I 0 extproc('inflateEnd')                Termin. expansion
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-      **************************************************************************
-      *                        Advanced function prototypes
-      **************************************************************************
-      *
-     D deflateInit2    PR            10I 0 extproc('deflateInit2_')             Init. compression
-     D  strm                               like(z_stream)                       Compression stream
-     D  level                        10I 0 value                                Compression level
-     D  method                       10I 0 value                                Compression method
-     D  windowBits                   10I 0 value                                log2(window size)
-     D  memLevel                     10I 0 value                                Mem/cmpress tradeoff
-     D  strategy                     10I 0 value                                Compression stategy
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D deflateSetDictionary...
-     D                 PR            10I 0 extproc('deflateSetDictionary')      Init. dictionary
-     D  strm                               like(z_stream)                       Compression stream
-     D  dictionary                65535    const options(*varsize)              Dictionary bytes
-     D  dictLength                   10U 0 value                                Dictionary length
-      *
-     D deflateCopy     PR            10I 0 extproc('deflateCopy')               Compress strm 2 strm
-     D  dest                               like(z_stream)                       Destination stream
-     D  source                             like(z_stream)                       Source stream
-      *
-     D deflateReset    PR            10I 0 extproc('deflateReset')              End and init. stream
-     D  strm                               like(z_stream)                       Compression stream
-      *
-     D deflateParams   PR            10I 0 extproc('deflateParams')             Change level & strat
-     D  strm                               like(z_stream)                       Compression stream
-     D  level                        10I 0 value                                Compression level
-     D  strategy                     10I 0 value                                Compression stategy
-      *
-     D deflateBound    PR            10U 0 extproc('deflateBound')              Change level & strat
-     D  strm                               like(z_stream)                       Compression stream
-     D  sourcelen                    10U 0 value                                Compression level
-      *
-     D deflatePending  PR            10I 0 extproc('deflatePending')            Change level & strat
-     D  strm                               like(z_stream)                       Compression stream
-     D  pending                      10U 0                                      Pending bytes
-     D  bits                         10I 0                                      Pending bits
-      *
-     D deflatePrime    PR            10I 0 extproc('deflatePrime')              Change level & strat
-     D  strm                               like(z_stream)                       Compression stream
-     D  bits                         10I 0 value                                # of bits to insert
-     D  value                        10I 0 value                                Bits to insert
-      *
-     D inflateInit2    PR            10I 0 extproc('inflateInit2_')             Init. expansion
-     D  strm                               like(z_stream)                       Expansion stream
-     D  windowBits                   10I 0 value                                log2(window size)
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D inflateSetDictionary...
-     D                 PR            10I 0 extproc('inflateSetDictionary')      Init. dictionary
-     D  strm                               like(z_stream)                       Expansion stream
-     D  dictionary                65535    const options(*varsize)              Dictionary bytes
-     D  dictLength                   10U 0 value                                Dictionary length
-      *
-     D inflateSync     PR            10I 0 extproc('inflateSync')               Sync. expansion
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D inflateCopy     PR            10I 0 extproc('inflateCopy')
-     D  dest                               like(z_stream)                       Destination stream
-     D  source                             like(z_stream)                       Source stream
-      *
-     D inflateReset    PR            10I 0 extproc('inflateReset')              End and init. stream
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D inflateReset2   PR            10I 0 extproc('inflateReset2')             End and init. stream
-     D  strm                               like(z_stream)                       Expansion stream
-     D  windowBits                   10I 0 value                                Log2(buffer size)
-      *
-     D inflatePrime    PR            10I 0 extproc('inflatePrime')              Insert bits
-     D  strm                               like(z_stream)                       Expansion stream
-     D  bits                         10I 0 value                                Bit count
-     D  value                        10I 0 value                                Bits to insert
-      *
-     D inflateMark     PR            10I 0 extproc('inflateMark')               Get inflate info
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D inflateBackInit...
-     D                 PR            10I 0 extproc('inflateBackInit_')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  windowBits                   10I 0 value                                Log2(buffer size)
-     D  window                    65535    options(*varsize)                    Buffer
-     D  version                        *   value options(*string)               Version string
-     D  stream_size                  10i 0 value                                Stream struct. size
-      *
-     D inflateBack     PR            10I 0 extproc('inflateBack')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  in                             *   value procptr                        Input function
-     D  in_desc                        *   value                                Input descriptor
-     D  out                            *   value procptr                        Output function
-     D  out_desc                       *   value                                Output descriptor
-      *
-     D inflateBackEnd  PR            10I 0 extproc('inflateBackEnd')
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D zlibCompileFlags...
-     D                 PR            10U 0 extproc('zlibCompileFlags')
-      *
-      **************************************************************************
-      *                        Checksum function prototypes
-      **************************************************************************
-      *
-     D adler32         PR            10U 0 extproc('adler32')                   New checksum
-     D  adler                        10U 0 value                                Old checksum
-     D  buf                       65535    const options(*varsize)              Bytes to accumulate
-     D  len                          10U 0 value                                Buffer length
-      *
-     D crc32           PR            10U 0 extproc('crc32')                     New checksum
-     D  crc                          10U 0 value                                Old checksum
-     D  buf                       65535    const options(*varsize)              Bytes to accumulate
-     D  len                          10U 0 value                                Buffer length
-      *
-      **************************************************************************
-      *                     Miscellaneous function prototypes
-      **************************************************************************
-      *
-     D zError          PR              *   extproc('zError')                    Error string
-     D  err                          10I 0 value                                Error code
-      *
-     D inflateSyncPoint...
-     D                 PR            10I 0 extproc('inflateSyncPoint')
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D get_crc_table   PR              *   extproc('get_crc_table')             Ptr to ulongs
-      *
-     D inflateUndermine...
-     D                 PR            10I 0 extproc('inflateUndermine')
-     D  strm                               like(z_stream)                       Expansion stream
-     D  arg                          10I 0 value                                Error code
-      *
-     D inflateResetKeep...
-     D                 PR            10I 0 extproc('inflateResetKeep')          End and init. stream
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D deflateResetKeep...
-     D                 PR            10I 0 extproc('deflateResetKeep')          End and init. stream
-     D  strm                               like(z_stream)                       Expansion stream
-      *
-     D gzflags         PR            10U 0 extproc('gzflags')
-      *
-      /endif

smplayer-0.8.0.tar.bz2/zlib-1.2.6/configure Deleted

@@ -1,720 +0,0 @@
-#!/bin/sh
-# configure script for zlib.
-#
-# Normally configure builds both a static and a shared library.
-# If you want to build just a static library, use: ./configure --static
-#
-# To impose specific compiler or flags or install directory, use for example:
-# prefix=$HOME CC=cc CFLAGS="-O4" ./configure
-# or for csh/tcsh users:
-# (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)
-
-# Incorrect settings of CC or CFLAGS may prevent creating a shared library.
-# If you have problems, try without defining CC and CFLAGS before reporting
-# an error.
-
-echo -------------------- >> configure.log
-echo $0 $* >> configure.log
-date >> configure.log
-
-if -n "${CHOST}" ; then
- uname="`echo "${CHOST}" | sed -e 's/^^-*-$^-*$$/\1/' -e 's/^^-*-^-*-$^-*$$/\1/' -e 's/^^-*-^-*-$^-*$-.*$/\1/'`"
- CROSS_PREFIX="${CHOST}-"
-fi
-
-STATICLIB=libz.a
-VER=`sed -n -e '/VERSION "/s/.*"$.*$".*/\1/p' < zlib.h`
-VER3=`sed -n -e '/VERSION "/s/.*"$0-9*\\.0-9*\\.0-9*$.*/\1/p' < zlib.h`
-VER2=`sed -n -e '/VERSION "/s/.*"$0-9*\\.0-9*$\\..*/\1/p' < zlib.h`
-VER1=`sed -n -e '/VERSION "/s/.*"$0-9*$\\..*/\1/p' < zlib.h`
-if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then
- AR=${AR-"${CROSS_PREFIX}ar"}
- test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
-else
- AR=${AR-"ar"}
- test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
-fi
-ARFLAGS=${ARFLAGS-"rc"}
-if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then
- RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"}
- test -n "${CROSS_PREFIX}" && echo Using ${RANLIB} | tee -a configure.log
-else
- RANLIB=${RANLIB-"ranlib"}
-fi
-if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then
- NM=${NM-"${CROSS_PREFIX}nm"}
- test -n "${CROSS_PREFIX}" && echo Using ${NM} | tee -a configure.log
-else
- NM=${NM-"nm"}
-fi
-LDCONFIG=${LDCONFIG-"ldconfig"}
-LDSHAREDLIBC="${LDSHAREDLIBC--lc}"
-ARCHS=
-prefix=${prefix-/usr/local}
-exec_prefix=${exec_prefix-'${prefix}'}
-libdir=${libdir-'${exec_prefix}/lib'}
-sharedlibdir=${sharedlibdir-'${libdir}'}
-includedir=${includedir-'${prefix}/include'}
-mandir=${mandir-'${prefix}/share/man'}
-shared_ext='.so'
-shared=1
-solo=0
-cover=0
-zprefix=0
-build64=0
-gcc=0
-old_cc="$CC"
-old_cflags="$CFLAGS"
-OBJC='$(OBJZ) $(OBJG)'
-PIC_OBJC='$(PIC_OBJZ) $(PIC_OBJG)'
-
-while test $# -ge 1
-do
-case "$1" in
- -h* | --help)
- echo 'usage:' | tee -a configure.log
- echo ' configure --zprefix --prefix=PREFIX --eprefix=EXPREFIX' | tee -a configure.log
- echo ' --static --64 --libdir=LIBDIR --sharedlibdir=LIBDIR' | tee -a configure.log
- echo ' --includedir=INCLUDEDIR --archs="-arch i386 -arch x86_64"' | tee -a configure.log
- exit 0 ;;
- -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;;
- -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;;
- -l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;;
- --sharedlibdir=*) sharedlibdir=`echo $1 | sed 's/.*=//'`; shift ;;
- -i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;;
- -u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;;
- -p* | --prefix) prefix="$2"; shift; shift ;;
- -e* | --eprefix) exec_prefix="$2"; shift; shift ;;
- -l* | --libdir) libdir="$2"; shift; shift ;;
- -i* | --includedir) includedir="$2"; shift; shift ;;
- -s* | --shared | --enable-shared) shared=1; shift ;;
- -t | --static) shared=0; shift ;;
- --solo) solo=1; shift ;;
- --cover) cover=1; shift ;;
- -z* | --zprefix) zprefix=1; shift ;;
- -6* | --64) build64=1; shift ;;
- -a*=* | --archs=*) ARCHS=`echo $1 | sed 's/.*=//'`; shift ;;
- --sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;;
- --localstatedir=*) echo "ignored option: --localstatedir" | tee -a configure.log; shift ;;
- *) echo "unknown option: $1"; echo "$0 --help for help" | tee -a configure.log; exit 1 ;;
- esac
-done
-
-test=ztest$$
-
-show()
-{
- case "$*" in
- *$test.c*)
- echo === $test.c === >> configure.log
- cat $test.c >> configure.log
- echo === >> configure.log;;
- esac
- echo $* >> configure.log
-}
-
-cat > $test.c <<EOF
-#error error
-EOF
-if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
- try()
- {
- show $*
- test "`( $* ) 2>&1 | tee -a configure.log`" = ""
- }
- echo - using any output from compiler to indicate an error >> configure.log
-else
- try()
- {
- show $*
- ( $* ) >> configure.log 2>&1
- ret=$?
- if test $ret -ne 0; then
- echo "(exit code "$ret")" >> configure.log
- fi
- return $ret
- }
-fi
-
-echo >> configure.log
-
-cat > $test.c <<EOF
-extern int getchar();
-int hello() {return getchar();}
-EOF
-
-test -z "$CC" && echo Checking for ${CROSS_PREFIX}gcc... | tee -a configure.log
-cc=${CC-${CROSS_PREFIX}gcc}
-cflags=${CFLAGS-"-O3"}
-# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
-case "$cc" in
- *gcc*) gcc=1 ;;
-esac
-case `$cc -v 2>&1` in
- *gcc*) gcc=1 ;;
-esac
-
-show $cc -c $cflags $test.c
-if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then
- echo ... using gcc >> configure.log
- CC="$cc"
- CFLAGS="${CFLAGS--O3} ${ARCHS}"
- SFLAGS="${CFLAGS--O3} -fPIC"
- LDFLAGS="${LDFLAGS} ${ARCHS}"
- if test $build64 -eq 1; then
- CFLAGS="${CFLAGS} -m64"
- SFLAGS="${SFLAGS} -m64"
- fi
- if test "${ZLIBGCCWARN}" = "YES"; then
- CFLAGS="${CFLAGS} -Wall -Wextra -pedantic"
- fi
- if test -z "$uname"; then
- uname=`(uname -s || echo unknown) 2>/dev/null`
- fi
- case "$uname" in
- Linux* | linux* | GNU | GNU/* | solaris*)
- LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
- *BSD | *bsd* | DragonFly)
- LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"}
- LDCONFIG="ldconfig -m" ;;
- CYGWIN* | Cygwin* | cygwin* | OS/2*)
- EXE='.exe' ;;
- MINGW* | mingw*)
-# temporary bypass
- rm -f $test.co $test $test$shared_ext
- echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
- exit 1
- LDSHARED=${LDSHARED-"$cc -shared"}
- LDSHAREDLIBC=""
- EXE='.exe' ;;
- QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
- # (alain.bonnefoy@icbt.com)
- LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"} ;;
- HP-UX*)
- LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
- case `(uname -m || echo unknown) 2>/dev/null` in
- ia64)
- shared_ext='.so'
- SHAREDLIB='libz.so' ;;
- *)
- shared_ext='.sl'
- SHAREDLIB='libz.sl' ;;
- esac ;;
- Darwin* | darwin*)
- shared_ext='.dylib'
- SHAREDLIB=libz$shared_ext
- SHAREDLIBV=libz.$VER$shared_ext
- SHAREDLIBM=libz.$VER1$shared_ext
- LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
- AR="libtool"
- ARFLAGS="-o" ;;
- *) LDSHARED=${LDSHARED-"$cc -shared"} ;;
- esac
-else
- # find system name and corresponding cc options
- CC=${CC-cc}
- gcc=0
- echo ... using $CC >> configure.log
- if test -z "$uname"; then
- uname=`(uname -sr || echo unknown) 2>/dev/null`
- fi
- case "$uname" in
- HP-UX*) SFLAGS=${CFLAGS-"-O +z"}
- CFLAGS=${CFLAGS-"-O"}
-# LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}
- LDSHARED=${LDSHARED-"ld -b"}
- case `(uname -m || echo unknown) 2>/dev/null` in
- ia64)
- shared_ext='.so'
- SHAREDLIB='libz.so' ;;
- *)
- shared_ext='.sl'
- SHAREDLIB='libz.sl' ;;
- esac ;;
- IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
- CFLAGS=${CFLAGS-"-ansi -O2"}
- LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
- OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}
- CFLAGS=${CFLAGS-"-O -std1"}
- LDFLAGS="${LDFLAGS} -Wl,-rpath,."
- LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"} ;;
- OSF1*) SFLAGS=${CFLAGS-"-O -std1"}
- CFLAGS=${CFLAGS-"-O -std1"}
- LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
- QNX*) SFLAGS=${CFLAGS-"-4 -O"}
- CFLAGS=${CFLAGS-"-4 -O"}
- LDSHARED=${LDSHARED-"cc"}
- RANLIB=${RANLIB-"true"}
- AR="cc"
- ARFLAGS="-A" ;;
- SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
- CFLAGS=${CFLAGS-"-O3"}
- LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;;
- SunOS\ 5* | solaris*)
- LDSHARED=${LDSHARED-"cc -G"}
- case `(uname -m || echo unknown) 2>/dev/null` in
- i86*)
- SFLAGS=${CFLAGS-"-xpentium -fast -KPIC -R."}
- CFLAGS=${CFLAGS-"-xpentium -fast"} ;;
- *)
- SFLAGS=${CFLAGS-"-fast -xcg92 -KPIC -R."}
- CFLAGS=${CFLAGS-"-fast -xcg92"} ;;
- esac ;;
- SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
- CFLAGS=${CFLAGS-"-O2"}
- LDSHARED=${LDSHARED-"ld"} ;;
- SunStudio\ 9*) SFLAGS=${CFLAGS-"-fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"}
- CFLAGS=${CFLAGS-"-fast -xtarget=ultra3 -xarch=v9b"}
- LDSHARED=${LDSHARED-"cc -xarch=v9b"} ;;
- UNIX_System_V\ 4.2.0)
- SFLAGS=${CFLAGS-"-KPIC -O"}
- CFLAGS=${CFLAGS-"-O"}
- LDSHARED=${LDSHARED-"cc -G"} ;;
- UNIX_SV\ 4.2MP)
- SFLAGS=${CFLAGS-"-Kconform_pic -O"}
- CFLAGS=${CFLAGS-"-O"}
- LDSHARED=${LDSHARED-"cc -G"} ;;
- OpenUNIX\ 5)
- SFLAGS=${CFLAGS-"-KPIC -O"}
- CFLAGS=${CFLAGS-"-O"}
- LDSHARED=${LDSHARED-"cc -G"} ;;
- AIX*) # Courtesy of dbakker@arrayasolutions.com
- SFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
- CFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
- LDSHARED=${LDSHARED-"xlc -G"} ;;
- # send working options for other systems to zlib@gzip.org
- *) SFLAGS=${CFLAGS-"-O"}
- CFLAGS=${CFLAGS-"-O"}
- LDSHARED=${LDSHARED-"cc -shared"} ;;
- esac
-fi
-
-SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}
-SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}
-SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}
-
-echo >> configure.log
-
-if test $shared -eq 1; then
- echo Checking for shared library support... | tee -a configure.log
- # we must test in two steps (cc then ld), required at least on SunOS 4.x
- if try $CC -w -c $SFLAGS $test.c &&
- try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
- echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log
- elif test -z "$old_cc" -a -z "$old_cflags"; then
- echo No shared library support. | tee -a configure.log
- shared=0;
- else
- echo 'No shared library support; try without defining CC and CFLAGS' | tee -a configure.log
- shared=0;
- fi
-fi
-if test $shared -eq 0; then
- LDSHARED="$CC"
- ALL="static"
- TEST="all teststatic"
- SHAREDLIB=""
- SHAREDLIBV=""
- SHAREDLIBM=""
- echo Building static library $STATICLIB version $VER with $CC. | tee -a configure.log
-else
- ALL="static shared"
- TEST="all teststatic testshared"
-fi
-
-CPP=${CPP-"$CC -E"}
-case $CFLAGS in
- *ASMV*)
- echo >> configure.log
- show "$NM $test.o | grep _hello"
- if test "`$NM $test.o | grep _hello | tee -a configure.log`" = ""; then
- CPP="$CPP -DNO_UNDERLINE"
- echo Checking for underline in external names... No. | tee -a configure.log
- else
- echo Checking for underline in external names... Yes. | tee -a configure.log
- fi ;;
-esac
-
-echo >> configure.log
-
-cat > $test.c <<EOF
-#include <sys/types.h>
-off64_t dummy = 0;
-EOF
-if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then
- CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"
- SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1"
- ALL="${ALL} all64"
- TEST="${TEST} test64"
- echo "Checking for off64_t... Yes." | tee -a configure.log
- echo "Checking for fseeko... Yes." | tee -a configure.log
-else
- echo "Checking for off64_t... No." | tee -a configure.log
- echo >> configure.log
- cat > $test.c <<EOF
-#include <stdio.h>
-int main(void) {
- fseeko(NULL, 0, 0);
- return 0;
-}
-EOF
- if try $CC $CFLAGS -o $test $test.c; then
- echo "Checking for fseeko... Yes." | tee -a configure.log
- else
- CFLAGS="${CFLAGS} -DNO_FSEEKO"
- SFLAGS="${SFLAGS} -DNO_FSEEKO"
- echo "Checking for fseeko... No." | tee -a configure.log
- fi
-fi
-
-cp -p zconf.h.in zconf.h
-
-echo >> configure.log
-
-cat > $test.c <<EOF
-#include <unistd.h>
-int main() { return 0; }
-EOF
-if try $CC -c $CFLAGS $test.c; then
- sed < zconf.h "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H$.*$ may be/ 1\1 was/" > zconf.temp.h
- mv zconf.temp.h zconf.h
- echo "Checking for unistd.h... Yes." | tee -a configure.log
-else
- echo "Checking for unistd.h... No." | tee -a configure.log
-fi
-
-echo >> configure.log
-
-cat > $test.c <<EOF
-#include <stdarg.h>
-int main() { return 0; }
-EOF
-if try $CC -c $CFLAGS $test.c; then
- sed < zconf.h "/^#ifdef HAVE_STDARG_H.* may be/s/def HAVE_STDARG_H$.*$ may be/ 1\1 was/" > zconf.temp.h
- mv zconf.temp.h zconf.h
- echo "Checking for stdarg.h... Yes." | tee -a configure.log
-else
- echo "Checking for stdarg.h... No." | tee -a configure.log
-fi
-
-if test $zprefix -eq 1; then
- sed < zconf.h "/#ifdef Z_PREFIX.* may be/s/def Z_PREFIX$.*$ may be/ 1\1 was/" > zconf.temp.h
- mv zconf.temp.h zconf.h
- echo >> configure.log
- echo "Using z_ prefix on all symbols." | tee -a configure.log
-fi
-
-if test $solo -eq 1; then
- sed '/#define ZCONF_H/a\
-#define Z_SOLO
-
-' < zconf.h > zconf.temp.h
- mv zconf.temp.h zconf.h
-OBJC='$(OBJZ)'
-PIC_OBJC='$(PIC_OBJZ)'
-fi
-
-if test $cover -eq 1; then
- CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage"
-fi
-
-echo >> configure.log
-
-cat > $test.c <<EOF
-#include <stdio.h>
-#include <stdarg.h>
-#include "zconf.h"
-int main()
-{
-#ifndef STDC
- choke me
-#endif
- return 0;
-}
-EOF
-
-if try $CC -c $CFLAGS $test.c; then
- echo "Checking whether to use vsnprintf() or snprintf()... using vsnprintf()." | tee -a configure.log
-
- echo >> configure.log
- cat > $test.c <<EOF
-#include <stdio.h>
-#include <stdarg.h>
-int mytest(const char *fmt, ...)
-{
- char buf20;
- va_list ap;
- va_start(ap, fmt);
- vsnprintf(buf, sizeof(buf), fmt, ap);
- va_end(ap);
- return 0;
-}
-int main()
-{
- return (mytest("Hello%d\n", 1));
-}
-EOF
- if try $CC $CFLAGS -o $test $test.c; then
- echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log
-
- echo >> configure.log
- cat >$test.c <<EOF
-#include <stdio.h>
-#include <stdarg.h>
-int mytest(const char *fmt, ...)
-{
- int n;
- char buf20;
- va_list ap;
- va_start(ap, fmt);
- n = vsnprintf(buf, sizeof(buf), fmt, ap);
- va_end(ap);
- return n;
-}
-int main()
-{
- return (mytest("Hello%d\n", 1));
-}
-EOF
-
- if try $CC -c $CFLAGS $test.c; then
- echo "Checking for return value of vsnprintf()... Yes." | tee -a configure.log
- else
- CFLAGS="$CFLAGS -DHAS_vsnprintf_void"
- SFLAGS="$SFLAGS -DHAS_vsnprintf_void"
- echo "Checking for return value of vsnprintf()... No." | tee -a configure.log
- echo " WARNING: apparently vsnprintf() does not return a value. zlib" | tee -a configure.log
- echo " can build but will be open to possible string-format security" | tee -a configure.log
- echo " vulnerabilities." | tee -a configure.log
- fi
- else
- CFLAGS="$CFLAGS -DNO_vsnprintf"
- SFLAGS="$SFLAGS -DNO_vsnprintf"
- echo "Checking for vsnprintf() in stdio.h... No." | tee -a configure.log
- echo " WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" | tee -a configure.log
- echo " can build but will be open to possible buffer-overflow security" | tee -a configure.log
- echo " vulnerabilities." | tee -a configure.log
-
- echo >> configure.log
- cat >$test.c <<EOF
-#include <stdio.h>
-#include <stdarg.h>
-int mytest(const char *fmt, ...)
-{
- int n;
- char buf20;
- va_list ap;
- va_start(ap, fmt);
- n = vsprintf(buf, fmt, ap);
- va_end(ap);
- return n;
-}
-int main()
-{
- return (mytest("Hello%d\n", 1));
-}
-EOF
-
- if try $CC -c $CFLAGS $test.c; then
- echo "Checking for return value of vsprintf()... Yes." | tee -a configure.log
- else
- CFLAGS="$CFLAGS -DHAS_vsprintf_void"
- SFLAGS="$SFLAGS -DHAS_vsprintf_void"
- echo "Checking for return value of vsprintf()... No." | tee -a configure.log
- echo " WARNING: apparently vsprintf() does not return a value. zlib" | tee -a configure.log
- echo " can build but will be open to possible string-format security" | tee -a configure.log
- echo " vulnerabilities." | tee -a configure.log
- fi
- fi
-else
- echo "Checking whether to use vsnprintf() or snprintf()... using snprintf()." | tee -a configure.log
-
- echo >> configure.log
- cat >$test.c <<EOF
-#include <stdio.h>
-int mytest()
-{
- char buf20;
- snprintf(buf, sizeof(buf), "%s", "foo");
- return 0;
-}
-int main()
-{
- return (mytest());
-}
-EOF
-
- if try $CC $CFLAGS -o $test $test.c; then
- echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log
-
- echo >> configure.log
- cat >$test.c <<EOF
-#include <stdio.h>
-int mytest()
-{
- char buf20;
- return snprintf(buf, sizeof(buf), "%s", "foo");
-}
-int main()
-{
- return (mytest());
-}
-EOF
-
- if try $CC -c $CFLAGS $test.c; then
- echo "Checking for return value of snprintf()... Yes." | tee -a configure.log
- else
- CFLAGS="$CFLAGS -DHAS_snprintf_void"
- SFLAGS="$SFLAGS -DHAS_snprintf_void"
- echo "Checking for return value of snprintf()... No." | tee -a configure.log
- echo " WARNING: apparently snprintf() does not return a value. zlib" | tee -a configure.log
- echo " can build but will be open to possible string-format security" | tee -a configure.log
- echo " vulnerabilities." | tee -a configure.log
- fi
- else
- CFLAGS="$CFLAGS -DNO_snprintf"
- SFLAGS="$SFLAGS -DNO_snprintf"
- echo "Checking for snprintf() in stdio.h... No." | tee -a configure.log
- echo " WARNING: snprintf() not found, falling back to sprintf(). zlib" | tee -a configure.log
- echo " can build but will be open to possible buffer-overflow security" | tee -a configure.log
- echo " vulnerabilities." | tee -a configure.log
-
- echo >> configure.log
- cat >$test.c <<EOF
-#include <stdio.h>
-int mytest()
-{
- char buf20;
- return sprintf(buf, "%s", "foo");
-}
-int main()
-{
- return (mytest());
-}
-EOF
-
- if try $CC -c $CFLAGS $test.c; then
- echo "Checking for return value of sprintf()... Yes." | tee -a configure.log
- else
- CFLAGS="$CFLAGS -DHAS_sprintf_void"
- SFLAGS="$SFLAGS -DHAS_sprintf_void"
- echo "Checking for return value of sprintf()... No." | tee -a configure.log
- echo " WARNING: apparently sprintf() does not return a value. zlib" | tee -a configure.log
- echo " can build but will be open to possible string-format security" | tee -a configure.log
- echo " vulnerabilities." | tee -a configure.log
- fi
- fi
-fi
-
-if test "$gcc" -eq 1; then
- echo >> configure.log
- cat > $test.c <<EOF
-#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33)
-# define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-#else
-# define ZLIB_INTERNAL
-#endif
-int ZLIB_INTERNAL foo;
-int main()
-{
- return 0;
-}
-EOF
- if try $CC -c $CFLAGS $test.c; then
- echo "Checking for attribute(visibility) support... Yes." | tee -a configure.log
- else
- CFLAGS="$CFLAGS -DNO_VIZ"
- SFLAGS="$SFLAGS -DNO_VIZ"
- echo "Checking for attribute(visibility) support... No." | tee -a configure.log
- fi
-fi
-
-rm -f $test.co $test $test$shared_ext $test.gcno
-
-# show the results in the log
-echo >> configure.log
-echo ALL = $ALL >> configure.log
-echo AR = $AR >> configure.log
-echo ARFLAGS = $ARFLAGS >> configure.log
-echo CC = $CC >> configure.log
-echo CFLAGS = $CFLAGS >> configure.log
-echo CPP = $CPP >> configure.log
-echo EXE = $EXE >> configure.log
-echo LDCONFIG = $LDCONFIG >> configure.log
-echo LDFLAGS = $LDFLAGS >> configure.log
-echo LDSHARED = $LDSHARED >> configure.log
-echo LDSHAREDLIBC = $LDSHAREDLIBC >> configure.log
-echo OBJC = $OBJC >> configure.log
-echo PIC_OBJC = $PIC_OBJC >> configure.log
-echo RANLIB = $RANLIB >> configure.log
-echo SFLAGS = $SFLAGS >> configure.log
-echo SHAREDLIB = $SHAREDLIB >> configure.log
-echo SHAREDLIBM = $SHAREDLIBM >> configure.log
-echo SHAREDLIBV = $SHAREDLIBV >> configure.log
-echo STATICLIB = $STATICLIB >> configure.log
-echo TEST = $TEST >> configure.log
-echo VER = $VER >> configure.log
-echo exec_prefix = $exec_prefix >> configure.log
-echo includedir = $includedir >> configure.log
-echo libdir = $libdir >> configure.log
-echo mandir = $mandir >> configure.log
-echo prefix = $prefix >> configure.log
-echo sharedlibdir = $sharedlibdir >> configure.log
-echo uname = $uname >> configure.log
-echo -------------------- >> configure.log
-echo >> configure.log
-echo >> configure.log
-
-# udpate Makefile
-sed < Makefile.in "
-/^CC *=/s#=.*#=$CC#
-/^CFLAGS *=/s#=.*#=$CFLAGS#
-/^SFLAGS *=/s#=.*#=$SFLAGS#
-/^LDFLAGS *=/s#=.*#=$LDFLAGS#
-/^LDSHARED *=/s#=.*#=$LDSHARED#
-/^CPP *=/s#=.*#=$CPP#
-/^STATICLIB *=/s#=.*#=$STATICLIB#
-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
-/^AR *=/s#=.*#=$AR#
-/^ARFLAGS *=/s#=.*#=$ARFLAGS#
-/^RANLIB *=/s#=.*#=$RANLIB#
-/^LDCONFIG *=/s#=.*#=$LDCONFIG#
-/^LDSHAREDLIBC *=/s#=.*#=$LDSHAREDLIBC#
-/^EXE *=/s#=.*#=$EXE#
-/^prefix *=/s#=.*#=$prefix#
-/^exec_prefix *=/s#=.*#=$exec_prefix#
-/^libdir *=/s#=.*#=$libdir#
-/^sharedlibdir *=/s#=.*#=$sharedlibdir#
-/^includedir *=/s#=.*#=$includedir#
-/^mandir *=/s#=.*#=$mandir#
-/^OBJC *=/s#=.*#= $OBJC#
-/^PIC_OBJC *=/s#=.*#= $PIC_OBJC#
-/^all: */s#:.*#: $ALL#
-/^test: */s#:.*#: $TEST#
-" > Makefile
-
-sed < zlib.pc.in "
-/^CC *=/s#=.*#=$CC#
-/^CFLAGS *=/s#=.*#=$CFLAGS#
-/^CPP *=/s#=.*#=$CPP#
-/^LDSHARED *=/s#=.*#=$LDSHARED#
-/^STATICLIB *=/s#=.*#=$STATICLIB#
-/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
-/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
-/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
-/^AR *=/s#=.*#=$AR#
-/^ARFLAGS *=/s#=.*#=$ARFLAGS#
-/^RANLIB *=/s#=.*#=$RANLIB#
-/^EXE *=/s#=.*#=$EXE#
-/^prefix *=/s#=.*#=$prefix#
-/^exec_prefix *=/s#=.*#=$exec_prefix#
-/^libdir *=/s#=.*#=$libdir#
-/^sharedlibdir *=/s#=.*#=$sharedlibdir#
-/^includedir *=/s#=.*#=$includedir#
-/^mandir *=/s#=.*#=$mandir#
-/^LDFLAGS *=/s#=.*#=$LDFLAGS#
-" | sed -e "
-s/\@VERSION\@/$VER/g;
-" > zlib.pc

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/ada Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/amd64 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/asm686 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/blast Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/delphi Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/delphi/ZLib.pas Deleted

@@ -1,557 +0,0 @@
-{*******************************************************}
-{ }
-{ Borland Delphi Supplemental Components }
-{ ZLIB Data Compression Interface Unit }
-{ }
-{ Copyright (c) 1997,99 Borland Corporation }
-{ }
-{*******************************************************}
-
-{ Updated for zlib 1.2.x by Cosmin Truta <cosmint@cs.ubbcluj.ro> }
-
-unit ZLib;
-
-interface
-
-uses SysUtils, Classes;
-
-type
- TAlloc = function (AppData: Pointer; Items, Size: Integer): Pointer; cdecl;
- TFree = procedure (AppData, Block: Pointer); cdecl;
-
- // Internal structure. Ignore.
- TZStreamRec = packed record
- next_in: PChar; // next input byte
- avail_in: Integer; // number of bytes available at next_in
- total_in: Longint; // total nb of input bytes read so far
-
- next_out: PChar; // next output byte should be put here
- avail_out: Integer; // remaining free space at next_out
- total_out: Longint; // total nb of bytes output so far
-
- msg: PChar; // last error message, NULL if no error
- internal: Pointer; // not visible by applications
-
- zalloc: TAlloc; // used to allocate the internal state
- zfree: TFree; // used to free the internal state
- AppData: Pointer; // private data object passed to zalloc and zfree
-
- data_type: Integer; // best guess about the data type: ascii or binary
- adler: Longint; // adler32 value of the uncompressed data
- reserved: Longint; // reserved for future use
- end;
-
- // Abstract ancestor class
- TCustomZlibStream = class(TStream)
- private
- FStrm: TStream;
- FStrmPos: Integer;
- FOnProgress: TNotifyEvent;
- FZRec: TZStreamRec;
- FBuffer: array Word of Char;
- protected
- procedure Progress(Sender: TObject); dynamic;
- property OnProgress: TNotifyEvent read FOnProgress write FOnProgress;
- constructor Create(Strm: TStream);
- end;
-
-{ TCompressionStream compresses data on the fly as data is written to it, and
- stores the compressed data to another stream.
-
- TCompressionStream is write-only and strictly sequential. Reading from the
- stream will raise an exception. Using Seek to move the stream pointer
- will raise an exception.
-
- Output data is cached internally, written to the output stream only when
- the internal output buffer is full. All pending output data is flushed
- when the stream is destroyed.
-
- The Position property returns the number of uncompressed bytes of
- data that have been written to the stream so far.
-
- CompressionRate returns the on-the-fly percentage by which the original
- data has been compressed: (1 - (CompressedBytes / UncompressedBytes)) * 100
- If raw data size = 100 and compressed data size = 25, the CompressionRate
- is 75%
-
- The OnProgress event is called each time the output buffer is filled and
- written to the output stream. This is useful for updating a progress
- indicator when you are writing a large chunk of data to the compression
- stream in a single call.}
-
-
- TCompressionLevel = (clNone, clFastest, clDefault, clMax);
-
- TCompressionStream = class(TCustomZlibStream)
- private
- function GetCompressionRate: Single;
- public
- constructor Create(CompressionLevel: TCompressionLevel; Dest: TStream);
- destructor Destroy; override;
- function Read(var Buffer; Count: Longint): Longint; override;
- function Write(const Buffer; Count: Longint): Longint; override;
- function Seek(Offset: Longint; Origin: Word): Longint; override;
- property CompressionRate: Single read GetCompressionRate;
- property OnProgress;
- end;
-
-{ TDecompressionStream decompresses data on the fly as data is read from it.
-
- Compressed data comes from a separate source stream. TDecompressionStream
- is read-only and unidirectional; you can seek forward in the stream, but not
- backwards. The special case of setting the stream position to zero is
- allowed. Seeking forward decompresses data until the requested position in
- the uncompressed data has been reached. Seeking backwards, seeking relative
- to the end of the stream, requesting the size of the stream, and writing to
- the stream will raise an exception.
-
- The Position property returns the number of bytes of uncompressed data that
- have been read from the stream so far.
-
- The OnProgress event is called each time the internal input buffer of
- compressed data is exhausted and the next block is read from the input stream.
- This is useful for updating a progress indicator when you are reading a
- large chunk of data from the decompression stream in a single call.}
-
- TDecompressionStream = class(TCustomZlibStream)
- public
- constructor Create(Source: TStream);
- destructor Destroy; override;
- function Read(var Buffer; Count: Longint): Longint; override;
- function Write(const Buffer; Count: Longint): Longint; override;
- function Seek(Offset: Longint; Origin: Word): Longint; override;
- property OnProgress;
- end;
-
-
-
-{ CompressBuf compresses data, buffer to buffer, in one call.
- In: InBuf = ptr to compressed data
- InBytes = number of bytes in InBuf
- Out: OutBuf = ptr to newly allocated buffer containing decompressed data
- OutBytes = number of bytes in OutBuf }
-procedure CompressBuf(const InBuf: Pointer; InBytes: Integer;
- out OutBuf: Pointer; out OutBytes: Integer);
-
-
-{ DecompressBuf decompresses data, buffer to buffer, in one call.
- In: InBuf = ptr to compressed data
- InBytes = number of bytes in InBuf
- OutEstimate = zero, or est. size of the decompressed data
- Out: OutBuf = ptr to newly allocated buffer containing decompressed data
- OutBytes = number of bytes in OutBuf }
-procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer;
- OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer);
-
-{ DecompressToUserBuf decompresses data, buffer to buffer, in one call.
- In: InBuf = ptr to compressed data
- InBytes = number of bytes in InBuf
- Out: OutBuf = ptr to user-allocated buffer to contain decompressed data
- BufSize = number of bytes in OutBuf }
-procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
- const OutBuf: Pointer; BufSize: Integer);
-
-const
- zlib_version = '1.2.6';
-
-type
- EZlibError = class(Exception);
- ECompressionError = class(EZlibError);
- EDecompressionError = class(EZlibError);
-
-implementation
-
-uses ZLibConst;
-
-const
- Z_NO_FLUSH = 0;
- Z_PARTIAL_FLUSH = 1;
- Z_SYNC_FLUSH = 2;
- Z_FULL_FLUSH = 3;
- Z_FINISH = 4;
-
- Z_OK = 0;
- Z_STREAM_END = 1;
- Z_NEED_DICT = 2;
- Z_ERRNO = (-1);
- Z_STREAM_ERROR = (-2);
- Z_DATA_ERROR = (-3);
- Z_MEM_ERROR = (-4);
- Z_BUF_ERROR = (-5);
- Z_VERSION_ERROR = (-6);
-
- Z_NO_COMPRESSION = 0;
- Z_BEST_SPEED = 1;
- Z_BEST_COMPRESSION = 9;
- Z_DEFAULT_COMPRESSION = (-1);
-
- Z_FILTERED = 1;
- Z_HUFFMAN_ONLY = 2;
- Z_RLE = 3;
- Z_DEFAULT_STRATEGY = 0;
-
- Z_BINARY = 0;
- Z_ASCII = 1;
- Z_UNKNOWN = 2;
-
- Z_DEFLATED = 8;
-
-
-{$L adler32.obj}
-{$L compress.obj}
-{$L crc32.obj}
-{$L deflate.obj}
-{$L infback.obj}
-{$L inffast.obj}
-{$L inflate.obj}
-{$L inftrees.obj}
-{$L trees.obj}
-{$L uncompr.obj}
-{$L zutil.obj}
-
-procedure adler32; external;
-procedure compressBound; external;
-procedure crc32; external;
-procedure deflateInit2_; external;
-procedure deflateParams; external;
-
-function _malloc(Size: Integer): Pointer; cdecl;
-begin
- Result := AllocMem(Size);
-end;
-
-procedure _free(Block: Pointer); cdecl;
-begin
- FreeMem(Block);
-end;
-
-procedure _memset(P: Pointer; B: Byte; count: Integer); cdecl;
-begin
- FillChar(P^, count, B);
-end;
-
-procedure _memcpy(dest, source: Pointer; count: Integer); cdecl;
-begin
- Move(source^, dest^, count);
-end;
-
-
-
-// deflate compresses data
-function deflateInit_(var strm: TZStreamRec; level: Integer; version: PChar;
- recsize: Integer): Integer; external;
-function deflate(var strm: TZStreamRec; flush: Integer): Integer; external;
-function deflateEnd(var strm: TZStreamRec): Integer; external;
-
-// inflate decompresses data
-function inflateInit_(var strm: TZStreamRec; version: PChar;
- recsize: Integer): Integer; external;
-function inflate(var strm: TZStreamRec; flush: Integer): Integer; external;
-function inflateEnd(var strm: TZStreamRec): Integer; external;
-function inflateReset(var strm: TZStreamRec): Integer; external;
-
-
-function zlibAllocMem(AppData: Pointer; Items, Size: Integer): Pointer; cdecl;
-begin
-// GetMem(Result, Items*Size);
- Result := AllocMem(Items * Size);
-end;
-
-procedure zlibFreeMem(AppData, Block: Pointer); cdecl;
-begin
- FreeMem(Block);
-end;
-
-{function zlibCheck(code: Integer): Integer;
-begin
- Result := code;
- if code < 0 then
- raise EZlibError.Create('error'); //!!
-end;}
-
-function CCheck(code: Integer): Integer;
-begin
- Result := code;
- if code < 0 then
- raise ECompressionError.Create('error'); //!!
-end;
-
-function DCheck(code: Integer): Integer;
-begin
- Result := code;
- if code < 0 then
- raise EDecompressionError.Create('error'); //!!
-end;
-
-procedure CompressBuf(const InBuf: Pointer; InBytes: Integer;
- out OutBuf: Pointer; out OutBytes: Integer);
-var
- strm: TZStreamRec;
- P: Pointer;
-begin
- FillChar(strm, sizeof(strm), 0);
- strm.zalloc := zlibAllocMem;
- strm.zfree := zlibFreeMem;
- OutBytes := ((InBytes + (InBytes div 10) + 12) + 255) and not 255;
- GetMem(OutBuf, OutBytes);
- try
- strm.next_in := InBuf;
- strm.avail_in := InBytes;
- strm.next_out := OutBuf;
- strm.avail_out := OutBytes;
- CCheck(deflateInit_(strm, Z_BEST_COMPRESSION, zlib_version, sizeof(strm)));
- try
- while CCheck(deflate(strm, Z_FINISH)) <> Z_STREAM_END do
- begin
- P := OutBuf;
- Inc(OutBytes, 256);
- ReallocMem(OutBuf, OutBytes);
- strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P)));
- strm.avail_out := 256;
- end;
- finally
- CCheck(deflateEnd(strm));
- end;
- ReallocMem(OutBuf, strm.total_out);
- OutBytes := strm.total_out;
- except
- FreeMem(OutBuf);
- raise
- end;
-end;
-
-
-procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer;
- OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer);
-var
- strm: TZStreamRec;
- P: Pointer;
- BufInc: Integer;
-begin
- FillChar(strm, sizeof(strm), 0);
- strm.zalloc := zlibAllocMem;
- strm.zfree := zlibFreeMem;
- BufInc := (InBytes + 255) and not 255;
- if OutEstimate = 0 then
- OutBytes := BufInc
- else
- OutBytes := OutEstimate;
- GetMem(OutBuf, OutBytes);
- try
- strm.next_in := InBuf;
- strm.avail_in := InBytes;
- strm.next_out := OutBuf;
- strm.avail_out := OutBytes;
- DCheck(inflateInit_(strm, zlib_version, sizeof(strm)));
- try
- while DCheck(inflate(strm, Z_NO_FLUSH)) <> Z_STREAM_END do
- begin
- P := OutBuf;
- Inc(OutBytes, BufInc);
- ReallocMem(OutBuf, OutBytes);
- strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P)));
- strm.avail_out := BufInc;
- end;
- finally
- DCheck(inflateEnd(strm));
- end;
- ReallocMem(OutBuf, strm.total_out);
- OutBytes := strm.total_out;
- except
- FreeMem(OutBuf);
- raise
- end;
-end;
-
-procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
- const OutBuf: Pointer; BufSize: Integer);
-var
- strm: TZStreamRec;
-begin
- FillChar(strm, sizeof(strm), 0);
- strm.zalloc := zlibAllocMem;
- strm.zfree := zlibFreeMem;
- strm.next_in := InBuf;
- strm.avail_in := InBytes;
- strm.next_out := OutBuf;
- strm.avail_out := BufSize;
- DCheck(inflateInit_(strm, zlib_version, sizeof(strm)));
- try
- if DCheck(inflate(strm, Z_FINISH)) <> Z_STREAM_END then
- raise EZlibError.CreateRes(@sTargetBufferTooSmall);
- finally
- DCheck(inflateEnd(strm));
- end;
-end;
-
-// TCustomZlibStream
-
-constructor TCustomZLibStream.Create(Strm: TStream);
-begin
- inherited Create;
- FStrm := Strm;
- FStrmPos := Strm.Position;
- FZRec.zalloc := zlibAllocMem;
- FZRec.zfree := zlibFreeMem;
-end;
-
-procedure TCustomZLibStream.Progress(Sender: TObject);
-begin
- if Assigned(FOnProgress) then FOnProgress(Sender);
-end;
-
-
-// TCompressionStream
-
-constructor TCompressionStream.Create(CompressionLevel: TCompressionLevel;
- Dest: TStream);
-const
- Levels: array TCompressionLevel of ShortInt =
- (Z_NO_COMPRESSION, Z_BEST_SPEED, Z_DEFAULT_COMPRESSION, Z_BEST_COMPRESSION);
-begin
- inherited Create(Dest);
- FZRec.next_out := FBuffer;
- FZRec.avail_out := sizeof(FBuffer);
- CCheck(deflateInit_(FZRec, LevelsCompressionLevel, zlib_version, sizeof(FZRec)));
-end;
-
-destructor TCompressionStream.Destroy;
-begin
- FZRec.next_in := nil;
- FZRec.avail_in := 0;
- try
- if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
- while (CCheck(deflate(FZRec, Z_FINISH)) <> Z_STREAM_END)
- and (FZRec.avail_out = 0) do
- begin
- FStrm.WriteBuffer(FBuffer, sizeof(FBuffer));
- FZRec.next_out := FBuffer;
- FZRec.avail_out := sizeof(FBuffer);
- end;
- if FZRec.avail_out < sizeof(FBuffer) then
- FStrm.WriteBuffer(FBuffer, sizeof(FBuffer) - FZRec.avail_out);
- finally
- deflateEnd(FZRec);
- end;
- inherited Destroy;
-end;
-
-function TCompressionStream.Read(var Buffer; Count: Longint): Longint;
-begin
- raise ECompressionError.CreateRes(@sInvalidStreamOp);
-end;
-
-function TCompressionStream.Write(const Buffer; Count: Longint): Longint;
-begin
- FZRec.next_in := @Buffer;
- FZRec.avail_in := Count;
- if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
- while (FZRec.avail_in > 0) do
- begin
- CCheck(deflate(FZRec, 0));
- if FZRec.avail_out = 0 then
- begin
- FStrm.WriteBuffer(FBuffer, sizeof(FBuffer));
- FZRec.next_out := FBuffer;
- FZRec.avail_out := sizeof(FBuffer);
- FStrmPos := FStrm.Position;
- Progress(Self);
- end;
- end;
- Result := Count;
-end;
-
-function TCompressionStream.Seek(Offset: Longint; Origin: Word): Longint;
-begin
- if (Offset = 0) and (Origin = soFromCurrent) then
- Result := FZRec.total_in
- else
- raise ECompressionError.CreateRes(@sInvalidStreamOp);
-end;
-
-function TCompressionStream.GetCompressionRate: Single;
-begin
- if FZRec.total_in = 0 then
- Result := 0
- else
- Result := (1.0 - (FZRec.total_out / FZRec.total_in)) * 100.0;
-end;
-
-
-// TDecompressionStream
-
-constructor TDecompressionStream.Create(Source: TStream);
-begin
- inherited Create(Source);
- FZRec.next_in := FBuffer;
- FZRec.avail_in := 0;
- DCheck(inflateInit_(FZRec, zlib_version, sizeof(FZRec)));
-end;
-
-destructor TDecompressionStream.Destroy;
-begin
- FStrm.Seek(-FZRec.avail_in, 1);
- inflateEnd(FZRec);
- inherited Destroy;
-end;
-
-function TDecompressionStream.Read(var Buffer; Count: Longint): Longint;
-begin
- FZRec.next_out := @Buffer;
- FZRec.avail_out := Count;
- if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
- while (FZRec.avail_out > 0) do
- begin
- if FZRec.avail_in = 0 then
- begin
- FZRec.avail_in := FStrm.Read(FBuffer, sizeof(FBuffer));
- if FZRec.avail_in = 0 then
- begin
- Result := Count - FZRec.avail_out;
- Exit;
- end;
- FZRec.next_in := FBuffer;
- FStrmPos := FStrm.Position;
- Progress(Self);
- end;
- CCheck(inflate(FZRec, 0));
- end;
- Result := Count;
-end;
-
-function TDecompressionStream.Write(const Buffer; Count: Longint): Longint;
-begin
- raise EDecompressionError.CreateRes(@sInvalidStreamOp);
-end;
-
-function TDecompressionStream.Seek(Offset: Longint; Origin: Word): Longint;
-var
- I: Integer;
- Buf: array 0..4095 of Char;
-begin
- if (Offset = 0) and (Origin = soFromBeginning) then
- begin
- DCheck(inflateReset(FZRec));
- FZRec.next_in := FBuffer;
- FZRec.avail_in := 0;
- FStrm.Position := 0;
- FStrmPos := 0;
- end
- else if ( (Offset >= 0) and (Origin = soFromCurrent)) or
- ( ((Offset - FZRec.total_out) > 0) and (Origin = soFromBeginning)) then
- begin
- if Origin = soFromBeginning then Dec(Offset, FZRec.total_out);
- if Offset > 0 then
- begin
- for I := 1 to Offset div sizeof(Buf) do
- ReadBuffer(Buf, sizeof(Buf));
- ReadBuffer(Buf, Offset mod sizeof(Buf));
- end;
- end
- else
- raise EDecompressionError.CreateRes(@sInvalidStreamOp);
- Result := FZRec.total_out;
-end;
-
-
-end.

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/delphi/zlibd32.mak Deleted

@@ -1,99 +0,0 @@
-# Makefile for zlib
-# For use with Delphi and C++ Builder under Win32
-# Updated for zlib 1.2.x by Cosmin Truta
-
-# ------------ Borland C++ ------------
-
-# This project uses the Delphi (fastcall/register) calling convention:
-LOC = -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl
-
-CC = bcc32
-LD = bcc32
-AR = tlib
-# do not use "-pr" in CFLAGS
-CFLAGS = -a -d -k- -O2 $(LOC)
-LDFLAGS =
-
-
-# variables
-ZLIB_LIB = zlib.lib
-
-OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
-OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
-OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
-OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
-
-
-# targets
-all: $(ZLIB_LIB) example.exe minigzip.exe
-
-.c.obj:
-	$(CC) -c $(CFLAGS) $*.c
-
-adler32.obj: adler32.c zlib.h zconf.h
-
-compress.obj: compress.c zlib.h zconf.h
-
-crc32.obj: crc32.c zlib.h zconf.h crc32.h
-
-deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
-
-gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
-
-gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
-
-gzread.obj: gzread.c zlib.h zconf.h gzguts.h
-
-gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
-
-infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h
-
-inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
- inffast.h inffixed.h
-
-inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-
-trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-
-uncompr.obj: uncompr.c zlib.h zconf.h
-
-zutil.obj: zutil.c zutil.h zlib.h zconf.h
-
-example.obj: test/example.c zlib.h zconf.h
-
-minigzip.obj: test/minigzip.c zlib.h zconf.h
-
-
-# For the sake of the old Borland make,
-# the command line is cut to fit in the MS-DOS 128 byte limit:
-$(ZLIB_LIB): $(OBJ1) $(OBJ2)
-	-del $(ZLIB_LIB)
-	$(AR) $(ZLIB_LIB) $(OBJP1)
-	$(AR) $(ZLIB_LIB) $(OBJP2)
-
-
-# testing
-test: example.exe minigzip.exe
-	example
-	echo hello world | minigzip | minigzip -d
-
-example.exe: example.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
-
-minigzip.exe: minigzip.obj $(ZLIB_LIB)
-	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
-
-
-# cleanup
-clean:
-	-del *.obj
-	-del *.exe
-	-del *.lib
-	-del *.tds
-	-del zlib.bak
-	-del foo.gz
-

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/dotzlib Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/dotzlib/DotZLib Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/dotzlib/DotZLib/UnitTests.cs Deleted

@@ -1,274 +0,0 @@
-//
-// © Copyright Henrik Ravn 2004
-//
-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-using System;
-using System.Collections;
-using System.IO;
-
-// uncomment the define below to include unit tests
-//#define nunit
-#if nunit
-using NUnit.Framework;
-
-// Unit tests for the DotZLib class library
-// ----------------------------------------
-//
-// Use this with NUnit 2 from http://www.nunit.org
-//
-
-namespace DotZLibTests
-{
- using DotZLib;
-
- // helper methods
- internal class Utils
- {
- public static bool byteArrEqual( byte lhs, byte rhs )
- {
- if (lhs.Length != rhs.Length)
- return false;
- for (int i = lhs.Length-1; i >= 0; --i)
- if (lhsi != rhsi)
- return false;
- return true;
- }
-
- }
-
-
- TestFixture
- public class CircBufferTests
- {
- #region Circular buffer tests
- Test
- public void SinglePutGet()
- {
- CircularBuffer buf = new CircularBuffer(10);
- Assert.AreEqual( 0, buf.Size );
- Assert.AreEqual( -1, buf.Get() );
-
- Assert.IsTrue(buf.Put( 1 ));
- Assert.AreEqual( 1, buf.Size );
- Assert.AreEqual( 1, buf.Get() );
- Assert.AreEqual( 0, buf.Size );
- Assert.AreEqual( -1, buf.Get() );
- }
-
- Test
- public void BlockPutGet()
- {
- CircularBuffer buf = new CircularBuffer(10);
- byte arr = {1,2,3,4,5,6,7,8,9,10};
- Assert.AreEqual( 10, buf.Put(arr,0,10) );
- Assert.AreEqual( 10, buf.Size );
- Assert.IsFalse( buf.Put(11) );
- Assert.AreEqual( 1, buf.Get() );
- Assert.IsTrue( buf.Put(11) );
-
- byte arr2 = (byte)arr.Clone();
- Assert.AreEqual( 9, buf.Get(arr2,1,9) );
- Assert.IsTrue( Utils.byteArrEqual(arr,arr2) );
- }
-
- #endregion
- }
-
- TestFixture
- public class ChecksumTests
- {
- #region CRC32 Tests
- Test
- public void CRC32_Null()
- {
- CRC32Checksum crc32 = new CRC32Checksum();
- Assert.AreEqual( 0, crc32.Value );
-
- crc32 = new CRC32Checksum(1);
- Assert.AreEqual( 1, crc32.Value );
-
- crc32 = new CRC32Checksum(556);
- Assert.AreEqual( 556, crc32.Value );
- }
-
- Test
- public void CRC32_Data()
- {
- CRC32Checksum crc32 = new CRC32Checksum();
- byte data = { 1,2,3,4,5,6,7 };
- crc32.Update(data);
- Assert.AreEqual( 0x70e46888, crc32.Value );
-
- crc32 = new CRC32Checksum();
- crc32.Update("penguin");
- Assert.AreEqual( 0x0e5c1a120, crc32.Value );
-
- crc32 = new CRC32Checksum(1);
- crc32.Update("penguin");
- Assert.AreEqual(0x43b6aa94, crc32.Value);
-
- }
- #endregion
-
- #region Adler tests
-
- Test
- public void Adler_Null()
- {
- AdlerChecksum adler = new AdlerChecksum();
- Assert.AreEqual(0, adler.Value);
-
- adler = new AdlerChecksum(1);
- Assert.AreEqual( 1, adler.Value );
-
- adler = new AdlerChecksum(556);
- Assert.AreEqual( 556, adler.Value );
- }
-
- Test
- public void Adler_Data()
- {
- AdlerChecksum adler = new AdlerChecksum(1);
- byte data = { 1,2,3,4,5,6,7 };
- adler.Update(data);
- Assert.AreEqual( 0x5b001d, adler.Value );
-
- adler = new AdlerChecksum();
- adler.Update("penguin");
- Assert.AreEqual(0x0bcf02f6, adler.Value );
-
- adler = new AdlerChecksum(1);
- adler.Update("penguin");
- Assert.AreEqual(0x0bd602f7, adler.Value);
-
- }
- #endregion
- }
-
- TestFixture
- public class InfoTests
- {
- #region Info tests
- Test
- public void Info_Version()
- {
- Info info = new Info();
- Assert.AreEqual("1.2.6", Info.Version);
- Assert.AreEqual(32, info.SizeOfUInt);
- Assert.AreEqual(32, info.SizeOfULong);
- Assert.AreEqual(32, info.SizeOfPointer);
- Assert.AreEqual(32, info.SizeOfOffset);
- }
- #endregion
- }
-
- TestFixture
- public class DeflateInflateTests
- {
- #region Deflate tests
- Test
- public void Deflate_Init()
- {
- using (Deflater def = new Deflater(CompressLevel.Default))
- {
- }
- }
-
- private ArrayList compressedData = new ArrayList();
- private uint adler1;
-
- private ArrayList uncompressedData = new ArrayList();
- private uint adler2;
-
- public void CDataAvail(byte data, int startIndex, int count)
- {
- for (int i = 0; i < count; ++i)
- compressedData.Add(datai+startIndex);
- }
-
- Test
- public void Deflate_Compress()
- {
- compressedData.Clear();
-
- byte testData = new byte35000;
- for (int i = 0; i < testData.Length; ++i)
- testDatai = 5;
-
- using (Deflater def = new Deflater((CompressLevel)5))
- {
- def.DataAvailable += new DataAvailableHandler(CDataAvail);
- def.Add(testData);
- def.Finish();
- adler1 = def.Checksum;
- }
- }
- #endregion
-
- #region Inflate tests
- Test
- public void Inflate_Init()
- {
- using (Inflater inf = new Inflater())
- {
- }
- }
-
- private void DDataAvail(byte data, int startIndex, int count)
- {
- for (int i = 0; i < count; ++i)
- uncompressedData.Add(datai+startIndex);
- }
-
- Test
- public void Inflate_Expand()
- {
- uncompressedData.Clear();
-
- using (Inflater inf = new Inflater())
- {
- inf.DataAvailable += new DataAvailableHandler(DDataAvail);
- inf.Add((byte)compressedData.ToArray(typeof(byte)));
- inf.Finish();
- adler2 = inf.Checksum;
- }
- Assert.AreEqual( adler1, adler2 );
- }
- #endregion
- }
-
- TestFixture
- public class GZipStreamTests
- {
- #region GZipStream test
- Test
- public void GZipStream_WriteRead()
- {
- using (GZipStream gzOut = new GZipStream("gzstream.gz", CompressLevel.Best))
- {
- BinaryWriter writer = new BinaryWriter(gzOut);
- writer.Write("hi there");
- writer.Write(Math.PI);
- writer.Write(42);
- }
-
- using (GZipStream gzIn = new GZipStream("gzstream.gz"))
- {
- BinaryReader reader = new BinaryReader(gzIn);
- string s = reader.ReadString();
- Assert.AreEqual("hi there",s);
- double d = reader.ReadDouble();
- Assert.AreEqual(Math.PI, d);
- int i = reader.ReadInt32();
- Assert.AreEqual(42,i);
- }
-
- }
- #endregion
-	}
-}
-
-#endif

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/gcc_gvmat64 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/infback9 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/infback9/inftree9.c Deleted

@@ -1,324 +0,0 @@
-/* inftree9.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2012 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftree9.h"
-
-#define MAXBITS 15
-
-const char inflate9_copyright =
- " inflate9 1.2.6 Copyright 1995-2012 Mark Adler ";
-/*
- If you use the zlib library in a product, an acknowledgment is welcome
- in the documentation of your product. If for some reason you cannot
- include such an acknowledgment, I would appreciate that you keep this
- copyright string in the executable of your product.
- */
-
-/*
- Build a set of tables to decode the provided canonical Huffman code.
- The code lengths are lens0..codes-1. The result starts at *table,
- whose indices are 0..2^bits-1. work is a writable array of at least
- lens shorts, which is used as a work area. type is the type of code
- to be generated, CODES, LENS, or DISTS. On return, zero is success,
- -1 is an invalid code, and +1 means that ENOUGH isn't enough. table
- on return points to the next available entry's address. bits is the
- requested root table index bits, and on return it is the actual root
- table index bits. It will differ if the request is greater than the
- longest code or if it is less than the shortest code.
- */
-int inflate_table9(type, lens, codes, table, bits, work)
-codetype type;
-unsigned short FAR *lens;
-unsigned codes;
-code FAR * FAR *table;
-unsigned FAR *bits;
-unsigned short FAR *work;
-{
- unsigned len; /* a code's length in bits */
- unsigned sym; /* index of code symbols */
- unsigned min, max; /* minimum and maximum code lengths */
- unsigned root; /* number of index bits for root table */
- unsigned curr; /* number of index bits for current table */
- unsigned drop; /* code bits to drop for sub-table */
- int left; /* number of prefix codes available */
- unsigned used; /* code entries in table used */
- unsigned huff; /* Huffman code */
- unsigned incr; /* for incrementing code, index */
- unsigned fill; /* index for replicating entries */
- unsigned low; /* low bits for current root entry */
- unsigned mask; /* mask for low root bits */
- code this; /* table entry for duplication */
- code FAR *next; /* next available space in table */
- const unsigned short FAR *base; /* base value table to use */
- const unsigned short FAR *extra; /* extra bits table to use */
- int end; /* use base and extra for symbol > end */
- unsigned short countMAXBITS+1; /* number of codes of each length */
- unsigned short offsMAXBITS+1; /* offsets in table for each length */
- static const unsigned short lbase31 = { /* Length codes 257..285 base */
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17,
- 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115,
- 131, 163, 195, 227, 3, 0, 0};
- static const unsigned short lext31 = { /* Length codes 257..285 extra */
- 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
- 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
- 133, 133, 133, 133, 144, 203, 69};
- static const unsigned short dbase32 = { /* Distance codes 0..31 base */
- 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
- 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
- 4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153};
- static const unsigned short dext32 = { /* Distance codes 0..31 extra */
- 128, 128, 128, 128, 129, 129, 130, 130, 131, 131, 132, 132,
- 133, 133, 134, 134, 135, 135, 136, 136, 137, 137, 138, 138,
- 139, 139, 140, 140, 141, 141, 142, 142};
-
- /*
- Process a set of code lengths to create a canonical Huffman code. The
- code lengths are lens0..codes-1. Each length corresponds to the
- symbols 0..codes-1. The Huffman code is generated by first sorting the
- symbols by length from short to long, and retaining the symbol order
- for codes with equal lengths. Then the code starts with all zero bits
- for the first code of the shortest length, and the codes are integer
- increments for the same length, and zeros are appended as the length
- increases. For the deflate format, these bits are stored backwards
- from their more natural integer increment ordering, and so when the
- decoding tables are built in the large loop below, the integer codes
- are incremented backwards.
-
- This routine assumes, but does not check, that all of the entries in
- lens are in the range 0..MAXBITS. The caller must assure this.
- 1..MAXBITS is interpreted as that code length. zero means that that
- symbol does not occur in this code.
-
- The codes are sorted by computing a count of codes for each length,
- creating from that a table of starting indices for each length in the
- sorted table, and then entering the symbols in order in the sorted
- table. The sorted table is work, with that space being provided by
- the caller.
-
- The length counts are used for other purposes as well, i.e. finding
- the minimum and maximum length codes, determining if there are any
- codes at all, checking for a valid set of lengths, and looking ahead
- at length counts to determine sub-table sizes when building the
- decoding tables.
- */
-
- /* accumulate lengths for codes (assumes lens all in 0..MAXBITS) */
- for (len = 0; len <= MAXBITS; len++)
- countlen = 0;
- for (sym = 0; sym < codes; sym++)
- countlenssym++;
-
- /* bound code lengths, force root to be within code lengths */
- root = *bits;
- for (max = MAXBITS; max >= 1; max--)
- if (countmax != 0) break;
- if (root > max) root = max;
- if (max == 0) return -1; /* no codes! */
- for (min = 1; min <= MAXBITS; min++)
- if (countmin != 0) break;
- if (root < min) root = min;
-
- /* check for an over-subscribed or incomplete set of lengths */
- left = 1;
- for (len = 1; len <= MAXBITS; len++) {
- left <<= 1;
- left -= countlen;
- if (left < 0) return -1; /* over-subscribed */
- }
- if (left > 0 && (type == CODES || max != 1))
- return -1; /* incomplete set */
-
- /* generate offsets into symbol table for each length for sorting */
- offs1 = 0;
- for (len = 1; len < MAXBITS; len++)
- offslen + 1 = offslen + countlen;
-
- /* sort symbols by length, by symbol order within each length */
- for (sym = 0; sym < codes; sym++)
- if (lenssym != 0) workoffslenssym++ = (unsigned short)sym;
-
- /*
- Create and fill in decoding tables. In this loop, the table being
- filled is at next and has curr index bits. The code being used is huff
- with length len. That code is converted to an index by dropping drop
- bits off of the bottom. For codes where len is less than drop + curr,
- those top drop + curr - len bits are incremented through all values to
- fill the table with replicated entries.
-
- root is the number of index bits for the root table. When len exceeds
- root, sub-tables are created pointed to by the root entry with an index
- of the low root bits of huff. This is saved in low to check for when a
- new sub-table should be started. drop is zero when the root table is
- being filled, and drop is root when sub-tables are being filled.
-
- When a new sub-table is needed, it is necessary to look ahead in the
- code lengths to determine what size sub-table is needed. The length
- counts are used for this, and so count is decremented as codes are
- entered in the tables.
-
- used keeps track of how many table entries have been allocated from the
- provided *table space. It is checked for LENS and DIST tables against
- the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
- the initial root table size constants. See the comments in inftree9.h
- for more information.
-
- sym increments through all symbols, and the loop terminates when
- all codes of length max, i.e. all codes, have been processed. This
- routine permits incomplete codes, so another loop after this one fills
- in the rest of the decoding tables with invalid code markers.
- */
-
- /* set up for code type */
- switch (type) {
- case CODES:
- base = extra = work; /* dummy value--not used */
- end = 19;
- break;
- case LENS:
- base = lbase;
- base -= 257;
- extra = lext;
- extra -= 257;
- end = 256;
- break;
- default: /* DISTS */
- base = dbase;
- extra = dext;
- end = -1;
- }
-
- /* initialize state for loop */
- huff = 0; /* starting code */
- sym = 0; /* starting code symbol */
- len = min; /* starting code length */
- next = *table; /* current table to fill in */
- curr = root; /* current table index bits */
- drop = 0; /* current bits to drop from code for index */
- low = (unsigned)(-1); /* trigger new sub-table when len > root */
- used = 1U << root; /* use root table entries */
- mask = used - 1; /* mask for comparing low */
-
- /* check available table space */
- if ((type == LENS && used >= ENOUGH_LENS) ||
- (type == DISTS && used >= ENOUGH_DISTS))
- return 1;
-
- /* process all codes and make table entries */
- for (;;) {
- /* create table entry */
- this.bits = (unsigned char)(len - drop);
- if ((int)(worksym) < end) {
- this.op = (unsigned char)0;
- this.val = worksym;
- }
- else if ((int)(worksym) > end) {
- this.op = (unsigned char)(extraworksym);
- this.val = baseworksym;
- }
- else {
- this.op = (unsigned char)(32 + 64); /* end of block */
- this.val = 0;
- }
-
- /* replicate for those indices with low len bits equal to huff */
- incr = 1U << (len - drop);
- fill = 1U << curr;
- do {
- fill -= incr;
- next(huff >> drop) + fill = this;
- } while (fill != 0);
-
- /* backwards increment the len-bit code huff */
- incr = 1U << (len - 1);
- while (huff & incr)
- incr >>= 1;
- if (incr != 0) {
- huff &= incr - 1;
- huff += incr;
- }
- else
- huff = 0;
-
- /* go to next symbol, update count, len */
- sym++;
- if (--(countlen) == 0) {
- if (len == max) break;
- len = lensworksym;
- }
-
- /* create new sub-table if needed */
- if (len > root && (huff & mask) != low) {
- /* if first time, transition to sub-tables */
- if (drop == 0)
- drop = root;
-
- /* increment past last table */
- next += 1U << curr;
-
- /* determine length of next table */
- curr = len - drop;
- left = (int)(1 << curr);
- while (curr + drop < max) {
- left -= countcurr + drop;
- if (left <= 0) break;
- curr++;
- left <<= 1;
- }
-
- /* check for enough space */
- used += 1U << curr;
- if ((type == LENS && used >= ENOUGH_LENS) ||
- (type == DISTS && used >= ENOUGH_DISTS))
- return 1;
-
- /* point entry in root table to sub-table */
- low = huff & mask;
- (*table)low.op = (unsigned char)curr;
- (*table)low.bits = (unsigned char)root;
- (*table)low.val = (unsigned short)(next - *table);
- }
- }
-
- /*
- Fill in rest of table for incomplete codes. This loop is similar to the
- loop above in incrementing huff for table indices. It is assumed that
- len is equal to curr + drop, so there is no loop needed to increment
- through high index bits. When the current sub-table is filled, the loop
- drops back to the root table to fill in any remaining entries there.
- */
- this.op = (unsigned char)64; /* invalid code marker */
- this.bits = (unsigned char)(len - drop);
- this.val = (unsigned short)0;
- while (huff != 0) {
- /* when done with sub-table, drop back to root table */
- if (drop != 0 && (huff & mask) != low) {
- drop = 0;
- len = root;
- next = *table;
- curr = root;
- this.bits = (unsigned char)len;
- }
-
- /* put invalid code marker in table */
- nexthuff >> drop = this;
-
- /* backwards increment the len-bit code huff */
- incr = 1U << (len - 1);
- while (huff & incr)
- incr >>= 1;
- if (incr != 0) {
- huff &= incr - 1;
- huff += incr;
- }
- else
- huff = 0;
- }
-
- /* set return parameters */
- *table += used;
- *bits = root;
- return 0;
-}

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/inflate86 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/iostream Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/iostream2 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/iostream3 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/masmx64 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/masmx86 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/minizip Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/minizip/Makefile.am Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/minizip/configure.ac Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/minizip/zip.c Deleted

@@ -1,2007 +0,0 @@
-/* zip.c -- IO on .zip files using zlib
- Version 1.1, February 14h, 2010
- part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
-
- Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
-
- Modifications for Zip64 support
- Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
-
- For more info read MiniZip_info.txt
-
- Changes
- Oct-2009 - Mathias Svensson - Remove old C style function prototypes
- Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
- Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
- Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
- It is used when recreting zip archive with RAW when deleting items from a zip.
- ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed.
- Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
- Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
-
-*/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include "zlib.h"
-#include "zip.h"
-
-#ifdef STDC
-# include <stddef.h>
-# include <string.h>
-# include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
- extern int errno;
-#else
-# include <errno.h>
-#endif
-
-
-#ifndef local
-# define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-#ifndef VERSIONMADEBY
-# define VERSIONMADEBY (0x0) /* platform depedent */
-#endif
-
-#ifndef Z_BUFSIZE
-#define Z_BUFSIZE (64*1024) //(16384)
-#endif
-
-#ifndef Z_MAXFILENAMEINZIP
-#define Z_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
-#endif
-
-/*
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-*/
-
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-
-
-// NOT sure that this work on ALL platform
-#define MAKEULONG64(a, b) ((ZPOS64_T)(((unsigned long)(a)) | ((ZPOS64_T)((unsigned long)(b))) << 32))
-
-#ifndef SEEK_CUR
-#define SEEK_CUR 1
-#endif
-
-#ifndef SEEK_END
-#define SEEK_END 2
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-
-#ifndef DEF_MEM_LEVEL
-#if MAX_MEM_LEVEL >= 8
-# define DEF_MEM_LEVEL 8
-#else
-# define DEF_MEM_LEVEL MAX_MEM_LEVEL
-#endif
-#endif
-const char zip_copyright =" zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
-
-
-#define SIZEDATA_INDATABLOCK (4096-(4*4))
-
-#define LOCALHEADERMAGIC (0x04034b50)
-#define CENTRALHEADERMAGIC (0x02014b50)
-#define ENDHEADERMAGIC (0x06054b50)
-#define ZIP64ENDHEADERMAGIC (0x6064b50)
-#define ZIP64ENDLOCHEADERMAGIC (0x7064b50)
-
-#define FLAG_LOCALHEADER_OFFSET (0x06)
-#define CRC_LOCALHEADER_OFFSET (0x0e)
-
-#define SIZECENTRALHEADER (0x2e) /* 46 */
-
-typedef struct linkedlist_datablock_internal_s
-{
- struct linkedlist_datablock_internal_s* next_datablock;
- uLong avail_in_this_block;
- uLong filled_in_this_block;
- uLong unused; /* for future use and alignement */
- unsigned char dataSIZEDATA_INDATABLOCK;
-} linkedlist_datablock_internal;
-
-typedef struct linkedlist_data_s
-{
- linkedlist_datablock_internal* first_block;
- linkedlist_datablock_internal* last_block;
-} linkedlist_data;
-
-
-typedef struct
-{
- z_stream stream; /* zLib stream structure for inflate */
-#ifdef HAVE_BZIP2
- bz_stream bstream; /* bzLib stream structure for bziped */
-#endif
-
- int stream_initialised; /* 1 is stream is initialised */
- uInt pos_in_buffered_data; /* last written byte in buffered_data */
-
- ZPOS64_T pos_local_header; /* offset of the local header of the file
- currenty writing */
- char* central_header; /* central header data for the current file */
- uLong size_centralExtra;
- uLong size_centralheader; /* size of the central header for cur file */
- uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */
- uLong flag; /* flag of the file currently writing */
-
- int method; /* compression method of file currenty wr.*/
- int raw; /* 1 for directly writing raw data */
- Byte buffered_dataZ_BUFSIZE;/* buffer contain compressed data to be writ*/
- uLong dosDate;
- uLong crc32;
- int encrypt;
- int zip64; /* Add ZIP64 extened information in the extra field */
- ZPOS64_T pos_zip64extrainfo;
- ZPOS64_T totalCompressedData;
- ZPOS64_T totalUncompressedData;
-#ifndef NOCRYPT
- unsigned long keys3; /* keys defining the pseudo-random sequence */
- const unsigned long* pcrc_32_tab;
- int crypt_header_size;
-#endif
-} curfile64_info;
-
-typedef struct
-{
- zlib_filefunc64_32_def z_filefunc;
- voidpf filestream; /* io structore of the zipfile */
- linkedlist_data central_dir;/* datablock with central dir in construction*/
- int in_opened_file_inzip; /* 1 if a file in the zip is currently writ.*/
- curfile64_info ci; /* info on the file curretly writing */
-
- ZPOS64_T begin_pos; /* position of the beginning of the zipfile */
- ZPOS64_T add_position_when_writting_offset;
- ZPOS64_T number_entry;
-
-#ifndef NO_ADDFILEINEXISTINGZIP
- char *globalcomment;
-#endif
-
-} zip64_internal;
-
-
-#ifndef NOCRYPT
-#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
-#include "crypt.h"
-#endif
-
-local linkedlist_datablock_internal* allocate_new_datablock()
-{
- linkedlist_datablock_internal* ldi;
- ldi = (linkedlist_datablock_internal*)
- ALLOC(sizeof(linkedlist_datablock_internal));
- if (ldi!=NULL)
- {
- ldi->next_datablock = NULL ;
- ldi->filled_in_this_block = 0 ;
- ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
- }
- return ldi;
-}
-
-local void free_datablock(linkedlist_datablock_internal* ldi)
-{
- while (ldi!=NULL)
- {
- linkedlist_datablock_internal* ldinext = ldi->next_datablock;
- TRYFREE(ldi);
- ldi = ldinext;
- }
-}
-
-local void init_linkedlist(linkedlist_data* ll)
-{
- ll->first_block = ll->last_block = NULL;
-}
-
-local void free_linkedlist(linkedlist_data* ll)
-{
- free_datablock(ll->first_block);
- ll->first_block = ll->last_block = NULL;
-}
-
-
-local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
-{
- linkedlist_datablock_internal* ldi;
- const unsigned char* from_copy;
-
- if (ll==NULL)
- return ZIP_INTERNALERROR;
-
- if (ll->last_block == NULL)
- {
- ll->first_block = ll->last_block = allocate_new_datablock();
- if (ll->first_block == NULL)
- return ZIP_INTERNALERROR;
- }
-
- ldi = ll->last_block;
- from_copy = (unsigned char*)buf;
-
- while (len>0)
- {
- uInt copy_this;
- uInt i;
- unsigned char* to_copy;
-
- if (ldi->avail_in_this_block==0)
- {
- ldi->next_datablock = allocate_new_datablock();
- if (ldi->next_datablock == NULL)
- return ZIP_INTERNALERROR;
- ldi = ldi->next_datablock ;
- ll->last_block = ldi;
- }
-
- if (ldi->avail_in_this_block < len)
- copy_this = (uInt)ldi->avail_in_this_block;
- else
- copy_this = (uInt)len;
-
- to_copy = &(ldi->dataldi->filled_in_this_block);
-
- for (i=0;i<copy_this;i++)
- *(to_copy+i)=*(from_copy+i);
-
- ldi->filled_in_this_block += copy_this;
- ldi->avail_in_this_block -= copy_this;
- from_copy += copy_this ;
- len -= copy_this;
- }
- return ZIP_OK;
-}
-
-
-
-/****************************************************************************/
-
-#ifndef NO_ADDFILEINEXISTINGZIP
-/* ===========================================================================
- Inputs a long in LSB order to the given file
- nbByte == 1, 2 ,4 or 8 (byte, short or long, ZPOS64_T)
-*/
-
-local int zip64local_putValue OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte));
-local int zip64local_putValue (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte)
-{
- unsigned char buf8;
- int n;
- for (n = 0; n < nbByte; n++)
- {
- bufn = (unsigned char)(x & 0xff);
- x >>= 8;
- }
- if (x != 0)
- { /* data overflow - hack for ZIP64 (X Roche) */
- for (n = 0; n < nbByte; n++)
- {
- bufn = 0xff;
- }
- }
-
- if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
- return ZIP_ERRNO;
- else
- return ZIP_OK;
-}
-
-local void zip64local_putValue_inmemory OF((void* dest, ZPOS64_T x, int nbByte));
-local void zip64local_putValue_inmemory (void* dest, ZPOS64_T x, int nbByte)
-{
- unsigned char* buf=(unsigned char*)dest;
- int n;
- for (n = 0; n < nbByte; n++) {
- bufn = (unsigned char)(x & 0xff);
- x >>= 8;
- }
-
- if (x != 0)
- { /* data overflow - hack for ZIP64 */
- for (n = 0; n < nbByte; n++)
- {
- bufn = 0xff;
- }
- }
-}
-
-/****************************************************************************/
-
-
-local uLong zip64local_TmzDateToDosDate(const tm_zip* ptm)
-{
- uLong year = (uLong)ptm->tm_year;
- if (year>=1980)
- year-=1980;
- else if (year>=80)
- year-=80;
- return
- (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
- ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
-}
-
-
-/****************************************************************************/
-
-local int zip64local_getByte OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi));
-
-local int zip64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def,voidpf filestream,int* pi)
-{
- unsigned char c;
- int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
- if (err==1)
- {
- *pi = (int)c;
- return ZIP_OK;
- }
- else
- {
- if (ZERROR64(*pzlib_filefunc_def,filestream))
- return ZIP_ERRNO;
- else
- return ZIP_EOF;
- }
-}
-
-
-/* ===========================================================================
- Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int zip64local_getShort OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
-
-local int zip64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
-{
- uLong x ;
- int i = 0;
- int err;
-
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x = (uLong)i;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<8;
-
- if (err==ZIP_OK)
- *pX = x;
- else
- *pX = 0;
- return err;
-}
-
-local int zip64local_getLong OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
-
-local int zip64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
-{
- uLong x ;
- int i = 0;
- int err;
-
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x = (uLong)i;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<8;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<16;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((uLong)i)<<24;
-
- if (err==ZIP_OK)
- *pX = x;
- else
- *pX = 0;
- return err;
-}
-
-local int zip64local_getLong64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX));
-
-
-local int zip64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX)
-{
- ZPOS64_T x;
- int i = 0;
- int err;
-
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x = (ZPOS64_T)i;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((ZPOS64_T)i)<<8;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((ZPOS64_T)i)<<16;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((ZPOS64_T)i)<<24;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((ZPOS64_T)i)<<32;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((ZPOS64_T)i)<<40;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((ZPOS64_T)i)<<48;
-
- if (err==ZIP_OK)
- err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
- x += ((ZPOS64_T)i)<<56;
-
- if (err==ZIP_OK)
- *pX = x;
- else
- *pX = 0;
-
- return err;
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-/*
- Locate the Central directory of a zipfile (at the end, just before
- the global comment)
-*/
-local ZPOS64_T zip64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
-
-local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
-{
- unsigned char* buf;
- ZPOS64_T uSizeFile;
- ZPOS64_T uBackRead;
- ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
- ZPOS64_T uPosFound=0;
-
- if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
- return 0;
-
-
- uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
- if (uMaxBack>uSizeFile)
- uMaxBack = uSizeFile;
-
- buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
- if (buf==NULL)
- return 0;
-
- uBackRead = 4;
- while (uBackRead<uMaxBack)
- {
- uLong uReadSize;
- ZPOS64_T uReadPos ;
- int i;
- if (uBackRead+BUFREADCOMMENT>uMaxBack)
- uBackRead = uMaxBack;
- else
- uBackRead+=BUFREADCOMMENT;
- uReadPos = uSizeFile-uBackRead ;
-
- uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
- (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
- if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
- break;
-
- if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
- break;
-
- for (i=(int)uReadSize-3; (i--)>0;)
- if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
- ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
- {
- uPosFound = uReadPos+i;
- break;
- }
-
- if (uPosFound!=0)
- break;
- }
- TRYFREE(buf);
- return uPosFound;
-}
-
-/*
-Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
-the global comment)
-*/
-local ZPOS64_T zip64local_SearchCentralDir64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
-
-local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
-{
- unsigned char* buf;
- ZPOS64_T uSizeFile;
- ZPOS64_T uBackRead;
- ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
- ZPOS64_T uPosFound=0;
- uLong uL;
- ZPOS64_T relativeOffset;
-
- if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
- return 0;
-
- uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
-
- if (uMaxBack>uSizeFile)
- uMaxBack = uSizeFile;
-
- buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
- if (buf==NULL)
- return 0;
-
- uBackRead = 4;
- while (uBackRead<uMaxBack)
- {
- uLong uReadSize;
- ZPOS64_T uReadPos;
- int i;
- if (uBackRead+BUFREADCOMMENT>uMaxBack)
- uBackRead = uMaxBack;
- else
- uBackRead+=BUFREADCOMMENT;
- uReadPos = uSizeFile-uBackRead ;
-
- uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
- (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
- if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
- break;
-
- if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
- break;
-
- for (i=(int)uReadSize-3; (i--)>0;)
- {
- // Signature "0x07064b50" Zip64 end of central directory locater
- if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
- {
- uPosFound = uReadPos+i;
- break;
- }
- }
-
- if (uPosFound!=0)
- break;
- }
-
- TRYFREE(buf);
- if (uPosFound == 0)
- return 0;
-
- /* Zip64 end of central directory locator */
- if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
- return 0;
-
- /* the signature, already checked */
- if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
- return 0;
-
- /* number of the disk with the start of the zip64 end of central directory */
- if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
- return 0;
- if (uL != 0)
- return 0;
-
- /* relative offset of the zip64 end of central directory record */
- if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
- return 0;
-
- /* total number of disks */
- if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
- return 0;
- if (uL != 1)
- return 0;
-
- /* Goto Zip64 end of central directory record */
- if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
- return 0;
-
- /* the signature */
- if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
- return 0;
-
- if (uL != 0x06064b50) // signature of 'Zip64 end of central directory'
- return 0;
-
- return relativeOffset;
-}
-
-int LoadCentralDirectoryRecord(zip64_internal* pziinit)
-{
- int err=ZIP_OK;
- ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-
- ZPOS64_T size_central_dir; /* size of the central directory */
- ZPOS64_T offset_central_dir; /* offset of start of central directory */
- ZPOS64_T central_pos;
- uLong uL;
-
- uLong number_disk; /* number of the current dist, used for
- spaning ZIP, unsupported, always 0*/
- uLong number_disk_with_CD; /* number the the disk with central dir, used
- for spaning ZIP, unsupported, always 0*/
- ZPOS64_T number_entry;
- ZPOS64_T number_entry_CD; /* total number of entries in
- the central dir
- (same than number_entry on nospan) */
- uLong VersionMadeBy;
- uLong VersionNeeded;
- uLong size_comment;
-
- int hasZIP64Record = 0;
-
- // check first if we find a ZIP64 record
- central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream);
- if(central_pos > 0)
- {
- hasZIP64Record = 1;
- }
- else if(central_pos == 0)
- {
- central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
- }
-
-/* disable to allow appending to empty ZIP archive
- if (central_pos==0)
- err=ZIP_ERRNO;
-*/
-
- if(hasZIP64Record)
- {
- ZPOS64_T sizeEndOfCentralDirectory;
- if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
- err=ZIP_ERRNO;
-
- /* the signature, already checked */
- if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* size of zip64 end of central directory record */
- if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* version made by */
- if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* version needed to extract */
- if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* number of this disk */
- if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* number of the disk with the start of the central directory */
- if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* total number of entries in the central directory on this disk */
- if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* total number of entries in the central directory */
- if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
- err=ZIP_BADZIPFILE;
-
- /* size of the central directory */
- if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* offset of start of central directory with respect to the
- starting disk number */
- if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- // TODO..
- // read the comment from the standard central header.
- size_comment = 0;
- }
- else
- {
- // Read End of central Directory info
- if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
- err=ZIP_ERRNO;
-
- /* the signature, already checked */
- if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* number of this disk */
- if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* number of the disk with the start of the central directory */
- if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
- err=ZIP_ERRNO;
-
- /* total number of entries in the central dir on this disk */
- number_entry = 0;
- if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
- err=ZIP_ERRNO;
- else
- number_entry = uL;
-
- /* total number of entries in the central dir */
- number_entry_CD = 0;
- if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
- err=ZIP_ERRNO;
- else
- number_entry_CD = uL;
-
- if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
- err=ZIP_BADZIPFILE;
-
- /* size of the central directory */
- size_central_dir = 0;
- if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
- err=ZIP_ERRNO;
- else
- size_central_dir = uL;
-
- /* offset of start of central directory with respect to the starting disk number */
- offset_central_dir = 0;
- if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
- err=ZIP_ERRNO;
- else
- offset_central_dir = uL;
-
-
- /* zipfile global comment length */
- if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &size_comment)!=ZIP_OK)
- err=ZIP_ERRNO;
- }
-
- if ((central_pos<offset_central_dir+size_central_dir) &&
- (err==ZIP_OK))
- err=ZIP_BADZIPFILE;
-
- if (err!=ZIP_OK)
- {
- ZCLOSE64(pziinit->z_filefunc, pziinit->filestream);
- return ZIP_ERRNO;
- }
-
- if (size_comment>0)
- {
- pziinit->globalcomment = (char*)ALLOC(size_comment+1);
- if (pziinit->globalcomment)
- {
- size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
- pziinit->globalcommentsize_comment=0;
- }
- }
-
- byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
- pziinit->add_position_when_writting_offset = byte_before_the_zipfile;
-
- {
- ZPOS64_T size_central_dir_to_read = size_central_dir;
- size_t buf_size = SIZEDATA_INDATABLOCK;
- void* buf_read = (void*)ALLOC(buf_size);
- if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
- err=ZIP_ERRNO;
-
- while ((size_central_dir_to_read>0) && (err==ZIP_OK))
- {
- ZPOS64_T read_this = SIZEDATA_INDATABLOCK;
- if (read_this > size_central_dir_to_read)
- read_this = size_central_dir_to_read;
-
- if (ZREAD64(pziinit->z_filefunc, pziinit->filestream,buf_read,(uLong)read_this) != read_this)
- err=ZIP_ERRNO;
-
- if (err==ZIP_OK)
- err = add_data_in_datablock(&pziinit->central_dir,buf_read, (uLong)read_this);
-
- size_central_dir_to_read-=read_this;
- }
- TRYFREE(buf_read);
- }
- pziinit->begin_pos = byte_before_the_zipfile;
- pziinit->number_entry = number_entry_CD;
-
- if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET) != 0)
- err=ZIP_ERRNO;
-
- return err;
-}
-
-
-#endif /* !NO_ADDFILEINEXISTINGZIP*/
-
-
-/************************************************************/
-extern zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def)
-{
- zip64_internal ziinit;
- zip64_internal* zi;
- int err=ZIP_OK;
-
- ziinit.z_filefunc.zseek32_file = NULL;
- ziinit.z_filefunc.ztell32_file = NULL;
- if (pzlib_filefunc64_32_def==NULL)
- fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64);
- else
- ziinit.z_filefunc = *pzlib_filefunc64_32_def;
-
- ziinit.filestream = ZOPEN64(ziinit.z_filefunc,
- pathname,
- (append == APPEND_STATUS_CREATE) ?
- (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
- (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
-
- if (ziinit.filestream == NULL)
- return NULL;
-
- if (append == APPEND_STATUS_CREATEAFTER)
- ZSEEK64(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END);
-
- ziinit.begin_pos = ZTELL64(ziinit.z_filefunc,ziinit.filestream);
- ziinit.in_opened_file_inzip = 0;
- ziinit.ci.stream_initialised = 0;
- ziinit.number_entry = 0;
- ziinit.add_position_when_writting_offset = 0;
- init_linkedlist(&(ziinit.central_dir));
-
-
-
- zi = (zip64_internal*)ALLOC(sizeof(zip64_internal));
- if (zi==NULL)
- {
- ZCLOSE64(ziinit.z_filefunc,ziinit.filestream);
- return NULL;
- }
-
- /* now we add file in a zipfile */
-# ifndef NO_ADDFILEINEXISTINGZIP
- ziinit.globalcomment = NULL;
- if (append == APPEND_STATUS_ADDINZIP)
- {
- // Read and Cache Central Directory Records
- err = LoadCentralDirectoryRecord(&ziinit);
- }
-
- if (globalcomment)
- {
- *globalcomment = ziinit.globalcomment;
- }
-# endif /* !NO_ADDFILEINEXISTINGZIP*/
-
- if (err != ZIP_OK)
- {
-# ifndef NO_ADDFILEINEXISTINGZIP
- TRYFREE(ziinit.globalcomment);
-# endif /* !NO_ADDFILEINEXISTINGZIP*/
- TRYFREE(zi);
- return NULL;
- }
- else
- {
- *zi = ziinit;
- return (zipFile)zi;
- }
-}
-
-extern zipFile ZEXPORT zipOpen2 (const char *pathname, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def)
-{
- if (pzlib_filefunc32_def != NULL)
- {
- zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
- fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
- return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
- }
- else
- return zipOpen3(pathname, append, globalcomment, NULL);
-}
-
-extern zipFile ZEXPORT zipOpen2_64 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def)
-{
- if (pzlib_filefunc_def != NULL)
- {
- zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
- zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
- zlib_filefunc64_32_def_fill.ztell32_file = NULL;
- zlib_filefunc64_32_def_fill.zseek32_file = NULL;
- return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
- }
- else
- return zipOpen3(pathname, append, globalcomment, NULL);
-}
-
-
-
-extern zipFile ZEXPORT zipOpen (const char* pathname, int append)
-{
- return zipOpen3((const void*)pathname,append,NULL,NULL);
-}
-
-extern zipFile ZEXPORT zipOpen64 (const void* pathname, int append)
-{
- return zipOpen3(pathname,append,NULL,NULL);
-}
-
-int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
-{
- /* write the local header */
- int err;
- uInt size_filename = (uInt)strlen(filename);
- uInt size_extrafield = size_extrafield_local;
-
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC, 4);
-
- if (err==ZIP_OK)
- {
- if(zi->ci.zip64)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);/* version needed to extract */
- else
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
- }
-
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
-
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
-
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
-
- // CRC / Compressed size / Uncompressed size will be filled in later and rewritten later
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
- if (err==ZIP_OK)
- {
- if(zi->ci.zip64)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* compressed size, unknown */
- else
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
- }
- if (err==ZIP_OK)
- {
- if(zi->ci.zip64)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* uncompressed size, unknown */
- else
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
- }
-
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
-
- if(zi->ci.zip64)
- {
- size_extrafield += 20;
- }
-
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield,2);
-
- if ((err==ZIP_OK) && (size_filename > 0))
- {
- if (ZWRITE64(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
- err = ZIP_ERRNO;
- }
-
- if ((err==ZIP_OK) && (size_extrafield_local > 0))
- {
- if (ZWRITE64(zi->z_filefunc, zi->filestream, extrafield_local, size_extrafield_local) != size_extrafield_local)
- err = ZIP_ERRNO;
- }
-
-
- if ((err==ZIP_OK) && (zi->ci.zip64))
- {
- // write the Zip64 extended info
- short HeaderID = 1;
- short DataSize = 16;
- ZPOS64_T CompressedSize = 0;
- ZPOS64_T UncompressedSize = 0;
-
- // Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file)
- zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
-
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
-
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
- }
-
- return err;
-}
-
-/*
- NOTE.
- When writing RAW the ZIP64 extended information in extrafield_local and extrafield_global needs to be stripped
- before calling this function it can be done with zipRemoveExtraInfoBlock
-
- It is not done here because then we need to realloc a new buffer since parameters are 'const' and I want to minimize
- unnecessary allocations.
- */
-extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void* extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level, int raw,
- int windowBits,int memLevel, int strategy,
- const char* password, uLong crcForCrypting,
- uLong versionMadeBy, uLong flagBase, int zip64)
-{
- zip64_internal* zi;
- uInt size_filename;
- uInt size_comment;
- uInt i;
- int err = ZIP_OK;
-
-# ifdef NOCRYPT
- (crcForCrypting);
- if (password != NULL)
- return ZIP_PARAMERROR;
-# endif
-
- if (file == NULL)
- return ZIP_PARAMERROR;
-
-#ifdef HAVE_BZIP2
- if ((method!=0) && (method!=Z_DEFLATED) && (method!=Z_BZIP2ED))
- return ZIP_PARAMERROR;
-#else
- if ((method!=0) && (method!=Z_DEFLATED))
- return ZIP_PARAMERROR;
-#endif
-
- zi = (zip64_internal*)file;
-
- if (zi->in_opened_file_inzip == 1)
- {
- err = zipCloseFileInZip (file);
- if (err != ZIP_OK)
- return err;
- }
-
- if (filename==NULL)
- filename="-";
-
- if (comment==NULL)
- size_comment = 0;
- else
- size_comment = (uInt)strlen(comment);
-
- size_filename = (uInt)strlen(filename);
-
- if (zipfi == NULL)
- zi->ci.dosDate = 0;
- else
- {
- if (zipfi->dosDate != 0)
- zi->ci.dosDate = zipfi->dosDate;
- else
- zi->ci.dosDate = zip64local_TmzDateToDosDate(&zipfi->tmz_date);
- }
-
- zi->ci.flag = flagBase;
- if ((level==8) || (level==9))
- zi->ci.flag |= 2;
- if ((level==2))
- zi->ci.flag |= 4;
- if ((level==1))
- zi->ci.flag |= 6;
- if (password != NULL)
- zi->ci.flag |= 1;
-
- zi->ci.crc32 = 0;
- zi->ci.method = method;
- zi->ci.encrypt = 0;
- zi->ci.stream_initialised = 0;
- zi->ci.pos_in_buffered_data = 0;
- zi->ci.raw = raw;
- zi->ci.pos_local_header = ZTELL64(zi->z_filefunc,zi->filestream);
-
- zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + size_extrafield_global + size_comment;
- zi->ci.size_centralExtraFree = 32; // Extra space we have reserved in case we need to add ZIP64 extra info data
-
- zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader + zi->ci.size_centralExtraFree);
-
- zi->ci.size_centralExtra = size_extrafield_global;
- zip64local_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
- /* version info */
- zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2);
- zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
- zip64local_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
- zip64local_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
- zip64local_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
- zip64local_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
- zip64local_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
- zip64local_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
- zip64local_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
- zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
- zip64local_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
- zip64local_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
-
- if (zipfi==NULL)
- zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
- else
- zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
-
- if (zipfi==NULL)
- zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
- else
- zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
-
- if(zi->ci.pos_local_header >= 0xffffffff)
- zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
- else
- zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writting_offset,4);
-
- for (i=0;i<size_filename;i++)
- *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
-
- for (i=0;i<size_extrafield_global;i++)
- *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
- *(((const char*)extrafield_global)+i);
-
- for (i=0;i<size_comment;i++)
- *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
- size_extrafield_global+i) = *(comment+i);
- if (zi->ci.central_header == NULL)
- return ZIP_INTERNALERROR;
-
- zi->ci.zip64 = zip64;
- zi->ci.totalCompressedData = 0;
- zi->ci.totalUncompressedData = 0;
- zi->ci.pos_zip64extrainfo = 0;
-
- err = Write_LocalFileHeader(zi, filename, size_extrafield_local, extrafield_local);
-
-#ifdef HAVE_BZIP2
- zi->ci.bstream.avail_in = (uInt)0;
- zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
- zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
- zi->ci.bstream.total_in_hi32 = 0;
- zi->ci.bstream.total_in_lo32 = 0;
- zi->ci.bstream.total_out_hi32 = 0;
- zi->ci.bstream.total_out_lo32 = 0;
-#endif
-
- zi->ci.stream.avail_in = (uInt)0;
- zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
- zi->ci.stream.next_out = zi->ci.buffered_data;
- zi->ci.stream.total_in = 0;
- zi->ci.stream.total_out = 0;
- zi->ci.stream.data_type = Z_BINARY;
-
-#ifdef HAVE_BZIP2
- if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED || zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
-#else
- if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
-#endif
- {
- if(zi->ci.method == Z_DEFLATED)
- {
- zi->ci.stream.zalloc = (alloc_func)0;
- zi->ci.stream.zfree = (free_func)0;
- zi->ci.stream.opaque = (voidpf)0;
-
- if (windowBits>0)
- windowBits = -windowBits;
-
- err = deflateInit2(&zi->ci.stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
-
- if (err==Z_OK)
- zi->ci.stream_initialised = Z_DEFLATED;
- }
- else if(zi->ci.method == Z_BZIP2ED)
- {
-#ifdef HAVE_BZIP2
- // Init BZip stuff here
- zi->ci.bstream.bzalloc = 0;
- zi->ci.bstream.bzfree = 0;
- zi->ci.bstream.opaque = (voidpf)0;
-
- err = BZ2_bzCompressInit(&zi->ci.bstream, level, 0,35);
- if(err == BZ_OK)
- zi->ci.stream_initialised = Z_BZIP2ED;
-#endif
- }
-
- }
-
-# ifndef NOCRYPT
- zi->ci.crypt_header_size = 0;
- if ((err==Z_OK) && (password != NULL))
- {
- unsigned char bufHeadRAND_HEAD_LEN;
- unsigned int sizeHead;
- zi->ci.encrypt = 1;
- zi->ci.pcrc_32_tab = get_crc_table();
- /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
-
- sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
- zi->ci.crypt_header_size = sizeHead;
-
- if (ZWRITE64(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
- err = ZIP_ERRNO;
- }
-# endif
-
- if (err==Z_OK)
- zi->in_opened_file_inzip = 1;
- return err;
-}
-
-extern int ZEXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void* extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level, int raw,
- int windowBits,int memLevel, int strategy,
- const char* password, uLong crcForCrypting,
- uLong versionMadeBy, uLong flagBase)
-{
- return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, raw,
- windowBits, memLevel, strategy,
- password, crcForCrypting, versionMadeBy, flagBase, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void* extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level, int raw,
- int windowBits,int memLevel, int strategy,
- const char* password, uLong crcForCrypting)
-{
- return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, raw,
- windowBits, memLevel, strategy,
- password, crcForCrypting, VERSIONMADEBY, 0, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void* extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level, int raw,
- int windowBits,int memLevel, int strategy,
- const char* password, uLong crcForCrypting, int zip64)
-{
- return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, raw,
- windowBits, memLevel, strategy,
- password, crcForCrypting, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void* extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level, int raw)
-{
- return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, raw,
- -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
- NULL, 0, VERSIONMADEBY, 0, 0);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void* extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level, int raw, int zip64)
-{
- return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, raw,
- -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
- NULL, 0, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void*extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level, int zip64)
-{
- return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, 0,
- -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
- NULL, 0, VERSIONMADEBY, 0, zip64);
-}
-
-extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
- const void* extrafield_local, uInt size_extrafield_local,
- const void*extrafield_global, uInt size_extrafield_global,
- const char* comment, int method, int level)
-{
- return zipOpenNewFileInZip4_64 (file, filename, zipfi,
- extrafield_local, size_extrafield_local,
- extrafield_global, size_extrafield_global,
- comment, method, level, 0,
- -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
- NULL, 0, VERSIONMADEBY, 0, 0);
-}
-
-local int zip64FlushWriteBuffer(zip64_internal* zi)
-{
- int err=ZIP_OK;
-
- if (zi->ci.encrypt != 0)
- {
-#ifndef NOCRYPT
- uInt i;
- int t;
- for (i=0;i<zi->ci.pos_in_buffered_data;i++)
- zi->ci.buffered_datai = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_datai,t);
-#endif
- }
-
- if (ZWRITE64(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data) != zi->ci.pos_in_buffered_data)
- err = ZIP_ERRNO;
-
- zi->ci.totalCompressedData += zi->ci.pos_in_buffered_data;
-
-#ifdef HAVE_BZIP2
- if(zi->ci.method == Z_BZIP2ED)
- {
- zi->ci.totalUncompressedData += zi->ci.bstream.total_in_lo32;
- zi->ci.bstream.total_in_lo32 = 0;
- zi->ci.bstream.total_in_hi32 = 0;
- }
- else
-#endif
- {
- zi->ci.totalUncompressedData += zi->ci.stream.total_in;
- zi->ci.stream.total_in = 0;
- }
-
-
- zi->ci.pos_in_buffered_data = 0;
-
- return err;
-}
-
-extern int ZEXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned int len)
-{
- zip64_internal* zi;
- int err=ZIP_OK;
-
- if (file == NULL)
- return ZIP_PARAMERROR;
- zi = (zip64_internal*)file;
-
- if (zi->in_opened_file_inzip == 0)
- return ZIP_PARAMERROR;
-
- zi->ci.crc32 = crc32(zi->ci.crc32,buf,(uInt)len);
-
-#ifdef HAVE_BZIP2
- if(zi->ci.method == Z_BZIP2ED && (!zi->ci.raw))
- {
- zi->ci.bstream.next_in = (void*)buf;
- zi->ci.bstream.avail_in = len;
- err = BZ_RUN_OK;
-
- while ((err==BZ_RUN_OK) && (zi->ci.bstream.avail_in>0))
- {
- if (zi->ci.bstream.avail_out == 0)
- {
- if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
- err = ZIP_ERRNO;
- zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
- zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
- }
-
-
- if(err != BZ_RUN_OK)
- break;
-
- if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
- {
- uLong uTotalOutBefore_lo = zi->ci.bstream.total_out_lo32;
-// uLong uTotalOutBefore_hi = zi->ci.bstream.total_out_hi32;
- err=BZ2_bzCompress(&zi->ci.bstream, BZ_RUN);
-
- zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore_lo) ;
- }
- }
-
- if(err == BZ_RUN_OK)
- err = ZIP_OK;
- }
- else
-#endif
- {
- zi->ci.stream.next_in = (Bytef*)buf;
- zi->ci.stream.avail_in = len;
-
- while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
- {
- if (zi->ci.stream.avail_out == 0)
- {
- if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
- err = ZIP_ERRNO;
- zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
- zi->ci.stream.next_out = zi->ci.buffered_data;
- }
-
-
- if(err != ZIP_OK)
- break;
-
- if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
- {
- uLong uTotalOutBefore = zi->ci.stream.total_out;
- err=deflate(&zi->ci.stream, Z_NO_FLUSH);
- if(uTotalOutBefore > zi->ci.stream.total_out)
- {
- int bBreak = 0;
- bBreak++;
- }
-
- zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
- }
- else
- {
- uInt copy_this,i;
- if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
- copy_this = zi->ci.stream.avail_in;
- else
- copy_this = zi->ci.stream.avail_out;
-
- for (i = 0; i < copy_this; i++)
- *(((char*)zi->ci.stream.next_out)+i) =
- *(((const char*)zi->ci.stream.next_in)+i);
- {
- zi->ci.stream.avail_in -= copy_this;
- zi->ci.stream.avail_out-= copy_this;
- zi->ci.stream.next_in+= copy_this;
- zi->ci.stream.next_out+= copy_this;
- zi->ci.stream.total_in+= copy_this;
- zi->ci.stream.total_out+= copy_this;
- zi->ci.pos_in_buffered_data += copy_this;
- }
- }
- }// while(...)
- }
-
- return err;
-}
-
-extern int ZEXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32)
-{
- return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
-}
-
-extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32)
-{
- zip64_internal* zi;
- ZPOS64_T compressed_size;
- uLong invalidValue = 0xffffffff;
- short datasize = 0;
- int err=ZIP_OK;
-
- if (file == NULL)
- return ZIP_PARAMERROR;
- zi = (zip64_internal*)file;
-
- if (zi->in_opened_file_inzip == 0)
- return ZIP_PARAMERROR;
- zi->ci.stream.avail_in = 0;
-
- if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
- {
- while (err==ZIP_OK)
- {
- uLong uTotalOutBefore;
- if (zi->ci.stream.avail_out == 0)
- {
- if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
- err = ZIP_ERRNO;
- zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
- zi->ci.stream.next_out = zi->ci.buffered_data;
- }
- uTotalOutBefore = zi->ci.stream.total_out;
- err=deflate(&zi->ci.stream, Z_FINISH);
- zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
- }
- }
- else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
- {
-#ifdef HAVE_BZIP2
- err = BZ_FINISH_OK;
- while (err==BZ_FINISH_OK)
- {
- uLong uTotalOutBefore;
- if (zi->ci.bstream.avail_out == 0)
- {
- if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
- err = ZIP_ERRNO;
- zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
- zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
- }
- uTotalOutBefore = zi->ci.bstream.total_out_lo32;
- err=BZ2_bzCompress(&zi->ci.bstream, BZ_FINISH);
- if(err == BZ_STREAM_END)
- err = Z_STREAM_END;
-
- zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore);
- }
-
- if(err == BZ_FINISH_OK)
- err = ZIP_OK;
-#endif
- }
-
- if (err==Z_STREAM_END)
- err=ZIP_OK; /* this is normal */
-
- if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
- {
- if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
- err = ZIP_ERRNO;
- }
-
- if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
- {
- int tmp_err = deflateEnd(&zi->ci.stream);
- if (err == ZIP_OK)
- err = tmp_err;
- zi->ci.stream_initialised = 0;
- }
-#ifdef HAVE_BZIP2
- else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
- {
- int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
- if (err==ZIP_OK)
- err = tmperr;
- zi->ci.stream_initialised = 0;
- }
-#endif
-
- if (!zi->ci.raw)
- {
- crc32 = (uLong)zi->ci.crc32;
- uncompressed_size = zi->ci.totalUncompressedData;
- }
- compressed_size = zi->ci.totalCompressedData;
-
-# ifndef NOCRYPT
- compressed_size += zi->ci.crypt_header_size;
-# endif
-
- // update Current Item crc and sizes,
- if(compressed_size >= 0xffffffff || uncompressed_size >= 0xffffffff || zi->ci.pos_local_header >= 0xffffffff)
- {
- /*version Made by*/
- zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)45,2);
- /*version needed*/
- zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)45,2);
-
- }
-
- zip64local_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
-
-
- if(compressed_size >= 0xffffffff)
- zip64local_putValue_inmemory(zi->ci.central_header+20, invalidValue,4); /*compr size*/
- else
- zip64local_putValue_inmemory(zi->ci.central_header+20, compressed_size,4); /*compr size*/
-
- /// set internal file attributes field
- if (zi->ci.stream.data_type == Z_ASCII)
- zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
-
- if(uncompressed_size >= 0xffffffff)
- zip64local_putValue_inmemory(zi->ci.central_header+24, invalidValue,4); /*uncompr size*/
- else
- zip64local_putValue_inmemory(zi->ci.central_header+24, uncompressed_size,4); /*uncompr size*/
-
- // Add ZIP64 extra info field for uncompressed size
- if(uncompressed_size >= 0xffffffff)
- datasize += 8;
-
- // Add ZIP64 extra info field for compressed size
- if(compressed_size >= 0xffffffff)
- datasize += 8;
-
- // Add ZIP64 extra info field for relative offset to local file header of current file
- if(zi->ci.pos_local_header >= 0xffffffff)
- datasize += 8;
-
- if(datasize > 0)
- {
- char* p = NULL;
-
- if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
- {
- // we can not write more data to the buffer that we have room for.
- return ZIP_BADZIPFILE;
- }
-
- p = zi->ci.central_header + zi->ci.size_centralheader;
-
- // Add Extra Information Header for 'ZIP64 information'
- zip64local_putValue_inmemory(p, 0x0001, 2); // HeaderID
- p += 2;
- zip64local_putValue_inmemory(p, datasize, 2); // DataSize
- p += 2;
-
- if(uncompressed_size >= 0xffffffff)
- {
- zip64local_putValue_inmemory(p, uncompressed_size, 8);
- p += 8;
- }
-
- if(compressed_size >= 0xffffffff)
- {
- zip64local_putValue_inmemory(p, compressed_size, 8);
- p += 8;
- }
-
- if(zi->ci.pos_local_header >= 0xffffffff)
- {
- zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
- p += 8;
- }
-
- // Update how much extra free space we got in the memory buffer
- // and increase the centralheader size so the new ZIP64 fields are included
- // ( 4 below is the size of HeaderID and DataSize field )
- zi->ci.size_centralExtraFree -= datasize + 4;
- zi->ci.size_centralheader += datasize + 4;
-
- // Update the extra info size field
- zi->ci.size_centralExtra += datasize + 4;
- zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
- }
-
- if (err==ZIP_OK)
- err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
-
- free(zi->ci.central_header);
-
- if (err==ZIP_OK)
- {
- // Update the LocalFileHeader with the new values.
-
- ZPOS64_T cur_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
-
- if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
- err = ZIP_ERRNO;
-
- if (err==ZIP_OK)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
-
- if(uncompressed_size >= 0xffffffff || compressed_size >= 0xffffffff )
- {
- if(zi->ci.pos_zip64extrainfo > 0)
- {
- // Update the size in the ZIP64 extended field.
- if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_zip64extrainfo + 4,ZLIB_FILEFUNC_SEEK_SET)!=0)
- err = ZIP_ERRNO;
-
- if (err==ZIP_OK) /* compressed size, unknown */
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, uncompressed_size, 8);
-
- if (err==ZIP_OK) /* uncompressed size, unknown */
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8);
- }
- else
- err = ZIP_BADZIPFILE; // Caller passed zip64 = 0, so no room for zip64 info -> fatal
- }
- else
- {
- if (err==ZIP_OK) /* compressed size, unknown */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
-
- if (err==ZIP_OK) /* uncompressed size, unknown */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
- }
-
- if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
- err = ZIP_ERRNO;
- }
-
- zi->number_entry ++;
- zi->in_opened_file_inzip = 0;
-
- return err;
-}
-
-extern int ZEXPORT zipCloseFileInZip (zipFile file)
-{
- return zipCloseFileInZipRaw (file,0,0);
-}
-
-int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
-{
- int err = ZIP_OK;
- ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
-
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
-
- /*num disks*/
- if (err==ZIP_OK) /* number of the disk with the start of the central directory */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
- /*relative offset*/
- if (err==ZIP_OK) /* Relative offset to the Zip64EndOfCentralDirectory */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
-
- /*total disks*/ /* Do not support spawning of disk so always say 1 here*/
- if (err==ZIP_OK) /* number of the disk with the start of the central directory */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)1,4);
-
- return err;
-}
-
-int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
-{
- int err = ZIP_OK;
-
- uLong Zip64DataSize = 44;
-
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDHEADERMAGIC,4);
-
- if (err==ZIP_OK) /* size of this 'zip64 end of central directory' */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)Zip64DataSize,8); // why ZPOS64_T of this ?
-
- if (err==ZIP_OK) /* version made by */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
-
- if (err==ZIP_OK) /* version needed */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
-
- if (err==ZIP_OK) /* number of this disk */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
- if (err==ZIP_OK) /* number of the disk with the start of the central directory */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
-
- if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
-
- if (err==ZIP_OK) /* total number of entries in the central dir */
- err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
-
- if (err==ZIP_OK) /* size of the central directory */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
-
- if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
- {
- ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
- }
- return err;
-}
-int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
-{
- int err = ZIP_OK;
-
- /*signature*/
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
-
- if (err==ZIP_OK) /* number of this disk */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
-
- if (err==ZIP_OK) /* number of the disk with the start of the central directory */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
-
- if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
- {
- {
- if(zi->number_entry >= 0xFFFF)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
- else
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
- }
- }
-
- if (err==ZIP_OK) /* total number of entries in the central dir */
- {
- if(zi->number_entry >= 0xFFFF)
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
- else
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
- }
-
- if (err==ZIP_OK) /* size of the central directory */
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
-
- if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
- {
- ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
- if(pos >= 0xffffffff)
- {
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
- }
- else
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
- }
-
- return err;
-}
-
-int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
-{
- int err = ZIP_OK;
- uInt size_global_comment = 0;
-
- if(global_comment != NULL)
- size_global_comment = (uInt)strlen(global_comment);
-
- err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
-
- if (err == ZIP_OK && size_global_comment > 0)
- {
- if (ZWRITE64(zi->z_filefunc,zi->filestream, global_comment, size_global_comment) != size_global_comment)
- err = ZIP_ERRNO;
- }
- return err;
-}
-
-extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
-{
- zip64_internal* zi;
- int err = 0;
- uLong size_centraldir = 0;
- ZPOS64_T centraldir_pos_inzip;
- ZPOS64_T pos;
-
- if (file == NULL)
- return ZIP_PARAMERROR;
-
- zi = (zip64_internal*)file;
-
- if (zi->in_opened_file_inzip == 1)
- {
- err = zipCloseFileInZip (file);
- }
-
-#ifndef NO_ADDFILEINEXISTINGZIP
- if (global_comment==NULL)
- global_comment = zi->globalcomment;
-#endif
-
- centraldir_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
-
- if (err==ZIP_OK)
- {
- linkedlist_datablock_internal* ldi = zi->central_dir.first_block;
- while (ldi!=NULL)
- {
- if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
- {
- if (ZWRITE64(zi->z_filefunc,zi->filestream, ldi->data, ldi->filled_in_this_block) != ldi->filled_in_this_block)
- err = ZIP_ERRNO;
- }
-
- size_centraldir += ldi->filled_in_this_block;
- ldi = ldi->next_datablock;
- }
- }
- free_linkedlist(&(zi->central_dir));
-
- pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
- if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
- {
- ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
- Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
-
- Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
- }
-
- if (err==ZIP_OK)
- err = Write_EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
-
- if(err == ZIP_OK)
- err = Write_GlobalComment(zi, global_comment);
-
- if (ZCLOSE64(zi->z_filefunc,zi->filestream) != 0)
- if (err == ZIP_OK)
- err = ZIP_ERRNO;
-
-#ifndef NO_ADDFILEINEXISTINGZIP
- TRYFREE(zi->globalcomment);
-#endif
- TRYFREE(zi);
-
- return err;
-}
-
-extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader)
-{
- char* p = pData;
- int size = 0;
- char* pNewHeader;
- char* pTmp;
- short header;
- short dataSize;
-
- int retVal = ZIP_OK;
-
- if(pData == NULL || *dataLen < 4)
- return ZIP_PARAMERROR;
-
- pNewHeader = (char*)ALLOC(*dataLen);
- pTmp = pNewHeader;
-
- while(p < (pData + *dataLen))
- {
- header = *(short*)p;
- dataSize = *(((short*)p)+1);
-
- if( header == sHeader ) // Header found.
- {
- p += dataSize + 4; // skip it. do not copy to temp buffer
- }
- else
- {
- // Extra Info block should not be removed, So copy it to the temp buffer.
- memcpy(pTmp, p, dataSize + 4);
- p += dataSize + 4;
- size += dataSize + 4;
- }
-
- }
-
- if(size < *dataLen)
- {
- // clean old extra info block.
- memset(pData,0, *dataLen);
-
- // copy the new extra info block over the old
- if(size > 0)
- memcpy(pData, pNewHeader, size);
-
- // set the new extra info size
- *dataLen = size;
-
- retVal = ZIP_OK;
- }
- else
- retVal = ZIP_ERRNO;
-
- TRYFREE(pNewHeader);
-
- return retVal;
-}

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/pascal Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/pascal/zlibpas.pas Deleted

@@ -1,276 +0,0 @@
-(* zlibpas -- Pascal interface to the zlib data compression library
- *
- * Copyright (C) 2003 Cosmin Truta.
- * Derived from original sources by Bob Dellaca.
- * For conditions of distribution and use, see copyright notice in readme.txt
- *)
-
-unit zlibpas;
-
-interface
-
-const
-  ZLIB_VERSION = '1.2.6';
-  ZLIB_VERNUM  = $1260;
-
-type
-  alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
-                 cdecl;
-  free_func  = procedure(opaque, address: Pointer);
-                 cdecl;
-
-  in_func    = function(opaque: Pointer; var buf: PByte): Integer;
-                 cdecl;
-  out_func   = function(opaque: Pointer; buf: PByte; size: Integer): Integer;
-                 cdecl;
-
-  z_streamp = ^z_stream;
-  z_stream = packed record
-    next_in: PChar;       (* next input byte *)
-    avail_in: Integer;    (* number of bytes available at next_in *)
-    total_in: LongInt;    (* total nb of input bytes read so far *)
-
-    next_out: PChar;      (* next output byte should be put there *)
-    avail_out: Integer;   (* remaining free space at next_out *)
-    total_out: LongInt;   (* total nb of bytes output so far *)
-
-    msg: PChar;           (* last error message, NULL if no error *)
-    state: Pointer;       (* not visible by applications *)
-
-    zalloc: alloc_func;   (* used to allocate the internal state *)
-    zfree: free_func;     (* used to free the internal state *)
-    opaque: Pointer;      (* private data object passed to zalloc and zfree *)
-
-    data_type: Integer;   (* best guess about the data type: ascii or binary *)
-    adler: LongInt;       (* adler32 value of the uncompressed data *)
-    reserved: LongInt;    (* reserved for future use *)
-  end;
-
-  gz_headerp = ^gz_header;
-  gz_header = packed record
-    text: Integer;        (* true if compressed data believed to be text *)
-    time: LongInt;        (* modification time *)
-    xflags: Integer;      (* extra flags (not used when writing a gzip file) *)
-    os: Integer;          (* operating system *)
-    extra: PChar;         (* pointer to extra field or Z_NULL if none *)
-    extra_len: Integer;   (* extra field length (valid if extra != Z_NULL) *)
-    extra_max: Integer;   (* space at extra (only when reading header) *)
-    name: PChar;          (* pointer to zero-terminated file name or Z_NULL *)
-    name_max: Integer;    (* space at name (only when reading header) *)
-    comment: PChar;       (* pointer to zero-terminated comment or Z_NULL *)
-    comm_max: Integer;    (* space at comment (only when reading header) *)
-    hcrc: Integer;        (* true if there was or will be a header crc *)
-    done: Integer;        (* true when done reading gzip header *)
-  end;
-
-(* constants *)
-const
-  Z_NO_FLUSH      = 0;
-  Z_PARTIAL_FLUSH = 1;
-  Z_SYNC_FLUSH    = 2;
-  Z_FULL_FLUSH    = 3;
-  Z_FINISH        = 4;
-  Z_BLOCK         = 5;
-  Z_TREES         = 6;
-
-  Z_OK            =  0;
-  Z_STREAM_END    =  1;
-  Z_NEED_DICT     =  2;
-  Z_ERRNO         = -1;
-  Z_STREAM_ERROR  = -2;
-  Z_DATA_ERROR    = -3;
-  Z_MEM_ERROR     = -4;
-  Z_BUF_ERROR     = -5;
-  Z_VERSION_ERROR = -6;
-
-  Z_NO_COMPRESSION       =  0;
-  Z_BEST_SPEED           =  1;
-  Z_BEST_COMPRESSION     =  9;
-  Z_DEFAULT_COMPRESSION  = -1;
-
-  Z_FILTERED            = 1;
-  Z_HUFFMAN_ONLY        = 2;
-  Z_RLE                 = 3;
-  Z_FIXED               = 4;
-  Z_DEFAULT_STRATEGY    = 0;
-
-  Z_BINARY   = 0;
-  Z_TEXT     = 1;
-  Z_ASCII    = 1;
-  Z_UNKNOWN  = 2;
-
-  Z_DEFLATED = 8;
-
-(* basic functions *)
-function zlibVersion: PChar;
-function deflateInit(var strm: z_stream; level: Integer): Integer;
-function deflate(var strm: z_stream; flush: Integer): Integer;
-function deflateEnd(var strm: z_stream): Integer;
-function inflateInit(var strm: z_stream): Integer;
-function inflate(var strm: z_stream; flush: Integer): Integer;
-function inflateEnd(var strm: z_stream): Integer;
-
-(* advanced functions *)
-function deflateInit2(var strm: z_stream; level, method, windowBits,
-                      memLevel, strategy: Integer): Integer;
-function deflateSetDictionary(var strm: z_stream; const dictionary: PChar;
-                              dictLength: Integer): Integer;
-function deflateCopy(var dest, source: z_stream): Integer;
-function deflateReset(var strm: z_stream): Integer;
-function deflateParams(var strm: z_stream; level, strategy: Integer): Integer;
-function deflateTune(var strm: z_stream; good_length, max_lazy, nice_length, max_chain: Integer): Integer;
-function deflateBound(var strm: z_stream; sourceLen: LongInt): LongInt;
-function deflatePending(var strm: z_stream; var pending: Integer; var bits: Integer): Integer;
-function deflatePrime(var strm: z_stream; bits, value: Integer): Integer;
-function deflateSetHeader(var strm: z_stream; head: gz_header): Integer;
-function inflateInit2(var strm: z_stream; windowBits: Integer): Integer;
-function inflateSetDictionary(var strm: z_stream; const dictionary: PChar;
-                              dictLength: Integer): Integer;
-function inflateSync(var strm: z_stream): Integer;
-function inflateCopy(var dest, source: z_stream): Integer;
-function inflateReset(var strm: z_stream): Integer;
-function inflateReset2(var strm: z_stream; windowBits: Integer): Integer;
-function inflatePrime(var strm: z_stream; bits, value: Integer): Integer;
-function inflateMark(var strm: z_stream): LongInt;
-function inflateGetHeader(var strm: z_stream; var head: gz_header): Integer;
-function inflateBackInit(var strm: z_stream;
-                         windowBits: Integer; window: PChar): Integer;
-function inflateBack(var strm: z_stream; in_fn: in_func; in_desc: Pointer;
-                     out_fn: out_func; out_desc: Pointer): Integer;
-function inflateBackEnd(var strm: z_stream): Integer;
-function zlibCompileFlags: LongInt;
-
-(* utility functions *)
-function compress(dest: PChar; var destLen: LongInt;
-                  const source: PChar; sourceLen: LongInt): Integer;
-function compress2(dest: PChar; var destLen: LongInt;
-                  const source: PChar; sourceLen: LongInt;
-                  level: Integer): Integer;
-function compressBound(sourceLen: LongInt): LongInt;
-function uncompress(dest: PChar; var destLen: LongInt;
-                    const source: PChar; sourceLen: LongInt): Integer;
-
-(* checksum functions *)
-function adler32(adler: LongInt; const buf: PChar; len: Integer): LongInt;
-function adler32_combine(adler1, adler2, len2: LongInt): LongInt;
-function crc32(crc: LongInt; const buf: PChar; len: Integer): LongInt;
-function crc32_combine(crc1, crc2, len2: LongInt): LongInt;
-
-(* various hacks, don't look :) *)
-function deflateInit_(var strm: z_stream; level: Integer;
-                      const version: PChar; stream_size: Integer): Integer;
-function inflateInit_(var strm: z_stream; const version: PChar;
-                      stream_size: Integer): Integer;
-function deflateInit2_(var strm: z_stream;
-                       level, method, windowBits, memLevel, strategy: Integer;
-                       const version: PChar; stream_size: Integer): Integer;
-function inflateInit2_(var strm: z_stream; windowBits: Integer;
-                       const version: PChar; stream_size: Integer): Integer;
-function inflateBackInit_(var strm: z_stream;
-                          windowBits: Integer; window: PChar;
-                          const version: PChar; stream_size: Integer): Integer;
-
-
-implementation
-
-{$L adler32.obj}
-{$L compress.obj}
-{$L crc32.obj}
-{$L deflate.obj}
-{$L infback.obj}
-{$L inffast.obj}
-{$L inflate.obj}
-{$L inftrees.obj}
-{$L trees.obj}
-{$L uncompr.obj}
-{$L zutil.obj}
-
-function adler32; external;
-function adler32_combine; external;
-function compress; external;
-function compress2; external;
-function compressBound; external;
-function crc32; external;
-function crc32_combine; external;
-function deflate; external;
-function deflateBound; external;
-function deflateCopy; external;
-function deflateEnd; external;
-function deflateInit_; external;
-function deflateInit2_; external;
-function deflateParams; external;
-function deflatePending; external;
-function deflatePrime; external;
-function deflateReset; external;
-function deflateSetDictionary; external;
-function deflateSetHeader; external;
-function deflateTune; external;
-function inflate; external;
-function inflateBack; external;
-function inflateBackEnd; external;
-function inflateBackInit_; external;
-function inflateCopy; external;
-function inflateEnd; external;
-function inflateGetHeader; external;
-function inflateInit_; external;
-function inflateInit2_; external;
-function inflateMark; external;
-function inflatePrime; external;
-function inflateReset; external;
-function inflateReset2; external;
-function inflateSetDictionary; external;
-function inflateSync; external;
-function uncompress; external;
-function zlibCompileFlags; external;
-function zlibVersion; external;
-
-function deflateInit(var strm: z_stream; level: Integer): Integer;
-begin
-  Result := deflateInit_(strm, level, ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function deflateInit2(var strm: z_stream; level, method, windowBits, memLevel,
-                      strategy: Integer): Integer;
-begin
-  Result := deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-                          ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function inflateInit(var strm: z_stream): Integer;
-begin
-  Result := inflateInit_(strm, ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function inflateInit2(var strm: z_stream; windowBits: Integer): Integer;
-begin
-  Result := inflateInit2_(strm, windowBits, ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function inflateBackInit(var strm: z_stream;
-                         windowBits: Integer; window: PChar): Integer;
-begin
-  Result := inflateBackInit_(strm, windowBits, window,
-                             ZLIB_VERSION, sizeof(z_stream));
-end;
-
-function _malloc(Size: Integer): Pointer; cdecl;
-begin
-  GetMem(Result, Size);
-end;
-
-procedure _free(Block: Pointer); cdecl;
-begin
-  FreeMem(Block);
-end;
-
-procedure _memset(P: Pointer; B: Byte; count: Integer); cdecl;
-begin
-  FillChar(P^, count, B);
-end;
-
-procedure _memcpy(dest, source: Pointer; count: Integer); cdecl;
-begin
-  Move(source^, dest^, count);
-end;
-
-end.

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/puff Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/testzlib Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/untgz Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio/readme.txt Deleted

@@ -1,60 +0,0 @@
-Building instructions for the DLL versions of Zlib 1.2.4
-========================================================
-
-This directory contains projects that build zlib and minizip using
-Microsoft Visual C++ 9.0/10.0, and Visual C++ .
-
-You don't need to build these projects yourself. You can download the
-binaries from:
-  http://www.winimage.com/zLibDll
-
-More information can be found at this site.
-
-first compile assembly code by running
-bld_ml64.bat in contrib\masmx64
-bld_ml32.bat in contrib\masmx86
-
-
-
-
-Build instructions for Visual Studio 2008 (32 bits or 64 bits)
---------------------------------------------------------------
-- Uncompress current zlib, including all contrib/* files
-- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008.0
-- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
-
-Build instructions for Visual Studio 2010 (32 bits or 64 bits)
---------------------------------------------------------------
-- Uncompress current zlib, including all contrib/* files
-- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010.0
-
-
-Important
----------
-- To use zlibwapi.dll in your application, you must define the
-  macro ZLIB_WINAPI when compiling your application's source files.
-
-
-Additional notes
-----------------
-- This DLL, named zlibwapi.dll, is compatible to the old zlib.dll built
-  by Gilles Vollant from the zlib 1.1.x sources, and distributed at
-    http://www.winimage.com/zLibDll
-  It uses the WINAPI calling convention for the exported functions, and
-  includes the minizip functionality. If your application needs that
-  particular build of zlib.dll, you can rename zlibwapi.dll to zlib.dll.
-
-- The new DLL was renamed because there exist several incompatible
-  versions of zlib.dll on the Internet.
-
-- There is also an official DLL build of zlib, named zlib1.dll. This one
-  is exporting the functions using the CDECL convention. See the file
-  win32\DLL_FAQ.txt found in this zlib distribution.
-
-- There used to be a ZLIB_DLL macro in zlib 1.1.x, but now this symbol
-  has a slightly different effect. To avoid compatibility problems, do
-  not define it here.
-
-
-Gilles Vollant
-info@winimage.com

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio/vc10 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio/vc10/miniunz.vcxproj.user Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio/vc10/minizip.vcxproj.user Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio/vc10/testzlib.vcxproj.user Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio/vc10/testzlibdll.vcxproj Deleted

@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Itanium">
- <Configuration>Debug</Configuration>
- <Platform>Itanium</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Itanium">
- <Configuration>Release</Configuration>
- <Platform>Itanium</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>MultiByte</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)testzlib.exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <OmitFramePointers>true</OmitFramePointers>
- <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)testzlib.exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)testzlib.exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
- <Midl>
- <TargetEnvironment>Itanium</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)testzlib.exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineIA64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <TargetEnvironment>X64</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <OmitFramePointers>true</OmitFramePointers>
- <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)testzlib.exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
- <Midl>
- <TargetEnvironment>Itanium</TargetEnvironment>
- </Midl>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <OmitFramePointers>true</OmitFramePointers>
- <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <BasicRuntimeChecks>Default</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)testzlib.exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineIA64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\testzlib\testzlib.c" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="zlibvc.vcxproj">
- <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio/vc10/testzlibdll.vcxproj.user Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio/vc10/zlib.rc Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio/vc10/zlibstat.vcxproj.user Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio/vc10/zlibvc.def Deleted

@@ -1,137 +0,0 @@
-LIBRARY
-; zlib data compression and ZIP file I/O library
-
-VERSION		1.24
-
-EXPORTS
-        adler32                                  @1
-        compress                                 @2
-        crc32                                    @3
-        deflate                                  @4
-        deflateCopy                              @5
-        deflateEnd                               @6
-        deflateInit2_                            @7
-        deflateInit_                             @8
-        deflateParams                            @9
-        deflateReset                             @10
-        deflateSetDictionary                     @11
-        gzclose                                  @12
-        gzdopen                                  @13
-        gzerror                                  @14
-        gzflush                                  @15
-        gzopen                                   @16
-        gzread                                   @17
-        gzwrite                                  @18
-        inflate                                  @19
-        inflateEnd                               @20
-        inflateInit2_                            @21
-        inflateInit_                             @22
-        inflateReset                             @23
-        inflateSetDictionary                     @24
-        inflateSync                              @25
-        uncompress                               @26
-        zlibVersion                              @27
-        gzprintf                                 @28
-        gzputc                                   @29
-        gzgetc                                   @30
-        gzseek                                   @31
-        gzrewind                                 @32
-        gztell                                   @33
-        gzeof                                    @34
-        gzsetparams                              @35
-        zError                                   @36
-        inflateSyncPoint                         @37
-        get_crc_table                            @38
-        compress2                                @39
-        gzputs                                   @40
-        gzgets                                   @41
-        inflateCopy                              @42
-        inflateBackInit_                         @43
-        inflateBack                              @44
-        inflateBackEnd                           @45
-        compressBound                            @46
-        deflateBound                             @47
-        gzclearerr                               @48
-        gzungetc                                 @49
-        zlibCompileFlags                         @50
-        deflatePrime                             @51
-        deflatePending                           @52
-
-        unzOpen                                  @61
-        unzClose                                 @62
-        unzGetGlobalInfo                         @63
-        unzGetCurrentFileInfo                    @64
-        unzGoToFirstFile                         @65
-        unzGoToNextFile                          @66
-        unzOpenCurrentFile                       @67
-        unzReadCurrentFile                       @68
-        unzOpenCurrentFile3                      @69
-        unztell                                  @70
-        unzeof                                   @71
-        unzCloseCurrentFile                      @72
-        unzGetGlobalComment                      @73
-        unzStringFileNameCompare                 @74
-        unzLocateFile                            @75
-        unzGetLocalExtrafield                    @76
-        unzOpen2                                 @77
-        unzOpenCurrentFile2                      @78
-        unzOpenCurrentFilePassword               @79
-
-        zipOpen                                  @80
-        zipOpenNewFileInZip                      @81
-        zipWriteInFileInZip                      @82
-        zipCloseFileInZip                        @83
-        zipClose                                 @84
-        zipOpenNewFileInZip2                     @86
-        zipCloseFileInZipRaw                     @87
-        zipOpen2                                 @88
-        zipOpenNewFileInZip3                     @89
-
-        unzGetFilePos                            @100
-        unzGoToFilePos                           @101
-
-        fill_win32_filefunc                      @110
-
-; zlibwapi v1.2.4 added:
-        fill_win32_filefunc64                   @111
-        fill_win32_filefunc64A                  @112
-        fill_win32_filefunc64W                  @113
-
-        unzOpen64                               @120
-        unzOpen2_64                             @121
-        unzGetGlobalInfo64                      @122
-        unzGetCurrentFileInfo64                 @124
-        unzGetCurrentFileZStreamPos64           @125
-        unztell64                               @126
-        unzGetFilePos64                         @127
-        unzGoToFilePos64                        @128
-
-        zipOpen64                               @130
-        zipOpen2_64                             @131
-        zipOpenNewFileInZip64                   @132
-        zipOpenNewFileInZip2_64                 @133
-        zipOpenNewFileInZip3_64                 @134
-        zipOpenNewFileInZip4_64                 @135
-        zipCloseFileInZipRaw64                  @136
-
-; zlib1 v1.2.4 added:
-        adler32_combine                         @140
-        crc32_combine                           @142
-        deflateSetHeader                        @144
-        deflateTune                             @145
-        gzbuffer                                @146
-        gzclose_r                               @147
-        gzclose_w                               @148
-        gzdirect                                @149
-        gzoffset                                @150
-        inflateGetHeader                        @156
-        inflateMark                             @157
-        inflatePrime                            @158
-        inflateReset2                           @159
-        inflateUndermine                        @160
-
-; zlib1 v1.2.6 added:
-        gzgetc_                                 @161
-        gzflags                                 @162
-        inflateResetKeep                        @163
-	deflateResetKeep			@164

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio/vc10/zlibvc.vcxproj Deleted

@@ -1,659 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Itanium">
- <Configuration>Debug</Configuration>
- <Platform>Itanium</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
- <Configuration>ReleaseWithoutAsm</Configuration>
- <Platform>Itanium</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
- <Configuration>ReleaseWithoutAsm</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
- <Configuration>ReleaseWithoutAsm</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Itanium">
- <Configuration>Release</Configuration>
- <Platform>Itanium</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <UseOfMfc>false</UseOfMfc>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
- <GenerateMapFile>true</GenerateMapFile>
- <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
- <AssemblerOutput>All</AssemblerOutput>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
- <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
- <GenerateMapFile>true</GenerateMapFile>
- <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Win32</TargetEnvironment>
- <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
- <AssemblerOutput>All</AssemblerOutput>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
- <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
- <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
- <GenerateMapFile>true</GenerateMapFile>
- <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
- <GenerateMapFile>true</GenerateMapFile>
- <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
- <Midl>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Itanium</TargetEnvironment>
- <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
- <GenerateMapFile>true</GenerateMapFile>
- <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
- <TargetMachine>MachineIA64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
- <AssemblerOutput>All</AssemblerOutput>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
- <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
- <GenerateMapFile>true</GenerateMapFile>
- <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Itanium</TargetEnvironment>
- <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
- <AssemblerOutput>All</AssemblerOutput>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
- <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
- <GenerateMapFile>true</GenerateMapFile>
- <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
- <TargetMachine>MachineIA64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>X64</TargetEnvironment>
- <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
- <AssemblerOutput>All</AssemblerOutput>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
- <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
- <GenerateMapFile>true</GenerateMapFile>
- <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
- <Midl>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MkTypLibCompatible>true</MkTypLibCompatible>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <TargetEnvironment>Itanium</TargetEnvironment>
- <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
- </Midl>
- <ClCompile>
- <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <StringPooling>true</StringPooling>
- <ExceptionHandling>
- </ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <BufferSecurityCheck>false</BufferSecurityCheck>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
- <AssemblerOutput>All</AssemblerOutput>
- <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
- <BrowseInformation>
- </BrowseInformation>
- <WarningLevel>Level3</WarningLevel>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <Culture>0x040c</Culture>
- </ResourceCompile>
- <Link>
- <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
- <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
- <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
- <GenerateMapFile>true</GenerateMapFile>
- <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
- <SubSystem>Windows</SubSystem>
- <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
- <TargetMachine>MachineIA64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\..\..\adler32.c" />
- <ClCompile Include="..\..\..\compress.c" />
- <ClCompile Include="..\..\..\crc32.c" />
- <ClCompile Include="..\..\..\deflate.c" />
- <ClCompile Include="..\..\..\gzclose.c" />
- <ClCompile Include="..\..\..\gzlib.c" />
- <ClCompile Include="..\..\..\gzread.c" />
- <ClCompile Include="..\..\..\gzwrite.c" />
- <ClCompile Include="..\..\..\infback.c" />
- <ClCompile Include="..\..\masmx64\inffas8664.c">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- </ClCompile>
- <ClCompile Include="..\..\..\inffast.c" />
- <ClCompile Include="..\..\..\inflate.c" />
- <ClCompile Include="..\..\..\inftrees.c" />
- <ClCompile Include="..\..\minizip\ioapi.c" />
- <ClCompile Include="..\..\minizip\iowin32.c" />
- <ClCompile Include="..\..\..\trees.c" />
- <ClCompile Include="..\..\..\uncompr.c" />
- <ClCompile Include="..\..\minizip\unzip.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\minizip\zip.c">
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <ClCompile Include="..\..\..\zutil.c" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="zlib.rc" />
- </ItemGroup>
- <ItemGroup>
- <None Include="zlibvc.def" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="..\..\..\deflate.h" />
- <ClInclude Include="..\..\..\infblock.h" />
- <ClInclude Include="..\..\..\infcodes.h" />
- <ClInclude Include="..\..\..\inffast.h" />
- <ClInclude Include="..\..\..\inftrees.h" />
- <ClInclude Include="..\..\..\infutil.h" />
- <ClInclude Include="..\..\..\zconf.h" />
- <ClInclude Include="..\..\..\zlib.h" />
- <ClInclude Include="..\..\..\zutil.h" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio/vc9 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio/vc9/zlib.rc Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/contrib/vstudio/vc9/zlibvc.def Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/crc32.c Deleted

@@ -1,447 +0,0 @@
-/* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2006, 2010, 2011 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
- * tables for updating the shift register in one step with three exclusive-ors
- * instead of four steps with four exclusive-ors. This results in about a
- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
- */
-
-/* @(#) $Id$ */
-
-/*
- Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
- protection on the static variables used to control the first-use generation
- of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should
- first call get_crc_table() to initialize the tables before allowing more than
- one thread to use crc32().
-
- DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
- */
-
-#ifdef MAKECRCH
-# include <stdio.h>
-# ifndef DYNAMIC_CRC_TABLE
-# define DYNAMIC_CRC_TABLE
-# endif /* !DYNAMIC_CRC_TABLE */
-#endif /* MAKECRCH */
-
-#include "zutil.h" /* for STDC and FAR definitions */
-
-#define local static
-
-/* Find a four-byte integer type for crc32_little() and crc32_big(). */
-#ifndef NOBYFOUR
-# ifdef STDC /* need ANSI C limits.h to determine sizes */
-# include <limits.h>
-# define BYFOUR
-# if (UINT_MAX == 0xffffffffUL)
- typedef unsigned int u4;
-# else
-# if (ULONG_MAX == 0xffffffffUL)
- typedef unsigned long u4;
-# else
-# if (USHRT_MAX == 0xffffffffUL)
- typedef unsigned short u4;
-# else
-# undef BYFOUR /* can't find a four-byte integer type! */
-# endif
-# endif
-# endif
-# endif /* STDC */
-#endif /* !NOBYFOUR */
-
-/* Definitions for doing the crc four data bytes at a time. */
-#ifdef BYFOUR
- typedef u4 crc_table_t;
-# define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \
- (((w)&0xff00)<<8)+(((w)&0xff)<<24))
- local unsigned long crc32_little OF((unsigned long,
- const unsigned char FAR *, unsigned));
- local unsigned long crc32_big OF((unsigned long,
- const unsigned char FAR *, unsigned));
-# define TBLS 8
-#else
- typedef unsigned long crc_table_t;
-# define TBLS 1
-#endif /* BYFOUR */
-
-/* Local functions for crc concatenation */
-local unsigned long gf2_matrix_times OF((unsigned long *mat,
- unsigned long vec));
-local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
-local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
-
-
-#ifdef DYNAMIC_CRC_TABLE
-
-local volatile int crc_table_empty = 1;
-local crc_table_t FAR crc_tableTBLS256;
-local void make_crc_table OF((void));
-#ifdef MAKECRCH
- local void write_table OF((FILE *, const crc_table_t FAR *));
-#endif /* MAKECRCH */
-/*
- Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
- x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-
- Polynomials over GF(2) are represented in binary, one bit per coefficient,
- with the lowest powers in the most significant bit. Then adding polynomials
- is just exclusive-or, and multiplying a polynomial by x is a right shift by
- one. If we call the above polynomial p, and represent a byte as the
- polynomial q, also with the lowest power in the most significant bit (so the
- byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
- where a mod b means the remainder after dividing a by b.
-
- This calculation is done using the shift-register method of multiplying and
- taking the remainder. The register is initialized to zero, and for each
- incoming bit, x^32 is added mod p to the register if the bit is a one (where
- x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
- x (which is shifting right by one and adding x^32 mod p if the bit shifted
- out is a one). We start with the highest power (least significant bit) of
- q and repeat for all eight bits of q.
-
- The first table is simply the CRC of all possible eight bit values. This is
- all the information needed to generate CRCs on data a byte at a time for all
- combinations of CRC register values and incoming bytes. The remaining tables
- allow for word-at-a-time CRC calculation for both big-endian and little-
- endian machines, where a word is four bytes.
-*/
-local void make_crc_table()
-{
- crc_table_t c;
- int n, k;
- crc_table_t poly; /* polynomial exclusive-or pattern */
- /* terms of polynomial defining this crc (except x^32): */
- static volatile int first = 1; /* flag to limit concurrent making */
- static const unsigned char p = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
- /* See if another task is already doing this (not thread-safe, but better
- than nothing -- significantly reduces duration of vulnerability in
- case the advice about DYNAMIC_CRC_TABLE is ignored) */
- if (first) {
- first = 0;
-
- /* make exclusive-or pattern from polynomial (0xedb88320UL) */
- poly = 0;
- for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
- poly |= (crc_table_t)1 << (31 - pn);
-
- /* generate a crc for every 8-bit value */
- for (n = 0; n < 256; n++) {
- c = (crc_table_t)n;
- for (k = 0; k < 8; k++)
- c = c & 1 ? poly ^ (c >> 1) : c >> 1;
- crc_table0n = c;
- }
-
-#ifdef BYFOUR
- /* generate crc for each value followed by one, two, and three zeros,
- and then the byte reversal of those as well as the first table */
- for (n = 0; n < 256; n++) {
- c = crc_table0n;
- crc_table4n = REV(c);
- for (k = 1; k < 4; k++) {
- c = crc_table0c & 0xff ^ (c >> 8);
- crc_tablekn = c;
- crc_tablek + 4n = REV(c);
- }
- }
-#endif /* BYFOUR */
-
- crc_table_empty = 0;
- }
- else { /* not first */
- /* wait for the other guy to finish (not efficient, but rare) */
- while (crc_table_empty)
- ;
- }
-
-#ifdef MAKECRCH
- /* write out CRC tables to crc32.h */
- {
- FILE *out;
-
- out = fopen("crc32.h", "w");
- if (out == NULL) return;
- fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
- fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
- fprintf(out, "local const crc_table_t FAR ");
- fprintf(out, "crc_tableTBLS256 =\n{\n {\n");
- write_table(out, crc_table0);
-# ifdef BYFOUR
- fprintf(out, "#ifdef BYFOUR\n");
- for (k = 1; k < 8; k++) {
- fprintf(out, " },\n {\n");
- write_table(out, crc_tablek);
- }
- fprintf(out, "#endif\n");
-# endif /* BYFOUR */
- fprintf(out, " }\n};\n");
- fclose(out);
- }
-#endif /* MAKECRCH */
-}
-
-#ifdef MAKECRCH
-local void write_table(out, table)
- FILE *out;
- const crc_table_t FAR *table;
-{
- int n;
-
- for (n = 0; n < 256; n++)
- fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ",
- (unsigned long)(tablen),
- n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
-}
-#endif /* MAKECRCH */
-
-#else /* !DYNAMIC_CRC_TABLE */
-/* ========================================================================
- * Tables of CRC-32s of all single-byte values, made by make_crc_table().
- */
-#include "crc32.h"
-#endif /* DYNAMIC_CRC_TABLE */
-
-/* =========================================================================
- * This function can be used by asm versions of crc32()
- */
-const unsigned long FAR * ZEXPORT get_crc_table()
-{
-#ifdef DYNAMIC_CRC_TABLE
- if (crc_table_empty)
- make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
- return (const unsigned long FAR *)crc_table;
-}
-
-/* ========================================================================= */
-#define DO1 crc = crc_table0((int)crc ^ (*buf++)) & 0xff ^ (crc >> 8)
-#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
-
-/* ========================================================================= */
-unsigned long ZEXPORT crc32(crc, buf, len)
- unsigned long crc;
- const unsigned char FAR *buf;
- uInt len;
-{
- if (buf == Z_NULL) return 0UL;
-
-#ifdef DYNAMIC_CRC_TABLE
- if (crc_table_empty)
- make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
-
-#ifdef BYFOUR
- if (sizeof(void *) == sizeof(ptrdiff_t)) {
- u4 endian;
-
- endian = 1;
- if (*((unsigned char *)(&endian)))
- return crc32_little(crc, buf, len);
- else
- return crc32_big(crc, buf, len);
- }
-#endif /* BYFOUR */
- crc = crc ^ 0xffffffffUL;
- while (len >= 8) {
- DO8;
- len -= 8;
- }
- if (len) do {
- DO1;
- } while (--len);
- return crc ^ 0xffffffffUL;
-}
-
-#ifdef BYFOUR
-
-/* ========================================================================= */
-#define DOLIT4 c ^= *buf4++; \
- c = crc_table3c & 0xff ^ crc_table2(c >> 8) & 0xff ^ \
- crc_table1(c >> 16) & 0xff ^ crc_table0c >> 24
-#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
-
-/* ========================================================================= */
-local unsigned long crc32_little(crc, buf, len)
- unsigned long crc;
- const unsigned char FAR *buf;
- unsigned len;
-{
- register u4 c;
- register const u4 FAR *buf4;
-
- c = (u4)crc;
- c = ~c;
- while (len && ((ptrdiff_t)buf & 3)) {
- c = crc_table0(c ^ *buf++) & 0xff ^ (c >> 8);
- len--;
- }
-
- buf4 = (const u4 FAR *)(const void FAR *)buf;
- while (len >= 32) {
- DOLIT32;
- len -= 32;
- }
- while (len >= 4) {
- DOLIT4;
- len -= 4;
- }
- buf = (const unsigned char FAR *)buf4;
-
- if (len) do {
- c = crc_table0(c ^ *buf++) & 0xff ^ (c >> 8);
- } while (--len);
- c = ~c;
- return (unsigned long)c;
-}
-
-/* ========================================================================= */
-#define DOBIG4 c ^= *++buf4; \
- c = crc_table4c & 0xff ^ crc_table5(c >> 8) & 0xff ^ \
- crc_table6(c >> 16) & 0xff ^ crc_table7c >> 24
-#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
-
-/* ========================================================================= */
-local unsigned long crc32_big(crc, buf, len)
- unsigned long crc;
- const unsigned char FAR *buf;
- unsigned len;
-{
- register u4 c;
- register const u4 FAR *buf4;
-
- c = REV((u4)crc);
- c = ~c;
- while (len && ((ptrdiff_t)buf & 3)) {
- c = crc_table4(c >> 24) ^ *buf++ ^ (c << 8);
- len--;
- }
-
- buf4 = (const u4 FAR *)(const void FAR *)buf;
- buf4--;
- while (len >= 32) {
- DOBIG32;
- len -= 32;
- }
- while (len >= 4) {
- DOBIG4;
- len -= 4;
- }
- buf4++;
- buf = (const unsigned char FAR *)buf4;
-
- if (len) do {
- c = crc_table4(c >> 24) ^ *buf++ ^ (c << 8);
- } while (--len);
- c = ~c;
- return (unsigned long)(REV(c));
-}
-
-#endif /* BYFOUR */
-
-#define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */
-
-/* ========================================================================= */
-local unsigned long gf2_matrix_times(mat, vec)
- unsigned long *mat;
- unsigned long vec;
-{
- unsigned long sum;
-
- sum = 0;
- while (vec) {
- if (vec & 1)
- sum ^= *mat;
- vec >>= 1;
- mat++;
- }
- return sum;
-}
-
-/* ========================================================================= */
-local void gf2_matrix_square(square, mat)
- unsigned long *square;
- unsigned long *mat;
-{
- int n;
-
- for (n = 0; n < GF2_DIM; n++)
- squaren = gf2_matrix_times(mat, matn);
-}
-
-/* ========================================================================= */
-local uLong crc32_combine_(crc1, crc2, len2)
- uLong crc1;
- uLong crc2;
- z_off64_t len2;
-{
- int n;
- unsigned long row;
- unsigned long evenGF2_DIM; /* even-power-of-two zeros operator */
- unsigned long oddGF2_DIM; /* odd-power-of-two zeros operator */
-
- /* degenerate case (also disallow negative lengths) */
- if (len2 <= 0)
- return crc1;
-
- /* put operator for one zero bit in odd */
- odd0 = 0xedb88320UL; /* CRC-32 polynomial */
- row = 1;
- for (n = 1; n < GF2_DIM; n++) {
- oddn = row;
- row <<= 1;
- }
-
- /* put operator for two zero bits in even */
- gf2_matrix_square(even, odd);
-
- /* put operator for four zero bits in odd */
- gf2_matrix_square(odd, even);
-
- /* apply len2 zeros to crc1 (first square will put the operator for one
- zero byte, eight zero bits, in even) */
- do {
- /* apply zeros operator for this bit of len2 */
- gf2_matrix_square(even, odd);
- if (len2 & 1)
- crc1 = gf2_matrix_times(even, crc1);
- len2 >>= 1;
-
- /* if no more bits set, then done */
- if (len2 == 0)
- break;
-
- /* another iteration of the loop with odd and even swapped */
- gf2_matrix_square(odd, even);
- if (len2 & 1)
- crc1 = gf2_matrix_times(odd, crc1);
- len2 >>= 1;
-
- /* if no more bits set, then done */
- } while (len2 != 0);
-
- /* return combined crc */
- crc1 ^= crc2;
- return crc1;
-}
-
-/* ========================================================================= */
-uLong ZEXPORT crc32_combine(crc1, crc2, len2)
- uLong crc1;
- uLong crc2;
- z_off_t len2;
-{
- return crc32_combine_(crc1, crc2, len2);
-}
-
-uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
- uLong crc1;
- uLong crc2;
- z_off64_t len2;
-{
- return crc32_combine_(crc1, crc2, len2);
-}

smplayer-0.8.0.tar.bz2/zlib-1.2.6/crc32.h Deleted

@@ -1,441 +0,0 @@
-/* crc32.h -- tables for rapid CRC calculation
- * Generated automatically by crc32.c
- */
-
-local const crc_table_t FAR crc_tableTBLS256 =
-{
-  {
-    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
-    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
-    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
-    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
-    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
-    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
-    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
-    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
-    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
-    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
-    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
-    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
-    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
-    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
-    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
-    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
-    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
-    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
-    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
-    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
-    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
-    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
-    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
-    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
-    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
-    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
-    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
-    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
-    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
-    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
-    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
-    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
-    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
-    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
-    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
-    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
-    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
-    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
-    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
-    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
-    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
-    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
-    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
-    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
-    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
-    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
-    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
-    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
-    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
-    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
-    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
-    0x2d02ef8dUL
-#ifdef BYFOUR
-  },
-  {
-    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
-    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
-    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
-    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
-    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
-    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
-    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
-    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
-    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
-    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
-    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
-    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
-    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
-    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
-    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
-    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
-    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
-    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
-    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
-    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
-    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
-    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
-    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
-    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
-    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
-    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
-    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
-    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
-    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
-    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
-    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
-    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
-    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
-    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
-    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
-    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
-    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
-    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
-    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
-    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
-    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
-    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
-    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
-    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
-    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
-    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
-    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
-    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
-    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
-    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
-    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
-    0x9324fd72UL
-  },
-  {
-    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
-    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
-    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
-    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
-    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
-    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
-    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
-    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
-    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
-    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
-    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
-    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
-    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
-    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
-    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
-    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
-    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
-    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
-    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
-    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
-    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
-    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
-    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
-    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
-    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
-    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
-    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
-    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
-    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
-    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
-    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
-    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
-    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
-    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
-    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
-    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
-    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
-    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
-    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
-    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
-    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
-    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
-    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
-    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
-    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
-    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
-    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
-    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
-    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
-    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
-    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
-    0xbe9834edUL
-  },
-  {
-    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
-    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
-    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
-    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
-    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
-    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
-    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
-    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
-    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
-    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
-    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
-    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
-    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
-    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
-    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
-    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
-    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
-    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
-    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
-    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
-    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
-    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
-    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
-    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
-    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
-    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
-    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
-    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
-    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
-    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
-    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
-    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
-    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
-    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
-    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
-    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
-    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
-    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
-    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
-    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
-    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
-    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
-    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
-    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
-    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
-    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
-    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
-    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
-    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
-    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
-    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
-    0xde0506f1UL
-  },
-  {
-    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
-    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
-    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
-    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
-    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
-    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
-    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
-    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
-    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
-    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
-    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
-    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
-    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
-    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
-    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
-    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
-    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
-    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
-    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
-    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
-    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
-    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
-    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
-    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
-    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
-    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
-    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
-    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
-    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
-    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
-    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
-    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
-    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
-    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
-    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
-    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
-    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
-    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
-    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
-    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
-    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
-    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
-    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
-    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
-    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
-    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
-    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
-    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
-    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
-    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
-    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
-    0x8def022dUL
-  },
-  {
-    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
-    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
-    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
-    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
-    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
-    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
-    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
-    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
-    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
-    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
-    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
-    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
-    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
-    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
-    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
-    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
-    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
-    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
-    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
-    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
-    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
-    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
-    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
-    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
-    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
-    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
-    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
-    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
-    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
-    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
-    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
-    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
-    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
-    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
-    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
-    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
-    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
-    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
-    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
-    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
-    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
-    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
-    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
-    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
-    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
-    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
-    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
-    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
-    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
-    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
-    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
-    0x72fd2493UL
-  },
-  {
-    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
-    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
-    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
-    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
-    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
-    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
-    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
-    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
-    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
-    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
-    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
-    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
-    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
-    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
-    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
-    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
-    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
-    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
-    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
-    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
-    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
-    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
-    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
-    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
-    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
-    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
-    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
-    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
-    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
-    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
-    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
-    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
-    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
-    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
-    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
-    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
-    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
-    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
-    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
-    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
-    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
-    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
-    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
-    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
-    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
-    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
-    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
-    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
-    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
-    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
-    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
-    0xed3498beUL
-  },
-  {
-    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
-    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
-    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
-    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
-    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
-    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
-    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
-    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
-    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
-    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
-    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
-    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
-    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
-    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
-    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
-    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
-    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
-    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
-    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
-    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
-    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
-    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
-    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
-    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
-    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
-    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
-    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
-    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
-    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
-    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
-    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
-    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
-    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
-    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
-    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
-    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
-    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
-    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
-    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
-    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
-    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
-    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
-    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
-    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
-    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
-    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
-    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
-    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
-    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
-    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
-    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
-    0xf10605deUL
-#endif
-  }
-};

smplayer-0.8.0.tar.bz2/zlib-1.2.6/deflate.c Deleted

@@ -1,1965 +0,0 @@
-/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * ALGORITHM
- *
- * The "deflation" process depends on being able to identify portions
- * of the input text which are identical to earlier input (within a
- * sliding window trailing behind the input currently being processed).
- *
- * The most straightforward technique turns out to be the fastest for
- * most input files: try all possible matches and select the longest.
- * The key feature of this algorithm is that insertions into the string
- * dictionary are very simple and thus fast, and deletions are avoided
- * completely. Insertions are performed at each input character, whereas
- * string matches are performed only when the previous match ends. So it
- * is preferable to spend more time in matches to allow very fast string
- * insertions and avoid deletions. The matching algorithm for small
- * strings is inspired from that of Rabin & Karp. A brute force approach
- * is used to find longer strings when a small match has been found.
- * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
- * (by Leonid Broukhis).
- * A previous version of this file used a more sophisticated algorithm
- * (by Fiala and Greene) which is guaranteed to run in linear amortized
- * time, but has a larger average cost, uses more memory and is patented.
- * However the F&G algorithm may be faster for some highly redundant
- * files if the parameter max_chain_length (described below) is too large.
- *
- * ACKNOWLEDGEMENTS
- *
- * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
- * I found it in 'freeze' written by Leonid Broukhis.
- * Thanks to many people for bug reports and testing.
- *
- * REFERENCES
- *
- * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- * Available in http://tools.ietf.org/html/rfc1951
- *
- * A description of the Rabin and Karp algorithm is given in the book
- * "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
- *
- * Fiala,E.R., and Greene,D.H.
- * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
- *
- */
-
-/* @(#) $Id$ */
-
-#include "deflate.h"
-
-const char deflate_copyright =
- " deflate 1.2.6 Copyright 1995-2012 Jean-loup Gailly and Mark Adler ";
-/*
- If you use the zlib library in a product, an acknowledgment is welcome
- in the documentation of your product. If for some reason you cannot
- include such an acknowledgment, I would appreciate that you keep this
- copyright string in the executable of your product.
- */
-
-/* ===========================================================================
- * Function prototypes.
- */
-typedef enum {
- need_more, /* block not completed, need more input or more output */
- block_done, /* block flush performed */
- finish_started, /* finish started, need only more output at next deflate */
- finish_done /* finish done, accept no more input or output */
-} block_state;
-
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
-/* Compression function. Returns the block state after the call. */
-
-local void fill_window OF((deflate_state *s));
-local block_state deflate_stored OF((deflate_state *s, int flush));
-local block_state deflate_fast OF((deflate_state *s, int flush));
-#ifndef FASTEST
-local block_state deflate_slow OF((deflate_state *s, int flush));
-#endif
-local block_state deflate_rle OF((deflate_state *s, int flush));
-local block_state deflate_huff OF((deflate_state *s, int flush));
-local void lm_init OF((deflate_state *s));
-local void putShortMSB OF((deflate_state *s, uInt b));
-local void flush_pending OF((z_streamp strm));
-local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifdef ASMV
- void match_init OF((void)); /* asm code initialization */
- uInt longest_match OF((deflate_state *s, IPos cur_match));
-#else
-local uInt longest_match OF((deflate_state *s, IPos cur_match));
-#endif
-
-#ifdef DEBUG
-local void check_match OF((deflate_state *s, IPos start, IPos match,
- int length));
-#endif
-
-/* ===========================================================================
- * Local data
- */
-
-#define NIL 0
-/* Tail of hash chains */
-
-#ifndef TOO_FAR
-# define TOO_FAR 4096
-#endif
-/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
-
-/* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
- * exclude worst case performance for pathological files. Better values may be
- * found for specific files.
- */
-typedef struct config_s {
- ush good_length; /* reduce lazy search above this match length */
- ush max_lazy; /* do not perform lazy search above this match length */
- ush nice_length; /* quit search above this match length */
- ush max_chain;
- compress_func func;
-} config;
-
-#ifdef FASTEST
-local const config configuration_table2 = {
-/* good lazy nice chain */
-/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */
-/* 1 */ {4, 4, 8, 4, deflate_fast}}; /* max speed, no lazy matches */
-#else
-local const config configuration_table10 = {
-/* good lazy nice chain */
-/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */
-/* 1 */ {4, 4, 8, 4, deflate_fast}, /* max speed, no lazy matches */
-/* 2 */ {4, 5, 16, 8, deflate_fast},
-/* 3 */ {4, 6, 32, 32, deflate_fast},
-
-/* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */
-/* 5 */ {8, 16, 32, 32, deflate_slow},
-/* 6 */ {8, 16, 128, 128, deflate_slow},
-/* 7 */ {8, 32, 128, 256, deflate_slow},
-/* 8 */ {32, 128, 258, 1024, deflate_slow},
-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
-#endif
-
-/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
- * meaning.
- */
-
-#define EQUAL 0
-/* result of memcmp for equal strings */
-
-#ifndef NO_DUMMY_DECL
-struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
-#endif
-
-/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
-#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
-
-/* ===========================================================================
- * Update a hash value with the given input byte
- * IN assertion: all calls to to UPDATE_HASH are made with consecutive
- * input characters, so that a running hash key can be computed from the
- * previous key instead of complete recalculation each time.
- */
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
-
-
-/* ===========================================================================
- * Insert string str in the dictionary and set match_head to the previous head
- * of the hash chain (the most recent string with same hash key). Return
- * the previous length of the hash chain.
- * If this file is compiled with -DFASTEST, the compression level is forced
- * to 1, and no hash chains are maintained.
- * IN assertion: all calls to to INSERT_STRING are made with consecutive
- * input characters and the first MIN_MATCH bytes of str are valid
- * (except for the last MIN_MATCH-1 bytes of the input file).
- */
-#ifdef FASTEST
-#define INSERT_STRING(s, str, match_head) \
- (UPDATE_HASH(s, s->ins_h, s->window(str) + (MIN_MATCH-1)), \
- match_head = s->heads->ins_h, \
- s->heads->ins_h = (Pos)(str))
-#else
-#define INSERT_STRING(s, str, match_head) \
- (UPDATE_HASH(s, s->ins_h, s->window(str) + (MIN_MATCH-1)), \
- match_head = s->prev(str) & s->w_mask = s->heads->ins_h, \
- s->heads->ins_h = (Pos)(str))
-#endif
-
-/* ===========================================================================
- * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
- * prev will be initialized on the fly.
- */
-#define CLEAR_HASH(s) \
- s->heads->hash_size-1 = NIL; \
- zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
-
-/* ========================================================================= */
-int ZEXPORT deflateInit_(strm, level, version, stream_size)
- z_streamp strm;
- int level;
- const char *version;
- int stream_size;
-{
- return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
- Z_DEFAULT_STRATEGY, version, stream_size);
- /* To do: ignore strm->next_in if we use it as window */
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
- version, stream_size)
- z_streamp strm;
- int level;
- int method;
- int windowBits;
- int memLevel;
- int strategy;
- const char *version;
- int stream_size;
-{
- deflate_state *s;
- int wrap = 1;
- static const char my_version = ZLIB_VERSION;
-
- ushf *overlay;
- /* We overlay pending_buf and d_buf+l_buf. This works since the average
- * output size for (length,distance) codes is <= 24 bits.
- */
-
- if (version == Z_NULL || version0 != my_version0 ||
- stream_size != sizeof(z_stream)) {
- return Z_VERSION_ERROR;
- }
- if (strm == Z_NULL) return Z_STREAM_ERROR;
-
- strm->msg = Z_NULL;
- if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
- return Z_STREAM_ERROR;
-#else
- strm->zalloc = zcalloc;
- strm->opaque = (voidpf)0;
-#endif
- }
- if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
- return Z_STREAM_ERROR;
-#else
- strm->zfree = zcfree;
-#endif
-
-#ifdef FASTEST
- if (level != 0) level = 1;
-#else
- if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
-
- if (windowBits < 0) { /* suppress zlib wrapper */
- wrap = 0;
- windowBits = -windowBits;
- }
-#ifdef GZIP
- else if (windowBits > 15) {
- wrap = 2; /* write gzip wrapper instead */
- windowBits -= 16;
- }
-#endif
- if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
- windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
- strategy < 0 || strategy > Z_FIXED) {
- return Z_STREAM_ERROR;
- }
- if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */
- s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
- if (s == Z_NULL) return Z_MEM_ERROR;
- strm->state = (struct internal_state FAR *)s;
- s->strm = strm;
-
- s->wrap = wrap;
- s->gzhead = Z_NULL;
- s->w_bits = windowBits;
- s->w_size = 1 << s->w_bits;
- s->w_mask = s->w_size - 1;
-
- s->hash_bits = memLevel + 7;
- s->hash_size = 1 << s->hash_bits;
- s->hash_mask = s->hash_size - 1;
- s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
-
- s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
- s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos));
- s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos));
-
- s->high_water = 0; /* nothing written to s->window yet */
-
- s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-
- overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
- s->pending_buf = (uchf *) overlay;
- s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-
- if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
- s->pending_buf == Z_NULL) {
- s->status = FINISH_STATE;
- strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
- deflateEnd (strm);
- return Z_MEM_ERROR;
- }
- s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
- s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-
- s->level = level;
- s->strategy = strategy;
- s->method = (Byte)method;
-
- return deflateReset(strm);
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
- z_streamp strm;
- const Bytef *dictionary;
- uInt dictLength;
-{
- deflate_state *s;
- uInt str, n;
- int wrap;
- unsigned avail;
- unsigned char *next;
-
- if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
- return Z_STREAM_ERROR;
- s = strm->state;
- wrap = s->wrap;
- if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
- return Z_STREAM_ERROR;
-
- /* when using zlib wrappers, compute Adler-32 for provided dictionary */
- if (wrap == 1)
- strm->adler = adler32(strm->adler, dictionary, dictLength);
- s->wrap = 0; /* avoid computing Adler-32 in read_buf */
-
- /* if dictionary would fill window, just replace the history */
- if (dictLength >= s->w_size) {
- if (wrap == 0) { /* already empty otherwise */
- CLEAR_HASH(s);
- s->strstart = 0;
- s->block_start = 0L;
- s->insert = 0;
- }
- dictionary += dictLength - s->w_size; /* use the tail */
- dictLength = s->w_size;
- }
-
- /* insert dictionary into window and hash */
- avail = strm->avail_in;
- next = strm->next_in;
- strm->avail_in = dictLength;
- strm->next_in = (Bytef *)dictionary;
- fill_window(s);
- while (s->lookahead >= MIN_MATCH) {
- str = s->strstart;
- n = s->lookahead - (MIN_MATCH-1);
- do {
- UPDATE_HASH(s, s->ins_h, s->windowstr + MIN_MATCH-1);
-#ifndef FASTEST
- s->prevstr & s->w_mask = s->heads->ins_h;
-#endif
- s->heads->ins_h = (Pos)str;
- str++;
- } while (--n);
- s->strstart = str;
- s->lookahead = MIN_MATCH-1;
- fill_window(s);
- }
- s->strstart += s->lookahead;
- s->block_start = (long)s->strstart;
- s->insert = s->lookahead;
- s->lookahead = 0;
- s->match_length = s->prev_length = MIN_MATCH-1;
- s->match_available = 0;
- strm->next_in = next;
- strm->avail_in = avail;
- s->wrap = wrap;
- return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateResetKeep (strm)
- z_streamp strm;
-{
- deflate_state *s;
-
- if (strm == Z_NULL || strm->state == Z_NULL ||
- strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
- return Z_STREAM_ERROR;
- }
-
- strm->total_in = strm->total_out = 0;
- strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
- strm->data_type = Z_UNKNOWN;
-
- s = (deflate_state *)strm->state;
- s->pending = 0;
- s->pending_out = s->pending_buf;
-
- if (s->wrap < 0) {
- s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
- }
- s->status = s->wrap ? INIT_STATE : BUSY_STATE;
- strm->adler =
-#ifdef GZIP
- s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
-#endif
- adler32(0L, Z_NULL, 0);
- s->last_flush = Z_NO_FLUSH;
-
- _tr_init(s);
-
- return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateReset (strm)
- z_streamp strm;
-{
- int ret;
-
- ret = deflateResetKeep(strm);
- if (ret == Z_OK)
- lm_init(strm->state);
- return ret;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetHeader (strm, head)
- z_streamp strm;
- gz_headerp head;
-{
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- if (strm->state->wrap != 2) return Z_STREAM_ERROR;
- strm->state->gzhead = head;
- return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflatePending (strm, pending, bits)
- unsigned *pending;
- int *bits;
- z_streamp strm;
-{
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- if (pending != Z_NULL)
- *pending = strm->state->pending;
- if (bits != Z_NULL)
- *bits = strm->state->bi_valid;
- return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflatePrime (strm, bits, value)
- z_streamp strm;
- int bits;
- int value;
-{
- deflate_state *s;
- int put;
-
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- s = strm->state;
- if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
- return Z_BUF_ERROR;
- do {
- put = Buf_size - s->bi_valid;
- if (put > bits)
- put = bits;
- s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
- s->bi_valid += put;
- _tr_flush_bits(s);
- value >>= put;
- bits -= put;
- } while (bits);
- return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateParams(strm, level, strategy)
- z_streamp strm;
- int level;
- int strategy;
-{
- deflate_state *s;
- compress_func func;
- int err = Z_OK;
-
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- s = strm->state;
-
-#ifdef FASTEST
- if (level != 0) level = 1;
-#else
- if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#endif
- if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
- return Z_STREAM_ERROR;
- }
- func = configuration_tables->level.func;
-
- if ((strategy != s->strategy || func != configuration_tablelevel.func) &&
- strm->total_in != 0) {
- /* Flush the last buffer: */
- err = deflate(strm, Z_BLOCK);
- }
- if (s->level != level) {
- s->level = level;
- s->max_lazy_match = configuration_tablelevel.max_lazy;
- s->good_match = configuration_tablelevel.good_length;
- s->nice_match = configuration_tablelevel.nice_length;
- s->max_chain_length = configuration_tablelevel.max_chain;
- }
- s->strategy = strategy;
- return err;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
- z_streamp strm;
- int good_length;
- int max_lazy;
- int nice_length;
- int max_chain;
-{
- deflate_state *s;
-
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- s = strm->state;
- s->good_match = good_length;
- s->max_lazy_match = max_lazy;
- s->nice_match = nice_length;
- s->max_chain_length = max_chain;
- return Z_OK;
-}
-
-/* =========================================================================
- * For the default windowBits of 15 and memLevel of 8, this function returns
- * a close to exact, as well as small, upper bound on the compressed size.
- * They are coded as constants here for a reason--if the #define's are
- * changed, then this function needs to be changed as well. The return
- * value for 15 and 8 only works for those exact settings.
- *
- * For any setting other than those defaults for windowBits and memLevel,
- * the value returned is a conservative worst case for the maximum expansion
- * resulting from using fixed blocks instead of stored blocks, which deflate
- * can emit on compressed data for some combinations of the parameters.
- *
- * This function could be more sophisticated to provide closer upper bounds for
- * every combination of windowBits and memLevel. But even the conservative
- * upper bound of about 14% expansion does not seem onerous for output buffer
- * allocation.
- */
-uLong ZEXPORT deflateBound(strm, sourceLen)
- z_streamp strm;
- uLong sourceLen;
-{
- deflate_state *s;
- uLong complen, wraplen;
- Bytef *str;
-
- /* conservative upper bound for compressed data */
- complen = sourceLen +
- ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
-
- /* if can't get parameters, return conservative bound plus zlib wrapper */
- if (strm == Z_NULL || strm->state == Z_NULL)
- return complen + 6;
-
- /* compute wrapper length */
- s = strm->state;
- switch (s->wrap) {
- case 0: /* raw deflate */
- wraplen = 0;
- break;
- case 1: /* zlib wrapper */
- wraplen = 6 + (s->strstart ? 4 : 0);
- break;
- case 2: /* gzip wrapper */
- wraplen = 18;
- if (s->gzhead != Z_NULL) { /* user-supplied gzip header */
- if (s->gzhead->extra != Z_NULL)
- wraplen += 2 + s->gzhead->extra_len;
- str = s->gzhead->name;
- if (str != Z_NULL)
- do {
- wraplen++;
- } while (*str++);
- str = s->gzhead->comment;
- if (str != Z_NULL)
- do {
- wraplen++;
- } while (*str++);
- if (s->gzhead->hcrc)
- wraplen += 2;
- }
- break;
- default: /* for compiler happiness */
- wraplen = 6;
- }
-
- /* if not default parameters, return conservative bound */
- if (s->w_bits != 15 || s->hash_bits != 8 + 7)
- return complen + wraplen;
-
- /* default settings: return tight bound for that case */
- return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
- (sourceLen >> 25) + 13 - 6 + wraplen;
-}
-
-/* =========================================================================
- * Put a short in the pending buffer. The 16-bit value is put in MSB order.
- * IN assertion: the stream state is correct and there is enough room in
- * pending_buf.
- */
-local void putShortMSB (s, b)
- deflate_state *s;
- uInt b;
-{
- put_byte(s, (Byte)(b >> 8));
- put_byte(s, (Byte)(b & 0xff));
-}
-
-/* =========================================================================
- * Flush as much pending output as possible. All deflate() output goes
- * through this function so some applications may wish to modify it
- * to avoid allocating a large strm->next_out buffer and copying into it.
- * (See also read_buf()).
- */
-local void flush_pending(strm)
- z_streamp strm;
-{
- unsigned len;
- deflate_state *s = strm->state;
-
- _tr_flush_bits(s);
- len = s->pending;
- if (len > strm->avail_out) len = strm->avail_out;
- if (len == 0) return;
-
- zmemcpy(strm->next_out, s->pending_out, len);
- strm->next_out += len;
- s->pending_out += len;
- strm->total_out += len;
- strm->avail_out -= len;
- s->pending -= len;
- if (s->pending == 0) {
- s->pending_out = s->pending_buf;
- }
-}
-
-/* ========================================================================= */
-int ZEXPORT deflate (strm, flush)
- z_streamp strm;
- int flush;
-{
- int old_flush; /* value of flush param for previous deflate call */
- deflate_state *s;
-
- if (strm == Z_NULL || strm->state == Z_NULL ||
- flush > Z_BLOCK || flush < 0) {
- return Z_STREAM_ERROR;
- }
- s = strm->state;
-
- if (strm->next_out == Z_NULL ||
- (strm->next_in == Z_NULL && strm->avail_in != 0) ||
- (s->status == FINISH_STATE && flush != Z_FINISH)) {
- ERR_RETURN(strm, Z_STREAM_ERROR);
- }
- if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
-
- s->strm = strm; /* just in case */
- old_flush = s->last_flush;
- s->last_flush = flush;
-
- /* Write the header */
- if (s->status == INIT_STATE) {
-#ifdef GZIP
- if (s->wrap == 2) {
- strm->adler = crc32(0L, Z_NULL, 0);
- put_byte(s, 31);
- put_byte(s, 139);
- put_byte(s, 8);
- if (s->gzhead == Z_NULL) {
- put_byte(s, 0);
- put_byte(s, 0);
- put_byte(s, 0);
- put_byte(s, 0);
- put_byte(s, 0);
- put_byte(s, s->level == 9 ? 2 :
- (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
- 4 : 0));
- put_byte(s, OS_CODE);
- s->status = BUSY_STATE;
- }
- else {
- put_byte(s, (s->gzhead->text ? 1 : 0) +
- (s->gzhead->hcrc ? 2 : 0) +
- (s->gzhead->extra == Z_NULL ? 0 : 4) +
- (s->gzhead->name == Z_NULL ? 0 : 8) +
- (s->gzhead->comment == Z_NULL ? 0 : 16)
- );
- put_byte(s, (Byte)(s->gzhead->time & 0xff));
- put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
- put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
- put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
- put_byte(s, s->level == 9 ? 2 :
- (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
- 4 : 0));
- put_byte(s, s->gzhead->os & 0xff);
- if (s->gzhead->extra != Z_NULL) {
- put_byte(s, s->gzhead->extra_len & 0xff);
- put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
- }
- if (s->gzhead->hcrc)
- strm->adler = crc32(strm->adler, s->pending_buf,
- s->pending);
- s->gzindex = 0;
- s->status = EXTRA_STATE;
- }
- }
- else
-#endif
- {
- uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
- uInt level_flags;
-
- if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
- level_flags = 0;
- else if (s->level < 6)
- level_flags = 1;
- else if (s->level == 6)
- level_flags = 2;
- else
- level_flags = 3;
- header |= (level_flags << 6);
- if (s->strstart != 0) header |= PRESET_DICT;
- header += 31 - (header % 31);
-
- s->status = BUSY_STATE;
- putShortMSB(s, header);
-
- /* Save the adler32 of the preset dictionary: */
- if (s->strstart != 0) {
- putShortMSB(s, (uInt)(strm->adler >> 16));
- putShortMSB(s, (uInt)(strm->adler & 0xffff));
- }
- strm->adler = adler32(0L, Z_NULL, 0);
- }
- }
-#ifdef GZIP
- if (s->status == EXTRA_STATE) {
- if (s->gzhead->extra != Z_NULL) {
- uInt beg = s->pending; /* start of bytes to update crc */
-
- while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
- if (s->pending == s->pending_buf_size) {
- if (s->gzhead->hcrc && s->pending > beg)
- strm->adler = crc32(strm->adler, s->pending_buf + beg,
- s->pending - beg);
- flush_pending(strm);
- beg = s->pending;
- if (s->pending == s->pending_buf_size)
- break;
- }
- put_byte(s, s->gzhead->extras->gzindex);
- s->gzindex++;
- }
- if (s->gzhead->hcrc && s->pending > beg)
- strm->adler = crc32(strm->adler, s->pending_buf + beg,
- s->pending - beg);
- if (s->gzindex == s->gzhead->extra_len) {
- s->gzindex = 0;
- s->status = NAME_STATE;
- }
- }
- else
- s->status = NAME_STATE;
- }
- if (s->status == NAME_STATE) {
- if (s->gzhead->name != Z_NULL) {
- uInt beg = s->pending; /* start of bytes to update crc */
- int val;
-
- do {
- if (s->pending == s->pending_buf_size) {
- if (s->gzhead->hcrc && s->pending > beg)
- strm->adler = crc32(strm->adler, s->pending_buf + beg,
- s->pending - beg);
- flush_pending(strm);
- beg = s->pending;
- if (s->pending == s->pending_buf_size) {
- val = 1;
- break;
- }
- }
- val = s->gzhead->names->gzindex++;
- put_byte(s, val);
- } while (val != 0);
- if (s->gzhead->hcrc && s->pending > beg)
- strm->adler = crc32(strm->adler, s->pending_buf + beg,
- s->pending - beg);
- if (val == 0) {
- s->gzindex = 0;
- s->status = COMMENT_STATE;
- }
- }
- else
- s->status = COMMENT_STATE;
- }
- if (s->status == COMMENT_STATE) {
- if (s->gzhead->comment != Z_NULL) {
- uInt beg = s->pending; /* start of bytes to update crc */
- int val;
-
- do {
- if (s->pending == s->pending_buf_size) {
- if (s->gzhead->hcrc && s->pending > beg)
- strm->adler = crc32(strm->adler, s->pending_buf + beg,
- s->pending - beg);
- flush_pending(strm);
- beg = s->pending;
- if (s->pending == s->pending_buf_size) {
- val = 1;
- break;
- }
- }
- val = s->gzhead->comments->gzindex++;
- put_byte(s, val);
- } while (val != 0);
- if (s->gzhead->hcrc && s->pending > beg)
- strm->adler = crc32(strm->adler, s->pending_buf + beg,
- s->pending - beg);
- if (val == 0)
- s->status = HCRC_STATE;
- }
- else
- s->status = HCRC_STATE;
- }
- if (s->status == HCRC_STATE) {
- if (s->gzhead->hcrc) {
- if (s->pending + 2 > s->pending_buf_size)
- flush_pending(strm);
- if (s->pending + 2 <= s->pending_buf_size) {
- put_byte(s, (Byte)(strm->adler & 0xff));
- put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
- strm->adler = crc32(0L, Z_NULL, 0);
- s->status = BUSY_STATE;
- }
- }
- else
- s->status = BUSY_STATE;
- }
-#endif
-
- /* Flush as much pending output as possible */
- if (s->pending != 0) {
- flush_pending(strm);
- if (strm->avail_out == 0) {
- /* Since avail_out is 0, deflate will be called again with
- * more output space, but possibly with both pending and
- * avail_in equal to zero. There won't be anything to do,
- * but this is not an error situation so make sure we
- * return OK instead of BUF_ERROR at next call of deflate:
- */
- s->last_flush = -1;
- return Z_OK;
- }
-
- /* Make sure there is something to do and avoid duplicate consecutive
- * flushes. For repeated and useless calls with Z_FINISH, we keep
- * returning Z_STREAM_END instead of Z_BUF_ERROR.
- */
- } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
- flush != Z_FINISH) {
- ERR_RETURN(strm, Z_BUF_ERROR);
- }
-
- /* User must not provide more input after the first FINISH: */
- if (s->status == FINISH_STATE && strm->avail_in != 0) {
- ERR_RETURN(strm, Z_BUF_ERROR);
- }
-
- /* Start a new block or continue the current one.
- */
- if (strm->avail_in != 0 || s->lookahead != 0 ||
- (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
- block_state bstate;
-
- bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
- (s->strategy == Z_RLE ? deflate_rle(s, flush) :
- (*(configuration_tables->level.func))(s, flush));
-
- if (bstate == finish_started || bstate == finish_done) {
- s->status = FINISH_STATE;
- }
- if (bstate == need_more || bstate == finish_started) {
- if (strm->avail_out == 0) {
- s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
- }
- return Z_OK;
- /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
- * of deflate should use the same flush parameter to make sure
- * that the flush is complete. So we don't have to output an
- * empty block here, this will be done at next call. This also
- * ensures that for a very small output buffer, we emit at most
- * one empty block.
- */
- }
- if (bstate == block_done) {
- if (flush == Z_PARTIAL_FLUSH) {
- _tr_align(s);
- } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
- _tr_stored_block(s, (char*)0, 0L, 0);
- /* For a full flush, this empty block will be recognized
- * as a special marker by inflate_sync().
- */
- if (flush == Z_FULL_FLUSH) {
- CLEAR_HASH(s); /* forget history */
- if (s->lookahead == 0) {
- s->strstart = 0;
- s->block_start = 0L;
- s->insert = 0;
- }
- }
- }
- flush_pending(strm);
- if (strm->avail_out == 0) {
- s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
- return Z_OK;
- }
- }
- }
- Assert(strm->avail_out > 0, "bug2");
-
- if (flush != Z_FINISH) return Z_OK;
- if (s->wrap <= 0) return Z_STREAM_END;
-
- /* Write the trailer */
-#ifdef GZIP
- if (s->wrap == 2) {
- put_byte(s, (Byte)(strm->adler & 0xff));
- put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
- put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
- put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
- put_byte(s, (Byte)(strm->total_in & 0xff));
- put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
- put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
- put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
- }
- else
-#endif
- {
- putShortMSB(s, (uInt)(strm->adler >> 16));
- putShortMSB(s, (uInt)(strm->adler & 0xffff));
- }
- flush_pending(strm);
- /* If avail_out is zero, the application will call deflate again
- * to flush the rest.
- */
- if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
- return s->pending != 0 ? Z_OK : Z_STREAM_END;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateEnd (strm)
- z_streamp strm;
-{
- int status;
-
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-
- status = strm->state->status;
- if (status != INIT_STATE &&
- status != EXTRA_STATE &&
- status != NAME_STATE &&
- status != COMMENT_STATE &&
- status != HCRC_STATE &&
- status != BUSY_STATE &&
- status != FINISH_STATE) {
- return Z_STREAM_ERROR;
- }
-
- /* Deallocate in reverse order of allocations: */
- TRY_FREE(strm, strm->state->pending_buf);
- TRY_FREE(strm, strm->state->head);
- TRY_FREE(strm, strm->state->prev);
- TRY_FREE(strm, strm->state->window);
-
- ZFREE(strm, strm->state);
- strm->state = Z_NULL;
-
- return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
-}
-
-/* =========================================================================
- * Copy the source state to the destination state.
- * To simplify the source, this is not supported for 16-bit MSDOS (which
- * doesn't have enough memory anyway to duplicate compression states).
- */
-int ZEXPORT deflateCopy (dest, source)
- z_streamp dest;
- z_streamp source;
-{
-#ifdef MAXSEG_64K
- return Z_STREAM_ERROR;
-#else
- deflate_state *ds;
- deflate_state *ss;
- ushf *overlay;
-
-
- if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
- return Z_STREAM_ERROR;
- }
-
- ss = source->state;
-
- zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
-
- ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
- if (ds == Z_NULL) return Z_MEM_ERROR;
- dest->state = (struct internal_state FAR *) ds;
- zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
- ds->strm = dest;
-
- ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
- ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos));
- ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos));
- overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
- ds->pending_buf = (uchf *) overlay;
-
- if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
- ds->pending_buf == Z_NULL) {
- deflateEnd (dest);
- return Z_MEM_ERROR;
- }
- /* following zmemcpy do not work for 16-bit MSDOS */
- zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
- zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
- zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
- zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
-
- ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
- ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
- ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
-
- ds->l_desc.dyn_tree = ds->dyn_ltree;
- ds->d_desc.dyn_tree = ds->dyn_dtree;
- ds->bl_desc.dyn_tree = ds->bl_tree;
-
- return Z_OK;
-#endif /* MAXSEG_64K */
-}
-
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read. All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->next_in buffer and copying from it.
- * (See also flush_pending()).
- */
-local int read_buf(strm, buf, size)
- z_streamp strm;
- Bytef *buf;
- unsigned size;
-{
- unsigned len = strm->avail_in;
-
- if (len > size) len = size;
- if (len == 0) return 0;
-
- strm->avail_in -= len;
-
- zmemcpy(buf, strm->next_in, len);
- if (strm->state->wrap == 1) {
- strm->adler = adler32(strm->adler, buf, len);
- }
-#ifdef GZIP
- else if (strm->state->wrap == 2) {
- strm->adler = crc32(strm->adler, buf, len);
- }
-#endif
- strm->next_in += len;
- strm->total_in += len;
-
- return (int)len;
-}
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-local void lm_init (s)
- deflate_state *s;
-{
- s->window_size = (ulg)2L*s->w_size;
-
- CLEAR_HASH(s);
-
- /* Set the default configuration parameters:
- */
- s->max_lazy_match = configuration_tables->level.max_lazy;
- s->good_match = configuration_tables->level.good_length;
- s->nice_match = configuration_tables->level.nice_length;
- s->max_chain_length = configuration_tables->level.max_chain;
-
- s->strstart = 0;
- s->block_start = 0L;
- s->lookahead = 0;
- s->insert = 0;
- s->match_length = s->prev_length = MIN_MATCH-1;
- s->match_available = 0;
- s->ins_h = 0;
-#ifndef FASTEST
-#ifdef ASMV
- match_init(); /* initialize the asm code */
-#endif
-#endif
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Set match_start to the longest match starting at the given string and
- * return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the result is equal to prev_length and match_start is
- * garbage.
- * IN assertions: cur_match is the head of the hash chain for the current
- * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
- * OUT assertion: the match length is not greater than s->lookahead.
- */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
-local uInt longest_match(s, cur_match)
- deflate_state *s;
- IPos cur_match; /* current match */
-{
- unsigned chain_length = s->max_chain_length;/* max hash chain length */
- register Bytef *scan = s->window + s->strstart; /* current string */
- register Bytef *match; /* matched string */
- register int len; /* length of current match */
- int best_len = s->prev_length; /* best match length so far */
- int nice_match = s->nice_match; /* stop if match long enough */
- IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
- s->strstart - (IPos)MAX_DIST(s) : NIL;
- /* Stop when cur_match becomes <= limit. To simplify the code,
- * we prevent matches with the string of window index 0.
- */
- Posf *prev = s->prev;
- uInt wmask = s->w_mask;
-
-#ifdef UNALIGNED_OK
- /* Compare two bytes at a time. Note: this is not always beneficial.
- * Try with and without -DUNALIGNED_OK to check.
- */
- register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
- register ush scan_start = *(ushf*)scan;
- register ush scan_end = *(ushf*)(scan+best_len-1);
-#else
- register Bytef *strend = s->window + s->strstart + MAX_MATCH;
- register Byte scan_end1 = scanbest_len-1;
- register Byte scan_end = scanbest_len;
-#endif
-
- /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
- * It is easy to get rid of this optimization if necessary.
- */
- Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
- /* Do not waste too much time if we already have a good match: */
- if (s->prev_length >= s->good_match) {
- chain_length >>= 2;
- }
- /* Do not look for matches beyond the end of the input. This is necessary
- * to make deflate deterministic.
- */
- if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
-
- Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
- do {
- Assert(cur_match < s->strstart, "no future");
- match = s->window + cur_match;
-
- /* Skip to next match if the match length cannot increase
- * or if the match length is less than 2. Note that the checks below
- * for insufficient lookahead only occur occasionally for performance
- * reasons. Therefore uninitialized memory will be accessed, and
- * conditional jumps will be made that depend on those values.
- * However the length of the match is limited to the lookahead, so
- * the output of deflate is not affected by the uninitialized values.
- */
-#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
- /* This code assumes sizeof(unsigned short) == 2. Do not use
- * UNALIGNED_OK if your compiler uses a different size.
- */
- if (*(ushf*)(match+best_len-1) != scan_end ||
- *(ushf*)match != scan_start) continue;
-
- /* It is not necessary to compare scan2 and match2 since they are
- * always equal when the other bytes match, given that the hash keys
- * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
- * strstart+3, +5, ... up to strstart+257. We check for insufficient
- * lookahead only every 4th comparison; the 128th check will be made
- * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
- * necessary to put more guard bytes at the end of the window, or
- * to check more often for insufficient lookahead.
- */
- Assert(scan2 == match2, "scan2?");
- scan++, match++;
- do {
- } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
- *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
- *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
- *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
- scan < strend);
- /* The funny "do {}" generates better code on most compilers */
-
- /* Here, scan <= window+strstart+257 */
- Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
- if (*scan == *match) scan++;
-
- len = (MAX_MATCH - 1) - (int)(strend-scan);
- scan = strend - (MAX_MATCH-1);
-
-#else /* UNALIGNED_OK */
-
- if (matchbest_len != scan_end ||
- matchbest_len-1 != scan_end1 ||
- *match != *scan ||
- *++match != scan1) continue;
-
- /* The check at best_len-1 can be removed because it will be made
- * again later. (This heuristic is not always a win.)
- * It is not necessary to compare scan2 and match2 since they
- * are always equal when the other bytes match, given that
- * the hash keys are equal and that HASH_BITS >= 8.
- */
- scan += 2, match++;
- Assert(*scan == *match, "match2?");
-
- /* We check for insufficient lookahead only every 8th comparison;
- * the 256th check will be made at strstart+258.
- */
- do {
- } while (*++scan == *++match && *++scan == *++match &&
- *++scan == *++match && *++scan == *++match &&
- *++scan == *++match && *++scan == *++match &&
- *++scan == *++match && *++scan == *++match &&
- scan < strend);
-
- Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
- len = MAX_MATCH - (int)(strend - scan);
- scan = strend - MAX_MATCH;
-
-#endif /* UNALIGNED_OK */
-
- if (len > best_len) {
- s->match_start = cur_match;
- best_len = len;
- if (len >= nice_match) break;
-#ifdef UNALIGNED_OK
- scan_end = *(ushf*)(scan+best_len-1);
-#else
- scan_end1 = scanbest_len-1;
- scan_end = scanbest_len;
-#endif
- }
- } while ((cur_match = prevcur_match & wmask) > limit
- && --chain_length != 0);
-
- if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
- return s->lookahead;
-}
-#endif /* ASMV */
-
-#else /* FASTEST */
-
-/* ---------------------------------------------------------------------------
- * Optimized version for FASTEST only
- */
-local uInt longest_match(s, cur_match)
- deflate_state *s;
- IPos cur_match; /* current match */
-{
- register Bytef *scan = s->window + s->strstart; /* current string */
- register Bytef *match; /* matched string */
- register int len; /* length of current match */
- register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-
- /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
- * It is easy to get rid of this optimization if necessary.
- */
- Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
- Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
- Assert(cur_match < s->strstart, "no future");
-
- match = s->window + cur_match;
-
- /* Return failure if the match length is less than 2:
- */
- if (match0 != scan0 || match1 != scan1) return MIN_MATCH-1;
-
- /* The check at best_len-1 can be removed because it will be made
- * again later. (This heuristic is not always a win.)
- * It is not necessary to compare scan2 and match2 since they
- * are always equal when the other bytes match, given that
- * the hash keys are equal and that HASH_BITS >= 8.
- */
- scan += 2, match += 2;
- Assert(*scan == *match, "match2?");
-
- /* We check for insufficient lookahead only every 8th comparison;
- * the 256th check will be made at strstart+258.
- */
- do {
- } while (*++scan == *++match && *++scan == *++match &&
- *++scan == *++match && *++scan == *++match &&
- *++scan == *++match && *++scan == *++match &&
- *++scan == *++match && *++scan == *++match &&
- scan < strend);
-
- Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
- len = MAX_MATCH - (int)(strend - scan);
-
- if (len < MIN_MATCH) return MIN_MATCH - 1;
-
- s->match_start = cur_match;
- return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
-}
-
-#endif /* FASTEST */
-
-#ifdef DEBUG
-/* ===========================================================================
- * Check that the match at match_start is indeed a match.
- */
-local void check_match(s, start, match, length)
- deflate_state *s;
- IPos start, match;
- int length;
-{
- /* check that the match is indeed a match */
- if (zmemcmp(s->window + match,
- s->window + start, length) != EQUAL) {
- fprintf(stderr, " start %u, match %u, length %d\n",
- start, match, length);
- do {
- fprintf(stderr, "%c%c", s->windowmatch++, s->windowstart++);
- } while (--length != 0);
- z_error("invalid match");
- }
- if (z_verbose > 1) {
- fprintf(stderr,"\\%d,%d", start-match, length);
- do { putc(s->windowstart++, stderr); } while (--length != 0);
- }
-}
-#else
-# define check_match(s, start, match, length)
-#endif /* DEBUG */
-
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- * At least one byte has been read, or avail_in == 0; reads are
- * performed for at least two bytes (required for the zip translate_eol
- * option -- not supported here).
- */
-local void fill_window(s)
- deflate_state *s;
-{
- register unsigned n, m;
- register Posf *p;
- unsigned more; /* Amount of free space at the end of the window. */
- uInt wsize = s->w_size;
-
- Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
-
- do {
- more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
- /* Deal with !@#$% 64K limit: */
- if (sizeof(int) <= 2) {
- if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
- more = wsize;
-
- } else if (more == (unsigned)(-1)) {
- /* Very unlikely, but possible on 16 bit machine if
- * strstart == 0 && lookahead == 1 (input done a byte at time)
- */
- more--;
- }
- }
-
- /* If the window is almost full and there is insufficient lookahead,
- * move the upper half to the lower one to make room in the upper half.
- */
- if (s->strstart >= wsize+MAX_DIST(s)) {
-
- zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
- s->match_start -= wsize;
- s->strstart -= wsize; /* we now have strstart >= MAX_DIST */
- s->block_start -= (long) wsize;
-
- /* Slide the hash table (could be avoided with 32 bit values
- at the expense of memory usage). We slide even when level == 0
- to keep the hash table consistent if we switch back to level > 0
- later. (Using level 0 permanently is not an optimal usage of
- zlib, so we don't care about this pathological case.)
- */
- n = s->hash_size;
- p = &s->headn;
- do {
- m = *--p;
- *p = (Pos)(m >= wsize ? m-wsize : NIL);
- } while (--n);
-
- n = wsize;
-#ifndef FASTEST
- p = &s->prevn;
- do {
- m = *--p;
- *p = (Pos)(m >= wsize ? m-wsize : NIL);
- /* If n is not on any hash chain, prevn is garbage but
- * its value will never be used.
- */
- } while (--n);
-#endif
- more += wsize;
- }
- if (s->strm->avail_in == 0) break;
-
- /* If there was no sliding:
- * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
- * more == window_size - lookahead - strstart
- * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
- * => more >= window_size - 2*WSIZE + 2
- * In the BIG_MEM or MMAP case (not yet supported),
- * window_size == input_size + MIN_LOOKAHEAD &&
- * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
- * Otherwise, window_size == 2*WSIZE so more >= 2.
- * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
- */
- Assert(more >= 2, "more < 2");
-
- n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
- s->lookahead += n;
-
- /* Initialize the hash value now that we have some input: */
- if (s->lookahead + s->insert >= MIN_MATCH) {
- uInt str = s->strstart - s->insert;
- s->ins_h = s->windowstr;
- UPDATE_HASH(s, s->ins_h, s->windowstr + 1);
-#if MIN_MATCH != 3
- Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
- while (s->insert) {
- UPDATE_HASH(s, s->ins_h, s->windowstr + MIN_MATCH-1);
-#ifndef FASTEST
- s->prevstr & s->w_mask = s->heads->ins_h;
-#endif
- s->heads->ins_h = (Pos)str;
- str++;
- s->insert--;
- if (s->lookahead + s->insert < MIN_MATCH)
- break;
- }
- }
- /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
- * but this is not important since only literal bytes will be emitted.
- */
-
- } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-
- /* If the WIN_INIT bytes after the end of the current data have never been
- * written, then zero those bytes in order to avoid memory check reports of
- * the use of uninitialized (or uninitialised as Julian writes) bytes by
- * the longest match routines. Update the high water mark for the next
- * time through here. WIN_INIT is set to MAX_MATCH since the longest match
- * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
- */
- if (s->high_water < s->window_size) {
- ulg curr = s->strstart + (ulg)(s->lookahead);
- ulg init;
-
- if (s->high_water < curr) {
- /* Previous high water mark below current data -- zero WIN_INIT
- * bytes or up to end of window, whichever is less.
- */
- init = s->window_size - curr;
- if (init > WIN_INIT)
- init = WIN_INIT;
- zmemzero(s->window + curr, (unsigned)init);
- s->high_water = curr + init;
- }
- else if (s->high_water < (ulg)curr + WIN_INIT) {
- /* High water mark at or above current data, but below current data
- * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
- * to end of window, whichever is less.
- */
- init = (ulg)curr + WIN_INIT - s->high_water;
- if (init > s->window_size - s->high_water)
- init = s->window_size - s->high_water;
- zmemzero(s->window + s->high_water, (unsigned)init);
- s->high_water += init;
- }
- }
-
- Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
- "not enough room for search");
-}
-
-/* ===========================================================================
- * Flush the current block, with given end-of-file flag.
- * IN assertion: strstart is set to the end of the current match.
- */
-#define FLUSH_BLOCK_ONLY(s, last) { \
- _tr_flush_block(s, (s->block_start >= 0L ? \
- (charf *)&s->window(unsigned)s->block_start : \
- (charf *)Z_NULL), \
- (ulg)((long)s->strstart - s->block_start), \
- (last)); \
- s->block_start = s->strstart; \
- flush_pending(s->strm); \
- Tracev((stderr,"FLUSH")); \
-}
-
-/* Same but force premature exit if necessary. */
-#define FLUSH_BLOCK(s, last) { \
- FLUSH_BLOCK_ONLY(s, last); \
- if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
-}
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- * This function does not insert new strings in the dictionary since
- * uncompressible data is probably not useful. This function is used
- * only for the level=0 compression option.
- * NOTE: this function should be optimized to avoid extra copying from
- * window to pending_buf.
- */
-local block_state deflate_stored(s, flush)
- deflate_state *s;
- int flush;
-{
- /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
- * to pending_buf_size, and each stored block has a 5 byte header:
- */
- ulg max_block_size = 0xffff;
- ulg max_start;
-
- if (max_block_size > s->pending_buf_size - 5) {
- max_block_size = s->pending_buf_size - 5;
- }
-
- /* Copy as much as possible from input to output: */
- for (;;) {
- /* Fill the window as much as possible: */
- if (s->lookahead <= 1) {
-
- Assert(s->strstart < s->w_size+MAX_DIST(s) ||
- s->block_start >= (long)s->w_size, "slide too late");
-
- fill_window(s);
- if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
-
- if (s->lookahead == 0) break; /* flush the current block */
- }
- Assert(s->block_start >= 0L, "block gone");
-
- s->strstart += s->lookahead;
- s->lookahead = 0;
-
- /* Emit a stored block if pending_buf will be full: */
- max_start = s->block_start + max_block_size;
- if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
- /* strstart == 0 is possible when wraparound on 16-bit machine */
- s->lookahead = (uInt)(s->strstart - max_start);
- s->strstart = (uInt)max_start;
- FLUSH_BLOCK(s, 0);
- }
- /* Flush if we may have to slide, otherwise block_start may become
- * negative and the data will be gone:
- */
- if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
- FLUSH_BLOCK(s, 0);
- }
- }
- s->insert = 0;
- if (flush == Z_FINISH) {
- FLUSH_BLOCK(s, 1);
- return finish_done;
- }
- if ((long)s->strstart > s->block_start)
- FLUSH_BLOCK(s, 0);
- return block_done;
-}
-
-/* ===========================================================================
- * Compress as much as possible from the input stream, return the current
- * block state.
- * This function does not perform lazy evaluation of matches and inserts
- * new strings in the dictionary only for unmatched strings or for short
- * matches. It is used only for the fast compression options.
- */
-local block_state deflate_fast(s, flush)
- deflate_state *s;
- int flush;
-{
- IPos hash_head; /* head of the hash chain */
- int bflush; /* set if current block must be flushed */
-
- for (;;) {
- /* Make sure that we always have enough lookahead, except
- * at the end of the input file. We need MAX_MATCH bytes
- * for the next match, plus MIN_MATCH bytes to insert the
- * string following the next match.
- */
- if (s->lookahead < MIN_LOOKAHEAD) {
- fill_window(s);
- if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
- return need_more;
- }
- if (s->lookahead == 0) break; /* flush the current block */
- }
-
- /* Insert the string windowstrstart .. strstart+2 in the
- * dictionary, and set hash_head to the head of the hash chain:
- */
- hash_head = NIL;
- if (s->lookahead >= MIN_MATCH) {
- INSERT_STRING(s, s->strstart, hash_head);
- }
-
- /* Find the longest match, discarding those <= prev_length.
- * At this point we have always match_length < MIN_MATCH
- */
- if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
- /* To simplify the code, we prevent matches with the string
- * of window index 0 (in particular we have to avoid a match
- * of the string with itself at the start of the input file).
- */
- s->match_length = longest_match (s, hash_head);
- /* longest_match() sets match_start */
- }
- if (s->match_length >= MIN_MATCH) {
- check_match(s, s->strstart, s->match_start, s->match_length);
-
- _tr_tally_dist(s, s->strstart - s->match_start,
- s->match_length - MIN_MATCH, bflush);
-
- s->lookahead -= s->match_length;
-
- /* Insert new strings in the hash table only if the match length
- * is not too large. This saves time but degrades compression.
- */
-#ifndef FASTEST
- if (s->match_length <= s->max_insert_length &&
- s->lookahead >= MIN_MATCH) {
- s->match_length--; /* string at strstart already in table */
- do {
- s->strstart++;
- INSERT_STRING(s, s->strstart, hash_head);
- /* strstart never exceeds WSIZE-MAX_MATCH, so there are
- * always MIN_MATCH bytes ahead.
- */
- } while (--s->match_length != 0);
- s->strstart++;
- } else
-#endif
- {
- s->strstart += s->match_length;
- s->match_length = 0;
- s->ins_h = s->windows->strstart;
- UPDATE_HASH(s, s->ins_h, s->windows->strstart+1);
-#if MIN_MATCH != 3
- Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
- /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
- * matter since it will be recomputed at next deflate call.
- */
- }
- } else {
- /* No match, output a literal byte */
- Tracevv((stderr,"%c", s->windows->strstart));
- _tr_tally_lit (s, s->windows->strstart, bflush);
- s->lookahead--;
- s->strstart++;
- }
- if (bflush) FLUSH_BLOCK(s, 0);
- }
- s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
- if (flush == Z_FINISH) {
- FLUSH_BLOCK(s, 1);
- return finish_done;
- }
- if (s->last_lit)
- FLUSH_BLOCK(s, 0);
- return block_done;
-}
-
-#ifndef FASTEST
-/* ===========================================================================
- * Same as above, but achieves better compression. We use a lazy
- * evaluation for matches: a match is finally adopted only if there is
- * no better match at the next window position.
- */
-local block_state deflate_slow(s, flush)
- deflate_state *s;
- int flush;
-{
- IPos hash_head; /* head of hash chain */
- int bflush; /* set if current block must be flushed */
-
- /* Process the input block. */
- for (;;) {
- /* Make sure that we always have enough lookahead, except
- * at the end of the input file. We need MAX_MATCH bytes
- * for the next match, plus MIN_MATCH bytes to insert the
- * string following the next match.
- */
- if (s->lookahead < MIN_LOOKAHEAD) {
- fill_window(s);
- if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
- return need_more;
- }
- if (s->lookahead == 0) break; /* flush the current block */
- }
-
- /* Insert the string windowstrstart .. strstart+2 in the
- * dictionary, and set hash_head to the head of the hash chain:
- */
- hash_head = NIL;
- if (s->lookahead >= MIN_MATCH) {
- INSERT_STRING(s, s->strstart, hash_head);
- }
-
- /* Find the longest match, discarding those <= prev_length.
- */
- s->prev_length = s->match_length, s->prev_match = s->match_start;
- s->match_length = MIN_MATCH-1;
-
- if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
- s->strstart - hash_head <= MAX_DIST(s)) {
- /* To simplify the code, we prevent matches with the string
- * of window index 0 (in particular we have to avoid a match
- * of the string with itself at the start of the input file).
- */
- s->match_length = longest_match (s, hash_head);
- /* longest_match() sets match_start */
-
- if (s->match_length <= 5 && (s->strategy == Z_FILTERED
-#if TOO_FAR <= 32767
- || (s->match_length == MIN_MATCH &&
- s->strstart - s->match_start > TOO_FAR)
-#endif
- )) {
-
- /* If prev_match is also MIN_MATCH, match_start is garbage
- * but we will ignore the current match anyway.
- */
- s->match_length = MIN_MATCH-1;
- }
- }
- /* If there was a match at the previous step and the current
- * match is not better, output the previous match:
- */
- if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
- uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
- /* Do not insert strings in hash table beyond this. */
-
- check_match(s, s->strstart-1, s->prev_match, s->prev_length);
-
- _tr_tally_dist(s, s->strstart -1 - s->prev_match,
- s->prev_length - MIN_MATCH, bflush);
-
- /* Insert in hash table all strings up to the end of the match.
- * strstart-1 and strstart are already inserted. If there is not
- * enough lookahead, the last two strings are not inserted in
- * the hash table.
- */
- s->lookahead -= s->prev_length-1;
- s->prev_length -= 2;
- do {
- if (++s->strstart <= max_insert) {
- INSERT_STRING(s, s->strstart, hash_head);
- }
- } while (--s->prev_length != 0);
- s->match_available = 0;
- s->match_length = MIN_MATCH-1;
- s->strstart++;
-
- if (bflush) FLUSH_BLOCK(s, 0);
-
- } else if (s->match_available) {
- /* If there was no match at the previous position, output a
- * single literal. If there was a match but the current match
- * is longer, truncate the previous match to a single literal.
- */
- Tracevv((stderr,"%c", s->windows->strstart-1));
- _tr_tally_lit(s, s->windows->strstart-1, bflush);
- if (bflush) {
- FLUSH_BLOCK_ONLY(s, 0);
- }
- s->strstart++;
- s->lookahead--;
- if (s->strm->avail_out == 0) return need_more;
- } else {
- /* There is no previous match to compare with, wait for
- * the next step to decide.
- */
- s->match_available = 1;
- s->strstart++;
- s->lookahead--;
- }
- }
- Assert (flush != Z_NO_FLUSH, "no flush?");
- if (s->match_available) {
- Tracevv((stderr,"%c", s->windows->strstart-1));
- _tr_tally_lit(s, s->windows->strstart-1, bflush);
- s->match_available = 0;
- }
- s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
- if (flush == Z_FINISH) {
- FLUSH_BLOCK(s, 1);
- return finish_done;
- }
- if (s->last_lit)
- FLUSH_BLOCK(s, 0);
- return block_done;
-}
-#endif /* FASTEST */
-
-/* ===========================================================================
- * For Z_RLE, simply look for runs of bytes, generate matches only of distance
- * one. Do not maintain a hash table. (It will be regenerated if this run of
- * deflate switches away from Z_RLE.)
- */
-local block_state deflate_rle(s, flush)
- deflate_state *s;
- int flush;
-{
- int bflush; /* set if current block must be flushed */
- uInt prev; /* byte at distance one to match */
- Bytef *scan, *strend; /* scan goes up to strend for length of run */
-
- for (;;) {
- /* Make sure that we always have enough lookahead, except
- * at the end of the input file. We need MAX_MATCH bytes
- * for the longest run, plus one for the unrolled loop.
- */
- if (s->lookahead <= MAX_MATCH) {
- fill_window(s);
- if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
- return need_more;
- }
- if (s->lookahead == 0) break; /* flush the current block */
- }
-
- /* See how many times the previous byte repeats */
- s->match_length = 0;
- if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
- scan = s->window + s->strstart - 1;
- prev = *scan;
- if (prev == *++scan && prev == *++scan && prev == *++scan) {
- strend = s->window + s->strstart + MAX_MATCH;
- do {
- } while (prev == *++scan && prev == *++scan &&
- prev == *++scan && prev == *++scan &&
- prev == *++scan && prev == *++scan &&
- prev == *++scan && prev == *++scan &&
- scan < strend);
- s->match_length = MAX_MATCH - (int)(strend - scan);
- if (s->match_length > s->lookahead)
- s->match_length = s->lookahead;
- }
- Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
- }
-
- /* Emit match if have run of MIN_MATCH or longer, else emit literal */
- if (s->match_length >= MIN_MATCH) {
- check_match(s, s->strstart, s->strstart - 1, s->match_length);
-
- _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
-
- s->lookahead -= s->match_length;
- s->strstart += s->match_length;
- s->match_length = 0;
- } else {
- /* No match, output a literal byte */
- Tracevv((stderr,"%c", s->windows->strstart));
- _tr_tally_lit (s, s->windows->strstart, bflush);
- s->lookahead--;
- s->strstart++;
- }
- if (bflush) FLUSH_BLOCK(s, 0);
- }
- s->insert = 0;
- if (flush == Z_FINISH) {
- FLUSH_BLOCK(s, 1);
- return finish_done;
- }
- if (s->last_lit)
- FLUSH_BLOCK(s, 0);
- return block_done;
-}
-
-/* ===========================================================================
- * For Z_HUFFMAN_ONLY, do not look for matches. Do not maintain a hash table.
- * (It will be regenerated if this run of deflate switches away from Huffman.)
- */
-local block_state deflate_huff(s, flush)
- deflate_state *s;
- int flush;
-{
- int bflush; /* set if current block must be flushed */
-
- for (;;) {
- /* Make sure that we have a literal to write. */
- if (s->lookahead == 0) {
- fill_window(s);
- if (s->lookahead == 0) {
- if (flush == Z_NO_FLUSH)
- return need_more;
- break; /* flush the current block */
- }
- }
-
- /* Output a literal byte */
- s->match_length = 0;
- Tracevv((stderr,"%c", s->windows->strstart));
- _tr_tally_lit (s, s->windows->strstart, bflush);
- s->lookahead--;
- s->strstart++;
- if (bflush) FLUSH_BLOCK(s, 0);
- }
- s->insert = 0;
- if (flush == Z_FINISH) {
- FLUSH_BLOCK(s, 1);
- return finish_done;
- }
- if (s->last_lit)
- FLUSH_BLOCK(s, 0);
- return block_done;
-}

smplayer-0.8.0.tar.bz2/zlib-1.2.6/doc Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/examples Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/gzguts.h Deleted

@@ -1,190 +0,0 @@
-/* gzguts.h -- zlib internal header definitions for gz* operations
- * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#ifdef _LARGEFILE64_SOURCE
-# ifndef _LARGEFILE_SOURCE
-# define _LARGEFILE_SOURCE 1
-# endif
-# ifdef _FILE_OFFSET_BITS
-# undef _FILE_OFFSET_BITS
-# endif
-#endif
-
-#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
-# define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-#else
-# define ZLIB_INTERNAL
-#endif
-
-#include <stdio.h>
-#include "zlib.h"
-#ifdef STDC
-# include <string.h>
-# include <stdlib.h>
-# include <limits.h>
-#endif
-#include <fcntl.h>
-
-#ifdef __TURBOC__
-# include <io.h>
-#endif
-
-#ifdef NO_DEFLATE /* for compatibility with old definition */
-# define NO_GZCOMPRESS
-#endif
-
-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
-# ifndef HAVE_VSNPRINTF
-# define HAVE_VSNPRINTF
-# endif
-#endif
-
-#if defined(__CYGWIN__)
-# ifndef HAVE_VSNPRINTF
-# define HAVE_VSNPRINTF
-# endif
-#endif
-
-#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)
-# ifndef HAVE_VSNPRINTF
-# define HAVE_VSNPRINTF
-# endif
-#endif
-
-#ifndef HAVE_VSNPRINTF
-# ifdef MSDOS
-/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
- but for now we just assume it doesn't. */
-# define NO_vsnprintf
-# endif
-# ifdef __TURBOC__
-# define NO_vsnprintf
-# endif
-# ifdef WIN32
-/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
-# if !defined(vsnprintf) && !defined(NO_vsnprintf)
-# if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
-# include <io.h>
-# define vsnprintf _vsnprintf
-# endif
-# endif
-# endif
-# ifdef __SASC
-# define NO_vsnprintf
-# endif
-# ifdef VMS
-# define NO_vsnprintf
-# endif
-# ifdef __OS400__
-# define NO_vsnprintf
-# endif
-# ifdef __MVS__
-# define NO_vsnprintf
-# endif
-#endif
-
-#ifndef local
-# define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-/* gz* functions always use library allocation functions */
-#ifndef STDC
- extern voidp malloc OF((uInt size));
- extern void free OF((voidpf ptr));
-#endif
-
-/* get errno and strerror definition */
-#if defined UNDER_CE
-# include <windows.h>
-# define zstrerror() gz_strwinerror((DWORD)GetLastError())
-#else
-# ifdef STDC
-# include <errno.h>
-# define zstrerror() strerror(errno)
-# else
-# define zstrerror() "stdio error (consult errno)"
-# endif
-#endif
-
-/* provide prototypes for these when building zlib without LFS */
-#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
- ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
- ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
- ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
- ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-#endif
-
-/* default memLevel */
-#if MAX_MEM_LEVEL >= 8
-# define DEF_MEM_LEVEL 8
-#else
-# define DEF_MEM_LEVEL MAX_MEM_LEVEL
-#endif
-
-/* default i/o buffer size -- double this for output when reading */
-#define GZBUFSIZE 8192
-
-/* gzip modes, also provide a little integrity check on the passed structure */
-#define GZ_NONE 0
-#define GZ_READ 7247
-#define GZ_WRITE 31153
-#define GZ_APPEND 1 /* mode set to GZ_WRITE after the file is opened */
-
-/* values for gz_state how */
-#define LOOK 0 /* look for a gzip header */
-#define COPY 1 /* copy input directly */
-#define GZIP 2 /* decompress a gzip stream */
-
-/* internal gzip file state data structure */
-typedef struct {
- /* exposed contents for gzgetc() macro */
- struct gzFile_s x; /* "x" for exposed */
- /* x.have: number of bytes available at x.next */
- /* x.next: next output data to deliver or write */
- /* x.pos: current position in uncompressed data */
- /* used for both reading and writing */
- int mode; /* see gzip modes above */
- int fd; /* file descriptor */
- char *path; /* path or fd for error messages */
- unsigned size; /* buffer size, zero if not allocated yet */
- unsigned want; /* requested buffer size, default is GZBUFSIZE */
- unsigned char *in; /* input buffer */
- unsigned char *out; /* output buffer (double-sized when reading) */
- int direct; /* 0 if processing gzip, 1 if transparent */
- /* just for reading */
- int how; /* 0: get header, 1: copy, 2: decompress */
- z_off64_t start; /* where the gzip data started, for rewinding */
- int eof; /* true if end of input file reached */
- int past; /* true if read requested past end */
- /* just for writing */
- int level; /* compression level */
- int strategy; /* compression strategy */
- /* seek request */
- z_off64_t skip; /* amount to skip (already rewound if backwards) */
- int seek; /* true if seek request pending */
- /* error information */
- int err; /* error code */
- char *msg; /* error message */
- /* zlib inflate or deflate stream */
- z_stream strm; /* stream structure in-place (not a pointer) */
-} gz_state;
-typedef gz_state FAR *gz_statep;
-
-/* shared functions */
-void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
-#if defined UNDER_CE
-char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
-#endif
-
-/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
- value -- needed when comparing unsigned to z_off64_t, which is signed
- (possible z_off64_t types off_t, off64_t, and long are all signed) */
-#ifdef INT_MAX
-# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
-#else
-unsigned ZLIB_INTERNAL gz_intmax OF((void));
-# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
-#endif

smplayer-0.8.0.tar.bz2/zlib-1.2.6/gzlib.c Deleted

@@ -1,564 +0,0 @@
-/* gzlib.c -- zlib functions common to reading and writing gzip files
- * Copyright (C) 2004, 2010, 2011 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "gzguts.h"
-
-#if defined(_WIN32) && !defined(__BORLANDC__)
-# define LSEEK _lseeki64
-#else
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-# define LSEEK lseek64
-#else
-# define LSEEK lseek
-#endif
-#endif
-
-/* Local functions */
-local void gz_reset OF((gz_statep));
-local gzFile gz_open OF((const char *, int, const char *));
-
-#if defined UNDER_CE
-
-/* Map the Windows error number in ERROR to a locale-dependent error message
- string and return a pointer to it. Typically, the values for ERROR come
- from GetLastError.
-
- The string pointed to shall not be modified by the application, but may be
- overwritten by a subsequent call to gz_strwinerror
-
- The gz_strwinerror function does not change the current setting of
- GetLastError. */
-char ZLIB_INTERNAL *gz_strwinerror (error)
- DWORD error;
-{
- static char buf1024;
-
- wchar_t *msgbuf;
- DWORD lasterr = GetLastError();
- DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
- | FORMAT_MESSAGE_ALLOCATE_BUFFER,
- NULL,
- error,
- 0, /* Default language */
- (LPVOID)&msgbuf,
- 0,
- NULL);
- if (chars != 0) {
- /* If there is an \r\n appended, zap it. */
- if (chars >= 2
- && msgbufchars - 2 == '\r' && msgbufchars - 1 == '\n') {
- chars -= 2;
- msgbufchars = 0;
- }
-
- if (chars > sizeof (buf) - 1) {
- chars = sizeof (buf) - 1;
- msgbufchars = 0;
- }
-
- wcstombs(buf, msgbuf, chars + 1);
- LocalFree(msgbuf);
- }
- else {
- sprintf(buf, "unknown win32 error (%ld)", error);
- }
-
- SetLastError(lasterr);
- return buf;
-}
-
-#endif /* UNDER_CE */
-
-/* Reset gzip file state */
-local void gz_reset(state)
- gz_statep state;
-{
- state->x.have = 0; /* no output data available */
- if (state->mode == GZ_READ) { /* for reading ... */
- state->eof = 0; /* not at end of file */
- state->past = 0; /* have not read past end yet */
- state->how = LOOK; /* look for gzip header */
- }
- state->seek = 0; /* no seek request pending */
- gz_error(state, Z_OK, NULL); /* clear error */
- state->x.pos = 0; /* no uncompressed data yet */
- state->strm.avail_in = 0; /* no input data yet */
-}
-
-/* Open a gzip file either by name or file descriptor. */
-local gzFile gz_open(path, fd, mode)
- const char *path;
- int fd;
- const char *mode;
-{
- gz_statep state;
-
- /* check input */
- if (path == NULL)
- return NULL;
-
- /* allocate gzFile structure to return */
- state = malloc(sizeof(gz_state));
- if (state == NULL)
- return NULL;
- state->size = 0; /* no buffers allocated yet */
- state->want = GZBUFSIZE; /* requested buffer size */
- state->msg = NULL; /* no error message yet */
-
- /* interpret mode */
- state->mode = GZ_NONE;
- state->level = Z_DEFAULT_COMPRESSION;
- state->strategy = Z_DEFAULT_STRATEGY;
- state->direct = 0;
- while (*mode) {
- if (*mode >= '0' && *mode <= '9')
- state->level = *mode - '0';
- else
- switch (*mode) {
- case 'r':
- state->mode = GZ_READ;
- break;
-#ifndef NO_GZCOMPRESS
- case 'w':
- state->mode = GZ_WRITE;
- break;
- case 'a':
- state->mode = GZ_APPEND;
- break;
-#endif
- case '+': /* can't read and write at the same time */
- free(state);
- return NULL;
- case 'b': /* ignore -- will request binary anyway */
- break;
- case 'f':
- state->strategy = Z_FILTERED;
- break;
- case 'h':
- state->strategy = Z_HUFFMAN_ONLY;
- break;
- case 'R':
- state->strategy = Z_RLE;
- break;
- case 'F':
- state->strategy = Z_FIXED;
- case 'T':
- state->direct = 1;
- default: /* could consider as an error, but just ignore */
- ;
- }
- mode++;
- }
-
- /* must provide an "r", "w", or "a" */
- if (state->mode == GZ_NONE) {
- free(state);
- return NULL;
- }
-
- /* can't force transparent read */
- if (state->mode == GZ_READ) {
- if (state->direct) {
- free(state);
- return NULL;
- }
- state->direct = 1; /* for empty file */
- }
-
- /* save the path name for error messages */
- state->path = malloc(strlen(path) + 1);
- if (state->path == NULL) {
- free(state);
- return NULL;
- }
- strcpy(state->path, path);
-
- /* open the file with the appropriate mode (or just use fd) */
- state->fd = fd != -1 ? fd :
- open(path,
-#ifdef O_LARGEFILE
- O_LARGEFILE |
-#endif
-#ifdef O_BINARY
- O_BINARY |
-#endif
- (state->mode == GZ_READ ?
- O_RDONLY :
- (O_WRONLY | O_CREAT | (
- state->mode == GZ_WRITE ?
- O_TRUNC :
- O_APPEND))),
- 0666);
- if (state->fd == -1) {
- free(state->path);
- free(state);
- return NULL;
- }
- if (state->mode == GZ_APPEND)
- state->mode = GZ_WRITE; /* simplify later checks */
-
- /* save the current position for rewinding (only if reading) */
- if (state->mode == GZ_READ) {
- state->start = LSEEK(state->fd, 0, SEEK_CUR);
- if (state->start == -1) state->start = 0;
- }
-
- /* initialize stream */
- gz_reset(state);
-
- /* return stream */
- return (gzFile)state;
-}
-
-/* -- see zlib.h -- */
-gzFile ZEXPORT gzopen(path, mode)
- const char *path;
- const char *mode;
-{
- return gz_open(path, -1, mode);
-}
-
-/* -- see zlib.h -- */
-gzFile ZEXPORT gzopen64(path, mode)
- const char *path;
- const char *mode;
-{
- return gz_open(path, -1, mode);
-}
-
-/* -- see zlib.h -- */
-gzFile ZEXPORT gzdopen(fd, mode)
- int fd;
- const char *mode;
-{
- char *path; /* identifier for error messages */
- gzFile gz;
-
- if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL)
- return NULL;
- sprintf(path, "<fd:%d>", fd); /* for debugging */
- gz = gz_open(path, fd, mode);
- free(path);
- return gz;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzbuffer(file, size)
- gzFile file;
- unsigned size;
-{
- gz_statep state;
-
- /* get internal structure and check integrity */
- if (file == NULL)
- return -1;
- state = (gz_statep)file;
- if (state->mode != GZ_READ && state->mode != GZ_WRITE)
- return -1;
-
- /* make sure we haven't already allocated memory */
- if (state->size != 0)
- return -1;
-
- /* check and set requested size */
- if (size < 2)
- size = 2; /* need two bytes to check magic header */
- state->want = size;
- return 0;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzrewind(file)
- gzFile file;
-{
- gz_statep state;
-
- /* get internal structure */
- if (file == NULL)
- return -1;
- state = (gz_statep)file;
-
- /* check that we're reading and that there's no error */
- if (state->mode != GZ_READ ||
- (state->err != Z_OK && state->err != Z_BUF_ERROR))
- return -1;
-
- /* back up and start over */
- if (LSEEK(state->fd, state->start, SEEK_SET) == -1)
- return -1;
- gz_reset(state);
- return 0;
-}
-
-/* -- see zlib.h -- */
-z_off64_t ZEXPORT gzseek64(file, offset, whence)
- gzFile file;
- z_off64_t offset;
- int whence;
-{
- unsigned n;
- z_off64_t ret;
- gz_statep state;
-
- /* get internal structure and check integrity */
- if (file == NULL)
- return -1;
- state = (gz_statep)file;
- if (state->mode != GZ_READ && state->mode != GZ_WRITE)
- return -1;
-
- /* check that there's no error */
- if (state->err != Z_OK && state->err != Z_BUF_ERROR)
- return -1;
-
- /* can only seek from start or relative to current position */
- if (whence != SEEK_SET && whence != SEEK_CUR)
- return -1;
-
- /* normalize offset to a SEEK_CUR specification */
- if (whence == SEEK_SET)
- offset -= state->x.pos;
- else if (state->seek)
- offset += state->skip;
- state->seek = 0;
-
- /* if within raw area while reading, just go there */
- if (state->mode == GZ_READ && state->how == COPY &&
- state->x.pos + offset >= 0) {
- ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
- if (ret == -1)
- return -1;
- state->x.have = 0;
- state->eof = 0;
- state->past = 0;
- state->seek = 0;
- gz_error(state, Z_OK, NULL);
- state->strm.avail_in = 0;
- state->x.pos += offset;
- return state->x.pos;
- }
-
- /* calculate skip amount, rewinding if needed for back seek when reading */
- if (offset < 0) {
- if (state->mode != GZ_READ) /* writing -- can't go backwards */
- return -1;
- offset += state->x.pos;
- if (offset < 0) /* before start of file! */
- return -1;
- if (gzrewind(file) == -1) /* rewind, then skip to offset */
- return -1;
- }
-
- /* if reading, skip what's in output buffer (one less gzgetc() check) */
- if (state->mode == GZ_READ) {
- n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
- (unsigned)offset : state->x.have;
- state->x.have -= n;
- state->x.next += n;
- state->x.pos += n;
- offset -= n;
- }
-
- /* request skip (if not zero) */
- if (offset) {
- state->seek = 1;
- state->skip = offset;
- }
- return state->x.pos + offset;
-}
-
-/* -- see zlib.h -- */
-z_off_t ZEXPORT gzseek(file, offset, whence)
- gzFile file;
- z_off_t offset;
- int whence;
-{
- z_off64_t ret;
-
- ret = gzseek64(file, (z_off64_t)offset, whence);
- return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-}
-
-/* -- see zlib.h -- */
-z_off64_t ZEXPORT gztell64(file)
- gzFile file;
-{
- gz_statep state;
-
- /* get internal structure and check integrity */
- if (file == NULL)
- return -1;
- state = (gz_statep)file;
- if (state->mode != GZ_READ && state->mode != GZ_WRITE)
- return -1;
-
- /* return position */
- return state->x.pos + (state->seek ? state->skip : 0);
-}
-
-/* -- see zlib.h -- */
-z_off_t ZEXPORT gztell(file)
- gzFile file;
-{
- z_off64_t ret;
-
- ret = gztell64(file);
- return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-}
-
-/* -- see zlib.h -- */
-z_off64_t ZEXPORT gzoffset64(file)
- gzFile file;
-{
- z_off64_t offset;
- gz_statep state;
-
- /* get internal structure and check integrity */
- if (file == NULL)
- return -1;
- state = (gz_statep)file;
- if (state->mode != GZ_READ && state->mode != GZ_WRITE)
- return -1;
-
- /* compute and return effective offset in file */
- offset = LSEEK(state->fd, 0, SEEK_CUR);
- if (offset == -1)
- return -1;
- if (state->mode == GZ_READ) /* reading */
- offset -= state->strm.avail_in; /* don't count buffered input */
- return offset;
-}
-
-/* -- see zlib.h -- */
-z_off_t ZEXPORT gzoffset(file)
- gzFile file;
-{
- z_off64_t ret;
-
- ret = gzoffset64(file);
- return ret == (z_off_t)ret ? (z_off_t)ret : -1;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzeof(file)
- gzFile file;
-{
- gz_statep state;
-
- /* get internal structure and check integrity */
- if (file == NULL)
- return 0;
- state = (gz_statep)file;
- if (state->mode != GZ_READ && state->mode != GZ_WRITE)
- return 0;
-
- /* return end-of-file state */
- return state->mode == GZ_READ ? state->past : 0;
-}
-
-/* -- see zlib.h -- */
-const char * ZEXPORT gzerror(file, errnum)
- gzFile file;
- int *errnum;
-{
- gz_statep state;
-
- /* get internal structure and check integrity */
- if (file == NULL)
- return NULL;
- state = (gz_statep)file;
- if (state->mode != GZ_READ && state->mode != GZ_WRITE)
- return NULL;
-
- /* return error information */
- if (errnum != NULL)
- *errnum = state->err;
- return state->msg == NULL ? "" : state->msg;
-}
-
-/* -- see zlib.h -- */
-void ZEXPORT gzclearerr(file)
- gzFile file;
-{
- gz_statep state;
-
- /* get internal structure and check integrity */
- if (file == NULL)
- return;
- state = (gz_statep)file;
- if (state->mode != GZ_READ && state->mode != GZ_WRITE)
- return;
-
- /* clear error and end-of-file */
- if (state->mode == GZ_READ) {
- state->eof = 0;
- state->past = 0;
- }
- gz_error(state, Z_OK, NULL);
-}
-
-/* Create an error message in allocated memory and set state->err and
- state->msg accordingly. Free any previous error message already there. Do
- not try to free or allocate space if the error is Z_MEM_ERROR (out of
- memory). Simply save the error message as a static string. If there is an
- allocation failure constructing the error message, then convert the error to
- out of memory. */
-void ZLIB_INTERNAL gz_error(state, err, msg)
- gz_statep state;
- int err;
- const char *msg;
-{
- /* free previously allocated message and clear */
- if (state->msg != NULL) {
- if (state->err != Z_MEM_ERROR)
- free(state->msg);
- state->msg = NULL;
- }
-
- /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
- if (err != Z_OK && err != Z_BUF_ERROR)
- state->x.have = 0;
-
- /* set error code, and if no message, then done */
- state->err = err;
- if (msg == NULL)
- return;
-
- /* for an out of memory error, save as static string */
- if (err == Z_MEM_ERROR) {
- state->msg = (char *)msg;
- return;
- }
-
- /* construct error message with path */
- if ((state->msg = malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) {
- state->err = Z_MEM_ERROR;
- state->msg = (char *)"out of memory";
- return;
- }
- strcpy(state->msg, state->path);
- strcat(state->msg, ": ");
- strcat(state->msg, msg);
- return;
-}
-
-#ifndef INT_MAX
-/* portably return maximum value for an int (when limits.h presumed not
- available) -- we need to do this to cover cases where 2's complement not
- used, since C standard permits 1's complement and sign-bit representations,
- otherwise we could just use ((unsigned)-1) >> 1 */
-unsigned ZLIB_INTERNAL gz_intmax()
-{
- unsigned p, q;
-
- p = 1;
- do {
- q = p;
- p <<= 1;
- p++;
- } while (p > q);
- return q >> 1;
-}
-#endif

smplayer-0.8.0.tar.bz2/zlib-1.2.6/gzread.c Deleted

@@ -1,584 +0,0 @@
-/* gzread.c -- zlib functions for reading gzip files
- * Copyright (C) 2004, 2005, 2010, 2011 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "gzguts.h"
-
-/* Local functions */
-local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
-local int gz_avail OF((gz_statep));
-local int gz_look OF((gz_statep));
-local int gz_decomp OF((gz_statep));
-local int gz_fetch OF((gz_statep));
-local int gz_skip OF((gz_statep, z_off64_t));
-
-/* Use read() to load a buffer -- return -1 on error, otherwise 0. Read from
- state->fd, and update state->eof, state->err, and state->msg as appropriate.
- This function needs to loop on read(), since read() is not guaranteed to
- read the number of bytes requested, depending on the type of descriptor. */
-local int gz_load(state, buf, len, have)
- gz_statep state;
- unsigned char *buf;
- unsigned len;
- unsigned *have;
-{
- int ret;
-
- *have = 0;
- do {
- ret = read(state->fd, buf + *have, len - *have);
- if (ret <= 0)
- break;
- *have += ret;
- } while (*have < len);
- if (ret < 0) {
- gz_error(state, Z_ERRNO, zstrerror());
- return -1;
- }
- if (ret == 0)
- state->eof = 1;
- return 0;
-}
-
-/* Load up input buffer and set eof flag if last data loaded -- return -1 on
- error, 0 otherwise. Note that the eof flag is set when the end of the input
- file is reached, even though there may be unused data in the buffer. Once
- that data has been used, no more attempts will be made to read the file.
- If strm->avail_in != 0, then the current data is moved to the beginning of
- the input buffer, and then the remainder of the buffer is loaded with the
- available data from the input file. */
-local int gz_avail(state)
- gz_statep state;
-{
- unsigned got;
- z_streamp strm = &(state->strm);
-
- if (state->err != Z_OK && state->err != Z_BUF_ERROR)
- return -1;
- if (state->eof == 0) {
- if (strm->avail_in)
- memmove(state->in, strm->next_in, strm->avail_in);
- if (gz_load(state, state->in + strm->avail_in,
- state->size - strm->avail_in, &got) == -1)
- return -1;
- strm->avail_in += got;
- strm->next_in = state->in;
- }
- return 0;
-}
-
-/* Look for gzip header, set up for inflate or copy. state->x.have must be 0.
- If this is the first time in, allocate required memory. state->how will be
- left unchanged if there is no more input data available, will be set to COPY
- if there is no gzip header and direct copying will be performed, or it will
- be set to GZIP for decompression. If direct copying, then leftover input
- data from the input buffer will be copied to the output buffer. In that
- case, all further file reads will be directly to either the output buffer or
- a user buffer. If decompressing, the inflate state will be initialized.
- gz_look() will return 0 on success or -1 on failure. */
-local int gz_look(state)
- gz_statep state;
-{
- z_streamp strm = &(state->strm);
-
- /* allocate read buffers and inflate memory */
- if (state->size == 0) {
- /* allocate buffers */
- state->in = malloc(state->want);
- state->out = malloc(state->want << 1);
- if (state->in == NULL || state->out == NULL) {
- if (state->out != NULL)
- free(state->out);
- if (state->in != NULL)
- free(state->in);
- gz_error(state, Z_MEM_ERROR, "out of memory");
- return -1;
- }
- state->size = state->want;
-
- /* allocate inflate memory */
- state->strm.zalloc = Z_NULL;
- state->strm.zfree = Z_NULL;
- state->strm.opaque = Z_NULL;
- state->strm.avail_in = 0;
- state->strm.next_in = Z_NULL;
- if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) { /* gunzip */
- free(state->out);
- free(state->in);
- state->size = 0;
- gz_error(state, Z_MEM_ERROR, "out of memory");
- return -1;
- }
- }
-
- /* get at least the magic bytes in the input buffer */
- if (strm->avail_in < 2) {
- if (gz_avail(state) == -1)
- return -1;
- if (strm->avail_in == 0)
- return 0;
- }
-
- /* look for gzip magic bytes -- if there, do gzip decoding (note: there is
- a logical dilemma here when considering the case of a partially written
- gzip file, to wit, if a single 31 byte is written, then we cannot tell
- whether this is a single-byte file, or just a partially written gzip
- file -- for here we assume that if a gzip file is being written, then
- the header will be written in a single operation, so that reading a
- single byte is sufficient indication that it is not a gzip file) */
- if (strm->avail_in > 1 &&
- strm->next_in0 == 31 && strm->next_in1 == 139) {
- inflateReset(strm);
- state->how = GZIP;
- state->direct = 0;
- return 0;
- }
-
- /* no gzip header -- if we were decoding gzip before, then this is trailing
- garbage. Ignore the trailing garbage and finish. */
- if (state->direct == 0) {
- strm->avail_in = 0;
- state->eof = 1;
- state->x.have = 0;
- return 0;
- }
-
- /* doing raw i/o, copy any leftover input to output -- this assumes that
- the output buffer is larger than the input buffer, which also assures
- space for gzungetc() */
- state->x.next = state->out;
- if (strm->avail_in) {
- memcpy(state->x.next, strm->next_in, strm->avail_in);
- state->x.have = strm->avail_in;
- strm->avail_in = 0;
- }
- state->how = COPY;
- state->direct = 1;
- return 0;
-}
-
-/* Decompress from input to the provided next_out and avail_out in the state.
- On return, state->x.have and state->x.next point to the just decompressed
- data. If the gzip stream completes, state->how is reset to LOOK to look for
- the next gzip stream or raw data, once state->x.have is depleted. Returns 0
- on success, -1 on failure. */
-local int gz_decomp(state)
- gz_statep state;
-{
- int ret = Z_OK;
- unsigned had;
- z_streamp strm = &(state->strm);
-
- /* fill output buffer up to end of deflate stream */
- had = strm->avail_out;
- do {
- /* get more input for inflate() */
- if (strm->avail_in == 0 && gz_avail(state) == -1)
- return -1;
- if (strm->avail_in == 0) {
- gz_error(state, Z_BUF_ERROR, "unexpected end of file");
- break;
- }
-
- /* decompress and handle errors */
- ret = inflate(strm, Z_NO_FLUSH);
- if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
- gz_error(state, Z_STREAM_ERROR,
- "internal error: inflate stream corrupt");
- return -1;
- }
- if (ret == Z_MEM_ERROR) {
- gz_error(state, Z_MEM_ERROR, "out of memory");
- return -1;
- }
- if (ret == Z_DATA_ERROR) { /* deflate stream invalid */
- gz_error(state, Z_DATA_ERROR,
- strm->msg == NULL ? "compressed data error" : strm->msg);
- return -1;
- }
- } while (strm->avail_out && ret != Z_STREAM_END);
-
- /* update available output */
- state->x.have = had - strm->avail_out;
- state->x.next = strm->next_out - state->x.have;
-
- /* if the gzip stream completed successfully, look for another */
- if (ret == Z_STREAM_END)
- state->how = LOOK;
-
- /* good decompression */
- return 0;
-}
-
-/* Fetch data and put it in the output buffer. Assumes state->x.have is 0.
- Data is either copied from the input file or decompressed from the input
- file depending on state->how. If state->how is LOOK, then a gzip header is
- looked for to determine whether to copy or decompress. Returns -1 on error,
- otherwise 0. gz_fetch() will leave state->how as COPY or GZIP unless the
- end of the input file has been reached and all data has been processed. */
-local int gz_fetch(state)
- gz_statep state;
-{
- z_streamp strm = &(state->strm);
-
- do {
- switch(state->how) {
- case LOOK: /* -> LOOK, COPY (only if never GZIP), or GZIP */
- if (gz_look(state) == -1)
- return -1;
- if (state->how == LOOK)
- return 0;
- break;
- case COPY: /* -> COPY */
- if (gz_load(state, state->out, state->size << 1, &(state->x.have))
- == -1)
- return -1;
- state->x.next = state->out;
- return 0;
- case GZIP: /* -> GZIP or LOOK (if end of gzip stream) */
- strm->avail_out = state->size << 1;
- strm->next_out = state->out;
- if (gz_decomp(state) == -1)
- return -1;
- }
- } while (state->x.have == 0 && (!state->eof || strm->avail_in));
- return 0;
-}
-
-/* Skip len uncompressed bytes of output. Return -1 on error, 0 on success. */
-local int gz_skip(state, len)
- gz_statep state;
- z_off64_t len;
-{
- unsigned n;
-
- /* skip over len bytes or reach end-of-file, whichever comes first */
- while (len)
- /* skip over whatever is in output buffer */
- if (state->x.have) {
- n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
- (unsigned)len : state->x.have;
- state->x.have -= n;
- state->x.next += n;
- state->x.pos += n;
- len -= n;
- }
-
- /* output buffer empty -- return if we're at the end of the input */
- else if (state->eof && state->strm.avail_in == 0)
- break;
-
- /* need more data to skip -- load up output buffer */
- else {
- /* get more output, looking for header if required */
- if (gz_fetch(state) == -1)
- return -1;
- }
- return 0;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzread(file, buf, len)
- gzFile file;
- voidp buf;
- unsigned len;
-{
- unsigned got, n;
- gz_statep state;
- z_streamp strm;
-
- /* get internal structure */
- if (file == NULL)
- return -1;
- state = (gz_statep)file;
- strm = &(state->strm);
-
- /* check that we're reading and that there's no (serious) error */
- if (state->mode != GZ_READ ||
- (state->err != Z_OK && state->err != Z_BUF_ERROR))
- return -1;
-
- /* since an int is returned, make sure len fits in one, otherwise return
- with an error (this avoids the flaw in the interface) */
- if ((int)len < 0) {
- gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
- return -1;
- }
-
- /* if len is zero, avoid unnecessary operations */
- if (len == 0)
- return 0;
-
- /* process a skip request */
- if (state->seek) {
- state->seek = 0;
- if (gz_skip(state, state->skip) == -1)
- return -1;
- }
-
- /* get len bytes to buf, or less than len if at the end */
- got = 0;
- do {
- /* first just try copying data from the output buffer */
- if (state->x.have) {
- n = state->x.have > len ? len : state->x.have;
- memcpy(buf, state->x.next, n);
- state->x.next += n;
- state->x.have -= n;
- }
-
- /* output buffer empty -- return if we're at the end of the input */
- else if (state->eof && strm->avail_in == 0) {
- state->past = 1; /* tried to read past end */
- break;
- }
-
- /* need output data -- for small len or new stream load up our output
- buffer */
- else if (state->how == LOOK || len < (state->size << 1)) {
- /* get more output, looking for header if required */
- if (gz_fetch(state) == -1)
- return -1;
- continue; /* no progress yet -- go back to memcpy() above */
- /* the copy above assures that we will leave with space in the
- output buffer, allowing at least one gzungetc() to succeed */
- }
-
- /* large len -- read directly into user buffer */
- else if (state->how == COPY) { /* read directly */
- if (gz_load(state, buf, len, &n) == -1)
- return -1;
- }
-
- /* large len -- decompress directly into user buffer */
- else { /* state->how == GZIP */
- strm->avail_out = len;
- strm->next_out = buf;
- if (gz_decomp(state) == -1)
- return -1;
- n = state->x.have;
- state->x.have = 0;
- }
-
- /* update progress */
- len -= n;
- buf = (char *)buf + n;
- got += n;
- state->x.pos += n;
- } while (len);
-
- /* return number of bytes read into user buffer (will fit in int) */
- return (int)got;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzgetc_(file)
- gzFile file;
-{
- int ret;
- unsigned char buf1;
- gz_statep state;
-
- /* get internal structure */
- if (file == NULL)
- return -1;
- state = (gz_statep)file;
-
- /* check that we're reading and that there's no (serious) error */
- if (state->mode != GZ_READ ||
- (state->err != Z_OK && state->err != Z_BUF_ERROR))
- return -1;
-
- /* try output buffer (no need to check for skip request) */
- if (state->x.have) {
- state->x.have--;
- state->x.pos++;
- return *(state->x.next)++;
- }
-
- /* nothing there -- try gzread() */
- ret = gzread(file, buf, 1);
- return ret < 1 ? -1 : buf0;
-}
-
-#undef gzgetc
-int ZEXPORT gzgetc(file)
-gzFile file;
-{
- return gzgetc_(file);
-} 
-
-/* -- see zlib.h -- */
-int ZEXPORT gzungetc(c, file)
- int c;
- gzFile file;
-{
- gz_statep state;
-
- /* get internal structure */
- if (file == NULL)
- return -1;
- state = (gz_statep)file;
-
- /* check that we're reading and that there's no (serious) error */
- if (state->mode != GZ_READ ||
- (state->err != Z_OK && state->err != Z_BUF_ERROR))
- return -1;
-
- /* process a skip request */
- if (state->seek) {
- state->seek = 0;
- if (gz_skip(state, state->skip) == -1)
- return -1;
- }
-
- /* can't push EOF */
- if (c < 0)
- return -1;
-
- /* if output buffer empty, put byte at end (allows more pushing) */
- if (state->x.have == 0) {
- state->x.have = 1;
- state->x.next = state->out + (state->size << 1) - 1;
- state->x.next0 = c;
- state->x.pos--;
- state->past = 0;
- return c;
- }
-
- /* if no room, give up (must have already done a gzungetc()) */
- if (state->x.have == (state->size << 1)) {
- gz_error(state, Z_DATA_ERROR, "out of room to push characters");
- return -1;
- }
-
- /* slide output data if needed and insert byte before existing data */
- if (state->x.next == state->out) {
- unsigned char *src = state->out + state->x.have;
- unsigned char *dest = state->out + (state->size << 1);
- while (src > state->out)
- *--dest = *--src;
- state->x.next = dest;
- }
- state->x.have++;
- state->x.next--;
- state->x.next0 = c;
- state->x.pos--;
- state->past = 0;
- return c;
-}
-
-/* -- see zlib.h -- */
-char * ZEXPORT gzgets(file, buf, len)
- gzFile file;
- char *buf;
- int len;
-{
- unsigned left, n;
- char *str;
- unsigned char *eol;
- gz_statep state;
-
- /* check parameters and get internal structure */
- if (file == NULL || buf == NULL || len < 1)
- return NULL;
- state = (gz_statep)file;
-
- /* check that we're reading and that there's no (serious) error */
- if (state->mode != GZ_READ ||
- (state->err != Z_OK && state->err != Z_BUF_ERROR))
- return NULL;
-
- /* process a skip request */
- if (state->seek) {
- state->seek = 0;
- if (gz_skip(state, state->skip) == -1)
- return NULL;
- }
-
- /* copy output bytes up to new line or len - 1, whichever comes first --
- append a terminating zero to the string (we don't check for a zero in
- the contents, let the user worry about that) */
- str = buf;
- left = (unsigned)len - 1;
- if (left) do {
- /* assure that something is in the output buffer */
- if (state->x.have == 0 && gz_fetch(state) == -1)
- return NULL; /* error */
- if (state->x.have == 0) { /* end of file */
- state->past = 1; /* read past end */
- break; /* return what we have */
- }
-
- /* look for end-of-line in current output buffer */
- n = state->x.have > left ? left : state->x.have;
- eol = memchr(state->x.next, '\n', n);
- if (eol != NULL)
- n = (unsigned)(eol - state->x.next) + 1;
-
- /* copy through end-of-line, or remainder if not found */
- memcpy(buf, state->x.next, n);
- state->x.have -= n;
- state->x.next += n;
- state->x.pos += n;
- left -= n;
- buf += n;
- } while (left && eol == NULL);
-
- /* return terminated string, or if nothing, end of file */
- if (buf == str)
- return NULL;
- buf0 = 0;
- return str;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzdirect(file)
- gzFile file;
-{
- gz_statep state;
-
- /* get internal structure */
- if (file == NULL)
- return 0;
- state = (gz_statep)file;
-
- /* if the state is not known, but we can find out, then do so (this is
- mainly for right after a gzopen() or gzdopen()) */
- if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0)
- (void)gz_look(state);
-
- /* return 1 if transparent, 0 if processing a gzip stream */
- return state->direct;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzclose_r(file)
- gzFile file;
-{
- int ret, err;
- gz_statep state;
-
- /* get internal structure */
- if (file == NULL)
- return Z_STREAM_ERROR;
- state = (gz_statep)file;
-
- /* check that we're reading */
- if (state->mode != GZ_READ)
- return Z_STREAM_ERROR;
-
- /* free memory and close file */
- if (state->size) {
- inflateEnd(&(state->strm));
- free(state->out);
- free(state->in);
- }
- err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
- gz_error(state, Z_OK, NULL);
- free(state->path);
- ret = close(state->fd);
- free(state);
- return ret ? Z_ERRNO : err;
-}

smplayer-0.8.0.tar.bz2/zlib-1.2.6/gzwrite.c Deleted

@@ -1,593 +0,0 @@
-/* gzwrite.c -- zlib functions for writing gzip files
- * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "gzguts.h"
-
-/* Local functions */
-local int gz_init OF((gz_statep));
-local int gz_comp OF((gz_statep, int));
-local int gz_zero OF((gz_statep, z_off64_t));
-
-/* Initialize state for writing a gzip file. Mark initialization by setting
- state->size to non-zero. Return -1 on failure or 0 on success. */
-local int gz_init(state)
- gz_statep state;
-{
- int ret;
- z_streamp strm = &(state->strm);
-
- /* allocate input buffer */
- state->in = malloc(state->want);
- if (state->in == NULL) {
- gz_error(state, Z_MEM_ERROR, "out of memory");
- return -1;
- }
-
- /* only need output buffer and deflate state if compressing */
- if (!state->direct) {
- /* allocate output buffer */
- state->out = malloc(state->want);
- if (state->out == NULL) {
- free(state->in);
- gz_error(state, Z_MEM_ERROR, "out of memory");
- return -1;
- }
-
- /* allocate deflate memory, set up for gzip compression */
- strm->zalloc = Z_NULL;
- strm->zfree = Z_NULL;
- strm->opaque = Z_NULL;
- ret = deflateInit2(strm, state->level, Z_DEFLATED,
- MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
- if (ret != Z_OK) {
- free(state->out);
- free(state->in);
- gz_error(state, Z_MEM_ERROR, "out of memory");
- return -1;
- }
- }
-
- /* mark state as initialized */
- state->size = state->want;
-
- /* initialize write buffer if compressing */
- if (!state->direct) {
- strm->avail_out = state->size;
- strm->next_out = state->out;
- state->x.next = strm->next_out;
- }
- return 0;
-}
-
-/* Compress whatever is at avail_in and next_in and write to the output file.
- Return -1 if there is an error writing to the output file, otherwise 0.
- flush is assumed to be a valid deflate() flush value. If flush is Z_FINISH,
- then the deflate() state is reset to start a new gzip stream. If gz->direct
- is true, then simply write to the output file without compressing, and
- ignore flush. */
-local int gz_comp(state, flush)
- gz_statep state;
- int flush;
-{
- int ret, got;
- unsigned have;
- z_streamp strm = &(state->strm);
-
- /* allocate memory if this is the first time through */
- if (state->size == 0 && gz_init(state) == -1)
- return -1;
-
- /* write directly if requested */
- if (state->direct) {
- got = write(state->fd, strm->next_in, strm->avail_in);
- if (got < 0 || (unsigned)got != strm->avail_in) {
- gz_error(state, Z_ERRNO, zstrerror());
- return -1;
- }
- strm->avail_in = 0;
- return 0;
- }
-
- /* run deflate() on provided input until it produces no more output */
- ret = Z_OK;
- do {
- /* write out current buffer contents if full, or if flushing, but if
- doing Z_FINISH then don't write until we get to Z_STREAM_END */
- if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
- (flush != Z_FINISH || ret == Z_STREAM_END))) {
- have = (unsigned)(strm->next_out - state->x.next);
- if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
- (unsigned)got != have)) {
- gz_error(state, Z_ERRNO, zstrerror());
- return -1;
- }
- if (strm->avail_out == 0) {
- strm->avail_out = state->size;
- strm->next_out = state->out;
- }
- state->x.next = strm->next_out;
- }
-
- /* compress */
- have = strm->avail_out;
- ret = deflate(strm, flush);
- if (ret == Z_STREAM_ERROR) {
- gz_error(state, Z_STREAM_ERROR,
- "internal error: deflate stream corrupt");
- return -1;
- }
- have -= strm->avail_out;
- } while (have);
-
- /* if that completed a deflate stream, allow another to start */
- if (flush == Z_FINISH)
- deflateReset(strm);
-
- /* all done, no errors */
- return 0;
-}
-
-/* Compress len zeros to output. Return -1 on error, 0 on success. */
-local int gz_zero(state, len)
- gz_statep state;
- z_off64_t len;
-{
- int first;
- unsigned n;
- z_streamp strm = &(state->strm);
-
- /* consume whatever's left in the input buffer */
- if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
- return -1;
-
- /* compress len zeros (len guaranteed > 0) */
- first = 1;
- while (len) {
- n = GT_OFF(state->size) || (z_off64_t)state->size > len ?
- (unsigned)len : state->size;
- if (first) {
- memset(state->in, 0, n);
- first = 0;
- }
- strm->avail_in = n;
- strm->next_in = state->in;
- state->x.pos += n;
- if (gz_comp(state, Z_NO_FLUSH) == -1)
- return -1;
- len -= n;
- }
- return 0;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzwrite(file, buf, len)
- gzFile file;
- voidpc buf;
- unsigned len;
-{
- unsigned put = len;
- unsigned n;
- gz_statep state;
- z_streamp strm;
-
- /* get internal structure */
- if (file == NULL)
- return 0;
- state = (gz_statep)file;
- strm = &(state->strm);
-
- /* check that we're writing and that there's no error */
- if (state->mode != GZ_WRITE || state->err != Z_OK)
- return 0;
-
- /* since an int is returned, make sure len fits in one, otherwise return
- with an error (this avoids the flaw in the interface) */
- if ((int)len < 0) {
- gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
- return 0;
- }
-
- /* if len is zero, avoid unnecessary operations */
- if (len == 0)
- return 0;
-
- /* allocate memory if this is the first time through */
- if (state->size == 0 && gz_init(state) == -1)
- return 0;
-
- /* check for seek request */
- if (state->seek) {
- state->seek = 0;
- if (gz_zero(state, state->skip) == -1)
- return 0;
- }
-
- /* for small len, copy to input buffer, otherwise compress directly */
- if (len < state->size) {
- /* copy to input buffer, compress when full */
- do {
- if (strm->avail_in == 0)
- strm->next_in = state->in;
- n = state->size - strm->avail_in;
- if (n > len)
- n = len;
- memcpy(strm->next_in + strm->avail_in, buf, n);
- strm->avail_in += n;
- state->x.pos += n;
- buf = (char *)buf + n;
- len -= n;
- if (len && gz_comp(state, Z_NO_FLUSH) == -1)
- return 0;
- } while (len);
- }
- else {
- /* consume whatever's left in the input buffer */
- if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
- return 0;
-
- /* directly compress user buffer to file */
- strm->avail_in = len;
- strm->next_in = (voidp)buf;
- state->x.pos += len;
- if (gz_comp(state, Z_NO_FLUSH) == -1)
- return 0;
- }
-
- /* input was all buffered or compressed (put will fit in int) */
- return (int)put;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzputc(file, c)
- gzFile file;
- int c;
-{
- unsigned char buf1;
- gz_statep state;
- z_streamp strm;
-
- /* get internal structure */
- if (file == NULL)
- return -1;
- state = (gz_statep)file;
- strm = &(state->strm);
-
- /* check that we're writing and that there's no error */
- if (state->mode != GZ_WRITE || state->err != Z_OK)
- return -1;
-
- /* check for seek request */
- if (state->seek) {
- state->seek = 0;
- if (gz_zero(state, state->skip) == -1)
- return -1;
- }
-
- /* try writing to input buffer for speed (state->size == 0 if buffer not
- initialized) */
- if (strm->avail_in < state->size) {
- if (strm->avail_in == 0)
- strm->next_in = state->in;
- strm->next_instrm->avail_in++ = c;
- state->x.pos++;
- return c & 0xff;
- }
-
- /* no room in buffer or not initialized, use gz_write() */
- buf0 = c;
- if (gzwrite(file, buf, 1) != 1)
- return -1;
- return c & 0xff;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzputs(file, str)
- gzFile file;
- const char *str;
-{
- int ret;
- unsigned len;
-
- /* write string */
- len = (unsigned)strlen(str);
- ret = gzwrite(file, str, len);
- return ret == 0 && len != 0 ? -1 : ret;
-}
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#include <stdarg.h>
-
-/* -- see zlib.h -- */
-int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)
-{
- int size, len;
- gz_statep state;
- z_streamp strm;
- va_list va;
-
- /* get internal structure */
- if (file == NULL)
- return -1;
- state = (gz_statep)file;
- strm = &(state->strm);
-
- /* check that we're writing and that there's no error */
- if (state->mode != GZ_WRITE || state->err != Z_OK)
- return 0;
-
- /* make sure we have some buffer space */
- if (state->size == 0 && gz_init(state) == -1)
- return 0;
-
- /* check for seek request */
- if (state->seek) {
- state->seek = 0;
- if (gz_zero(state, state->skip) == -1)
- return 0;
- }
-
- /* consume whatever's left in the input buffer */
- if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
- return 0;
-
- /* do the printf() into the input buffer, put length in len */
- size = (int)(state->size);
- state->insize - 1 = 0;
- va_start(va, format);
-#ifdef NO_vsnprintf
-# ifdef HAS_vsprintf_void
- (void)vsprintf(state->in, format, va);
- va_end(va);
- for (len = 0; len < size; len++)
- if (state->inlen == 0) break;
-# else
- len = vsprintf(state->in, format, va);
- va_end(va);
-# endif
-#else
-# ifdef HAS_vsnprintf_void
- (void)vsnprintf(state->in, size, format, va);
- va_end(va);
- len = strlen(state->in);
-# else
- len = vsnprintf((char *)(state->in), size, format, va);
- va_end(va);
-# endif
-#endif
-
- /* check that printf() results fit in buffer */
- if (len <= 0 || len >= (int)size || state->insize - 1 != 0)
- return 0;
-
- /* update buffer and position, defer compression until needed */
- strm->avail_in = (unsigned)len;
- strm->next_in = state->in;
- state->x.pos += len;
- return len;
-}
-
-#else /* !STDC && !Z_HAVE_STDARG_H */
-
-/* -- see zlib.h -- */
-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
- a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
- gzFile file;
- const char *format;
- int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
- a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
-{
- int size, len;
- gz_statep state;
- z_streamp strm;
-
- /* get internal structure */
- if (file == NULL)
- return -1;
- state = (gz_statep)file;
- strm = &(state->strm);
-
- /* check that can really pass pointer in ints */
- if (sizeof(int) != sizeof(void *))
- return 0;
-
- /* check that we're writing and that there's no error */
- if (state->mode != GZ_WRITE || state->err != Z_OK)
- return 0;
-
- /* make sure we have some buffer space */
- if (state->size == 0 && gz_init(state) == -1)
- return 0;
-
- /* check for seek request */
- if (state->seek) {
- state->seek = 0;
- if (gz_zero(state, state->skip) == -1)
- return 0;
- }
-
- /* consume whatever's left in the input buffer */
- if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
- return 0;
-
- /* do the printf() into the input buffer, put length in len */
- size = (int)(state->size);
- state->insize - 1 = 0;
-#ifdef NO_snprintf
-# ifdef HAS_sprintf_void
- sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8,
- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
- for (len = 0; len < size; len++)
- if (state->inlen == 0) break;
-# else
- len = sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8,
- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-# endif
-#else
-# ifdef HAS_snprintf_void
- snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,
- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
- len = strlen(state->in);
-# else
- len = snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8,
- a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-# endif
-#endif
-
- /* check that printf() results fit in buffer */
- if (len <= 0 || len >= (int)size || state->insize - 1 != 0)
- return 0;
-
- /* update buffer and position, defer compression until needed */
- strm->avail_in = (unsigned)len;
- strm->next_in = state->in;
- state->x.pos += len;
- return len;
-}
-
-#endif
-
-/* -- see zlib.h -- */
-int ZEXPORT gzflush(file, flush)
- gzFile file;
- int flush;
-{
- gz_statep state;
-
- /* get internal structure */
- if (file == NULL)
- return -1;
- state = (gz_statep)file;
-
- /* check that we're writing and that there's no error */
- if (state->mode != GZ_WRITE || state->err != Z_OK)
- return Z_STREAM_ERROR;
-
- /* check flush parameter */
- if (flush < 0 || flush > Z_FINISH)
- return Z_STREAM_ERROR;
-
- /* check for seek request */
- if (state->seek) {
- state->seek = 0;
- if (gz_zero(state, state->skip) == -1)
- return -1;
- }
-
- /* compress remaining data with requested flush */
- gz_comp(state, flush);
- return state->err;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzsetparams(file, level, strategy)
- gzFile file;
- int level;
- int strategy;
-{
- gz_statep state;
- z_streamp strm;
-
- /* get internal structure */
- if (file == NULL)
- return Z_STREAM_ERROR;
- state = (gz_statep)file;
- strm = &(state->strm);
-
- /* check that we're writing and that there's no error */
- if (state->mode != GZ_WRITE || state->err != Z_OK)
- return Z_STREAM_ERROR;
-
- /* if no change is requested, then do nothing */
- if (level == state->level && strategy == state->strategy)
- return Z_OK;
-
- /* check for seek request */
- if (state->seek) {
- state->seek = 0;
- if (gz_zero(state, state->skip) == -1)
- return -1;
- }
-
- /* change compression parameters for subsequent input */
- if (state->size) {
- /* flush previous input with previous parameters before changing */
- if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1)
- return state->err;
- deflateParams(strm, level, strategy);
- }
- state->level = level;
- state->strategy = strategy;
- return Z_OK;
-}
-
-/* -- see zlib.h -- */
-int ZEXPORT gzclose_w(file)
- gzFile file;
-{
- int ret = Z_OK;
- gz_statep state;
-
- /* get internal structure */
- if (file == NULL)
- return Z_STREAM_ERROR;
- state = (gz_statep)file;
-
- /* check that we're writing */
- if (state->mode != GZ_WRITE)
- return Z_STREAM_ERROR;
-
- /* check for seek request */
- if (state->seek) {
- state->seek = 0;
- if (gz_zero(state, state->skip) == -1)
- ret = state->err;
- }
-
- /* flush, free memory, and close file */
- if (gz_comp(state, Z_FINISH) == -1)
- ret = state->err;
- if (!state->direct) {
- (void)deflateEnd(&(state->strm));
- free(state->out);
- }
- free(state->in);
- gz_error(state, Z_OK, NULL);
- free(state->path);
- if (close(state->fd) == -1)
- ret = Z_ERRNO;
- free(state);
- return ret;
-}
-
-/* used by zlibVersion() to get the vsnprintf story from the horse's mouth */
-unsigned long ZEXPORT gzflags()
-{
- unsigned long flags = 0;
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-# ifdef NO_vsnprintf
- flags += 1L << 25;
-# ifdef HAS_vsprintf_void
- flags += 1L << 26;
-# endif
-# else
-# ifdef HAS_vsnprintf_void
- flags += 1L << 26;
-# endif
-# endif
-#else
- flags += 1L << 24;
-# ifdef NO_snprintf
- flags += 1L << 25;
-# ifdef HAS_sprintf_void
- flags += 1L << 26;
-# endif
-# else
-# ifdef HAS_snprintf_void
- flags += 1L << 26;
-# endif
-# endif
-#endif
- return flags;
-}

smplayer-0.8.0.tar.bz2/zlib-1.2.6/inflate.c Deleted

@@ -1,1501 +0,0 @@
-/* inflate.c -- zlib decompression
- * Copyright (C) 1995-2011 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * Change history:
- *
- * 1.2.beta0 24 Nov 2002
- * - First version -- complete rewrite of inflate to simplify code, avoid
- * creation of window when not needed, minimize use of window when it is
- * needed, make inffast.c even faster, implement gzip decoding, and to
- * improve code readability and style over the previous zlib inflate code
- *
- * 1.2.beta1 25 Nov 2002
- * - Use pointers for available input and output checking in inffast.c
- * - Remove input and output counters in inffast.c
- * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
- * - Remove unnecessary second byte pull from length extra in inffast.c
- * - Unroll direct copy to three copies per loop in inffast.c
- *
- * 1.2.beta2 4 Dec 2002
- * - Change external routine names to reduce potential conflicts
- * - Correct filename to inffixed.h for fixed tables in inflate.c
- * - Make hbuf unsigned char to match parameter type in inflate.c
- * - Change strm->next_out-state->offset to *(strm->next_out - state->offset)
- * to avoid negation problem on Alphas (64 bit) in inflate.c
- *
- * 1.2.beta3 22 Dec 2002
- * - Add comments on state->bits assertion in inffast.c
- * - Add comments on op field in inftrees.h
- * - Fix bug in reuse of allocated window after inflateReset()
- * - Remove bit fields--back to byte structure for speed
- * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
- * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
- * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
- * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
- * - Use local copies of stream next and avail values, as well as local bit
- * buffer and bit count in inflate()--for speed when inflate_fast() not used
- *
- * 1.2.beta4 1 Jan 2003
- * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
- * - Move a comment on output buffer sizes from inffast.c to inflate.c
- * - Add comments in inffast.c to introduce the inflate_fast() routine
- * - Rearrange window copies in inflate_fast() for speed and simplification
- * - Unroll last copy for window match in inflate_fast()
- * - Use local copies of window variables in inflate_fast() for speed
- * - Pull out common wnext == 0 case for speed in inflate_fast()
- * - Make op and len in inflate_fast() unsigned for consistency
- * - Add FAR to lcode and dcode declarations in inflate_fast()
- * - Simplified bad distance check in inflate_fast()
- * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
- * source file infback.c to provide a call-back interface to inflate for
- * programs like gzip and unzip -- uses window as output buffer to avoid
- * window copying
- *
- * 1.2.beta5 1 Jan 2003
- * - Improved inflateBack() interface to allow the caller to provide initial
- * input in strm.
- * - Fixed stored blocks bug in inflateBack()
- *
- * 1.2.beta6 4 Jan 2003
- * - Added comments in inffast.c on effectiveness of POSTINC
- * - Typecasting all around to reduce compiler warnings
- * - Changed loops from while (1) or do {} while (1) to for (;;), again to
- * make compilers happy
- * - Changed type of window in inflateBackInit() to unsigned char *
- *
- * 1.2.beta7 27 Jan 2003
- * - Changed many types to unsigned or unsigned short to avoid warnings
- * - Added inflateCopy() function
- *
- * 1.2.0 9 Mar 2003
- * - Changed inflateBack() interface to provide separate opaque descriptors
- * for the in() and out() functions
- * - Changed inflateBack() argument and in_func typedef to swap the length
- * and buffer address return values for the input function
- * - Check next_in and next_out for Z_NULL on entry to inflate()
- *
- * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "inflate.h"
-#include "inffast.h"
-
-#ifdef MAKEFIXED
-# ifndef BUILDFIXED
-# define BUILDFIXED
-# endif
-#endif
-
-/* function prototypes */
-local void fixedtables OF((struct inflate_state FAR *state));
-local int updatewindow OF((z_streamp strm, unsigned out));
-#ifdef BUILDFIXED
- void makefixed OF((void));
-#endif
-local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
- unsigned len));
-
-int ZEXPORT inflateResetKeep(strm)
-z_streamp strm;
-{
- struct inflate_state FAR *state;
-
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- state = (struct inflate_state FAR *)strm->state;
- strm->total_in = strm->total_out = state->total = 0;
- strm->msg = Z_NULL;
- if (state->wrap) /* to support ill-conceived Java test suite */
- strm->adler = state->wrap & 1;
- state->mode = HEAD;
- state->last = 0;
- state->havedict = 0;
- state->dmax = 32768U;
- state->head = Z_NULL;
- state->hold = 0;
- state->bits = 0;
- state->lencode = state->distcode = state->next = state->codes;
- state->sane = 1;
- state->back = -1;
- Tracev((stderr, "inflate: reset\n"));
- return Z_OK;
-}
-
-int ZEXPORT inflateReset(strm)
-z_streamp strm;
-{
- struct inflate_state FAR *state;
-
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- state = (struct inflate_state FAR *)strm->state;
- state->wsize = 0;
- state->whave = 0;
- state->wnext = 0;
- return inflateResetKeep(strm);
-}
-
-int ZEXPORT inflateReset2(strm, windowBits)
-z_streamp strm;
-int windowBits;
-{
- int wrap;
- struct inflate_state FAR *state;
-
- /* get the state */
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- state = (struct inflate_state FAR *)strm->state;
-
- /* extract wrap request from windowBits parameter */
- if (windowBits < 0) {
- wrap = 0;
- windowBits = -windowBits;
- }
- else {
- wrap = (windowBits >> 4) + 1;
-#ifdef GUNZIP
- if (windowBits < 48)
- windowBits &= 15;
-#endif
- }
-
- /* set number of window bits, free window if different */
- if (windowBits && (windowBits < 8 || windowBits > 15))
- return Z_STREAM_ERROR;
- if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
- ZFREE(strm, state->window);
- state->window = Z_NULL;
- }
-
- /* update state and reset the rest of it */
- state->wrap = wrap;
- state->wbits = (unsigned)windowBits;
- return inflateReset(strm);
-}
-
-int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
-z_streamp strm;
-int windowBits;
-const char *version;
-int stream_size;
-{
- int ret;
- struct inflate_state FAR *state;
-
- if (version == Z_NULL || version0 != ZLIB_VERSION0 ||
- stream_size != (int)(sizeof(z_stream)))
- return Z_VERSION_ERROR;
- if (strm == Z_NULL) return Z_STREAM_ERROR;
- strm->msg = Z_NULL; /* in case we return an error */
- if (strm->zalloc == (alloc_func)0) {
-#ifdef Z_SOLO
- return Z_STREAM_ERROR;
-#else
- strm->zalloc = zcalloc;
- strm->opaque = (voidpf)0;
-#endif
- }
- if (strm->zfree == (free_func)0)
-#ifdef Z_SOLO
- return Z_STREAM_ERROR;
-#else
- strm->zfree = zcfree;
-#endif
- state = (struct inflate_state FAR *)
- ZALLOC(strm, 1, sizeof(struct inflate_state));
- if (state == Z_NULL) return Z_MEM_ERROR;
- Tracev((stderr, "inflate: allocated\n"));
- strm->state = (struct internal_state FAR *)state;
- state->window = Z_NULL;
- ret = inflateReset2(strm, windowBits);
- if (ret != Z_OK) {
- ZFREE(strm, state);
- strm->state = Z_NULL;
- }
- return ret;
-}
-
-int ZEXPORT inflateInit_(strm, version, stream_size)
-z_streamp strm;
-const char *version;
-int stream_size;
-{
- return inflateInit2_(strm, DEF_WBITS, version, stream_size);
-}
-
-int ZEXPORT inflatePrime(strm, bits, value)
-z_streamp strm;
-int bits;
-int value;
-{
- struct inflate_state FAR *state;
-
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- state = (struct inflate_state FAR *)strm->state;
- if (bits < 0) {
- state->hold = 0;
- state->bits = 0;
- return Z_OK;
- }
- if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
- value &= (1L << bits) - 1;
- state->hold += value << state->bits;
- state->bits += bits;
- return Z_OK;
-}
-
-/*
- Return state with length and distance decoding tables and index sizes set to
- fixed code decoding. Normally this returns fixed tables from inffixed.h.
- If BUILDFIXED is defined, then instead this routine builds the tables the
- first time it's called, and returns those tables the first time and
- thereafter. This reduces the size of the code by about 2K bytes, in
- exchange for a little execution time. However, BUILDFIXED should not be
- used for threaded applications, since the rewriting of the tables and virgin
- may not be thread-safe.
- */
-local void fixedtables(state)
-struct inflate_state FAR *state;
-{
-#ifdef BUILDFIXED
- static int virgin = 1;
- static code *lenfix, *distfix;
- static code fixed544;
-
- /* build fixed huffman tables if first call (may not be thread safe) */
- if (virgin) {
- unsigned sym, bits;
- static code *next;
-
- /* literal/length table */
- sym = 0;
- while (sym < 144) state->lenssym++ = 8;
- while (sym < 256) state->lenssym++ = 9;
- while (sym < 280) state->lenssym++ = 7;
- while (sym < 288) state->lenssym++ = 8;
- next = fixed;
- lenfix = next;
- bits = 9;
- inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
-
- /* distance table */
- sym = 0;
- while (sym < 32) state->lenssym++ = 5;
- distfix = next;
- bits = 5;
- inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
-
- /* do this just once */
- virgin = 0;
- }
-#else /* !BUILDFIXED */
-# include "inffixed.h"
-#endif /* BUILDFIXED */
- state->lencode = lenfix;
- state->lenbits = 9;
- state->distcode = distfix;
- state->distbits = 5;
-}
-
-#ifdef MAKEFIXED
-#include <stdio.h>
-
-/*
- Write out the inffixed.h that is #include'd above. Defining MAKEFIXED also
- defines BUILDFIXED, so the tables are built on the fly. makefixed() writes
- those tables to stdout, which would be piped to inffixed.h. A small program
- can simply call makefixed to do this:
-
- void makefixed(void);
-
- int main(void)
- {
- makefixed();
- return 0;
- }
-
- Then that can be linked with zlib built with MAKEFIXED defined and run:
-
- a.out > inffixed.h
- */
-void makefixed()
-{
- unsigned low, size;
- struct inflate_state state;
-
- fixedtables(&state);
- puts(" /* inffixed.h -- table for decoding fixed codes");
- puts(" * Generated automatically by makefixed().");
- puts(" */");
- puts("");
- puts(" /* WARNING: this file should *not* be used by applications.");
- puts(" It is part of the implementation of this library and is");
- puts(" subject to change. Applications should only use zlib.h.");
- puts(" */");
- puts("");
- size = 1U << 9;
- printf(" static const code lenfix%u = {", size);
- low = 0;
- for (;;) {
- if ((low % 7) == 0) printf("\n ");
- printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencodelow.op,
- state.lencodelow.bits, state.lencodelow.val);
- if (++low == size) break;
- putchar(',');
- }
- puts("\n };");
- size = 1U << 5;
- printf("\n static const code distfix%u = {", size);
- low = 0;
- for (;;) {
- if ((low % 6) == 0) printf("\n ");
- printf("{%u,%u,%d}", state.distcodelow.op, state.distcodelow.bits,
- state.distcodelow.val);
- if (++low == size) break;
- putchar(',');
- }
- puts("\n };");
-}
-#endif /* MAKEFIXED */
-
-/*
- Update the window with the last wsize (normally 32K) bytes written before
- returning. If window does not exist yet, create it. This is only called
- when a window is already in use, or when output has been written during this
- inflate call, but the end of the deflate stream has not been reached yet.
- It is also called to create a window for dictionary data when a dictionary
- is loaded.
-
- Providing output buffers larger than 32K to inflate() should provide a speed
- advantage, since only the last 32K of output is copied to the sliding window
- upon return from inflate(), and since all distances after the first 32K of
- output will fall in the output data, making match copies simpler and faster.
- The advantage may be dependent on the size of the processor's data caches.
- */
-local int updatewindow(strm, out)
-z_streamp strm;
-unsigned out;
-{
- struct inflate_state FAR *state;
- unsigned copy, dist;
-
- state = (struct inflate_state FAR *)strm->state;
-
- /* if it hasn't been done already, allocate space for the window */
- if (state->window == Z_NULL) {
- state->window = (unsigned char FAR *)
- ZALLOC(strm, 1U << state->wbits,
- sizeof(unsigned char));
- if (state->window == Z_NULL) return 1;
- }
-
- /* if window not in use yet, initialize */
- if (state->wsize == 0) {
- state->wsize = 1U << state->wbits;
- state->wnext = 0;
- state->whave = 0;
- }
-
- /* copy state->wsize or less output bytes into the circular window */
- copy = out - strm->avail_out;
- if (copy >= state->wsize) {
- zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
- state->wnext = 0;
- state->whave = state->wsize;
- }
- else {
- dist = state->wsize - state->wnext;
- if (dist > copy) dist = copy;
- zmemcpy(state->window + state->wnext, strm->next_out - copy, dist);
- copy -= dist;
- if (copy) {
- zmemcpy(state->window, strm->next_out - copy, copy);
- state->wnext = copy;
- state->whave = state->wsize;
- }
- else {
- state->wnext += dist;
- if (state->wnext == state->wsize) state->wnext = 0;
- if (state->whave < state->wsize) state->whave += dist;
- }
- }
- return 0;
-}
-
-/* Macros for inflate(): */
-
-/* check function to use adler32() for zlib or crc32() for gzip */
-#ifdef GUNZIP
-# define UPDATE(check, buf, len) \
- (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
-#else
-# define UPDATE(check, buf, len) adler32(check, buf, len)
-#endif
-
-/* check macros for header crc */
-#ifdef GUNZIP
-# define CRC2(check, word) \
- do { \
- hbuf0 = (unsigned char)(word); \
- hbuf1 = (unsigned char)((word) >> 8); \
- check = crc32(check, hbuf, 2); \
- } while (0)
-
-# define CRC4(check, word) \
- do { \
- hbuf0 = (unsigned char)(word); \
- hbuf1 = (unsigned char)((word) >> 8); \
- hbuf2 = (unsigned char)((word) >> 16); \
- hbuf3 = (unsigned char)((word) >> 24); \
- check = crc32(check, hbuf, 4); \
- } while (0)
-#endif
-
-/* Load registers with state in inflate() for speed */
-#define LOAD() \
- do { \
- put = strm->next_out; \
- left = strm->avail_out; \
- next = strm->next_in; \
- have = strm->avail_in; \
- hold = state->hold; \
- bits = state->bits; \
- } while (0)
-
-/* Restore state from registers in inflate() */
-#define RESTORE() \
- do { \
- strm->next_out = put; \
- strm->avail_out = left; \
- strm->next_in = next; \
- strm->avail_in = have; \
- state->hold = hold; \
- state->bits = bits; \
- } while (0)
-
-/* Clear the input bit accumulator */
-#define INITBITS() \
- do { \
- hold = 0; \
- bits = 0; \
- } while (0)
-
-/* Get a byte of input into the bit accumulator, or return from inflate()
- if there is no input available. */
-#define PULLBYTE() \
- do { \
- if (have == 0) goto inf_leave; \
- have--; \
- hold += (unsigned long)(*next++) << bits; \
- bits += 8; \
- } while (0)
-
-/* Assure that there are at least n bits in the bit accumulator. If there is
- not enough available input to do that, then return from inflate(). */
-#define NEEDBITS(n) \
- do { \
- while (bits < (unsigned)(n)) \
- PULLBYTE(); \
- } while (0)
-
-/* Return the low n bits of the bit accumulator (n < 16) */
-#define BITS(n) \
- ((unsigned)hold & ((1U << (n)) - 1))
-
-/* Remove n bits from the bit accumulator */
-#define DROPBITS(n) \
- do { \
- hold >>= (n); \
- bits -= (unsigned)(n); \
- } while (0)
-
-/* Remove zero to seven bits as needed to go to a byte boundary */
-#define BYTEBITS() \
- do { \
- hold >>= bits & 7; \
- bits -= bits & 7; \
- } while (0)
-
-/* Reverse the bytes in a 32-bit value */
-#define REVERSE(q) \
- ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
- (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
-
-/*
- inflate() uses a state machine to process as much input data and generate as
- much output data as possible before returning. The state machine is
- structured roughly as follows:
-
- for (;;) switch (state) {
- ...
- case STATEn:
- if (not enough input data or output space to make progress)
- return;
- ... make progress ...
- state = STATEm;
- break;
- ...
- }
-
- so when inflate() is called again, the same case is attempted again, and
- if the appropriate resources are provided, the machine proceeds to the
- next state. The NEEDBITS() macro is usually the way the state evaluates
- whether it can proceed or should return. NEEDBITS() does the return if
- the requested bits are not available. The typical use of the BITS macros
- is:
-
- NEEDBITS(n);
- ... do something with BITS(n) ...
- DROPBITS(n);
-
- where NEEDBITS(n) either returns from inflate() if there isn't enough
- input left to load n bits into the accumulator, or it continues. BITS(n)
- gives the low n bits in the accumulator. When done, DROPBITS(n) drops
- the low n bits off the accumulator. INITBITS() clears the accumulator
- and sets the number of available bits to zero. BYTEBITS() discards just
- enough bits to put the accumulator on a byte boundary. After BYTEBITS()
- and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
-
- NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
- if there is no input available. The decoding of variable length codes uses
- PULLBYTE() directly in order to pull just enough bytes to decode the next
- code, and no more.
-
- Some states loop until they get enough input, making sure that enough
- state information is maintained to continue the loop where it left off
- if NEEDBITS() returns in the loop. For example, want, need, and keep
- would all have to actually be part of the saved state in case NEEDBITS()
- returns:
-
- case STATEw:
- while (want < need) {
- NEEDBITS(n);
- keepwant++ = BITS(n);
- DROPBITS(n);
- }
- state = STATEx;
- case STATEx:
-
- As shown above, if the next state is also the next case, then the break
- is omitted.
-
- A state may also return if there is not enough output space available to
- complete that state. Those states are copying stored data, writing a
- literal byte, and copying a matching string.
-
- When returning, a "goto inf_leave" is used to update the total counters,
- update the check value, and determine whether any progress has been made
- during that inflate() call in order to return the proper return code.
- Progress is defined as a change in either strm->avail_in or strm->avail_out.
- When there is a window, goto inf_leave will update the window with the last
- output written. If a goto inf_leave occurs in the middle of decompression
- and there is no window currently, goto inf_leave will create one and copy
- output to the window for the next call of inflate().
-
- In this implementation, the flush parameter of inflate() only affects the
- return code (per zlib.h). inflate() always writes as much as possible to
- strm->next_out, given the space available and the provided input--the effect
- documented in zlib.h of Z_SYNC_FLUSH. Furthermore, inflate() always defers
- the allocation of and copying into a sliding window until necessary, which
- provides the effect documented in zlib.h for Z_FINISH when the entire input
- stream available. So the only thing the flush parameter actually does is:
- when flush is set to Z_FINISH, inflate() cannot return Z_OK. Instead it
- will return Z_BUF_ERROR if it has not reached the end of the stream.
- */
-
-int ZEXPORT inflate(strm, flush)
-z_streamp strm;
-int flush;
-{
- struct inflate_state FAR *state;
- unsigned char FAR *next; /* next input */
- unsigned char FAR *put; /* next output */
- unsigned have, left; /* available input and output */
- unsigned long hold; /* bit buffer */
- unsigned bits; /* bits in bit buffer */
- unsigned in, out; /* save starting available input and output */
- unsigned copy; /* number of stored or match bytes to copy */
- unsigned char FAR *from; /* where to copy match bytes from */
- code here; /* current decoding table entry */
- code last; /* parent table entry */
- unsigned len; /* length to copy for repeats, bits to drop */
- int ret; /* return code */
-#ifdef GUNZIP
- unsigned char hbuf4; /* buffer for gzip header crc calculation */
-#endif
- static const unsigned short order19 = /* permutation of code lengths */
- {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
- if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
- (strm->next_in == Z_NULL && strm->avail_in != 0))
- return Z_STREAM_ERROR;
-
- state = (struct inflate_state FAR *)strm->state;
- if (state->mode == TYPE) state->mode = TYPEDO; /* skip check */
- LOAD();
- in = have;
- out = left;
- ret = Z_OK;
- for (;;)
- switch (state->mode) {
- case HEAD:
- if (state->wrap == 0) {
- state->mode = TYPEDO;
- break;
- }
- NEEDBITS(16);
-#ifdef GUNZIP
- if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */
- state->check = crc32(0L, Z_NULL, 0);
- CRC2(state->check, hold);
- INITBITS();
- state->mode = FLAGS;
- break;
- }
- state->flags = 0; /* expect zlib header */
- if (state->head != Z_NULL)
- state->head->done = -1;
- if (!(state->wrap & 1) || /* check if zlib header allowed */
-#else
- if (
-#endif
- ((BITS(8) << 8) + (hold >> 8)) % 31) {
- strm->msg = (char *)"incorrect header check";
- state->mode = BAD;
- break;
- }
- if (BITS(4) != Z_DEFLATED) {
- strm->msg = (char *)"unknown compression method";
- state->mode = BAD;
- break;
- }
- DROPBITS(4);
- len = BITS(4) + 8;
- if (state->wbits == 0)
- state->wbits = len;
- else if (len > state->wbits) {
- strm->msg = (char *)"invalid window size";
- state->mode = BAD;
- break;
- }
- state->dmax = 1U << len;
- Tracev((stderr, "inflate: zlib header ok\n"));
- strm->adler = state->check = adler32(0L, Z_NULL, 0);
- state->mode = hold & 0x200 ? DICTID : TYPE;
- INITBITS();
- break;
-#ifdef GUNZIP
- case FLAGS:
- NEEDBITS(16);
- state->flags = (int)(hold);
- if ((state->flags & 0xff) != Z_DEFLATED) {
- strm->msg = (char *)"unknown compression method";
- state->mode = BAD;
- break;
- }
- if (state->flags & 0xe000) {
- strm->msg = (char *)"unknown header flags set";
- state->mode = BAD;
- break;
- }
- if (state->head != Z_NULL)
- state->head->text = (int)((hold >> 8) & 1);
- if (state->flags & 0x0200) CRC2(state->check, hold);
- INITBITS();
- state->mode = TIME;
- case TIME:
- NEEDBITS(32);
- if (state->head != Z_NULL)
- state->head->time = hold;
- if (state->flags & 0x0200) CRC4(state->check, hold);
- INITBITS();
- state->mode = OS;
- case OS:
- NEEDBITS(16);
- if (state->head != Z_NULL) {
- state->head->xflags = (int)(hold & 0xff);
- state->head->os = (int)(hold >> 8);
- }
- if (state->flags & 0x0200) CRC2(state->check, hold);
- INITBITS();
- state->mode = EXLEN;
- case EXLEN:
- if (state->flags & 0x0400) {
- NEEDBITS(16);
- state->length = (unsigned)(hold);
- if (state->head != Z_NULL)
- state->head->extra_len = (unsigned)hold;
- if (state->flags & 0x0200) CRC2(state->check, hold);
- INITBITS();
- }
- else if (state->head != Z_NULL)
- state->head->extra = Z_NULL;
- state->mode = EXTRA;
- case EXTRA:
- if (state->flags & 0x0400) {
- copy = state->length;
- if (copy > have) copy = have;
- if (copy) {
- if (state->head != Z_NULL &&
- state->head->extra != Z_NULL) {
- len = state->head->extra_len - state->length;
- zmemcpy(state->head->extra + len, next,
- len + copy > state->head->extra_max ?
- state->head->extra_max - len : copy);
- }
- if (state->flags & 0x0200)
- state->check = crc32(state->check, next, copy);
- have -= copy;
- next += copy;
- state->length -= copy;
- }
- if (state->length) goto inf_leave;
- }
- state->length = 0;
- state->mode = NAME;
- case NAME:
- if (state->flags & 0x0800) {
- if (have == 0) goto inf_leave;
- copy = 0;
- do {
- len = (unsigned)(nextcopy++);
- if (state->head != Z_NULL &&
- state->head->name != Z_NULL &&
- state->length < state->head->name_max)
- state->head->namestate->length++ = len;
- } while (len && copy < have);
- if (state->flags & 0x0200)
- state->check = crc32(state->check, next, copy);
- have -= copy;
- next += copy;
- if (len) goto inf_leave;
- }
- else if (state->head != Z_NULL)
- state->head->name = Z_NULL;
- state->length = 0;
- state->mode = COMMENT;
- case COMMENT:
- if (state->flags & 0x1000) {
- if (have == 0) goto inf_leave;
- copy = 0;
- do {
- len = (unsigned)(nextcopy++);
- if (state->head != Z_NULL &&
- state->head->comment != Z_NULL &&
- state->length < state->head->comm_max)
- state->head->commentstate->length++ = len;
- } while (len && copy < have);
- if (state->flags & 0x0200)
- state->check = crc32(state->check, next, copy);
- have -= copy;
- next += copy;
- if (len) goto inf_leave;
- }
- else if (state->head != Z_NULL)
- state->head->comment = Z_NULL;
- state->mode = HCRC;
- case HCRC:
- if (state->flags & 0x0200) {
- NEEDBITS(16);
- if (hold != (state->check & 0xffff)) {
- strm->msg = (char *)"header crc mismatch";
- state->mode = BAD;
- break;
- }
- INITBITS();
- }
- if (state->head != Z_NULL) {
- state->head->hcrc = (int)((state->flags >> 9) & 1);
- state->head->done = 1;
- }
- strm->adler = state->check = crc32(0L, Z_NULL, 0);
- state->mode = TYPE;
- break;
-#endif
- case DICTID:
- NEEDBITS(32);
- strm->adler = state->check = REVERSE(hold);
- INITBITS();
- state->mode = DICT;
- case DICT:
- if (state->havedict == 0) {
- RESTORE();
- return Z_NEED_DICT;
- }
- strm->adler = state->check = adler32(0L, Z_NULL, 0);
- state->mode = TYPE;
- case TYPE:
- if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
- case TYPEDO:
- if (state->last) {
- BYTEBITS();
- state->mode = CHECK;
- break;
- }
- NEEDBITS(3);
- state->last = BITS(1);
- DROPBITS(1);
- switch (BITS(2)) {
- case 0: /* stored block */
- Tracev((stderr, "inflate: stored block%s\n",
- state->last ? " (last)" : ""));
- state->mode = STORED;
- break;
- case 1: /* fixed block */
- fixedtables(state);
- Tracev((stderr, "inflate: fixed codes block%s\n",
- state->last ? " (last)" : ""));
- state->mode = LEN_; /* decode codes */
- if (flush == Z_TREES) {
- DROPBITS(2);
- goto inf_leave;
- }
- break;
- case 2: /* dynamic block */
- Tracev((stderr, "inflate: dynamic codes block%s\n",
- state->last ? " (last)" : ""));
- state->mode = TABLE;
- break;
- case 3:
- strm->msg = (char *)"invalid block type";
- state->mode = BAD;
- }
- DROPBITS(2);
- break;
- case STORED:
- BYTEBITS(); /* go to byte boundary */
- NEEDBITS(32);
- if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
- strm->msg = (char *)"invalid stored block lengths";
- state->mode = BAD;
- break;
- }
- state->length = (unsigned)hold & 0xffff;
- Tracev((stderr, "inflate: stored length %u\n",
- state->length));
- INITBITS();
- state->mode = COPY_;
- if (flush == Z_TREES) goto inf_leave;
- case COPY_:
- state->mode = COPY;
- case COPY:
- copy = state->length;
- if (copy) {
- if (copy > have) copy = have;
- if (copy > left) copy = left;
- if (copy == 0) goto inf_leave;
- zmemcpy(put, next, copy);
- have -= copy;
- next += copy;
- left -= copy;
- put += copy;
- state->length -= copy;
- break;
- }
- Tracev((stderr, "inflate: stored end\n"));
- state->mode = TYPE;
- break;
- case TABLE:
- NEEDBITS(14);
- state->nlen = BITS(5) + 257;
- DROPBITS(5);
- state->ndist = BITS(5) + 1;
- DROPBITS(5);
- state->ncode = BITS(4) + 4;
- DROPBITS(4);
-#ifndef PKZIP_BUG_WORKAROUND
- if (state->nlen > 286 || state->ndist > 30) {
- strm->msg = (char *)"too many length or distance symbols";
- state->mode = BAD;
- break;
- }
-#endif
- Tracev((stderr, "inflate: table sizes ok\n"));
- state->have = 0;
- state->mode = LENLENS;
- case LENLENS:
- while (state->have < state->ncode) {
- NEEDBITS(3);
- state->lensorderstate->have++ = (unsigned short)BITS(3);
- DROPBITS(3);
- }
- while (state->have < 19)
- state->lensorderstate->have++ = 0;
- state->next = state->codes;
- state->lencode = (code const FAR *)(state->next);
- state->lenbits = 7;
- ret = inflate_table(CODES, state->lens, 19, &(state->next),
- &(state->lenbits), state->work);
- if (ret) {
- strm->msg = (char *)"invalid code lengths set";
- state->mode = BAD;
- break;
- }
- Tracev((stderr, "inflate: code lengths ok\n"));
- state->have = 0;
- state->mode = CODELENS;
- case CODELENS:
- while (state->have < state->nlen + state->ndist) {
- for (;;) {
- here = state->lencodeBITS(state->lenbits);
- if ((unsigned)(here.bits) <= bits) break;
- PULLBYTE();
- }
- if (here.val < 16) {
- DROPBITS(here.bits);
- state->lensstate->have++ = here.val;
- }
- else {
- if (here.val == 16) {
- NEEDBITS(here.bits + 2);
- DROPBITS(here.bits);
- if (state->have == 0) {
- strm->msg = (char *)"invalid bit length repeat";
- state->mode = BAD;
- break;
- }
- len = state->lensstate->have - 1;
- copy = 3 + BITS(2);
- DROPBITS(2);
- }
- else if (here.val == 17) {
- NEEDBITS(here.bits + 3);
- DROPBITS(here.bits);
- len = 0;
- copy = 3 + BITS(3);
- DROPBITS(3);
- }
- else {
- NEEDBITS(here.bits + 7);
- DROPBITS(here.bits);
- len = 0;
- copy = 11 + BITS(7);
- DROPBITS(7);
- }
- if (state->have + copy > state->nlen + state->ndist) {
- strm->msg = (char *)"invalid bit length repeat";
- state->mode = BAD;
- break;
- }
- while (copy--)
- state->lensstate->have++ = (unsigned short)len;
- }
- }
-
- /* handle error breaks in while */
- if (state->mode == BAD) break;
-
- /* check for end-of-block code (better have one) */
- if (state->lens256 == 0) {
- strm->msg = (char *)"invalid code -- missing end-of-block";
- state->mode = BAD;
- break;
- }
-
- /* build code tables -- note: do not change the lenbits or distbits
- values here (9 and 6) without reading the comments in inftrees.h
- concerning the ENOUGH constants, which depend on those values */
- state->next = state->codes;
- state->lencode = (code const FAR *)(state->next);
- state->lenbits = 9;
- ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
- &(state->lenbits), state->work);
- if (ret) {
- strm->msg = (char *)"invalid literal/lengths set";
- state->mode = BAD;
- break;
- }
- state->distcode = (code const FAR *)(state->next);
- state->distbits = 6;
- ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
- &(state->next), &(state->distbits), state->work);
- if (ret) {
- strm->msg = (char *)"invalid distances set";
- state->mode = BAD;
- break;
- }
- Tracev((stderr, "inflate: codes ok\n"));
- state->mode = LEN_;
- if (flush == Z_TREES) goto inf_leave;
- case LEN_:
- state->mode = LEN;
- case LEN:
- if (have >= 6 && left >= 258) {
- RESTORE();
- inflate_fast(strm, out);
- LOAD();
- if (state->mode == TYPE)
- state->back = -1;
- break;
- }
- state->back = 0;
- for (;;) {
- here = state->lencodeBITS(state->lenbits);
- if ((unsigned)(here.bits) <= bits) break;
- PULLBYTE();
- }
- if (here.op && (here.op & 0xf0) == 0) {
- last = here;
- for (;;) {
- here = state->lencodelast.val +
- (BITS(last.bits + last.op) >> last.bits);
- if ((unsigned)(last.bits + here.bits) <= bits) break;
- PULLBYTE();
- }
- DROPBITS(last.bits);
- state->back += last.bits;
- }
- DROPBITS(here.bits);
- state->back += here.bits;
- state->length = (unsigned)here.val;
- if ((int)(here.op) == 0) {
- Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
- "inflate: literal '%c'\n" :
- "inflate: literal 0x%02x\n", here.val));
- state->mode = LIT;
- break;
- }
- if (here.op & 32) {
- Tracevv((stderr, "inflate: end of block\n"));
- state->back = -1;
- state->mode = TYPE;
- break;
- }
- if (here.op & 64) {
- strm->msg = (char *)"invalid literal/length code";
- state->mode = BAD;
- break;
- }
- state->extra = (unsigned)(here.op) & 15;
- state->mode = LENEXT;
- case LENEXT:
- if (state->extra) {
- NEEDBITS(state->extra);
- state->length += BITS(state->extra);
- DROPBITS(state->extra);
- state->back += state->extra;
- }
- Tracevv((stderr, "inflate: length %u\n", state->length));
- state->was = state->length;
- state->mode = DIST;
- case DIST:
- for (;;) {
- here = state->distcodeBITS(state->distbits);
- if ((unsigned)(here.bits) <= bits) break;
- PULLBYTE();
- }
- if ((here.op & 0xf0) == 0) {
- last = here;
- for (;;) {
- here = state->distcodelast.val +
- (BITS(last.bits + last.op) >> last.bits);
- if ((unsigned)(last.bits + here.bits) <= bits) break;
- PULLBYTE();
- }
- DROPBITS(last.bits);
- state->back += last.bits;
- }
- DROPBITS(here.bits);
- state->back += here.bits;
- if (here.op & 64) {
- strm->msg = (char *)"invalid distance code";
- state->mode = BAD;
- break;
- }
- state->offset = (unsigned)here.val;
- state->extra = (unsigned)(here.op) & 15;
- state->mode = DISTEXT;
- case DISTEXT:
- if (state->extra) {
- NEEDBITS(state->extra);
- state->offset += BITS(state->extra);
- DROPBITS(state->extra);
- state->back += state->extra;
- }
-#ifdef INFLATE_STRICT
- if (state->offset > state->dmax) {
- strm->msg = (char *)"invalid distance too far back";
- state->mode = BAD;
- break;
- }
-#endif
- Tracevv((stderr, "inflate: distance %u\n", state->offset));
- state->mode = MATCH;
- case MATCH:
- if (left == 0) goto inf_leave;
- copy = out - left;
- if (state->offset > copy) { /* copy from window */
- copy = state->offset - copy;
- if (copy > state->whave) {
- if (state->sane) {
- strm->msg = (char *)"invalid distance too far back";
- state->mode = BAD;
- break;
- }
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
- Trace((stderr, "inflate.c too far\n"));
- copy -= state->whave;
- if (copy > state->length) copy = state->length;
- if (copy > left) copy = left;
- left -= copy;
- state->length -= copy;
- do {
- *put++ = 0;
- } while (--copy);
- if (state->length == 0) state->mode = LEN;
- break;
-#endif
- }
- if (copy > state->wnext) {
- copy -= state->wnext;
- from = state->window + (state->wsize - copy);
- }
- else
- from = state->window + (state->wnext - copy);
- if (copy > state->length) copy = state->length;
- }
- else { /* copy from output */
- from = put - state->offset;
- copy = state->length;
- }
- if (copy > left) copy = left;
- left -= copy;
- state->length -= copy;
- do {
- *put++ = *from++;
- } while (--copy);
- if (state->length == 0) state->mode = LEN;
- break;
- case LIT:
- if (left == 0) goto inf_leave;
- *put++ = (unsigned char)(state->length);
- left--;
- state->mode = LEN;
- break;
- case CHECK:
- if (state->wrap) {
- NEEDBITS(32);
- out -= left;
- strm->total_out += out;
- state->total += out;
- if (out)
- strm->adler = state->check =
- UPDATE(state->check, put - out, out);
- out = left;
- if ((
-#ifdef GUNZIP
- state->flags ? hold :
-#endif
- REVERSE(hold)) != state->check) {
- strm->msg = (char *)"incorrect data check";
- state->mode = BAD;
- break;
- }
- INITBITS();
- Tracev((stderr, "inflate: check matches trailer\n"));
- }
-#ifdef GUNZIP
- state->mode = LENGTH;
- case LENGTH:
- if (state->wrap && state->flags) {
- NEEDBITS(32);
- if (hold != (state->total & 0xffffffffUL)) {
- strm->msg = (char *)"incorrect length check";
- state->mode = BAD;
- break;
- }
- INITBITS();
- Tracev((stderr, "inflate: length matches trailer\n"));
- }
-#endif
- state->mode = DONE;
- case DONE:
- ret = Z_STREAM_END;
- goto inf_leave;
- case BAD:
- ret = Z_DATA_ERROR;
- goto inf_leave;
- case MEM:
- return Z_MEM_ERROR;
- case SYNC:
- default:
- return Z_STREAM_ERROR;
- }
-
- /*
- Return from inflate(), updating the total counts and the check value.
- If there was no progress during the inflate() call, return a buffer
- error. Call updatewindow() to create and/or update the window state.
- Note: a memory error from inflate() is non-recoverable.
- */
- inf_leave:
- RESTORE();
- if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
- (state->mode < CHECK || flush != Z_FINISH)))
- if (updatewindow(strm, out)) {
- state->mode = MEM;
- return Z_MEM_ERROR;
- }
- in -= strm->avail_in;
- out -= strm->avail_out;
- strm->total_in += in;
- strm->total_out += out;
- state->total += out;
- if (state->wrap && out)
- strm->adler = state->check =
- UPDATE(state->check, strm->next_out - out, out);
- strm->data_type = state->bits + (state->last ? 64 : 0) +
- (state->mode == TYPE ? 128 : 0) +
- (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
- if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
- ret = Z_BUF_ERROR;
- return ret;
-}
-
-int ZEXPORT inflateEnd(strm)
-z_streamp strm;
-{
- struct inflate_state FAR *state;
- if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
- return Z_STREAM_ERROR;
- state = (struct inflate_state FAR *)strm->state;
- if (state->window != Z_NULL) ZFREE(strm, state->window);
- ZFREE(strm, strm->state);
- strm->state = Z_NULL;
- Tracev((stderr, "inflate: end\n"));
- return Z_OK;
-}
-
-int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
-z_streamp strm;
-const Bytef *dictionary;
-uInt dictLength;
-{
- struct inflate_state FAR *state;
- unsigned long id;
- unsigned char *next;
- unsigned avail;
- int ret;
-
- /* check state */
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- state = (struct inflate_state FAR *)strm->state;
- if (state->wrap != 0 && state->mode != DICT)
- return Z_STREAM_ERROR;
-
- /* check for correct dictionary id */
- if (state->mode == DICT) {
- id = adler32(0L, Z_NULL, 0);
- id = adler32(id, dictionary, dictLength);
- if (id != state->check)
- return Z_DATA_ERROR;
- }
-
- /* copy dictionary to window using updatewindow(), which will amend the
- existing dictionary if appropriate */
- next = strm->next_out;
- avail = strm->avail_out;
- strm->next_out = (Bytef *)dictionary + dictLength;
- strm->avail_out = 0;
- ret = updatewindow(strm, dictLength);
- strm->avail_out = avail;
- strm->next_out = next;
- if (ret) {
- state->mode = MEM;
- return Z_MEM_ERROR;
- }
- state->havedict = 1;
- Tracev((stderr, "inflate: dictionary set\n"));
- return Z_OK;
-}
-
-int ZEXPORT inflateGetHeader(strm, head)
-z_streamp strm;
-gz_headerp head;
-{
- struct inflate_state FAR *state;
-
- /* check state */
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- state = (struct inflate_state FAR *)strm->state;
- if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
-
- /* save header structure */
- state->head = head;
- head->done = 0;
- return Z_OK;
-}
-
-/*
- Search buf0..len-1 for the pattern: 0, 0, 0xff, 0xff. Return when found
- or when out of input. When called, *have is the number of pattern bytes
- found in order so far, in 0..3. On return *have is updated to the new
- state. If on return *have equals four, then the pattern was found and the
- return value is how many bytes were read including the last byte of the
- pattern. If *have is less than four, then the pattern has not been found
- yet and the return value is len. In the latter case, syncsearch() can be
- called again with more data and the *have state. *have is initialized to
- zero for the first call.
- */
-local unsigned syncsearch(have, buf, len)
-unsigned FAR *have;
-unsigned char FAR *buf;
-unsigned len;
-{
- unsigned got;
- unsigned next;
-
- got = *have;
- next = 0;
- while (next < len && got < 4) {
- if ((int)(bufnext) == (got < 2 ? 0 : 0xff))
- got++;
- else if (bufnext)
- got = 0;
- else
- got = 4 - got;
- next++;
- }
- *have = got;
- return next;
-}
-
-int ZEXPORT inflateSync(strm)
-z_streamp strm;
-{
- unsigned len; /* number of bytes to look at or looked at */
- unsigned long in, out; /* temporary to save total_in and total_out */
- unsigned char buf4; /* to restore bit buffer to byte string */
- struct inflate_state FAR *state;
-
- /* check parameters */
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- state = (struct inflate_state FAR *)strm->state;
- if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
-
- /* if first time, start search in bit buffer */
- if (state->mode != SYNC) {
- state->mode = SYNC;
- state->hold <<= state->bits & 7;
- state->bits -= state->bits & 7;
- len = 0;
- while (state->bits >= 8) {
- buflen++ = (unsigned char)(state->hold);
- state->hold >>= 8;
- state->bits -= 8;
- }
- state->have = 0;
- syncsearch(&(state->have), buf, len);
- }
-
- /* search available input */
- len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
- strm->avail_in -= len;
- strm->next_in += len;
- strm->total_in += len;
-
- /* return no joy or set up to restart inflate() on a new block */
- if (state->have != 4) return Z_DATA_ERROR;
- in = strm->total_in; out = strm->total_out;
- inflateReset(strm);
- strm->total_in = in; strm->total_out = out;
- state->mode = TYPE;
- return Z_OK;
-}
-
-/*
- Returns true if inflate is currently at the end of a block generated by
- Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
- implementation to provide an additional safety check. PPP uses
- Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
- block. When decompressing, PPP checks that at the end of input packet,
- inflate is waiting for these length bytes.
- */
-int ZEXPORT inflateSyncPoint(strm)
-z_streamp strm;
-{
- struct inflate_state FAR *state;
-
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- state = (struct inflate_state FAR *)strm->state;
- return state->mode == STORED && state->bits == 0;
-}
-
-int ZEXPORT inflateCopy(dest, source)
-z_streamp dest;
-z_streamp source;
-{
- struct inflate_state FAR *state;
- struct inflate_state FAR *copy;
- unsigned char FAR *window;
- unsigned wsize;
-
- /* check input */
- if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
- source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
- return Z_STREAM_ERROR;
- state = (struct inflate_state FAR *)source->state;
-
- /* allocate space */
- copy = (struct inflate_state FAR *)
- ZALLOC(source, 1, sizeof(struct inflate_state));
- if (copy == Z_NULL) return Z_MEM_ERROR;
- window = Z_NULL;
- if (state->window != Z_NULL) {
- window = (unsigned char FAR *)
- ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
- if (window == Z_NULL) {
- ZFREE(source, copy);
- return Z_MEM_ERROR;
- }
- }
-
- /* copy state */
- zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
- zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
- if (state->lencode >= state->codes &&
- state->lencode <= state->codes + ENOUGH - 1) {
- copy->lencode = copy->codes + (state->lencode - state->codes);
- copy->distcode = copy->codes + (state->distcode - state->codes);
- }
- copy->next = copy->codes + (state->next - state->codes);
- if (window != Z_NULL) {
- wsize = 1U << state->wbits;
- zmemcpy(window, state->window, wsize);
- }
- copy->window = window;
- dest->state = (struct internal_state FAR *)copy;
- return Z_OK;
-}
-
-int ZEXPORT inflateUndermine(strm, subvert)
-z_streamp strm;
-int subvert;
-{
- struct inflate_state FAR *state;
-
- if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
- state = (struct inflate_state FAR *)strm->state;
- state->sane = !subvert;
-#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
- return Z_OK;
-#else
- state->sane = 1;
- return Z_DATA_ERROR;
-#endif
-}
-
-long ZEXPORT inflateMark(strm)
-z_streamp strm;
-{
- struct inflate_state FAR *state;
-
- if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
- state = (struct inflate_state FAR *)strm->state;
- return ((long)(state->back) << 16) +
- (state->mode == COPY ? state->length :
- (state->mode == MATCH ? state->was - state->length : 0));
-}

smplayer-0.8.0.tar.bz2/zlib-1.2.6/inftrees.c Deleted

@@ -1,306 +0,0 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2012 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-
-#define MAXBITS 15
-
-const char inflate_copyright =
- " inflate 1.2.6 Copyright 1995-2012 Mark Adler ";
-/*
- If you use the zlib library in a product, an acknowledgment is welcome
- in the documentation of your product. If for some reason you cannot
- include such an acknowledgment, I would appreciate that you keep this
- copyright string in the executable of your product.
- */
-
-/*
- Build a set of tables to decode the provided canonical Huffman code.
- The code lengths are lens0..codes-1. The result starts at *table,
- whose indices are 0..2^bits-1. work is a writable array of at least
- lens shorts, which is used as a work area. type is the type of code
- to be generated, CODES, LENS, or DISTS. On return, zero is success,
- -1 is an invalid code, and +1 means that ENOUGH isn't enough. table
- on return points to the next available entry's address. bits is the
- requested root table index bits, and on return it is the actual root
- table index bits. It will differ if the request is greater than the
- longest code or if it is less than the shortest code.
- */
-int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
-codetype type;
-unsigned short FAR *lens;
-unsigned codes;
-code FAR * FAR *table;
-unsigned FAR *bits;
-unsigned short FAR *work;
-{
- unsigned len; /* a code's length in bits */
- unsigned sym; /* index of code symbols */
- unsigned min, max; /* minimum and maximum code lengths */
- unsigned root; /* number of index bits for root table */
- unsigned curr; /* number of index bits for current table */
- unsigned drop; /* code bits to drop for sub-table */
- int left; /* number of prefix codes available */
- unsigned used; /* code entries in table used */
- unsigned huff; /* Huffman code */
- unsigned incr; /* for incrementing code, index */
- unsigned fill; /* index for replicating entries */
- unsigned low; /* low bits for current root entry */
- unsigned mask; /* mask for low root bits */
- code here; /* table entry for duplication */
- code FAR *next; /* next available space in table */
- const unsigned short FAR *base; /* base value table to use */
- const unsigned short FAR *extra; /* extra bits table to use */
- int end; /* use base and extra for symbol > end */
- unsigned short countMAXBITS+1; /* number of codes of each length */
- unsigned short offsMAXBITS+1; /* offsets in table for each length */
- static const unsigned short lbase31 = { /* Length codes 257..285 base */
- 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
- 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
- static const unsigned short lext31 = { /* Length codes 257..285 extra */
- 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
- 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 203, 69};
- static const unsigned short dbase32 = { /* Distance codes 0..29 base */
- 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
- 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
- 8193, 12289, 16385, 24577, 0, 0};
- static const unsigned short dext32 = { /* Distance codes 0..29 extra */
- 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
- 23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
- 28, 28, 29, 29, 64, 64};
-
- /*
- Process a set of code lengths to create a canonical Huffman code. The
- code lengths are lens0..codes-1. Each length corresponds to the
- symbols 0..codes-1. The Huffman code is generated by first sorting the
- symbols by length from short to long, and retaining the symbol order
- for codes with equal lengths. Then the code starts with all zero bits
- for the first code of the shortest length, and the codes are integer
- increments for the same length, and zeros are appended as the length
- increases. For the deflate format, these bits are stored backwards
- from their more natural integer increment ordering, and so when the
- decoding tables are built in the large loop below, the integer codes
- are incremented backwards.
-
- This routine assumes, but does not check, that all of the entries in
- lens are in the range 0..MAXBITS. The caller must assure this.
- 1..MAXBITS is interpreted as that code length. zero means that that
- symbol does not occur in this code.
-
- The codes are sorted by computing a count of codes for each length,
- creating from that a table of starting indices for each length in the
- sorted table, and then entering the symbols in order in the sorted
- table. The sorted table is work, with that space being provided by
- the caller.
-
- The length counts are used for other purposes as well, i.e. finding
- the minimum and maximum length codes, determining if there are any
- codes at all, checking for a valid set of lengths, and looking ahead
- at length counts to determine sub-table sizes when building the
- decoding tables.
- */
-
- /* accumulate lengths for codes (assumes lens all in 0..MAXBITS) */
- for (len = 0; len <= MAXBITS; len++)
- countlen = 0;
- for (sym = 0; sym < codes; sym++)
- countlenssym++;
-
- /* bound code lengths, force root to be within code lengths */
- root = *bits;
- for (max = MAXBITS; max >= 1; max--)
- if (countmax != 0) break;
- if (root > max) root = max;
- if (max == 0) { /* no symbols to code at all */
- here.op = (unsigned char)64; /* invalid code marker */
- here.bits = (unsigned char)1;
- here.val = (unsigned short)0;
- *(*table)++ = here; /* make a table to force an error */
- *(*table)++ = here;
- *bits = 1;
- return 0; /* no symbols, but wait for decoding to report error */
- }
- for (min = 1; min < max; min++)
- if (countmin != 0) break;
- if (root < min) root = min;
-
- /* check for an over-subscribed or incomplete set of lengths */
- left = 1;
- for (len = 1; len <= MAXBITS; len++) {
- left <<= 1;
- left -= countlen;
- if (left < 0) return -1; /* over-subscribed */
- }
- if (left > 0 && (type == CODES || max != 1))
- return -1; /* incomplete set */
-
- /* generate offsets into symbol table for each length for sorting */
- offs1 = 0;
- for (len = 1; len < MAXBITS; len++)
- offslen + 1 = offslen + countlen;
-
- /* sort symbols by length, by symbol order within each length */
- for (sym = 0; sym < codes; sym++)
- if (lenssym != 0) workoffslenssym++ = (unsigned short)sym;
-
- /*
- Create and fill in decoding tables. In this loop, the table being
- filled is at next and has curr index bits. The code being used is huff
- with length len. That code is converted to an index by dropping drop
- bits off of the bottom. For codes where len is less than drop + curr,
- those top drop + curr - len bits are incremented through all values to
- fill the table with replicated entries.
-
- root is the number of index bits for the root table. When len exceeds
- root, sub-tables are created pointed to by the root entry with an index
- of the low root bits of huff. This is saved in low to check for when a
- new sub-table should be started. drop is zero when the root table is
- being filled, and drop is root when sub-tables are being filled.
-
- When a new sub-table is needed, it is necessary to look ahead in the
- code lengths to determine what size sub-table is needed. The length
- counts are used for this, and so count is decremented as codes are
- entered in the tables.
-
- used keeps track of how many table entries have been allocated from the
- provided *table space. It is checked for LENS and DIST tables against
- the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
- the initial root table size constants. See the comments in inftrees.h
- for more information.
-
- sym increments through all symbols, and the loop terminates when
- all codes of length max, i.e. all codes, have been processed. This
- routine permits incomplete codes, so another loop after this one fills
- in the rest of the decoding tables with invalid code markers.
- */
-
- /* set up for code type */
- switch (type) {
- case CODES:
- base = extra = work; /* dummy value--not used */
- end = 19;
- break;
- case LENS:
- base = lbase;
- base -= 257;
- extra = lext;
- extra -= 257;
- end = 256;
- break;
- default: /* DISTS */
- base = dbase;
- extra = dext;
- end = -1;
- }
-
- /* initialize state for loop */
- huff = 0; /* starting code */
- sym = 0; /* starting code symbol */
- len = min; /* starting code length */
- next = *table; /* current table to fill in */
- curr = root; /* current table index bits */
- drop = 0; /* current bits to drop from code for index */
- low = (unsigned)(-1); /* trigger new sub-table when len > root */
- used = 1U << root; /* use root table entries */
- mask = used - 1; /* mask for comparing low */
-
- /* check available table space */
- if ((type == LENS && used >= ENOUGH_LENS) ||
- (type == DISTS && used >= ENOUGH_DISTS))
- return 1;
-
- /* process all codes and make table entries */
- for (;;) {
- /* create table entry */
- here.bits = (unsigned char)(len - drop);
- if ((int)(worksym) < end) {
- here.op = (unsigned char)0;
- here.val = worksym;
- }
- else if ((int)(worksym) > end) {
- here.op = (unsigned char)(extraworksym);
- here.val = baseworksym;
- }
- else {
- here.op = (unsigned char)(32 + 64); /* end of block */
- here.val = 0;
- }
-
- /* replicate for those indices with low len bits equal to huff */
- incr = 1U << (len - drop);
- fill = 1U << curr;
- min = fill; /* save offset to next table */
- do {
- fill -= incr;
- next(huff >> drop) + fill = here;
- } while (fill != 0);
-
- /* backwards increment the len-bit code huff */
- incr = 1U << (len - 1);
- while (huff & incr)
- incr >>= 1;
- if (incr != 0) {
- huff &= incr - 1;
- huff += incr;
- }
- else
- huff = 0;
-
- /* go to next symbol, update count, len */
- sym++;
- if (--(countlen) == 0) {
- if (len == max) break;
- len = lensworksym;
- }
-
- /* create new sub-table if needed */
- if (len > root && (huff & mask) != low) {
- /* if first time, transition to sub-tables */
- if (drop == 0)
- drop = root;
-
- /* increment past last table */
- next += min; /* here min is 1 << curr */
-
- /* determine length of next table */
- curr = len - drop;
- left = (int)(1 << curr);
- while (curr + drop < max) {
- left -= countcurr + drop;
- if (left <= 0) break;
- curr++;
- left <<= 1;
- }
-
- /* check for enough space */
- used += 1U << curr;
- if ((type == LENS && used >= ENOUGH_LENS) ||
- (type == DISTS && used >= ENOUGH_DISTS))
- return 1;
-
- /* point entry in root table to sub-table */
- low = huff & mask;
- (*table)low.op = (unsigned char)curr;
- (*table)low.bits = (unsigned char)root;
- (*table)low.val = (unsigned short)(next - *table);
- }
- }
-
- /* fill in remaining table entry if code is incomplete (guaranteed to have
- at most one remaining entry, since if the code is incomplete, the
- maximum code length that was allowed to get this far is one bit) */
- if (huff != 0) {
- here.op = (unsigned char)64; /* invalid code marker */
- here.bits = (unsigned char)(len - drop);
- here.val = (unsigned short)0;
- nexthuff = here;
- }
-
- /* set return parameters */
- *table += used;
- *bits = root;
- return 0;
-}

smplayer-0.8.0.tar.bz2/zlib-1.2.6/make_vms.com Deleted

@@ -1,804 +0,0 @@
-$! make libz under VMS written by
-$! Martin P.J. Zinser
-$!
-$! In case of problems with the install you might contact me at
-$! zinser@zinser.no-ip.info(preferred) or
-$! zinser@sysdev.deutsche-boerse.com (work)
-$!
-$! Make procedure history for Zlib
-$!
-$!------------------------------------------------------------------------------
-$! Version history
-$! 0.01 20060120 First version to receive a number
-$! 0.02 20061008 Adapt to new Makefile.in
-$! 0.03 20091224 Add support for large file check
-$! 0.04 20100110 Add new gzclose, gzlib, gzread, gzwrite
-$! 0.05 20100221 Exchange zlibdefs.h by zconf.h.in
-$!
-$ on error then goto err_exit
-$ set proc/parse=ext
-$!
-$ true = 1
-$ false = 0
-$ tmpnam = "temp_" + f$getjpi("","pid")
-$ tt = tmpnam + ".txt"
-$ tc = tmpnam + ".c"
-$ th = tmpnam + ".h"
-$ define/nolog tconfig 'th'
-$ its_decc = false
-$ its_vaxc = false
-$ its_gnuc = false
-$ s_case = False
-$!
-$! Setup variables holding "config" information
-$!
-$ Make = ""
-$ name = "Zlib"
-$ version = "?.?.?"
-$ v_string = "ZLIB_VERSION"
-$ v_file = "zlib.h"
-$ ccopt = ""
-$ lopts = ""
-$ dnsrl = ""
-$ aconf_in_file = "zconf.h.in#zconf.h_in"
-$ conf_check_string = ""
-$ linkonly = false
-$ optfile = name + ".opt"
-$ libdefs = ""
-$ axp = f$getsyi("HW_MODEL").ge.1024 .and. f$getsyi("HW_MODEL").lt.4096
-$!
-$ whoami = f$parse(f$enviornment("Procedure"),,,,"NO_CONCEAL")
-$ mydef = F$parse(whoami,,,"DEVICE")
-$ mydir = f$parse(whoami,,,"DIRECTORY") - ""
-$ myproc = f$parse(whoami,,,"Name") + f$parse(whoami,,,"type")
-$!
-$! Check for MMK/MMS
-$!
-$ If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"
-$ If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"
-$!
-$!
-$ gosub find_version
-$!
-$ open/write topt tmp.opt
-$ open/write optf 'optfile'
-$!
-$ gosub check_opts
-$!
-$! Look for the compiler used
-$!
-$ gosub check_compiler
-$ close topt
-$!
-$ if its_decc
-$ then
-$ ccopt = "/prefix=all" + ccopt
-$ if f$trnlnm("SYS") .eqs. ""
-$ then
-$ if axp
-$ then
-$ define sys sys$library:
-$ else
-$ ccopt = "/decc" + ccopt
-$ define sys decc$library_include:
-$ endif
-$ endif
-$ endif
-$ if its_vaxc .or. its_gnuc
-$ then
-$ if f$trnlnm("SYS").eqs."" then define sys sys$library:
-$ endif
-$!
-$! Build a fake configure input header
-$!
-$ open/write conf_hin config.hin
-$ write conf_hin "#undef _LARGEFILE64_SOURCE"
-$ close conf_hin
-$!
-$!
-$ i = 0
-$FIND_ACONF:
-$ fname = f$element(i,"#",aconf_in_file)
-$ if fname .eqs. "#" then goto AMISS_ERR
-$ if f$search(fname) .eqs. ""
-$ then
-$ i = i + 1
-$ goto find_aconf
-$ endif
-$ open/read/err=aconf_err aconf_in 'fname'
-$ open/write aconf zconf.h
-$ACONF_LOOP:
-$ read/end_of_file=aconf_exit aconf_in line
-$ work = f$edit(line, "compress,trim")
-$ if f$extract(0,6,work) .nes. "#undef"
-$ then
-$ if f$extract(0,12,work) .nes. "#cmakedefine"
-$ then
-$ write aconf line
-$ endif
-$ else
-$ cdef = f$element(1," ",work)
-$ gosub check_config
-$ endif
-$ goto aconf_loop
-$ACONF_EXIT:
-$ write aconf "#define VMS 1"
-$ write aconf "#include <unistd.h>"
-$ write aconf "#include <unixio.h>"
-$ write aconf "#ifdef _LARGEFILE"
-$ write aconf "#define off64_t __off64_t"
-$ write aconf "#define fopen64 fopen"
-$ write aconf "#define fseeko64 fseeko"
-$ write aconf "#define lseek64 lseek"
-$ write aconf "#define ftello64 ftell"
-$ write aconf "#endif"
-$ close aconf_in
-$ close aconf
-$ if f$search("''th'") .nes. "" then delete 'th';*
-$! Build the thing plain or with mms
-$!
-$ write sys$output "Compiling Zlib sources ..."
-$ if make.eqs.""
-$ then
-$ dele example.obj;*,minigzip.obj;*
-$ CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
- adler32.c zlib.h zconf.h
-$ CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
- compress.c zlib.h zconf.h
-$ CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
- crc32.c zlib.h zconf.h
-$ CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
- deflate.c deflate.h zutil.h zlib.h zconf.h
-$ CALL MAKE gzclose.OBJ "CC ''CCOPT' gzclose" -
- gzclose.c zutil.h zlib.h zconf.h
-$ CALL MAKE gzlib.OBJ "CC ''CCOPT' gzlib" -
- gzlib.c zutil.h zlib.h zconf.h
-$ CALL MAKE gzread.OBJ "CC ''CCOPT' gzread" -
- gzread.c zutil.h zlib.h zconf.h
-$ CALL MAKE gzwrite.OBJ "CC ''CCOPT' gzwrite" -
- gzwrite.c zutil.h zlib.h zconf.h
-$ CALL MAKE infback.OBJ "CC ''CCOPT' infback" -
- infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
-$ CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
- inffast.c zutil.h zlib.h zconf.h inffast.h
-$ CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
- inflate.c zutil.h zlib.h zconf.h infblock.h
-$ CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
- inftrees.c zutil.h zlib.h zconf.h inftrees.h
-$ CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
- trees.c deflate.h zutil.h zlib.h zconf.h
-$ CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
- uncompr.c zlib.h zconf.h
-$ CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
- zutil.c zutil.h zlib.h zconf.h
-$ write sys$output "Building Zlib ..."
-$ CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
-$ write sys$output "Building example..."
-$ CALL MAKE example.OBJ "CC ''CCOPT' example" -
- test/example.c zlib.h zconf.h
-$ call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
-$ if f$search("x11vms:xvmsutils.olb") .nes. ""
-$ then
-$ write sys$output "Building minigzip..."
-$ CALL MAKE minigzip.OBJ "CC ''CCOPT' minigzip" -
- test/minigzip.c zlib.h zconf.h
-$ call make minigzip.exe -
- "LINK minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib" -
- minigzip.obj libz.olb
-$ endif
-$ else
-$ gosub crea_mms
-$ write sys$output "Make ''name' ''version' with ''Make' "
-$ 'make'
-$ endif
-$!
-$! Alpha gets a shareable image
-$!
-$ If axp
-$ Then
-$ gosub crea_olist
-$ write sys$output "Creating libzshr.exe"
-$ call anal_obj_axp modules.opt _link.opt
-$ if s_case
-$ then
-$ open/append optf modules.opt
-$ write optf "case_sensitive=YES"
-$ close optf
-$ endif
-$ LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,_link.opt/opt
-$ endif
-$ write sys$output "Zlib build completed"
-$ exit
-$CC_ERR:
-$ write sys$output "C compiler required to build ''name'"
-$ goto err_exit
-$ERR_EXIT:
-$ set message/facil/ident/sever/text
-$ close/nolog optf
-$ close/nolog topt
-$ close/nolog conf_hin
-$ close/nolog aconf_in
-$ close/nolog aconf
-$ close/nolog out
-$ close/nolog min
-$ close/nolog mod
-$ close/nolog h_in
-$ write sys$output "Exiting..."
-$ exit 2
-$!
-$!
-$MAKE: SUBROUTINE !SUBROUTINE TO CHECK DEPENDENCIES
-$ V = 'F$Verify(0)
-$! P1 = What we are trying to make
-$! P2 = Command to make it
-$! P3 - P8 What it depends on
-$
-$ If F$Search(P1) .Eqs. "" Then Goto Makeit
-$ Time = F$CvTime(F$File(P1,"RDT"))
-$arg=3
-$Loop:
-$ Argument = P'arg
-$ If Argument .Eqs. "" Then Goto Exit
-$ El=0
-$Loop2:
-$ File = F$Element(El," ",Argument)
-$ If File .Eqs. " " Then Goto Endl
-$ AFile = ""
-$Loop3:
-$ OFile = AFile
-$ AFile = F$Search(File)
-$ If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
-$ If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
-$ Goto Loop3
-$NextEL:
-$ El = El + 1
-$ Goto Loop2
-$EndL:
-$ arg=arg+1
-$ If arg .Le. 8 Then Goto Loop
-$ Goto Exit
-$
-$Makeit:
-$ VV=F$VERIFY(0)
-$ write sys$output P2
-$ 'P2
-$ VV='F$Verify(VV)
-$Exit:
-$ If V Then Set Verify
-$ENDSUBROUTINE
-$!------------------------------------------------------------------------------
-$!
-$! Check command line options and set symbols accordingly
-$!
-$!------------------------------------------------------------------------------
-$! Version history
-$! 0.01 20041206 First version to receive a number
-$! 0.02 20060126 Add new "HELP" target
-$ CHECK_OPTS:
-$ i = 1
-$ OPT_LOOP:
-$ if i .lt. 9
-$ then
-$ cparm = f$edit(p'i',"upcase")
-$!
-$! Check if parameter actually contains something
-$!
-$ if f$edit(cparm,"trim") .nes. ""
-$ then
-$ if cparm .eqs. "DEBUG"
-$ then
-$ ccopt = ccopt + "/noopt/deb"
-$ lopts = lopts + "/deb"
-$ endif
-$ if f$locate("CCOPT=",cparm) .lt. f$length(cparm)
-$ then
-$ start = f$locate("=",cparm) + 1
-$ len = f$length(cparm) - start
-$ ccopt = ccopt + f$extract(start,len,cparm)
-$ if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -
- then s_case = true
-$ endif
-$ if cparm .eqs. "LINK" then linkonly = true
-$ if f$locate("LOPTS=",cparm) .lt. f$length(cparm)
-$ then
-$ start = f$locate("=",cparm) + 1
-$ len = f$length(cparm) - start
-$ lopts = lopts + f$extract(start,len,cparm)
-$ endif
-$ if f$locate("CC=",cparm) .lt. f$length(cparm)
-$ then
-$ start = f$locate("=",cparm) + 1
-$ len = f$length(cparm) - start
-$ cc_com = f$extract(start,len,cparm)
- if (cc_com .nes. "DECC") .and. -
- (cc_com .nes. "VAXC") .and. -
- (cc_com .nes. "GNUC")
-$ then
-$ write sys$output "Unsupported compiler choice ''cc_com' ignored"
-$ write sys$output "Use DECC, VAXC, or GNUC instead"
-$ else
-$ if cc_com .eqs. "DECC" then its_decc = true
-$ if cc_com .eqs. "VAXC" then its_vaxc = true
-$ if cc_com .eqs. "GNUC" then its_gnuc = true
-$ endif
-$ endif
-$ if f$locate("MAKE=",cparm) .lt. f$length(cparm)
-$ then
-$ start = f$locate("=",cparm) + 1
-$ len = f$length(cparm) - start
-$ mmks = f$extract(start,len,cparm)
-$ if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS")
-$ then
-$ make = mmks
-$ else
-$ write sys$output "Unsupported make choice ''mmks' ignored"
-$ write sys$output "Use MMK or MMS instead"
-$ endif
-$ endif
-$ if cparm .eqs. "HELP" then gosub bhelp
-$ endif
-$ i = i + 1
-$ goto opt_loop
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Look for the compiler used
-$!
-$! Version history
-$! 0.01 20040223 First version to receive a number
-$! 0.02 20040229 Save/set value of decc$no_rooted_search_lists
-$! 0.03 20060202 Extend handling of GNU C
-$! 0.04 20090402 Compaq -> hp
-$CHECK_COMPILER:
-$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
-$ then
-$ its_decc = (f$search("SYS$SYSTEM:DECC$COMPILER.EXE") .nes. "")
-$ its_vaxc = .not. its_decc .and. (F$Search("SYS$System:VAXC.Exe") .nes. "")
-$ its_gnuc = .not. (its_decc .or. its_vaxc) .and. (f$trnlnm("gnu_cc") .nes. "")
-$ endif
-$!
-$! Exit if no compiler available
-$!
-$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
-$ then goto CC_ERR
-$ else
-$ if its_decc
-$ then
-$ write sys$output "CC compiler check ... hp C"
-$ if f$trnlnm("decc$no_rooted_search_lists") .nes. ""
-$ then
-$ dnrsl = f$trnlnm("decc$no_rooted_search_lists")
-$ endif
-$ define/nolog decc$no_rooted_search_lists 1
-$ else
-$ if its_vaxc then write sys$output "CC compiler check ... VAX C"
-$ if its_gnuc
-$ then
-$ write sys$output "CC compiler check ... GNU C"
-$ if f$trnlnm(topt) then write topt "gnu_cc:000000gcclib.olb/lib"
-$ if f$trnlnm(optf) then write optf "gnu_cc:000000gcclib.olb/lib"
-$ cc = "gcc"
-$ endif
-$ if f$trnlnm(topt) then write topt "sys$share:vaxcrtl.exe/share"
-$ if f$trnlnm(optf) then write optf "sys$share:vaxcrtl.exe/share"
-$ endif
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! If MMS/MMK are available dump out the descrip.mms if required
-$!
-$CREA_MMS:
-$ write sys$output "Creating descrip.mms..."
-$ create descrip.mms
-$ open/append out descrip.mms
-$ copy sys$input: out
-$ deck
-# descrip.mms: MMS description file for building zlib on VMS
-# written by Martin P.J. Zinser
-# <zinser@zinser.no-ip.info or zinser@sysdev.deutsche-boerse.com>
-
-OBJS = adler32.obj, compress.obj, crc32.obj, gzclose.obj, gzlib.obj\
- gzread.obj, gzwrite.obj, uncompr.obj, infback.obj\
- deflate.obj, trees.obj, zutil.obj, inflate.obj, \
- inftrees.obj, inffast.obj
-
-$ eod
-$ write out "CFLAGS=", ccopt
-$ write out "LOPTS=", lopts
-$ copy sys$input: out
-$ deck
-
-all : example.exe minigzip.exe libz.olb
- @ write sys$output " Example applications available"
-
-libz.olb : libz.olb($(OBJS))
-	@ write sys$output " libz available"
-
-example.exe : example.obj libz.olb
- link $(LOPTS) example,libz.olb/lib
-
-minigzip.exe : minigzip.obj libz.olb
- link $(LOPTS) minigzip,libz.olb/lib,x11vms:xvmsutils.olb/lib
-
-clean :
-	delete *.obj;*,libz.olb;*,*.opt;*,*.exe;*
-
-
-# Other dependencies.
-adler32.obj : adler32.c zutil.h zlib.h zconf.h
-compress.obj : compress.c zlib.h zconf.h
-crc32.obj : crc32.c zutil.h zlib.h zconf.h
-deflate.obj : deflate.c deflate.h zutil.h zlib.h zconf.h
-example.obj : test/example.c zlib.h zconf.h
-gzclose.obj : gzclose.c zutil.h zlib.h zconf.h
-gzlib.obj : gzlib.c zutil.h zlib.h zconf.h
-gzread.obj : gzread.c zutil.h zlib.h zconf.h
-gzwrite.obj : gzwrite.c zutil.h zlib.h zconf.h
-inffast.obj : inffast.c zutil.h zlib.h zconf.h inftrees.h inffast.h
-inflate.obj : inflate.c zutil.h zlib.h zconf.h
-inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h
-minigzip.obj : test/minigzip.c zlib.h zconf.h
-trees.obj : trees.c deflate.h zutil.h zlib.h zconf.h
-uncompr.obj : uncompr.c zlib.h zconf.h
-zutil.obj : zutil.c zutil.h zlib.h zconf.h
-infback.obj : infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
-$ eod
-$ close out
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Read list of core library sources from makefile.in and create options
-$! needed to build shareable image
-$!
-$CREA_OLIST:
-$ open/read min makefile.in
-$ open/write mod modules.opt
-$ src_check = "OBJC ="
-$MRLOOP:
-$ read/end=mrdone min rec
-$ if (f$extract(0,6,rec) .nes. src_check) then goto mrloop
-$ rec = rec - src_check
-$ gosub extra_filnam
-$ if (f$element(1,"\",rec) .eqs. "\") then goto mrdone
-$MRSLOOP:
-$ read/end=mrdone min rec
-$ gosub extra_filnam
-$ if (f$element(1,"\",rec) .nes. "\") then goto mrsloop
-$MRDONE:
-$ close min
-$ close mod
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Take record extracted in crea_olist and split it into single filenames
-$!
-$EXTRA_FILNAM:
-$ myrec = f$edit(rec - "\", "trim,compress")
-$ i = 0
-$FELOOP:
-$ srcfil = f$element(i," ", myrec)
-$ if (srcfil .nes. " ")
-$ then
-$ write mod f$parse(srcfil,,,"NAME"), ".obj"
-$ i = i + 1
-$ goto feloop
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Find current Zlib version number
-$!
-$FIND_VERSION:
-$ open/read h_in 'v_file'
-$hloop:
-$ read/end=hdone h_in rec
-$ rec = f$edit(rec,"TRIM")
-$ if (f$extract(0,1,rec) .nes. "#") then goto hloop
-$ rec = f$edit(rec - "#", "TRIM")
-$ if f$element(0," ",rec) .nes. "define" then goto hloop
-$ if f$element(1," ",rec) .eqs. v_string
-$ then
-$ version = 'f$element(2," ",rec)'
-$ goto hdone
-$ endif
-$ goto hloop
-$hdone:
-$ close h_in
-$ return
-$!------------------------------------------------------------------------------
-$!
-$CHECK_CONFIG:
-$!
-$ in_ldef = f$locate(cdef,libdefs)
-$ if (in_ldef .lt. f$length(libdefs))
-$ then
-$ write aconf "#define ''cdef' 1"
-$ libdefs = f$extract(0,in_ldef,libdefs) + -
- f$extract(in_ldef + f$length(cdef) + 1, -
- f$length(libdefs) - in_ldef - f$length(cdef) - 1, -
- libdefs)
-$ else
-$ if (f$type('cdef') .eqs. "INTEGER")
-$ then
-$ write aconf "#define ''cdef' ", 'cdef'
-$ else
-$ if (f$type('cdef') .eqs. "STRING")
-$ then
-$ write aconf "#define ''cdef' ", """", '''cdef'', """"
-$ else
-$ gosub check_cc_def
-$ endif
-$ endif
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Check if this is a define relating to the properties of the C/C++
-$! compiler
-$!
-$ CHECK_CC_DEF:
-$ if (cdef .eqs. "_LARGEFILE64_SOURCE")
-$ then
-$ copy sys$input: 'tc'
-$ deck
-#include "tconfig"
-#define _LARGEFILE
-#include <stdio.h>
-
-int main(){
-FILE *fp;
- fp = fopen("temp.txt","r");
- fseeko(fp,1,SEEK_SET);
- fclose(fp);
-}
-
-$ eod
-$ test_inv = false
-$ comm_h = false
-$ gosub cc_prop_check
-$ return
-$ endif
-$ write aconf "/* ", line, " */"
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Check for properties of C/C++ compiler
-$!
-$! Version history
-$! 0.01 20031020 First version to receive a number
-$! 0.02 20031022 Added logic for defines with value
-$! 0.03 20040309 Make sure local config file gets not deleted
-$! 0.04 20041230 Also write include for configure run
-$! 0.05 20050103 Add processing of "comment defines"
-$CC_PROP_CHECK:
-$ cc_prop = true
-$ is_need = false
-$ is_need = (f$extract(0,4,cdef) .eqs. "NEED") .or. (test_inv .eq. true)
-$ if f$search(th) .eqs. "" then create 'th'
-$ set message/nofac/noident/nosever/notext
-$ on error then continue
-$ cc 'tmpnam'
-$ if .not. ($status) then cc_prop = false
-$ on error then continue
-$! The headers might lie about the capabilities of the RTL
-$ link 'tmpnam',tmp.opt/opt
-$ if .not. ($status) then cc_prop = false
-$ set message/fac/ident/sever/text
-$ on error then goto err_exit
-$ delete/nolog 'tmpnam'.*;*/exclude='th'
-$ if (cc_prop .and. .not. is_need) .or. -
- (.not. cc_prop .and. is_need)
-$ then
-$ write sys$output "Checking for ''cdef'... yes"
-$ if f$type('cdef_val'_yes) .nes. ""
-$ then
-$ if f$type('cdef_val'_yes) .eqs. "INTEGER" -
- then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_yes)
-$ if f$type('cdef_val'_yes) .eqs. "STRING" -
- then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_yes)
-$ else
-$ call write_config f$fao("#define !AS 1",cdef)
-$ endif
-$ if (cdef .eqs. "HAVE_FSEEKO") .or. (cdef .eqs. "_LARGE_FILES") .or. -
- (cdef .eqs. "_LARGEFILE64_SOURCE") then -
- call write_config f$string("#define _LARGEFILE 1")
-$ else
-$ write sys$output "Checking for ''cdef'... no"
-$ if (comm_h)
-$ then
- call write_config f$fao("/* !AS */",line)
-$ else
-$ if f$type('cdef_val'_no) .nes. ""
-$ then
-$ if f$type('cdef_val'_no) .eqs. "INTEGER" -
- then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_no)
-$ if f$type('cdef_val'_no) .eqs. "STRING" -
- then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_no)
-$ else
-$ call write_config f$fao("#undef !AS",cdef)
-$ endif
-$ endif
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Check for properties of C/C++ compiler with multiple result values
-$!
-$! Version history
-$! 0.01 20040127 First version
-$! 0.02 20050103 Reconcile changes from cc_prop up to version 0.05
-$CC_MPROP_CHECK:
-$ cc_prop = true
-$ i = 1
-$ idel = 1
-$ MT_LOOP:
-$ if f$type(result_'i') .eqs. "STRING"
-$ then
-$ set message/nofac/noident/nosever/notext
-$ on error then continue
-$ cc 'tmpnam'_'i'
-$ if .not. ($status) then cc_prop = false
-$ on error then continue
-$! The headers might lie about the capabilities of the RTL
-$ link 'tmpnam'_'i',tmp.opt/opt
-$ if .not. ($status) then cc_prop = false
-$ set message/fac/ident/sever/text
-$ on error then goto err_exit
-$ delete/nolog 'tmpnam'_'i'.*;*
-$ if (cc_prop)
-$ then
-$ write sys$output "Checking for ''cdef'... ", mdef_'i'
-$ if f$type(mdef_'i') .eqs. "INTEGER" -
- then call write_config f$fao("#define !AS !UL",cdef,mdef_'i')
-$ if f$type('cdef_val'_yes) .eqs. "STRING" -
- then call write_config f$fao("#define !AS !AS",cdef,mdef_'i')
-$ goto msym_clean
-$ else
-$ i = i + 1
-$ goto mt_loop
-$ endif
-$ endif
-$ write sys$output "Checking for ''cdef'... no"
-$ call write_config f$fao("#undef !AS",cdef)
-$ MSYM_CLEAN:
-$ if (idel .le. msym_max)
-$ then
-$ delete/sym mdef_'idel'
-$ idel = idel + 1
-$ goto msym_clean
-$ endif
-$ return
-$!------------------------------------------------------------------------------
-$!
-$! Analyze Object files for OpenVMS AXP to extract Procedure and Data
-$! information to build a symbol vector for a shareable image
-$! All the "brains" of this logic was suggested by Hartmut Becker
-$! (Hartmut.Becker@compaq.com). All the bugs were introduced by me
-$! (zinser@zinser.no-ip.info), so if you do have problem reports please do not
-$! bother Hartmut/HP, but get in touch with me
-$!
-$! Version history
-$! 0.01 20040406 Skip over shareable images in option file
-$! 0.02 20041109 Fix option file for shareable images with case_sensitive=YES
-$! 0.03 20050107 Skip over Identification labels in option file
-$! 0.04 20060117 Add uppercase alias to code compiled with /name=as_is
-$!
-$ ANAL_OBJ_AXP: Subroutine
-$ V = 'F$Verify(0)
-$ SAY := "WRITE_ SYS$OUTPUT"
-$
-$ IF F$SEARCH("''P1'") .EQS. ""
-$ THEN
-$ SAY "ANAL_OBJ_AXP-E-NOSUCHFILE: Error, inputfile ''p1' not available"
-$ goto exit_aa
-$ ENDIF
-$ IF "''P2'" .EQS. ""
-$ THEN
-$ SAY "ANAL_OBJ_AXP: Error, no output file provided"
-$ goto exit_aa
-$ ENDIF
-$
-$ open/read in 'p1
-$ create a.tmp
-$ open/append atmp a.tmp
-$ loop:
-$ read/end=end_loop in line
-$ if f$locate("/SHARE",f$edit(line,"upcase")) .lt. f$length(line)
-$ then
-$ write sys$output "ANAL_SKP_SHR-i-skipshare, ''line'"
-$ goto loop
-$ endif
-$ if f$locate("IDENTIFICATION=",f$edit(line,"upcase")) .lt. f$length(line)
-$ then
-$ write sys$output "ANAL_OBJ_AXP-i-ident: Identification ", -
- f$element(1,"=",line)
-$ goto loop
-$ endif
-$ f= f$search(line)
-$ if f .eqs. ""
-$ then
-$	write sys$output "ANAL_OBJ_AXP-w-nosuchfile, ''line'"
-$	goto loop
-$ endif
-$ define/user sys$output nl:
-$ define/user sys$error nl:
-$ anal/obj/gsd 'f /out=x.tmp
-$ open/read xtmp x.tmp
-$ XLOOP:
-$ read/end=end_xloop xtmp xline
-$ xline = f$edit(xline,"compress")
-$ write atmp xline
-$ goto xloop
-$ END_XLOOP:
-$ close xtmp
-$ goto loop
-$ end_loop:
-$ close in
-$ close atmp
-$ if f$search("a.tmp") .eqs. "" -
-	then $ exit
-$ ! all global definitions
-$ search a.tmp "symbol:","EGSY$V_DEF 1","EGSY$V_NORM 1"/out=b.tmp
-$ ! all procedures
-$ search b.tmp "EGSY$V_NORM 1"/wind=(0,1) /out=c.tmp
-$ search c.tmp "symbol:"/out=d.tmp
-$ define/user sys$output nl:
-$ edito/edt/command=sys$input d.tmp
-sub/symbol: "/symbol_vector=(/whole
-sub/"/=PROCEDURE)/whole
-exit
-$ ! all data
-$ search b.tmp "EGSY$V_DEF 1"/wind=(0,1) /out=e.tmp
-$ search e.tmp "symbol:"/out=f.tmp
-$ define/user sys$output nl:
-$ edito/edt/command=sys$input f.tmp
-sub/symbol: "/symbol_vector=(/whole
-sub/"/=DATA)/whole
-exit
-$ sort/nodupl d.tmp,f.tmp g.tmp
-$ open/read raw_vector g.tmp
-$ open/write case_vector 'p2'
-$ RAWLOOP:
-$ read/end=end_rawloop raw_vector raw_element
-$ write case_vector raw_element
-$ if f$locate("=PROCEDURE)",raw_element) .lt. f$length(raw_element)
-$ then
-$ name = f$element(1,"=",raw_element) - "("
-$ if f$edit(name,"UPCASE") .nes. name then -
- write case_vector f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)", -
-	 f$edit(name,"UPCASE"), name)
-$ endif
-$ if f$locate("=DATA)",raw_element) .lt. f$length(raw_element)
-$ then
-$ name = f$element(1,"=",raw_element) - "("
-$ if f$edit(name,"UPCASE") .nes. name then -
- write case_vector f$fao(" symbol_vector=(!AS/!AS=DATA)", -
-	 f$edit(name,"UPCASE"), name)
-$ endif
-$ goto rawloop
-$ END_RAWLOOP:
-$ close raw_vector
-$ close case_vector
-$ delete a.tmp;*,b.tmp;*,c.tmp;*,d.tmp;*,e.tmp;*,f.tmp;*,g.tmp;*
-$ if f$search("x.tmp") .nes. "" -
-	then $ delete x.tmp;*
-$!
-$ EXIT_AA:
-$ if V then set verify
-$ endsubroutine
-$!------------------------------------------------------------------------------
-$!
-$! Write configuration to both permanent and temporary config file
-$!
-$! Version history
-$! 0.01 20031029 First version to receive a number
-$!
-$WRITE_CONFIG: SUBROUTINE
-$ write aconf 'p1'
-$ open/append confh 'th'
-$ write confh 'p1'
-$ close confh
-$ENDSUBROUTINE
-$!------------------------------------------------------------------------------

smplayer-0.8.0.tar.bz2/zlib-1.2.6/msdos Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/nintendods Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/old Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/old/os2 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/qnx Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/qnx/package.qpg Deleted

@@ -1,141 +0,0 @@
-<QPG:Generation>
- <QPG:Options>
- <QPG:User unattended="no" verbosity="2" listfiles="yes"/>
- <QPG:Defaults type="qnx_package"/>
- <QPG:Source></QPG:Source>
- <QPG:Release number="+"/>
- <QPG:Build></QPG:Build>
- <QPG:FileSorting strip="yes"/>
- <QPG:Package targets="combine"/>
- <QPG:Repository generate="yes"/>
- <QPG:FinalDir></QPG:FinalDir>
- <QPG:Cleanup></QPG:Cleanup>
- </QPG:Options>
-
- <QPG:Responsible>
- <QPG:Company></QPG:Company>
- <QPG:Department></QPG:Department>
- <QPG:Group></QPG:Group>
- <QPG:Team></QPG:Team>
- <QPG:Employee></QPG:Employee>
- <QPG:EmailAddress></QPG:EmailAddress>
- </QPG:Responsible>
-
- <QPG:Values>
- <QPG:Files>
- <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
- <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
- <QPG:Add file="../libz.so.1.2.6" install="/opt/lib/" user="root:bin" permission="644"/>
- <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.6"/>
- <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.6"/>
- <QPG:Add file="../libz.so.1.2.6" install="/opt/lib/" component="slib"/>
- </QPG:Files>
-
- <QPG:PackageFilter>
- <QPM:PackageManifest>
- <QPM:PackageDescription>
- <QPM:PackageType>Library</QPM:PackageType>
- <QPM:PackageReleaseNotes></QPM:PackageReleaseNotes>
- <QPM:PackageReleaseUrgency>Medium</QPM:PackageReleaseUrgency>
- <QPM:PackageRepository></QPM:PackageRepository>
- <QPM:FileVersion>2.0</QPM:FileVersion>
- </QPM:PackageDescription>
-
- <QPM:ProductDescription>
- <QPM:ProductName>zlib</QPM:ProductName>
- <QPM:ProductIdentifier>zlib</QPM:ProductIdentifier>
- <QPM:ProductEmail>alain.bonnefoy@icbt.com</QPM:ProductEmail>
- <QPM:VendorName>Public</QPM:VendorName>
- <QPM:VendorInstallName>public</QPM:VendorInstallName>
- <QPM:VendorURL>www.gzip.org/zlib</QPM:VendorURL>
- <QPM:VendorEmbedURL></QPM:VendorEmbedURL>
- <QPM:VendorEmail></QPM:VendorEmail>
- <QPM:AuthorName>Jean-Loup Gailly,Mark Adler</QPM:AuthorName>
- <QPM:AuthorURL>www.gzip.org/zlib</QPM:AuthorURL>
- <QPM:AuthorEmbedURL></QPM:AuthorEmbedURL>
- <QPM:AuthorEmail>zlib@gzip.org</QPM:AuthorEmail>
- <QPM:ProductIconSmall></QPM:ProductIconSmall>
- <QPM:ProductIconLarge></QPM:ProductIconLarge>
- <QPM:ProductDescriptionShort>A massively spiffy yet delicately unobtrusive compression library.</QPM:ProductDescriptionShort>
- <QPM:ProductDescriptionLong>zlib is designed to be a free, general-purpose, legally unencumbered, lossless data compression library for use on virtually any computer hardware and operating system.</QPM:ProductDescriptionLong>
- <QPM:ProductDescriptionURL>http://www.gzip.org/zlib</QPM:ProductDescriptionURL>
- <QPM:ProductDescriptionEmbedURL></QPM:ProductDescriptionEmbedURL>
- </QPM:ProductDescription>
-
- <QPM:ReleaseDescription>
- <QPM:ReleaseVersion>1.2.6</QPM:ReleaseVersion>
- <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
- <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
- <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
- <QPM:ReleaseNoteMajor></QPM:ReleaseNoteMajor>
- <QPM:ExcludeCountries>
- <QPM:Country></QPM:Country>
- </QPM:ExcludeCountries>
-
- <QPM:ReleaseCopyright>No License</QPM:ReleaseCopyright>
- </QPM:ReleaseDescription>
-
- <QPM:ContentDescription>
- <QPM:ContentTopic xmlmultiple="true">Software Development/Libraries and Extensions/C Libraries</QPM:ContentTopic>
- <QPM:ContentKeyword>zlib,compression</QPM:ContentKeyword>
- <QPM:TargetOS>qnx6</QPM:TargetOS>
- <QPM:HostOS>qnx6</QPM:HostOS>
- <QPM:DisplayEnvironment xmlmultiple="true">None</QPM:DisplayEnvironment>
- <QPM:TargetAudience xmlmultiple="true">Developer</QPM:TargetAudience>
- </QPM:ContentDescription>
- </QPM:PackageManifest>
- </QPG:PackageFilter>
-
- <QPG:PackageFilter proc="none" target="none">
- <QPM:PackageManifest>
- <QPM:ProductInstallationDependencies>
- <QPM:ProductRequirements></QPM:ProductRequirements>
- </QPM:ProductInstallationDependencies>
-
- <QPM:ProductInstallationProcedure>
- <QPM:Script xmlmultiple="true">
- <QPM:ScriptName></QPM:ScriptName>
- <QPM:ScriptType>Install</QPM:ScriptType>
- <QPM:ScriptTiming>Post</QPM:ScriptTiming>
- <QPM:ScriptBlocking>No</QPM:ScriptBlocking>
- <QPM:ScriptResult>Ignore</QPM:ScriptResult>
- <QPM:ShortDescription></QPM:ShortDescription>
- <QPM:UseBinaries>No</QPM:UseBinaries>
- <QPM:Priority>Optional</QPM:Priority>
- </QPM:Script>
- </QPM:ProductInstallationProcedure>
- </QPM:PackageManifest>
-
- <QPM:Launch>
- </QPM:Launch>
- </QPG:PackageFilter>
-
- <QPG:PackageFilter type="core" component="none">
- <QPM:PackageManifest>
- <QPM:ProductInstallationProcedure>
-	 <QPM:OrderDependency xmlmultiple="true">
-	 <QPM:Order>InstallOver</QPM:Order>
-	 <QPM:Product>zlib</QPM:Product>
-	 </QPM:OrderDependency>
- </QPM:ProductInstallationProcedure>
- </QPM:PackageManifest>
-
- <QPM:Launch>
- </QPM:Launch>
- </QPG:PackageFilter>
-
- <QPG:PackageFilter type="core" component="dev">
- <QPM:PackageManifest>
- <QPM:ProductInstallationProcedure>
-	 <QPM:OrderDependency xmlmultiple="true">
-	 <QPM:Order>InstallOver</QPM:Order>
-	 <QPM:Product>zlib-dev</QPM:Product>
-	 </QPM:OrderDependency>
- </QPM:ProductInstallationProcedure>
- </QPM:PackageManifest>
-
- <QPM:Launch>
- </QPM:Launch>
- </QPG:PackageFilter>
- </QPG:Values>
-</QPG:Generation>

smplayer-0.8.0.tar.bz2/zlib-1.2.6/test Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/test/minigzip.c Deleted

@@ -1,631 +0,0 @@
-/* minigzip.c -- simulate gzip using the zlib compression library
- * Copyright (C) 1995-2006, 2010, 2011 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/*
- * minigzip is a minimal implementation of the gzip utility. This is
- * only an example of using zlib and isn't meant to replace the
- * full-featured gzip. No attempt is made to deal with file systems
- * limiting names to 14 or 8+3 characters, etc... Error checking is
- * very limited. So use minigzip only for testing; use gzip for the
- * real thing. On MSDOS, use only on file names without extension
- * or in pipe mode.
- */
-
-/* @(#) $Id$ */
-
-#include "zlib.h"
-#include <stdio.h>
-
-#ifdef STDC
-# include <string.h>
-# include <stdlib.h>
-#endif
-
-#ifdef USE_MMAP
-# include <sys/types.h>
-# include <sys/mman.h>
-# include <sys/stat.h>
-#endif
-
-#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
-# include <fcntl.h>
-# include <io.h>
-# ifdef UNDER_CE
-# include <stdlib.h>
-# endif
-# define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-# define SET_BINARY_MODE(file)
-#endif
-
-#ifdef VMS
-# define unlink delete
-# define GZ_SUFFIX "-gz"
-#endif
-#ifdef RISCOS
-# define unlink remove
-# define GZ_SUFFIX "-gz"
-# define fileno(file) file->__file
-#endif
-#if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-# include <unix.h> /* for fileno */
-#endif
-
-#if !defined(Z_HAVE_UNISTD_H) && !defined(_LARGEFILE64_SOURCE)
-#ifndef WIN32 /* unlink already in stdio.h for WIN32 */
- extern int unlink OF((const char *));
-#endif
-#endif
-
-#if defined(UNDER_CE)
-# include <windows.h>
-# define perror(s) pwinerror(s)
-
-/* Map the Windows error number in ERROR to a locale-dependent error
- message string and return a pointer to it. Typically, the values
- for ERROR come from GetLastError.
-
- The string pointed to shall not be modified by the application,
- but may be overwritten by a subsequent call to strwinerror
-
- The strwinerror function does not change the current setting
- of GetLastError. */
-
-static char *strwinerror (error)
- DWORD error;
-{
- static char buf1024;
-
- wchar_t *msgbuf;
- DWORD lasterr = GetLastError();
- DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
- | FORMAT_MESSAGE_ALLOCATE_BUFFER,
- NULL,
- error,
- 0, /* Default language */
- (LPVOID)&msgbuf,
- 0,
- NULL);
- if (chars != 0) {
- /* If there is an \r\n appended, zap it. */
- if (chars >= 2
- && msgbufchars - 2 == '\r' && msgbufchars - 1 == '\n') {
- chars -= 2;
- msgbufchars = 0;
- }
-
- if (chars > sizeof (buf) - 1) {
- chars = sizeof (buf) - 1;
- msgbufchars = 0;
- }
-
- wcstombs(buf, msgbuf, chars + 1);
- LocalFree(msgbuf);
- }
- else {
- sprintf(buf, "unknown win32 error (%ld)", error);
- }
-
- SetLastError(lasterr);
- return buf;
-}
-
-static void pwinerror (s)
- const char *s;
-{
- if (s && *s)
- fprintf(stderr, "%s: %s\n", s, strwinerror(GetLastError ()));
- else
- fprintf(stderr, "%s\n", strwinerror(GetLastError ()));
-}
-
-#endif /* UNDER_CE */
-
-#ifndef GZ_SUFFIX
-# define GZ_SUFFIX ".gz"
-#endif
-#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
-
-#define BUFLEN 16384
-#define MAX_NAME_LEN 1024
-
-#ifdef MAXSEG_64K
-# define local static
- /* Needed for systems with limitation on stack size. */
-#else
-# define local
-#endif
-
-#ifdef Z_SOLO
-/* for Z_SOLO, create simplified gz* functions using deflate and inflate */
-
-#if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)
-# include <unistd.h> /* for unlink() */
-#endif
-
-void *myalloc OF((void *, unsigned, unsigned));
-void myfree OF((void *, void *));
-
-void *myalloc(q, n, m)
- void *q;
- unsigned n, m;
-{
- q = Z_NULL;
- return calloc(n, m);
-}
-
-void myfree(q, p)
- void *q, *p;
-{
- q = Z_NULL;
- free(p);
-}
-
-typedef struct gzFile_s {
- FILE *file;
- int write;
- int err;
- char *msg;
- z_stream strm;
-} *gzFile;
-
-gzFile gzopen OF((const char *, const char *));
-gzFile gzdopen OF((int, const char *));
-gzFile gz_open OF((const char *, int, const char *));
-
-gzFile gzopen(path, mode)
-const char *path;
-const char *mode;
-{
- return gz_open(path, -1, mode);
-}
-
-gzFile gzdopen(fd, mode)
-int fd;
-const char *mode;
-{
- return gz_open(NULL, fd, mode);
-}
-
-gzFile gz_open(path, fd, mode)
- const char *path;
- int fd;
- const char *mode;
-{
- gzFile gz;
- int ret;
-
- gz = malloc(sizeof(gzFile));
- if (gz == NULL)
- return NULL;
- gz->write = strchr(mode, 'w') != NULL;
- gz->strm.zalloc = myalloc;
- gz->strm.zfree = myfree;
- gz->strm.opaque = Z_NULL;
- if (gz->write)
- ret = deflateInit2(&(gz->strm), -1, 8, 15 + 16, 8, 0);
- else {
- gz->strm.next_in = 0;
- gz->strm.avail_in = Z_NULL;
- ret = inflateInit2(&(gz->strm), 15 + 16);
- }
- if (ret != Z_OK) {
- free(gz);
- return NULL;
- }
- gz->file = path == NULL ? fdopen(fd, gz->write ? "wb" : "rb") :
- fopen(path, gz->write ? "wb" : "rb");
- if (gz->file == NULL) {
- gz->write ? deflateEnd(&(gz->strm)) : inflateEnd(&(gz->strm));
- free(gz);
- return NULL;
- }
- gz->err = 0;
- gz->msg = "";
- return gz;
-}
-
-int gzwrite OF((gzFile, const void *, unsigned));
-
-int gzwrite(gz, buf, len)
- gzFile gz;
- const void *buf;
- unsigned len;
-{
- z_stream *strm;
- unsigned char outBUFLEN;
-
- if (gz == NULL || !gz->write)
- return 0;
- strm = &(gz->strm);
- strm->next_in = (void *)buf;
- strm->avail_in = len;
- do {
- strm->next_out = out;
- strm->avail_out = BUFLEN;
- (void)deflate(strm, Z_NO_FLUSH);
- fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
- } while (strm->avail_out == 0);
- return len;
-}
-
-int gzread OF((gzFile, void *, unsigned));
-
-int gzread(gz, buf, len)
- gzFile gz;
- void *buf;
- unsigned len;
-{
- int ret;
- unsigned got;
- unsigned char in1;
- z_stream *strm;
-
- if (gz == NULL || gz->write)
- return 0;
- if (gz->err)
- return 0;
- strm = &(gz->strm);
- strm->next_out = (void *)buf;
- strm->avail_out = len;
- do {
- got = fread(in, 1, 1, gz->file);
- if (got == 0)
- break;
- strm->next_in = in;
- strm->avail_in = 1;
- ret = inflate(strm, Z_NO_FLUSH);
- if (ret == Z_DATA_ERROR) {
- gz->err = Z_DATA_ERROR;
- gz->msg = strm->msg;
- return 0;
- }
- if (ret == Z_STREAM_END)
- inflateReset(strm);
- } while (strm->avail_out);
- return len - strm->avail_out;
-}
-
-int gzclose OF((gzFile));
-
-int gzclose(gz)
- gzFile gz;
-{
- z_stream *strm;
- unsigned char outBUFLEN;
-
- if (gz == NULL)
- return Z_STREAM_ERROR;
- strm = &(gz->strm);
- if (gz->write) {
- strm->next_in = Z_NULL;
- strm->avail_in = 0;
- do {
- strm->next_out = out;
- strm->avail_out = BUFLEN;
- (void)deflate(strm, Z_FINISH);
- fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
- } while (strm->avail_out == 0);
- deflateEnd(strm);
- }
- else
- inflateEnd(strm);
- fclose(gz->file);
- free(gz);
- return Z_OK;
-}
-
-const char *gzerror OF((gzFile, int *));
-
-const char *gzerror(gz, err)
- gzFile gz;
- int *err;
-{
- *err = gz->err;
- return gz->msg;
-}
-
-#endif
-
-char *prog;
-
-void error OF((const char *msg));
-void gz_compress OF((FILE *in, gzFile out));
-#ifdef USE_MMAP
-int gz_compress_mmap OF((FILE *in, gzFile out));
-#endif
-void gz_uncompress OF((gzFile in, FILE *out));
-void file_compress OF((char *file, char *mode));
-void file_uncompress OF((char *file));
-int main OF((int argc, char *argv));
-
-/* ===========================================================================
- * Display error message and exit
- */
-void error(msg)
- const char *msg;
-{
- fprintf(stderr, "%s: %s\n", prog, msg);
- exit(1);
-}
-
-/* ===========================================================================
- * Compress input to output then close both files.
- */
-
-void gz_compress(in, out)
- FILE *in;
- gzFile out;
-{
- local char bufBUFLEN;
- int len;
- int err;
-
-#ifdef USE_MMAP
- /* Try first compressing with mmap. If mmap fails (minigzip used in a
- * pipe), use the normal fread loop.
- */
- if (gz_compress_mmap(in, out) == Z_OK) return;
-#endif
- for (;;) {
- len = (int)fread(buf, 1, sizeof(buf), in);
- if (ferror(in)) {
- perror("fread");
- exit(1);
- }
- if (len == 0) break;
-
- if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));
- }
- fclose(in);
- if (gzclose(out) != Z_OK) error("failed gzclose");
-}
-
-#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
-
-/* Try compressing the input file at once using mmap. Return Z_OK if
- * if success, Z_ERRNO otherwise.
- */
-int gz_compress_mmap(in, out)
- FILE *in;
- gzFile out;
-{
- int len;
- int err;
- int ifd = fileno(in);
- caddr_t buf; /* mmap'ed buffer for the entire input file */
- off_t buf_len; /* length of the input file */
- struct stat sb;
-
- /* Determine the size of the file, needed for mmap: */
- if (fstat(ifd, &sb) < 0) return Z_ERRNO;
- buf_len = sb.st_size;
- if (buf_len <= 0) return Z_ERRNO;
-
- /* Now do the actual mmap: */
- buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
- if (buf == (caddr_t)(-1)) return Z_ERRNO;
-
- /* Compress the whole file at once: */
- len = gzwrite(out, (char *)buf, (unsigned)buf_len);
-
- if (len != (int)buf_len) error(gzerror(out, &err));
-
- munmap(buf, buf_len);
- fclose(in);
- if (gzclose(out) != Z_OK) error("failed gzclose");
- return Z_OK;
-}
-#endif /* USE_MMAP */
-
-/* ===========================================================================
- * Uncompress input to output then close both files.
- */
-void gz_uncompress(in, out)
- gzFile in;
- FILE *out;
-{
- local char bufBUFLEN;
- int len;
- int err;
-
- for (;;) {
- len = gzread(in, buf, sizeof(buf));
- if (len < 0) error (gzerror(in, &err));
- if (len == 0) break;
-
- if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
- error("failed fwrite");
- }
- }
- if (fclose(out)) error("failed fclose");
-
- if (gzclose(in) != Z_OK) error("failed gzclose");
-}
-
-
-/* ===========================================================================
- * Compress the given file: create a corresponding .gz file and remove the
- * original.
- */
-void file_compress(file, mode)
- char *file;
- char *mode;
-{
- local char outfileMAX_NAME_LEN;
- FILE *in;
- gzFile out;
-
- if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile)) {
- fprintf(stderr, "%s: filename too long\n", prog);
- exit(1);
- }
-
- strcpy(outfile, file);
- strcat(outfile, GZ_SUFFIX);
-
- in = fopen(file, "rb");
- if (in == NULL) {
- perror(file);
- exit(1);
- }
- out = gzopen(outfile, mode);
- if (out == NULL) {
- fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
- exit(1);
- }
- gz_compress(in, out);
-
- unlink(file);
-}
-
-
-/* ===========================================================================
- * Uncompress the given file and remove the original.
- */
-void file_uncompress(file)
- char *file;
-{
- local char bufMAX_NAME_LEN;
- char *infile, *outfile;
- FILE *out;
- gzFile in;
- size_t len = strlen(file);
-
- if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) {
- fprintf(stderr, "%s: filename too long\n", prog);
- exit(1);
- }
-
- strcpy(buf, file);
-
- if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
- infile = file;
- outfile = buf;
- outfilelen-3 = '\0';
- } else {
- outfile = file;
- infile = buf;
- strcat(infile, GZ_SUFFIX);
- }
- in = gzopen(infile, "rb");
- if (in == NULL) {
- fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
- exit(1);
- }
- out = fopen(outfile, "wb");
- if (out == NULL) {
- perror(file);
- exit(1);
- }
-
- gz_uncompress(in, out);
-
- unlink(infile);
-}
-
-
-/* ===========================================================================
- * Usage: minigzip -c -d -f -h -r -1 to -9 files...
- * -c : write to standard output
- * -d : decompress
- * -f : compress with Z_FILTERED
- * -h : compress with Z_HUFFMAN_ONLY
- * -r : compress with Z_RLE
- * -1 to -9 : compression level
- */
-
-int main(argc, argv)
- int argc;
- char *argv;
-{
- int copyout = 0;
- int uncompr = 0;
- gzFile file;
- char *bname, outmode20;
-
- strcpy(outmode, "wb6 ");
-
- prog = argv0;
- bname = strrchr(argv0, '/');
- if (bname)
- bname++;
- else
- bname = argv0;
- argc--, argv++;
-
- if (!strcmp(bname, "gunzip"))
- uncompr = 1;
- else if (!strcmp(bname, "zcat"))
- copyout = uncompr = 1;
-
- while (argc > 0) {
- if (strcmp(*argv, "-c") == 0)
- copyout = 1;
- else if (strcmp(*argv, "-d") == 0)
- uncompr = 1;
- else if (strcmp(*argv, "-f") == 0)
- outmode3 = 'f';
- else if (strcmp(*argv, "-h") == 0)
- outmode3 = 'h';
- else if (strcmp(*argv, "-r") == 0)
- outmode3 = 'R';
- else if ((*argv)0 == '-' && (*argv)1 >= '1' && (*argv)1 <= '9' &&
- (*argv)2 == 0)
- outmode2 = (*argv)1;
- else
- break;
- argc--, argv++;
- }
- if (outmode3 == ' ')
- outmode3 = 0;
- if (argc == 0) {
- SET_BINARY_MODE(stdin);
- SET_BINARY_MODE(stdout);
- if (uncompr) {
- file = gzdopen(fileno(stdin), "rb");
- if (file == NULL) error("can't gzdopen stdin");
- gz_uncompress(file, stdout);
- } else {
- file = gzdopen(fileno(stdout), outmode);
- if (file == NULL) error("can't gzdopen stdout");
- gz_compress(stdin, file);
- }
- } else {
- if (copyout) {
- SET_BINARY_MODE(stdout);
- }
- do {
- if (uncompr) {
- if (copyout) {
- file = gzopen(*argv, "rb");
- if (file == NULL)
- fprintf(stderr, "%s: can't gzopen %s\n", prog, *argv);
- else
- gz_uncompress(file, stdout);
- } else {
- file_uncompress(*argv);
- }
- } else {
- if (copyout) {
- FILE * in = fopen(*argv, "rb");
-
- if (in == NULL) {
- perror(*argv);
- } else {
- file = gzdopen(fileno(stdout), outmode);
- if (file == NULL) error("can't gzdopen stdout");
-
- gz_compress(in, file);
- }
-
- } else {
- file_compress(*argv, outmode);
- }
- }
- } while (argv++, --argc);
- }
- return 0;
-}

smplayer-0.8.0.tar.bz2/zlib-1.2.6/treebuild.xml Deleted

@@ -1,116 +0,0 @@
-<?xml version="1.0" ?>
-<package name="zlib" version="1.2.6">
- <library name="zlib" dlversion="1.2.6" dlname="z">
-	<property name="description"> zip compression library </property>
-	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
-
-	
-	<property name="compiler/c/inline" value="yes" />
-
-	<include-file name="zlib.h" scope="public" mode="644" />
-	<include-file name="zconf.h" scope="public" mode="644" />
-
-	<source name="adler32.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	</source>
-	<source name="compress.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	</source>
-	<source name="crc32.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	 <depend name="crc32.h" />
-	</source>
-	<source name="gzclose.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	 <depend name="gzguts.h" />
-	</source>
-	<source name="gzlib.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	 <depend name="gzguts.h" />
-	</source>
-	<source name="gzread.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	 <depend name="gzguts.h" />
-	</source>
-	<source name="gzwrite.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	 <depend name="gzguts.h" />
-	</source>
-	<source name="uncompr.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	</source>
-	<source name="deflate.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	 <depend name="zutil.h" />
-	 <depend name="deflate.h" />
-	</source>
-	<source name="trees.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	 <depend name="zutil.h" />
-	 <depend name="deflate.h" />
-	 <depend name="trees.h" />
-	</source>
-	<source name="zutil.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	 <depend name="zutil.h" />
-	</source>
-	<source name="inflate.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	 <depend name="zutil.h" />
-	 <depend name="inftrees.h" />
-	 <depend name="inflate.h" />
-	 <depend name="inffast.h" />
-	</source>
-	<source name="infback.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	 <depend name="zutil.h" />
-	 <depend name="inftrees.h" />
-	 <depend name="inflate.h" />
-	 <depend name="inffast.h" />
-	</source>
-	<source name="inftrees.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	 <depend name="zutil.h" />
-	 <depend name="inftrees.h" />
-	</source>
-	<source name="inffast.c">
-	 <depend name="zlib.h" />
-	 <depend name="zconf.h" />
-	 <depend name="zutil.h" />
-	 <depend name="inftrees.h" />
-	 <depend name="inflate.h" />
-	 <depend name="inffast.h" />
-	</source>
- </library>
-</package>
-
-

smplayer-0.8.0.tar.bz2/zlib-1.2.6/watcom Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/win32 Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/win32/Makefile.gcc Deleted

@@ -1,181 +0,0 @@
-# Makefile for zlib, derived from Makefile.dj2.
-# Modified for mingw32 by C. Spieler, 6/16/98.
-# Updated for zlib 1.2.x by Christian Spieler and Cosmin Truta, Mar-2003.
-# Last updated: 1-Aug-2003.
-# Tested under Cygwin and MinGW.
-
-# Copyright (C) 1995-2003 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h
-
-# To compile, or to compile and test, type:
-#
-# make -fmakefile.gcc; make test testdll -fmakefile.gcc
-#
-# To use the asm code, type:
-# cp contrib/asm?86/match.S ./match.S
-# make LOC=-DASMV OBJA=match.o -fmakefile.gcc
-#
-# To install libz.a, zconf.h and zlib.h in the system directories, type:
-#
-# make install -fmakefile.gcc
-
-# Note:
-# If the platform is *not* MinGW (e.g. it is Cygwin or UWIN),
-# the DLL name should be changed from "zlib1.dll".
-
-STATICLIB = libz.a
-SHAREDLIB = zlib1.dll
-IMPLIB = libz.dll.a
-
-#
-# Set to 1 if shared object needs to be installed
-#
-SHARED_MODE=0
-
-#LOC = -DASMV
-#LOC = -DDEBUG -g
-
-PREFIX =
-CC = $(PREFIX)gcc
-CFLAGS = $(LOC) -O3 -Wall
-EXTRA_CFLAGS = -DNO_VIZ
-
-AS = $(CC)
-ASFLAGS = $(LOC) -Wall
-
-LD = $(CC)
-LDFLAGS = $(LOC)
-
-AR = $(PREFIX)ar
-ARFLAGS = rcs
-
-RC = $(PREFIX)windres
-RCFLAGS = --define GCC_WINDRES
-
-STRIP = $(PREFIX)strip
-
-CP = cp -fp
-# If GNU install is available, replace $(CP) with install.
-INSTALL = $(CP)
-#RM = rm -f
-RM = del
-
-prefix ?= /usr/local
-exec_prefix = $(prefix)
-
-OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
- gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
-OBJA =
-
-all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example.exe minigzip.exe example_d.exe minigzip_d.exe
-
-test: example.exe minigzip.exe
-	./example
-	echo hello world | ./minigzip | ./minigzip -d
-
-testdll: example_d.exe minigzip_d.exe
-	./example_d
-	echo hello world | ./minigzip_d | ./minigzip_d -d
-
-.c.o:
-	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-
-.S.o:
-	$(AS) $(ASFLAGS) -c -o $@ $<
-
-$(STATICLIB): $(OBJS) $(OBJA)
-	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
-
-$(IMPLIB): $(SHAREDLIB)
-
-$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
-	$(CC) -shared -Wl,--out-implib,$(IMPLIB) $(LDFLAGS) \
-	-o $@ win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
-	$(STRIP) $@
-
-example.exe: example.o $(STATICLIB)
-	$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
-	$(STRIP) $@
-
-minigzip.exe: minigzip.o $(STATICLIB)
-	$(LD) $(LDFLAGS) -o $@ minigzip.o $(STATICLIB)
-	$(STRIP) $@
-
-example_d.exe: example.o $(IMPLIB)
-	$(LD) $(LDFLAGS) -o $@ example.o $(IMPLIB)
-	$(STRIP) $@
-
-minigzip_d.exe: minigzip.o $(IMPLIB)
-	$(LD) $(LDFLAGS) -o $@ minigzip.o $(IMPLIB)
-	$(STRIP) $@
-
-example.o: test/example.c zlib.h zconf.h
-	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I. -c -o $@ test/example.c
-
-minigzip.o: test/minigzip.c zlib.h zconf.h
-	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I. -c -o $@ test/minigzip.c
-
-zlibrc.o: win32/zlib1.rc
-	$(RC) $(RCFLAGS) -o $@ win32/zlib1.rc
-
-
-# BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set.
-
-.PHONY: install uninstall clean
-
-install: zlib.h zconf.h $(STATICLIB) $(IMPLIB)
-	@if test -z "$(INCLUDE_PATH)" -o -z "$(LIBRARY_PATH)" -o -z "$(BINARY_PATH)"; then \
-		echo INCLUDE_PATH, LIBRARY_PATH, and BINARY_PATH must be specified; \
-		exit 1; \
-	fi
-	-@mkdir -p $(INCLUDE_PATH)
-	-@mkdir -p $(LIBRARY_PATH) $(LIBRARY_PATH)/pkgconfig
-	-if "$(SHARED_MODE)" = "1" ; then \
-		mkdir -p $(BINARY_PATH); \
-		$(INSTALL) $(SHAREDLIB) $(BINARY_PATH); \
-		$(INSTALL) $(IMPLIB) $(LIBRARY_PATH); \
-	fi
-	-$(INSTALL) zlib.h $(INCLUDE_PATH)
-	-$(INSTALL) zconf.h $(INCLUDE_PATH)
-	-$(INSTALL) $(STATICLIB) $(LIBRARY_PATH)
-	sed \
-		-e 's|@prefix@|${prefix}|g' \
-		-e 's|@exec_prefix@|${exec_prefix}|g' \
-		-e 's|@libdir@|$(LIBRARY_PATH)|g' \
-		-e 's|@sharedlibdir@|$(LIBRARY_PATH)|g' \
-		-e 's|@includedir@|$(INCLUDE_PATH)|g' \
-		-e 's|@VERSION@|'`sed -n -e '/VERSION "/s/.*"$.*$".*/\1/p' zlib.h`'|g' \
-		zlib.pc.in > $(LIBRARY_PATH)/pkgconfig/zlib.pc
-
-uninstall:
-	-if "$(SHARED_MODE)" = "1" ; then \
-		$(RM) $(BINARY_PATH)/$(SHAREDLIB); \
-		$(RM) $(LIBRARY_PATH)/$(IMPLIB); \
-	fi
-	-$(RM) $(INCLUDE_PATH)/zlib.h
-	-$(RM) $(INCLUDE_PATH)/zconf.h
-	-$(RM) $(LIBRARY_PATH)/$(STATICLIB)
-
-clean:
-	-$(RM) $(STATICLIB)
-	-$(RM) $(SHAREDLIB)
-	-$(RM) $(IMPLIB)
-	-$(RM) *.o
-	-$(RM) *.exe
-	-$(RM) foo.gz
-
-adler32.o: zlib.h zconf.h
-compress.o: zlib.h zconf.h
-crc32.o: crc32.h zlib.h zconf.h
-deflate.o: deflate.h zutil.h zlib.h zconf.h
-gzclose.o: zlib.h zconf.h gzguts.h
-gzlib.o: zlib.h zconf.h gzguts.h
-gzread.o: zlib.h zconf.h gzguts.h
-gzwrite.o: zlib.h zconf.h gzguts.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
-uncompr.o: zlib.h zconf.h
-zutil.o: zutil.h zlib.h zconf.h

smplayer-0.8.0.tar.bz2/zlib-1.2.6/win32/README-WIN32.txt Deleted

@@ -1,103 +0,0 @@
-ZLIB DATA COMPRESSION LIBRARY
-
-zlib 1.2.4 is a general purpose data compression library. All the code is
-thread safe. The data format used by the zlib library is described by RFCs
-(Request for Comments) 1950 to 1952 in the files
-http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
-and rfc1952.txt (gzip format).
-
-All functions of the compression library are documented in the file zlib.h
-(volunteer to write man pages welcome, contact zlib@gzip.org). Two compiled
-examples are distributed in this package, example and minigzip. The example_d
-and minigzip_d flavors validate that the zlib1.dll file is working correctly.
-
-Questions about zlib should be sent to <zlib@gzip.org>. The zlib home page
-is http://zlib.net/ . Before reporting a problem, please check this site to
-verify that you have the latest version of zlib; otherwise get the latest
-version and check whether the problem still exists or not.
-
-PLEASE read DLL_FAQ.txt, and the the zlib FAQ http://zlib.net/zlib_faq.html
-before asking for help.
-
-
-Manifest:
-
-The package zlib-1.2.4-win32-x86.zip contains the following files:
-
- README-WIN32.txt This document
- ChangeLog Changes since previous zlib packages
- DLL_FAQ.txt Frequently asked questions about zlib1.dll
- zlib.3.pdf Documentation of this library in Adobe Acrobat format
-
- example.exe A statically-bound example (using zlib.lib, not the dll)
- example.pdb Symbolic information for debugging example.exe
-
- example_d.exe A zlib1.dll bound example (using zdll.lib)
- example_d.pdb Symbolic information for debugging example_d.exe
-
- minigzip.exe A statically-bound test program (using zlib.lib, not the dll)
- minigzip.pdb Symbolic information for debugging minigzip.exe
-
- minigzip_d.exe A zlib1.dll bound test program (using zdll.lib)
- minigzip_d.pdb Symbolic information for debugging minigzip_d.exe
-
- zlib.h Install these files into the compilers' INCLUDE path to
- zconf.h compile programs which use zlib.lib or zdll.lib
-
- zdll.lib Install these files into the compilers' LIB path if linking
- zdll.exp a compiled program to the zlib1.dll binary
-
- zlib.lib Install these files into the compilers' LIB path to link zlib
- zlib.pdb into compiled programs, without zlib1.dll runtime dependency
- (zlib.pdb provides debugging info to the compile time linker)
-
- zlib1.dll Install this binary shared library into the system PATH, or
- the program's runtime directory (where the .exe resides)
- zlib1.pdb Install in the same directory as zlib1.dll, in order to debug
- an application crash using WinDbg or similar tools.
-
-All .pdb files above are entirely optional, but are very useful to a developer
-attempting to diagnose program misbehavior or a crash. Many additional
-important files for developers can be found in the zlib124.zip source package
-available from http://zlib.net/ - review that package's README file for details.
-
-
-Acknowledgments:
-
-The deflate format used by zlib was defined by Phil Katz. The deflate and
-zlib specifications were written by L. Peter Deutsch. Thanks to all the
-people who reported problems and suggested various improvements in zlib; they
-are too numerous to cite here.
-
-
-Copyright notice:
-
- (C) 1995-2010 Jean-loup Gailly and Mark Adler
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Jean-loup Gailly Mark Adler
- jloup@gzip.org madler@alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not* receiving
-lengthy legal documents to sign. The sources are provided for free but without
-warranty of any kind. The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include in
-the file ChangeLog history information documenting your changes. Please read
-the FAQ for more information on the distribution of modified source versions.

smplayer-0.8.0.tar.bz2/zlib-1.2.6/win32/zlib.def Deleted

@@ -1,84 +0,0 @@
-; zlib data compression library
-EXPORTS
-; basic functions
-    zlibVersion
-    deflate
-    deflateEnd
-    inflate
-    inflateEnd
-; advanced functions
-    deflateSetDictionary
-    deflateCopy
-    deflateReset
-    deflateParams
-    deflateTune
-    deflateBound
-    deflatePending
-    deflatePrime
-    deflateSetHeader
-    inflateSetDictionary
-    inflateSync
-    inflateCopy
-    inflateReset
-    inflateReset2
-    inflatePrime
-    inflateMark
-    inflateGetHeader
-    inflateBack
-    inflateBackEnd
-    zlibCompileFlags
-; utility functions
-    compress
-    compress2
-    compressBound
-    uncompress
-    gzopen
-    gzdopen
-    gzbuffer
-    gzsetparams
-    gzread
-    gzwrite
-    gzprintf
-    gzputs
-    gzgets
-    gzputc
-    gzgetc
-    gzungetc
-    gzflush
-    gzseek
-    gzrewind
-    gztell
-    gzoffset
-    gzeof
-    gzdirect
-    gzclose
-    gzclose_r
-    gzclose_w
-    gzerror
-    gzclearerr
-; large file functions
-    gzopen64
-    gzseek64
-    gztell64
-    gzoffset64
-    adler32_combine64
-    crc32_combine64
-; checksum functions
-    adler32
-    crc32
-    adler32_combine
-    crc32_combine
-; various hacks, don't look :)
-    deflateInit_
-    deflateInit2_
-    inflateInit_
-    inflateInit2_
-    inflateBackInit_
-    zError
-    inflateSyncPoint
-    get_crc_table
-    inflateUndermine
-    inflateResetKeep
-    deflateResetKeep
-    gzgetc_
-    gzflags

smplayer-0.8.0.tar.bz2/zlib-1.2.6/zconf.h Deleted

@@ -1,466 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2011 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
-# define Z_PREFIX_SET
-
-/* all linked symbols */
-# define _dist_code z__dist_code
-# define _length_code z__length_code
-# define _tr_align z__tr_align
-# define _tr_flush_block z__tr_flush_block
-# define _tr_init z__tr_init
-# define _tr_stored_block z__tr_stored_block
-# define _tr_tally z__tr_tally
-# define adler32 z_adler32
-# define adler32_combine z_adler32_combine
-# define adler32_combine64 z_adler32_combine64
-# ifndef Z_SOLO
-# define compress z_compress
-# define compress2 z_compress2
-# define compressBound z_compressBound
-# endif
-# define crc32 z_crc32
-# define crc32_combine z_crc32_combine
-# define crc32_combine64 z_crc32_combine64
-# define deflate z_deflate
-# define deflateBound z_deflateBound
-# define deflateCopy z_deflateCopy
-# define deflateEnd z_deflateEnd
-# define deflateInit2_ z_deflateInit2_
-# define deflateInit_ z_deflateInit_
-# define deflateParams z_deflateParams
-# define deflatePending z_deflatePending
-# define deflatePrime z_deflatePrime
-# define deflateReset z_deflateReset
-# define deflateResetKeep z_deflateResetKeep
-# define deflateSetDictionary z_deflateSetDictionary
-# define deflateSetHeader z_deflateSetHeader
-# define deflateTune z_deflateTune
-# define deflate_copyright z_deflate_copyright
-# define get_crc_table z_get_crc_table
-# ifndef Z_SOLO
-# define gz_error z_gz_error
-# define gz_intmax z_gz_intmax
-# define gz_strwinerror z_gz_strwinerror
-# define gzbuffer z_gzbuffer
-# define gzclearerr z_gzclearerr
-# define gzclose z_gzclose
-# define gzclose_r z_gzclose_r
-# define gzclose_w z_gzclose_w
-# define gzdirect z_gzdirect
-# define gzdopen z_gzdopen
-# define gzeof z_gzeof
-# define gzerror z_gzerror
-# define gzflags z_gzflags
-# define gzflush z_gzflush
-# define gzgetc z_gzgetc
-# define gzgetc_ z_gzgetc_
-# define gzgets z_gzgets
-# define gzoffset z_gzoffset
-# define gzoffset64 z_gzoffset64
-# define gzopen z_gzopen
-# define gzopen64 z_gzopen64
-# define gzprintf z_gzprintf
-# define gzputc z_gzputc
-# define gzputs z_gzputs
-# define gzread z_gzread
-# define gzrewind z_gzrewind
-# define gzseek z_gzseek
-# define gzseek64 z_gzseek64
-# define gzsetparams z_gzsetparams
-# define gztell z_gztell
-# define gztell64 z_gztell64
-# define gzungetc z_gzungetc
-# define gzwrite z_gzwrite
-# endif
-# define inflate z_inflate
-# define inflateBack z_inflateBack
-# define inflateBackEnd z_inflateBackEnd
-# define inflateBackInit_ z_inflateBackInit_
-# define inflateCopy z_inflateCopy
-# define inflateEnd z_inflateEnd
-# define inflateGetHeader z_inflateGetHeader
-# define inflateInit2_ z_inflateInit2_
-# define inflateInit_ z_inflateInit_
-# define inflateMark z_inflateMark
-# define inflatePrime z_inflatePrime
-# define inflateReset z_inflateReset
-# define inflateReset2 z_inflateReset2
-# define inflateSetDictionary z_inflateSetDictionary
-# define inflateSync z_inflateSync
-# define inflateSyncPoint z_inflateSyncPoint
-# define inflateUndermine z_inflateUndermine
-# define inflateResetKeep z_inflateResetKeep
-# define inflate_copyright z_inflate_copyright
-# define inflate_fast z_inflate_fast
-# define inflate_table z_inflate_table
-# ifndef Z_SOLO
-# define uncompress z_uncompress
-# endif
-# define zError z_zError
-# ifndef Z_SOLO
-# define zcalloc z_zcalloc
-# define zcfree z_zcfree
-# endif
-# define zlibCompileFlags z_zlibCompileFlags
-# define zlibVersion z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-# define Byte z_Byte
-# define Bytef z_Bytef
-# define alloc_func z_alloc_func
-# define charf z_charf
-# define free_func z_free_func
-# ifndef Z_SOLO
-# define gzFile z_gzFile
-# define gz_header z_gz_header
-# define gz_headerp z_gz_headerp
-# endif
-# define in_func z_in_func
-# define intf z_intf
-# define out_func z_out_func
-# define uInt z_uInt
-# define uIntf z_uIntf
-# define uLong z_uLong
-# define uLongf z_uLongf
-# define voidp z_voidp
-# define voidpc z_voidpc
-# define voidpf z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-# ifndef Z_SOLO
-# define gz_header_s z_gz_header_s
-# endif
-# define internal_state z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-# define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-# define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-# define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-# ifndef WIN32
-# define WIN32
-# endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-# ifndef SYS16BIT
-# define SYS16BIT
-# endif
-# endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-# define MAXSEG_64K
-#endif
-#ifdef MSDOS
-# define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-# ifndef STDC
-# define STDC
-# endif
-# if __STDC_VERSION__ >= 199901L
-# ifndef STDC99
-# define STDC99
-# endif
-# endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-# define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-# define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-# define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-# define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
-# define STDC
-#endif
-
-#ifndef STDC
-# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-# define const /* note: need a more gentle solution here */
-# endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-# define z_const const
-#else
-# define z_const
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-# define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-# ifdef MAXSEG_64K
-# define MAX_MEM_LEVEL 8
-# else
-# define MAX_MEM_LEVEL 9
-# endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-# define MAX_WBITS 15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
- (1 << (windowBits+2)) + (1 << (memLevel+9))
- that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
- make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
- The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
- /* Type declarations */
-
-#ifndef OF /* function prototypes */
-# ifdef STDC
-# define OF(args) args
-# else
-# define OF(args) ()
-# endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-# if defined(STDC) || defined(Z_HAVE_STDARG_H)
-# define Z_ARG(args) args
-# else
-# define Z_ARG(args) ()
-# endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-# if defined(M_I86SM) || defined(M_I86MM)
- /* MSC small or medium model */
-# define SMALL_MEDIUM
-# ifdef _MSC_VER
-# define FAR _far
-# else
-# define FAR far
-# endif
-# endif
-# if (defined(__SMALL__) || defined(__MEDIUM__))
- /* Turbo C small or medium model */
-# define SMALL_MEDIUM
-# ifdef __BORLANDC__
-# define FAR _far
-# else
-# define FAR far
-# endif
-# endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
- /* If building or using zlib as a DLL, define ZLIB_DLL.
- * This is not mandatory, but it offers a little performance increase.
- */
-# ifdef ZLIB_DLL
-# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-# ifdef ZLIB_INTERNAL
-# define ZEXTERN extern __declspec(dllexport)
-# else
-# define ZEXTERN extern __declspec(dllimport)
-# endif
-# endif
-# endif /* ZLIB_DLL */
- /* If building or using zlib with the WINAPI/WINAPIV calling convention,
- * define ZLIB_WINAPI.
- * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
- */
-# ifdef ZLIB_WINAPI
-# ifdef FAR
-# undef FAR
-# endif
-# include <windows.h>
- /* No need for _export, use ZLIB.DEF instead. */
- /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-# define ZEXPORT WINAPI
-# ifdef WIN32
-# define ZEXPORTVA WINAPIV
-# else
-# define ZEXPORTVA FAR CDECL
-# endif
-# endif
-#endif
-
-#if defined (__BEOS__)
-# ifdef ZLIB_DLL
-# ifdef ZLIB_INTERNAL
-# define ZEXPORT __declspec(dllexport)
-# define ZEXPORTVA __declspec(dllexport)
-# else
-# define ZEXPORT __declspec(dllimport)
-# define ZEXPORTVA __declspec(dllimport)
-# endif
-# endif
-#endif
-
-#ifndef ZEXTERN
-# define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-# define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-# define ZEXPORTVA
-#endif
-
-#ifndef FAR
-# define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char Byte; /* 8 bits */
-#endif
-typedef unsigned int uInt; /* 16 bits or more */
-typedef unsigned long uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
- /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-# define Bytef Byte FAR
-#else
- typedef Byte FAR Bytef;
-#endif
-typedef char FAR charf;
-typedef int FAR intf;
-typedef uInt FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
- typedef void const *voidpc;
- typedef void FAR *voidpf;
- typedef void *voidp;
-#else
- typedef Byte const *voidpc;
- typedef Byte FAR *voidpf;
- typedef Byte *voidp;
-#endif
-
-#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
-# define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
-# define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-# ifndef Z_SOLO
-# include <sys/types.h> /* for off_t */
-# endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if -_LARGEFILE64_SOURCE - -1 == 1
-# undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-# define Z_LARGE
-#endif
-
-#if (defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)) && !defined(Z_SOLO)
-# include <unistd.h> /* for SEEK_* and off_t */
-# ifdef VMS
-# include <unixio.h> /* for off_t */
-# endif
-# ifndef z_off_t
-# define z_off_t off_t
-# endif
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-# define SEEK_SET 0 /* Seek from beginning of file. */
-# define SEEK_CUR 1 /* Seek from current position. */
-# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-# define z_off_t long
-#endif
-
-#if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0)
-# define z_off64_t off64_t
-#else
-# if defined(_WIN32)
-# define z_off64_t __int64
-# else
-# define z_off64_t z_off_t
-#endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
- #pragma map(deflateInit_,"DEIN")
- #pragma map(deflateInit2_,"DEIN2")
- #pragma map(deflateEnd,"DEEND")
- #pragma map(deflateBound,"DEBND")
- #pragma map(inflateInit_,"ININ")
- #pragma map(inflateInit2_,"ININ2")
- #pragma map(inflateEnd,"INEND")
- #pragma map(inflateSync,"INSY")
- #pragma map(inflateSetDictionary,"INSEDI")
- #pragma map(compressBound,"CMBND")
- #pragma map(inflate_table,"INTABL")
- #pragma map(inflate_fast,"INFA")
- #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */

smplayer-0.8.0.tar.bz2/zlib-1.2.6/zconf.h.cmakein Deleted

@@ -1,468 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2011 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-#cmakedefine Z_PREFIX
-#cmakedefine Z_HAVE_UNISTD_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
-# define Z_PREFIX_SET
-
-/* all linked symbols */
-# define _dist_code z__dist_code
-# define _length_code z__length_code
-# define _tr_align z__tr_align
-# define _tr_flush_block z__tr_flush_block
-# define _tr_init z__tr_init
-# define _tr_stored_block z__tr_stored_block
-# define _tr_tally z__tr_tally
-# define adler32 z_adler32
-# define adler32_combine z_adler32_combine
-# define adler32_combine64 z_adler32_combine64
-# ifndef Z_SOLO
-# define compress z_compress
-# define compress2 z_compress2
-# define compressBound z_compressBound
-# endif
-# define crc32 z_crc32
-# define crc32_combine z_crc32_combine
-# define crc32_combine64 z_crc32_combine64
-# define deflate z_deflate
-# define deflateBound z_deflateBound
-# define deflateCopy z_deflateCopy
-# define deflateEnd z_deflateEnd
-# define deflateInit2_ z_deflateInit2_
-# define deflateInit_ z_deflateInit_
-# define deflateParams z_deflateParams
-# define deflatePending z_deflatePending
-# define deflatePrime z_deflatePrime
-# define deflateReset z_deflateReset
-# define deflateResetKeep z_deflateResetKeep
-# define deflateSetDictionary z_deflateSetDictionary
-# define deflateSetHeader z_deflateSetHeader
-# define deflateTune z_deflateTune
-# define deflate_copyright z_deflate_copyright
-# define get_crc_table z_get_crc_table
-# ifndef Z_SOLO
-# define gz_error z_gz_error
-# define gz_intmax z_gz_intmax
-# define gz_strwinerror z_gz_strwinerror
-# define gzbuffer z_gzbuffer
-# define gzclearerr z_gzclearerr
-# define gzclose z_gzclose
-# define gzclose_r z_gzclose_r
-# define gzclose_w z_gzclose_w
-# define gzdirect z_gzdirect
-# define gzdopen z_gzdopen
-# define gzeof z_gzeof
-# define gzerror z_gzerror
-# define gzflags z_gzflags
-# define gzflush z_gzflush
-# define gzgetc z_gzgetc
-# define gzgetc_ z_gzgetc_
-# define gzgets z_gzgets
-# define gzoffset z_gzoffset
-# define gzoffset64 z_gzoffset64
-# define gzopen z_gzopen
-# define gzopen64 z_gzopen64
-# define gzprintf z_gzprintf
-# define gzputc z_gzputc
-# define gzputs z_gzputs
-# define gzread z_gzread
-# define gzrewind z_gzrewind
-# define gzseek z_gzseek
-# define gzseek64 z_gzseek64
-# define gzsetparams z_gzsetparams
-# define gztell z_gztell
-# define gztell64 z_gztell64
-# define gzungetc z_gzungetc
-# define gzwrite z_gzwrite
-# endif
-# define inflate z_inflate
-# define inflateBack z_inflateBack
-# define inflateBackEnd z_inflateBackEnd
-# define inflateBackInit_ z_inflateBackInit_
-# define inflateCopy z_inflateCopy
-# define inflateEnd z_inflateEnd
-# define inflateGetHeader z_inflateGetHeader
-# define inflateInit2_ z_inflateInit2_
-# define inflateInit_ z_inflateInit_
-# define inflateMark z_inflateMark
-# define inflatePrime z_inflatePrime
-# define inflateReset z_inflateReset
-# define inflateReset2 z_inflateReset2
-# define inflateSetDictionary z_inflateSetDictionary
-# define inflateSync z_inflateSync
-# define inflateSyncPoint z_inflateSyncPoint
-# define inflateUndermine z_inflateUndermine
-# define inflateResetKeep z_inflateResetKeep
-# define inflate_copyright z_inflate_copyright
-# define inflate_fast z_inflate_fast
-# define inflate_table z_inflate_table
-# ifndef Z_SOLO
-# define uncompress z_uncompress
-# endif
-# define zError z_zError
-# ifndef Z_SOLO
-# define zcalloc z_zcalloc
-# define zcfree z_zcfree
-# endif
-# define zlibCompileFlags z_zlibCompileFlags
-# define zlibVersion z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-# define Byte z_Byte
-# define Bytef z_Bytef
-# define alloc_func z_alloc_func
-# define charf z_charf
-# define free_func z_free_func
-# ifndef Z_SOLO
-# define gzFile z_gzFile
-# define gz_header z_gz_header
-# define gz_headerp z_gz_headerp
-# endif
-# define in_func z_in_func
-# define intf z_intf
-# define out_func z_out_func
-# define uInt z_uInt
-# define uIntf z_uIntf
-# define uLong z_uLong
-# define uLongf z_uLongf
-# define voidp z_voidp
-# define voidpc z_voidpc
-# define voidpf z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-# ifndef Z_SOLO
-# define gz_header_s z_gz_header_s
-# endif
-# define internal_state z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-# define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-# define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-# define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-# ifndef WIN32
-# define WIN32
-# endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-# ifndef SYS16BIT
-# define SYS16BIT
-# endif
-# endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-# define MAXSEG_64K
-#endif
-#ifdef MSDOS
-# define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-# ifndef STDC
-# define STDC
-# endif
-# if __STDC_VERSION__ >= 199901L
-# ifndef STDC99
-# define STDC99
-# endif
-# endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-# define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-# define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-# define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-# define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
-# define STDC
-#endif
-
-#ifndef STDC
-# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-# define const /* note: need a more gentle solution here */
-# endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-# define z_const const
-#else
-# define z_const
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-# define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-# ifdef MAXSEG_64K
-# define MAX_MEM_LEVEL 8
-# else
-# define MAX_MEM_LEVEL 9
-# endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-# define MAX_WBITS 15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
- (1 << (windowBits+2)) + (1 << (memLevel+9))
- that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
- make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
- The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
- /* Type declarations */
-
-#ifndef OF /* function prototypes */
-# ifdef STDC
-# define OF(args) args
-# else
-# define OF(args) ()
-# endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-# if defined(STDC) || defined(Z_HAVE_STDARG_H)
-# define Z_ARG(args) args
-# else
-# define Z_ARG(args) ()
-# endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-# if defined(M_I86SM) || defined(M_I86MM)
- /* MSC small or medium model */
-# define SMALL_MEDIUM
-# ifdef _MSC_VER
-# define FAR _far
-# else
-# define FAR far
-# endif
-# endif
-# if (defined(__SMALL__) || defined(__MEDIUM__))
- /* Turbo C small or medium model */
-# define SMALL_MEDIUM
-# ifdef __BORLANDC__
-# define FAR _far
-# else
-# define FAR far
-# endif
-# endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
- /* If building or using zlib as a DLL, define ZLIB_DLL.
- * This is not mandatory, but it offers a little performance increase.
- */
-# ifdef ZLIB_DLL
-# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-# ifdef ZLIB_INTERNAL
-# define ZEXTERN extern __declspec(dllexport)
-# else
-# define ZEXTERN extern __declspec(dllimport)
-# endif
-# endif
-# endif /* ZLIB_DLL */
- /* If building or using zlib with the WINAPI/WINAPIV calling convention,
- * define ZLIB_WINAPI.
- * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
- */
-# ifdef ZLIB_WINAPI
-# ifdef FAR
-# undef FAR
-# endif
-# include <windows.h>
- /* No need for _export, use ZLIB.DEF instead. */
- /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-# define ZEXPORT WINAPI
-# ifdef WIN32
-# define ZEXPORTVA WINAPIV
-# else
-# define ZEXPORTVA FAR CDECL
-# endif
-# endif
-#endif
-
-#if defined (__BEOS__)
-# ifdef ZLIB_DLL
-# ifdef ZLIB_INTERNAL
-# define ZEXPORT __declspec(dllexport)
-# define ZEXPORTVA __declspec(dllexport)
-# else
-# define ZEXPORT __declspec(dllimport)
-# define ZEXPORTVA __declspec(dllimport)
-# endif
-# endif
-#endif
-
-#ifndef ZEXTERN
-# define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-# define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-# define ZEXPORTVA
-#endif
-
-#ifndef FAR
-# define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char Byte; /* 8 bits */
-#endif
-typedef unsigned int uInt; /* 16 bits or more */
-typedef unsigned long uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
- /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-# define Bytef Byte FAR
-#else
- typedef Byte FAR Bytef;
-#endif
-typedef char FAR charf;
-typedef int FAR intf;
-typedef uInt FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
- typedef void const *voidpc;
- typedef void FAR *voidpf;
- typedef void *voidp;
-#else
- typedef Byte const *voidpc;
- typedef Byte FAR *voidpf;
- typedef Byte *voidp;
-#endif
-
-#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
-# define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
-# define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-# ifndef Z_SOLO
-# include <sys/types.h> /* for off_t */
-# endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if -_LARGEFILE64_SOURCE - -1 == 1
-# undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
-# define Z_LARGE
-#endif
-
-#if (defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)) && !defined(Z_SOLO)
-# include <unistd.h> /* for SEEK_* and off_t */
-# ifdef VMS
-# include <unixio.h> /* for off_t */
-# endif
-# ifndef z_off_t
-# define z_off_t off_t
-# endif
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-# define SEEK_SET 0 /* Seek from beginning of file. */
-# define SEEK_CUR 1 /* Seek from current position. */
-# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
-#endif
-
-#ifndef z_off_t
-# define z_off_t long
-#endif
-
-#if !defined(_WIN32) && (defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0)
-# define z_off64_t off64_t
-#else
-# if defined(_WIN32)
-# define z_off64_t __int64
-# else
-# define z_off64_t z_off_t
-#endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
- #pragma map(deflateInit_,"DEIN")
- #pragma map(deflateInit2_,"DEIN2")
- #pragma map(deflateEnd,"DEEND")
- #pragma map(deflateBound,"DEBND")
- #pragma map(inflateInit_,"ININ")
- #pragma map(inflateInit2_,"ININ2")
- #pragma map(inflateEnd,"INEND")
- #pragma map(inflateSync,"INSY")
- #pragma map(inflateSetDictionary,"INSEDI")
- #pragma map(compressBound,"CMBND")
- #pragma map(inflate_table,"INTABL")
- #pragma map(inflate_fast,"INFA")
- #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */

smplayer-0.8.0.tar.bz2/zlib-1.2.6/zconf.h.in Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/zlib.3 Deleted

@@ -1,151 +0,0 @@
-.TH ZLIB 3 "29 Jan 2012"
-.SH NAME
-zlib \- compression/decompression library
-.SH SYNOPSIS
-see
-.I zlib.h
-for full description
-.SH DESCRIPTION
-The
-.I zlib
-library is a general purpose data compression library.
-The code is thread safe, assuming that the standard library functions
-used are thread safe, such as memory allocation routines.
-It provides in-memory compression and decompression functions,
-including integrity checks of the uncompressed data.
-This version of the library supports only one compression method (deflation)
-but other algorithms may be added later
-with the same stream interface.
-.LP
-Compression can be done in a single step if the buffers are large enough
-or can be done by repeated calls of the compression function.
-In the latter case,
-the application must provide more input and/or consume the output
-(providing more output space) before each call.
-.LP
-The library also supports reading and writing files in
-.IR gzip (1)
-(.gz) format
-with an interface similar to that of stdio.
-.LP
-The library does not install any signal handler.
-The decoder checks the consistency of the compressed data,
-so the library should never crash even in the case of corrupted input.
-.LP
-All functions of the compression library are documented in the file
-.IR zlib.h .
-The distribution source includes examples of use of the library
-in the files
-.I test/example.c
-and
-.IR test/minigzip.c,
-as well as other examples in the
-.IR examples/
-directory.
-.LP
-Changes to this version are documented in the file
-.I ChangeLog
-that accompanies the source.
-.LP
-.I zlib
-is available in Java using the java.util.zip package:
-.IP
-http://java.sun.com/developer/technicalArticles/Programming/compression/
-.LP
-A Perl interface to
-.IR zlib ,
-written by Paul Marquess (pmqs@cpan.org),
-is available at CPAN (Comprehensive Perl Archive Network) sites,
-including:
-.IP
-http://search.cpan.org/~pmqs/IO-Compress-Zlib/
-.LP
-A Python interface to
-.IR zlib ,
-written by A.M. Kuchling (amk@magnet.com),
-is available in Python 1.5 and later versions:
-.IP
-http://docs.python.org/library/zlib.html
-.LP
-.I zlib
-is built into
-.IR tcl:
-.IP
-http://wiki.tcl.tk/4610
-.LP
-An experimental package to read and write files in .zip format,
-written on top of
-.I zlib
-by Gilles Vollant (info@winimage.com),
-is available at:
-.IP
-http://www.winimage.com/zLibDll/minizip.html
-and also in the
-.I contrib/minizip
-directory of the main
-.I zlib
-source distribution.
-.SH "SEE ALSO"
-The
-.I zlib
-web site can be found at:
-.IP
-http://zlib.net/
-.LP
-The data format used by the zlib library is described by RFC
-(Request for Comments) 1950 to 1952 in the files:
-.IP
-http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format)
-.br
-http://tools.ietf.org/html/rfc1951 (for the deflate compressed data format)
-.br
-http://tools.ietf.org/html/rfc1952 (for the gzip header and trailer format)
-.LP
-Mark Nelson wrote an article about
-.I zlib
-for the Jan. 1997 issue of  Dr. Dobb's Journal;
-a copy of the article is available at:
-.IP
-http://marknelson.us/1997/01/01/zlib-engine/
-.SH "REPORTING PROBLEMS"
-Before reporting a problem,
-please check the
-.I zlib
-web site to verify that you have the latest version of
-.IR zlib ;
-otherwise,
-obtain the latest version and see if the problem still exists.
-Please read the
-.I zlib
-FAQ at:
-.IP
-http://zlib.net/zlib_faq.html
-.LP
-before asking for help.
-Send questions and/or comments to zlib@gzip.org,
-or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
-.SH AUTHORS
-Version 1.2.6
-Copyright (C) 1995-2012 Jean-loup Gailly (jloup@gzip.org)
-and Mark Adler (madler@alumni.caltech.edu).
-.LP
-This software is provided "as-is,"
-without any express or implied warranty.
-In no event will the authors be held liable for any damages
-arising from the use of this software.
-See the distribution directory with respect to requirements
-governing redistribution.
-The deflate format used by
-.I zlib
-was defined by Phil Katz.
-The deflate and
-.I zlib
-specifications were written by L. Peter Deutsch.
-Thanks to all the people who reported problems and suggested various
-improvements in
-.IR zlib ;
-who are too numerous to cite here.
-.LP
-UNIX manual page by R. P. C. Rodgers,
-U.S. National Library of Medicine (rodgers@nlm.nih.gov).
-.\" end of man page

smplayer-0.8.0.tar.bz2/zlib-1.2.6/zlib.3.pdf Deleted

smplayer-0.8.0.tar.bz2/zlib-1.2.6/zlib.h Deleted

@@ -1,1732 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
- version 1.2.6, January 29th, 2012
-
- Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
-
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
-
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
-
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
-
- Jean-loup Gailly Mark Adler
- jloup@gzip.org madler@alumni.caltech.edu
-
-
- The data format used by the zlib library is described by RFCs (Request for
- Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
- (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.6"
-#define ZLIB_VERNUM 0x1260
-#define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 6
-#define ZLIB_VER_SUBREVISION 0
-
-/*
- The 'zlib' compression library provides in-memory compression and
- decompression functions, including integrity checks of the uncompressed data.
- This version of the library supports only one compression method (deflation)
- but other algorithms will be added later and will have the same stream
- interface.
-
- Compression can be done in a single step if the buffers are large enough,
- or can be done by repeated calls of the compression function. In the latter
- case, the application must provide more input and/or consume the output
- (providing more output space) before each call.
-
- The compressed data format used by default by the in-memory functions is
- the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
- around a deflate stream, which is itself documented in RFC 1951.
-
- The library also supports reading and writing files in gzip (.gz) format
- with an interface similar to that of stdio using the functions that start
- with "gz". The gzip format is different from the zlib format. gzip is a
- gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
- This library can optionally read and write gzip streams in memory as well.
-
- The zlib format was designed to be compact and fast for use in memory
- and on communications channels. The gzip format was designed for single-
- file compression on file systems, has a larger header than zlib to maintain
- directory information, and uses a different, slower check method than zlib.
-
- The library does not install any signal handler. The decoder checks
- the consistency of the compressed data, so the library should never crash
- even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void (*free_func) OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
- z_const Bytef *next_in; /* next input byte */
- uInt avail_in; /* number of bytes available at next_in */
- uLong total_in; /* total number of input bytes read so far */
-
- Bytef *next_out; /* next output byte should be put there */
- uInt avail_out; /* remaining free space at next_out */
- uLong total_out; /* total number of bytes output so far */
-
- z_const char *msg; /* last error message, NULL if no error */
- struct internal_state FAR *state; /* not visible by applications */
-
- alloc_func zalloc; /* used to allocate the internal state */
- free_func zfree; /* used to free the internal state */
- voidpf opaque; /* private data object passed to zalloc and zfree */
-
- int data_type; /* best guess about the data type: binary or text */
- uLong adler; /* adler32 value of the uncompressed data */
- uLong reserved; /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
- gzip header information passed to and from zlib routines. See RFC 1952
- for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
- int text; /* true if compressed data believed to be text */
- uLong time; /* modification time */
- int xflags; /* extra flags (not used when writing a gzip file) */
- int os; /* operating system */
- Bytef *extra; /* pointer to extra field or Z_NULL if none */
- uInt extra_len; /* extra field length (valid if extra != Z_NULL) */
- uInt extra_max; /* space at extra (only when reading header) */
- Bytef *name; /* pointer to zero-terminated file name or Z_NULL */
- uInt name_max; /* space at name (only when reading header) */
- Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */
- uInt comm_max; /* space at comment (only when reading header) */
- int hcrc; /* true if there was or will be a header crc */
- int done; /* true when done reading gzip header (not used
- when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
- The application must update next_in and avail_in when avail_in has dropped
- to zero. It must update next_out and avail_out when avail_out has dropped
- to zero. The application must initialize zalloc, zfree and opaque before
- calling the init function. All other fields are set by the compression
- library and must not be updated by the application.
-
- The opaque value provided by the application will be passed as the first
- parameter for calls of zalloc and zfree. This can be useful for custom
- memory management. The compression library attaches no meaning to the
- opaque value.
-
- zalloc must return Z_NULL if there is not enough memory for the object.
- If zlib is used in a multi-threaded application, zalloc and zfree must be
- thread safe.
-
- On 16-bit systems, the functions zalloc and zfree must be able to allocate
- exactly 65536 bytes, but will not be required to allocate more than this if
- the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, pointers
- returned by zalloc for objects of exactly 65536 bytes *must* have their
- offset normalized to zero. The default allocation function provided by this
- library ensures this (see zutil.c). To reduce memory requirements and avoid
- any allocation of 64K objects, at the expense of compression ratio, compile
- the library with -DMAX_WBITS=14 (see zconf.h).
-
- The fields total_in and total_out can be used for statistics or progress
- reports. After compression, total_in holds the total size of the
- uncompressed data and may be saved for use in the decompressor (particularly
- if the decompressor wants to decompress everything in a single step).
-*/
-
- /* constants */
-
-#define Z_NO_FLUSH 0
-#define Z_PARTIAL_FLUSH 1
-#define Z_SYNC_FLUSH 2
-#define Z_FULL_FLUSH 3
-#define Z_FINISH 4
-#define Z_BLOCK 5
-#define Z_TREES 6
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK 0
-#define Z_STREAM_END 1
-#define Z_NEED_DICT 2
-#define Z_ERRNO (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR (-3)
-#define Z_MEM_ERROR (-4)
-#define Z_BUF_ERROR (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION 0
-#define Z_BEST_SPEED 1
-#define Z_BEST_COMPRESSION 9
-#define Z_DEFAULT_COMPRESSION (-1)
-/* compression levels */
-
-#define Z_FILTERED 1
-#define Z_HUFFMAN_ONLY 2
-#define Z_RLE 3
-#define Z_FIXED 4
-#define Z_DEFAULT_STRATEGY 0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY 0
-#define Z_TEXT 1
-#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN 2
-/* Possible values of the data_type field (though see inflate()) */
-
-#define Z_DEFLATED 8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-
- /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
- If the first character differs, the library code actually used is not
- compatible with the zlib.h header file used by the application. This check
- is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
- Initializes the internal stream state for compression. The fields
- zalloc, zfree and opaque must be initialized before by the caller. If
- zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
- allocation functions.
-
- The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
- 1 gives best speed, 9 gives best compression, 0 gives no compression at all
- (the input data is simply copied a block at a time). Z_DEFAULT_COMPRESSION
- requests a default compromise between speed and compression (currently
- equivalent to level 6).
-
- deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
- memory, Z_STREAM_ERROR if level is not a valid compression level, or
- Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
- with the version assumed by the caller (ZLIB_VERSION). msg is set to null
- if there is no error message. deflateInit does not perform any compression:
- this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
- deflate compresses as much data as possible, and stops when the input
- buffer becomes empty or the output buffer becomes full. It may introduce
- some output latency (reading input without producing any output) except when
- forced to flush.
-
- The detailed semantics are as follows. deflate performs one or both of the
- following actions:
-
- - Compress more input starting at next_in and update next_in and avail_in
- accordingly. If not all input can be processed (because there is not
- enough room in the output buffer), next_in and avail_in are updated and
- processing will resume at this point for the next call of deflate().
-
- - Provide more output starting at next_out and update next_out and avail_out
- accordingly. This action is forced if the parameter flush is non zero.
- Forcing flush frequently degrades the compression ratio, so this parameter
- should be set only when necessary (in interactive applications). Some
- output may be provided even if flush is not set.
-
- Before the call of deflate(), the application should ensure that at least
- one of the actions is possible, by providing more input and/or consuming more
- output, and updating avail_in or avail_out accordingly; avail_out should
- never be zero before the call. The application can consume the compressed
- output when it wants, for example when the output buffer is full (avail_out
- == 0), or after each call of deflate(). If deflate returns Z_OK and with
- zero avail_out, it must be called again after making room in the output
- buffer because there might be more output pending.
-
- Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
- decide how much data to accumulate before producing output, in order to
- maximize compression.
-
- If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
- flushed to the output buffer and the output is aligned on a byte boundary, so
- that the decompressor can get all input data available so far. (In
- particular avail_in is zero after the call if enough output space has been
- provided before the call.) Flushing may degrade compression for some
- compression algorithms and so it should be used only when necessary. This
- completes the current deflate block and follows it with an empty stored block
- that is three bits plus filler bits to the next byte, followed by four bytes
- (00 00 ff ff).
-
- If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
- output buffer, but the output is not aligned to a byte boundary. All of the
- input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
- This completes the current deflate block and follows it with an empty fixed
- codes block that is 10 bits long. This assures that enough bytes are output
- in order for the decompressor to finish the block before the empty fixed code
- block.
-
- If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
- for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
- seven bits of the current block are held to be written as the next byte after
- the next deflate block is completed. In this case, the decompressor may not
- be provided enough bits at this point in order to complete decompression of
- the data provided so far to the compressor. It may need to wait for the next
- block to be emitted. This is for advanced applications that need to control
- the emission of deflate blocks.
-
- If flush is set to Z_FULL_FLUSH, all output is flushed as with
- Z_SYNC_FLUSH, and the compression state is reset so that decompression can
- restart from this point if previous compressed data has been damaged or if
- random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
- compression.
-
- If deflate returns with avail_out == 0, this function must be called again
- with the same value of the flush parameter and more output space (updated
- avail_out), until the flush is complete (deflate returns with non-zero
- avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
- avail_out is greater than six to avoid repeated flush markers due to
- avail_out == 0 on return.
-
- If the parameter flush is set to Z_FINISH, pending input is processed,
- pending output is flushed and deflate returns with Z_STREAM_END if there was
- enough output space; if deflate returns with Z_OK, this function must be
- called again with Z_FINISH and more output space (updated avail_out) but no
- more input data, until it returns with Z_STREAM_END or an error. After
- deflate has returned Z_STREAM_END, the only possible operations on the stream
- are deflateReset or deflateEnd.
-
- Z_FINISH can be used immediately after deflateInit if all the compression
- is to be done in a single step. In this case, avail_out must be at least the
- value returned by deflateBound (see below). Then deflate is guaranteed to
- return Z_STREAM_END. If not enough output space is provided, deflate will
- not return Z_STREAM_END, and it must be called again as described above.
-
- deflate() sets strm->adler to the adler32 checksum of all input read
- so far (that is, total_in bytes).
-
- deflate() may update strm->data_type if it can make a good guess about
- the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
- binary. This field is only for information purposes and does not affect the
- compression algorithm in any manner.
-
- deflate() returns Z_OK if some progress has been made (more input
- processed or more output produced), Z_STREAM_END if all input has been
- consumed and all output has been produced (only when flush is set to
- Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
- if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
- (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
- fatal, and deflate() can be called again with more input and more output
- space to continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
- All dynamically allocated data structures for this stream are freed.
- This function discards any unprocessed input and does not flush any pending
- output.
-
- deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
- stream state was inconsistent, Z_DATA_ERROR if the stream was freed
- prematurely (some input or output was discarded). In the error case, msg
- may be set but then points to a static string (which must not be
- deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
- Initializes the internal stream state for decompression. The fields
- next_in, avail_in, zalloc, zfree and opaque must be initialized before by
- the caller. If next_in is not Z_NULL and avail_in is large enough (the
- exact value depends on the compression method), inflateInit determines the
- compression method from the zlib header and allocates all data structures
- accordingly; otherwise the allocation will be deferred to the first call of
- inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to
- use default allocation functions.
-
- inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
- memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
- version assumed by the caller, or Z_STREAM_ERROR if the parameters are
- invalid, such as a null pointer to the structure. msg is set to null if
- there is no error message. inflateInit does not perform any decompression
- apart from possibly reading the zlib header if present: actual decompression
- will be done by inflate(). (So next_in and avail_in may be modified, but
- next_out and avail_out are unused and unchanged.) The current implementation
- of inflateInit() does not process any header information -- that is deferred
- until inflate() is called.
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
- inflate decompresses as much data as possible, and stops when the input
- buffer becomes empty or the output buffer becomes full. It may introduce
- some output latency (reading input without producing any output) except when
- forced to flush.
-
- The detailed semantics are as follows. inflate performs one or both of the
- following actions:
-
- - Decompress more input starting at next_in and update next_in and avail_in
- accordingly. If not all input can be processed (because there is not
- enough room in the output buffer), next_in is updated and processing will
- resume at this point for the next call of inflate().
-
- - Provide more output starting at next_out and update next_out and avail_out
- accordingly. inflate() provides as much output as possible, until there is
- no more input data or no more space in the output buffer (see below about
- the flush parameter).
-
- Before the call of inflate(), the application should ensure that at least
- one of the actions is possible, by providing more input and/or consuming more
- output, and updating the next_* and avail_* values accordingly. The
- application can consume the uncompressed output when it wants, for example
- when the output buffer is full (avail_out == 0), or after each call of
- inflate(). If inflate returns Z_OK and with zero avail_out, it must be
- called again after making room in the output buffer because there might be
- more output pending.
-
- The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
- Z_BLOCK, or Z_TREES. Z_SYNC_FLUSH requests that inflate() flush as much
- output as possible to the output buffer. Z_BLOCK requests that inflate()
- stop if and when it gets to the next deflate block boundary. When decoding
- the zlib or gzip format, this will cause inflate() to return immediately
- after the header and before the first block. When doing a raw inflate,
- inflate() will go ahead and process the first block, and will return when it
- gets to the end of that block, or when it runs out of data.
-
- The Z_BLOCK option assists in appending to or combining deflate streams.
- Also to assist in this, on return inflate() will set strm->data_type to the
- number of unused bits in the last byte taken from strm->next_in, plus 64 if
- inflate() is currently decoding the last block in the deflate stream, plus
- 128 if inflate() returned immediately after decoding an end-of-block code or
- decoding the complete header up to just before the first byte of the deflate
- stream. The end-of-block will not be indicated until all of the uncompressed
- data from that block has been written to strm->next_out. The number of
- unused bits may in general be greater than seven, except when bit 7 of
- data_type is set, in which case the number of unused bits will be less than
- eight. data_type is set as noted here every time inflate() returns for all
- flush options, and so can be used to determine the amount of currently
- consumed input in bits.
-
- The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
- end of each deflate block header is reached, before any actual data in that
- block is decoded. This allows the caller to determine the length of the
- deflate block header for later use in random access within a deflate block.
- 256 is added to the value of strm->data_type when inflate() returns
- immediately after reaching the end of the deflate block header.
-
- inflate() should normally be called until it returns Z_STREAM_END or an
- error. However if all decompression is to be performed in a single step (a
- single call of inflate), the parameter flush should be set to Z_FINISH. In
- this case all pending input is processed and all pending output is flushed;
- avail_out must be large enough to hold all the uncompressed data. (The size
- of the uncompressed data may have been saved by the compressor for this
- purpose.) The next operation on this stream must be inflateEnd to deallocate
- the decompression state. The use of Z_FINISH is not required to perform an
- inflation in one step. However it may be used to inform inflate that a
- faster approach can be used for the single inflate() call. Z_FINISH also
- informs inflate to not maintain a sliding window if the stream completes,
- which reduces inflate's memory footprint.
-
- In this implementation, inflate() always flushes as much output as
- possible to the output buffer, and always uses the faster approach on the
- first call. So the effects of the flush parameter in this implementation are
- on the return value of inflate() as noted below, when inflate() returns early
- when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
- memory for a sliding window when Z_FINISH is used.
-
- If a preset dictionary is needed after this call (see inflateSetDictionary
- below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
- chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
- strm->adler to the Adler-32 checksum of all output produced so far (that is,
- total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
- below. At the end of the stream, inflate() checks that its computed adler32
- checksum is equal to that saved by the compressor and returns Z_STREAM_END
- only if the checksum is correct.
-
- inflate() can decompress and check either zlib-wrapped or gzip-wrapped
- deflate data. The header type is detected automatically, if requested when
- initializing with inflateInit2(). Any information contained in the gzip
- header is not retained, so applications that need that information should
- instead use raw inflate, see inflateInit2() below, or inflateBack() and
- perform their own processing of the gzip header and trailer. When processing
- gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
- producted so far. The CRC-32 is checked against the gzip trailer.
-
- inflate() returns Z_OK if some progress has been made (more input processed
- or more output produced), Z_STREAM_END if the end of the compressed data has
- been reached and all uncompressed output has been produced, Z_NEED_DICT if a
- preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
- corrupted (input stream not conforming to the zlib format or incorrect check
- value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
- next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
- Z_BUF_ERROR if no progress is possible or if there was not enough room in the
- output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
- inflate() can be called again with more input and more output space to
- continue decompressing. If Z_DATA_ERROR is returned, the application may
- then call inflateSync() to look for a good compression block if a partial
- recovery of the data is desired.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
- All dynamically allocated data structures for this stream are freed.
- This function discards any unprocessed input and does not flush any pending
- output.
-
- inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
- was inconsistent. In the error case, msg may be set but then points to a
- static string (which must not be deallocated).
-*/
-
-
- /* Advanced functions */
-
-/*
- The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
- int level,
- int method,
- int windowBits,
- int memLevel,
- int strategy));
-
- This is another version of deflateInit with more compression options. The
- fields next_in, zalloc, zfree and opaque must be initialized before by the
- caller.
-
- The method parameter is the compression method. It must be Z_DEFLATED in
- this version of the library.
-
- The windowBits parameter is the base two logarithm of the window size
- (the size of the history buffer). It should be in the range 8..15 for this
- version of the library. Larger values of this parameter result in better
- compression at the expense of memory usage. The default value is 15 if
- deflateInit is used instead.
-
- windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
- determines the window size. deflate() will then generate raw deflate data
- with no zlib header or trailer, and will not compute an adler32 check value.
-
- windowBits can also be greater than 15 for optional gzip encoding. Add
- 16 to windowBits to write a simple gzip header and trailer around the
- compressed data instead of a zlib wrapper. The gzip header will have no
- file name, no extra data, no comment, no modification time (set to zero), no
- header crc, and the operating system will be set to 255 (unknown). If a
- gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-
- The memLevel parameter specifies how much memory should be allocated
- for the internal compression state. memLevel=1 uses minimum memory but is
- slow and reduces compression ratio; memLevel=9 uses maximum memory for
- optimal speed. The default value is 8. See zconf.h for total memory usage
- as a function of windowBits and memLevel.
-
- The strategy parameter is used to tune the compression algorithm. Use the
- value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
- filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
- string match), or Z_RLE to limit match distances to one (run-length
- encoding). Filtered data consists mostly of small values with a somewhat
- random distribution. In this case, the compression algorithm is tuned to
- compress them better. The effect of Z_FILTERED is to force more Huffman
- coding and less string matching; it is somewhat intermediate between
- Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as
- fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data. The
- strategy parameter only affects the compression ratio but not the
- correctness of the compressed output even if it is not set appropriately.
- Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
- decoder for special applications.
-
- deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
- memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
- method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
- incompatible with the version assumed by the caller (ZLIB_VERSION). msg is
- set to null if there is no error message. deflateInit2 does not perform any
- compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
- const Bytef *dictionary,
- uInt dictLength));
-/*
- Initializes the compression dictionary from the given byte sequence
- without producing any compressed output. When using the zlib format, this
- function must be called immediately after deflateInit, deflateInit2 or
- deflateReset, and before any call of deflate. When doing raw deflate, this
- function must be called either before any call of deflate, or immediately
- after the completion of a deflate block, i.e. after all input has been
- consumed and all output has been delivered when using any of the flush
- options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH. The
- compressor and decompressor must use exactly the same dictionary (see
- inflateSetDictionary).
-
- The dictionary should consist of strings (byte sequences) that are likely
- to be encountered later in the data to be compressed, with the most commonly
- used strings preferably put towards the end of the dictionary. Using a
- dictionary is most useful when the data to be compressed is short and can be
- predicted with good accuracy; the data can then be compressed better than
- with the default empty dictionary.
-
- Depending on the size of the compression data structures selected by
- deflateInit or deflateInit2, a part of the dictionary may in effect be
- discarded, for example if the dictionary is larger than the window size
- provided in deflateInit or deflateInit2. Thus the strings most likely to be
- useful should be put at the end of the dictionary, not at the front. In
- addition, the current implementation of deflate will use at most the window
- size minus 262 bytes of the provided dictionary.
-
- Upon return of this function, strm->adler is set to the adler32 value
- of the dictionary; the decompressor may later use this value to determine
- which dictionary has been used by the compressor. (The adler32 value
- applies to the whole dictionary even if only a subset of the dictionary is
- actually used by the compressor.) If a raw deflate was requested, then the
- adler32 value is not computed and strm->adler is not set.
-
- deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
- parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is
- inconsistent (for example if deflate has already been called for this stream
- or if not at a block boundary for raw deflate). deflateSetDictionary does
- not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
- z_streamp source));
-/*
- Sets the destination stream as a complete copy of the source stream.
-
- This function can be useful when several compression strategies will be
- tried, for example when there are several ways of pre-processing the input
- data with a filter. The streams that will be discarded should then be freed
- by calling deflateEnd. Note that deflateCopy duplicates the internal
- compression state which can be quite large, so this strategy is slow and can
- consume lots of memory.
-
- deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
- enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
- (such as zalloc being Z_NULL). msg is left unchanged in both source and
- destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
- This function is equivalent to deflateEnd followed by deflateInit,
- but does not free and reallocate all the internal compression state. The
- stream will keep the same compression level and any other attributes that
- may have been set by deflateInit2.
-
- deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
- stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
- int level,
- int strategy));
-/*
- Dynamically update the compression level and compression strategy. The
- interpretation of level and strategy is as in deflateInit2. This can be
- used to switch between compression and straight copy of the input data, or
- to switch to a different kind of input data requiring a different strategy.
- If the compression level is changed, the input available so far is
- compressed with the old level (and may be flushed); the new level will take
- effect only at the next call of deflate().
-
- Before the call of deflateParams, the stream state must be set as for
- a call of deflate(), since the currently available input may have to be
- compressed and flushed. In particular, strm->avail_out must be non-zero.
-
- deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
- stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
- strm->avail_out was zero.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
- int good_length,
- int max_lazy,
- int nice_length,
- int max_chain));
-/*
- Fine tune deflate's internal compression parameters. This should only be
- used by someone who understands the algorithm used by zlib's deflate for
- searching for the best matching string, and even then only by the most
- fanatic optimizer trying to squeeze out the last compressed bit for their
- specific input data. Read the deflate.c source code for the meaning of the
- max_lazy, good_length, nice_length, and max_chain parameters.
-
- deflateTune() can be called after deflateInit() or deflateInit2(), and
- returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
- uLong sourceLen));
-/*
- deflateBound() returns an upper bound on the compressed size after
- deflation of sourceLen bytes. It must be called after deflateInit() or
- deflateInit2(), and after deflateSetHeader(), if used. This would be used
- to allocate an output buffer for deflation in a single pass, and so would be
- called before deflate(). If that first deflate() call is provided the
- sourceLen input bytes, an output buffer allocated to the size returned by
- deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
- to return Z_STREAM_END. Note that it is possible for the compressed size to
- be larger than the value returned by deflateBound() if flush options other
- than Z_FINISH or Z_NO_FLUSH are used.
-*/
-
-ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
- unsigned *pending,
- int *bits));
-/*
- deflatePending() returns the number of bytes and bits of output that have
- been generated, but not yet provided in the available output. The bytes not
- provided would be due to the available output space having being consumed.
- The number of bits of output not provided are between 0 and 7, where they
- await more bits to join them in order to fill out a full byte. If pending
- or bits are Z_NULL, then those values are not set.
-
- deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
- stream state was inconsistent.
- */
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
- int bits,
- int value));
-/*
- deflatePrime() inserts bits in the deflate output stream. The intent
- is that this function is used to start off the deflate output with the bits
- leftover from a previous deflate stream when appending to it. As such, this
- function can only be used for raw deflate, and must be used before the first
- deflate() call after a deflateInit2() or deflateReset(). bits must be less
- than or equal to 16, and that many of the least significant bits of value
- will be inserted in the output.
-
- deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
- room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
- source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
- gz_headerp head));
-/*
- deflateSetHeader() provides gzip header information for when a gzip
- stream is requested by deflateInit2(). deflateSetHeader() may be called
- after deflateInit2() or deflateReset() and before the first call of
- deflate(). The text, time, os, extra field, name, and comment information
- in the provided gz_header structure are written to the gzip header (xflag is
- ignored -- the extra flags are set according to the compression level). The
- caller must assure that, if not Z_NULL, name and comment are terminated with
- a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
- available there. If hcrc is true, a gzip header crc is included. Note that
- the current versions of the command-line version of gzip (up through version
- 1.3.x) do not support header crc's, and will report that it is a "multi-part
- gzip file" and give up.
-
- If deflateSetHeader is not used, the default gzip header has text false,
- the time set to zero, and os set to 255, with no extra, name, or comment
- fields. The gzip header is returned to the default state by deflateReset().
-
- deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
- stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
- int windowBits));
-
- This is another version of inflateInit with an extra parameter. The
- fields next_in, avail_in, zalloc, zfree and opaque must be initialized
- before by the caller.
-
- The windowBits parameter is the base two logarithm of the maximum window
- size (the size of the history buffer). It should be in the range 8..15 for
- this version of the library. The default value is 15 if inflateInit is used
- instead. windowBits must be greater than or equal to the windowBits value
- provided to deflateInit2() while compressing, or it must be equal to 15 if
- deflateInit2() was not used. If a compressed stream with a larger window
- size is given as input, inflate() will return with the error code
- Z_DATA_ERROR instead of trying to allocate a larger window.
-
- windowBits can also be zero to request that inflate use the window size in
- the zlib header of the compressed stream.
-
- windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
- determines the window size. inflate() will then process raw deflate data,
- not looking for a zlib or gzip header, not generating a check value, and not
- looking for any check values for comparison at the end of the stream. This
- is for use with other formats that use the deflate compressed data format
- such as zip. Those formats provide their own check values. If a custom
- format is developed using the raw deflate format for compressed data, it is
- recommended that a check value such as an adler32 or a crc32 be applied to
- the uncompressed data as is done in the zlib, gzip, and zip formats. For
- most applications, the zlib format should be used as is. Note that comments
- above on the use in deflateInit2() applies to the magnitude of windowBits.
-
- windowBits can also be greater than 15 for optional gzip decoding. Add
- 32 to windowBits to enable zlib and gzip decoding with automatic header
- detection, or add 16 to decode only the gzip format (the zlib format will
- return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a
- crc32 instead of an adler32.
-
- inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
- memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
- version assumed by the caller, or Z_STREAM_ERROR if the parameters are
- invalid, such as a null pointer to the structure. msg is set to null if
- there is no error message. inflateInit2 does not perform any decompression
- apart from possibly reading the zlib header if present: actual decompression
- will be done by inflate(). (So next_in and avail_in may be modified, but
- next_out and avail_out are unused and unchanged.) The current implementation
- of inflateInit2() does not process any header information -- that is
- deferred until inflate() is called.
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
- const Bytef *dictionary,
- uInt dictLength));
-/*
- Initializes the decompression dictionary from the given uncompressed byte
- sequence. This function must be called immediately after a call of inflate,
- if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
- can be determined from the adler32 value returned by that call of inflate.
- The compressor and decompressor must use exactly the same dictionary (see
- deflateSetDictionary). For raw inflate, this function can be called at any
- time to set the dictionary. If the provided dictionary is smaller than the
- window and there is already data in the window, then the provided dictionary
- will amend what's there. The application must insure that the dictionary
- that was used for compression is provided.
-
- inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
- parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is
- inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
- expected one (incorrect adler32 value). inflateSetDictionary does not
- perform any decompression: this will be done by subsequent calls of
- inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
- Skips invalid compressed data until a possible full flush point (see above
- for the description of deflate with Z_FULL_FLUSH) can be found, or until all
- available input is skipped. No output is provided.
-
- inflateSync searches for a 00 00 FF FF pattern in the compressed data.
- All full flush points have this pattern, but not all occurences of this
- pattern are full flush points.
-
- inflateSync returns Z_OK if a possible full flush point has been found,
- Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
- has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
- In the success case, the application may save the current current value of
- total_in which indicates where valid compressed data was found. In the
- error case, the application may repeatedly call inflateSync, providing more
- input each time, until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
- z_streamp source));
-/*
- Sets the destination stream as a complete copy of the source stream.
-
- This function can be useful when randomly accessing a large stream. The
- first pass through the stream can periodically record the inflate state,
- allowing restarting inflate at those points when randomly accessing the
- stream.
-
- inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
- enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
- (such as zalloc being Z_NULL). msg is left unchanged in both source and
- destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
- This function is equivalent to inflateEnd followed by inflateInit,
- but does not free and reallocate all the internal decompression state. The
- stream will keep attributes that may have been set by inflateInit2.
-
- inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
- stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
- int windowBits));
-/*
- This function is the same as inflateReset, but it also permits changing
- the wrap and window size requests. The windowBits parameter is interpreted
- the same as it is for inflateInit2.
-
- inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
- stream state was inconsistent (such as zalloc or state being Z_NULL), or if
- the windowBits parameter is invalid.
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
- int bits,
- int value));
-/*
- This function inserts bits in the inflate input stream. The intent is
- that this function is used to start inflating at a bit position in the
- middle of a byte. The provided bits will be used before any bytes are used
- from next_in. This function should only be used with raw inflate, and
- should be used before the first inflate() call after inflateInit2() or
- inflateReset(). bits must be less than or equal to 16, and that many of the
- least significant bits of value will be inserted in the input.
-
- If bits is negative, then the input stream bit buffer is emptied. Then
- inflatePrime() can be called again to put bits in the buffer. This is used
- to clear out bits leftover after feeding inflate a block description prior
- to feeding inflate codes.
-
- inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
- stream state was inconsistent.
-*/
-
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
-/*
- This function returns two values, one in the lower 16 bits of the return
- value, and the other in the remaining upper bits, obtained by shifting the
- return value down 16 bits. If the upper value is -1 and the lower value is
- zero, then inflate() is currently decoding information outside of a block.
- If the upper value is -1 and the lower value is non-zero, then inflate is in
- the middle of a stored block, with the lower value equaling the number of
- bytes from the input remaining to copy. If the upper value is not -1, then
- it is the number of bits back from the current bit position in the input of
- the code (literal or length/distance pair) currently being processed. In
- that case the lower value is the number of bytes already emitted for that
- code.
-
- A code is being processed if inflate is waiting for more input to complete
- decoding of the code, or if it has completed decoding but is waiting for
- more output space to write the literal or match data.
-
- inflateMark() is used to mark locations in the input data for random
- access, which may be at bit positions, and to note those cases where the
- output of a code may span boundaries of random access blocks. The current
- location in the input stream can be determined from avail_in and data_type
- as noted in the description for the Z_BLOCK flush parameter for inflate.
-
- inflateMark returns the value noted above or -1 << 16 if the provided
- source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
- gz_headerp head));
-/*
- inflateGetHeader() requests that gzip header information be stored in the
- provided gz_header structure. inflateGetHeader() may be called after
- inflateInit2() or inflateReset(), and before the first call of inflate().
- As inflate() processes the gzip stream, head->done is zero until the header
- is completed, at which time head->done is set to one. If a zlib stream is
- being decoded, then head->done is set to -1 to indicate that there will be
- no gzip header information forthcoming. Note that Z_BLOCK or Z_TREES can be
- used to force inflate() to return immediately after header processing is
- complete and before any actual data is decompressed.
-
- The text, time, xflags, and os fields are filled in with the gzip header
- contents. hcrc is set to true if there is a header CRC. (The header CRC
- was valid if done is set to one.) If extra is not Z_NULL, then extra_max
- contains the maximum number of bytes to write to extra. Once done is true,
- extra_len contains the actual extra field length, and extra contains the
- extra field, or that field truncated if extra_max is less than extra_len.
- If name is not Z_NULL, then up to name_max characters are written there,
- terminated with a zero unless the length is greater than name_max. If
- comment is not Z_NULL, then up to comm_max characters are written there,
- terminated with a zero unless the length is greater than comm_max. When any
- of extra, name, or comment are not Z_NULL and the respective field is not
- present in the header, then that field is set to Z_NULL to signal its
- absence. This allows the use of deflateSetHeader() with the returned
- structure to duplicate the header. However if those fields are set to
- allocated memory, then the application will need to save those pointers
- elsewhere so that they can be eventually freed.
-
- If inflateGetHeader is not used, then the header information is simply
- discarded. The header is always checked for validity, including the header
- CRC if present. inflateReset() will reset the process to discard the header
- information. The application would need to call inflateGetHeader() again to
- retrieve the header from the next gzip stream.
-
- inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
- stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
- unsigned char FAR *window));
-
- Initialize the internal stream state for decompression using inflateBack()
- calls. The fields zalloc, zfree and opaque in strm must be initialized
- before the call. If zalloc and zfree are Z_NULL, then the default library-
- derived memory allocation routines are used. windowBits is the base two
- logarithm of the window size, in the range 8..15. window is a caller
- supplied buffer of that size. Except for special applications where it is
- assured that deflate was used with small window sizes, windowBits must be 15
- and a 32K byte window must be supplied to be able to decompress general
- deflate streams.
-
- See inflateBack() for the usage of these routines.
-
- inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
- the parameters are invalid, Z_MEM_ERROR if the internal state could not be
- allocated, or Z_VERSION_ERROR if the version of the library does not match
- the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
- in_func in, void FAR *in_desc,
- out_func out, void FAR *out_desc));
-/*
- inflateBack() does a raw inflate with a single call using a call-back
- interface for input and output. This is more efficient than inflate() for
- file i/o applications in that it avoids copying between the output and the
- sliding window by simply making the window itself the output buffer. This
- function trusts the application to not change the output buffer passed by
- the output function, at least until inflateBack() returns.
-
- inflateBackInit() must be called first to allocate the internal state
- and to initialize the state with the user-provided window buffer.
- inflateBack() may then be used multiple times to inflate a complete, raw
- deflate stream with each call. inflateBackEnd() is then called to free the
- allocated state.
-
- A raw deflate stream is one with no zlib or gzip header or trailer.
- This routine would normally be used in a utility that reads zip or gzip
- files and writes out uncompressed files. The utility would decode the
- header and process the trailer on its own, hence this routine expects only
- the raw deflate stream to decompress. This is different from the normal
- behavior of inflate(), which expects either a zlib or gzip header and
- trailer around the deflate stream.
-
- inflateBack() uses two subroutines supplied by the caller that are then
- called by inflateBack() for input and output. inflateBack() calls those
- routines until it reads a complete deflate stream and writes out all of the
- uncompressed data, or until it encounters an error. The function's
- parameters and return types are defined above in the in_func and out_func
- typedefs. inflateBack() will call in(in_desc, &buf) which should return the
- number of bytes of provided input, and a pointer to that input in buf. If
- there is no input available, in() must return zero--buf is ignored in that
- case--and inflateBack() will return a buffer error. inflateBack() will call
- out(out_desc, buf, len) to write the uncompressed data buf0..len-1. out()
- should return zero on success, or non-zero on failure. If out() returns
- non-zero, inflateBack() will return with an error. Neither in() nor out()
- are permitted to change the contents of the window provided to
- inflateBackInit(), which is also the buffer that out() uses to write from.
- The length written by out() will be at most the window size. Any non-zero
- amount of input may be provided by in().
-
- For convenience, inflateBack() can be provided input on the first call by
- setting strm->next_in and strm->avail_in. If that input is exhausted, then
- in() will be called. Therefore strm->next_in must be initialized before
- calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called
- immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in
- must also be initialized, and then if strm->avail_in is not zero, input will
- initially be taken from strm->next_in0 .. strm->avail_in - 1.
-
- The in_desc and out_desc parameters of inflateBack() is passed as the
- first parameter of in() and out() respectively when they are called. These
- descriptors can be optionally used to pass any information that the caller-
- supplied in() and out() functions need to do their job.
-
- On return, inflateBack() will set strm->next_in and strm->avail_in to
- pass back any unused input that was provided by the last in() call. The
- return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
- if in() or out() returned an error, Z_DATA_ERROR if there was a format error
- in the deflate stream (in which case strm->msg is set to indicate the nature
- of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
- In the case of Z_BUF_ERROR, an input or output error can be distinguished
- using strm->next_in which will be Z_NULL only if in() returned an error. If
- strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
- non-zero. (in() will always be called before out(), so strm->next_in is
- assured to be defined if out() returns non-zero.) Note that inflateBack()
- cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
- All memory allocated by inflateBackInit() is freed.
-
- inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
- state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
- Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
- 1.0: size of uInt
- 3.2: size of uLong
- 5.4: size of voidpf (pointer)
- 7.6: size of z_off_t
-
- Compiler, assembler, and debug options:
- 8: DEBUG
- 9: ASMV or ASMINF -- use ASM code
- 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
- 11: 0 (reserved)
-
- One-time table building (smaller code, but not thread-safe if true):
- 12: BUILDFIXED -- build static block decoding tables when needed
- 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
- 14,15: 0 (reserved)
-
- Library content (indicates missing functionality):
- 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
- deflate code when not needed)
- 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
- and decode gzip streams (to avoid linking crc code)
- 18-19: 0 (reserved)
-
- Operation variations (changes in library functionality):
- 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
- 21: FASTEST -- deflate algorithm with only one, lowest compression level
- 22,23: 0 (reserved)
-
- The sprintf variant used by gzprintf (zero is best):
- 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
- 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
- 26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
- Remainder:
- 27-31: 0 (reserved)
- */
-
-#ifndef Z_SOLO
-
- /* utility functions */
-
-/*
- The following utility functions are implemented on top of the basic
- stream-oriented functions. To simplify the interface, some default options
- are assumed (compression level and memory usage, standard memory allocation
- functions). The source code of these utility functions can be modified if
- you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen,
- const Bytef *source, uLong sourceLen));
-/*
- Compresses the source buffer into the destination buffer. sourceLen is
- the byte length of the source buffer. Upon entry, destLen is the total size
- of the destination buffer, which must be at least the value returned by
- compressBound(sourceLen). Upon exit, destLen is the actual size of the
- compressed buffer.
-
- compress returns Z_OK if success, Z_MEM_ERROR if there was not
- enough memory, Z_BUF_ERROR if there was not enough room in the output
- buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen,
- const Bytef *source, uLong sourceLen,
- int level));
-/*
- Compresses the source buffer into the destination buffer. The level
- parameter has the same meaning as in deflateInit. sourceLen is the byte
- length of the source buffer. Upon entry, destLen is the total size of the
- destination buffer, which must be at least the value returned by
- compressBound(sourceLen). Upon exit, destLen is the actual size of the
- compressed buffer.
-
- compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
- memory, Z_BUF_ERROR if there was not enough room in the output buffer,
- Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
- compressBound() returns an upper bound on the compressed size after
- compress() or compress2() on sourceLen bytes. It would be used before a
- compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen,
- const Bytef *source, uLong sourceLen));
-/*
- Decompresses the source buffer into the destination buffer. sourceLen is
- the byte length of the source buffer. Upon entry, destLen is the total size
- of the destination buffer, which must be large enough to hold the entire
- uncompressed data. (The size of the uncompressed data must have been saved
- previously by the compressor and transmitted to the decompressor by some
- mechanism outside the scope of this compression library.) Upon exit, destLen
- is the actual size of the uncompressed buffer.
-
- uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
- enough memory, Z_BUF_ERROR if there was not enough room in the output
- buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. In
- the case where there is not enough room, uncompress() will fill the output
- buffer with the uncompressed data up to that point.
-*/
-
- /* gzip file access functions */
-
-/*
- This library supports reading and writing files in gzip (.gz) format with
- an interface similar to that of stdio, using the functions that start with
- "gz". The gzip format is different from the zlib format. gzip is a gzip
- wrapper, documented in RFC 1952, wrapped around a deflate stream.
-*/
-
-typedef struct gzFile_s *gzFile; /* semi-opaque gzip file descriptor */
-
-/*
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
-
- Opens a gzip (.gz) file for reading or writing. The mode parameter is as
- in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
- a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
- compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
- for fixed code compression as in "wb9F". (See the description of
- deflateInit2 for more information about the strategy parameter.) 'T' will
- request transparent writing or appending with no compression and not using
- the gzip format.
-
- "a" can be used instead of "w" to request that the gzip stream that will
- be written be appended to the file. "+" will result in an error, since
- reading and writing to the same gzip file is not supported.
-
- These functions, as well as gzip, will read and decode a sequence of gzip
- streams in a file. The append function of gzopen() can be used to create
- such a file. (Also see gzflush() for another way to do this.) When
- appending, gzopen does not test whether the file begins with a gzip stream,
- nor does it look for the end of the gzip streams to begin appending. gzopen
- will simply append a gzip stream to the existing file.
-
- gzopen can be used to read a file which is not in gzip format; in this
- case gzread will directly read from the file without decompression. When
- reading, this will be detected automatically by looking for the magic two-
- byte gzip header.
-
- gzopen returns NULL if the file could not be opened, if there was
- insufficient memory to allocate the gzFile state, or if an invalid mode was
- specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
- errno can be checked to determine if the reason gzopen failed was that the
- file could not be opened.
-*/
-
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
-/*
- gzdopen associates a gzFile with the file descriptor fd. File descriptors
- are obtained from calls like open, dup, creat, pipe or fileno (if the file
- has been previously opened with fopen). The mode parameter is as in gzopen.
-
- The next call of gzclose on the returned gzFile will also close the file
- descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
- fd. If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
- mode);. The duplicated descriptor should be saved to avoid a leak, since
- gzdopen does not close fd if it fails. If you are using fileno() to get the
- file descriptor from a FILE *, then you will have to use dup() to avoid
- double-close()ing the file descriptor. Both gzclose() and fclose() will
- close the associated file descriptor, so they need to have different file
- descriptors.
-
- gzdopen returns NULL if there was insufficient memory to allocate the
- gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
- provided, or '+' was provided), or if fd is -1. The file descriptor is not
- used until the next gz* read, write, seek, or close operation, so gzdopen
- will not detect if fd is invalid (unless fd is -1).
-*/
-
-ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
-/*
- Set the internal buffer size used by this library's functions. The
- default buffer size is 8192 bytes. This function must be called after
- gzopen() or gzdopen(), and before any other calls that read or write the
- file. The buffer memory allocation is always deferred to the first read or
- write. Two buffers are allocated, either both of the specified size when
- writing, or one of the specified size and the other twice that size when
- reading. A larger buffer size of, for example, 64K or 128K bytes will
- noticeably increase the speed of decompression (reading).
-
- The new buffer size also affects the maximum length for gzprintf().
-
- gzbuffer() returns 0 on success, or -1 on failure, such as being called
- too late.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
- Dynamically update the compression level or strategy. See the description
- of deflateInit2 for the meaning of these parameters.
-
- gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
- opened for writing.
-*/
-
-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
-/*
- Reads the given number of uncompressed bytes from the compressed file. If
- the input file is not in gzip format, gzread copies the given number of
- bytes into the buffer directly from the file.
-
- After reaching the end of a gzip stream in the input, gzread will continue
- to read, looking for another gzip stream. Any number of gzip streams may be
- concatenated in the input file, and will all be decompressed by gzread().
- If something other than a gzip stream is encountered after a gzip stream,
- that remaining trailing garbage is ignored (and no error is returned).
-
- gzread can be used to read a gzip file that is being concurrently written.
- Upon reaching the end of the input, gzread will return with the available
- data. If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
- gzclearerr can be used to clear the end of file indicator in order to permit
- gzread to be tried again. Z_OK indicates that a gzip stream was completed
- on the last gzread. Z_BUF_ERROR indicates that the input file ended in the
- middle of a gzip stream. Note that gzread does not return -1 in the event
- of an incomplete gzip stream. This error is deferred until gzclose(), which
- will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
- stream. Alternatively, gzerror can be used before gzclose to detect this
- case.
-
- gzread returns the number of uncompressed bytes actually read, less than
- len for end of file, or -1 for error.
-*/
-
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
- voidpc buf, unsigned len));
-/*
- Writes the given number of uncompressed bytes into the compressed file.
- gzwrite returns the number of uncompressed bytes written or 0 in case of
- error.
-*/
-
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
-/*
- Converts, formats, and writes the arguments to the compressed file under
- control of the format string, as in fprintf. gzprintf returns the number of
- uncompressed bytes actually written, or 0 in case of error. The number of
- uncompressed bytes written is limited to 8191, or one less than the buffer
- size given to gzbuffer(). The caller should assure that this limit is not
- exceeded. If it is exceeded, then gzprintf() will return an error (0) with
- nothing written. In this case, there may also be a buffer overflow with
- unpredictable consequences, which is possible only if zlib was compiled with
- the insecure functions sprintf() or vsprintf() because the secure snprintf()
- or vsnprintf() functions were not available. This can be determined using
- zlibCompileFlags().
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
- Writes the given null-terminated string to the compressed file, excluding
- the terminating null character.
-
- gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
- Reads bytes from the compressed file until len-1 characters are read, or a
- newline character is read and transferred to buf, or an end-of-file
- condition is encountered. If any characters are read or if len == 1, the
- string is terminated with a null character. If no characters are read due
- to an end-of-file or len < 1, then the buffer is left untouched.
-
- gzgets returns buf which is a null-terminated string, or it returns NULL
- for end-of-file or in case of error. If there was an error, the contents at
- buf are indeterminate.
-*/
-
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
-/*
- Writes c, converted to an unsigned char, into the compressed file. gzputc
- returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
-/*
- Reads one byte from the compressed file. gzgetc returns this byte or -1
- in case of end of file or error. This is implemented as a macro for speed.
- As such, it does not do all of the checking the other functions do. I.e.
- it does not check to see if file is NULL, nor whether the structure file
- points to has been clobbered or not.
-*/
-
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
-/*
- Push one character back onto the stream to be read as the first character
- on the next read. At least one character of push-back is allowed.
- gzungetc() returns the character pushed, or -1 on failure. gzungetc() will
- fail if c is -1, and may fail if a character has been pushed but not read
- yet. If gzungetc is used immediately after gzopen or gzdopen, at least the
- output buffer size of pushed characters is allowed. (See gzbuffer above.)
- The pushed character will be discarded if the stream is repositioned with
- gzseek() or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
-/*
- Flushes all pending output into the compressed file. The parameter flush
- is as in the deflate() function. The return value is the zlib error number
- (see function gzerror below). gzflush is only permitted when writing.
-
- If the flush parameter is Z_FINISH, the remaining data is written and the
- gzip stream is completed in the output. If gzwrite() is called again, a new
- gzip stream will be started in the output. gzread() is able to read such
- concatented gzip streams.
-
- gzflush should be called only when strictly necessary because it will
- degrade compression if called too often.
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
- z_off_t offset, int whence));
-
- Sets the starting position for the next gzread or gzwrite on the given
- compressed file. The offset represents a number of bytes in the
- uncompressed data stream. The whence parameter is defined as in lseek(2);
- the value SEEK_END is not supported.
-
- If the file is opened for reading, this function is emulated but can be
- extremely slow. If the file is opened for writing, only forward seeks are
- supported; gzseek then compresses a sequence of zeroes up to the new
- starting position.
-
- gzseek returns the resulting offset location as measured in bytes from
- the beginning of the uncompressed stream, or -1 in case of error, in
- particular if the file is opened for writing and the new starting position
- would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT gzrewind OF((gzFile file));
-/*
- Rewinds the given file. This function is supported only for reading.
-
- gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file));
-
- Returns the starting position for the next gzread or gzwrite on the given
- compressed file. This position represents a number of bytes in the
- uncompressed data stream, and is zero when starting, even if appending or
- reading a gzip stream from the middle of a file using gzdopen().
-
- gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
-
- Returns the current offset in the file being read or written. This offset
- includes the count of bytes that precede the gzip stream, for example when
- appending or when using gzdopen() for reading. When reading, the offset
- does not include as yet unused buffered input. This information can be used
- for a progress indicator. On error, gzoffset() returns -1.
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
- Returns true (1) if the end-of-file indicator has been set while reading,
- false (0) otherwise. Note that the end-of-file indicator is set only if the
- read tried to go past the end of the input, but came up short. Therefore,
- just like feof(), gzeof() may return false even if there is no more data to
- read, in the event that the last read request was for the exact number of
- bytes remaining in the input file. This will happen if the input file size
- is an exact multiple of the buffer size.
-
- If gzeof() returns true, then the read functions will return no more data,
- unless the end-of-file indicator is reset by gzclearerr() and the input file
- has grown since the previous end of file was detected.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
- Returns true (1) if file is being copied directly while reading, or false
- (0) if file is a gzip stream being decompressed.
-
- If the input file is empty, gzdirect() will return true, since the input
- does not contain a gzip stream.
-
- If gzdirect() is used immediately after gzopen() or gzdopen() it will
- cause buffers to be allocated to allow reading the file to determine if it
- is a gzip file. Therefore if gzbuffer() is used, it should be called before
- gzdirect().
-
- When writing, gzdirect() returns true (1) if transparent writing was
- requested ("wT" for the gzopen() mode), or false (0) otherwise. (Note:
- gzdirect() is not needed when writing. Transparent writing must be
- explicitly requested, so the application already knows the answer. When
- linking statically, using gzdirect() will include all of the zlib code for
- gzip file reading and decompression, which may not be desired.)
-*/
-
-ZEXTERN int ZEXPORT gzclose OF((gzFile file));
-/*
- Flushes all pending output if necessary, closes the compressed file and
- deallocates the (de)compression state. Note that once file is closed, you
- cannot call gzerror with file, since its structures have been deallocated.
- gzclose must not be called more than once on the same file, just as free
- must not be called more than once on the same allocation.
-
- gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
- file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
- last read ended in the middle of a gzip stream, or Z_OK on success.
-*/
-
-ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
-ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
-/*
- Same as gzclose(), but gzclose_r() is only for use when reading, and
- gzclose_w() is only for use when writing or appending. The advantage to
- using these instead of gzclose() is that they avoid linking in zlib
- compression or decompression code that is not used when only reading or only
- writing respectively. If gzclose() is used, then both compression and
- decompression code will be included the application when linking to a static
- zlib library.
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
- Returns the error message for the last error which occurred on the given
- compressed file. errnum is set to zlib error number. If an error occurred
- in the file system and not in the compression library, errnum is set to
- Z_ERRNO and the application may consult errno to get the exact error code.
-
- The application must not modify the returned string. Future calls to
- this function may invalidate the previously returned string. If file is
- closed, then the string previously returned by gzerror will no longer be
- available.
-
- gzerror() should be used to distinguish errors from end-of-file for those
- functions above that do not distinguish those cases in their return values.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
- Clears the error and end-of-file flags for file. This is analogous to the
- clearerr() function in stdio. This is useful for continuing to read a gzip
- file that is being written concurrently.
-*/
-
-#endif /* !Z_SOLO */
-
- /* checksum functions */
-
-/*
- These functions are not related to compression but are exported
- anyway because they might be useful in applications using the compression
- library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
- Update a running Adler-32 checksum with the bytes buf0..len-1 and
- return the updated checksum. If buf is Z_NULL, this function returns the
- required initial value for the checksum.
-
- An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
- much faster.
-
- Usage example:
-
- uLong adler = adler32(0L, Z_NULL, 0);
-
- while (read_buffer(buffer, length) != EOF) {
- adler = adler32(adler, buffer, length);
- }
- if (adler != original_adler) error();
-*/
-
-/*
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
- z_off_t len2));
-
- Combine two Adler-32 checksums into one. For two sequences of bytes, seq1
- and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
- each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of
- seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. Note
- that the z_off_t type (like off_t) is a signed integer. If len2 is
- negative, the result has no meaning or utility.
-*/
-
-ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
-/*
- Update a running CRC-32 with the bytes buf0..len-1 and return the
- updated CRC-32. If buf is Z_NULL, this function returns the required
- initial value for the for the crc. Pre- and post-conditioning (one's
- complement) is performed within this function so it shouldn't be done by the
- application.
-
- Usage example:
-
- uLong crc = crc32(0L, Z_NULL, 0);
-
- while (read_buffer(buffer, length) != EOF) {
- crc = crc32(crc, buffer, length);
- }
- if (crc != original_crc) error();
-*/
-
-/*
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
- Combine two CRC-32 check values into one. For two sequences of bytes,
- seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
- calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32
- check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
- len2.
-*/
-
-
- /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
- const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
- const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method,
- int windowBits, int memLevel,
- int strategy, const char *version,
- int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits,
- const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
- unsigned char FAR *window,
- const char *version,
- int stream_size));
-#define deflateInit(strm, level) \
- deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit(strm) \
- inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
- deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
- (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
- inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
- (int)sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
- inflateBackInit_((strm), (windowBits), (window), \
- ZLIB_VERSION, (int)sizeof(z_stream))
-
-#ifndef Z_SOLO
-
-/* gzgetc() macro and its supporting function and exposed data structure. Note
- * that the real internal state is much larger than the exposed structure.
- * This abbreviated structure exposes just enough for the gzgetc() macro. The
- * user should not mess with these exposed elements, since their names or
- * behavior could change in the future, perhaps even capriciously. They can
- * only be used by the gzgetc() macro. You have been warned.
- */
-struct gzFile_s {
- unsigned have;
- unsigned char *next;
- z_off64_t pos;
-};
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));
-#define gzgetc(g) \
- ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc_(g))
-
-/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
- * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
- * both are true, the application gets the *64 functions, and the regular
- * functions are changed to 64 bits) -- in case these are set on systems
- * without large file support, _LFS64_LARGEFILE must also be true
- */
-#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
- ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
- ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
- ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
- ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
- ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
- ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
-#endif
-
-#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0
-# ifdef Z_PREFIX_SET
-# define z_gzopen z_gzopen64
-# define z_gzseek z_gzseek64
-# define z_gztell z_gztell64
-# define z_gzoffset z_gzoffset64
-# define z_adler32_combine z_adler32_combine64
-# define z_crc32_combine z_crc32_combine64
-# else
-# define gzopen gzopen64
-# define gzseek gzseek64
-# define gztell gztell64
-# define gzoffset gzoffset64
-# define adler32_combine adler32_combine64
-# define crc32_combine crc32_combine64
-# endif
-# ifndef _LARGEFILE64_SOURCE
- ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
- ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
- ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
- ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
- ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
- ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-# endif
-#else
- ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
- ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
- ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
- ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
- ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
- ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-#endif
-
-#else /* Z_SOLO */
-
- ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
- ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-
-#endif /* !Z_SOLO */
-
-/* hack for buggy compilers */
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
- struct internal_state {int dummy;};
-#endif
-
-/* undocumented functions */
-ZEXTERN const char * ZEXPORT zError OF((int));
-ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void));
-ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int));
-ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp));
-ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp));
-#ifndef Z_SOLO
- ZEXTERN unsigned long ZEXPORT gzflags OF((void));
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */

smplayer-0.8.0.tar.bz2/zlib-1.2.6/zlib.map Deleted

@@ -1,79 +0,0 @@
-ZLIB_1.2.0 {
-  global:
-    compressBound;
-    deflateBound;
-    inflateBack;
-    inflateBackEnd;
-    inflateBackInit_;
-    inflateCopy;
-  local:
-    deflate_copyright;
-    inflate_copyright;
-    inflate_fast;
-    inflate_table;
-    zcalloc;
-    zcfree;
-    z_errmsg;
-    gz_error;
-    gz_intmax;
-    _*;
-};
-
-ZLIB_1.2.0.2 {
-    gzclearerr;
-    gzungetc;
-    zlibCompileFlags;
-} ZLIB_1.2.0;
-
-ZLIB_1.2.0.8 {
-    deflatePrime;
-} ZLIB_1.2.0.2;
-
-ZLIB_1.2.2 {
-    adler32_combine;
-    crc32_combine;
-    deflateSetHeader;
-    inflateGetHeader;
-} ZLIB_1.2.0.8;
-
-ZLIB_1.2.2.3 {
-    deflateTune;
-    gzdirect;
-} ZLIB_1.2.2;
-
-ZLIB_1.2.2.4 {
-    inflatePrime;
-} ZLIB_1.2.2.3;
-
-ZLIB_1.2.3.3 {
-    adler32_combine64;
-    crc32_combine64;
-    gzopen64;
-    gzseek64;
-    gztell64;
-    inflateUndermine;
-} ZLIB_1.2.2.4;
-
-ZLIB_1.2.3.4 {
-    inflateReset2;
-    inflateMark;
-} ZLIB_1.2.3.3;
-
-ZLIB_1.2.3.5 {
-    gzbuffer;
-    gzoffset;
-    gzoffset64;
-    gzclose_r;
-    gzclose_w;
-} ZLIB_1.2.3.4;
-
-ZLIB_1.2.5.1 {
-    deflatePending;
-} ZLIB_1.2.3.5;
-
-ZLIB_1.2.5.2 {
-    deflateResetKeep;
-    gzflags;
-    gzgetc_;
-    inflateResetKeep;
-} ZLIB_1.2.5.1;

smplayer-0.8.0.tar.bz2/zlib-1.2.6/zutil.c Deleted

@@ -1,301 +0,0 @@
-/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2005, 2010, 2011 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $Id$ */
-
-#include "zutil.h"
-
-#ifndef NO_DUMMY_DECL
-struct internal_state {int dummy;}; /* for buggy compilers */
-#endif
-
-const char * const z_errmsg10 = {
-"need dictionary", /* Z_NEED_DICT 2 */
-"stream end", /* Z_STREAM_END 1 */
-"", /* Z_OK 0 */
-"file error", /* Z_ERRNO (-1) */
-"stream error", /* Z_STREAM_ERROR (-2) */
-"data error", /* Z_DATA_ERROR (-3) */
-"insufficient memory", /* Z_MEM_ERROR (-4) */
-"buffer error", /* Z_BUF_ERROR (-5) */
-"incompatible version",/* Z_VERSION_ERROR (-6) */
-""};
-
-
-const char * ZEXPORT zlibVersion()
-{
- return ZLIB_VERSION;
-}
-
-uLong ZEXPORT zlibCompileFlags()
-{
- uLong flags;
-
- flags = 0;
- switch ((int)(sizeof(uInt))) {
- case 2: break;
- case 4: flags += 1; break;
- case 8: flags += 2; break;
- default: flags += 3;
- }
- switch ((int)(sizeof(uLong))) {
- case 2: break;
- case 4: flags += 1 << 2; break;
- case 8: flags += 2 << 2; break;
- default: flags += 3 << 2;
- }
- switch ((int)(sizeof(voidpf))) {
- case 2: break;
- case 4: flags += 1 << 4; break;
- case 8: flags += 2 << 4; break;
- default: flags += 3 << 4;
- }
- switch ((int)(sizeof(z_off_t))) {
- case 2: break;
- case 4: flags += 1 << 6; break;
- case 8: flags += 2 << 6; break;
- default: flags += 3 << 6;
- }
-#ifdef DEBUG
- flags += 1 << 8;
-#endif
-#if defined(ASMV) || defined(ASMINF)
- flags += 1 << 9;
-#endif
-#ifdef ZLIB_WINAPI
- flags += 1 << 10;
-#endif
-#ifdef BUILDFIXED
- flags += 1 << 12;
-#endif
-#ifdef DYNAMIC_CRC_TABLE
- flags += 1 << 13;
-#endif
-#ifdef NO_GZCOMPRESS
- flags += 1L << 16;
-#endif
-#ifdef NO_GZIP
- flags += 1L << 17;
-#endif
-#ifdef PKZIP_BUG_WORKAROUND
- flags += 1L << 20;
-#endif
-#ifdef FASTEST
- flags += 1L << 21;
-#endif
-#ifdef Z_SOLO
- return flags;
-#else
- return flags + gzflags();
-#endif
-}
-
-#ifdef DEBUG
-
-# ifndef verbose
-# define verbose 0
-# endif
-int ZLIB_INTERNAL z_verbose = verbose;
-
-void ZLIB_INTERNAL z_error (m)
- char *m;
-{
- fprintf(stderr, "%s\n", m);
- exit(1);
-}
-#endif
-
-/* exported to allow conversion of error code to string for compress() and
- * uncompress()
- */
-const char * ZEXPORT zError(err)
- int err;
-{
- return ERR_MSG(err);
-}
-
-#if defined(_WIN32_WCE)
- /* The Microsoft C Run-Time Library for Windows CE doesn't have
- * errno. We define it as a global variable to simplify porting.
- * Its value is always 0 and should not be used.
- */
- int errno = 0;
-#endif
-
-#ifndef HAVE_MEMCPY
-
-void ZLIB_INTERNAL zmemcpy(dest, source, len)
- Bytef* dest;
- const Bytef* source;
- uInt len;
-{
- if (len == 0) return;
- do {
- *dest++ = *source++; /* ??? to be unrolled */
- } while (--len != 0);
-}
-
-int ZLIB_INTERNAL zmemcmp(s1, s2, len)
- const Bytef* s1;
- const Bytef* s2;
- uInt len;
-{
- uInt j;
-
- for (j = 0; j < len; j++) {
- if (s1j != s2j) return 2*(s1j > s2j)-1;
- }
- return 0;
-}
-
-void ZLIB_INTERNAL zmemzero(dest, len)
- Bytef* dest;
- uInt len;
-{
- if (len == 0) return;
- do {
- *dest++ = 0; /* ??? to be unrolled */
- } while (--len != 0);
-}
-#endif
-
-#ifndef Z_SOLO
-
-#ifdef SYS16BIT
-
-#ifdef __TURBOC__
-/* Turbo C in 16-bit mode */
-
-# define MY_ZCALLOC
-
-/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
- * and farmalloc(64K) returns a pointer with an offset of 8, so we
- * must fix the pointer. Warning: the pointer must be put back to its
- * original form in order to free it, use zcfree().
- */
-
-#define MAX_PTR 10
-/* 10*64K = 640K */
-
-local int next_ptr = 0;
-
-typedef struct ptr_table_s {
- voidpf org_ptr;
- voidpf new_ptr;
-} ptr_table;
-
-local ptr_table tableMAX_PTR;
-/* This table is used to remember the original form of pointers
- * to large buffers (64K). Such pointers are normalized with a zero offset.
- * Since MSDOS is not a preemptive multitasking OS, this table is not
- * protected from concurrent access. This hack doesn't work anyway on
- * a protected system like OS/2. Use Microsoft C instead.
- */
-
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
- voidpf buf = opaque; /* just to make some compilers happy */
- ulg bsize = (ulg)items*size;
-
- /* If we allocate less than 65520 bytes, we assume that farmalloc
- * will return a usable pointer which doesn't have to be normalized.
- */
- if (bsize < 65520L) {
- buf = farmalloc(bsize);
- if (*(ush*)&buf != 0) return buf;
- } else {
- buf = farmalloc(bsize + 16L);
- }
- if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
- tablenext_ptr.org_ptr = buf;
-
- /* Normalize the pointer to seg:0 */
- *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
- *(ush*)&buf = 0;
- tablenext_ptr++.new_ptr = buf;
- return buf;
-}
-
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
- int n;
- if (*(ush*)&ptr != 0) { /* object < 64K */
- farfree(ptr);
- return;
- }
- /* Find the original pointer */
- for (n = 0; n < next_ptr; n++) {
- if (ptr != tablen.new_ptr) continue;
-
- farfree(tablen.org_ptr);
- while (++n < next_ptr) {
- tablen-1 = tablen;
- }
- next_ptr--;
- return;
- }
- ptr = opaque; /* just to make some compilers happy */
- Assert(0, "zcfree: ptr not found");
-}
-
-#endif /* __TURBOC__ */
-
-
-#ifdef M_I86
-/* Microsoft C in 16-bit mode */
-
-# define MY_ZCALLOC
-
-#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
-# define _halloc halloc
-# define _hfree hfree
-#endif
-
-voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
-{
- if (opaque) opaque = 0; /* to make compiler happy */
- return _halloc((long)items, size);
-}
-
-void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
-{
- if (opaque) opaque = 0; /* to make compiler happy */
- _hfree(ptr);
-}
-
-#endif /* M_I86 */
-
-#endif /* SYS16BIT */
-
-
-#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-
-#ifndef STDC
-extern voidp malloc OF((uInt size));
-extern voidp calloc OF((uInt items, uInt size));
-extern void free OF((voidpf ptr));
-#endif
-
-voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
- voidpf opaque;
- unsigned items;
- unsigned size;
-{
- if (opaque) items += size - size; /* make compiler happy */
- return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
- (voidpf)calloc(items, size);
-}
-
-void ZLIB_INTERNAL zcfree (opaque, ptr)
- voidpf opaque;
- voidpf ptr;
-{
- free(ptr);
- if (opaque) return; /* make compiler happy */
-}
-
-#endif /* MY_ZCALLOC */
-
-#endif /* !Z_SOLO */

smplayer-0.8.0.tar.bz2/zlib-1.2.6/zutil.h Deleted

@@ -1,248 +0,0 @@
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2011 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
- part of the implementation of the compression library and is
- subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef ZUTIL_H
-#define ZUTIL_H
-
-#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
-# define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
-#else
-# define ZLIB_INTERNAL
-#endif
-
-#include "zlib.h"
-
-#if defined(STDC) && !defined(Z_SOLO)
-# if !(defined(_WIN32_WCE) && defined(_MSC_VER))
-# include <stddef.h>
-# endif
-# include <string.h>
-# include <stdlib.h>
-#endif
-
-#ifdef Z_SOLO
- typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */
-#endif
-
-#ifndef local
-# define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-typedef unsigned char uch;
-typedef uch FAR uchf;
-typedef unsigned short ush;
-typedef ush FAR ushf;
-typedef unsigned long ulg;
-
-extern const char * const z_errmsg10; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) z_errmsgZ_NEED_DICT-(err)
-
-#define ERR_RETURN(strm,err) \
- return (strm->msg = (char*)ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
- /* common constants */
-
-#ifndef DEF_WBITS
-# define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-# define DEF_MEM_LEVEL 8
-#else
-# define DEF_MEM_LEVEL MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES 2
-/* The three kinds of block type */
-
-#define MIN_MATCH 3
-#define MAX_MATCH 258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
- /* target dependencies */
-
-#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
-# define OS_CODE 0x00
-# ifndef Z_SOLO
-# if defined(__TURBOC__) || defined(__BORLANDC__)
-# if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
- /* Allow compilation with ANSI keywords only enabled */
- void _Cdecl farfree( void *block );
- void *_Cdecl farmalloc( unsigned long nbytes );
-# else
-# include <alloc.h>
-# endif
-# else /* MSC or DJGPP */
-# include <malloc.h>
-# endif
-# endif
-#endif
-
-#ifdef AMIGA
-# define OS_CODE 0x01
-#endif
-
-#if defined(VAXC) || defined(VMS)
-# define OS_CODE 0x02
-# define F_OPEN(name, mode) \
- fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-#endif
-
-#if defined(ATARI) || defined(atarist)
-# define OS_CODE 0x05
-#endif
-
-#ifdef OS2
-# define OS_CODE 0x06
-# if defined(M_I86) && !defined(Z_SOLO)
-# include <malloc.h>
-# endif
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-# define OS_CODE 0x07
-# ifndef Z_SOLO
-# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-# include <unix.h> /* for fdopen */
-# else
-# ifndef fdopen
-# define fdopen(fd,mode) NULL /* No fdopen() */
-# endif
-# endif
-# endif
-#endif
-
-#ifdef TOPS20
-# define OS_CODE 0x0a
-#endif
-
-#ifdef WIN32
-# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */
-# define OS_CODE 0x0b
-# endif
-#endif
-
-#ifdef __50SERIES /* Prime/PRIMOS */
-# define OS_CODE 0x0f
-#endif
-
-#if defined(_BEOS_) || defined(RISCOS)
-# define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
-# if defined(_WIN32_WCE)
-# define fdopen(fd,mode) NULL /* No fdopen() */
-# ifndef _PTRDIFF_T_DEFINED
- typedef int ptrdiff_t;
-# define _PTRDIFF_T_DEFINED
-# endif
-# else
-# define fdopen(fd,type) _fdopen(fd,type)
-# endif
-#endif
-
-#if defined(__BORLANDC__) && !defined(MSDOS)
- #pragma warn -8004
- #pragma warn -8008
- #pragma warn -8066
-#endif
-
-/* provide prototypes for these when building zlib without LFS */
-#if !defined(_WIN32) && (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
- ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
- ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#endif
-
- /* common defaults */
-
-#ifndef OS_CODE
-# define OS_CODE 0x03 /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-# define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
- /* functions */
-
-#if defined(pyr) || defined(Z_SOLO)
-# define NO_MEMCPY
-#endif
-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
- /* Use our own functions for small and medium model with MSC <= 5.0.
- * You may have to use the same strategy for Borland C (untested).
- * The __SC__ check is for Symantec.
- */
-# define NO_MEMCPY
-#endif
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-# define HAVE_MEMCPY
-#endif
-#ifdef HAVE_MEMCPY
-# ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-# define zmemcpy _fmemcpy
-# define zmemcmp _fmemcmp
-# define zmemzero(dest, len) _fmemset(dest, 0, len)
-# else
-# define zmemcpy memcpy
-# define zmemcmp memcmp
-# define zmemzero(dest, len) memset(dest, 0, len)
-# endif
-#else
- void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
- int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
- void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
-#endif
-
-/* Diagnostic functions */
-#ifdef DEBUG
-# include <stdio.h>
- extern int ZLIB_INTERNAL z_verbose;
- extern void ZLIB_INTERNAL z_error OF((char *m));
-# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
-# define Trace(x) {if (z_verbose>=0) fprintf x ;}
-# define Tracev(x) {if (z_verbose>0) fprintf x ;}
-# define Tracevv(x) {if (z_verbose>1) fprintf x ;}
-# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
-# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
-#else
-# define Assert(cond,msg)
-# define Trace(x)
-# define Tracev(x)
-# define Tracevv(x)
-# define Tracec(c,x)
-# define Tracecv(c,x)
-#endif
-
-#ifndef Z_SOLO
- voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
- unsigned size));
- void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr));
-#endif
-
-#define ZALLOC(strm, items, size) \
- (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-#endif /* ZUTIL_H */

smplayer-0.8.0.tar.bz2/Changelog -> smplayer-0.8.1.tar.bz2/Changelog Changed

smplayer-0.8.0.tar.bz2/Release_notes.txt -> smplayer-0.8.1.tar.bz2/Release_notes.txt Changed

smplayer-0.8.1.tar.bz2/clean_windows.cmd Added

smplayer-0.8.1.tar.bz2/compile_windows.cmd Added

smplayer-0.8.1.tar.bz2/compile_windows_portable.cmd Added

smplayer-0.8.0.tar.bz2/create_deb.sh -> smplayer-0.8.1.tar.bz2/create_deb.sh Changed

smplayer-0.8.0.tar.bz2/debian-rvm/changelog-orig -> smplayer-0.8.1.tar.bz2/debian-rvm/changelog-orig Changed

smplayer-0.8.1.tar.bz2/docs/eu Added

smplayer-0.8.1.tar.bz2/docs/eu/faq.html Added

@@ -0,0 +1,334 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<style type="text/css">
+html, body {
+ background-color: #fff;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+cite,
+code,
+del,
+dfn,
+em,
+img,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+dd,
+dl,
+dt,
+li,
+ol,
+ul,
+fieldset,
+form,
+label,
+legend,
+button,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-weight: normal;
+ font-style: normal;
+ font-size: 100%;
+ line-height: 1;
+ font-family: inherit;
+}
+body {
+ margin: 18px;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 13px;
+ font-weight: normal;
+ line-height: 18px;
+ color: #000000;
+}
+a {
+ color: #0069d6;
+ text-decoration: none;
+ line-height: inherit;
+ font-weight: inherit;
+}
+a:hover {
+ color: #0050a3;
+ text-decoration: underline;
+}
+p {
+ font-size: 13px;
+ font-weight: normal;
+ line-height:18px;
+ margin-bottom: 9px;
+}
+p small {
+ font-size: 11px;
+ color: #bfbfbf;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ font-weight: bold;
+ color: #202020;
+}
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+ color: #bfbfbf;
+}
+h1 {
+ margin-bottom: 18px;
+ font-size: 30px;
+ line-height: 36px;
+}
+h1 small {
+ font-size: 18px;
+}
+h2 {
+ font-size: 24px;
+ line-height: 36px;
+}
+h2 small {
+ font-size: 14px;
+}
+h3,
+h4,
+h5,
+h6 {
+ line-height: 36px;
+}
+h3 {
+ font-size: 18px;
+}
+h3 small {
+ font-size: 14px;
+}
+h4 {
+ font-size: 16px;
+}
+h4 small {
+ font-size: 12px;
+}
+h5 {
+ font-size: 14px;
+}
+h6 {
+ font-size: 13px;
+ color: #bfbfbf;
+ text-transform: uppercase;
+}
+ul, ol {
+ margin: 0 0 18px 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+ margin-bottom: 0;
+}
+ul {
+ list-style: disc;
+}
+ol {
+ list-style: decimal;
+}
+li {
+ line-height: 18px;
+ color: #000;
+}
+pre {
+ background-color: #E0E0E0;
+ padding: 6px;
+ width: 950px;
+ font-family: Consolas,monospace;
+ line-height: 19px;
+}
+</style>
+<title>SMPlayer - Sarri Egindako Galderak</title>
+</head>
+<body>
+
+<h1>SMPlayer - Sarri Egindako Galderak</h1>
+<ol>
+<li><a href="#smplayer_mplayer">Batzuetan irakurtzen dut SMPlayer, besteetan MPlayer, zer dira? Gauza bera dira?</a></li>
+<li><a href="#mplayer2">Zer da MPlayer2-ri buruz?</a></li>
+<li><a href="#qt">Qt buruzko zerbait irakurri dut, zer da?</a></li>
+<li><a href="#dvd_menus">DVD menuak, non daude?</a></li>
+<li><a href="#output_drivers">Irteera gidagailuak (directx, xv, x11, gl, alsa, oss...) zer dira? Zein da hoberena?</a></li>
+<li><a href="#screenshot">Ikusleiho-argazki bat egiten saiatu naiz baina aukera ezagaituta dago, zergaitik?</a></li>
+<li><a href="#audio_track">Audio bidea aldatzen saiatu naiz baina ez dabil, audioak berdin jarraitzen du. Bideoa gelditu eta berriro abiarazi behar dut audio bidea eguneratzeko. Zergaitik?</a></li>
+<li><a href="#shortcuts">Nola aldatu ditzaket lasterteklak?</a></li>
+<li><a href="#codecs">Bideo heuskarri batzuekin audioa besterik ez dut, baina ez bideoa. Zergaitik? Kodek batzuk behar ditut?</a></li>
+<li><a href="#open_quit">Zein alde dago Ireki -> Itxi eta Ireki -> Amaitu artean? Ez dute gauza bera egiten?</a></li>
+<li><a href="#audio_cd">Nola irakurri dezaket audio CD bat?</a></li>
+<li><a href="#mplayer_errors">Agiri bat irakurtzen saiatu naiz baina ez da ezer gertatzen. Zergaitik?</a></li>
+<li><a href="#mplayer_restart">Menuko aukera pilo batek bideoa une batez zuri jartzen dute. Zergaitik?</a></li>
+<li><a href="#crash">SMPlayer matxuratu da, baina audioa ez da gelditzen, zergaitik?</a></li>
+<li><a href="#mplayer_recommended">MPlayerren zein bertsio gomendatzen da?</a></li>
+<li><a href="#subtitles_border">Azpidatziak hertz beltzean erakustea nahi ditut irudian ordez, nola egin dezaket?</a></li>
+<li><a href="#expand_filter">Azpidatziak hertz beltzean erakustea nahi ditut bideo GUZTIETAN, ahal da?</a></li>
+<li><a href="#screensaver1">Ikusleiho-babeslea ez da itzaltzen, zergaitik?</a></li>
+<li><a href="#multithread">MPlayer hari-anitzekoa da? Nola aurreratu dezaket nire CPU nukleo guztiak erabiltzeko?</a></li>
+<li><a href="#osdfontsize">Nola zehaztu dezaket hizki neurria OSD-an (Ikusleiho Gainean Erakutsi)?</a></li>
+<li><a href="#config_file">Non daude itxurapen agiriak?</a></li>
+<li><a href="#win_multimonitors">(Windows) Bideoa 1. monitorean ikusten da baina 2.-ean ez, zergaitik?</a></li>
+<li><a href="#win_aero">(Windows) Bideo bat irakurtzen dudan bakoitzean Aero ezgaitu egiten da, zergaitik?</a></li>
+<li><a href="#win_shortnames">(Windows) Ezin ditut ireki agiriak hizki-kode bereziekin edo ez-Ingelerazkoekin, zergaitik?</a></li>
+</ol>
+
+<hr>
+
+<h4>Batzuetan irakurtzen dut SMPlayer, besteetan MPlayer, zer dira? Gauza bera dira?</h4>
+Ez, bi aplikazio ezberdin dira. MPlayer multimedia irakurgailu bat da, hasieran Linuxerako garatua eta gero beste sistema eragile batzuetara ekarria. Oso ona da, ia den dena irakurtzen du, eta iragazki pilo bat ditu eta abar. Baina erabiltzaile gehienek erabiltzeko zaila aurkitzen dute.
+
+Zorionez, MPlayerrek beste aplikazio batekin batera lan egin dezake (bideo leihoa beste aplikazio baten EIG-n barneratu daiteke, aplikazioak bidalitako aginduak betetzen ditu). Hortaz SMPlayer aurre-amaiera bat besterik ez da egitan MPlayer erabiltzen duena bideoak irakurtzeko.
+
+SMPlayer zuk ikusten duzun leihoa da, menuak, hobespen elkarrizketa... (ikusten ez dituzun beste gauza batzuekin batera, MPlayerren aginte eginkizunak bezala). Baina SMPlayerrek ez daki ezer agiri irakurketaz. Ez daki kodek bat zer den ere. MPlayerrek beste alde batean, agiriak ireki, dekodeatu, bideoa erakutsi eta audioa irakurtzen du. Azpidatziak ere MPlayerrek irakurri, aztertu eta erakusten ditu ikusleihoan.
+
+<h4>Zer da MPlayer2-ri buruz?</h4>
+MPlayer2 MPlayerren adar bat da. MPlayer2-k <a href="http://www.mplayer2.org/comparison.html">hobekuntza eta ezaugarri</a> ugari eskaintzen ditu MPlayerren aldean eta bateragarria da SMPlayerrekin.
+
+<h4>Qt buruzko zerbait irakurri dut, zer da?</h4>
+SMPlayer Qt erabiliz garatzen da, hau plataforma-anitzerako garapena ahalbidetzen duen C++ liburutegi bat da. Ituruburu kode bera bildu daiteke
+Windows, Linux eta Mac SE-an. Argibide gehiago: <a href="http://qt.nokia.com/products/">http://qt.nokia.com/products/</a>.
+
+<h4>DVD menuak, non daude?</h4>
+SMPlayer Gidagailu hobespenetan (Aukerak - Hobespenak - Gidagailuak), gaitu "Gaitu DVD menuak (Esperimentala)" aukera eta ezarri zure DVD gidagailua. Ezaugarri honek libdvdnav sostengua duen MPlayer eraiketa berri bat behar du.
+
+<h4>Irteera gidagailuak (directx, xv, x11, gl, alsa, oss...) zer dira? Zein da hoberena? Zein da hoberena?</h4>
+MPlayerrek irteera gidagailu ugari ditu, bideo eta soinurako. SMPlayerrek berain artean nahi duzuna hautatzea ahalbidetzen dizu (Hobespenak -> Orokorra -> Bideoa/Audioa).
+Bideoarentzako gomendatzen da erabiltzea xv (Linuxen) edo directx (Windowsen). Hauek hardware bizkorpena erabiltzen dute eta egintza hoberena ematen dute. Directx-ren alde txarra Aero ezgaitzen duela da Windows Vista eta ondorengoetan.
+x11 eta directx:noaccel hardware bizkorpen gabeko gidagailuak dira. Hauek egintza okerrena ematen dute. Bestalde directx:noaccel-ek ontasun txarra ematen du ikusleiho-osoko moduan.
+gl eta gl2-k 3D bizkorpena erabiliko dute grafika txarteletik. Directx:noaccel eta x11-k baino egintza hobea emango dute baina ez directx edo xv-k bezain ona. gl/gl2 erabilgarriak izan daitezke Windows Vista eta ondorengoen erabiltzaileentzat.
+Soinuarentzat, arrunt alsa erabili behar duzu Linuxen. Nik ez ditut gogoko esd edo arts, CPU gehiago erabiltzeko erabiltzen dituztenak.
+Windowsen soinu gidagailuak dsound eta win32 dira. Irakurri dut dsound-ek audio-bideo aldiberetze arazoak eragin ditzakeela batzuetan. Arazo hori nabaritzen baduzu saiatu win32-rekin ordez.
+Beste gidagailu batzuek bideoa irudi agiri bezala gordetzea edo soinua diskan idaztea ahalbidetzen dizute. Gidagailu hauek ez daude ofizialki sostengatuta SMPlayerren. Erabili itzazu bakarrik zer egiten ari zaren badakizu.
+
+<h4>Ikusleiho-argazki bat egiten saiatu naiz baina aukera ezagaituta dago, zergaitik?</h4>
+Ez duzu agiriterik hautatu ikusleiho-argazkiak biltegiratzeko. Egizu hemen: Hobespenak -> Orokorra, eta ikusleiho-argazki aukera gaitu egingo da.
+
+<h4>Audio bidea aldatzen saiatu naiz baina ez dabil, audioak berdin jarraitzen du. Bideoa gelditu eta berriro abiarazi behar dut audio bidea eguneratzeko. Zergaitik?</h4>
+Zenbait heuskarrirekin (mp4 edo ogm bezalakoak), MPlayerrek ezin du audio bidea aldatu ekinean dagoela. "Audio bide aldaketa azkarra" (Hobespenak -> Performantzia) aukera ezgaituz gero audio bidez aldatu ahalko zara heuskarri hauetan.
+
+<h4>Nola aldatu ditzaket lasterteklak?</h4>
+Hobespenak -> Teklatua eta sagua. Lastertekla gehienak aldatu ahalko dituzu.
+
+<h4>Bideo heuskarri batzuekin audioa besterik ez dut, baina ez bideoa. Zergaitik? Kodek batzuk behar ditut?</h4>
+MPlayerrek heuskarri arrunt gehienak irakurri ditzake "kutxatik kanpo". Baina oraindik jatorrian gehitu ez diren kodekentzat, beharrezkoa da kodek binario pakete bat ezartzea. Hau hemen lortu dezakezu: <a href="http://www.mplayerhq.hu/design7/dload.html">MPlayer jeisketa orrialdea</a>.
+Windowsen, ezarri kodekak mplayer\codecs azpizuzenbidean. Linux distros-etan paketea eskuragarri egon daiteke pakete arruntetan, agian w32codecs izenarekin edo
+horrelako zerbait.
+
+<h4>Zein alde dago Ireki -> Itxi eta Ireki -> Amaitu artean? Ez dute gauza bera egiten?</h4>
+"Erakutsi ikurra erabide erretiluan" (Aukerak menuan) aukera ez badago hautatuta, orduan bai, bi aukerek gauza berdina egiten dute: aplikazioa utzi.
+Baina aukera hori gaituta badago, orduan Open -> Itxi aplikazioa ezkutatu besterik ez du egingo (eta uneko agiria gelditu), baina SMPlayer oraindik ekinean dago. Ireki -> Amaitu egitan uzten du aplikazioa, berdin da erabide erretilu ikurra gaituta dagoen edo ez.
+
+<h4>Nola irakurri dezaket audio CD bat?</h4>
+CD irakurketarako sostengua 0.5.18 bertsioan gehitu zen.
+Windowsen oraingoz ezinezkoa da audio CD-ak irakurtzea.
+
+<h4>Agiri bat irakurtzen saiatu naiz baina ez da ezer gertatzen. Zergaitik?</h4>
+Zihurrenik MPlayerrek ezin du agiria irakurri. Ireki mplayer oharra (Aukerak -> Ikusi oharrak -> MPlayer), zihurrenik akats mezu bat aurkituko duzu azken lerroetan.
+Windowsen oso arrunta da MPlayerren zenbait eraiketek huts egitea zeren SMPlayer erabiltzen saiatzen den ezaugarri batzuentzako sostengu gabe bildu ziren. Akats mezuak zantzu bat eman ahalko dizu. Katxeaz kexatzen bada, saiatu katxea ezgaitzen Hobespenak -> Performantzia. Hizki itxurapenaz kexatzen bada, saiatu ttf hizkia erabiltzen sistemaren hizkiaren ordez Hobespenak -> Azpidatziak -> Hizkiak eta margoak -> Gaitu azpidatzi arruntak.
+
+<h4>Menuko aukera pilo batek bideoa une batez zuri jartzen dute. Zergaitik?</h4>
+Aukera batzuek MPlayer prozesua gelditu eta parametro berriekin berrabiaraztea behar dute. Horregaitik eteten da une batez.
+
+<h4>SMPlayer matxuratu da, baina audioa ez da gelditzen, zergaitik?</h4>
+SMPlayer matxuratu da, baina MPlayer oraindik ekinean dago. Amaitu MPlayer prozezua ataza-kudeatzailean.
+Edonola SMPlayer matxuratzen bada, zuzendu beharreko akats larria da. Jakinarazi ezazu.
+
+<h4>MPlayerren zein bertsio gomendatzen da?</h4>
+Gomendatzen dut erabiltzea gutxienez MPlayer SVN r33216 (2011-04-05) edo MPlayer2, baina SVN/git-eko bertsio berri bat hobea litzake kodek hobetuen sostengurako eta akatsen zuzenketarako.
+SMPlayer saiatuko da ahal duena egiten bertsio zaharragoekin lan egiteko, baina zenbait aukerek badaiteke lanik ez egitea.
+
+<h4>Azpidatziak hertz beltzean erakustea nahi ditut irudian ordez, nola egin dezaket?</h4>
+Bideo iragazkiak -> Gehitu hertz beltzak
+
+<h4>Azpidatziak hertz beltzean erakustea nahi ditut bideo GUZTIETAN, ahal da? </h4>
+expand=:::::4/3 bezalako bideo iragazki bat gehitu dezakezu hemen: Hobespenak -> Aurreratua -> MPlayer aukerak.
+Beste aukera batzuk:
+<ul>
+<li>Hautatu Gehitu hertz beltzak ikusleiho-osoan Hobespenak -> Orokorra -> Bideoa</li>
+<li>Gehitu add_letterbox true ekintza zerrendaren eremuan Hobespenak -> Aurreratua</li>
+</ul>
+
+<h4>Ikusleiho-babeslea ez da itzaltzen, zergaitik?</h4>
+MPlayerren bertsio berri bat erabiltzen baduzu badaiteke hau bezalako lerro bat gehitu behar izatea zure ~/.mplayer/config:
+
+(gnome) 
+
+<pre>heartbeat-cmd="gnome-screensaver-command -p &amp;>/dev/null"</pre>
+
+(kde)
+
+<pre>heartbeat-cmd="dcop kdesktop KScreensaverIface enable false &amp;>/dev/null &amp;&amp; dcop kdesktop KScreensaverIface enable true &amp;>/dev/null"</pre>
+
+Mesedez bota begirada bat MPlayerren eskuliburu orrialdeari argibide gehiagorako.
+
+<h4>MPlayer hari-anitzekoa da? Nola aurreratu dezaket nire CPU nukleo guztiak erabiltzeko?</h4>
+Hari-anitzeko dekodeaketak MPlayerren edo FFmpeg-mt eraiketa berri bat behar du Linuxen. MPlayer2-k berezgaitasunez erabiltzen ditu nukleo guztiak, baina MPlayerrek eskuzko zehazpena behar du. Dekodeaketarako hari zenbatekoa hemen zehaztu dezakezu: Hobespenak -> Performantzia. Ezarri hau zure ordenagailuak dituen nukleo (eta hariak hyperthreaded Intel CPU-en kasuan) zenbatekoaren berdin edo gutxiagon. Ezarri zure CPU-ak duen gaitasunaren bezain handia edo ez du eraginik izango.
+
+<h4>Nola zehaztu dezaket hizki neurria OSD-an (Ikusleiho Gainean Erakutsi)?</h4>
+OSD-ko hizki neurria zehazteko, MPlayerretik denbora eta beste mezu batzuk erakusten dituena ikusleihoaren goi-ezker bazterrean, joan Hobespenak -&gt; Aurreratua -&gt; MPlayer aukerak, eta Aukerak: eremuan, gehitu hurrengo hau:
+<pre>-subfont-autoscale 0 -subfont-osd-scale y</pre>
+
+Non y zuk hobetsitako neurria den. Berezko balioa -subfont-osd-scale 20 da.
+
+<h4>Non daude itxurapen agiriak?</h4>
+SMPlayerren itxurapen agiri nagusia smplayer.ini da. Zure itxurapenaren arabera, gordetzen dira banakako ezarpen agiriak smplayer_files.ini (ini agiri bat) edo file_settings azpizuzenbidean (ini agiri anitz). Zure SE-ren arabera helbidetuta daude:
+<pre>Linux 	 $HOME/.config/smplayer
+Windows 2000/XP 	 C:\Agiriak eta Ezarpenak\&lt;zure_erabitzaile-izena&gt;\.smplayer
+Windows Vista/7 	 C:\Erabiltzaileak\&lt;zure_erabiltzaile-izena&gt;\.smplayer</pre>
+
+Baita ere ikusi dezakezu SMPlayer oharrean (Aukerak -> Ikusi oharrak), bilatu hau bezalako lerro bat:
+<pre>
+ * ini path: '/users/xabier/.config/smplayer'
+</pre>
+
+smplayer.ini-k SMPlayerren itxurapena biltegiratzen du eta smplayer_files.ini-k zuk irakurritako agirien ezarpenak biltegiratzen ditu.
+Oharra: Linuxen, .config berez ezkutatua egon daiteke. Zihurtatu gaitzeaz ezkutuko agiriak eta agiritegiak zure agiri kudeatzailean.
+
+<h4>(Windows) Bideoa 1. monitorean ikusten da baina 2.-ean ez, zergaitik?</h4>
+directx bideo gidagailu bezala erabiltzen duzunean (Hobespenak -> Orokorra -> Bideoa) bideoa monitore bakar batean erakutsi daiteke. Honen ordez gl, gl2 edo direct3d erabiltzen baduzu bideoa edozein monitoretan erakutsiko da..
+Edonola directx erabiltzea nahiago baduzu bideoa erakutsiko den ikusleihoa hautatu dezakezu menuan Bideoa -> Ikusleihoa.
+
+<h4>(Windows) Bideo bat irakurtzen dudan bakoitzean Aero ezgaitu egiten da, zergaitik?</h4>
+Hau gertatzen da directx bideo gidagailu bezala erabiltzerakoan (Hobespenak -> Orokorra -> Bideoa). Aldatu dezakezu hona: gl, gl2 edo direct3d.
+
+<h4>(Windows) Ezin ditut ireki agiriak hizki-kode bereziekin edo ez-Ingelerazkoekin, zergaitik?</h4>
+Ezin baduzu hizki-kode bereziekin edo ez-Ingelerazkoekin agiririk ireki, gaitu Bidali agirizen laburrak (8+3) MPlayerri. Aukerak -&gt; Hobespenak -&gt; Aurreratua arazo honen inguruan lan egiteko.
+
+</body>
+</html>
\ No newline at end of file

smplayer-0.8.0.tar.bz2/docs/ru/faq.html -> smplayer-0.8.1.tar.bz2/docs/ru/faq.html Changed

@@ -2,7 +2,180 @@
 <html>
 <head>
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=utf-8">
-<title>SMPlayer FAQ</title>
+<style type="text/css">
+html, body {
+ background-color: #fff;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+cite,
+code,
+del,
+dfn,
+em,
+img,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+dd,
+dl,
+dt,
+li,
+ol,
+ul,
+fieldset,
+form,
+label,
+legend,
+button,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-weight: normal;
+ font-style: normal;
+ font-size: 100%;
+ line-height: 1;
+ font-family: inherit;
+}
+body {
+ margin: 18px;
+ font-family: "Tahoma", Helvetica, Arial, sans-serif;
+ font-size: 13px;
+ font-weight: normal;
+ line-height: 18px;
+ color: #000000;
+}
+a {
+ color: #0069d6;
+ text-decoration: none;
+ line-height: inherit;
+ font-weight: inherit;
+}
+a:hover {
+ color: #0050a3;
+ text-decoration: underline;
+}
+p {
+ font-size: 13px;
+ font-weight: normal;
+ line-height:18px;
+ margin-bottom: 9px;
+}
+p small {
+ font-size: 11px;
+ color: #bfbfbf;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ font-weight: bold;
+ color: #202020;
+}
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+ color: #bfbfbf;
+}
+h1 {
+ margin-bottom: 18px;
+ font-size: 30px;
+ line-height: 36px;
+}
+h1 small {
+ font-size: 18px;
+}
+h2 {
+ font-size: 24px;
+ line-height: 36px;
+}
+h2 small {
+ font-size: 14px;
+}
+h3,
+h4,
+h5,
+h6 {
+ line-height: 36px;
+}
+h3 {
+ font-size: 18px;
+}
+h3 small {
+ font-size: 14px;
+}
+h4 {
+ font-size: 16px;
+}
+h4 small {
+ font-size: 12px;
+}
+h5 {
+ font-size: 14px;
+}
+h6 {
+ font-size: 13px;
+ color: #bfbfbf;
+ text-transform: uppercase;
+}
+ul, ol {
+ margin: 0 0 18px 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+ margin-bottom: 0;
+}
+ul {
+ list-style: disc;
+}
+ol {
+ list-style: decimal;
+}
+li {
+ line-height: 18px;
+ color: #000;
+}
+pre {
+ background-color: #E0E0E0;
+ padding: 6px;
+ width: 950px;
+ font-family: Consolas,monospace;
+ line-height: 19px;
+}
+</style><title>SMPlayer FAQ</title>
 </head>
 
 <body>
@@ -10,327 +183,213 @@
 
 <ol>
 <li><a href="#smplayer_mplayer">Иногда я встречаю название SMPlayer, иногда MPlayer, что это такое? Это одно и то же?</a></li>
+<li><a href="#mplayer2">Что такое MPlayer2?</a></li>
+<li><a href="#qt">Я что-то читал про Qt, что это вообще такое?</a></li>
 <li><a href="#dvd_menus">А где же DVD-меню?</a></li>
 <li><a href="#output_drivers">Устройства вывода (directx, xv, x11, gl, alsa, oss...). Что это такое? Что из них лучше?</a></li>
 <li><a href="#screenshot">Я пытаюсь сделать снимок экрана, но опция недоступна, почему?</a></li>
 <li><a href="#audio_track">Я пытаюсь сменить звуковую дорожку, но опция не срабатывает, дорожка остаётся той же самой. Я вынужден останавливать видео и запускать его опять чтобы сменить аудиодорожку. Почему?</a></li>
 <li><a href="#shortcuts">Как я могу сменить сочетания клавиш?</a></li>
-<li><a href="#qt">Я что-то прочитал про Qt, что это такое?</a></li>
 <li><a href="#codecs">С некоторыми форматами видео я слышу только звук, без изображения. Почему? Мне нужны какие-то кодеки?</a></li>
-<li><a href="#open_quit">В чём разница между Открыть -> Закрыть и Открыть -> Выход? Это не одно и то же?</a></li>
+<li><a href="#open_quit">В чём разница между Открыть -&gt; Закрыть и Открыть -&gt; Выход? Это не одно и то же?</a></li>
 <li><a href="#audio_cd">Как я могу проигрывать аудиодиски?</a></li>
-<li><a href="#bookmark">Где закладки?</a></li>
 <li><a href="#mplayer_errors">Я пытаюсь воспроизвести файл, но ничего не происходит. Почему?</a></li>
-<li><a href="#tv">Вы собираетесь добавить поддержку TV?</a></li>
 <li><a href="#mplayer_restart">Вызов многих функций меню вызывает кратковременное прерывание видео. Почему?</a></li>
 <li><a href="#crash">SMPlayer завершился с ошибкой, но аудио продолжает звучать, почему?</a></li>
-<li><a href="#playlist_problem">Когда я воспроизвожу плейлист, когда файл заканчивается, MPlayer не переходит на следующий файл автоматически, почему?</a></li>
 <li><a href="#mplayer_recommended">Какая версия MPlayer рекомендована?</a></li>
 <li><a href="#subtitles_border">Я хочу, чтобы субтитры отображались на чёрной полосе, а не самом видео, как мне это сделать?</a></li>
 <li><a href="#expand_filter">Я хочу, чтобы субтитры отображались на чёрной полосе для всех видеофайлов, это возможно?</a></li>
-<li><a href="#monitors">(Windows) Окно видео отображается только на первом мониторе, но не на втором, почему?</a></li>
 <li><a href="#screensaver1">Хранитель экрана не выключается, в чём дело?</a></li>
-<li><a href="#volume_loud">В самом начале воспроизведения наблюдается скачок громкости, как это можно исправить?</a></li>
-<li><a href="#vista">(Windows) Я использую Windows Vista и всякий раз при воспроизведении видео Aero отключается, почему?</a></li>
+<li><a href="#multithread">MPlayer многопоточен? Могу ли я видеть выигрыш от всех ядер моего CPU?</a></li>
+<li><a href="#osdfontsize">Как я могу подогнать размер OSD (Onscreen Display)?</a></li>
 <li><a href="#config_file">Где находятся файлы настроек?</a></li>
+<li><a href="#win_multimonitors">(Windows) Видео отображается только на первом мониторе, но не на втором, почему?</a></li>
+<li><a href="#win_aero">(Windows) Я использую Windows Vista или новее, и всякий раз при воспроизведении видео Aero отключается, почему?</a></li>
+<li><a href="#win_shortnames">(Windows) У меня не выходит открыть файлы со специальными или нелатинскими символами в имени, почему?</a></li>
 </ol>
 
 <hr>
 
-<ol>
-<li><a name="smplayer_mplayer"></a>
-Иногда я встречаю название SMPlayer, иногда MPlayer, что это такое?
-Это одно и то же?
-
-Нет это два разных приложения. MPlayer – это мультимедийный проигрыватель,
+<h4>Иногда я встречаю название SMPlayer, иногда MPlayer, что это такое?
+Это одно и то же?</h4>
+Нет это два разных приложения. MPlayer – это мультимедийный проигрыватель,
 изначально написанный под Linux и позднее портированный на другие ОС.
 Он очень хорош, может проиграть практически всё, включает большое количество
 разных фильтров и т.п. Но многие пользователи считают его слишком
-сложным для использования.
-
-К счастью, MPlayer умеет работать совместно с другими приложениями
+сложным для использования.
+К счастью, MPlayer умеет работать совместно с другими приложениями
 (окно видео Mplayer может встраиваться в интерфейс другого приложиения и
 подчиняться командам, посылаемым этим приложением).
 Таким образом, SMPlayer – это просто графическая оболочка, использующая
-MPlayer для проигрывания видео.
-
-SMPlayer – это окно, которое вы видите, меню, диалоги настроек
+MPlayer для проигрывания видео.
+SMPlayer – это окно, которое вы видите, меню, диалоги настроек
 (а также другие невидимые вами вещи вроде функцонала для управления
 MPlayer). Сам SMPlayer совершенно ничего не знает о воспроизводимых
 файлах. Он даже не знает, какой кодек используется.
 С другой стороны, MPlayer открывает файлы, декодирует их, отображает
 видео и воспроизводит аудио. Субтитры также читаются, обрабатываются
-и отображаются на экране с помощью MPlayer.
-</li>
+и отображаются на экране с помощью MPlayer.
+
+<h4>Что такое MPlayer2?</h4>
+MPlayer2 — это форк MPlayer. MPlayer2 имеет несколько <a href="http://www.mplayer2.org/comparison.html">
+важных улучшений и особенностей</a> по сравнению с MPlayer и совместим с SMPlayer.
 
-<li><a name="dvd_menus"></a>
-А где же DVD-меню?
-
-В настоящее время MPlayer не поддерживает DVD-меню...
-эта функциональность сейчас находится в разработке.
+<h4>Я что-то читал про Qt, что это вообще такое?</h4>
+SMPlayer был разработан с использованием Qt – библиотеки на C++, которая
+позволяет кроссплатформенную разработку. Один и тот же исходный код может
+быть скомпилирован для Windows, Linux и Mac OS.
+Дополнительная информация: <a href="http://trolltech.com/products/qt">http://trolltech.com/products/qt</a>
 
-Но в любом случае, даже не имея DVD-меню, можно выбрать
-заголовок, главу, аудиодорожку, субтитры... в меню SMPlayer.
-</li>
+<h4>А где же DVD-меню?</h4>
+В настройках SMPlayer (Настройки -&gt; Устройства) отметьте опцию
+"Включить DVD-меню" и укажите свой DVD-привод. Опция требует собранного
+с поддержкой libdvdnav MPlayer
 
-<li><a name="output_drivers"></a>
-Устройства вывода (directx, xv, x11, gl, alsa, oss...). Что это такое?
-Что из них лучше?
-
-MPlayer умеет работать с несколькими устройствами вывода видео и звука.
-SMPlayer позволяет выбрать нужное вам (Настройки -> Основные).
-
-Для видео рекомендуется использовать xv (в Linux) или directx (Windows).
+<h4>Устройства вывода (directx, xv, x11, gl, alsa, oss...). Что это такое?
+Что из них лучше?</h4>
+MPlayer умеет работать с несколькими устройствами вывода видео и звука.
+SMPlayer позволяет выбрать нужное вам (Настройки -&gt; Основные -&gt; Видео/Аудио).
+Для видео рекомендуется использовать xv (в Linux) или directx (Windows).
 Они используют аппаратное ускорение и позволяют получить максимальную
 производительность. Некоторое неудобство directx для пользователей
-Windows Vista заключается в том, что при его использовании отключается Aero.
-
-x11 и directx:noaccel – устройства вывода без аппаратного ускорения. Дают
+Windows Vista заключается в том, что при его использовании отключается Aero.
+x11 и directx:noaccel – устройства вывода без аппаратного ускорения. Дают
 самую худшую производительность. Более того, directx:noaccel даёт плохое
-качество в полноэкранном режиме.
-
-gl и gl2 будут использовать 3D-ускорение графических карт, и дадут лучшую
+качество в полноэкранном режиме.
+gl и gl2 будут использовать 3D-ускорение графических карт, и дадут лучшую
 производительность, чем directx:noaccel или x11, но не такую хорошую, как
-directx или xv. Поэтому gl/gl2 могут оказаться полезны для пользователей Windows Vista.
-
-Для вывода звука обычно можно использовать oss или alsa в Linux. Худший вариант - 
-esd и arts, так как они используют больше ресурсов процессора.
-
-В Windows звуковые устройства – dsound и win32. Есть вероятность, что dsound может
+directx или xv. Поэтому gl/gl2 могут оказаться полезны для пользователей Windows Vista.
+Для вывода звука обычно можно использовать oss или alsa в Linux. Худший вариант - 
+esd и arts, так как они используют больше ресурсов процессора.
+В Windows звуковые устройства – dsound и win32. Есть вероятность, что dsound может
 вызывать некоторые проблемы с синхронизацией аудио-видео. Если вы заметили
-подобные проблемы, попробуйте использовать win32.
-
-Другие устройства вывода позволяют вам сохранять видео как файлы изображений или
+подобные проблемы, попробуйте использовать win32.
+Другие устройства вывода позволяют вам сохранять видео как файлы изображений или
 сохранять звук на диск. Эти драйверы официально не поддерживаются SMPlayer.
-Используйте их на свой страх и риск, если сами знаете что вы делаете.
-</li>
+Используйте их на свой страх и риск, если сами знаете что вы делаете.
 
-<li><a name="screenshot"></a>
-Я пытаюсь сделать снимок экрана, но опция недоступна, почему?
-
-Вы не выбрали каталог для сохранения снимков экрана. Сделайте это в
-Настройки -> Основные, и опция станет доступна.
-</li>
+<h4>Я пытаюсь сделать снимок экрана, но опция недоступна, почему?</h4>
+Вы не выбрали каталог для сохранения снимков экрана. Сделайте это в
+Настройки -&gt; Основные, и опция станет доступна.
 
-<li><a name="audio_track"></a>
-Я пытаюсь сменить звуковую дорожку, но опция не срабатывает, дорожка остаётся
+<h4>Я пытаюсь сменить звуковую дорожку, но опция не срабатывает, дорожка остаётся
 той же самой. Я вынужден останавливать видео и запускать его опять чтобы
-сменить аудиодорожку. Почему?
-
-В некоторых форматах (вроде mp4 или ogm) MPlayer не умеет менять звуковую
+сменить аудиодорожку. Почему?</h4>
+В некоторых форматах (вроде mp4 или ogm) MPlayer не умеет менять звуковую
 дорожку на лету. Убрав опцию "Быстрое переключение звуковых дорожек"
-(Настройки -> Производительность)
-, вы получите возможность менять аудиодорожку для этих форматов.
-</li>
+(Настройки -&gt; Производительность), вы получите возможность
+менять аудиодорожку для этих форматов.
 
-<li><a name="shortcuts"></a>
-Как я могу сменить сочетания клавиш?
-
-Настройка -> Клавиатура и мышь. Вы можете поменять большинство сочетаний
-клавиш.
-</li>
-
-<li><a name="qt"></a>
-Я что-то прочитал про Qt, что это такое?
-
-SMPlayer был разработан с использованием Qt – библиотеки на C++, которая
-позволяет кроссплатформенную разработку. Один и тот же исходный код может
-быть скомпилирован для Windows, Linux и Mac OS.
-Дополнительная информация:
-<a href="http://trolltech.com/products/qt">http://trolltech.com/products/qt</a>
-</li>
+<h4>Как я могу сменить сочетания клавиш?</h4>
+Настройка -&gt; Клавиатура и мышь. Вы можете поменять большинство сочетаний
+клавиш.
 
-<li><a name="codecs"></a>
-С некоторыми форматами видео я слышу только звук, без изображения.
-Почему? Мне нужны какие-то кодеки?
-
-MPlayer может проиграть большинство форматов "из коробки". Но для кодеков,
+<h4>С некоторыми форматами видео я слышу только звук, без изображения.
+Почему? Мне нужны какие-то кодеки?</h4>
+MPlayer может проиграть большинство форматов "из коробки". Но для кодеков,
 которые не встроены в него, нужно установить пакет с бинарными кодеками. Вы
 можете скачать его со 
-<a href="http://www.mplayerhq.hu/design7/dload.html">страницы загрузок MPlayer</a>.
- 
-В Windows установите кодеки в mplayer/codecs каталог.
+<a href="http://www.mplayerhq.hu/design7/dload.html">страницы загрузок MPlayer</a>.
+В Windows установите кодеки в mplayer/codecs каталог.
 В дистрибутивах Linux кодеки могут быть доступен как обычный пакет,
-возможно с названием w32codecs или подобным.
-</li>
+возможно с названием w32codecs или подобным.
 
-<li><a name="open_quit"></a>
-В чём разница между Открыть -> Закрыть и Открыть -> Выход? 
-Это не одно и то же?
-
-Если не выбрана настройка "Показать значок в системном лотке", тогда да,
-эти две опции делают одно и то же: завершают работу программы.
-
-Но если эта настройка выбрана, тогда Открыть -> Закрыть спрячет программу
+<h4>В чём разница между Открыть -&gt; Закрыть и Открыть -&gt; Выход?
+Это не одно и то же?</h4>
+Если не выбрана настройка "Показать значок в системном лотке", тогда да,
+эти две опции делают одно и то же: завершают работу программы.
+Но если эта настройка выбрана, тогда Открыть -&gt; Закрыть спрячет программу
 (и остановит текущий файл), но SMPlayer будет всё ещё запущен.
-Открыть -> Выход завершают работу программы, независимо от того,
-включена иконка в системном трее или нет.
-</li>
+Открыть -&gt; Выход завершают работу программы, независимо от того,
+включена иконка в системном трее или нет.
 
-<li><a name="audio_cd"></a>
-Как я могу проигрывать аудиодиски?
-
-Поддержка аудио CD была включена с версии 0.5.18.
-
-Под Windows пока всё ещё нельзя проигрывать аудиодиски с помощью SMPlayer.
-</li>
+<h4>Как я могу проигрывать аудиодиски?</h4>
+Поддержка аудио CD была включена с версии 0.5.18.
+Под Windows пока всё ещё нельзя проигрывать аудиодиски с помощью SMPlayer.
 
-<li><a name="bookmark"></a>
-Где закладки?
-
-Пока ещё не реализованы.
-</li>
-
-<li><a name="mplayer_errors"></a>
-Я пытаюсь воспроизвести файл, но ничего не происходит. Почему?
-
-Вероятно MPlayer не может воспроизвести этот файл. Откройти отчёт Mplayer
-(Настройки -> Смотреть отчёты -> MPlayer) и, вероятнее всего, вы найдёте
-сообщение об ошибке где-то в последних строках отчёта.
-
-Под Windows вполне возможно, что некоторые сборки MPlayer падают, потому
+<h4>Я пытаюсь воспроизвести файл, но ничего не происходит. Почему?</h4>
+Вероятно MPlayer не может воспроизвести этот файл. Откройти отчёт Mplayer
+(Настройки -&gt; Смотреть отчёты -&gt; MPlayer) и, вероятнее всего, вы найдёте
+сообщение об ошибке где-то в последних строках отчёта.
+Под Windows вполне возможно, что некоторые сборки MPlayer падают, потому
 что они собираются без поддержки некоторых опций, которые пытается
 использовать SMPlayer. Сообщение об ошибках поможет понять в чём дело. Если
 в отчёте говорится что-то о кэше, попытайтесь отключить кэширование в
-Настройки -> Производительность. Если ошибка касается fontconfig,
-попытайтесь использовать ttf-шрифт вместо системного.
-</li>
-
-<li><a name="tv"></a>
-Вы собираетесь добавить поддержку TV?
-
-Это было бы, конечно, замечательно, но поддержка TV пока не планируется.
-На текущий момент у меня нет TV-тюнера, поэтому я не могу реализовать
-эту функциональность.
-</li>
-
-<li><a name="mplayer_restart"></a>
-Вызов многих функций меню вызывает кратковременное прерывание видео. Почему?
-
-Некоторые опции требуют остановки процесса MPlayer и его перезапуска с новыми
-параметрами. Поэтому и возникает кратковременное прерывание.
-</li>
+Настройки -&gt; Производительность. Если ошибка касается fontconfig,
+попытайтесь использовать ttf-шрифт вместо системного.
 
-<li><a name="crash"></a>
-SMPlayer завершился с ошибкой, но аудио продолжает звучать, почему?
-
-SMPlayer упал, но MPlayer всё ещё работает. Завершите его процесс с помощью
-диспетчера задач.
-
-Всякий случай падения SMPlayer – это серьёзный баг. Пожалуйста, пришлите
-отчёт об этом.
-</li>
+<h4>Вызов многих функций меню вызывает кратковременное прерывание видео. Почему?</h4>
+Некоторые опции требуют остановки процесса MPlayer и его перезапуска с новыми
+параметрами. Поэтому и возникает кратковременное прерывание.
 
-<li><a name="playlist_problem"></a>
-Когда я воспроизвожу плейлист, когда файл заканчивается, MPlayer не
-переходит на следующий файл автоматически, почему?
-
-Убедитесь, что вы используете как минимум SMPlayer 0.6.5 и MPlayer SVN r28066.
-</li>
+<h4>SMPlayer завершился с ошибкой, но аудио продолжает звучать, почему?</h4>
+SMPlayer упал, но MPlayer всё ещё работает. Завершите его процесс с помощью
+диспетчера задач.
+Всякий случай падения SMPlayer – это серьёзный баг. Пожалуйста, пришлите
+отчёт об этом.
 
-<li><a name="mplayer_recommended"></a>
-Какая версия MPlayer рекомендована?
-
-Рекомендуется использовать MPlayer SVN r25843 (от 23.01.2008), но в любом случае
-свежая версия из SVN будет лучше.
-
-SMPlayer будет пытаться работать и с более старыми версиями, но некоторые опции
-могут не работать.
-</li>
+<h4>Какая версия MPlayer рекомендована?</h4>
+Рекомендуется использовать MPlayer SVN r33216 (от 05.04.2011), но в любом случае
+свежая версия из SVN будет лучше с точки зрения поддержки кодеков и исправленных ошибок.
+SMPlayer будет пытаться работать и с более старыми версиями, но некоторые опции
+могут не работать.
 
-<li><a name="subtitles_border"></a>
-Я хочу, чтобы субтитры отображались на чёрной полосе, а не самом видео,
-как мне это сделать?
-
-Видео -> фильтры -> Добавить чёрные полосы
-
-</li>
+<h4>Я хочу, чтобы субтитры отображались на чёрной полосе, а не самом видео,
+как мне это сделать?</h4>
+Видео -&gt; фильтры -&gt; Добавить чёрные полосы
 
-<li><a name="expand_filter"></a>
-Я хочу, чтобы субтитры отображались на чёрной полосе для всех видеофайлов,
-это возможно?
-
-Вы можете добавить видеофильтр вроде expand=:::::4/3 в Настройки -> Дополнительно ->
-Настройки MPlayer.
-
+<h4>Я хочу, чтобы субтитры отображались на чёрной полосе для всех видеофайлов,
+это возможно?</h4>
+Вы можете добавить видеофильтр вроде expand=:::::4/3 в Настройки -&gt; Дополнительно -&gt;
+Настройки MPlayer.
 Другие способы:
 <ul>
-<li>включите опцию Добавить чёрные полосы в полноэкранном режиме в Настройки ->
-Основные -> Видео</li>
-<li>добавьте add_letterbox true в поле для списка действий в Настройки -> Дополнительно</li>
-</ul>
-</li>
+<li>включите опцию Добавить чёрные полосы в полноэкранном режиме в Настройки -&gt;
+Основные -&gt; Видео</li>
+<li>добавьте add_letterbox true в поле для списка действий в Настройки -&gt; Дополнительно</li>
+</ul>
 
-<li><a name="monitors"></a>
-(Windows) Окно видео отображается только на первом мониторе, но не на втором, почему?
-
-Когда вы используете directx в качестве устройства вывода (Настройки -> Основные -> Видео),
-видео может отображаться только на одном мониторе. Если вы выводите видео с помощью
-gl, gl2 или direct3d, видео может быть выведено на любой монитор.
-
-В любом случае, если вы используете directx, вы можете выбрать экран для отображения
-видео в меню Видео -> Экран.
-
-</li>
-
-<li><a name="screensaver1"></a>
-Хранитель экрана не выключается, в чём дело?
-
-Если вы используете достаточно свежую версию MPlayer, то возможно потребуется добавить
+<h4>Хранитель экрана не выключается, в чём дело?</h4>
+Если вы используете достаточно свежую версию MPlayer, то возможно потребуется добавить
 следующую строку в ваш ~./mplayer/config:
-
-(gnome)
-<pre>heartbeat-cmd="gnome-screensaver-command -p &>/dev/null"</pre>
-
-(kde)
-<pre>heartbeat-cmd="dcop kdesktop KScreensaverIface enable false &>/dev/null && dcop kdesktop KScreensaverIface enable true &>/dev/null"</pre>
-
-Пожалуйста, обратитесь к страницам руководства MPlayer для более подробной информации.
-</li>
+(gnome)
+<pre>heartbeat-cmd="gnome-screensaver-command -p &amp;>/dev/null"</pre>
+(kde3)
+<pre>heartbeat-cmd="dcop kdesktop KScreensaverIface enable false &amp;>/dev/null &amp;&amp; dcop kdesktop KScreensaverIface enable true &amp;>/dev/null"</pre>
+Пожалуйста, обратитесь к страницам руководства MPlayer для более подробной информации.
 
-<li><a name="volume_loud"></a>
-В самом начале воспроизведения наблюдается скачок громкости, как это можно исправить?
-
-Выберите опцию Изменять громкость непосредственно перед проигрыванием в Настройки ->
-Основные -> Звук.
-
-Опция требует как минимум MPlayer SVN r27872.
-</li>
+<h4>MPlayer многопоточен? Могу ли я видеть выигрыш от всех ядер моего CPU?</h4>
+Многопоточное декодирование требует последних сборок MPlayer или FFmpeg-mt в Linux. MPlayer2 автоматически
+использует все ядра, но MPlayer требует ручной настройки. Вы можете установить количество используемых для декодирования потоков в Настройки -&gt; Производительность.
+Установите эту опцию в значение равное или меньшее, чем количество ядер (и потоков в Intel-процессорах с поддержкой HyperThreading) вашего CPU. Установка больших значений, чем может ваш CPU, не даст эффекта.
 
-<li><a name="vista"></a>
-(Windows) Я использую Windows Vista и всякий раз при воспроизведении видео
-Aero отключается, почему?
-
-Это может случиться, если вы используете directx в качестве устройства вывода видео.
-(Настройки -> Основные -> Видео). Вы можете изменить его на gl, gl2 или direct3d.
-</li>
+<h4>Как я могу подогнать размер OSD (Onscreen Display)?</h4>
+Для коррекции размера шрифта OSDб отображаемого время и прочие сообщения MPlayer в верхнем левом углу, в Настройки -&gt; Дополнительно -&gt; Опции для MPlayer, в поле Настройки:, добавьте следующее:
+<pre>-subfont-autoscale 0 -subfont-osd-scale y</pre>
+Здесь y — предпочитаемый размер. По умолчанию используется значение -subfont-osd-scale, равное 20.
 
-<li><a name="config_file"></a>
+<h4></h4>
 Где находятся файлы настроек?
-
-SMPlayer использует для хранения настроек два файла: smplayer.ini и smplayer_files.ini. Оба они находятся
+SMPlayer использует для хранения настроек два файла: smplayer.ini и smplayer_files.ini. Оба они находятся
 по умолчанию в $HOME/.config/smplayer (Linux) или
-C:\Documents and Settings\ваш_пользователь\.smplayer (WindowsXP).
-
-Вы можете также увидеть пути к файлам настроек в отчёте SMPlayer (Настройки -> Смотреть отчёты),
+C:\Documents and Settings\ваш_пользователь\.smplayer (WindowsXP).
+Вы можете также увидеть пути к файлам настроек в отчёте SMPlayer (Настройки -&gt; Смотреть отчёты),
 в строках приблизительно такого вида:
 <pre>
 * ini path: '/home/ricardo/.config/smplayer'
 </pre>
-smplayer.ini хранит настройки SMPlayer, smplayer_files.ini хранит настройки файлов,
-которые вы проигрывали.
-
-</li>
+smplayer.ini хранит настройки SMPlayer, smplayer_files.ini хранит настройки файлов,
+которые вы проигрывали.
 
-
+<h4>(Windows) Видео отображается только на первом мониторе, но не на втором, почему?</h4>
+Если вы используете directx в качестве устройства вывода видео (Настройки -&gt; Основные -&gt; Видео) видео может отображаться только на первом мониторе. При использовании gl, gl2 или direct3d видео можно вывести на любой монитор.
+Однако, если вы всё же предпочитаете directx, вы можете выбрать экран, на который будет выводиться видео, в меню Видео -&gt; Экран.
 
-</ol>
+<h4>(Windows) Я использую Windows Vista или новее, и всякий раз при воспроизведении видео Aero отключается, почему?</h4>
+Это может случиться, если вы используете	 directx в качестве устройства вывода видео (Настройки -&gt; Основные -&gt; Видео). Вы можете изменить его на gl, gl2 или direct3d.
+
+<h4>(Windows) У меня не выходит открыть файлы со специальными или нелатинскими символами в имени, почему?</h4>
+Если у вас не выходит открыть файлы со специальными или нелатинскими символами, включите Передавать короткие имена (8+3) в MPlayer в Насстройки -&gt; Дополнительно для решения этой проблемы.
 
 </body>
 </html>

smplayer-0.8.0.tar.bz2/docs/zh_CN/faq.html -> smplayer-0.8.1.tar.bz2/docs/zh_CN/faq.html Changed

@@ -1,191 +1,332 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
 <html>
 <head>
-<META HTTP-EQUIV="content-type" CONTENT="text/html; charset=gb2312">
-<title>SMPlayer FAQ</title>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<style type="text/css">
+html, body {
+ background-color: #fff;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+cite,
+code,
+del,
+dfn,
+em,
+img,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+dd,
+dl,
+dt,
+li,
+ol,
+ul,
+fieldset,
+form,
+label,
+legend,
+button,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-weight: normal;
+ font-style: normal;
+ font-size: 100%;
+ line-height: 1;
+ font-family: inherit;
+}
+body {
+ margin: 18px;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 13px;
+ font-weight: normal;
+ line-height: 18px;
+ color: #000000;
+}
+a {
+ color: #0069d6;
+ text-decoration: none;
+ line-height: inherit;
+ font-weight: inherit;
+}
+a:hover {
+ color: #0050a3;
+ text-decoration: underline;
+}
+p {
+ font-size: 13px;
+ font-weight: normal;
+ line-height:18px;
+ margin-bottom: 9px;
+}
+p small {
+ font-size: 11px;
+ color: #bfbfbf;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ font-weight: bold;
+ color: #202020;
+}
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+ color: #bfbfbf;
+}
+h1 {
+ margin-bottom: 18px;
+ font-size: 30px;
+ line-height: 36px;
+}
+h1 small {
+ font-size: 18px;
+}
+h2 {
+ font-size: 24px;
+ line-height: 36px;
+}
+h2 small {
+ font-size: 14px;
+}
+h3,
+h4,
+h5,
+h6 {
+ line-height: 36px;
+}
+h3 {
+ font-size: 18px;
+}
+h3 small {
+ font-size: 14px;
+}
+h4 {
+ font-size: 16px;
+}
+h4 small {
+ font-size: 12px;
+}
+h5 {
+ font-size: 14px;
+}
+h6 {
+ font-size: 13px;
+ color: #bfbfbf;
+ text-transform: uppercase;
+}
+ul, ol {
+ margin: 0 0 18px 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+ margin-bottom: 0;
+}
+ul {
+ list-style: disc;
+}
+ol {
+ list-style: decimal;
+}
+li {
+ line-height: 18px;
+ color: #000;
+}
+pre {
+ background-color: #E0E0E0;
+ padding: 6px;
+ width: 950px;
+ font-family: Consolas,monospace;
+ line-height: 19px;
+}
+</style>
+<title>SMPlayer - å¸¸è§é®é¢è§£ç</title>
 </head>
-
 <body>
-<h1>SMPlayer - ³£¼ûÎÊÌâ½â´ð</h1>
 
+<h1>SMPlayer - å¸¸è§é®é¢è§£ç</h1>
 <ol>
-<li><a href="#smplayer_mplayer">SMPlayer ºÍ MPlayer Ö®¼äµÄ¹ØÏµÊÇÊ²Ã´? ËüÃÇÊÇÒ»ÑùµÄÂð?</a></li>
-<li><a href="#dvd_menus">DVD ²Ëµ¥ÔÚÄÄÀï?</a></li>
-<li><a href="#output_drivers">¡°Êä³öÇý¶¯¡±(directx, xv, x11, gl, alsa, oss...) ÊÇÊ²Ã´? Ñ¡ÄÄ¸ö×îºÃ?</a></li>
-<li><a href="#screenshot">ÎÒ³¢ÊÔ½ØÍ¼£¬µ«¸ÃÑ¡Ïî±»½ûÓÃ£¬ÎªÊ²Ã´?</a></li>
-<li><a href="#audio_track">ÎÒ³¢ÊÔ¸ü¸ÄÒô¹ì£¬µ«Ã»ÓÐÐ§¹û£¬ÒôÆµÈÔÈ»Ã»±ä¡£ÎÒÒªÍ£Ö¹ÊÓÆµ²¢ÔÙ´Î²¥·Å²Å¿ÉÒÔ¸ü¸ÄÒôÆµ¡£ÎªÊ²Ã´?</a></li>
-<li><a href="#shortcuts">ÎÒÈçºÎ¸ü¸Ä¿ì½Ý¼ü?</a></li>
-<li><a href="#qt">ÎÒ¿´µ½Ò»Ð©¹ØÓÚ Qt µÄ¶«Î÷£¬ÄÇÊÇÊ²Ã´?</a></li>
-<li><a href="#codecs">¶ÔÓÚÄ³Ð©ÊÓÆµ¸ñÊ½ÎÒÖ»ÄÜÌýµ½ÒôÆµ£¬Ã»ÓÐÊÓÆµ¡£ÎªÊ²Ã´? ÎÒÐèÒªÒ»Ð©±à½âÂëÆ÷?</a></li>
-<li><a href="#open_quit">¡°´ò¿ª->¹Ø±Õ¡±ºÍ¡°´ò¿ª->ÍË³ö¡±Ö®¼äÓÐÊ²Ã´Çø±ð?ËüÃÇÒ»ÑùÂð?</a></li>
-<li><a href="#audio_cd">ÎÒ¿ÉÒÔ²¥·ÅÒôÆµCDÂð?</a></li>
-<li><a href="#bookmark">ÊéÇ©ÔÚÄÄÀï?</a></li>
-<li><a href="#mplayer_errors">ÎÒ³¢ÊÔ²¥·ÅÒ»¸öÎÄ¼þµ«Ã»ÓÐÈÎºÎ·´Ó¦£¬ÎªÊ²Ã´?</a></li>
-<li><a href="#preferences_delay">µ±ÎÒÊ×´Î´ò¿ªÊ×Ñ¡Ïî¶Ô»°¿òÊ±£¬ÐèÒªÊýÃë²ÅÄÜÏÔÊ¾³öÀ´£¬ÎªÊ²Ã´?</a></li>
-<li><a href="#tv">ÄãÒªÔö¼ÓÖ§³ÖµçÊÓÂð?</a></li>
-<li><a href="#mplayer_restart">ºÜ¶à²Ëµ¥Ñ¡Ïî»áÈÃÕýÔÚ²¥·ÅµÄÊÓÆµË²¼ä±ä³É¿Õ°×¡£ÎªÊ²Ã´?</a></li>
-<li><a href="#crash">SMPlayer ±ÀÀ£ÒÔºó£¬ÒôÆµ»¹Ã»ÓÐÍ£Ö¹£¬ÎªÊ²Ã´?</a></li>
-<li><a href="#playlist_problem">ÎÒÔÚ²¥·ÅÒ»¸ö²¥·ÅÁÐ±í£¬µ±Ò»¸öÎÄ¼þ²¥·Å½áÊøÊ±£¬SMPlayer ²»×Ô¶¯²¥·ÅÏÂÒ»¸öÎÄ¼þ£¬ÎªÊ²Ã´?</a></li>
-<li><a href="#mplayer_recommended">½¨ÒéÊ¹ÓÃÄÄ¸ö MPlayer °æ±¾?</a></li>
-<li><a href="#subtitles_border">ÎÒÏëÈÃ×ÖÄ»ÔÚºÚÉ«±ß¿òÉÏÏÔÊ¾£¬¶ø²»ÊÇÍ¼ÏñÉÏ£¬ÎÒ¸ÃÔõÃ´°ì?</a></li>
-<li><a href="#expand_filter">ÎÒÏëÈÃËùÓÐÊÓÆµµÄ×ÖÄ»¶¼ÏÔÊ¾ÔÚºÚÉ«±ß¿òÉÏ£¬Õâ¿ÉÄÜÂð?</a></li>
-<li><a href="#monitors">(Windows) ÊÓÆµÖ»ÏÔÊ¾ÔÚµÚÒ»ÏÔÊ¾Æ÷£¬ÎÞ·¨ÏÔÊ¾ÔÚµÚ¶þÏÔÊ¾Æ÷ÉÏ£¬ÎªÊ²Ã´?</a></li>
-<li><a href="#screensaver1">ÆÁÄ»±£»¤³ÌÐòÃ»ÓÐ¹Ø±Õ£¬ÎªÊ²Ã´?</a></li>
-<li><a href="#vista">(Windows) ÎÒÓÃµÄÊÇ Windows Vista£¬Ã¿´Î²¥·ÅÊÓÆµÊ± Aero »á±»½ûÓÃ£¬ÎªÊ²Ã´?</a></li>
-<li><a href="#config_file">ÅäÖÃÎÄ¼þÔÚÄÄÀï?</a></li>
+<li><a href="#smplayer_mplayer">ææ¶åæè¯» SMPlayerï¼ææ¶åè¯» MPlayerï¼å®ä»¬æ¯ä»ä¹ï¼å®ä»¬æ¯ç¸åçåï¼</a></li>
+<li><a href="#mplayer2">MPlayer2 æ¯ä»ä¹ï¼</a></li>
+<li><a href="#qt">æçå°ä¸äºå³äº Qt çä¸è¥¿ï¼é£æ¯ä»ä¹ï¼</a></li>
+<li><a href="#dvd_menus">DVD èåï¼å®å¨åªéï¼</a></li>
+<li><a href="#output_drivers">è¾åºé©±å¨ï¼directx, xv, x11, gl, alsa, oss...ï¼æ¯ä»ä¹å¢ï¼åªä¸ä¸ªæ¯æå¥½çï¼</a></li>
+<li><a href="#screenshot">æå°è¯æªå¾ï¼ä½è¯¥éé¡¹è¢«ç¦ç¨ï¼ä¸ºä»ä¹ï¼</a></li>
+<li><a href="#audio_track">æå°è¯æ´æ¹é³è½¨ï¼ä½æ²¡æææï¼é³é¢ä»ç¶æ²¡åãæè¦åæ¢è§é¢å¹¶åæ¬¡ææ¾æå¯ä»¥æ´æ¹é³é¢ãä¸ºä»ä¹ï¼</a></li>
+<li><a href="#shortcuts">æå¦ä½æ´æ¹å¿«æ·é®ï¼</a></li>
+<li><a href="#codecs">æäºè§é¢æ ¼å¼æåªè½å¬å°é³é¢ï¼æ²¡æè§é¢ãä¸ºä»ä¹ï¼æéè¦ä¸äºç¼è§£ç å¨ï¼</a></li>
+<li><a href="#open_quit">âæå¼ -> å³éâ å âæå¼ -> éåºâ ä¹é´çåºå«æ¯ä»ä¹ï¼å®ä»¬æ¯å¦é½ä¸æ ·ï¼</a></li>
+<li><a href="#audio_cd">æææ ·æè½ææ¾é³é¢ CD å¢ï¼</a></li>
+<li><a href="#mplayer_errors">æå°è¯ææ¾ä¸ä¸ªæä»¶ä½æ²¡æä»»ä½ååºãä¸ºä»ä¹ï¼</a></li>
+<li><a href="#mplayer_restart">å¾å¤èåéé¡¹ä¼è®©æ£å¨ææ¾çè§é¢ç¬é´åæç©ºç½ãä¸ºä»ä¹ï¼</a></li>
+<li><a href="#crash">SMPlayer å´©æºä»¥åï¼é³é¢è¿æ²¡æåæ¢ï¼ä¸ºä»ä¹ï¼</a></li>
+<li><a href="#mplayer_recommended">å»ºè®®ä½¿ç¨ä»ä¹çæ¬ç MPlayerï¼</a></li>
+<li><a href="#subtitles_border">ææ³è®©åå¹å¨é»è²è¾¹æ¡ä¸æ¾ç¤ºï¼èä¸æ¯å¾åä¸ï¼æè¯¥æä¹åï¼</a></li>
+<li><a href="#expand_filter">ææ³è®©ææè§é¢çåå¹é½æ¾ç¤ºå¨é»è²è¾¹æ¡ä¸ï¼è¿å¯è½åï¼</a></li>
+<li><a href="#screensaver1">å±å¹ä¿æ¤ç¨åºæ²¡æå³éï¼ä¸ºä»ä¹ï¼</a></li>
+<li><a href="#multithread">MPlayer æ¯å¤çº¿ç¨çåï¼ææä¹æè½ååå©ç¨æææç CPU æ ¸å¿ï¼</a></li>
+<li><a href="#osdfontsize">æææ ·æè½è°æ´ OSDï¼å¨å±å¹ä¸æ¾ç¤ºï¼çåä½å¤§å°ï¼</a></li>
+<li><a href="#config_file">éç½®æä»¶å¨åªéï¼</a></li>
+<li><a href="#win_multimonitors">ï¼Windowsï¼è§é¢åªæ¾ç¤ºå¨ç¬¬ä¸æ¾ç¤ºå¨ï¼æ æ³æ¾ç¤ºå¨ç¬¬äºæ¾ç¤ºå¨ä¸ï¼ä¸ºä»ä¹ï¼</a></li>
+<li><a href="#win_aero">ï¼Windowsï¼ææ¯æ¬¡ææ¾è§é¢ Aero é½ä¼è¢«ç¦ç¨ï¼ä¸ºä»ä¹ï¼</a></li>
+<li><a href="#win_shortnames">ï¼Windowsï¼ææ æ³æå¼å«æç¹æ®æéè±æåç¬¦çæä»¶ï¼ä¸ºä»ä¹ï¼</a></li>
 </ol>
 
 <hr>
 
-<ol>
-<li><a name="smplayer_mplayer"></a>
-SMPlayer ºÍ MPlayer Ö®¼äµÄ¹ØÏµÊÇÊ²Ã´? ËüÃÇÊÇÒ»ÑùµÄÂð?
-²»£¬ËüÃÇÊÇÁ½¸ö²»Í¬µÄÓ¦ÓÃ³ÌÐò¡£MPlayer ÊÇÒ»¸ö¶àÃ½Ìå²¥·ÅÆ÷£¬×î³õÊÇÎª Linux ¿ª·¢µÄ£¬ºóÀ´±»ÒÆÖ²µ½ÆäËûµÄ²Ù×÷ÏµÍ³¡£Ëü·Ç³£°ô£¬Ëü¼¸ºõ¿ÉÒÔ²¥·ÅÒ»ÇÐ£¬²¢ÇÒËüÓÐºÜ¶à¹¦ÄÜ(ÀýÈç¹ýÂËÆ÷)¡£µ«´ó¶àÊýÓÃ»§¿ÉÄÜ»á·¢ÏÖºÜÄÑÊ¹ÓÃËü¡£
-ÐÒÔËµÄÊÇ MPlayer ¿ÉÒÔÓëÆäËûÓ¦ÓÃ³ÌÐòÒ»Æð¹¤×÷(ËüµÄÊÓÆµ´°¿Ú¿ÉÒÔ±»Ç¶Èëµ½ÆäËûÓ¦ÓÃ³ÌÐòµÄÍ¼ÐÎÓÃ»§½çÃæÖÐ£¬Ëü»¹ÄÜÖ´ÐÐ¸ÃÓ¦ÓÃ³ÌÐò·¢ËÍµÄÃüÁî)£¬Òò´Ë SMPlayer Ö»ÊÇÒ»¸öÊ¹ÓÃ MPlayer ²¥·ÅÊÓÆµµÄÇ°¶Ë³ÌÐò¡£
-SMPlayer ¾ÍÊÇÄúËù¿´µ½µÄ´°¿Ú¡¢²Ëµ¥ºÍÊ×Ñ¡Ïî¶Ô»°¿ò...(»¹ÓÐÆäËûÄúÃ»ÓÐ¿´µ½µÄ¶«Î÷£¬ÀýÈç¿ØÖÆ MPlayer µÄ¹¦ÄÜ)£¬µ« SMPlayer ¶ÔÓÚÕýÔÚ²¥·ÅµÄÎÄ¼þÒ»ÎÞËùÖª£¬ËüÉõÖÁ²»ÖªµÀÊ²Ã´ÊÇ±à½âÂëÆ÷¡£ÁíÒ»·½Ãæ£¬MPlayer ÔòÔÚ´ò¿ªÎÄ¼þ¡¢½âÂëËüÃÇ¡¢ÏÔÊ¾ÊÓÆµºÍ²¥·ÅÒôÆµ£¬²¢¶ÁÈ¡ºÍ·ÖÎö×ÖÄ»£¬½«ËüÃÇÏÔÊ¾ÔÚÆÁÄ»ÉÏ¡£
-</li>
-
-<li><a name="dvd_menus"></a>
-DVD ²Ëµ¥ÔÚÄÄÀï?
-Ä¿Ç° DVD ²Ëµ¥¹¦ÄÜ»¹ÔÚ¿ª·¢²âÊÔÖÐ£¬Äú¿ÉÒÔ´Ó¡°Ê×Ñ¡Ïî -> Çý¶¯Æ÷¡±Ñ¡Ïî¿¨ÖÐÆôÓÃ DVD ²Ëµ¥£¬µ«Çë×¢ÒâÈç¹ûÄúÏÖÔÚÆôÓÃËü¿ÉÄÜ»áÓöµ½ºÜ¶àÎÊÌâ¡£
-ÎÞÂÛÈçºÎ£¬¼´Ê¹Ã»ÓÐ DVD ²Ëµ¥£¬ÄúÒÀÈ»¿ÉÒÔÍ¨¹ý SMPlayer ²Ëµ¥Ñ¡ÔñÄúÏëÒª²¥·Å/²é¿´µÄ±êÌâ¡¢ÕÂ½Ú¡¢Òô¹ìºÍ×ÖÄ»µÈ...
-</li>
-
-<li><a name="output_drivers"></a>
-¡°Êä³öÇý¶¯¡±(directx, xv, x11, gl, alsa, oss...)ÊÇÊ²Ã´? Ñ¡ÄÄ¸ö×îºÃ?
-MPlayer ÓÐÒ»Ð©ÓÃÓÚÊÓÆµºÍÒôÆµµÄÊä³öÇý¶¯¡£SMPlayer ÔÊÐíÄúÔÚÆäÖÐÑ¡ÔñÒ»¸ö(Ê×Ñ¡Ïî -> ³£¹æ -> ÊÓÆµ/ÒôÆµ)¡£
-¶ÔÓÚÊÓÆµ£¬½¨ÒéÄúÊ¹ÓÃ xv (Linux) »ò directx (Windows)¡£ËüÃÇÊ¹ÓÃÓ²¼þ¼ÓËÙ£¬¿ÉÒÔ»ñµÃ×î¼ÑµÄÐÔÄÜ¡£µ«Õâ¶ÔÓÚ Windows Vista ÓÃ»§²»±ãµÄÊÇ£¬Ê¹ÓÃ directx »áµ¼ÖÂ½ûÓÃ Aero£¬È»¶øÄú¿ÉÒÔ³¢ÊÔÊ¹ÓÃ direct3d¡£ 
-x11 ºÍ directx (½ûÓÃ¼ÓËÙ) Çý¶¯¶¼Ã»ÓÐÓ²¼þ¼ÓËÙ£¬ËüÃÇµÄÐÔÄÜ×î²î£¬´ËÍâ directx (½ûÓÃ¼ÓËÙ)ÔÚÈ«ÆÁÄ£Ê½ÏÂµÄÖÊÁ¿Ò²ºÜ²î¡£
-gl ºÍ gl2 ½«Ê¹ÓÃÍ¼ÐÎ¿¨µÄ 3D ¼ÓËÙ£¬ËüÃÇÌá¹©µÄÐÔÄÜÓÅÓÚ directx (½ûÓÃ¼ÓËÙ)ºÍ x11£¬µ«Ñ·É«ÓÚ directx »ò xv ¡£Windows Vista ÓÃ»§¿ÉÒÔÊ¹ÓÃ gl/gl2£¬³ý´ËÖ®Íâ»¹¿ÉÒÔ³¢ÊÔ direct3d (Ò²ÐíÕâÊÇ¸üºÃµÄÑ¡Ôñ)¡£
-¶ÔÓÚÉùÒô£¬ÔÚ Linux ÖÐÄúÍ¨³£Ó¦¸ÃÊ¹ÓÃ oss »ò alsa¡£ÎÒ²»Ï²»¶ esd »ò arts£¬ËüÃÇÐèÒªÊ¹ÓÃ¸ü¶àµÄ CPU¡£
-ÔÚ Windows ÖÐµÄÉùÒôÇý¶¯ÊÇ dsound ºÍ win32¡£ÎÒÁË½âµ½ dsound ÓÐÊ±¿ÉÄÜ»áµ¼ÖÂ¡°ÒôÆµ-ÊÓÆµ (A-V)¡±Í¬²½µÄÎÊÌâ£¬Èç¹ûÄú·¢ÏÖ´ËÎÊÌâ£¬Çë³¢ÊÔÊ¹ÓÃ win32 ´úÌæ¡£
-ÆäËûÇý¶¯ÔÊÐíÄú±£´æÊÓÆµÎªÍ¼ÏñÎÄ¼þ»ò½«ÉùÒôÐ´Èëµ½´ÅÅÌ¡£SMPlayer ²»ÕýÊ½Ö§³ÖÕâÐ©Çý¶¯¡£ÇëÔÚÄúÖªµÀ×Ô¼ºÔÚ×öÊ²Ã´µÄÇé¿öÏÂÊ¹ÓÃËüÃÇ¡£
-</li>
-
-<li><a name="screenshot"></a>
-ÎÒ³¢ÊÔ½ØÍ¼£¬µ«¸ÃÑ¡Ïî±»½ûÓÃ£¬ÎªÊ²Ã´?
-ÄúÃ»ÓÐÑ¡ÔñÒ»¸öÓÃÓÚ´æ´¢ÆÁÄ»½ØÍ¼µÄÎÄ¼þ¼Ð¡£ÔÚ Ê×Ñ¡Ïî -> ³£¹æ ÖÐÉèÖÃºó£¬½ØÍ¼Ñ¡Ïî½«±»ÆôÓÃ¡£
-</li>
-
-<li><a name="audio_track"></a>
-ÎÒ³¢ÊÔ¸ü¸ÄÒô¹ì£¬µ«Ã»ÓÐÐ§¹û£¬ÒôÆµÈÔÈ»Ã»±ä¡£ÎÒÒªÍ£Ö¹ÊÓÆµ²¢ÔÙ´Î²¥·Å²Å¿ÉÒÔ¸ü¸ÄÒôÆµ¡£ÎªÊ²Ã´?
-¶ÔÓÚÄ³Ð©¸ñÊ½(ÀýÈç mp4 »ò ogm)£¬MPlayer ÎÞ·¨ÔÚÔËÐÐÊ±¸ü¸ÄÒô¹ì¡£Í¨¹ý½«¡°¿ìËÙÇÐ»»Òô¹ì¡±(Ê×Ñ¡Ïî -> Ê×Ñ¡Ïî)Ñ¡ÏîÉèÖÃÎª¡°×Ô¶¯¡±»ò¡°·ñ¡±£¬Äú¾Í¿ÉÒÔ¸ü¸ÄÕâÐ©¸ñÊ½µÄÒôÆµ¡£
-</li>
-
-<li><a name="shortcuts"></a>
-ÎÒÈçºÎ¸ü¸Ä¿ì½Ý¼ü?
-Äú¿ÉÒÔÔÚ Ê×Ñ¡Ïî -> ¼üÅÌºÍÊó±ê ÖÐÉèÖÃ¿ì½Ý¼ü¡£
-</li>
-
-<li><a name="qt"></a>
-ÎÒ¿´µ½Ò»Ð©¹ØÓÚ Qt µÄ¶«Î÷£¬ÄÇÊÇÊ²Ã´?
-SMPlayer ÊÇÊ¹ÓÃ Qt ¿ª·¢µÄ£¬ÕâÊÇÒ»¸öÔÊÐí¿çÆ½Ì¨¿ª·¢µÄ C++ ¿â¡£ ËüÌá¹©ÁËµ¥Ò»Ô´´úÂë¿ÉÔÚ Windows¡¢Linux ºÍ Mac OS ¶àÏµÍ³Æ½Ì¨ÉÏ±àÒëµÄ¿ÉÒÆÖ²ÐÔ¡£¸ü¶àÐÅÏ¢: <a href="http://trolltech.com/products/qt">http://trolltech.com/products/qt</a>
-</li>
-
-<li><a name="codecs"></a>
-¶ÔÓÚÄ³Ð©ÊÓÆµ¸ñÊ½ÎÒÖ»ÄÜÌýµ½ÒôÆµ£¬Ã»ÓÐÊÓÆµ¡£ÎªÊ²Ã´? ÎÒÐèÒªÒ»Ð©±à½âÂëÆ÷?
-MPlayer ¿ÉÒÔ¡°¿ªÏä¼´ÓÃ¡±²¥·Å³£¼ûµÄ¸ñÊ½¡£µ«¶ÔÓÚÄÇÐ©Ô±¾Î´Ö§³ÖµÄ¸ñÊ½£¬±ØÐë°²×°¶þ½øÖÆ±à½âÂëÆ÷°ü¡£Äú¿ÉÒÔ´Ó <a href="http://www.mplayerhq.hu/design7/dload.html">MPlayer ÏÂÔØÒ³Ãæ</a> ÉÏ»ñÈ¡¡£
-ÔÚ Windows ÏµÍ³»·¾³ÏÂ£¬ÇëÔÚÏÂÔØºóÇë½«±à½âÂëÆ÷°²×°µ½ mplayer/codecs ×ÓÄ¿Â¼¡£ÔÚ Linux ÏµÍ³»·¾³£¬·¢ÐÐ°æµÄÈí¼þ°üÖÐ³£·â×°ÓÐËü£¬Ëü¿ÉÄÜÊÇ w32codecs »òÀàËÆµÄÃû³Æ¡£
-</li>
-
-<li><a name="open_quit"></a>
-´ò¿ª->¹Ø±Õ ºÍ ´ò¿ª->ÍË³ö Ö®¼äÓÐÊ²Ã´Çø±ð? ËüÃÇÒ»ÑùÂð?
-Èç¹û¡°ÔÚÏµÍ³ÍÐÅÌÉÏÏÔÊ¾Í¼±ê¡±(ÔÚ Ñ¡Ïî ²Ëµ¥ÖÐ)Ñ¡ÏîÃ»ÓÐ±»Ñ¡ÖÐ£¬ÄÇÃ´ÊÇµÄ£¬ÕâÁ½¸öÑ¡Ïî¶¼ÏàÍ¬: ÍË³öÓ¦ÓÃ³ÌÐò¡£
-µ«Èç¹û¸ÃÑ¡Ïî±»ÆôÓÃ£¬´ò¿ª -> ¹Ø±Õ ½«Ö»Òþ²ØÓ¦ÓÃ³ÌÐò(²¢Í£Ö¹µ±Ç°ÕýÔÚ²¥·ÅµÄÎÄ¼þ)£¬µ« SMPlayer ÈÔÔÚÔËÐÐ¡£ÕâÊ±Ê¹ÓÃ ´ò¿ª -> ÍË³ö ²ÅÄÜÍË³öÓ¦ÓÃ³ÌÐò£¬ÎÞÂÛ¡°ÔÚÏµÍ³ÍÐÅÌÉÏÏÔÊ¾Í¼±ê¡±Ñ¡ÏîÊÇ·ñÆôÓÃ¡£
-</li>
-
-<li><a name="audio_cd"></a>
-ÎÒ¿ÉÒÔ²¥·ÅÒôÆµCDÂð?
-0.5.18 (»òÒÔÉÏ°æ±¾)ÒÑÔö¼Ó¶ÔÒôÆµ CD µÄÖ§³Ö
-µ«ÔÚ Windows ÏÂËü¿ÉÄÜÎÞ·¨²¥·ÅÒôÆµCD¡£
-</li>
-
-<li><a name="bookmark"></a>
-ÊéÇ©ÔÚÄÄÀï?
-ÉÐÎ´ÊµÏÖ¡£
-</li>
-
-<li><a name="mplayer_errors"></a>
-ÎÒ³¢ÊÔ²¥·ÅÒ»¸öÎÄ¼þµ«Ã»ÓÐÈÎºÎ·´Ó¦£¬ÎªÊ²Ã´?
-¿ÉÄÜÊÇ MPlayer ÎÞ·¨²¥·Å¸ÃÎÄ¼þ¡£´ò¿ª MPlayer ÈÕÖ¾(Ñ¡Ïî -> ²é¿´ÈÕÖ¾ -> MPlayer)£¬ÔÚ×îÐÂµÄÐÐÖÐÄú¿ÉÄÜ»áÕÒµ½Ò»Ìõ´íÎóÐÅÏ¢¡£
-Ò»Ð©ÎÞÐ§µÄ MPlayer ±àÒë°æ ÔÚ Windows ÖÐÏàµ±ÆÕ±é£¬ÒòÎªËüÃÇÔÚ±àÒëÊ±Ã»ÓÐÖ§³ÖÒ»Ð© SMPlayer ³¢ÊÔÊ¹ÓÃµÄ¹¦ÄÜ£¬¸Ã´íÎóÐÅÏ¢¿ÉÄÜ»á¸øÄúÒ»Ð©ÏßË÷¡£Èç¹ûÊÇ»º´æ (cache) ÎÊÌâ£¬Äú¿ÉÒÔ³¢ÊÔÔÚ Ê×Ñ¡Ïî -> Ê×Ñ¡Ïî -> »º´æ ÖÐ½ûÓÃ»º´æ¡£Èç¹ûÊÇ×ÖÌåÅäÖÃ (fontconfig) µÄÎÊÌâ£¬ÇëÊ¹ÓÃÒ»¸öÏµÍ³ÖÐµÄ TTF ×ÖÌå´úÌæ(Ê×Ñ¡Ïî -> ×ÖÄ» -> ×ÖÌåºÍÑÕÉ«)¡£
-</li>
-
-
-<li><a name="preferences_delay"></a>
-µ±ÎÒÊ×´Î´ò¿ªÊ×Ñ¡Ïî¶Ô»°¿òÊ±£¬ÐèÒªÊýÃë²ÅÄÜÏÔÊ¾³öÀ´£¬ÎªÊ²Ã´?
-ÄÇÒ»¿Ì SMPlayer ÔÚµ÷ÓÃ´Ó MPlayer µÃµ½µÄÒ»Ð©ÐÅÏ¢(ÀýÈç Êä³öÇý¶¯)¡£ÔÚ´ò¿ª Ñ¡Ïî -> ²é¿´ÐÅÏ¢ºÍÊôÐÔ... ¶Ô»°¿òÊ±Ò²ÊÇÈç´Ë¡£
-</li>
-
-<li><a name="tv"></a>
-ÄãÒªÔö¼ÓÖ§³ÖµçÊÓÂð?
-ÄÇÌýÆðÀ´ºÜºÃ£¬µ«µçÊÓÖ§³Ö²¢²»ÊÇÏÖÔÚµÄ¼Æ»®¡£Ä¿Ç°ÎÒÃ»ÓÐµçÊÓ¿¨£¬ËùÒÔÎÒÎÞ·¨ÊµÏÖËü¡£
-</li>
-
-<li><a name="mplayer_restart"></a>
-ºÜ¶à²Ëµ¥Ñ¡Ïî»áÈÃÕýÔÚ²¥·ÅµÄÊÓÆµË²¼ä±ä³É¿Õ°×¡£ÎªÊ²Ã´?
-Ò»Ð©Ñ¡ÏîÐèÒªÍ£Ö¹ MPlayer ½ø³Ì£¬²¢ÒÔÐÂµÄ²ÎÊýÖØÐÂÆô¶¯Ëü¡£Õâ¾ÍÊÇÎªÊ²Ã´²¥·ÅÊ±»áË²¼äÖÐ¶Ï¡£
-</li>
-
-<li><a name="crash"></a>
-SMPlayer ±ÀÀ£ÒÔºó£¬ÒôÆµ»¹Ã»ÓÐÍ£Ö¹£¬ÎªÊ²Ã´?
-ÒòÎª SMPlayer ±ÀÀ£ºó£¬MPlayer ÈÔÔÚÔËÐÐ¡£Äú¿ÉÒÔÔÚÈÎÎñ¹ÜÀíÆ÷ÖÐ½áÊø MPlayer ½ø³Ì¡£
-ÎÞÂÛÈçºÎ£¬Èç¹û SMPlayer ±ÀÀ££¬ËµÃ÷ÕâÊÇÒ»¸öÑÏÖØµÄ´íÎó (bug)£¬ËüÓ¦¸Ã±»ÐÞ¸´¡£Çë±¨¸æËü¡£
-</li>
-
-<li><a name="playlist_problem"></a>
-ÎÒÔÚ²¥·ÅÒ»¸ö²¥·ÅÁÐ±í£¬µ±Ò»¸öÎÄ¼þ²¥·Å½áÊøÊ±£¬SMPlayer ²»×Ô¶¯²¥·ÅÏÂÒ»¸öÎÄ¼þ£¬ÎªÊ²Ã´?
-ÇëÈ·±£ÄúÖÁÉÙÊ¹ÓÃµÄÊÇ SMPlayer 0.6.5 ºÍ MPlayer SVN r28066 ¡£
-</li>
-
-<li><a name="mplayer_recommended"></a>
-½¨ÒéÊ¹ÓÃÄÄ¸ö MPlayer °æ±¾?
-ÎÒ½¨ÒéÖÁÉÙÊ¹ÓÃ MPlayer SVN r25843 (2008-01-23)£¬ËäÈ» SVN ÖÐµÄ×îÐÂ°æ±¾»á¸üºÃ¡£
-SMPlayer ½«³¢ÊÔ¼æÈÝ¾ÉµÄ°æ±¾£¬µ«ÓÐÐ©Ñ¡Ïî¿ÉÄÜÎÞ·¨¹¤×÷¡£
-</li>
-
-<li><a name="subtitles_border"></a>
-ÎÒÏëÈÃ×ÖÄ»ÔÚºÚÉ«±ß¿òÉÏÏÔÊ¾£¬¶ø²»ÊÇÍ¼ÏñÉÏ£¬ÎÒ¸ÃÔõÃ´°ì?
-ÊÓÆµ -> ¹ýÂËÆ÷ -> Ìí¼ÓºÚÉ«±ß¿ò
-</li>
-
-<li><a name="expand_filter"></a>
-ÎÒÏëÈÃËùÓÐÊÓÆµµÄ×ÖÄ»¶¼ÏÔÊ¾ÔÚºÚÉ«±ß¿òÉÏ£¬Õâ¿ÉÄÜÂð?
-Äú¿ÉÒÔÔÚ Ê×Ñ¡Ïî -> ¸ß¼¶ -> MPlayer Ñ¡Ïî ÖÐÌí¼ÓÒ»¸öÊÓÆµ¹ýÂËÆ÷£¬ÀýÈç expand=:::::4/3¡£
-ÆäËûÑ¡Ïî/·½·¨:
+<h4>ææ¶åæè¯» SMPlayerï¼ææ¶åè¯» MPlayerï¼å®ä»¬æ¯ä»ä¹ï¼å®ä»¬æ¯ç¸åçåï¼</h4>
+ä¸ï¼å®ä»¬æ¯ä¸¤ä¸ªä¸åçåºç¨ç¨åºãMPlayer æ¯ä¸ä¸ªå¤åªä½ææ¾å¨ï¼æåæ¯ä¸º Linux å¼åçï¼åæ¥è¢«ç§»æ¤å°å¶ä»çæä½ç³»ç»ãå®éå¸¸æ£ï¼å®å ä¹å¯ä»¥ææ¾ä¸åï¼å¹¶ä¸å®æå¾å¤åè½ï¼ä¾å¦è¿æ»¤å¨ï¼ãä½å¤§å¤æ°ç¨æ·å¯è½ä¼åç°å¾é¾ä½¿ç¨å®ã
+
+å¹¸è¿çæ¯ MPlayer å¯ä»¥ä¸å¶ä»åºç¨ç¨åºä¸èµ·å·¥ä½ï¼å®çè§é¢çªå£å¯ä»¥è¢«åµå¥å°å¶ä»åºç¨ç¨åºçå¾å½¢ç¨æ·çé¢ä¸ï¼å®è¿è½æ§è¡è¯¥åºç¨ç¨åºåéçå½ä»¤ï¼ï¼å æ¤ SMPlayer åªæ¯ä¸ä¸ªä½¿ç¨ MPlayer ææ¾è§é¢çåç«¯ç¨åºã
+
+SMPlayer å°±æ¯æ¨æçå°ççªå£ãèååé¦éé¡¹å¯¹è¯æ¡...ï¼è¿æå¶ä»æ¨æ²¡æçå°çä¸è¥¿ï¼ä¾å¦æ§å¶ MPlayer çåè½ï¼ï¼ä½ SMPlayer å¯¹äºæ£å¨ææ¾çæä»¶ä¸æ æç¥ï¼å®çè³ä¸ç¥éä»ä¹æ¯ç¼è§£ç å¨ãå¦ä¸æ¹é¢ï¼MPlayer åå¨æå¼æä»¶ãè§£ç å®ä»¬ãæ¾ç¤ºè§é¢åææ¾é³é¢ï¼å¹¶è¯»åååæåå¹ï¼å°å®ä»¬æ¾ç¤ºå¨å±å¹ä¸ã
+
+<h4>MPlayer2 æ¯ä»ä¹ï¼</h4>
+MPlayer2 æ¯ä¸ä¸ª MPlayer çåæ¯ãMPlayer2 æä¾çä¸äº <a href="http://www.mplayer2.org/comparison.html">æ¹è¿ååè½</a> è¶è¿äº MPlayer ä¸ SMPlayer çå¼å®¹æ§ã
+
+<h4>æçå°ä¸äºå³äº Qt çä¸è¥¿ï¼é£æ¯ä»ä¹ï¼</h4>
+SMPlayer æ¯ä½¿ç¨ Qt å¼åçï¼è¿æ¯ä¸ä¸ªåè®¸è·¨å¹³å°å¼åç C++ åºã å®æä¾äºåä¸æºä»£ç å¯å¨ WindowsãLinux å Mac OS å¤ç³»ç»å¹³å°ä¸ç¼è¯çå¯ç§»æ¤æ§ãæ´å¤ä¿¡æ¯ï¼<a href="http://qt.nokia.com/products/">http://qt.nokia.com/products/</a>ã
+
+<h4>DVD èåï¼å®å¨åªéï¼</h4>
+å¨ SMPlayer ç âé©±å¨å¨â é¦éé¡¹ï¼éé¡¹ - é¦éé¡¹ - é©±å¨å¨ï¼ä¸ï¼å¯ç¨ âå¯ç¨ DVD èåï¼è¯éªï¼â éé¡¹ï¼å¹¶è®¾ç½®æ¨ç DVD é©±å¨å¨ãè¯¥åè½éè¦ä¸ä¸ªæè¿æå»ºçç¼è¯æ libdvdnav æ¯æç MPlayerã
+
+<h4>è¾åºé©±å¨ï¼directx, xv, x11, gl, alsa, oss...ï¼æ¯ä»ä¹å¢ï¼åªä¸ä¸ªæ¯æå¥½çï¼</h4>
+MPlayer æä¸äºç¨äºè§é¢åé³é¢çè¾åºé©±å¨ãSMPlayer åè®¸æ¨å¨å¶ä¸éæ©ä¸ä¸ªï¼é¦éé¡¹ -> å¸¸è§ -> è§é¢/é³é¢ï¼ã
+å¯¹äºè§é¢ï¼å»ºè®®æ¨ä½¿ç¨ xvï¼Linuxï¼æ directxï¼Windowsï¼ãå®ä»¬ä½¿ç¨ç¡¬ä»¶å éï¼å¯ä»¥è·å¾æä½³çæ§è½ãä½è¿å¯¹äº Windows Vista åæ´é«çæ¬ç¨æ·çä¸ä¾¿ä¹å¤æ¯ï¼ä½¿ç¨ directx ä¼å¯¼è´ç¦ç¨ Aeroã
+x11 å directxï¼ç¦ç¨å éï¼é©±å¨é½æ²¡æç¡¬ä»¶å éï¼å®ä»¬çæ§è½æå·®ï¼æ¤å¤ directxï¼ç¦ç¨å éï¼å¨å¨å±æ¨¡å¼ä¸çè´¨éä¹å¾å·®ã
+gl å gl2 å°ä½¿ç¨å¾å½¢å¡ç 3D å éï¼å®ä»¬æä¾çæ§è½ä¼äº directxï¼ç¦ç¨å éï¼å x11ï¼ä½éè²äº directx æ xv ãWindows Vista åæ´é«çæ¬çç¨æ·å¯ä»¥ä½¿ç¨ gl/gl2ã
+å¯¹äºå£°é³ï¼å¨ Linux ä¸æ¨éå¸¸åºè¯¥ä½¿ç¨ alsaãæä¸åæ¬¢ esd æ artsï¼å®ä»¬éè¦ä½¿ç¨æ´å¤ç CPUã
+å¨ Windows ä¸çå£°é³é©±å¨æ¯ dsound å win32ãæäºè§£å° dsound ææ¶å¯è½ä¼å¯¼è´ âé³é¢ - è§é¢ï¼A-Vï¼â åæ¥çé®é¢ï¼å¦ææ¨åç°æ¤é®é¢ï¼è¯·å°è¯ä½¿ç¨ win32 ä»£æ¿ã
+å¶ä»é©±å¨åè®¸æ¨ä¿åè§é¢ä¸ºå¾åæä»¶æå°å£°é³åå¥å°ç£çãSMPlayer ä¸æ£å¼æ¯æè¿äºé©±å¨ãè¯·å¨æ¨ç¥éèªå·±å¨åä»ä¹çæåµä¸ä½¿ç¨å®ä»¬ã
+
+<h4>æå°è¯æªå¾ï¼ä½è¯¥éé¡¹è¢«ç¦ç¨ï¼ä¸ºä»ä¹ï¼</h4>
+æ¨æ²¡æéæ©ä¸ä¸ªç¨äºåå¨å±å¹æªå¾çæä»¶å¤¹ãå¨ é¦éé¡¹ -> å¸¸è§ ä¸è®¾ç½®åï¼æªå¾éé¡¹å°è¢«å¯ç¨ã
+
+<h4>æå°è¯æ´æ¹é³è½¨ï¼ä½æ²¡æææï¼é³é¢ä»ç¶æ²¡åãæè¦åæ¢è§é¢å¹¶åæ¬¡ææ¾æå¯ä»¥æ´æ¹é³é¢ãä¸ºä»ä¹ï¼</h4>
+å¯¹äºæäºæ ¼å¼ï¼ä¾å¦ mp4 æ ogmï¼ï¼MPlayer æ æ³å¨è¿è¡æ¶æ´æ¹é³è½¨ãéè¿å° âå¿«éåæ¢é³è½¨âï¼é¦éé¡¹ -> é¦éé¡¹ï¼éé¡¹è®¾ç½®ä¸º âèªå¨â æ âå¦âï¼æ¨å°±å¯ä»¥æ´æ¹è¿äºæ ¼å¼çé³é¢ã
+
+<h4>æå¦ä½æ´æ¹å¿«æ·é®ï¼</h4>
+é¦éé¡¹ -> é®çåé¼ æ ãæ¨å°è½å¤æ´æ¹å¤§å¤æ°å¿«æ·é®ã
+
+<h4>æäºè§é¢æ ¼å¼æåªè½å¬å°é³é¢ï¼æ²¡æè§é¢ãä¸ºä»ä¹ï¼æéè¦ä¸äºç¼è§£ç å¨ï¼</h4>
+MPlayer å¯ä»¥ âå¼ç®±å³ç¨â ææ¾å¸¸è§çæ ¼å¼ãä½å¯¹äºé£äºåæ¬æªæ¯æçæ ¼å¼ï¼å¿é¡»å®è£äºè¿å¶ç¼è§£ç å¨åãæ¨å¯ä»¥ä» <a href="http://www.mplayerhq.hu/design7/dload.html">MPlayer ä¸è½½é¡µé¢</a> ä¸è·åã
+å¨ Windows ä¸ï¼å®è£ç¼è§£ç å¨å° mplayer\codecs åç®å½ãå¨ Linux åè¡çä¸ï¼è½¯ä»¶åä¸å¸¸å¸¸æå®ï¼å®å¯è½æ¯ w32codecs æç±»ä¼¼çåç§°ã
+
+<h4>âæå¼ -> å³éâ å âæå¼ -> éåºâ ä¹é´çåºå«æ¯ä»ä¹ï¼å®ä»¬æ¯å¦é½ä¸æ ·ï¼</h4>
+å¦æ âå¨ç³»ç»æçä¸æ¾ç¤ºå¾æ âï¼å¨ éé¡¹ èåä¸ï¼éé¡¹æ²¡æè¢«éä¸ï¼é£ä¹æ¯çï¼è¿ä¸¤ä¸ªéé¡¹é½ç¸åï¼éåºåºç¨ç¨åºã
+ä½å¦æè¯¥éé¡¹è¢«å¯ç¨ï¼æå¼ -> å³é å°åªéèåºç¨ç¨åºï¼å¹¶åæ¢å½åæ£å¨ææ¾çæä»¶ï¼ï¼ä½ SMPlayer ä»å¨è¿è¡ãè¿æ¶ä½¿ç¨ æå¼ -> éåº æè½éåºåºç¨ç¨åºï¼æ è®º âå¨ç³»ç»æçä¸æ¾ç¤ºå¾æ â éé¡¹æ¯å¦å¯ç¨ã
+
+<h4>æææ ·æè½ææ¾é³é¢ CD å¢ï¼</h4>
+0.5.18ï¼æä»¥ä¸çæ¬ï¼å·²å¢å å¯¹é³é¢ CD çæ¯æã
+ä½å¨ Windows ä¸æ æ³ææ¾é³é¢ CDã
+
+<h4>æå°è¯ææ¾ä¸ä¸ªæä»¶ä½æ²¡æä»»ä½ååºãä¸ºä»ä¹ï¼</h4>
+å¯è½æ¯ MPlayer æ æ³ææ¾è¯¥æä»¶ãæå¼ MPlayer æ¥å¿ï¼éé¡¹ -> æ¥çæ¥å¿ -> MPlayerï¼ï¼å¨ææ°çè¡ä¸æ¨å¯è½ä¼æ¾å°ä¸æ¡éè¯¯ä¿¡æ¯ã
+ä¸äºæ æç MPlayer ç¼è¯ç å¨ Windows ä¸ç¸å½æ®éï¼å ä¸ºå®ä»¬å¨ç¼è¯æ¶æ²¡ææ¯æä¸äº SMPlayer å°è¯ä½¿ç¨çåè½ï¼è¯¥éè¯¯ä¿¡æ¯å¯è½ä¼ç»æ¨ä¸äºçº¿ç´¢ãå¦ææ¯ç¼åï¼cacheï¼é®é¢ï¼æ¨å¯ä»¥å°è¯å¨ é¦éé¡¹ -> é¦éé¡¹ -> ç¼å ä¸ç¦ç¨ç¼åãå¦ææ¯åä½éç½®ï¼fontconfigï¼çé®é¢ï¼è¯·ä½¿ç¨ä¸ä¸ªç³»ç»ä¸ç TTF åä½ä»£æ¿ï¼é¦éé¡¹ -> åå¹ -> åä½åé¢è²ï¼ã
+
+<h4>å¾å¤èåéé¡¹ä¼è®©æ£å¨ææ¾çè§é¢ç¬é´åæç©ºç½ãä¸ºä»ä¹ï¼</h4>
+ä¸äºéé¡¹éè¦åæ¢ MPlayer è¿ç¨ï¼å¹¶ä»¥æ°çåæ°éæ°å¯å¨å®ãè¿å°±æ¯ä¸ºä»ä¹ææ¾æ¶ä¼ç¬é´ä¸æã
+
+<h4>SMPlayer å´©æºä»¥åï¼é³é¢è¿æ²¡æåæ¢ï¼ä¸ºä»ä¹ï¼</h4>
+SMPlayer å´©æºåï¼MPlayer ä»å¨è¿è¡ãæ¨å¯ä»¥å¨ä»»å¡ç®¡çå¨ä¸ç»æ MPlayer è¿ç¨ã
+æ è®ºå¦ä½ï¼å¦æ SMPlayer å´©æºï¼è¯´æè¿æ¯ä¸ä¸ªä¸¥éçéè¯¯ï¼bugï¼ï¼å®åºè¯¥è¢«ä¿®å¤ãè¯·æ¥åå®ã
+
+<h4>å»ºè®®ä½¿ç¨ä»ä¹çæ¬ç MPlayerï¼</h4>
+æå»ºè®®è³å°ä½¿ç¨ MPlayer SVN r33216ï¼2011-04-05ï¼æ MPlayer2ï¼å°½ç®¡ä» SVN/git è·åçææ°çæ¬ä¼æ´å¥½å°æ¹è¿ç¼è§£ç å¨æ¯æåéè¯¯ä¿®æ£ã
+SMPlayer å°å°½åå¼å®¹æ§ççæ¬ï¼ä½æäºéé¡¹å¯è½æ æ³å·¥ä½ã
+
+<h4>ææ³è®©åå¹å¨é»è²è¾¹æ¡ä¸æ¾ç¤ºï¼èä¸æ¯å¾åä¸ï¼æè¯¥æä¹åï¼</h4>
+è§é¢è¿æ»¤å¨ -> æ·»å é»è²è¾¹æ¡
+
+<h4>ææ³è®©ææè§é¢çåå¹é½æ¾ç¤ºå¨é»è²è¾¹æ¡ä¸ï¼è¿å¯è½åï¼</h4>
+æ¨å¯ä»¥å¨ é¦éé¡¹ -> é«çº§ -> MPlayer éé¡¹ ä¸æ·»å ä¸ä¸ªè§é¢è¿æ»¤å¨ï¼ä¾å¦ expand=:::::4/3ã
+å¶ä»å¯è½çéé¡¹ï¼
 <ul>
-<li>´ò¿ª Ê×Ñ¡Ïî -> ³£¹æ -> ÊÓÆµ£¬Ñ¡ÖÐ È«ÆÁÊ±Ìí¼ÓºÚÉ«±ß¿ò</li>
-<li>ÔÚ Ê×Ñ¡Ïî -> ¸ß¼¶ -> ¸ß¼¶ ÖÐµÄ¶¯×÷ÁÐ±íÎÄ±¾¿òÖÐÌí¼Ó add_letterbox true</li>
-</ul>
-</li>
-
-<li><a name="monitors"></a>
-(Windows) ÊÓÆµÖ»ÏÔÊ¾ÔÚµÚÒ»ÏÔÊ¾Æ÷£¬ÎÞ·¨ÏÔÊ¾ÔÚµÚ¶þÏÔÊ¾Æ÷ÉÏ£¬ÎªÊ²Ã´?
-µ±ÄúÊ¹ÓÃ directx ×÷ÎªÊÓÆµÇý¶¯(Ê×Ñ¡Ïî -> ³£¹æ -> ÊÓÆµ)Ê±£¬ÊÓÆµÖ»ÄÜ±»ÏÔÊ¾ÔÚÒ»Ì¨ÏÔÊ¾Æ÷ÉÏ¡£Èç¹ûÄúÊ¹ÓÃ gl¡¢gl2 »ò direct3d ´úÌæ£¬ÊÓÆµ½«¿ÉÒÔ±»ÏÔÊ¾ÔÚÈÎºÎÏÔÊ¾Æ÷¡£
-ÎÞÂÛÈçºÎ£¬Èç¹ûÄú¸üÏ²»¶Ê¹ÓÃ directx£¬Äú¿ÉÒÔÍ¨¹ý²Ëµ¥(ÊÓÆµ -> ÆÁÄ»)Ñ¡ÔñÒªÏÔÊ¾ÊÓÆµµÄÏÔÊ¾Æ÷¡£
-</li>
-
-<li><a name="screensaver1"></a>
-ÆÁÄ»±£»¤³ÌÐòÃ»ÓÐ¹Ø±Õ£¬ÎªÊ²Ã´?
-Èç¹ûÄúÊ¹ÓÃµÄÊÇ×îÐÂ°æ±¾µÄ MPlayer£¬Äú¿ÉÒÔÐèÒªÔÚÄúµÄ ~/.mplayer/config ÖÐÌí¼ÓÕâÑùÒ»ÐÐ:
-(GNOME »·¾³)<pre>heartbeat-cmd="gnome-screensaver-command -p &>/dev/null" </pre>
-(KDE »·¾³)<pre>heartbeat-cmd="dcop kdesktop KScreensaverIface enable false &>/dev/null && dcop kdesktop KScreensaverIface enable true &>/dev/null" </pre>
-¸ü¶àÐÅÏ¢Çëµ½ MPlayer µÄÁª»ú°ïÖúÖÐ¿´Ò»ÏÂ¡£
-</li>
-
-<li><a name="vista"></a>
-(Windows) ÎÒÓÃµÄÊÇ Windows Vista£¬Ã¿´Î²¥·ÅÊÓÆµÊ± Aero »á±»½ûÓÃ£¬ÎªÊ²Ã´?
-ÕâÖÖÇé¿ö»áÔÚÄúÊ¹ÓÃ directx ×÷ÎªÊÓÆµÇý¶¯(Ê×Ñ¡Ïî -> ³£¹æ -> ÊÓÆµ)Ê±·¢Éú¡£Äú¿ÉÒÔ½«Ëü¸ü¸ÄÎª gl¡¢gl2 »ò direct3d¡£
-</li>
-
-<li><a name="config_file"></a>
-ÅäÖÃÎÄ¼þÔÚÄÄÀï?
-SMPlayer Ê¹ÓÃÁ½¸ö ini ÎÄ¼þ: smplayer.ini ºÍ smplayer_files.ini¡£Ä¬ÈÏÇé¿öÏÂ¶¼´æ´¢ÔÚ $HOME/.config/smplayer (Linux) »ò C:\Documents and Settings\ÄúµÄÓÃ»§Ãû\.smplayer (Windows XP)¡¢C:\Users\ÄúµÄÓÃ»§Ãû\.smplayer (Windows Vista¡¢7)¡£
-ÄúÒ²¿ÉÒÔÔÚ SMPlayer ÈÕÖ¾(Ñ¡Ïî -> ²é¿´ÈÕÖ¾ -> SMPlayer) ÖÐ¿´µ½ËüµÄÂ·¾¶£¬¾ÍÏñÕâÐÐ: <pre> * ini path: '/home/ricardo/.config/smplayer' </pre>
-smplayer.ini ´æ´¢ SMPlayer µÄÅäÖÃ£¬Í¬Ê± smplayer_files.ini ´æ´¢Äú²¥·Å¹ýµÄÎÄ¼þµÄÉèÖÃ¡£
-</li>
+<li>æå¼ é¦éé¡¹ -> å¸¸è§ -> è§é¢ï¼éä¸ å¨å±æ¶æ·»å é»è²è¾¹æ¡</li>
+<li>å¨ é¦éé¡¹ -> é«çº§ -> é«çº§ ä¸çå¨ä½åè¡¨ææ¬æ¡ä¸æ·»å  add_letterbox true</li>
+</ul>
 
-</ol>
+<h4>å±å¹ä¿æ¤ç¨åºæ²¡æå³éï¼ä¸ºä»ä¹ï¼</h4>
+å¦ææ¨ä½¿ç¨çæ¯ææ°çæ¬ç MPlayerï¼æ¨å¯è½éè¦å¨æ¨ç ~/.mplayer/config ä¸æ·»å è¿æ ·ä¸è¡ï¼
+
+(gnome) 
+
+<pre>heartbeat-cmd="gnome-screensaver-command -p &amp;>/dev/null"</pre>
+
+(kde)
+
+<pre>heartbeat-cmd="dcop kdesktop KScreensaverIface enable false &amp;>/dev/null &amp;&amp; dcop kdesktop KScreensaverIface enable true &amp;>/dev/null"</pre>
+
+æ´å¤ä¿¡æ¯è¯·å° MPlayer çèæºå¸®å©ä¸çä¸ä¸ã
+
+<h4>MPlayer æ¯å¤çº¿ç¨çåï¼ææä¹æè½ååå©ç¨æææç CPU æ ¸å¿ï¼</h4>
+å¤çº¿ç¨è§£ç éè¦ä¸ä¸ªæè¿æå»ºç MPlayer æ FFmpeg-mtï¼Linuxï¼ãMPlayer2 èªå¨ä½¿ç¨æææ ¸å¿ï¼ä½ MPlayer éè¦æå¨è°æ´ãæ¨å¯ä»¥å¨ é¦éé¡¹ -> é¦éé¡¹ ä¸è°æ´è§£ç çº¿ç¨æ°ãå°å®è®¾ç½®ä¸ºçäºæå°äºæ¨çå¤çå¨çæ ¸å¿æ°éï¼æè¶çº¿ç¨ Inter CPU æåµä¸ççº¿ç¨æ°ï¼ãè®¾ç½®å®å¤§äºæ¨ç CPU å®éæ°éå°æ²¡æä»»ä½ææã
+
+<h4>æææ ·æè½è°æ´ OSDï¼å¨å±å¹ä¸æ¾ç¤ºï¼çåä½å¤§å°ï¼</h4>
+è¦è°æ´ OSDï¼MPlayer å¨å·¦ä¸è§æ¾ç¤ºçæ¶é´åå¶ä»ä¿¡æ¯ï¼çåä½å¤§å°ï¼è¯·å¨ é¦éé¡¹ -&gt; é«çº§ -&gt; MPlayer éé¡¹ ç éé¡¹: åæ®µä¸æ·»å ä»¥ä¸ï¼
+<pre>-subfont-autoscale 0 -subfont-osd-scale y</pre>
+
+å¶ä¸ y æ¯æ¨åå¥½çå¤§å°ã-subfont-osd-scale çé»è®¤å¼ä¸º 20ã
+
+<h4>éç½®æä»¶å¨åªéï¼</h4>
+ä¸»è¦ç SMPlayer éç½®æä»¶æ¯ smplayer.iniãæ ¹æ®æ¨çéç½®ï¼åä¸ªæä»¶çè®¾ç½®ä¿åå¨ smplayer_files.iniï¼ä¸ä¸ª ini æä»¶ï¼æåç®å½ file_settingsï¼å¤ä¸ª ini æä»¶ï¼ä¸ãæ ¹æ®æ¨çæä½ç³»ç»å®ä»¬ä½äºï¼
+<pre>Linux 	 $HOME/.config/smplayer
+Windows 2000/XP 	 C:\Documents and Settings\&lt;your_username&gt;\.smplayer
+Windows Vista/7 	 C:\Users\&lt;your_username&gt;\.smplayer</pre>
+
+æ¨è¿å¯ä»¥å¨ SMPlayer æ¥å¿ï¼éé¡¹ -> æ¥çæ¥å¿ -> SMPlayerï¼ä¸çå°å®çè·¯å¾ï¼å°±åè¿è¡ï¼
+<pre>
+ * ini path: '/home/ricardo/.config/smplayer'
+</pre>
+
+smplayer.ini åå¨ SMPlayer çéç½®ï¼è smplayer_files.ini åå¨æ¨ææ¾è¿çæä»¶çè®¾ç½®ã
+æ³¨æï¼å¨ Linux ä¸ï¼.config é»è®¤å¯è½ä¼è¢«éèãè¯·ç¡®å®æ¨çæä»¶ç®¡çå¨æ¯å¦å¯ç¨äºéèæä»¶ææä»¶å¤¹ã
+
+<h4>ï¼Windowsï¼è§é¢åªæ¾ç¤ºå¨ç¬¬ä¸æ¾ç¤ºå¨ï¼æ æ³æ¾ç¤ºå¨ç¬¬äºæ¾ç¤ºå¨ä¸ï¼ä¸ºä»ä¹ï¼</h4>
+å½æ¨ä½¿ç¨ directx ä½ä¸ºè§é¢é©±å¨ï¼é¦éé¡¹ -> å¸¸è§ -> è§é¢ï¼æ¶ï¼è§é¢åªè½è¢«æ¾ç¤ºå¨ä¸å°æ¾ç¤ºå¨ä¸ãå¦ææ¨ä½¿ç¨ glãgl2 æ direct3d ä»£æ¿ï¼è§é¢å°å¯ä»¥è¢«æ¾ç¤ºå¨ä»»ä½æ¾ç¤ºå¨ã
+æ è®ºå¦ä½ï¼å¦ææ¨æ´åæ¬¢ä½¿ç¨ directxï¼æ¨å¯ä»¥éè¿èåï¼è§é¢ -> å±å¹ï¼éæ©è¦æ¾ç¤ºè§é¢çæ¾ç¤ºå¨ã
+
+<h4>ï¼Windowsï¼æä½¿ç¨ Windows Vista ææ´æ°çæ¬æ¶ï¼ææ¯æ¬¡ææ¾è§é¢ Aero é½ä¼è¢«ç¦ç¨ï¼ä¸ºä»ä¹ï¼</h4>
+è¿ç§æåµä¼å¨æ¨ä½¿ç¨ directx ä½ä¸ºè§é¢é©±å¨ï¼é¦éé¡¹ -> å¸¸è§ -> è§é¢ï¼æ¶åçãæ¨å¯ä»¥å°å®æ´æ¹ä¸º glãgl2 æ direct3dã
+
+<h4>ï¼Windowsï¼ææ æ³æå¼å«æç¹æ®æéè±æåç¬¦çæä»¶ï¼ä¸ºä»ä¹ï¼</h4>
+å¦ææ¨æ æ³æå¼å«æç¹æ®æéè±æåç¬¦çæä»¶ï¼è¯·å¨ éé¡¹ -&gt; é¦éé¡¹ -&gt; é«çº§ ä¸å¯ç¨ ä¼ éçæä»¶å (8+3) è³ MPlayer æ¥è§£å³è¿ä¸ªé®é¢ã
 
 </body>
-</html>
+</html>
\ No newline at end of file

smplayer-0.8.0.tar.bz2/setup/scripts/install_smplayer.cmd -> smplayer-0.8.1.tar.bz2/setup/scripts/install_smplayer.cmd Changed

smplayer-0.8.0.tar.bz2/setup/scripts/make_pkgs.cmd -> smplayer-0.8.1.tar.bz2/setup/scripts/make_pkgs.cmd Changed

@@ -12,19 +12,27 @@
 echo.
 echo * Release Packages
 echo.
-echo 1 - Portable SMPlayer Package
-echo 2 - SMPlayer Package w/o MPlayer
-echo 3 - MPlayer Package
+echo 1 - NSIS SMPlayer Packages
+echo 2 - Portable SMPlayer Package
+echo 3 - SMPlayer Package w/o MPlayer
+echo 4 - MPlayer Package
 echo.
 echo * Update Packages
 echo.
-echo 4 - SMPlayer SVN Update Package
-echo 5 - Qt DLL Package
+echo 5 - SMPlayer SVN Update Package
+echo 6 - Qt DLL Package
 
 echo.
 
+:: Relative directory of all the source files to this script
 set TOP_LEVEL_DIR=..
 
+:: Reset in case ran again in same command prompt instance
+set SMPLAYER_VER=
+
+:: NSIS path
+set NSIS_PATH="C:\Program Files (x86)\NSIS\Unicode"
+
 set SMPLAYER_DIR=%TOP_LEVEL_DIR%\smplayer-build
 set MPLAYER_DIR=%TOP_LEVEL_DIR%\mplayer
 set OUTPUT_DIR=%TOP_LEVEL_DIR%\output
@@ -35,89 +43,165 @@
 set /P USER_CHOICE="Choose an action: "
 echo.
 
-if "%USER_CHOICE%" == "1" goto portable
-if "%USER_CHOICE%" == "2" goto nomplayer
-if "%USER_CHOICE%" == "3" goto mplayer
-if "%USER_CHOICE%" == "4" goto svn_updpkg
-if "%USER_CHOICE%" == "5" goto qtdlls
-if "%USER_CHOICE%" == "" goto end
+if "%USER_CHOICE%" == "1" (
+ goto nsispkg
+
+) else if "%USER_CHOICE%" == "2" (
+ goto portable
+
+) else if "%USER_CHOICE%" == "3" (
+ goto nomplayer
+
+) else if "%USER_CHOICE%" == "4" (
+ goto mplayer
+
+) else if "%USER_CHOICE%" == "5" (
+ goto svn_updpkg
+
+) else if "%USER_CHOICE%" == "6" (
+ goto qtdlls
+
+) else (
+ goto reask
+)
+
+:nsispkg
+
+echo --- Creating SMPlayer NSIS Packages ---
+echo.
+echo Format: VER_MAJOR.VER_MINOR.VER_BUILD.VER_REVISION
+echo Example: 0.8.1.0
+echo.
+echo Note: VER_REVISION must be defined as '0' if not used
+echo.
+
+:: Reset in case ran again in same command prompt instance
+set VER_MAJOR=
+set VER_MINOR=
+set VER_BUILD=
+set VER_REVISION=
+
+set /P VER_MAJOR="VER_MAJOR: "
+set /P VER_MINOR="VER_MINOR: "
+set /P VER_BUILD="VER_BUILD: "
+set /P VER_REVISION="VER_REVISION: "
+
+echo.
+
+if %VER_REVISION% neq 0 (
+
+%NSIS_PATH%\makensis.exe /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% /DVER_REVISION=%VER_REVISION% %TOP_LEVEL_DIR%\smplayer.nsi
+rem %NSIS_PATH%\makensis.exe /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% /DVER_REVISION=%VER_REVISION% /DWIN64 %TOP_LEVEL_DIR%\smplayer.nsi
+rem %NSIS_PATH%\makensis.exe /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% /DVER_REVISION=%VER_REVISION% /DWIN64 %TOP_LEVEL_DIR%\smplayer.full.nsi
+
+) else (
+
+%NSIS_PATH%\makensis.exe /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% %TOP_LEVEL_DIR%\smplayer.nsi
+rem %NSIS_PATH%\makensis.exe /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% /DWIN64 %TOP_LEVEL_DIR%\smplayer.nsi
+rem %NSIS_PATH%\makensis.exe /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% /DWIN64 %TOP_LEVEL_DIR%\smplayer.full.nsi
+
+)
+
+echo.
+
+goto end
 
 :portable
 echo --- Creating SMPlayer Portable Package ---
 echo.
 
 set /P SMPLAYER_VER="SMPlayer Version: "
-if "%SMPLAYER_VER%"=="" exit
+if "%SMPLAYER_VER%"=="" goto end
 echo.
 
+:: Check for portable exes
+if not exist %PORTABLE_EXE_DIR%\smplayer-portable.exe (
+ echo SMPlayer portable EXE not found!
+	goto end
+)
+
+if not exist %PORTABLE_EXE_DIR%\smtube-portable.exe (
+ echo SMTube portable EXE not found!
+	goto end
+)
+
 ren %SMPLAYER_DIR% smplayer-portable-%SMPLAYER_VER%
-set SMPLAYER_DIR=%TOP_LEVEL_DIR%\smplayer-portable-%SMPLAYER_VER%
+set SMPLAYER_PORTABLE_DIR=%TOP_LEVEL_DIR%\smplayer-portable-%SMPLAYER_VER%
+
+if not exist %TOP_LEVEL_DIR%\smplayer-portable-%SMPLAYER_VER% (
+ echo Oops! Unable to find renamed directory, make sure no files are opened.
+	goto end
+)
 
 echo.
 echo ###### Backing up files #######
 echo.
 
-ren %SMPLAYER_DIR%\smplayer.exe smplayer.bak
-ren %SMPLAYER_DIR%\mplayer\mplayer\config config.bak
+ren %SMPLAYER_PORTABLE_DIR%\smplayer.exe smplayer.bak
+ren %SMPLAYER_PORTABLE_DIR%\smtube.exe smtube.bak
+ren %SMPLAYER_PORTABLE_DIR%\mplayer\mplayer\config config.bak
 
 echo.
 echo ###### Create screenshots dir. #######
 echo.
 
-mkdir %SMPLAYER_DIR%\screenshots
+mkdir %SMPLAYER_PORTABLE_DIR%\screenshots
 
 echo.
 echo ###### Create smplayer.ini #######
 echo.
 
-echo %%General>> %SMPLAYER_DIR%\smplayer.ini
-echo screenshot_directory=.\\screenshots>> %SMPLAYER_DIR%\smplayer.ini
-echo.>> %SMPLAYER_DIR%\smplayer.ini
-echo advanced>> %SMPLAYER_DIR%\smplayer.ini
-echo mplayer_additional_options=-nofontconfig>> %SMPLAYER_DIR%\smplayer.ini
+echo %%General>> %SMPLAYER_PORTABLE_DIR%\smplayer.ini
+echo screenshot_directory=.\\screenshots>> %SMPLAYER_PORTABLE_DIR%\smplayer.ini
+echo.>> %SMPLAYER_PORTABLE_DIR%\smplayer.ini
+echo advanced>> %SMPLAYER_PORTABLE_DIR%\smplayer.ini
+echo mplayer_additional_options=-nofontconfig>> %SMPLAYER_PORTABLE_DIR%\smplayer.ini
 
 echo.
 echo ###### Create smplayer_orig.ini #######
 echo.
 
-echo %%General>> %SMPLAYER_DIR%\smplayer_orig.ini
-echo screenshot_directory=.\\screenshots>> %SMPLAYER_DIR%\smplayer_orig.ini
-echo.>> %SMPLAYER_DIR%\smplayer_orig.ini
-echo advanced>> %SMPLAYER_DIR%\smplayer_orig.ini
-echo mplayer_additional_options=-nofontconfig>> %SMPLAYER_DIR%\smplayer_orig.ini
+echo %%General>> %SMPLAYER_PORTABLE_DIR%\smplayer_orig.ini
+echo screenshot_directory=.\\screenshots>> %SMPLAYER_PORTABLE_DIR%\smplayer_orig.ini
+echo.>> %SMPLAYER_PORTABLE_DIR%\smplayer_orig.ini
+echo advanced>> %SMPLAYER_PORTABLE_DIR%\smplayer_orig.ini
+echo mplayer_additional_options=-nofontconfig>> %SMPLAYER_PORTABLE_DIR%\smplayer_orig.ini
 
 echo.
 echo ###### Create mplayer config #######
 echo.
 
-echo ## MPlayer Windows configuration>> %SMPLAYER_DIR%\mplayer\mplayer\config
-echo.>> %SMPLAYER_DIR%\mplayer\mplayer\config
-echo subfont=c:\windows\fonts\arial.ttf>> %SMPLAYER_DIR%\mplayer\mplayer\config
-echo ^<cachedir^>../fontconfig^</cachedir^>> %SMPLAYER_DIR%\mplayer\fonts\local.conf
+echo ## MPlayer Windows configuration>> %SMPLAYER_PORTABLE_DIR%\mplayer\mplayer\config
+echo.>> %SMPLAYER_PORTABLE_DIR%\mplayer\mplayer\config
+echo subfont=c:\windows\fonts\arial.ttf>> %SMPLAYER_PORTABLE_DIR%\mplayer\mplayer\config
+echo ^<cachedir^>../fontconfig^</cachedir^>> %SMPLAYER_PORTABLE_DIR%\mplayer\fonts\local.conf
 
 echo.
 echo ###### Copying portable .exe #######
 echo.
 
-copy /y %PORTABLE_EXE_DIR%\smplayer-portable.exe %SMPLAYER_DIR%\smplayer.exe
+copy /y %PORTABLE_EXE_DIR%\smplayer-portable.exe %SMPLAYER_PORTABLE_DIR%\smplayer.exe
+copy /y %PORTABLE_EXE_DIR%\smtube-portable.exe %SMPLAYER_PORTABLE_DIR%\smtube.exe
 
 echo.
 echo ###### Creating portable package #######
 echo.
-7za a -t7z %OUTPUT_DIR%\smplayer-portable-%SMPLAYER_VER%.7z %SMPLAYER_DIR% -xr!*.bak -xr!qxtcore.dll -mx9
+7za a -t7z %OUTPUT_DIR%\smplayer-portable-%SMPLAYER_VER%.7z %SMPLAYER_PORTABLE_DIR% -xr!*.bak -xr!qxtcore.dll -mx9
 
 echo.
 echo Restoring source folder(s) back to its original state...
 echo.
-rmdir %SMPLAYER_DIR%\screenshots
-del %SMPLAYER_DIR%\smplayer.ini
-del %SMPLAYER_DIR%\smplayer_orig.ini
-del %SMPLAYER_DIR%\smplayer.exe
-del %SMPLAYER_DIR%\mplayer\mplayer\config
-del %SMPLAYER_DIR%\mplayer\fonts\local.conf
-ren %SMPLAYER_DIR%\smplayer.bak smplayer.exe
-ren %SMPLAYER_DIR%\mplayer\mplayer\config.bak config
-ren %SMPLAYER_DIR% smplayer-build
+rmdir %SMPLAYER_PORTABLE_DIR%\screenshots
+del %SMPLAYER_PORTABLE_DIR%\smplayer.ini
+del %SMPLAYER_PORTABLE_DIR%\smplayer_orig.ini
+del %SMPLAYER_PORTABLE_DIR%\smplayer.exe
+del %SMPLAYER_PORTABLE_DIR%\smtube.exe
+del %SMPLAYER_PORTABLE_DIR%\mplayer\mplayer\config
+del %SMPLAYER_PORTABLE_DIR%\mplayer\fonts\local.conf
+ren %SMPLAYER_PORTABLE_DIR%\smplayer.bak smplayer.exe
+ren %SMPLAYER_PORTABLE_DIR%\smtube.bak smtube.exe
+ren %SMPLAYER_PORTABLE_DIR%\mplayer\mplayer\config.bak config
+ren %SMPLAYER_PORTABLE_DIR% smplayer-build
 
 goto end
 
@@ -126,7 +210,7 @@
 echo.
 
 set /P SMPLAYER_VER="SMPlayer Version: "
-if "%SMPLAYER_VER%"=="" exit
+if "%SMPLAYER_VER%"=="" goto end
 echo.
 
 ren %SMPLAYER_DIR% smplayer-%SMPLAYER_VER%
@@ -151,7 +235,7 @@
 ren %MPLAYER_DIR% mplayer-svn-%MP_REV%
 set MPLAYER_DIR=%TOP_LEVEL_DIR%\mplayer-svn-%MP_REV%
 
-7za a -t7z %OUTPUT_DIR%\mplayer-svn-%MP_REV%.7z %MPLAYER_DIR% -mx9
+7za a -t7z %OUTPUT_DIR%\mplayer-svn-%MP_REV%.7z %MPLAYER_DIR% -xr!mencoder.exe -mx9
 
 ren %MPLAYER_DIR% mplayer
 set MPLAYER_DIR=%TOP_LEVEL_DIR%\mplayer
@@ -167,7 +251,7 @@
 echo.
 
 set /P SMPLAYER_SVN="SMPlayer SVN Revision: "
-if "%SMPLAYER_SVN%"=="" exit
+if "%SMPLAYER_SVN%"=="" goto end
 
 7za a -t7z %OUTPUT_DIR%\smplayer_update_svn_r%SMPLAYER_SVN%.7z %SMPLAYER_DIR%\smplayer.exe %SMPLAYER_DIR%\translations -mx9
 
@@ -176,7 +260,7 @@
 :qtdlls
 
 set /P QTVER="Qt Version: "
-if "%QTVER%"=="" exit
+if "%QTVER%"=="" goto end
 
 echo.
 echo --- Creating Qt DLL Package ---

smplayer-0.8.0.tar.bz2/setup/smplayer.nsi -> smplayer-0.8.1.tar.bz2/setup/smplayer.nsi Changed

@@ -1,6 +1,6 @@
-; Installer script for win32 SMPlayer
+; Installer script for win32/win64 SMPlayer
 ; Written by redxii (redxii@users.sourceforge.net)
-; Tested/Developed with Unicode NSIS 2.46.4
+; Tested/Developed with Unicode NSIS 2.46.5
 
 !ifndef VER_MAJOR | VER_MINOR | VER_BUILD
   !error "Version information not defined (or incomplete). You must define: VER_MAJOR, VER_MINOR, VER_BUILD."
@@ -49,14 +49,6 @@
   !define DEFAULT_CODECS_VERSION "windows-essential-20071007"
 !endif
 
-!ifndef WITH_MPLAYER
-
-  !ifndef DEFAULT_MPLAYER_VERSION
-    !define DEFAULT_MPLAYER_VERSION "mplayer-svn-33216"
-  !endif
-
-!endif
-
   ;Version control
 !ifndef VERSION_FILE_URL
   !define VERSION_FILE_URL "http://smplayer.sourceforge.net/mplayer-version-info"
@@ -69,19 +61,9 @@
   Name "SMPlayer ${SMPLAYER_VERSION}"
   BrandingText "SMPlayer for Windows v${SMPLAYER_VERSION}"
 !ifdef WIN64
-  !ifdef WITH_MPLAYER
-    OutFile "smplayer-${SMPLAYER_VERSION}-x64.exe"
-  !else ifndef WITH_MPLAYER
-    OutFile "smplayer-${SMPLAYER_VERSION}-dl-x64.exe"
-  !endif
+  OutFile "output\smplayer-${SMPLAYER_VERSION}-x86_64.exe"
 !else
-  !ifdef WITH_MPLAYER
-    ;OutFile "smplayer-${SMPLAYER_VERSION}-x86.exe"
-    OutFile "smplayer-${SMPLAYER_VERSION}-win32.exe"
-  !else ifndef WITH_MPLAYER
-    ;OutFile "smplayer-${SMPLAYER_VERSION}-dl-x86.exe"
-    OutFile "smplayer-${SMPLAYER_VERSION}-webdl.exe"
-  !endif
+  OutFile "output\smplayer-${SMPLAYER_VERSION}-x86.exe"
 !endif
 
   ;Version tab properties
@@ -91,19 +73,9 @@
   VIAddVersionKey "FileVersion" "${SMPLAYER_VERSION}"
   VIAddVersionKey "LegalCopyright" ""
 !ifdef WIN64
-  !ifdef WITH_MPLAYER
-    VIAddVersionKey "FileDescription" "SMPlayer Installer x64 (Offline)"
-  !else ifndef WITH_MPLAYER
-    VIAddVersionKey "FileDescription" "SMPlayer Installer x64 (Web Downloader)"
-  !endif
+  VIAddVersionKey "FileDescription" "SMPlayer Installer (64-bit)"
 !else
-  !ifdef WITH_MPLAYER
-    ;VIAddVersionKey "FileDescription" "SMPlayer Installer x86 (Offline)"
-    VIAddVersionKey "FileDescription" "SMPlayer Installer (Offline)"
-  !else ifndef WITH_MPLAYER
-    ;VIAddVersionKey "FileDescription" "SMPlayer Installer x86 (Web Downloader)"
-    VIAddVersionKey "FileDescription" "SMPlayer Installer (Web Downloader)"
-  !endif
+  VIAddVersionKey "FileDescription" "SMPlayer Installer (32-bit)"
 !endif
 
   ;Default installation folder
@@ -125,7 +97,6 @@
 ;--------------------------------
 ;Variables
 
-  Var Codec_Version
   Var Dialog_Reinstall
   Var Inst_Type
   Var Previous_Version
@@ -139,6 +110,7 @@
   Var Reinstall_UninstallButton
   Var Reinstall_UninstallButton_State
   Var SMPlayer_Path
+  Var SMPlayer_UnStrPath
   Var SMPlayer_StartMenuFolder
 
 ;--------------------------------
@@ -306,13 +278,13 @@
   ${If} $Reinstall_Uninstall == 1
 
     ${If} $Reinstall_UninstallButton_State == 1
-      Exec '"$SMPlayer_Path\uninst.exe" /X'
+      Exec '"$SMPlayer_UnStrPath" /X'
       Quit
     ${ElseIf} $Reinstall_OverwriteButton_State == 1
       ${If} "$INSTDIR" == "$SMPlayer_Path"
-        ExecWait '"$SMPlayer_Path\uninst.exe" /S /R _?=$SMPlayer_Path'
+        ExecWait '"$SMPlayer_UnStrPath" /S /R _?=$SMPlayer_Path'
       ${Else}
-        ExecWait '"$SMPlayer_Path\uninst.exe" /S /R'
+        ExecWait '"$SMPlayer_UnStrPath" /S /R'
       ${EndIf}
     ${EndIf}
 
@@ -353,7 +325,7 @@
 ;Shortcuts
 SectionGroup $(ShortcutGroupTitle)
 
-  ${MementoUnselectedSection} $(Section_DesktopShortcut) SecDesktopShortcut
+  ${MementoSection} $(Section_DesktopShortcut) SecDesktopShortcut
 
     SetOutPath "$INSTDIR"
     CreateShortCut "$DESKTOP\SMPlayer.lnk" "$INSTDIR\smplayer.exe"
@@ -367,7 +339,7 @@
       CreateDirectory "$SMPROGRAMS\$SMPlayer_StartMenuFolder"
       CreateShortCut "$SMPROGRAMS\$SMPlayer_StartMenuFolder\SMPlayer.lnk" "$INSTDIR\smplayer.exe"
       CreateShortCut "$SMPROGRAMS\$SMPlayer_StartMenuFolder\SMTube.lnk" "$INSTDIR\smtube.exe"
-      WriteINIStr    "$SMPROGRAMS\$SMPlayer_StartMenuFolder\SMPlayer on the Web.url" "InternetShortcut" "URL" "http://smplayer.sf.net"
+      WriteINIStr    "$SMPROGRAMS\$SMPlayer_StartMenuFolder\SMPlayer on the Web.url" "InternetShortcut" "URL" "http://smplayer.sourceforge.net"
       CreateShortCut "$SMPROGRAMS\$SMPlayer_StartMenuFolder\Uninstall SMPlayer.lnk" "$INSTDIR\${SMPLAYER_UNINST_EXE}"
     !insertmacro MUI_STARTMENU_WRITE_END
 
@@ -383,63 +355,19 @@
 
     SectionIn RO
 
-!ifdef WITH_MPLAYER
     SetOutPath "$INSTDIR\mplayer"
     File /r "${SMPLAYER_BUILD_DIR}\mplayer\*.*"
 
     WriteRegDWORD HKLM "${SMPLAYER_REG_KEY}" Installed_MPlayer 0x1
-!else ifndef WITH_MPLAYER
-    AddSize 16800
-
-    Var /GLOBAL MPlayer_Version
-
-    Call GetVerInfo
-
-    /* Read from version-info
-    If it was unable to download, set version to that defined in the
-    beginning of the script. */
-    ${If} ${FileExists} "$PLUGINSDIR\version-info"
-      ReadINIStr $MPlayer_Version "$PLUGINSDIR\version-info" smplayer mplayer
-    ${Else}
-      StrCpy $MPlayer_Version ${DEFAULT_MPLAYER_VERSION}
-    ${EndIf}
-
-    retry_mplayer:
-
-    DetailPrint $(MPlayer_DL_Msg)
-    inetc::get /CONNECTTIMEOUT 15000 /RESUME "" /BANNER $(MPlayer_DL_Msg) /CAPTION $(MPlayer_DL_Msg) \"http://downloads.sourceforge.net/smplayer/$MPlayer_Version.7z?big_mirror=0" \
-    "$PLUGINSDIR\$MPlayer_Version.7z" /END
-    Pop $R0
-    StrCmp $R0 OK 0 check_mplayer
 
-    DetailPrint $(Info_Files_Extract)
-    nsExec::Exec '"$PLUGINSDIR\7za.exe" x "$PLUGINSDIR\$MPlayer_Version.7z" -y -o"$PLUGINSDIR"'
-
-    CreateDirectory "$INSTDIR\mplayer"
-    CopyFiles /SILENT "$PLUGINSDIR\$MPlayer_Version\*" "$INSTDIR\mplayer"
-
-    check_mplayer:
-
-    ${If} $R0 != "OK"
-      DetailPrint $(MPlayer_DL_Failed)
-    ${EndIf}
-
-    IfFileExists "$INSTDIR\mplayer\mplayer.exe" mplayerInstSuccess mplayerInstFailed
-      mplayerInstSuccess:
-        WriteRegDWORD HKLM "${SMPLAYER_REG_KEY}" Installed_MPlayer 0x1
-        Goto done
-      mplayerInstFailed:
-        MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(MPlayer_DL_Retry) /SD IDCANCEL IDRETRY retry_mplayer
-        Abort $(MPlayer_Inst_Failed)
-
-    done:
-!endif
   SectionEnd
 
   Section /o $(Section_MPlayerCodecs) SecCodecs
 
     AddSize 22300
 
+    Var /GLOBAL Codec_Version
+
     Call GetVerInfo
 
     /* Read from version-info
@@ -533,11 +461,11 @@
 !endif
   WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "DisplayIcon" "$INSTDIR\smplayer.exe"
   WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "DisplayVersion" "${SMPLAYER_VERSION}"
-  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "HelpLink" "http://smplayer.berlios.de/forum"
+  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "HelpLink" "http://smplayer.sourceforge.net/forum"
   WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "Publisher" "Ricardo Villalba"
   WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "UninstallString" "$INSTDIR\${SMPLAYER_UNINST_EXE}"
-  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "URLInfoAbout" "http://smplayer.sf.net"
-  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "URLUpdateInfo" "http://smplayer.sf.net"
+  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "URLInfoAbout" "http://smplayer.sourceforge.net"
+  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "URLUpdateInfo" "http://smplayer.sourceforge.net"
   WriteRegDWORD HKLM "${SMPLAYER_UNINST_KEY}" "NoModify" "1"
   WriteRegDWORD HKLM "${SMPLAYER_UNINST_KEY}" "NoRepair" "1"
 
@@ -582,7 +510,9 @@
   !insertmacro ${_action} ".m2v"
   !insertmacro ${_action} ".m3u"
   !insertmacro ${_action} ".m3u8"
+  !insertmacro ${_action} ".m4a"
   !insertmacro ${_action} ".m4v"
+  !insertmacro ${_action} ".mka"
   !insertmacro ${_action} ".mkv"
   !insertmacro ${_action} ".mov"
   !insertmacro ${_action} ".mp3"
@@ -592,9 +522,11 @@
   !insertmacro ${_action} ".mpv"
   !insertmacro ${_action} ".mqv"
   !insertmacro ${_action} ".nsv"
+  !insertmacro ${_action} ".oga"
   !insertmacro ${_action} ".ogg"
   !insertmacro ${_action} ".ogm"
   !insertmacro ${_action} ".ogv"
+  !insertmacro ${_action} ".ogx"
   !insertmacro ${_action} ".pls"
   !insertmacro ${_action} ".ra"
   !insertmacro ${_action} ".ram"
@@ -612,6 +544,7 @@
   !insertmacro ${_action} ".webm"
   !insertmacro ${_action} ".wma"
   !insertmacro ${_action} ".wmv"
+  !insertmacro ${_action} ".wtv"
 !macroend
 
 !macro WriteRegStrSupportedTypes EXT
@@ -676,10 +609,10 @@
 Function ${UN}RunCheck
 
   retry_runcheck:
-  FindProcDLL::FindProc "smplayer.exe"
-  IntCmp $R0 1 0 +3
-    MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(SMPlayer_Is_Running) /SD IDCANCEL IDRETRY retry_runcheck
-    Abort
+	FindProcDLL::FindProc "smplayer.exe"
+	IntCmp $R0 1 0 +3
+		MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(SMPlayer_Is_Running) /SD IDCANCEL IDRETRY retry_runcheck
+		Abort
 
 FunctionEnd
 !macroend
@@ -691,6 +624,12 @@
 
 Function .onInit
 
+  ${Unless} ${AtLeastWinXP}
+    MessageBox MB_YESNO|MB_ICONSTOP $(OS_Not_Supported) /SD IDNO IDYES installonoldwindows
+    Abort
+	installonoldwindows:
+  ${EndIf}
+
 !ifdef WIN64
   ${IfNot} ${RunningX64}
     MessageBox MB_OK|MB_ICONSTOP $(Win64_Required)
@@ -720,10 +659,6 @@
   ${EndIf}
 !endif
 
-  !ifdef PRE_RELEASE
-    MessageBox MB_OK|MB_ICONINFORMATION "This is a pre-release version of SMPlayer. Please report all issues."
-  !endif
-
   ;Check if setup is already running
   System::Call 'kernel32::CreateMutexW(i 0, i 0, t "SMPlayerSetup") i .r1 ?e'
   Pop $R0
@@ -777,6 +712,7 @@
 
   ClearErrors
   ReadRegStr $Previous_Version HKLM "${SMPLAYER_REG_KEY}" "Version"
+  ReadRegStr $SMPlayer_UnStrPath HKLM "${SMPLAYER_UNINST_KEY}" "UninstallString"
   ReadRegStr $SMPlayer_Path HKLM "${SMPLAYER_REG_KEY}" "Path"
 
   ${IfNot} ${Errors}
@@ -1006,7 +942,7 @@
 
 !ifdef WIN64
   ${IfNot} ${RunningX64}
-    MessageBox MB_OK|MB_ICONSTOP "This installation can only be uninstalled on 64-bit Windows."
+    MessageBox MB_OK|MB_ICONSTOP $(Uninstaller_64bitOnly)
     Abort
   ${EndIf}

smplayer-0.8.0.tar.bz2/setup/translations/basque.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/basque.nsh Changed

@@ -4,16 +4,17 @@
 ;Save file as UTF-8 w/ BOM
 ;
 
-!insertmacro LANGFILE "Basque" "Euskera"
+!insertmacro LANGFILE "Basque" "Euskara"
 
 ; Startup
 ${LangFileString} Installer_Is_Running "Ezartzailea jadanik lanean dago."
 ${LangFileString} Installer_No_Admin "Administratzaile bezala saioa hasita egon behar duzu programa hau ezartzerakoan."
-${LangFileString} SMPlayer_Is_Running "An instance of SMPlayer is running. Please exit SMPlayer and try again."
+${LangFileString} SMPlayer_Is_Running "SMPlayerren eskabide bat lanean ari da. Mesedez irten SMPlayerretik eta saiatu berriro."
 
-${LangFileString} Win64_Required "A 64-bit Windows operating system is required to install this software."
-${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
-${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
+${LangFileString} Win64_Required "64-biteko Windows sistema eragile bat behar da software hau ezartzeko."
+${LangFileString} Existing_32bitInst "32-biteko SMPlayer ezarpen bat dago. Lehenik 32-biteko SMPlayer kendu behar duzu."
+${LangFileString} Existing_64bitInst "64-biteko SMPlayer ezarpen bat dago. Lehenik 64-biteko SMPlayer kendu behar duzu."
 
 ; Components Page
 ${LangFileString} ShortcutGroupTitle "Lasterbideak"
@@ -29,11 +30,7 @@
 ${LangFileString} Section_StartMenu_Desc "Sortu SMPlayer sarrera bat Hasiera Menuan."
 
 ${LangFileString} Section_MPlayer "MPlayer (beharrezkoa)"
-!ifdef WITH_MPLAYER
 ${LangFileString} Section_MPlayer_Desc "MPlayer; beharrezkoa irakurketarako."
-!else ifndef WITH_MPLAYER
-${LangFileString} Section_MPlayer_Desc "MPlayer; beharrezkoa irakurketarako. (Internet Elkarketa beharrezkoa da ezarpenerako)"
-!endif
 
 ${LangFileString} Section_MPlayerCodecs "Kodek Binarioak"
 !ifdef WITH_CODECS
@@ -44,32 +41,32 @@
 
 ${LangFileString} Section_MEncoder_Desc "MPlayer laguntzen duen programa bat erabili daiteke kodeatzeko edo eraldatzeko sostengatutako audio edo bideo jarioak."
 
-${LangFileString} Section_IconThemes "Ikono Gaiak"
-${LangFileString} Section_IconThemes_Desc "SMPlayer-entzako ikono gai gehigarriak."
+${LangFileString} Section_IconThemes "Ikur Gaiak"
+${LangFileString} Section_IconThemes_Desc "SMPlayer-entzako ikur gai gehigarriak."
 
 ${LangFileString} Section_Translations "Hizkuntzak"
 ${LangFileString} Section_Translations_Desc "SMPlayer-entzako Ez Ingelerazko hizkuntza agiriak."
 
-${LangFileString} MPlayer_Codec_Msg "Kodek binario paketeek jatorrizkoan ez dauden kodek sostengua gehitzen dute, RealVideo aldaera berrienak eta formato ez arrunt asko bezalakoak.$\nOhartu hauek ez direla beharrezkoak formato arruntenak irakurtzeko, DVD, MPEG-1/2/4, etab."
+${LangFileString} MPlayer_Codec_Msg "Kodek binario paketeek jatorrizkoan ez dauden kodek sostengua gehitzen dute, RealVideo aldaera berrienak eta formato ez arrunt asko bezalakoak.$\nOhartu hauek ez direla beharrezkoak heuskarri arruntenak irakurtzeko, DVD, MPEG-1/2/4, etab."
 
 ; Upgrade/Reinstall Page
-${LangFileString} Reinstall_Header_Text "Select Install Type"
-${LangFileString} Reinstall_Header_SubText "Select Overwrite or Uninstall mode."
+${LangFileString} Reinstall_Header_Text "Hautatu Ezarpen Mota"
+${LangFileString} Reinstall_Header_SubText "Hautatu Gainidatzi edo Kendu modua."
 
-${LangFileString} Reinstall_Msg1 "You have an existing installation of SMPlayer in the following folder:"
-${LangFileString} Reinstall_Msg2 "Please select how to proceed:"
-${LangFileString} Reinstall_Overwrite "Overwrite ($Inst_Type) the existing installation"
-${LangFileString} Reinstall_Uninstall "Uninstall (remove) the existing installation"
-${LangFileString} Reinstall_Msg3_1 "Click Start when ready to proceed."
-${LangFileString} Reinstall_Msg3_2 "Click Next when ready to proceed."
-${LangFileString} Reinstall_Msg3_3 "Click Uninstall when ready to proceed."
-${LangFileString} Reinstall_Msg4 "Change Installation Settings"
+${LangFileString} Reinstall_Msg1 "Jadanik baduzu SMPlayerren ezarpen bat agiritegi honetan:"
+${LangFileString} Reinstall_Msg2 "Mesedez hautatu nola jarraitu:"
+${LangFileString} Reinstall_Overwrite "Gainidatzi ($Inst_Type) dagoen ezarpena"
+${LangFileString} Reinstall_Uninstall "Kendu (kendu) dagoen ezarpena"
+${LangFileString} Reinstall_Msg3_1 "Klikatu Hasi jarraitzeko gertu zaudenean."
+${LangFileString} Reinstall_Msg3_2 "Klikatu Hurrengoa jarraitzeko gertu zaudenean."
+${LangFileString} Reinstall_Msg3_3 "Klikatu Kendu jarraitzeko gertu zaudenean."
+${LangFileString} Reinstall_Msg4 "Aldatu Ezarpenaren Hobespenak"
 
-${LangFileString} Type_Reinstall "reinstall"
-${LangFileString} Type_Downgrade "downgrade"
-${LangFileString} Type_Upgrade "upgrade"
+${LangFileString} Type_Reinstall "berrezarri"
+${LangFileString} Type_Downgrade "aurrekoratu"
+${LangFileString} Type_Upgrade "eguneratu"
 
-${LangFileString} StartBtn "Start"
+${LangFileString} StartBtn "Hasi"
 
 ; MPlayer Section
 ${LangFileString} MPlayer_DL_Msg "MPlayer jeisten..."
@@ -88,9 +85,10 @@
 ${LangFileString} VerInfo_DL_Failed "Hutsegitea bertsio argibideak jeisterakoan: '$R0'. Berezko bertsioa erabiltzen."
 
 ; Uninstaller
-${LangFileString} Uninstaller_No_Admin "Ezarpen hau administrari eskubidea duen erabiltzaileak bakarrik kendu dezake."
+${LangFileString} Uninstaller_No_Admin "Ezarpen hau administratzaile eskubidea duen erabiltzaileak bakarrik kendu dezake."
 ${LangFileString} Uninstaller_Aborted "Kentzea erabiltzaileak utzita."
 ${LangFileString} Uninstaller_NotInstalled "Ez da agertzen SMPlayer zuzenbidean ezarrita dagoenik '$INSTDIR'.$\r$\nJarraitu horrela ere (ez da gomendagarria)?"
+${LangFileString} Uninstaller_64bitOnly "Ezarpen hau 64-biteko Windowsetik bakarrik kendu daiteke."
 
 ; Vista & Later Default Programs Registration
 ${LangFileString} Application_Description "SMPlayer aurrealde-amaiera oso bat da MPlayer-entzat, ohinarrizko eginkizunetatik: Bideo, DVD, VCD irakurketatik, eginkizun aurreratuenetarainok: MPlayer iragazkiak, edl zerrenda, eta gehiago."
@@ -100,5 +98,5 @@
 ${LangFileString} Info_Del_Registry "Erresgistro Giltzak Ezabatzen..."
 ${LangFileString} Info_Del_Shortcuts "Lasterbideak Ezabatzen..."
 ${LangFileString} Info_Rest_Assoc "Agiri elkarketak birrezartzen..."
-${LangFileString} Info_RollBack "Rolling back changes..."
+${LangFileString} Info_RollBack "Aldaketak desegiten..."
 ${LangFileString} Info_Files_Extract "Agiriak ateratzen..."

smplayer-0.8.0.tar.bz2/setup/translations/catalan.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/catalan.nsh Changed

@@ -11,6 +11,7 @@
 ${LangFileString} Installer_No_Admin "You must be logged in as an administrator when installing this program."
 ${LangFileString} SMPlayer_Is_Running "An instance of SMPlayer is running. Please exit SMPlayer and try again."
 
+${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
 ${LangFileString} Win64_Required "A 64-bit Windows operating system is required to install this software."
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
@@ -29,11 +30,7 @@
 ${LangFileString} Section_StartMenu_Desc "Create a Start Menu entry for SMPlayer."
 
 ${LangFileString} Section_MPlayer "MPlayer (required)"
-!ifdef WITH_MPLAYER
 ${LangFileString} Section_MPlayer_Desc "MPlayer; required for playback."
-!else ifndef WITH_MPLAYER
-${LangFileString} Section_MPlayer_Desc "MPlayer; required for playback. (Internet Connection required for installation)"
-!endif
 
 ${LangFileString} Section_MPlayerCodecs "Binary Codecs"
 !ifdef WITH_CODECS
@@ -91,6 +88,7 @@
 ${LangFileString} Uninstaller_No_Admin "This installation can only be uninstalled by a user with administrator privileges."
 ${LangFileString} Uninstaller_Aborted "Uninstall aborted by user."
 ${LangFileString} Uninstaller_NotInstalled "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
+${LangFileString} Uninstaller_64bitOnly "This installation can only be uninstalled on 64-bit Windows."
 
 ; Vista & Later Default Programs Registration
 ${LangFileString} Application_Description "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."

smplayer-0.8.0.tar.bz2/setup/translations/croatian.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/croatian.nsh Changed

smplayer-0.8.0.tar.bz2/setup/translations/czech.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/czech.nsh Changed

@@ -11,9 +11,10 @@
 ${LangFileString} Installer_No_Admin "Instalaci tohoto programu je potřeba provést s právy administrátora."
 ${LangFileString} SMPlayer_Is_Running "An instance of SMPlayer is running. Please exit SMPlayer and try again."
 
-${LangFileString} Win64_Required "A 64-bit Windows operating system is required to install this software."
-${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
-${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
+${LangFileString} Win64_Required "Pro instalaci tohoto software je zapotřebí mít 64-bitový oprační systém Windows."
+${LangFileString} Existing_32bitInst "Máte nainstalovánu 32-bitovou verzi SMPlayeru. Musíte nejprve odinstalovat 32-bitový SMPlayer."
+${LangFileString} Existing_64bitInst "Máte nainstalovánu 64-bitovou verzi SMPlayeru. Musíte nejprve odinstalovat 64-bitový SMPlayer."
 
 ; Components Page
 ${LangFileString} ShortcutGroupTitle "Zástupci"
@@ -29,11 +30,7 @@
 ${LangFileString} Section_StartMenu_Desc "Vytvoří zástupce SMPlayeru v nabídce Start."
 
 ${LangFileString} Section_MPlayer "MPlayer (vyžadován)"
-!ifdef WITH_MPLAYER
 ${LangFileString} Section_MPlayer_Desc "MPlayer; vyžadován pro přehrávání."
-!else ifndef WITH_MPLAYER
-${LangFileString} Section_MPlayer_Desc "MPlayer; vyžadován pro přehrávání. (Pro instalaci je potřeba připojení k Internetu)"
-!endif
 
 ${LangFileString} Section_MPlayerCodecs "Binární kodeky"
 !ifdef WITH_CODECS
@@ -42,7 +39,7 @@
 ${LangFileString} Section_MPlayerCodecs_Desc "Přídavné kodeky MPlayeru. (Pro instalaci je potřeba připojení k Internetu)"
 !endif
 
-${LangFileString} Section_MEncoder_Desc "A companion program to MPlayer that can be used to encode or transform supported audio or video streams."
+${LangFileString} Section_MEncoder_Desc "Dodatkový program pro MPlayer, který se využívá k enkódování nebo transformaci audio/video souborů."
 
 ${LangFileString} Section_IconThemes "Témata ikon"
 ${LangFileString} Section_IconThemes_Desc "Přídavná témata ikon pro SMPlayer."
@@ -53,19 +50,19 @@
 ${LangFileString} MPlayer_Codec_Msg "Binární kodeky podporují formáty, které zatím nejsou implementovány nativně, např. novější varianty RealVideo a jiné málo používané formáty.$\nPro většinu běžných formátů nejsou potřeba (DVD, MPEG-1/2/4, apod.)."
 
 ; Upgrade/Reinstall Page
-${LangFileString} Reinstall_Header_Text "Select Install Type"
-${LangFileString} Reinstall_Header_SubText "Select Overwrite or Uninstall mode."
-
-${LangFileString} Reinstall_Msg1 "You have an existing installation of SMPlayer in the following folder:"
-${LangFileString} Reinstall_Msg2 "Please select how to proceed:"
-${LangFileString} Reinstall_Overwrite "Overwrite ($Inst_Type) the existing installation"
-${LangFileString} Reinstall_Uninstall "Uninstall (remove) the existing installation"
-${LangFileString} Reinstall_Msg3_1 "Click Start when ready to proceed."
-${LangFileString} Reinstall_Msg3_2 "Click Next when ready to proceed."
-${LangFileString} Reinstall_Msg3_3 "Click Uninstall when ready to proceed."
-${LangFileString} Reinstall_Msg4 "Change Installation Settings"
-
-${LangFileString} Type_Reinstall "reinstall"
+${LangFileString} Reinstall_Header_Text "Vyberte typ instalace"
+${LangFileString} Reinstall_Header_SubText "Vyberte přepsání nebo odinstalaci."
+
+${LangFileString} Reinstall_Msg1 "SMPlayer již máte nainstalován v tomto adresáři:"
+${LangFileString} Reinstall_Msg2 "Prosím vyberte jak pokračovat:"
+${LangFileString} Reinstall_Overwrite "Přepsat ($Inst_Type) existující instalaci"
+${LangFileString} Reinstall_Uninstall "Odinstalovat (odebrat) existující instalaci"
+${LangFileString} Reinstall_Msg3_1 "Stiskněte Start jste-li připraveni."
+${LangFileString} Reinstall_Msg3_2 "Stiskněte Další jste-li připraveni."
+${LangFileString} Reinstall_Msg3_3 "Stiskněte Odinstalovat jste-li připraveni."
+${LangFileString} Reinstall_Msg4 "Změnit nastavení instalace"
+
+${LangFileString} Type_Reinstall "reinstalovat"
 ${LangFileString} Type_Downgrade "downgrade"
 ${LangFileString} Type_Upgrade "upgrade"
 
@@ -91,14 +88,15 @@
 ${LangFileString} Uninstaller_No_Admin "Odinstalaci je potřeba provést s právy administrátora."
 ${LangFileString} Uninstaller_Aborted "Odinstalace přerušena uživatelem."
 ${LangFileString} Uninstaller_NotInstalled "V adresáři '$INSTDIR' není SMPlayer nainstalován .$\r$\nPokračovat (nedoporučeno)?"
+${LangFileString} Uninstaller_64bitOnly "Tato instalace jde odinstalovat pouze na 64-bitové verzi Windows."
 
 ; Vista & Later Default Programs Registration
 ${LangFileString} Application_Description "SMPlayer je kompletní frontend pro MPlayer, podporuje vše od základních funkcí jako přehrávání videí, DVD, VCD až po pokročilé funkce jako filtry MPlayeru, edl a více."
 
 ; Misc
-${LangFileString} Info_Del_Files "Deleting Files..."
-${LangFileString} Info_Del_Registry "Deleting Registry Keys..."
-${LangFileString} Info_Del_Shortcuts "Deleting Shortcuts..."
-${LangFileString} Info_Rest_Assoc "Restoring file associations..."
-${LangFileString} Info_RollBack "Rolling back changes..."
-${LangFileString} Info_Files_Extract "Extracting files..."
+${LangFileString} Info_Del_Files "Mažu soubory..."
+${LangFileString} Info_Del_Registry "Mažu záznamy registru..."
+${LangFileString} Info_Del_Shortcuts "Mažu zástupce..."
+${LangFileString} Info_Rest_Assoc "Obnovuji asociace souborů..."
+${LangFileString} Info_RollBack "Beru zpět změny..."
+${LangFileString} Info_Files_Extract "Extrahuji soubory..."

smplayer-0.8.0.tar.bz2/setup/translations/danish.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/danish.nsh Changed

smplayer-0.8.0.tar.bz2/setup/translations/dutch.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/dutch.nsh Changed

smplayer-0.8.0.tar.bz2/setup/translations/english.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/english.nsh Changed

smplayer-0.8.0.tar.bz2/setup/translations/finnish.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/finnish.nsh Changed

smplayer-0.8.0.tar.bz2/setup/translations/french.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/french.nsh Changed

smplayer-0.8.0.tar.bz2/setup/translations/german.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/german.nsh Changed

@@ -11,6 +11,7 @@
 ${LangFileString} Installer_No_Admin "Es sind Administratorrechte nötig, um dieses Programm zu installieren."
 ${LangFileString} SMPlayer_Is_Running "An instance of SMPlayer is running. Please exit SMPlayer and try again."
 
+${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
 ${LangFileString} Win64_Required "A 64-bit Windows operating system is required to install this software."
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
@@ -29,11 +30,7 @@
 ${LangFileString} Section_StartMenu_Desc "Erstellt einen Startmenü-Eintrag für SMPlayer."
 
 ${LangFileString} Section_MPlayer "MPlayer (erforderlich)"
-!ifdef WITH_MPLAYER
 ${LangFileString} Section_MPlayer_Desc "MPlayer – benötigt für die Wiedergabe."
-!else ifndef WITH_MPLAYER
-${LangFileString} Section_MPlayer_Desc "MPlayer – benötigt für die Wiedergabe. (Internetverbindung benötigt für Installation)"
-!endif
 
 ${LangFileString} Section_MPlayerCodecs "Binärcodecs"
 !ifdef WITH_CODECS
@@ -91,6 +88,7 @@
 ${LangFileString} Uninstaller_No_Admin "Es sind Administratorrechte nötig, um dieses Programm zu deinstallieren."
 ${LangFileString} Uninstaller_Aborted "Die Deinstallation ist vom Benutzer abgebrochen worden."
 ${LangFileString} Uninstaller_NotInstalled "Es scheint, dass SMPlayer nicht im Verzeichnis '$INSTDIR' installiert ist.$\r$\nTrotzdem fortfahren (nicht empfohlen)?"
+${LangFileString} Uninstaller_64bitOnly "This installation can only be uninstalled on 64-bit Windows."
 
 ; Vista & Later Default Programs Registration
 ${LangFileString} Application_Description "SMPlayer ist ein komplettes grafische Oberfläche für MPlayer, von grundlegenden Funktionen, wie das Abspielen von Videos, DVDs, VCDs, bis zu erweiterten Funktionen, wie die Unterstützung für MPlayer-Filter, edl-Listen und vielem mehr."

smplayer-0.8.0.tar.bz2/setup/translations/hebrew.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/hebrew.nsh Changed

smplayer-0.8.0.tar.bz2/setup/translations/hungarian.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/hungarian.nsh Changed

@@ -11,6 +11,7 @@
 ${LangFileString} Installer_No_Admin "Rendszergazdaként kell bejelentkeznie a program telepítéséhez."
 ${LangFileString} SMPlayer_Is_Running "An instance of SMPlayer is running. Please exit SMPlayer and try again."
 
+${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
 ${LangFileString} Win64_Required "A 64-bit Windows operating system is required to install this software."
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
@@ -29,11 +30,7 @@
 ${LangFileString} Section_StartMenu_Desc "Create a Start Menu entry for SMPlayer."
 
 ${LangFileString} Section_MPlayer "MPlayer (required)"
-!ifdef WITH_MPLAYER
 ${LangFileString} Section_MPlayer_Desc "MPlayer; required for playback."
-!else ifndef WITH_MPLAYER
-${LangFileString} Section_MPlayer_Desc "MPlayer; required for playback. (Internet Connection required for installation)"
-!endif
 
 ${LangFileString} Section_MPlayerCodecs "Binary Codecs"
 !ifdef WITH_CODECS
@@ -91,6 +88,7 @@
 ${LangFileString} Uninstaller_No_Admin "A program eltávolításához rendszergazda jogosultság szükséges."
 ${LangFileString} Uninstaller_Aborted "Az eltávolítást a felhasználó megszakította."
 ${LangFileString} Uninstaller_NotInstalled "Nem úgy néz ki, mint ha az SMPlayer ebbe a könyvtárba lett volna telepítve: '$INSTDIR'.$\r$\nMégis folytassam (nem ajánlott)?"
+${LangFileString} Uninstaller_64bitOnly "This installation can only be uninstalled on 64-bit Windows."
 
 ; Vista & Later Default Programs Registration
 ${LangFileString} Application_Description "Az SMPlayer egy komplett felület az MPlayerhez, mindent támogat az alap funkcióktól kezdve, mint a videók, DVDk, VCDk lejátszása, haladó funkciókig, mint az MPlayer szűrők, edl listák és még sok más."

smplayer-0.8.0.tar.bz2/setup/translations/italian.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/italian.nsh Changed

@@ -11,6 +11,7 @@
 ${LangFileString} Installer_No_Admin "Devi essere autenticato come amministratore per installare questo programma."
 ${LangFileString} SMPlayer_Is_Running "An instance of SMPlayer is running. Please exit SMPlayer and try again."
 
+${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
 ${LangFileString} Win64_Required "A 64-bit Windows operating system is required to install this software."
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
@@ -29,11 +30,7 @@
 ${LangFileString} Section_StartMenu_Desc "Crea un elemento nel menu di avvio per SMPlayer."
 
 ${LangFileString} Section_MPlayer "MPlayer (essenziale)"
-!ifdef WITH_MPLAYER
 ${LangFileString} Section_MPlayer_Desc "MPlayer; essenziale per la riproduzione."
-!else ifndef WITH_MPLAYER
-${LangFileString} Section_MPlayer_Desc "MPlayer; essenziale per la riproduzione. (Connessione a Internet richiesta per l'installazione)"
-!endif
 
 ${LangFileString} Section_MPlayerCodecs "Codec binari"
 !ifdef WITH_CODECS
@@ -91,6 +88,7 @@
 ${LangFileString} Uninstaller_No_Admin "La disinstallazione può essere effettuata solo da un utente con permessi amministrativi."
 ${LangFileString} Uninstaller_Aborted "Disinstallazione annullata dall'utente."
 ${LangFileString} Uninstaller_NotInstalled "Sembra che SMPlayer non sia installato nella cartella '$INSTDIR'.$\r$\nContinua comunque (non raccomandato)?"
+${LangFileString} Uninstaller_64bitOnly "This installation can only be uninstalled on 64-bit Windows."
 
 ; Vista & Later Default Programs Registration
 ${LangFileString} Application_Description "SMPlayer è un'interfaccia completa per MPlayer, fornisce funzionalità di base come la riproduzione di video, DVD, VCD e funzionalità più avanzate come il supporto dei filtri di MPlayer, le liste edl e altro ancora."

smplayer-0.8.0.tar.bz2/setup/translations/japanese.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/japanese.nsh Changed

@@ -11,9 +11,10 @@
 ${LangFileString} Installer_No_Admin "このプログラムをインストールするときは管理者としてログインする必要があります。"
 ${LangFileString} SMPlayer_Is_Running "SMPlayer のインスタンスが実行中です。SMPlayer を終了してやり直してください。"
 
-${LangFileString} Win64_Required "A 64-bit Windows operating system is required to install this software."
-${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
-${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
+${LangFileString} Win64_Required "このソフトウェアをインストールするには 64 ビットの Windows オペレーティング システムが必要です。"
+${LangFileString} Existing_32bitInst "32 ビットの SMPlayer が既にインストールされています。先に 32 ビットの SMPlayer をアンインストールする必要があります。"
+${LangFileString} Existing_64bitInst "64 ビットの SMPlayer が既にインストールされています。先に 64 ビットの SMPlayer をアンインストールする必要があります。"
 
 ; Components Page
 ${LangFileString} ShortcutGroupTitle "ショートカット"
@@ -29,11 +30,7 @@
 ${LangFileString} Section_StartMenu_Desc "SMPlayer の スタート メニュー エントリを作成します。"
 
 ${LangFileString} Section_MPlayer "MPlayer (必須)"
-!ifdef WITH_MPLAYER
 ${LangFileString} Section_MPlayer_Desc "再生のために必要な MPlayer です。"
-!else ifndef WITH_MPLAYER
-${LangFileString} Section_MPlayer_Desc "再生のために必要な MPlayer です。(インストールにはインターネット接続が必要です)"
-!endif
 
 ${LangFileString} Section_MPlayerCodecs "バイナリ コーデック"
 !ifdef WITH_CODECS
@@ -91,6 +88,7 @@
 ${LangFileString} Uninstaller_No_Admin "このインストールは管理者特権のあるユーザーによってのみアンインストールできます。"
 ${LangFileString} Uninstaller_Aborted "アンインストールはユーザーによって中止されました。"
 ${LangFileString} Uninstaller_NotInstalled "ディレクトリ '$INSTDIR' に SMPlayer がインストールされているように見えません。$\r$\nこのまま続行しますか (推奨されません)?"
+${LangFileString} Uninstaller_64bitOnly "このインストールは 64 ビットの Windows でのみアンインストールできます。"
 
 ; Vista & Later Default Programs Registration
 ${LangFileString} Application_Description "SMPlayer はビデオ、DVD、VCD の再生のような基本的な機能から MPlayer フィルター、edl リストなどへのサポートのような高度な機能まで、MPlayer の完全なフロントエンドです。"

smplayer-0.8.0.tar.bz2/setup/translations/korean.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/korean.nsh Changed

smplayer-0.8.0.tar.bz2/setup/translations/norwegian.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/norwegian.nsh Changed

smplayer-0.8.0.tar.bz2/setup/translations/polish.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/polish.nsh Changed

@@ -11,6 +11,7 @@
 ${LangFileString} Installer_No_Admin "Do instalacji tego programu wymagane są uprawnienia administratora."
 ${LangFileString} SMPlayer_Is_Running "An instance of SMPlayer is running. Please exit SMPlayer and try again."
 
+${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
 ${LangFileString} Win64_Required "A 64-bit Windows operating system is required to install this software."
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
@@ -29,11 +30,7 @@
 ${LangFileString} Section_StartMenu_Desc "Tworzy skrót do programu w Menu Start."
 
 ${LangFileString} Section_MPlayer "MPlayer (wymagane)"
-!ifdef WITH_MPLAYER
 ${LangFileString} Section_MPlayer_Desc "MPlayer; wymagany do odtwarzania filmów."
-!else ifndef WITH_MPLAYER
-${LangFileString} Section_MPlayer_Desc "MPlayer; wymagany do odtwarzania filmów. (Wymagane połączenie z internetem)"
-!endif
 
 ${LangFileString} Section_MPlayerCodecs "Kodeki"
 !ifdef WITH_CODECS
@@ -90,6 +87,7 @@
 ${LangFileString} Uninstaller_No_Admin "Aplikacja może być usunięta tylko przez osobe z uprawnieniami Administratora."
 ${LangFileString} Uninstaller_Aborted "Usuwanie anulowane przez użytkownika."
 ${LangFileString} Uninstaller_NotInstalled "Wygląda na to, że SMPlayer nie został zainstalowany w katalogu '$INSTDIR'.$\r$\nKontynuować mimo to (nie zalecane)?"
+${LangFileString} Uninstaller_64bitOnly "This installation can only be uninstalled on 64-bit Windows."
 
 ; Vista & Later Default Programs Registration
 ${LangFileString} Application_Description "SMPlayer jest graficzną nakładką programu MPlayer, z prostymi funkcjami, takimi jak odtwarzanie wideo, DVD i VCD oraz z bardziej zaawansowanymi funkcjami np: obsługa filtrów MPlayera i wiele innych."

smplayer-0.8.0.tar.bz2/setup/translations/portuguese.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/portuguese.nsh Changed

@@ -11,9 +11,10 @@
 ${LangFileString} Installer_No_Admin "Tem que iniciar a sessão como administrador para instalar este programa."
 ${LangFileString} SMPlayer_Is_Running "Já existe uma instância SMPlayer em execução. Feche o SMPlayer e tente novamente."
 
-${LangFileString} Win64_Required "A 64-bit Windows operating system is required to install this software."
-${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
-${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
+${LangFileString} Win64_Required "Para instalar esta versão, tem que possuir um sistema de 64 bits."
+${LangFileString} Existing_32bitInst "Já existe uma instalação 32 bits do SMPlayer. Tem que a desinstalar antes de uma nova instalação."
+${LangFileString} Existing_64bitInst "Já existe uma instalação 64 bits do SMPlayer. Tem que a desinstalar antes de uma nova instalação."
 
 ; Components Page
 ${LangFileString} ShortcutGroupTitle "Atalhos"
@@ -29,17 +30,13 @@
 ${LangFileString} Section_StartMenu_Desc "Cria uma entrada no Menu Iniciar para o SMPlayer."
 
 ${LangFileString} Section_MPlayer "MPlayer (obrigatório)"
-!ifdef WITH_MPLAYER
 ${LangFileString} Section_MPlayer_Desc "MPlayer; necessário para a reprodução."
-!else ifndef WITH_MPLAYER
-${LangFileString} Section_MPlayer_Desc "MPlayer; necessário para a reprodução. (Precisa de uma ligação à Internet)"
-!endif
 
 ${LangFileString} Section_MPlayerCodecs "Codificadores"
 !ifdef WITH_CODECS
 ${LangFileString} Section_MPlayerCodecs_Desc "Codificadores opcionais para o MPlayer."
 !else ifndef WITH_CODECS
-${LangFileString} Section_MPlayerCodecs_Desc "Codificadores opcionais para o MPlayer. (Precisa de uma ligação à Internet)"
+${LangFileString} Section_MPlayerCodecs_Desc "Codificadores opcionais para o MPlayer. (precisa de uma ligação à Internet)"
 !endif
 
 ${LangFileString} Section_MEncoder_Desc "Um programa complementar ao MPlayer, utilizado para codificar ou converter emissões de vídeo e áudio."
@@ -50,7 +47,7 @@
 ${LangFileString} Section_Translations "Idiomas"
 ${LangFileString} Section_Translations_Desc "Idiomas adicionais para o SMPlayer."
 
-${LangFileString} MPlayer_Codec_Msg "O pacote de codificadores adiciona suporte para os formatos que ainda não foram implementados no MPlayer, tais como as novas variantes RealVideo e outros formatos não usuais.$\nNote que estes não serão necessários para os formatos mais comuns como DVDs, MPEG-1/2/4, etc."
+${LangFileString} MPlayer_Codec_Msg "O pacote de codificadores adiciona suporte para os formatos que ainda não foram implementados no MPlayer, tais como as novas variantes RealVideo e outros formatos.$\nEstes codificadores não são necessários para os formatos mais comuns como DVDs, MPEG-1/2/4, etc."
 
 ; Upgrade/Reinstall Page
 ${LangFileString} Reinstall_Header_Text "Selecione o tipo de instalação"
@@ -91,6 +88,7 @@
 ${LangFileString} Uninstaller_No_Admin "Esta aplicação só pode ser desinstalada no modo de administrador."
 ${LangFileString} Uninstaller_Aborted "Desinstalação cancelada pelo utilizador."
 ${LangFileString} Uninstaller_NotInstalled "Parece que o SMPlayer não está instalado no diretório '$INSTDIR'.$\r$\nContinuar (não recomendado)?"
+${LangFileString} Uninstaller_64bitOnly "Esta instalação só pode ser desinstalada num sistema Windows de 64 bits."
 
 ; Vista & Later Default Programs Registration
 ${LangFileString} Application_Description "O SMPlayer é um interface gráfico para o MPlayer, com funções simples como a reprodução de vídeos, DVDs e VCDs bem como outras mais avançadas(suporte a filtros MPlayer, listas e mais)."

smplayer-0.8.0.tar.bz2/setup/translations/russian.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/russian.nsh Changed

@@ -8,97 +8,95 @@
 
 ; Startup
 ${LangFileString} Installer_Is_Running "Программа установки уже запущена."
-${LangFileString} Installer_No_Admin "You must be logged in as an administrator when installing this program."
-${LangFileString} SMPlayer_Is_Running "An instance of SMPlayer is running. Please exit SMPlayer and try again."
+${LangFileString} Installer_No_Admin "Для установки программы необходимо войти в систему как администратор."
+${LangFileString} SMPlayer_Is_Running "Экземпляр SMPlayer запущен. Пожалуйста, закройте SMPlayer и попытайтесь снова."
 
-${LangFileString} Win64_Required "A 64-bit Windows operating system is required to install this software."
-${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
-${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
+${LangFileString} Win64_Required "Для установки данного ПО требуется 64-битная ОС Windows."
+${LangFileString} Existing_32bitInst "Существует 32-битная установка SMPlayer. Сначала далите 32-битный SMPlayer."
+${LangFileString} Existing_64bitInst "Существует 64-битная установка SMPlayer. Сначала далите 64-битный SMPlayer."
 
 ; Components Page
-${LangFileString} ShortcutGroupTitle "Shortcuts"
-${LangFileString} MPlayerGroupTitle "MPlayer Components"
+${LangFileString} ShortcutGroupTitle "Ярлыки"
+${LangFileString} MPlayerGroupTitle "Компоненты MPlayer"
 
-${LangFileString} Section_SMPlayer "SMPlayer (required)"
-${LangFileString} Section_SMPlayer_Desc "SMPlayer, shared libraries, and documentation."
+${LangFileString} Section_SMPlayer "SMPlayer (необходимо)"
+${LangFileString} Section_SMPlayer_Desc "SMPlayer, разделяемые библиотеки и документация."
 
-${LangFileString} Section_DesktopShortcut "Desktop"
-${LangFileString} Section_DesktopShortcut_Desc "Creates a shortcut to SMPlayer on the desktop."
+${LangFileString} Section_DesktopShortcut "Рабочий стол"
+${LangFileString} Section_DesktopShortcut_Desc "Создаёт ярлыки SMPlayer на рабочем столе."
 
-${LangFileString} Section_StartMenu "Start Menu"
-${LangFileString} Section_StartMenu_Desc "Create a Start Menu entry for SMPlayer."
+${LangFileString} Section_StartMenu "Стартовое меню"
+${LangFileString} Section_StartMenu_Desc "Создаёт ярлыки SMPlayer в стартовом меню."
 
-${LangFileString} Section_MPlayer "MPlayer (required)"
-!ifdef WITH_MPLAYER
-${LangFileString} Section_MPlayer_Desc "MPlayer; required for playback."
-!else ifndef WITH_MPLAYER
-${LangFileString} Section_MPlayer_Desc "MPlayer; required for playback. (Internet Connection required for installation)"
-!endif
+${LangFileString} Section_MPlayer "MPlayer (необходимо)"
+${LangFileString} Section_MPlayer_Desc "MPlayer; необходимо для воспроизведения."
 
-${LangFileString} Section_MPlayerCodecs "Binary Codecs"
+${LangFileString} Section_MPlayerCodecs "Бинарные кодеки"
 !ifdef WITH_CODECS
-${LangFileString} Section_MPlayerCodecs_Desc "Optional codecs for MPlayer."
+${LangFileString} Section_MPlayerCodecs_Desc "Дополнительные кодеки для MPlayer."
 !else ifndef WITH_CODECS
-${LangFileString} Section_MPlayerCodecs_Desc "Optional codecs for MPlayer. (Internet Connection required for installation)"
+${LangFileString} Section_MPlayerCodecs_Desc "Дополнительные кодеки для MPlayer. (Для установки требуется подключение к сети Интернет)"
 !endif
 
-${LangFileString} Section_MEncoder_Desc "A companion program to MPlayer that can be used to encode or transform supported audio or video streams."
+${LangFileString} Section_MEncoder_Desc "Сопутствующая MPlayer программа, которую можно использовать для кодирования и преобразования поддерживаемых аудио и видео потоков."
 
-${LangFileString} Section_IconThemes "Icon Themes"
-${LangFileString} Section_IconThemes_Desc "Additional icon themes for SMPlayer."
+${LangFileString} Section_IconThemes "Темы иконок"
+${LangFileString} Section_IconThemes_Desc "Дополнительные темы иконок для SMPlayer."
 
-${LangFileString} Section_Translations "Languages"
-${LangFileString} Section_Translations_Desc "Non-English language files for SMPlayer."
+${LangFileString} Section_Translations "Переводы"
+${LangFileString} Section_Translations_Desc "Языковые файлы SMPlayer, помимо английского."
 
 ${LangFileString} MPlayer_Codec_Msg "Пакеты с бинарными кодеками добавляют поддержку кодеков, не встроенных в mplayer, например, RealVideo и других нестандартных форматов.$\nОбратите внимание, что эти кодеки не нужны для воспроизведения большинства обычных форматов вроде DVD, MPEG-1/2/4 и т.п."
 
 ; Upgrade/Reinstall Page
-${LangFileString} Reinstall_Header_Text "Select Install Type"
-${LangFileString} Reinstall_Header_SubText "Select Overwrite or Uninstall mode."
+${LangFileString} Reinstall_Header_Text "Выберите тип установки"
+${LangFileString} Reinstall_Header_SubText "Выберите режим установки поверх или удаления."
 
-${LangFileString} Reinstall_Msg1 "You have an existing installation of SMPlayer in the following folder:"
-${LangFileString} Reinstall_Msg2 "Please select how to proceed:"
-${LangFileString} Reinstall_Overwrite "Overwrite ($Inst_Type) the existing installation"
-${LangFileString} Reinstall_Uninstall "Uninstall (remove) the existing installation"
-${LangFileString} Reinstall_Msg3_1 "Click Start when ready to proceed."
-${LangFileString} Reinstall_Msg3_2 "Click Next when ready to proceed."
-${LangFileString} Reinstall_Msg3_3 "Click Uninstall when ready to proceed."
-${LangFileString} Reinstall_Msg4 "Change Installation Settings"
+${LangFileString} Reinstall_Msg1 "Существует установка SMPlayer в следующем каталоге:"
+${LangFileString} Reinstall_Msg2 "Выберите метод для продолжения:"
+${LangFileString} Reinstall_Overwrite "Перезаписать ($Inst_Type) существующую установку"
+${LangFileString} Reinstall_Uninstall "Удалить существующую установку"
+${LangFileString} Reinstall_Msg3_1 "Нажмите Старт для продолжения."
+${LangFileString} Reinstall_Msg3_2 "Нажмите Далее для продолжения."
+${LangFileString} Reinstall_Msg3_3 "Нажмите Удалить для продолжения."
+${LangFileString} Reinstall_Msg4 "Изменить настройки установки"
 
-${LangFileString} Type_Reinstall "reinstall"
-${LangFileString} Type_Downgrade "downgrade"
-${LangFileString} Type_Upgrade "upgrade"
+${LangFileString} Type_Reinstall "переустановить"
+${LangFileString} Type_Downgrade "откатить"
+${LangFileString} Type_Upgrade "обновить"
 
-${LangFileString} StartBtn "Start"
+${LangFileString} StartBtn "Старт"
 
 ; MPlayer Section
 ${LangFileString} MPlayer_DL_Msg "Загрузка MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer was not successfully installed. Retry?"
+${LangFileString} MPlayer_DL_Retry "Не удалось успешно установить MPlayer. Попытаться ещё раз?"
 ${LangFileString} MPlayer_DL_Failed "Не удалось загрузить MPlayer: '$R0'."
 ${LangFileString} MPlayer_Inst_Failed "Ошибка при установке MPlayer. MPlayer требуется для воспроизведения."
 
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Загрузка бинарных кодеков для MPlayer..."
-${LangFileString} Codecs_DL_Retry "MPlayer codecs were not successfully installed. Retry?"
+${LangFileString} Codecs_DL_Retry "Не удалось успешно установить кодеки MPlayer. Попытаться ещё раз?"
 ${LangFileString} Codecs_DL_Failed "Не удалось загрузить бинарные кодеки для MPlayer: '$R0'."
 ${LangFileString} Codecs_Inst_Failed "Ошибка при установке бинарных кодеков для MPlayer."
 
 ; Version information
 ${LangFileString} VerInfo_DL_Msg "Загрузка информации о версии..."
-${LangFileString} VerInfo_DL_Failed "Не удалось загрузить информацию о версии: '$R0'. Using a default version."
+${LangFileString} VerInfo_DL_Failed "Не удалось загрузить информацию о версии: '$R0'. Будет использована версия по умолчанию."
 
 ; Uninstaller
-${LangFileString} Uninstaller_No_Admin "This installation can only be uninstalled by a user with administrator privileges."
+${LangFileString} Uninstaller_No_Admin "Эта установка может быть удалена только пользователем с правами администратора."
 ${LangFileString} Uninstaller_Aborted "Удаление прервано пользователем."
 ${LangFileString} Uninstaller_NotInstalled "Не похоже, что SMPlayer установлен в каталог '$INSTDIR'.$\r$\nПродолжить всё равно (не рекомендуется)?"
+${LangFileString} Uninstaller_64bitOnly "Эта установка может быть удалена только на 64-битной Windows."
 
 ; Vista & Later Default Programs Registration
 ${LangFileString} Application_Description "SMPlayer - полноценная оболочка для MPlayer, начиная от базовых функций вроде воспроизведения видеофайлов, DVD, VCD и заканчивая более продвинутыми вроде поддержки фильтров MPlayer, списков и т.д."
 
 ; Misc
-${LangFileString} Info_Del_Files "Deleting Files..."
-${LangFileString} Info_Del_Registry "Deleting Registry Keys..."
-${LangFileString} Info_Del_Shortcuts "Deleting Shortcuts..."
-${LangFileString} Info_Rest_Assoc "Restoring file associations..."
-${LangFileString} Info_RollBack "Rolling back changes..."
-${LangFileString} Info_Files_Extract "Extracting files..."
+${LangFileString} Info_Del_Files "Удаление файлов..."
+${LangFileString} Info_Del_Registry "Удаление ключей реестра..."
+${LangFileString} Info_Del_Shortcuts "Удаление ярлыков..."
+${LangFileString} Info_Rest_Assoc "Восстановление ассоциаций файлов..."
+${LangFileString} Info_RollBack "Откат изменений..."
+${LangFileString} Info_Files_Extract "Извлечение файлов..."

smplayer-0.8.0.tar.bz2/setup/translations/simpchinese.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/simpchinese.nsh Changed

@@ -11,9 +11,10 @@
 ${LangFileString} Installer_No_Admin "安装本程序时，您必须以管理员身份登录。"
 ${LangFileString} SMPlayer_Is_Running "一个 SMPlayer 实例正在运行。请退出 SMPlayer，然后再试一次。"
 
-${LangFileString} Win64_Required "A 64-bit Windows operating system is required to install this software."
-${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
-${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
+${LangFileString} Win64_Required "安装本软件需要 64 位 Windows 操作系统。"
+${LangFileString} Existing_32bitInst "一个 SMPlayer 的 32 位安装已经存在。您必须先卸载 32 位 SMPlayer。"
+${LangFileString} Existing_64bitInst "一个 SMPlayer 的 64 位安装已经存在。您必须先卸载 64 位 SMPlayer。"
 
 ; Components Page
 ${LangFileString} ShortcutGroupTitle "快捷方式"
@@ -29,11 +30,7 @@
 ${LangFileString} Section_StartMenu_Desc "创建 SMPlayer 开始菜单项。"
 
 ${LangFileString} Section_MPlayer "MPlayer (必需)"
-!ifdef WITH_MPLAYER
 ${LangFileString} Section_MPlayer_Desc "播放媒体文件所必需的 MPlayer 内核。"
-!else ifndef WITH_MPLAYER
-${LangFileString} Section_MPlayer_Desc "播放媒体文件所必需的 MPlayer 内核。(安装需要使用网络连接)"
-!endif
 
 ${LangFileString} Section_MPlayerCodecs "二进制编解码器"
 !ifdef WITH_CODECS
@@ -91,6 +88,7 @@
 ${LangFileString} Uninstaller_No_Admin "本安装只能由具有管理员权限的用户卸载。"
 ${LangFileString} Uninstaller_Aborted "卸载由用户中止。"
 ${LangFileString} Uninstaller_NotInstalled "没有发现 SMPlayer 被安装在目录 '$INSTDIR' 中。$\r$\n仍要继续吗? (不推荐)"
+${LangFileString} Uninstaller_64bitOnly "本安装只能在 64 位 Windows 中卸载。"
 
 ; Vista & Later Default Programs Registration
 ${LangFileString} Application_Description "SMPlayer 是一个从播放视频、DVD、VCD 等基本特性到支持 MPlayer 过滤器、EDL 列表等高级特性的完整 MPlayer 前端程序。"

smplayer-0.8.0.tar.bz2/setup/translations/slovak.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/slovak.nsh Changed

smplayer-0.8.0.tar.bz2/setup/translations/slovenian.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/slovenian.nsh Changed

smplayer-0.8.0.tar.bz2/setup/translations/spanish.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/spanish.nsh Changed

@@ -11,6 +11,7 @@
 ${LangFileString} Installer_No_Admin "Debes tener permisos de administrador para instalar este programa."
 ${LangFileString} SMPlayer_Is_Running "SMPlayer se está ejecutando. Por favor, ciérralo e inténtalo de nuevo."
 
+${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
 ${LangFileString} Win64_Required "Se necesita un Windows de 64 bits para instalar este programa."
 ${LangFileString} Existing_32bitInst "Existe una versión de 32 bits instalada. Debes desinstalarla primero."
 ${LangFileString} Existing_64bitInst "Existe una versión de 64 bits instalada. Debes desinstalarla primero."
@@ -29,11 +30,7 @@
 ${LangFileString} Section_StartMenu_Desc "Crea una entrada en el Menú Inicio para SMPlayer."
 
 ${LangFileString} Section_MPlayer "MPlayer (requerido)"
-!ifdef WITH_MPLAYER
 ${LangFileString} Section_MPlayer_Desc "MPlayer; requerido para la reproducción multimedia."
-!else ifndef WITH_MPLAYER
-${LangFileString} Section_MPlayer_Desc "MPlayer; requerido para la reproducción multimedia. (Se necesita conexión a internet para la instalación)"
-!endif
 
 ${LangFileString} Section_MPlayerCodecs "Códecs Binarios"
 !ifdef WITH_CODECS
@@ -91,6 +88,7 @@
 ${LangFileString} Uninstaller_No_Admin "Este programa sólo se puede desinstalar por un usuario con permisos de administrador."
 ${LangFileString} Uninstaller_Aborted "Desinstalación cancelada por el usuario."
 ${LangFileString} Uninstaller_NotInstalled "No parece que el SMPlayer esté instalado en el directorio '$INSTDIR'.$\r$\n¿Continuar de todos modos (no recomendado)?"
+${LangFileString} Uninstaller_64bitOnly "This installation can only be uninstalled on 64-bit Windows."
 
 ; Vista & Later Default Programs Registration
 ${LangFileString} Application_Description "SMPlayer pretende ser un interfaz completo para MPlayer, con opciones para cosas básicas, como reproducir vídeos, DVDs y VCDs hasta opciones más avanzadas como soporte para los filtros del MPlayer y mucho más."

smplayer-0.8.0.tar.bz2/setup/translations/tradchinese.nsh -> smplayer-0.8.1.tar.bz2/setup/translations/tradchinese.nsh Changed

smplayer-0.8.0.tar.bz2/smplayer.spec -> smplayer-0.8.1.tar.bz2/smplayer.spec Changed

smplayer-0.8.0.tar.bz2/src/basegui.cpp -> smplayer-0.8.1.tar.bz2/src/basegui.cpp Changed

@@ -308,12 +308,6 @@
 	connect( openAudioCDAct, SIGNAL(triggered()),
              this, SLOT(openAudioCD()) );
 
-#ifdef Q_OS_WIN
-	// VCD's and Audio CD's seem they don't work on windows
-	//openVCDAct->setEnabled(pref->enable_vcd_on_windows);
-	openAudioCDAct->setEnabled(pref->enable_audiocd_on_windows);
-#endif
-
 	openDVDAct = new MyAction( this, "open_dvd" );
 	connect( openDVDAct, SIGNAL(triggered()),
              this, SLOT(openDVD()) );
@@ -1902,6 +1896,9 @@
 	connect( core, SIGNAL(mediaStoppedByUser()),
              this, SLOT(exitFullscreenOnStop()) );
 
+	connect( core, SIGNAL(mediaStoppedByUser()),
+             mplayerwindow, SLOT(showLogo()) );
+
 	connect( core, SIGNAL(mediaLoaded()),
              this, SLOT(enableActionsOnPlaying()) );
 #if NOTIFY_AUDIO_CHANGES
@@ -1967,6 +1964,10 @@
 #endif
 	mplayerwindow->allowVideoMovement( pref->allow_video_movement );
 
+#if LOGO_ANIMATION
+	mplayerwindow->setAnimatedLogo( pref->animated_logo);
+#endif
+
 	QHBoxLayout * layout = new QHBoxLayout;
 	layout->setSpacing(0);
 	layout->setMargin(0);
@@ -2060,6 +2061,10 @@
 	*/
 	connect( playlist, SIGNAL(playlistEnded()),
              this, SLOT(playlistHasFinished()) );
+
+	connect( playlist, SIGNAL(playlistEnded()),
+             mplayerwindow, SLOT(showLogo()) );
+
 	/*
 	connect( playlist, SIGNAL(visibilityChanged()),
              this, SLOT(playlistVisibilityChanged()) );
@@ -3090,6 +3095,10 @@
 			// Let's see if it looks like a file (no dvd://1 or something)
 			if (fullname.indexOf(QRegExp("^.*://.*")) == -1) filename = fi.fileName();
 
+			if (filename.size() > 85) {
+				filename = filename.left(80) + "...";
+			}
+
 			QAction * a = recentfiles_menu->addAction( QString("%1. " + filename ).arg( i.insert( i.size()-1, '&' ), 3, ' ' ));
 			a->setStatusTip(fullname);
 			a->setData(n);

smplayer-0.8.0.tar.bz2/src/config.h -> smplayer-0.8.1.tar.bz2/src/config.h Changed

smplayer-0.8.0.tar.bz2/src/core.cpp -> smplayer-0.8.1.tar.bz2/src/core.cpp Changed

smplayer-0.8.0.tar.bz2/src/defaultgui.cpp -> smplayer-0.8.1.tar.bz2/src/defaultgui.cpp Changed

@@ -439,24 +439,28 @@
 	qDebug("DefaultGui::createStatusBar");
 
 	time_display = new QLabel( statusBar() );
+	time_display->setObjectName("time_display");
 	time_display->setAlignment(Qt::AlignRight);
 	time_display->setFrameShape(QFrame::NoFrame);
 	time_display->setText(" 88:88:88 / 88:88:88 ");
 	time_display->setMinimumSize(time_display->sizeHint());
 
 	frame_display = new QLabel( statusBar() );
+	frame_display->setObjectName("frame_display");
 	frame_display->setAlignment(Qt::AlignRight);
 	frame_display->setFrameShape(QFrame::NoFrame);
 	frame_display->setText("88888888");
 	frame_display->setMinimumSize(frame_display->sizeHint());
 
 	ab_section_display = new QLabel( statusBar() );
+	ab_section_display->setObjectName("ab_section_display");
 	ab_section_display->setAlignment(Qt::AlignRight);
 	ab_section_display->setFrameShape(QFrame::NoFrame);
 //	ab_section_display->setText("A:0:00:00 B:0:00:00");
 //	ab_section_display->setMinimumSize(ab_section_display->sizeHint());
 
 	video_info_display = new QLabel( statusBar() );
+	video_info_display->setObjectName("video_info_display");
 	video_info_display->setAlignment(Qt::AlignRight);
 	video_info_display->setFrameShape(QFrame::NoFrame);

smplayer-0.8.0.tar.bz2/src/extensions.cpp -> smplayer-0.8.1.tar.bz2/src/extensions.cpp Changed

smplayer-0.8.0.tar.bz2/src/favorites.cpp -> smplayer-0.8.1.tar.bz2/src/favorites.cpp Changed

smplayer-0.8.0.tar.bz2/src/favorites.h -> smplayer-0.8.1.tar.bz2/src/favorites.h Changed

smplayer-0.8.0.tar.bz2/src/helper.cpp -> smplayer-0.8.1.tar.bz2/src/helper.cpp Changed

smplayer-0.8.0.tar.bz2/src/inforeader.cpp -> smplayer-0.8.1.tar.bz2/src/inforeader.cpp Changed

@@ -122,6 +122,7 @@
 
 static QRegExp rx_driver("\\t(.*)\\t(.*)");
 static QRegExp rx_demuxer("^\\s+(A-Z,a-z,0-9+)\\s+(\\d+)\\s+(\\S.*)");
+static QRegExp rx_demuxer2("^\\s+(A-Z,a-z,0-9+)\\s+(\\S.*)");
 static QRegExp rx_codec("^(A-Z,a-z,0-9+)\\s+(A-Z,a-z,0-9+)\\s+(A-Z,a-z,0-9+)\\s+(\\S.*)");
 
 void InfoReader::readLine(QByteArray ba) {
@@ -131,45 +132,63 @@
 	QString line = QString::fromLocal8Bit(ba);
 #endif
 
+	if (line.isEmpty()) return;
+
 	qDebug("InfoReader::readLine: line: '%s'", line.toUtf8().data());
 	//qDebug("waiting_for_key: %d", waiting_for_key);
 
 	if (!waiting_for_key) {
-		if ( rx_driver.indexIn(line) > -1 ) {
-			QString name = rx_driver.cap(1);
-			QString desc = rx_driver.cap(2);
-			qDebug("InfoReader::readLine: found driver: '%s' '%s'", name.toUtf8().data(), desc.toUtf8().data());
-			if (reading_type==VO) {
-				vo_list.append( InfoData(name, desc) );
-			} 
-			else
-			if (reading_type==AO) {
-				ao_list.append( InfoData(name, desc) );
+		if ((reading_type == VO) || (reading_type == AO)) {
+			if ( rx_driver.indexIn(line) > -1 ) {
+				QString name = rx_driver.cap(1);
+				QString desc = rx_driver.cap(2);
+				qDebug("InfoReader::readLine: found driver: '%s' '%s'", name.toUtf8().data(), desc.toUtf8().data());
+				if (reading_type==VO) {
+					vo_list.append( InfoData(name, desc) );
+				} 
+				else
+				if (reading_type==AO) {
+					ao_list.append( InfoData(name, desc) );
+				}
+			} else {
+				qWarning("InfoReader::readLine: can't parse output driver from line '%s'", line.toUtf8().constData());
 			}
-			else
-			qWarning("InfoReader::readLine: Unknown type! Ignoring");
 		}
 		else
-		if ( rx_demuxer.indexIn(line) > -1 ) {
-			QString name = rx_demuxer.cap(1);
-			QString desc = rx_demuxer.cap(3);
-			qDebug("InfoReader::readLine: found demuxer: '%s' '%s'", name.toUtf8().data(), desc.toUtf8().data());
-			demuxer_list.append( InfoData(name, desc) );
+		if (reading_type == DEMUXER) {
+			if ( rx_demuxer.indexIn(line) > -1 ) {
+				QString name = rx_demuxer.cap(1);
+				QString desc = rx_demuxer.cap(3);
+				qDebug("InfoReader::readLine: found demuxer: '%s' '%s'", name.toUtf8().data(), desc.toUtf8().data());
+				demuxer_list.append( InfoData(name, desc) );
+			}
+			else 
+			if ( rx_demuxer2.indexIn(line) > -1 ) {
+				QString name = rx_demuxer2.cap(1);
+				QString desc = rx_demuxer2.cap(2);
+				qDebug("InfoReader::readLine: found demuxer: '%s' '%s'", name.toUtf8().data(), desc.toUtf8().data());
+				demuxer_list.append( InfoData(name, desc) );
+			}
+			else {
+				qWarning("InfoReader::readLine: can't parse demuxer from line '%s'", line.toUtf8().constData());
+			}
 		}
 		else
-		if ( rx_codec.indexIn(line) > -1 ) {
-			QString name = rx_codec.cap(1);
-			QString desc = rx_codec.cap(4);
-			qDebug("InfoReader::readLine: found codec: '%s' '%s'", name.toUtf8().data(), desc.toUtf8().data());
-			if (reading_type==VC) {
-				vc_list.append( InfoData(name, desc) );
-			} 
-			else
-			if (reading_type==AC) {
-				ac_list.append( InfoData(name, desc) );
+		if ((reading_type == VC) || (reading_type == AC)) {
+			if ( rx_codec.indexIn(line) > -1 ) {
+				QString name = rx_codec.cap(1);
+				QString desc = rx_codec.cap(4);
+				qDebug("InfoReader::readLine: found codec: '%s' '%s'", name.toUtf8().data(), desc.toUtf8().data());
+				if (reading_type==VC) {
+					vc_list.append( InfoData(name, desc) );
+				} 
+				else
+				if (reading_type==AC) {
+					ac_list.append( InfoData(name, desc) );
+				}
+			} else {
+				qWarning("InfoReader::readLine: can't parse codec from line '%s'", line.toUtf8().constData());
 			}
-			else
-			qWarning("InfoReader::readLine: Unknown type! Ignoring");
 		}
 	}

smplayer-0.8.0.tar.bz2/src/mplayerprocess.cpp -> smplayer-0.8.1.tar.bz2/src/mplayerprocess.cpp Changed

smplayer-0.8.0.tar.bz2/src/mplayerversion.cpp -> smplayer-0.8.1.tar.bz2/src/mplayerversion.cpp Changed

smplayer-0.8.0.tar.bz2/src/mplayerwindow.cpp -> smplayer-0.8.1.tar.bz2/src/mplayerwindow.cpp Changed

@@ -37,6 +37,10 @@
 #include <QTimer>
 #endif
 
+#if LOGO_ANIMATION
+#include <QPropertyAnimation>
+#endif
+
 Screen::Screen(QWidget* parent, Qt::WindowFlags f) : QWidget(parent, f ) 
 {
 	setMouseTracking(TRUE);
@@ -262,7 +266,32 @@
 }
 
 void MplayerWindow::setLogoVisible( bool b) {
+#if !LOGO_ANIMATION
 	logo->setVisible(b);
+#else
+	if (!animated_logo) {
+		logo->setVisible(b);
+	} else {
+		if (b) {
+			logo->show();
+			QPropertyAnimation * animation = new QPropertyAnimation(logo, "pos");
+			animation->setDuration(200);
+			animation->setEasingCurve(QEasingCurve::OutBounce);
+			animation->setStartValue(QPoint(logo->x(), 0 - logo->y()));
+			animation->setEndValue(logo->pos());
+			animation->start();
+		} else {
+			QPropertyAnimation * animation = new QPropertyAnimation(logo, "pos");
+			animation->setDuration(200);
+			animation->setEasingCurve(QEasingCurve::OutBounce);
+			animation->setEndValue(QPoint(width(), logo->y()));
+			animation->setStartValue(logo->pos());
+			animation->start();
+			connect(animation, SIGNAL(finished()), logo, SLOT(hide()));
+			//logo->hide();
+		}
+	}
+#endif
 }
 
 /*

smplayer-0.8.0.tar.bz2/src/mplayerwindow.h -> smplayer-0.8.1.tar.bz2/src/mplayerwindow.h Changed

smplayer-0.8.0.tar.bz2/src/prefdrives.cpp -> smplayer-0.8.1.tar.bz2/src/prefdrives.cpp Changed

smplayer-0.8.0.tar.bz2/src/preferences.cpp -> smplayer-0.8.1.tar.bz2/src/preferences.cpp Changed

@@ -38,6 +38,8 @@
 #include "retrieveyoutubeurl.h"
 #endif
 
+#define CURRENT_CONFIG_VERSION 1
+
 using namespace Global;
 
 Preferences::Preferences() {
@@ -67,6 +69,8 @@
 General
 ******* */
 
+	config_version = CURRENT_CONFIG_VERSION;
+
 #if defined(Q_OS_WIN) || defined(Q_OS_OS2)
 	mplayer_bin= "mplayer/mplayer.exe";
 #else
@@ -193,6 +197,7 @@
 
 #ifdef YOUTUBE_SUPPORT
 	yt_quality = RetrieveYoutubeUrl::MP4_720p;
+	yt_user_agent = QString::null;
 #endif
 
 
@@ -383,6 +388,10 @@
 	auto_add_to_playlist = true;
 	add_to_playlist_consecutive_files = false;
 
+#if LOGO_ANIMATION
+	animated_logo = true;
+#endif
+
 
 /* ********
 TV (dvb)
@@ -400,7 +409,7 @@
 
 	latest_dir = QDir::homePath();
 	last_dvd_directory="";
-
+	save_dirs = true;
 
 /* **************
 Initial values
@@ -491,6 +500,8 @@
 
 	set->beginGroup( "general");
 
+	set->setValue("config_version", config_version);
+
 	set->setValue("mplayer_bin", mplayer_bin);
 	set->setValue("driver/vo", vo);
 	set->setValue("driver/audio_output", ao);
@@ -604,12 +615,15 @@
 	set->setValue("cache_for_audiocds", cache_for_audiocds);
 	set->setValue("cache_for_tv", cache_for_tv);
 
+	set->endGroup(); // performance
+
 #ifdef YOUTUBE_SUPPORT
-	set->setValue("youtube_quality", yt_quality);
+	set->beginGroup("youtube");
+	set->setValue("quality", yt_quality);
+	set->setValue("user_agent", yt_user_agent);
+	set->endGroup();
 #endif
 
-	set->endGroup(); // performance
-
 
 /* *********
 Subtitles
@@ -785,8 +799,12 @@
 	set->setValue("reported_mplayer_is_old", reported_mplayer_is_old);
 #endif
 
- set->setValue("auto_add_to_playlist", auto_add_to_playlist);
- set->setValue("add_to_playlist_consecutive_files", add_to_playlist_consecutive_files);
+	set->setValue("auto_add_to_playlist", auto_add_to_playlist);
+	set->setValue("add_to_playlist_consecutive_files", add_to_playlist_consecutive_files);
+
+#if LOGO_ANIMATION
+	set->setValue("animated_logo", animated_logo);
+#endif
 
 	set->endGroup(); // gui
 
@@ -807,8 +825,14 @@
 *********** */
 
 	set->beginGroup( "directories");
-	set->setValue("latest_dir", latest_dir);
-	set->setValue("last_dvd_directory", last_dvd_directory);
+	if (save_dirs) {
+		set->setValue("latest_dir", latest_dir);
+		set->setValue("last_dvd_directory", last_dvd_directory);
+	} else {
+		set->setValue("latest_dir", "");
+		set->setValue("last_dvd_directory", "");
+	}
+	set->setValue("save_dirs", save_dirs);
 	set->endGroup(); // directories
 
 
@@ -917,6 +941,8 @@
 
 	set->beginGroup( "general");
 
+	config_version = set->value("config_version", 0).toInt();
+
 	mplayer_bin = set->value("mplayer_bin", mplayer_bin).toString();
 	vo = set->value("driver/vo", vo).toString();
 	ao = set->value("driver/audio_output", ao).toString();
@@ -1032,12 +1058,15 @@
 	cache_for_audiocds = set->value("cache_for_audiocds", cache_for_audiocds).toInt();
 	cache_for_tv = set->value("cache_for_tv", cache_for_tv).toInt();
 
+	set->endGroup(); // performance
+
 #ifdef YOUTUBE_SUPPORT
-	yt_quality = set->value("youtube_quality", yt_quality).toInt();
+	set->beginGroup("youtube");
+	yt_quality = set->value("quality", yt_quality).toInt();
+	yt_user_agent = set->value("user_agent", yt_user_agent).toString();
+	set->endGroup();
 #endif
 
-	set->endGroup(); // performance
-
 
 /* *********
 Subtitles
@@ -1221,6 +1250,10 @@
 	auto_add_to_playlist = set->value("auto_add_to_playlist", auto_add_to_playlist).toBool();
 	add_to_playlist_consecutive_files = set->value("add_to_playlist_consecutive_files", add_to_playlist_consecutive_files).toBool();
 
+#if LOGO_ANIMATION
+	animated_logo = set->value("animated_logo", animated_logo).toBool();
+#endif
+
 	set->endGroup(); // gui
 
 
@@ -1241,8 +1274,11 @@
 *********** */
 
 	set->beginGroup( "directories");
-	latest_dir = set->value("latest_dir", latest_dir).toString();
-	last_dvd_directory = set->value("last_dvd_directory", last_dvd_directory).toString();
+	save_dirs = set->value("save_dirs", save_dirs).toBool();
+	if (save_dirs) {
+		latest_dir = set->value("latest_dir", latest_dir).toString();
+		last_dvd_directory = set->value("last_dvd_directory", last_dvd_directory).toString();
+	}
 	set->endGroup(); // directories
 
 
@@ -1338,6 +1374,16 @@
 ******* */
 
 	filters->load(set);
+
+	// Fix some values if config is old
+	if (config_version < CURRENT_CONFIG_VERSION) {
+		qDebug("Preferences::load: config version is old, updating it");
+		config_version = CURRENT_CONFIG_VERSION;
+		/*
+		iconset = "Nuvola";
+		yt_user_agent = "Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)";
+		*/
+	}
 }
 
 #endif // NO_USE_INI_FILES

smplayer-0.8.0.tar.bz2/src/preferences.h -> smplayer-0.8.1.tar.bz2/src/preferences.h Changed

smplayer-0.8.0.tar.bz2/src/smplayer.cpp -> smplayer-0.8.1.tar.bz2/src/smplayer.cpp Changed

smplayer-0.8.0.tar.bz2/src/smplayer.ico -> smplayer-0.8.1.tar.bz2/src/smplayer.ico Changed

smplayer-0.8.0.tar.bz2/src/smplayer.pro -> smplayer-0.8.1.tar.bz2/src/smplayer.pro Changed

smplayer-0.8.0.tar.bz2/src/smplayer.rc -> smplayer-0.8.1.tar.bz2/src/smplayer.rc Changed

smplayer-0.8.0.tar.bz2/src/translations/smplayer_cs.ts -> smplayer-0.8.1.tar.bz2/src/translations/smplayer_cs.ts Changed

@@ -16,7 +16,7 @@
 <message>
 <location filename="../about.cpp" line="143"/>
 <source>Spanish</source>
- <translation type="unfinished">Španělština</translation>
+ <translation>Španělská</translation>
 </message>
 <message>
 <location filename="../about.cpp" line="144"/>
@@ -284,37 +284,37 @@
 <message>
 <location filename="../about.cpp" line="204"/>
 <source>Croatian</source>
- <translation type="unfinished">Chorvatština</translation>
+ <translation>Chorvatská</translation>
 </message>
 <message>
 <location filename="../about.cpp" line="46"/>
 <source>Using MPlayer2 %1</source>
- <translation type="unfinished"></translation>
+ <translation>Používá Mplayer2 %1</translation>
 </message>
 <message>
 <location filename="../about.cpp" line="70"/>
 <source>SMPlayer uses the award-winning MPlayer as playback engine. See %1</source>
- <translation type="unfinished"></translation>
+ <translation>SMPlayer používá oceněný přehrávač MPlayer jako přehrávací engine. Viz %1</translation>
 </message>
 <message>
 <location filename="../about.cpp" line="85"/>
 <source>Read the entire license</source>
- <translation type="unfinished"></translation>
+ <translation>Přečtěte si celou licenci</translation>
 </message>
 <message>
 <location filename="../about.cpp" line="93"/>
 <source>Read a translation</source>
- <translation type="unfinished"></translation>
+ <translation>Přečtěte si překlad</translation>
 </message>
 <message>
 <location filename="../about.cpp" line="105"/>
 <source>Packages for Windows created by %1</source>
- <translation type="unfinished"></translation>
+ <translation>Balíčky pro Windows vytvořil %1</translation>
 </message>
 <message>
 <location filename="../about.cpp" line="106"/>
 <source>Many other people contributed with patches. See the Changelog for details.</source>
- <translation type="unfinished"></translation>
+ <translation>Mnoho dalších licí přispělo pomocí patchů. Viz Changelog.</translation>
 </message>
 </context>
 <context>
@@ -583,12 +583,12 @@
 <location filename="../basegui.cpp" line="1540"/>
 <source>&amp;Off</source>
 <comment>closed captions menu</comment>
- <translation type="unfinished">&amp;Vypnuto</translation>
+ <translation>&amp;Vypnuto</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1550"/>
 <source>&amp;YouTube browser</source>
- <translation type="unfinished"></translation>
+ <translation>Prohlížeč &amp;YouTube</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1664"/>
@@ -598,32 +598,32 @@
 <message>
 <location filename="../basegui.cpp" line="1822"/>
 <source>SMPlayer - MPlayer log</source>
- <translation type="unfinished"></translation>
+ <translation>SMPlayer - log MPlayeru</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1825"/>
 <source>SMPlayer - SMPlayer log</source>
- <translation type="unfinished"></translation>
+ <translation>SMPlayer - log SMPlayeru</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="2714"/>
 <source>Information</source>
- <translation type="unfinished">Informace</translation>
+ <translation>Informace</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="2715"/>
 <source>You need to restart SMPlayer to use the new GUI.</source>
- <translation type="unfinished"></translation>
+ <translation>K zobrazení nového GUI musíte restartovat SMPlayer.</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="4661"/>
 <source>An error happened - SMPlayer</source>
- <translation type="unfinished"></translation>
+ <translation>Nastala chyba - SMPlayer</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="4661"/>
 <source>The YouTube Browser couldn&apos;t be launched</source>
- <translation type="unfinished"></translation>
+ <translation>Prohlížeč YouTube se nepodařilo spustit</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1461"/>
@@ -768,7 +768,7 @@
 <message>
 <location filename="../basegui.cpp" line="1493"/>
 <source>Debanding (&amp;gradfun)</source>
- <translation type="unfinished"></translation>
+ <translation>Debanding (&amp;gradfun)</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1566"/>
@@ -843,12 +843,12 @@
 <message>
 <location filename="../basegui.cpp" line="1704"/>
 <source>De&amp;noise</source>
- <translation type="unfinished"></translation>
+ <translation>Odstranění š&amp;umu</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1707"/>
 <source>Blur/S&amp;harp</source>
- <translation type="unfinished"></translation>
+ <translation>Rozmazání/&amp;zaostření</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1722"/>
@@ -870,37 +870,37 @@
 <location filename="../basegui.cpp" line="1729"/>
 <source>&amp;Off</source>
 <comment>denoise menu</comment>
- <translation type="unfinished">&amp;Vypnuto</translation>
+ <translation>&amp;Vypnuto</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1730"/>
 <source>&amp;Normal</source>
 <comment>denoise menu</comment>
- <translation type="unfinished"></translation>
+ <translation>&amp;Normální</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1731"/>
 <source>&amp;Soft</source>
 <comment>denoise menu</comment>
- <translation type="unfinished"></translation>
+ <translation>&amp;Jemné</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1733"/>
 <source>&amp;None</source>
 <comment>unsharp menu</comment>
- <translation type="unfinished">Žá&amp;dné</translation>
+ <translation>Žá&amp;dné</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1734"/>
 <source>&amp;Blur</source>
 <comment>unsharp menu</comment>
- <translation type="unfinished"></translation>
+ <translation>&amp;Rozmazat</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1735"/>
 <source>&amp;Sharpen</source>
 <comment>unsharp menu</comment>
- <translation type="unfinished"></translation>
+ <translation>&amp;Zaostřit</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1759"/>
@@ -1737,47 +1737,47 @@
 <message>
 <location filename="../basegui.cpp" line="1564"/>
 <source>&amp;Donate</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Přispět</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1778"/>
 <source>&amp;Closed captions</source>
- <translation type="unfinished"></translation>
+ <translation>S&amp;kryté titulky</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="3689"/>
 <source>Donate</source>
- <translation type="unfinished"></translation>
+ <translation>Přispět</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="3690"/>
 <source>If you like SMPlayer, a really good way to support it is by sending a donation, even the smallest one is highly appreciated.</source>
- <translation type="unfinished"></translation>
+ <translation>Máte-li rádi SMPlayer, můžete svou podporu vyjádřit zasláním příspěvku, i malý příspěvek je vítán.</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="3691"/>
 <source>You can send your donation using %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Příspěvek můžete zaslat pomocí %1.</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="3691"/>
 <source>this form</source>
- <translation type="unfinished"></translation>
+ <translation>tohoto formuláře</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1650"/>
 <source>&amp;Disc</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Disk</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1654"/>
 <source>F&amp;avorites</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Oblíbené</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1563"/>
 <source>Check for &amp;updates</source>
- <translation type="unfinished"></translation>
+ <translation>Zkontrolovat a&amp;ktualizace</translation>
 </message>
 </context>
 <context>
@@ -1939,17 +1939,17 @@
 <message>
 <location filename="../core.cpp" line="504"/>
 <source>Connecting to %1</source>
- <translation type="unfinished"></translation>
+ <translation>Připojuji se k %1</translation>
 </message>
 <message>
 <location filename="../core.cpp" line="508"/>
 <source>Unable to retrieve youtube page</source>
- <translation type="unfinished"></translation>
+ <translation>Nepodařilo se získat stránku youtube</translation>
 </message>
 <message>
 <location filename="../core.cpp" line="512"/>
 <source>Unable to locate the url of the video</source>
- <translation type="unfinished"></translation>
+ <translation>Nepodařilo se získat url videa</translation>
 </message>
 </context>
 <context>
@@ -1987,22 +1987,22 @@
 <message>
 <location filename="../defaultgui.cpp" line="515"/>
 <source>Edit main &amp;toolbar</source>
- <translation type="unfinished"></translation>
+ <translation>Upravit hlavní liš&amp;tu</translation>
 </message>
 <message>
 <location filename="../defaultgui.cpp" line="516"/>
 <source>Edit &amp;control bar</source>
- <translation type="unfinished"></translation>
+ <translation>Upravit ovládací &amp;panel</translation>
 </message>
 <message>
 <location filename="../defaultgui.cpp" line="517"/>
 <source>Edit m&amp;ini control bar</source>
- <translation type="unfinished"></translation>
+ <translation>Upravit &amp;mini ovládací panel</translation>
 </message>
 <message>
 <location filename="../defaultgui.cpp" line="518"/>
 <source>Edit &amp;floating control</source>
- <translation type="unfinished"></translation>
+ <translation>Upravit &amp;plovoucí ovládání</translation>
 </message>
 <message>
 <location filename="../defaultgui.cpp" line="536"/>
@@ -2146,12 +2146,12 @@
 <message>
 <location filename="../favoriteeditor.ui" line="51"/>
 <source>&amp;New item</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Nová položka</translation>
 </message>
 <message>
 <location filename="../favoriteeditor.ui" line="85"/>
 <source>New &amp;submenu</source>
- <translation type="unfinished"></translation>
+ <translation>Nové &amp;podmenu</translation>
 </message>
 </context>
 <context>
@@ -2169,27 +2169,27 @@
 <message>
 <location filename="../favorites.cpp" line="89"/>
 <source>&amp;Edit...</source>
- <translation type="unfinished">&amp;Upravit...</translation>
+ <translation>&amp;Upravit...</translation>
 </message>
 <message>
 <location filename="../favorites.cpp" line="90"/>
 <source>&amp;Jump...</source>
- <translation type="unfinished">&amp;Jdi na...</translation>
+ <translation>&amp;Jdi na...</translation>
 </message>
 <message>
 <location filename="../favorites.cpp" line="91"/>
 <source>&amp;Next</source>
- <translation type="unfinished">&amp;Další</translation>
+ <translation>&amp;Další</translation>
 </message>
 <message>
 <location filename="../favorites.cpp" line="92"/>
 <source>&amp;Previous</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Předchozí</translation>
 </message>
 <message>
 <location filename="../favorites.cpp" line="93"/>
 <source>&amp;Add current media</source>
- <translation type="unfinished"></translation>
+ <translation>Přidat aktuální &amp;médium</translation>
 </message>
 </context>
 <context>
@@ -2197,7 +2197,7 @@
 <message>
 <location filename="../filechooser.cpp" line="54"/>
 <source>Click to select a file or folder</source>
- <translation type="unfinished"></translation>
+ <translation>Klikněte pro výběr souboru nebo adresáře</translation>
 </message>
 </context>
 <context>
@@ -2401,12 +2401,12 @@
 <message>
 <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="20"/>
 <source>Server</source>
- <translation type="unfinished"></translation>
+ <translation>Server</translation>
 </message>
 <message>
 <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="26"/>
 <source>&amp;Opensubtitles server:</source>
- <translation type="unfinished"></translation>
+ <translation>Server &amp;Opensubtitles:</translation>
 </message>
 <message>
 <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="42"/>
@@ -2479,7 +2479,7 @@
 <message>
 <location filename="../findsubtitles/findsubtitleswindow.cpp" line="215"/>
 <source>Portuguese - Brasil</source>
- <translation type="unfinished"></translation>
+ <translation>Portugalština - Brazílie</translation>
 </message>
 <message>
 <location filename="../findsubtitles/findsubtitleswindow.cpp" line="228"/>
@@ -2494,16 +2494,16 @@
 <message numerus="yes">
 <location filename="../findsubtitles/findsubtitleswindow.cpp" line="564"/>
 <source>%n subtitle(s) extracted</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>získány %n titulky</numerusform>
+ <numerusform>získány %n titulky</numerusform>
+ <numerusform>získány %n titulků</numerusform>
 </translation>
 </message>
 <message>
 <location filename="../findsubtitles/findsubtitleswindow.cpp" line="623"/>
 <source>Error fixing the subtitle lines</source>
- <translation type="unfinished"></translation>
+ <translation>Chyba při opravě řádků titulků</translation>
 </message>
 <message>
 <location filename="../findsubtitles/findsubtitleswindow.ui" line="136"/>
@@ -3324,7 +3324,7 @@
 <message>
 <location filename="../languages.cpp" line="141"/>
 <source>Norwegian Nynorsk</source>
- <translation type="unfinished"></translation>
+ <translation>Norština Nynorsk</translation>
 </message>
 <message>
 <location filename="../languages.cpp" line="142"/>
@@ -4090,12 +4090,12 @@
 <message>
 <location filename="../minigui.cpp" line="160"/>
 <source>Edit &amp;control bar</source>
- <translation type="unfinished"></translation>
+ <translation>Upravit &amp;ovládací panel</translation>
 </message>
 <message>
 <location filename="../minigui.cpp" line="161"/>
 <source>Edit &amp;floating control</source>
- <translation type="unfinished"></translation>
+ <translation>Upravit &amp;plovoucí ovládání</translation>
 </message>
 </context>
 <context>
@@ -4108,7 +4108,7 @@
 <message>
 <location filename="../mpcgui/mpcgui.cpp" line="134"/>
 <source>Seek bar</source>
- <translation type="unfinished"></translation>
+ <translation>Seekování</translation>
 </message>
 <message>
 <location filename="../mpcgui/mpcgui.cpp" line="427"/>
@@ -4293,7 +4293,7 @@
 <message>
 <location filename="../playlist.cpp" line="1020"/>
 <source>Multimedia</source>
- <translation type="unfinished">Multimédia</translation>
+ <translation>Multimédia</translation>
 </message>
 </context>
 <context>
@@ -4402,12 +4402,12 @@
 <message>
 <location filename="../prefadvanced.ui" line="526"/>
 <source>MPlayer</source>
- <translation type="unfinished"></translation>
+ <translation>MPlayer</translation>
 </message>
 <message>
 <location filename="../prefadvanced.ui" line="591"/>
 <source>SMPlayer</source>
- <translation type="unfinished"></translation>
+ <translation>SMPlayer</translation>
 </message>
 <message>
 <location filename="../prefadvanced.ui" line="597"/>
@@ -4697,17 +4697,17 @@
 <message>
 <location filename="../prefadvanced.cpp" line="456"/>
 <source>Show tag info in window title</source>
- <translation type="unfinished"></translation>
+ <translation>Zobrazit informace o tagu v názvu okna</translation>
 </message>
 <message>
 <location filename="../prefadvanced.cpp" line="457"/>
 <source>If this option is enabled, information from tags will be shown in window title. Otherwise only the filename will be shown.</source>
- <translation type="unfinished"></translation>
+ <translation>Je-li tato položka začkrtnuta, informace z tagů bude zobrazena v názvu okna. Jinak se zobrazí pouze název souboru.</translation>
 </message>
 <message>
 <location filename="../prefadvanced.ui" line="261"/>
 <source>Show tag in&amp;fo in window title</source>
- <translation type="unfinished"></translation>
+ <translation>Zobrazit in&amp;formace v názvu okna</translation>
 </message>
 </context>
 <context>
@@ -5660,32 +5660,32 @@
 <message>
 <location filename="../prefgeneral.cpp" line="337"/>
 <source>snap mode</source>
- <translation type="unfinished"></translation>
+ <translation>snap mód</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="338"/>
 <source>slower dive mode</source>
- <translation type="unfinished"></translation>
+ <translation>slower dive mód</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="388"/>
 <source>uniaud mode</source>
- <translation type="unfinished"></translation>
+ <translation>uniaud mód</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="389"/>
 <source>dart mode</source>
- <translation type="unfinished"></translation>
+ <translation>dart mód</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="985"/>
 <source>%1 is the recommended one. %2 is only available on older MPlayer (before version %3)</source>
- <translation type="unfinished"></translation>
+ <translation>%1 je doporučené nastavení. %2 je dostupné pouze ve starší verzi MPlayeru (starší než %3)</translation>
 </message>
 <message>
 <location filename="../prefgeneral.ui" line="257"/>
 <source>Configu&amp;re...</source>
- <translation type="unfinished"></translation>
+ <translation>Nasta&amp;vit...</translation>
 </message>
 </context>
 <context>
@@ -6588,37 +6588,37 @@
 <message>
 <location filename="../prefinterface.cpp" line="527"/>
 <source>Hide video window when playing audio files</source>
- <translation type="unfinished"></translation>
+ <translation>Skrýt okno videa při přehrávání zvukových souborů</translation>
 </message>
 <message>
 <location filename="../prefinterface.cpp" line="528"/>
 <source>If this option is enabled the video window will be hidden when playing audio files.</source>
- <translation type="unfinished"></translation>
+ <translation>Je-li tato možnost zaškrtnuta, okno vide nebude při přehrávání zvukových souborů vidět.</translation>
 </message>
 <message>
 <location filename="../prefinterface.ui" line="108"/>
 <source>&amp;Hide video window when playing audio files</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Skrýt okna videa při přehrávání zvukových souborů</translation>
 </message>
 <message>
 <location filename="../prefinterface.cpp" line="583"/>
 <source>Precise seeking</source>
- <translation type="unfinished"></translation>
+ <translation>Přesné seekování</translation>
 </message>
 <message>
 <location filename="../prefinterface.cpp" line="584"/>
 <source>If this option is enabled, seeks are more accurate but they can be a little bit slower. May not work with some video formats.</source>
- <translation type="unfinished"></translation>
+ <translation>Je-li tato možnost zaškrtnuta, seekování bude přesnější, ale může být pomalejší. Pro některé formáty nemusí fungovat.</translation>
 </message>
 <message>
 <location filename="../prefinterface.cpp" line="586"/>
 <source>Note: this option only works with MPlayer2</source>
- <translation type="unfinished"></translation>
+ <translation>Poznámka: tato možnost funguje pouze pro MPlayer2</translation>
 </message>
 <message>
 <location filename="../prefinterface.ui" line="561"/>
 <source>&amp;Precise seeking</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Přesné seekování</translation>
 </message>
 </context>
 <context>
@@ -6938,17 +6938,17 @@
 <message>
 <location filename="../prefperformance.cpp" line="333"/>
 <source>Youtube quality</source>
- <translation type="unfinished"></translation>
+ <translation>Kvalita YouTube</translation>
 </message>
 <message>
 <location filename="../prefperformance.cpp" line="334"/>
 <source>Select the preferred quality for youtube videos.</source>
- <translation type="unfinished"></translation>
+ <translation>Vyberte preferovanou kvalitu videí z YouTube.</translation>
 </message>
 <message>
 <location filename="../prefperformance.ui" line="348"/>
 <source>Youtube &amp;quality</source>
- <translation type="unfinished"></translation>
+ <translation>Kvalita &amp;YouTube</translation>
 </message>
 </context>
 <context>
@@ -7922,20 +7922,20 @@
 <location filename="../helper.cpp" line="77"/>
 <location filename="../helper.cpp" line="83"/>
 <source>%n second(s)</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n sekundu</numerusform>
+ <numerusform>%n sekundy</numerusform>
+ <numerusform>%n sekund</numerusform>
 </translation>
 </message>
 <message numerus="yes">
 <location filename="../helper.cpp" line="80"/>
 <location filename="../helper.cpp" line="82"/>
 <source>%n minute(s)</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n minut</numerusform>
+ <numerusform>%n minuty</numerusform>
+ <numerusform>%n minut</numerusform>
 </translation>
 </message>
 <message>
@@ -7994,7 +7994,7 @@
 <message>
 <location filename="../clhelp.cpp" line="172"/>
 <source>&apos;media&apos; is any kind of file that SMPlayer can open. It can be a local file, a DVD (e.g. dvd://1), an Internet stream (e.g. mms://....) or a local playlist in format m3u or pls.</source>
- <translation type="unfinished"></translation>
+ <translation>&apos;média&apos; znamená jakýkoli soubor, který SMPlayer dokáže otevřít. Může se jednat o soubor na disku, DVD (např. dvd://1), internetový přenos (např. mms://) nebo playlist ve formátu m3u nebo pls.</translation>
 </message>
 </context>
 <context>
@@ -8095,73 +8095,73 @@
 <message>
 <location filename="../toolbareditor.ui" line="14"/>
 <source>Toolbar Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Editor nástrojové lišty</translation>
 </message>
 <message>
 <location filename="../toolbareditor.ui" line="22"/>
 <source>&amp;Available actions:</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Možné akce:</translation>
 </message>
 <message>
 <location filename="../toolbareditor.ui" line="57"/>
 <source>&amp;Left</source>
- <translation type="unfinished"></translation>
+ <translation>Do&amp;leva</translation>
 </message>
 <message>
 <location filename="../toolbareditor.ui" line="67"/>
 <source>&amp;Right</source>
- <translation type="unfinished"></translation>
+ <translation>Dop&amp;rava</translation>
 </message>
 <message>
 <location filename="../toolbareditor.ui" line="77"/>
 <source>&amp;Down</source>
- <translation type="unfinished">&amp;Dolů</translation>
+ <translation>&amp;Dolů</translation>
 </message>
 <message>
 <location filename="../toolbareditor.ui" line="87"/>
 <source>&amp;Up</source>
- <translation type="unfinished">N&amp;ahoru</translation>
+ <translation>&amp;Nahoru</translation>
 </message>
 <message>
 <location filename="../toolbareditor.ui" line="113"/>
 <source>Curre&amp;nt actions:</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Aktuální akce:</translation>
 </message>
 <message>
 <location filename="../toolbareditor.ui" line="143"/>
 <source>Add &amp;separator</source>
- <translation type="unfinished"></translation>
+ <translation>Přidat &amp;oddělovač</translation>
 </message>
 <message>
 <location filename="../toolbareditor.cpp" line="87"/>
 <location filename="../toolbareditor.cpp" line="180"/>
 <source>(separator)</source>
- <translation type="unfinished"></translation>
+ <translation>(oddělovač)</translation>
 </message>
 <message>
 <location filename="../toolbareditor.cpp" line="239"/>
 <source>Time slider</source>
- <translation type="unfinished"></translation>
+ <translation>Posuvník času</translation>
 </message>
 <message>
 <location filename="../toolbareditor.cpp" line="241"/>
 <source>Volume slider</source>
- <translation type="unfinished"></translation>
+ <translation>Posuvník hlasitosti</translation>
 </message>
 <message>
 <location filename="../toolbareditor.cpp" line="243"/>
 <source>Display time</source>
- <translation type="unfinished"></translation>
+ <translation>Zobrazení času</translation>
 </message>
 <message>
 <location filename="../toolbareditor.cpp" line="245"/>
 <source>3 in 1 rewind</source>
- <translation type="unfinished"></translation>
+ <translation>3 na 1 zpět</translation>
 </message>
 <message>
 <location filename="../toolbareditor.cpp" line="247"/>
 <source>3 in 1 forward</source>
- <translation type="unfinished"></translation>
+ <translation>3 na 1 vpřed</translation>
 </message>
 </context>
 <context>
@@ -8187,42 +8187,42 @@
 <message>
 <location filename="../vdpauproperties.ui" line="13"/>
 <source>VDPAU Properties</source>
- <translation type="unfinished"></translation>
+ <translation>Nastavení VDPAU</translation>
 </message>
 <message>
 <location filename="../vdpauproperties.ui" line="19"/>
 <source>Select the vdpau codecs to use. Not all of them may work.</source>
- <translation type="unfinished"></translation>
+ <translation>Vyberte VDPAU kodeky, které se mají použít. Ne všechny musejí fungovat.</translation>
 </message>
 <message>
 <location filename="../vdpauproperties.ui" line="29"/>
 <source>ffh&amp;264vdpau</source>
- <translation type="unfinished"></translation>
+ <translation>ffh&amp;264vdpau</translation>
 </message>
 <message>
 <location filename="../vdpauproperties.ui" line="36"/>
 <source>ff&amp;mpeg12vdpau</source>
- <translation type="unfinished"></translation>
+ <translation>ff&amp;mpeg12vdpau</translation>
 </message>
 <message>
 <location filename="../vdpauproperties.ui" line="43"/>
 <source>ff&amp;wmv3vdpau</source>
- <translation type="unfinished"></translation>
+ <translation>ff&amp;wmv3vdpau</translation>
 </message>
 <message>
 <location filename="../vdpauproperties.ui" line="50"/>
 <source>ff&amp;vc1vdpau</source>
- <translation type="unfinished"></translation>
+ <translation>ff&amp;vc1vdpau</translation>
 </message>
 <message>
 <location filename="../vdpauproperties.ui" line="57"/>
 <source>ffodiv&amp;xvdpau</source>
- <translation type="unfinished"></translation>
+ <translation>ffodiv&amp;xvdpau</translation>
 </message>
 <message>
 <location filename="../vdpauproperties.ui" line="71"/>
 <source>&amp;Disable software video filters</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Zakázat softwareové video filtry</translation>
 </message>
 </context>
 <context>

smplayer-0.8.0.tar.bz2/src/translations/smplayer_eu.ts -> smplayer-0.8.1.tar.bz2/src/translations/smplayer_eu.ts Changed

@@ -566,7 +566,7 @@
 <message>
 <location filename="../basegui.cpp" line="1397"/>
 <source>&amp;URL...</source>
- <translation>&amp;URL-a...</translation>
+ <translation>UR&amp;L-a...</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1648"/>
@@ -707,7 +707,7 @@
 <message>
 <location filename="../basegui.cpp" line="1690"/>
 <source>F&amp;ilters</source>
- <translation>I&amp;ragazkiak</translation>
+ <translation>I&amp;ragazkiak </translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1463"/>
@@ -722,7 +722,7 @@
 <message>
 <location filename="../basegui.cpp" line="1696"/>
 <source>S&amp;tay on top</source>
- <translation>E&amp;duki goian</translation>
+ <translation>E&amp;duki gainean</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1512"/>
@@ -737,7 +737,7 @@
 <message>
 <location filename="../basegui.cpp" line="1756"/>
 <source>&amp;Filters</source>
- <translation>I&amp;ragazkiak</translation>
+ <translation>&amp;Iragazkiak</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1770"/>
@@ -807,7 +807,7 @@
 <message>
 <location filename="../basegui.cpp" line="1517"/>
 <source>&amp;Load...</source>
- <translation>&amp;Gertatu...</translation>
+ <translation>Gertatu&amp;...</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1519"/>
@@ -857,12 +857,12 @@
 <message>
 <location filename="../basegui.cpp" line="1809"/>
 <source>&amp;OSD</source>
- <translation>&amp;OSD</translation>
+ <translation>&amp;IGE (Ikusleiho Gaineko Erakuspena)</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1813"/>
 <source>&amp;View logs</source>
- <translation>&amp;Ikusi oharrak</translation>
+ <translation>Ik&amp;usi oharrak</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1549"/>
@@ -1074,7 +1074,7 @@
 <message>
 <location filename="../basegui.cpp" line="1590"/>
 <source>OSD - Next level</source>
- <translation>OSD - Hurrengo maila</translation>
+ <translation>IGE - Hurrengo maila</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1591"/>
@@ -1315,12 +1315,12 @@
 <message>
 <location filename="../basegui.cpp" line="1562"/>
 <source>&amp;Command line options</source>
- <translation>&amp;Komando lerroko aukerak</translation>
+ <translation>Agindu lerroko au&amp;kerak</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="3677"/>
 <source>SMPlayer command line options</source>
- <translation>SMPlayer-en komando lerroko aukerak</translation>
+ <translation>SMPlayer-en agindu lerroko aukerak</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1531"/>
@@ -1527,7 +1527,7 @@
 <message>
 <location filename="../basegui.cpp" line="1467"/>
 <source>Pre&amp;view...</source>
- <translation>Aurrekoa&amp;...</translation>
+ <translation>Aurr&amp;eikuspena...</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1743"/>
@@ -1627,7 +1627,7 @@
 <message>
 <location filename="../basegui.cpp" line="1746"/>
 <source>Toggle stay on top</source>
- <translation>Aldatu eduki goianra</translation>
+ <translation>Aldatu eduki gainean-ra</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="4297"/>
@@ -1703,7 +1703,7 @@
 <message>
 <location filename="../basegui.cpp" line="1613"/>
 <source>Show filename on OSD</source>
- <translation>Erakutsi agirizena OSD-an</translation>
+ <translation>Erakutsi agirizena IGE-an</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1442"/>
@@ -1801,7 +1801,7 @@
 <message>
 <location filename="../baseguiplus.cpp" line="208"/>
 <source>&amp;Quit</source>
- <translation>A&amp;maitu</translation>
+ <translation>&amp;Utzi</translation>
 </message>
 <message>
 <location filename="../baseguiplus.cpp" line="214"/>
@@ -1952,7 +1952,7 @@
 <message>
 <location filename="../defaultgui.cpp" line="480"/>
 <source>Welcome to SMPlayer</source>
- <translation>Ongi etorri SMPlayerrera</translation>
+ <translation>Ongi etorri SM Irakurgailura</translation>
 </message>
 <message>
 <location filename="../defaultgui.cpp" line="508"/>
@@ -2282,7 +2282,7 @@
 Example: scale=512:-2,eq2=1.1</source>
 <translation>Bideo iragazki gehigarriak ere bidali ahal dizkiozu.
 Bereizi itzazu &quot;,&quot; bidez. Ez erabili zuriunerik!
-Adibidez: scale=512:-2.eq2=1.1</translation>
+Adibidez: scale=512:-2,eq2=1.1</translation>
 </message>
 <message>
 <location filename="../filepropertiesdialog.ui" line="348"/>
@@ -4467,7 +4467,7 @@
 <message>
 <location filename="../prefadvanced.cpp" line="468"/>
 <source>Here you can add video filters for MPlayer. Write them separated by commas. Don&apos;t use spaces!</source>
- <translation>Hemen MPlayerrentzako bideo iragazkiak gehitu ditzakezu. Idatzi itzazu kakotxaz banandute. Ez erabili tarterik!</translation>
+ <translation>Hemen MPlayerrentzako bideo iragazkiak gehitu ditzakezu. Idatzi itzazu kakotxaz bananduta. Ez erabili tarterik!</translation>
 </message>
 <message>
 <location filename="../prefadvanced.cpp" line="471"/>
@@ -4477,7 +4477,7 @@
 <message>
 <location filename="../prefadvanced.cpp" line="472"/>
 <source>Here you can add audio filters for MPlayer. Write them separated by commas. Don&apos;t use spaces!</source>
- <translation>Hemen MPlayerrentzako audio iragazkiak gehitu ditzakezu. Idatzi itzazu kakotxaz banandute. Ez erabili tarterik!</translation>
+ <translation>Hemen MPlayerrentzako audio iragazkiak gehitu ditzakezu. Idatzi itzazu kakotxaz bananduta. Ez erabili tarterik!</translation>
 </message>
 <message>
 <location filename="../prefadvanced.cpp" line="432"/>
@@ -4552,7 +4552,7 @@
 <message>
 <location filename="../prefadvanced.cpp" line="518"/>
 <source>This option allows to filter the SMPlayer messages that will be stored in the log. Here you can write any regular expression.&lt;br&gt;For instance: &lt;i&gt;^Core::.*&lt;/i&gt; will display only the lines starting with &lt;i&gt;Core::&lt;/i&gt;</source>
- <translation>Aukera honek ahalbidetzen du iragaztea oharren gordeko diren SMPlayerren mezuak. Hemen edozein adierazpen arrunt idatzi dezakezu.&lt;br&gt;Eskabidea: &lt;i&gt;^Core::.*&lt;/i&gt; honela hitz horrekin hasten diren lerroak bakarrik erakutsiko ditu &lt;i&gt;Core::&lt;/i&gt;</translation>
+ <translation>Aukera honek ahalbidetzen du iragaztea oharrean gordeko diren SMPlayerren mezuak. Hemen edozein adierazpen arrunt idatzi dezakezu.&lt;br&gt;Eskabidea: &lt;i&gt;^Core::.*&lt;/i&gt; honela hitz horrekin hasten diren lerroak bakarrik erakutsiko ditu &lt;i&gt;Core::&lt;/i&gt;</translation>
 </message>
 <message>
 <location filename="../prefadvanced.cpp" line="412"/>
@@ -4622,7 +4622,7 @@
 <message>
 <location filename="../prefadvanced.cpp" line="494"/>
 <source>If this option is checked, the SMPlayer log wil be recorded to %1</source>
- <translation>Aukera hau hautatua bada, SMPlayer oharr hemen grabatuko da: %1</translation>
+ <translation>Aukera hau hautatua bada, SMPlayer oharra hemen grabatuko da: %1</translation>
 </message>
 <message>
 <location filename="../prefadvanced.ui" line="629"/>
@@ -4670,7 +4670,7 @@
 <message>
 <location filename="../prefassociations.cpp" line="225"/>
 <source>Check all file types in the list</source>
- <translation>Egiaztatu zerrendako agiri mota guztiak</translation>
+ <translation>Hautatu zerrendako agiri mota guztiak</translation>
 </message>
 <message>
 <location filename="../prefassociations.cpp" line="228"/>
@@ -4705,7 +4705,7 @@
 <message>
 <location filename="../prefassociations.cpp" line="231"/>
 <source>Check the media file extensions you would like SMPlayer to handle. When you click Apply, the checked files will be associated with SMPlayer. If you uncheck a media type, the file association will be restored.</source>
- <translation>SMPlayerrek kudeatzea nahi duzun agiri hedapenak egiaztatu. Ezarri sakatzean egiaztatuko agiriak SMPlayerrekin lotuko dira. Multimedia agiri bat desmarkatuaz agiri lotura berrezarriko da.</translation>
+ <translation>SMPlayerrek kudeatzea nahi duzun agiri hedapenak hautatu. Ezarri sakatzean hautatutako agiriak SMPlayerrekin lotuko dira. Multimedia agiri bat deshautatuz agiri lotura leheneratuko da.</translation>
 </message>
 <message>
 <location filename="../prefassociations.cpp" line="227"/>
@@ -4896,7 +4896,7 @@
 <message>
 <location filename="../prefgeneral.cpp" line="924"/>
 <source>You can check this option if video equalizer is not supported by your graphic card or the selected video output driver.&lt;br&gt;&lt;b&gt;Note:&lt;/b&gt; this option can be incompatible with some video output drivers.</source>
- <translation>Aukera hau hautatu dezakezu zure txartel grafikoak edo hautatutako bideo kontrolatzaileak ez badu bideo ekualizagailua onartzen.&lt;br&gt;&lt;b&gt;Oharra:&lt;/b&gt; aukera hau zenbait bideo irteera gidagailuarekin bateraezina izan daiteke.</translation>
+ <translation>Aukera hau hautatu dezakezu zure txartel grafikoak edo hautatutako bideo irteera gidagailuak ez badu bideo ekualizagailua onartzen.&lt;br&gt;&lt;b&gt;Oharra:&lt;/b&gt; aukera hau zenbait bideo irteera gidagailuarekin bateraezina izan daiteke.</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="946"/>
@@ -4991,7 +4991,7 @@
 <message>
 <location filename="../prefgeneral.cpp" line="935"/>
 <source>Double buffering fixes flicker by storing two frames in memory, and displaying one while decoding another. If disabled it can affect OSD negatively, but often removes OSD flickering.</source>
- <translation>Buferreratze bikoitzak dirdir arazoak konpontzen ditu oroimenean bi frame gorde eta bat dekodetzen den bitartean bestea azaltzen. Ezgaituz gero OSD-an okerra eragin dezake, baina hala ere OSD dirdira konpontzen du.</translation>
+ <translation>Buferreratze bikoitzak dirdir arazoak konpontzen ditu oroimenean bi frame gorde eta bat dekodetzen den bitartean bestea azaltzen. Ezgaituz gero IGE-an okerra eragin dezake, baina hala ere IGE-ko dirdira konpontzen du.</translation>
 </message>
 <message>
 <location filename="../prefgeneral.ui" line="309"/>
@@ -5131,7 +5131,7 @@
 <message>
 <location filename="../prefgeneral.cpp" line="132"/>
 <source>Here you can type your preferred language for the audio and subtitle streams. When a media with multiple audio or subtitle streams is found, SMPlayer will try to use your preferred language. This only will work with media that offer info about the language of audio and subtitle streams, like DVDs or mkv files.&lt;br&gt;These fields accept regular expressions. Example: &lt;b&gt;es|esp|spa&lt;/b&gt; will select the track if it matches with &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; or &lt;i&gt;spa&lt;/i&gt;.</source>
- <translation>Hemen audio eta azpidatzi jarioentzat hobetsiriko hizkuntza zehaztu dezakezu. Azpidatzi edo audio jario anitz dituen multimedia bat aurkitzean, smplayer hobetsiriko hizkuntza erabiltzen saiatuko da.&lt;br&gt;Honek, DVD-ak edo mkv agiriak bezala, azpidatzi eta audio jarioei buruzko argibideak eskeintzen dituzten multimediekin jarduten du.&lt;br&gt;Eremu honek adierazpen arruntak onartzen ditu. Adibidez &lt;b&gt;eu|eus|baq&lt;/b&gt; erabiliaz &lt;i&gt;eu&lt;/i&gt;, &lt;i&gt;eus&lt;/i&gt; edo &lt;i&gt;baq&lt;/i&gt;-rekin parekatzen den jarioa erabiliko da.</translation>
+ <translation>Hemen audio eta azpidatzi jarioentzat hobetsiriko hizkuntza zehaztu dezakezu. Azpidatzi edo audio jario anitz dituen multimedia bat aurkitzean, smplayer hobetsiriko hizkuntza erabiltzen saiatuko da.&lt;br&gt;Honek, DVD-ak edo mkv agiriak bezala, azpidatzi eta audio jarioei buruzko argibideak eskaintzen dituzten multimediekin jarduten du.&lt;br&gt;Eremu honek adierazpen arruntak onartzen ditu. Adibidez &lt;b&gt;eu|eus|baq&lt;/b&gt; erabiliaz &lt;i&gt;eu&lt;/i&gt;, &lt;i&gt;eus&lt;/i&gt; edo &lt;i&gt;baq&lt;/i&gt;-rekin parekatzen den jarioa erabiliko da.</translation>
 </message>
 <message>
 <location filename="../prefgeneral.ui" line="1011"/>
@@ -5323,7 +5323,7 @@
 <message>
 <location filename="../prefgeneral.cpp" line="886"/>
 <source>Select the video output driver. %1 provides the best performance.</source>
- <translation>Hautatu bideo irteera gigagailua. %1 ematen etekin hoberena.</translation>
+ <translation>Hautatu bideo irteera gigagailua. %1-ek ematen du etekin hoberena.</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="991"/>
@@ -5343,17 +5343,17 @@
 <message>
 <location filename="../prefgeneral.cpp" line="972"/>
 <source>Check this option to disable the screensaver while playing.&lt;br&gt;The screensaver will enabled again when play finishes.</source>
- <translation>Hautatu aukera hau ikusleiho-babeslea ezgaitzeko irakurketan zehar. &lt;br&gt;Ikusleihobabeslea berriro gaituko da irakurketa amaitzean.</translation>
+ <translation>Hautatu aukera hau ikusleiho-babeslea ezgaitzeko irakurketan zehar. &lt;br&gt;Ikusleiho-babeslea berriro gaituko da irakurketa amaitzean.</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="1053"/>
 <source>Here you can type your preferred language for the audio streams. When a media with multiple audio streams is found, SMPlayer will try to use your preferred language.&lt;br&gt;This only will work with media that offer info about the language of the audio streams, like DVDs or mkv files.&lt;br&gt;This field accepts regular expressions. Example: &lt;b&gt;es|esp|spa&lt;/b&gt; will select the audio track if it matches with &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; or &lt;i&gt;spa&lt;/i&gt;.</source>
- <translation>Hemen azpidatzien jariorako hizkuntza hobetsia idatzi dezakezu. Azpidatzi jario anitz dituen multimedia bat aurkitzen denean, SMPlayer saiatuko da erabiltzen zuk hobetsitako hizkuntza. &lt;br&gt;Honek bakarrik lan egingo du azpidatzi jarioaren argibideak ematen dituen multimediekin, DVD-ak edo mkv agiriak adibidez.&lt;br&gt;Eremu honek adierazpen arruntak onartzen ditu. Adibidez: &lt;b&gt;es|esp|spa&lt;/b&gt;idatziz gero &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; edo &lt;i&gt;spa&lt;/i&gt;-rekin bat datorren azpidatzi jarioa hautatuko du.</translation>
+ <translation>Hemen azpidatzien jariorako hizkuntza hobetsia idatzi dezakezu. Azpidatzi jario anitz dituen multimedia bat aurkitzen denean, SMPlayer saiatuko da erabiltzen zuk hobetsitako hizkuntza. &lt;br&gt;Honek bakarrik lan egingo du azpidatzi jarioaren argibideak ematen dituzten multimediekin, DVD-ak edo mkv agiriak adibidez.&lt;br&gt;Eremu honek adierazpen arruntak onartzen ditu. Adibidez: &lt;b&gt;eu|eus|baq&lt;/b&gt; idatziz gero &lt;i&gt;eu&lt;/i&gt;, &lt;i&gt;eus&lt;/i&gt; edo &lt;i&gt;baq&lt;/i&gt;-rekin bat datorren azpidatzi jarioa hautatuko du.</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="1063"/>
 <source>Here you can type your preferred language for the subtitle stream. When a media with multiple subtitle streams is found, SMPlayer will try to use your preferred language.&lt;br&gt;This only will work with media that offer info about the language of the subtitle streams, like DVDs or mkv files.&lt;br&gt;This field accepts regular expressions. Example: &lt;b&gt;es|esp|spa&lt;/b&gt; will select the subtitle stream if it matches with &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; or &lt;i&gt;spa&lt;/i&gt;.</source>
- <translation>Hemen azpidatzien jariorako hizkuntza hobetsia idatzi dezakezu. Azpidatzi jario anitz dituen multimedia bat aurkitzen denean, SMPlayer saiatuko da erabiltzen zuk hobetsitako hizkuntza. &lt;br&gt;Honek bakarrik lan egingo du azpidatzi jarioaren argibideak ematen dituen multimediekin, DVD-ak edo mkv agiriak adibidez.&lt;br&gt;Eremu honek adierazpen arruntak onartzen ditu. Adibidez: &lt;b&gt;es|esp|spa&lt;/b&gt;idatziz gero &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; edo &lt;i&gt;spa&lt;/i&gt;-rekin bat datorren azpidatzi jarioa hautatuko du.</translation>
+ <translation>Hemen azpidatzien jariorako hizkuntza hobetsia idatzi dezakezu. Azpidatzi jario anitz dituen multimedia bat aurkitzen denean, SMPlayer saiatuko da erabiltzen zuk hobetsitako hizkuntza. &lt;br&gt;Honek bakarrik lan egingo du azpidatzi jarioaren argibideak ematen dituzten multimediekin, DVD-ak edo mkv agiriak adibidez.&lt;br&gt;Eremu honek adierazpen arruntak onartzen ditu. Adibidez: &lt;b&gt;eu|eus|baq&lt;/b&gt; idatziz gero &lt;i&gt;eu&lt;/i&gt;, &lt;i&gt;eus&lt;/i&gt; edo &lt;i&gt;baq&lt;/i&gt;-rekin bat datorren azpidatzi jarioa hautatuko du.</translation>
 </message>
 <message>
 <location filename="../prefgeneral.ui" line="569"/>
@@ -5423,12 +5423,12 @@
 <message>
 <location filename="../prefgeneral.cpp" line="930"/>
 <source>If checked, turns on direct rendering (not supported by all codecs and video outputs)&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; May cause OSD/SUB corruption!</source>
- <translation>Hautatuta badago, zuzeneko aurkezpenera itzultzen da (ez dago sostengaturik kodek eta bideo irteera guztietan) &lt;br&gt;&lt;b&gt;Kontuz:&lt;/b&gt; Eragin dezake OSD/SUB-ren hondatzea!</translation>
+ <translation>Hautatuta badago, zuzeneko aurkezpenera itzultzen da (ez dago sostengaturik kodek eta bideo irteera guztietan) &lt;br&gt;&lt;b&gt;Kontuz:&lt;/b&gt; IGE/SUB-ren hondatzea eragin dezake!</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="1009"/>
 <source>Requests the number of playback channels. MPlayer asks the decoder to decode the audio into as many channels as specified. Then it is up to the decoder to fulfill the requirement. This is usually only important when playing videos with AC3 audio (like DVDs). In that case liba52 does the decoding by default and correctly downmixes the audio into the requested number of channels. &lt;b&gt;Note&lt;/b&gt;: This option is honored by codecs (AC3 only), filters (surround) and audio output drivers (OSS at least).</source>
- <translation>Galdetzen du irakurketa bide zenbatekoa. MPlayerrek galdetzen dio dekoatzaileari audioa adierazitako haina bideetan dekodeatzeko. Orduan gertu dago dekodeaketa eskabidea betetzeko. Hau garrantzitsua da bakarik AC3 audioa duten bideoak irakurtzerakoan (DVD-ak adibidez). Honelakoetan liba52-k egiten du dekodeaketa eta audioa behar bezala nahasten du eskatutako audio bide zenbatekoan. &lt;b&gt;Oharra&lt;/b&gt;: Aukera hau eskertzen dute kodek-ek (AC3 bakarrik), iragazkiek (ingurusoinua) eta audio irteera gidagailuak (OSS-k gutxienez).</translation>
+ <translation>Galdetzen du irakurketa bide zenbatekoa. MPlayerrek galdetzen dio dekodeatzaileari audioa adierazitako haina bideetan dekodeatzeko. Orduan gertu dago dekodeaketa eskabidea betetzeko. Hau garrantzitsua da bakarik AC3 audioa duten bideoak irakurtzerakoan (DVD-ak adibidez). Honelakoetan liba52-k egiten du dekodeaketa eta audioa behar bezala nahasten du eskatutako audio bide zenbatekoan. &lt;b&gt;Oharra&lt;/b&gt;: Aukera hau eskertzen dute kodek-ek (AC3 bakarrik), iragazkiek (ingurusoinua) eta audio irteera gidagailuak (OSS-k gutxienez).</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="864"/>
@@ -5493,17 +5493,17 @@
 <message>
 <location filename="../prefgeneral.cpp" line="959"/>
 <source>This option switches the screensaver off just before starting to play a file and switches it on when playback finishes. If this option is enabled, the screensaver won&apos;t appear even if playing audio files or when a file is paused.</source>
- <translation>Aukera honek aldatzen du ikusleiho-babeslea ezgaitura agiria irakurketa hastera doanean eta birgaitu egiten du irakurketa amaitutakoan. Aukera hau gaiturik badago, ikusleihobabeslea ez da agertuko audio agiriak irakurtzerakoan edo agiria pausatuta dagoenean.</translation>
+ <translation>Aukera honek aldatzen du ikusleiho-babeslea ezgaitura agiria irakurketa hastera doanean eta birgaitu egiten du irakurketa amaitutakoan. Aukera hau gaiturik badago, ikusleiho-babeslea ez da agertuko audio agiriak irakurtzerakoan edo agiria pausatuta dagoenean.</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="964"/>
 <source>Avoid screensaver</source>
- <translation>Sahiestu ikusleiho-babeslea</translation>
+ <translation>Saihestu ikusleiho-babeslea</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="965"/>
 <source>When this option is checked, SMPlayer will try to prevent the screensaver to be shown when playing a video file. The screensaver will be allowed to be shown if playing an audio file or in pause mode. This option only works if the SMPlayer window is in the foreground.</source>
- <translation>Aukera hau hautatu dagoenean, SMPlayer saiatuko da ikusleiho-babeslea ez erakusten bideo agiri bat irakurtzen ari denean. Ikusleihobabeslea ahalbidetuko da audio agiri bat irakurtzerakoan edo pausatuta moduan. Aukera honek lan egiten du baldin eta SMPlayer leihoa lehen planoan badago.</translation>
+ <translation>Aukera hau hautatu dagoenean, SMPlayer saiatuko da ikusleiho-babeslea ez erakusten bideo agiri bat irakurtzen ari denean. Ikusleiho-babeslea ahalbidetuko da audio agiri bat irakurtzerakoan edo pausatuta moduan. Aukera honek lan egiten du baldin eta SMPlayer leihoa lehen planoan badago.</translation>
 </message>
 <message>
 <location filename="../prefgeneral.ui" line="524"/>
@@ -5518,7 +5518,7 @@
 <message>
 <location filename="../prefgeneral.ui" line="537"/>
 <source>Avoid &amp;screensaver</source>
- <translation>Sahiestu ikusleiho&amp;-babeslea</translation>
+ <translation>Saihestu ikusleiho&amp;-babeslea</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="1043"/>
@@ -5666,7 +5666,7 @@
 <message>
 <location filename="../prefinput.ui" line="86"/>
 <source>Here you can change any key shortcut. To do it double click or press enter over a shortcut cell. Optionally you can also save the list to share it with other people or load it in another computer.</source>
- <translation>Hemen edozein lastertekla aldatu dezakezu. Horretarako klik bikoitza egin edo sartu sakatu lastertekla gelaxka batean. Aukeran zerrenda gorde dezakezu beste jendearekin elkarbanatu edo beste ordenagailu batean gertatzeko.</translation>
+ <translation>Hemen edozein lastertekla aldatu dezakezu. Horretarako klik bikoitza egin edo sakatu sartu lastertekla gelaxka batean. Aukeran zerrenda gorde dezakezu beste jendearekin elkarbanatu edo beste ordenagailu batean gertatzeko.</translation>
 </message>
 <message>
 <location filename="../prefinput.cpp" line="156"/>
@@ -5696,7 +5696,7 @@
 <message>
 <location filename="../prefinput.cpp" line="310"/>
 <source>This table allows you to change the key shortcuts of most available actions. Double click or press enter on a item, or press the &lt;b&gt;Change shortcut&lt;/b&gt; button to enter in the &lt;i&gt;Modify shortcut&lt;/i&gt; dialog. There are two ways to change a shortcut: if the &lt;b&gt;Capture&lt;/b&gt; button is on then just press the new key or combination of keys that you want to assign for the action (unfortunately this doesn&apos;t work for all keys). If the &lt;b&gt;Capture&lt;/b&gt; button is off then you could enter the full name of the key.</source>
- <translation>Taula honek ekintza arruntenentzat lasterteklak aldatzeko aukera ematen dizu. Sartu sakatu edo klik bikoitza egin gai batean edo sakatu &lt;b&gt;Aldatu lastermarka&lt;/b&gt; botoia sakatu &lt;i&gt;Eraldatu lastermarka&lt;/i&gt; leihoan. Bi modu daude lasterteklak aldatzeko: &lt;b&gt;Harpena&lt;/b&gt; botoia gaiturik badago, ezarri nahi duzun tekla konbinazio berria sakatu (zoritxarrez honek ez du tekla guztiekin jarduten). &lt;b&gt;Harpena&lt;/b&gt; botoia ezgaiturik badago, teklaren izen osoa sartu behar duzu.</translation>
+ <translation>Taula honek ekintza arruntenentzat lasterteklak aldatzeko aukera ematen dizu. Sakatu sartu edo klik bikoitza egin gai batean edo sakatu &lt;b&gt;Aldatu lastermarka&lt;/b&gt; botoia &lt;i&gt;Eraldatu lastermarka&lt;/i&gt; leihoan sartzeko. Bi modu daude lasterteklak aldatzeko: &lt;b&gt;Harpena&lt;/b&gt; botoia gaiturik badago, ezarri nahi duzun tekla konbinazio berria sakatu (zoritxarrez honek ez du tekla guztiekin jarduten). &lt;b&gt;Harpena&lt;/b&gt; botoia ezgaiturik badago, teklaren izen osoa sartu behar duzu.</translation>
 </message>
 <message>
 <location filename="../prefinput.cpp" line="322"/>
@@ -5886,7 +5886,7 @@
 <message>
 <location filename="../prefinput.cpp" line="74"/>
 <source>OSD - Next level</source>
- <translation>OSD - Hurrengo maila</translation>
+ <translation>IGE - Hurrengo maila</translation>
 </message>
 <message>
 <location filename="../prefinput.cpp" line="84"/>
@@ -5941,17 +5941,17 @@
 <message>
 <location filename="../prefinput.cpp" line="70"/>
 <source>Always on top</source>
- <translation>Betik goian</translation>
+ <translation>Betik gainean</translation>
 </message>
 <message>
 <location filename="../prefinput.cpp" line="71"/>
 <source>Never on top</source>
- <translation>Inoiz ez goian</translation>
+ <translation>Inoiz ez gainean</translation>
 </message>
 <message>
 <location filename="../prefinput.cpp" line="72"/>
 <source>On top while playing</source>
- <translation>Goian irakurketan</translation>
+ <translation>Gainean irakurketan</translation>
 </message>
 <message>
 <location filename="../prefinput.cpp" line="87"/>
@@ -6159,7 +6159,7 @@
 <message>
 <location filename="../prefinterface.ui" line="218"/>
 <source>Ico&amp;n set:</source>
- <translation>Iko&amp;no ezarpenak:</translation>
+ <translation>Ikur ezarpe&amp;nak:</translation>
 </message>
 <message>
 <location filename="../prefinterface.ui" line="205"/>
@@ -6174,7 +6174,7 @@
 <message>
 <location filename="../prefinterface.ui" line="66"/>
 <source>Auto&amp;resize:</source>
- <translation>Be&amp;rez-irneurriratu:</translation>
+ <translation>Be&amp;rez-birneurriratu:</translation>
 </message>
 <message>
 <location filename="../prefinterface.ui" line="101"/>
@@ -6369,7 +6369,7 @@
 <message>
 <location filename="../prefinterface.cpp" line="545"/>
 <source>Select the GUI you prefer for the application. Currently there are two available: Default GUI and Mini GUI.&lt;br&gt;The &lt;b&gt;Default GUI&lt;/b&gt; provides the traditional GUI, with the toolbar and control bar. The &lt;b&gt;Mini GUI&lt;/b&gt; provides a more simple GUI, without toolbar and a control bar with few buttons.&lt;br&gt;&lt;b&gt;Note:&lt;/b&gt; this option will take effect the next time you run SMPlayer.</source>
- <translation>Hautatu aplikaziorako nahiago duzun EIG. Arrunt bi daude eskuragarri. Berezko GUI-a eta Mini GUI-a. &lt;br&gt;Berezko &lt;b&gt;GUI-ak&lt;/b&gt; GUI tradizionala eskaintzen du, tresna-barrarekin eta aginte-barrarekin. &lt;b&gt;Mini GUI-ak&lt;/b&gt; GUI arruntago bat eskaintzen du, tresna-barra gabe eta botoi gutxi batzuko aginte-barrarekin. &lt;br&gt;&lt;b&gt;Oharra:&lt;/b&gt; aukera honek SMPlayer abiarazten duzun hurrengoan izango du eragina.</translation>
+ <translation>Hautatu aplikaziorako nahiago duzun EIG. Arrunt bi daude eskuragarri. Berezko EIG-a eta EIG Txikia. &lt;br&gt;Berezko &lt;b&gt;EIG-k&lt;/b&gt; EIG tradizionala eskaintzen du, tresna-barrarekin eta aginte-barrarekin. &lt;b&gt;EIG Txikiak&lt;/b&gt; EIG arruntago bat eskaintzen du, tresna-barra gabe eta botoi gutxi batzuko aginte-barrarekin. &lt;br&gt;&lt;b&gt;Oharra:&lt;/b&gt; aukera honek SMPlayer abiarazten duzun hurrengoan izango du eragina.</translation>
 </message>
 <message>
 <location filename="../prefinterface.ui" line="313"/>
@@ -6657,7 +6657,7 @@
 <message>
 <location filename="../prefperformance.cpp" line="301"/>
 <source>Skip loop filter</source>
- <translation>Ahaztu begizta iragazkia</translation>
+ <translation>Jauzi bigizta iragazkia</translation>
 </message>
 <message>
 <location filename="../prefperformance.ui" line="226"/>
@@ -6737,12 +6737,12 @@
 <message>
 <location filename="../prefperformance.ui" line="249"/>
 <source>Loop &amp;filter</source>
- <translation>Begizta i&amp;ragazkia</translation>
+ <translation>Bigizta i&amp;ragazkia</translation>
 </message>
 <message>
 <location filename="../prefperformance.cpp" line="302"/>
 <source>This option allows to skips the loop filter (AKA deblocking) during H.264 decoding. Since the filtered frame is supposed to be used as reference for decoding dependent frames this has a worse effect on quality than not doing deblocking on e.g. MPEG-2 video. But at least for high bitrate HDTV this provides a big speedup with no visible quality loss.</source>
- <translation>Honek ahalbidetzen du jauzi egitea begizta iragazkia (AKA deblokeaketa) H.264 dekodeaketan zehar. Iragazkiriko framea menpeko frameen dekodeaketarako xehetasun bezala erabili dela suposatzen den unetik honek deblokeaketa ez egitea baino eragin txarragoa du, adib. MPEG-2 bideoan. Baina gutxienez bitneurri handiko HDTV-rako honek bizkortasun handia ematen du kalitate galera ohargarririk gabe.</translation>
+ <translation>Honek ahalbidetzen du jauzi egitea bigizta iragazkia (AKA deblokeaketa) H.264 dekodeaketan zehar. Iragazkiriko framea menpeko frameen dekodeaketarako xehetasun bezala erabili dela suposatzen den unetik honek deblokeaketa ez egitea baino eragin txarragoa du, adib. MPEG-2 bideoan. Baina gutxienez bitneurri handiko HDTV-rako honek bizkortasun handia ematen du kalitate galera ohargarririk gabe.</translation>
 </message>
 <message>
 <location filename="../prefperformance.cpp" line="309"/>
@@ -6752,17 +6752,17 @@
 <message>
 <location filename="../prefperformance.cpp" line="310"/>
 <source>&lt;b&gt;Enabled&lt;/b&gt;: the loop filter is not skipped</source>
- <translation>&lt;b&gt;Gaiturik&lt;/b&gt;: begizta iragazkia ez da baztertuko</translation>
+ <translation>&lt;b&gt;Gaiturik&lt;/b&gt;: bigizta iragazkia ez da baztertuko</translation>
 </message>
 <message>
 <location filename="../prefperformance.cpp" line="311"/>
 <source>&lt;b&gt;Skip (always)&lt;/b&gt;: the loop filter is skipped no matter the resolution of the video</source>
- <translation>&lt;b&gt;Jauzi (betik)&lt;/b&gt;: begizta iragazkia jauzi egingo da bideo bereizmena begiratu gabe</translation>
+ <translation>&lt;b&gt;Jauzi (betik)&lt;/b&gt;: bigizta iragazkia jauzi egingo da bideo bereizmena begiratu gabe</translation>
 </message>
 <message>
 <location filename="../prefperformance.cpp" line="313"/>
 <source>&lt;b&gt;Skip only on HD videos&lt;/b&gt;: the loop filter will be skipped only on videos which height is %1 or greater.</source>
- <translation>&lt;b&gt;Jauzi HD bideoetan bakarrik&lt;/b&gt;: begizta iragazkiak %1 edo handiagoak diren bideoetan bakarrik jauziko da.</translation>
+ <translation>&lt;b&gt;Jauzi HD bideoetan bakarrik&lt;/b&gt;: bigizta iragazkiak %1 edo handiagoak diren bideoetan bakarrik jauziko da.</translation>
 </message>
 <message>
 <location filename="../prefperformance.cpp" line="337"/>
@@ -6807,17 +6807,17 @@
 <message>
 <location filename="../prefperformance.cpp" line="295"/>
 <source>Sets the number of threads to use for decoding. Only for MPEG-1/2 and H.264</source>
- <translation>Ezartzen du dekodeaketarako gai zenbatekoa. MPEG-1/2 eta H.264 bakarrik</translation>
+ <translation>Ezartzen du dekodeaketarako hari zenbatekoa. MPEG-1/2 eta H.264 bakarrik</translation>
 </message>
 <message>
 <location filename="../prefperformance.ui" line="188"/>
 <source>&amp;Threads for decoding (MPEG-1/2 and H.264 only):</source>
- <translation>&amp;Dekodeaketa gaiak (MPEG-1/2 and H.264 bakarrik):</translation>
+ <translation>&amp;Dekodeaketa hariak (MPEG-1/2 eta H.264 bakarrik):</translation>
 </message>
 <message>
 <location filename="../prefperformance.cpp" line="282"/>
 <source>Set process priority for mplayer according to the predefined priorities available under Windows.&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; Using realtime priority can cause system lockup.</source>
- <translation>Garapen lehentasuna ezartzen du mplayerrentzat Windowsekin eskuragarri diren lehentasun aurre-zehazpenekin. &lt;br&gt;&lt;b&gt;Kontuz:&lt;/b&gt; Egizkodenbora lehentasuna erabiliz sistemaren istea eragin dezake.</translation>
+ <translation>Garapen lehentasuna ezartzen du mplayerrentzat Windowsekin eskuragarri diren lehentasun aurre-zehazpenekin. &lt;br&gt;&lt;b&gt;Kontuz:&lt;/b&gt; Egizko denbora lehentasuna erabiliz sistemaren istea eragin dezake.</translation>
 </message>
 <message>
 <location filename="../prefperformance.cpp" line="298"/>
@@ -7008,7 +7008,7 @@
 <message>
 <location filename="../prefsubtitles.ui" line="388"/>
 <source>Select the font which will be used for subtitles (and OSD):</source>
- <translation>Hautatu azpidatzietan (eta OSD-en) erabiliko den hizki mota:</translation>
+ <translation>Hautatu azpidatzietan (eta IGE-an) erabiliko den hizki mota:</translation>
 </message>
 <message>
 <location filename="../prefsubtitles.cpp" line="513"/>
@@ -7113,7 +7113,7 @@
 <message>
 <location filename="../prefsubtitles.cpp" line="475"/>
 <source>Here you can select a system font to be used for the subtitles and OSD. &lt;b&gt;Note:&lt;/b&gt; requires a MPlayer with fontconfig support.</source>
- <translation>Hemen azpidatzientzako eta OSD-an erabiliko den sistema hizkia hautatu dezakezu. &lt;b&gt;Oharra:&lt;/b&gt; fontconfig duen MPlayerra behar du.</translation>
+ <translation>Hemen azpidatzientzako eta IGE-an erabiliko den sistema hizkia hautatu dezakezu. &lt;b&gt;Oharra:&lt;/b&gt; fontconfig duen MPlayerra behar du.</translation>
 </message>
 <message>
 <location filename="../prefsubtitles.cpp" line="478"/>
@@ -7263,7 +7263,7 @@
 <message>
 <location filename="../prefsubtitles.cpp" line="540"/>
 <source>Horizontal alignment</source>
- <translation>Etzenako lerrokapena</translation>
+ <translation>Etzaneko lerrokapena</translation>
 </message>
 <message>
 <location filename="../prefsubtitles.cpp" line="541"/>
@@ -7596,7 +7596,7 @@
 <message>
 <location filename="../prefsubtitles.cpp" line="561"/>
 <source>If this option is checked, the style defined above will be applied to ass subtitles too.</source>
- <translation>Aukera hau hautatu bada, azpian zehaztutako estiloa ass azpidatziei ere ezarriko zaie.</translation>
+ <translation>Aukera hau hautatu bada, gainean zehaztutako estiloa ass azpidatziei ere ezarriko zaie.</translation>
 </message>
 <message>
 <location filename="../prefsubtitles.ui" line="1211"/>
@@ -8400,7 +8400,7 @@
 <message>
 <location filename="../videopreview/videopreviewconfigdialog.cpp" line="49"/>
 <source>Usually the first frames are black, so it&apos;s a good idea to skip some seconds at the beginning of the video. This option allows to specify how many seconds will be skipped.</source>
- <translation>Arrunt lehen framea beltza da, baina ideia hona da bideoaren hasierako segundu batzuk ahazteko. Aukera honek ahalbidetzen du adieraztea zenbat segundu ahaztuko diren.</translation>
+ <translation>Arrunt lehen framea beltza da, baina ideia hona da bideoaren hasierako segundu batzuk ahazteko. Aukera honek ahalbidetzen du adieraztea zenbat segundu jauziko diren.</translation>
 </message>
 <message>
 <location filename="../videopreview/videopreviewconfigdialog.cpp" line="51"/>
@@ -8420,7 +8420,7 @@
 <message>
 <location filename="../videopreview/videopreviewconfigdialog.ui" line="249"/>
 <source>&amp;Extract frames as</source>
- <translation>&amp;Atera frameak honela</translation>
+ <translation>Atera &amp;frameak honela</translation>
 </message>
 <message>
 <location filename="../videopreview/videopreviewconfigdialog.cpp" line="44"/>

smplayer-0.8.0.tar.bz2/src/translations/smplayer_hr.ts -> smplayer-0.8.1.tar.bz2/src/translations/smplayer_hr.ts Changed

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0">
+<!DOCTYPE TS><TS>
 <context>
 <name>About</name>
 <message>
@@ -1404,19 +1402,19 @@
 </message>
 <message>
 <source>SMPlayer - MPlayer log</source>
- <translation type="unfinished"></translation>
+ <translation>SMPlayer - MPlayer log</translation>
 </message>
 <message>
 <source>SMPlayer - SMPlayer log</source>
- <translation type="unfinished"></translation>
+ <translation>SMPlayer - SMPlayer log</translation>
 </message>
 <message>
 <source>Information</source>
- <translation type="unfinished">Informacije</translation>
+ <translation>Informacije</translation>
 </message>
 <message>
 <source>You need to restart SMPlayer to use the new GUI.</source>
- <translation type="unfinished"></translation>
+ <translation>Morate ponovo pokrenuti SMPlayer da bi koristili novo sučelje.</translation>
 </message>
 </context>
 <context>
@@ -2060,14 +2058,13 @@
 <source>Subtitle saved as %1</source>
 <translation>Titlovi spremljeni kao %1</translation>
 </message>
- <message numerus="yes">
+ <message>
 <source>%1 subtitle(s) extracted</source>
- <translation type="obsolete">
- <numerusform>%1 titl(ova) otpakirano
+ <translation type="obsolete">%1 titl(ova) otpakirano
+ 
 
 
 
- </numerusform>
 </translation>
 </message>
 <message>
@@ -2104,16 +2101,15 @@
 </message>
 <message>
 <source>Portuguese - Brasil</source>
- <translation type="unfinished"></translation>
+ <translation>Portugalski - Brazil</translation>
 </message>
 <message>
 <source>Error fixing the subtitle lines</source>
- <translation type="unfinished"></translation>
+ <translation>Pogreška pri popravljanju linija titlova</translation>
 </message>
- <message numerus="yes">
+ <message>
 <source>%n subtitle(s) extracted</source>
- <translation type="unfinished">
- <numerusform></numerusform>
+ <translation>%n titlova otpakirano
 </translation>
 </message>
 </context>
@@ -3077,7 +3073,7 @@
 <source>Marshallese</source>
 <translation>Marshallese</translation>
 </message>
- <message utf8="true">
+ <message encoding="UTF-8">
 <source>Bokmål</source>
 <translation>Bokmål</translation>
 </message>
@@ -3165,7 +3161,7 @@
 <source>Venda</source>
 <translation>Venda</translation>
 </message>
- <message utf8="true">
+ <message encoding="UTF-8">
 <source>Volapük</source>
 <translation>Volapük</translation>
 </message>
@@ -3179,7 +3175,7 @@
 </message>
 <message>
 <source>Norwegian Nynorsk</source>
- <translation type="unfinished"></translation>
+ <translation>Norveški Nynorsk</translation>
 </message>
 </context>
 <context>
@@ -3265,7 +3261,7 @@
 </message>
 <message>
 <source>Seek bar</source>
- <translation type="unfinished"></translation>
+ <translation>Klizač za premotavanje</translation>
 </message>
 </context>
 <context>
@@ -3732,11 +3728,11 @@
 </message>
 <message>
 <source>MPlayer</source>
- <translation type="unfinished"></translation>
+ <translation>MPlayer</translation>
 </message>
 <message>
 <source>SMPlayer</source>
- <translation type="unfinished"></translation>
+ <translation>SMPlayer</translation>
 </message>
 </context>
 <context>
@@ -6328,20 +6324,16 @@
 <source>&apos;media&apos; is any kind of file that SMPlayer can open. It can be a local file, a DVD (e.g. dvd://1), an Internet stream (e.g. mms://....) or a local playlist in format m3u or pls.</source>
 <translation>&apos;medij&apos; je svaka vrsta datoteke koju SMPlayer može otvoriti. To može biti lokalna datoteka, DVD, internet streaming (npr. mms://...) ili lokalna playlista u .m3u ili .pls formatu.</translation>
 </message>
- <message numerus="yes">
+ <message>
 <source>%n second(s)</source>
- <translation type="unfinished">
- <numerusform>%n sekundi
+ <translation>%n sekundi 
 
- </numerusform>
 </translation>
 </message>
- <message numerus="yes">
+ <message>
 <source>%n minute(s)</source>
- <translation type="unfinished">
- <numerusform>%n minuta
+ <translation>%n minuta 
 
- </numerusform>
 </translation>
 </message>
 </context>

smplayer-0.8.0.tar.bz2/src/translations/smplayer_ru_RU.ts -> smplayer-0.8.1.tar.bz2/src/translations/smplayer_ru_RU.ts Changed

@@ -2499,7 +2499,7 @@
 <message>
 <location filename="../findsubtitles/findsubtitleswindow.cpp" line="215"/>
 <source>Portuguese - Brasil</source>
- <translation type="unfinished"></translation>
+ <translation>Португальский (Бразилия)</translation>
 </message>
 <message>
 <location filename="../findsubtitles/findsubtitleswindow.cpp" line="228"/>
@@ -2514,16 +2514,16 @@
 <message numerus="yes">
 <location filename="../findsubtitles/findsubtitleswindow.cpp" line="564"/>
 <source>%n subtitle(s) extracted</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n субтитр извлечён</numerusform>
+ <numerusform>%n субтитра извлечёны</numerusform>
+ <numerusform>%n субтитров извлечено</numerusform>
 </translation>
 </message>
 <message>
 <location filename="../findsubtitles/findsubtitleswindow.cpp" line="623"/>
 <source>Error fixing the subtitle lines</source>
- <translation type="unfinished"></translation>
+ <translation>Ошибка при исправлении строк субтитров</translation>
 </message>
 <message>
 <location filename="../findsubtitles/findsubtitleswindow.ui" line="136"/>
@@ -3344,7 +3344,7 @@
 <message>
 <location filename="../languages.cpp" line="141"/>
 <source>Norwegian Nynorsk</source>
- <translation type="unfinished"></translation>
+ <translation>Норвежский (Нюношк)</translation>
 </message>
 <message>
 <location filename="../languages.cpp" line="142"/>

smplayer-0.8.0.tar.bz2/src/translations/smplayer_uk_UA.ts -> smplayer-0.8.1.tar.bz2/src/translations/smplayer_uk_UA.ts Changed

@@ -16,7 +16,7 @@
 <message>
 <location filename="../about.cpp" line="143"/>
 <source>Spanish</source>
- <translation type="unfinished">Іспанська</translation>
+ <translation>Іспанська</translation>
 </message>
 <message>
 <location filename="../about.cpp" line="144"/>
@@ -284,37 +284,37 @@
 <message>
 <location filename="../about.cpp" line="204"/>
 <source>Croatian</source>
- <translation type="unfinished">Хорватська</translation>
+ <translation>Хорватська</translation>
 </message>
 <message>
 <location filename="../about.cpp" line="46"/>
 <source>Using MPlayer2 %1</source>
- <translation type="unfinished"></translation>
+ <translation>Використовується MPlayer2 %1</translation>
 </message>
 <message>
 <location filename="../about.cpp" line="70"/>
 <source>SMPlayer uses the award-winning MPlayer as playback engine. See %1</source>
- <translation type="unfinished"></translation>
+ <translation>SMPlayer використовує заслужено відомий MPlayer для відтворення. Дивіться %1</translation>
 </message>
 <message>
 <location filename="../about.cpp" line="85"/>
 <source>Read the entire license</source>
- <translation type="unfinished"></translation>
+ <translation>Читати повну ліцензію</translation>
 </message>
 <message>
 <location filename="../about.cpp" line="93"/>
 <source>Read a translation</source>
- <translation type="unfinished"></translation>
+ <translation>Читати переклад</translation>
 </message>
 <message>
 <location filename="../about.cpp" line="105"/>
 <source>Packages for Windows created by %1</source>
- <translation type="unfinished"></translation>
+ <translation>Пакети для Windows створено %1</translation>
 </message>
 <message>
 <location filename="../about.cpp" line="106"/>
 <source>Many other people contributed with patches. See the Changelog for details.</source>
- <translation type="unfinished"></translation>
+ <translation>Багато людей внесли свій вклад своїми патчами. Більш детально перегляньте Changelog.</translation>
 </message>
 </context>
 <context>
@@ -1055,12 +1055,12 @@
 <message>
 <location filename="../basegui.cpp" line="1493"/>
 <source>Debanding (&amp;gradfun)</source>
- <translation type="unfinished"></translation>
+ <translation>Зменшити полосатість (&amp;gradfun)</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1550"/>
 <source>&amp;YouTube browser</source>
- <translation type="unfinished"></translation>
+ <translation>Переглядач &amp;YouTube</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1585"/>
@@ -1140,78 +1140,78 @@
 <message>
 <location filename="../basegui.cpp" line="1704"/>
 <source>De&amp;noise</source>
- <translation type="unfinished"></translation>
+ <translation>Зниження ш&amp;умів</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1707"/>
 <source>Blur/S&amp;harp</source>
- <translation type="unfinished"></translation>
+ <translation>Розмиття/Ч&amp;іткість</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1729"/>
 <source>&amp;Off</source>
 <comment>denoise menu</comment>
- <translation type="unfinished">&amp;Вимк</translation>
+ <translation>&amp;Вимкнено</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1730"/>
 <source>&amp;Normal</source>
 <comment>denoise menu</comment>
- <translation type="unfinished"></translation>
+ <translation>&amp;Нормальне</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1731"/>
 <source>&amp;Soft</source>
 <comment>denoise menu</comment>
- <translation type="unfinished"></translation>
+ <translation>&amp;Програмне</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1733"/>
 <source>&amp;None</source>
 <comment>unsharp menu</comment>
- <translation type="unfinished">&amp;Немає</translation>
+ <translation>&amp;Немає</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1734"/>
 <source>&amp;Blur</source>
 <comment>unsharp menu</comment>
- <translation type="unfinished"></translation>
+ <translation>&amp;Розмиття</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1735"/>
 <source>&amp;Sharpen</source>
 <comment>unsharp menu</comment>
- <translation type="unfinished"></translation>
+ <translation>&amp;Чіткість</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1822"/>
 <source>SMPlayer - MPlayer log</source>
- <translation type="unfinished"></translation>
+ <translation>SMPlayer - журнал mplayer</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1825"/>
 <source>SMPlayer - SMPlayer log</source>
- <translation type="unfinished"></translation>
+ <translation>SMPlayer - журнали smplayer</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="2714"/>
 <source>Information</source>
- <translation type="unfinished">Відомості</translation>
+ <translation>Відомості</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="2715"/>
 <source>You need to restart SMPlayer to use the new GUI.</source>
- <translation type="unfinished"></translation>
+ <translation>Необхідно перезапустити SMPlayer для використання нового інтерфейсу.</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="4661"/>
 <source>An error happened - SMPlayer</source>
- <translation type="unfinished"></translation>
+ <translation>Виникла помилка - SMPlayer</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="4661"/>
 <source>The YouTube Browser couldn&apos;t be launched</source>
- <translation type="unfinished"></translation>
+ <translation>Запуск переглядача YouTube неможливий</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1598"/>
@@ -1334,7 +1334,7 @@
 <location filename="../basegui.cpp" line="1540"/>
 <source>&amp;Off</source>
 <comment>closed captions menu</comment>
- <translation type="unfinished">&amp;Вимк</translation>
+ <translation>&amp;Вимкнено</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1607"/>
@@ -1349,7 +1349,7 @@
 <message>
 <location filename="../basegui.cpp" line="1737"/>
 <source>&amp;Off</source>
- <translation>&amp;Вимк</translation>
+ <translation>&amp;Вимкнено</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1738"/>
@@ -1737,47 +1737,47 @@
 <message>
 <location filename="../basegui.cpp" line="1564"/>
 <source>&amp;Donate</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Зробити пожертву</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1778"/>
 <source>&amp;Closed captions</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Закриті субтитри</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="3689"/>
 <source>Donate</source>
- <translation type="unfinished"></translation>
+ <translation>Зробити пожертву</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="3690"/>
 <source>If you like SMPlayer, a really good way to support it is by sending a donation, even the smallest one is highly appreciated.</source>
- <translation type="unfinished"></translation>
+ <translation>Якщо Вам подобається SMPlayer, найкращий спосіб підтримати його - зробити пожертву, навіть невеличкий внесок високо цінується.</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="3691"/>
 <source>You can send your donation using %1.</source>
- <translation type="unfinished"></translation>
+ <translation>Ви можете відправити вашу пожертву, використовуючи %1.</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="3691"/>
 <source>this form</source>
- <translation type="unfinished"></translation>
+ <translation>цю форму</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1650"/>
 <source>&amp;Disc</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Диск</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1654"/>
 <source>F&amp;avorites</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Улюблене</translation>
 </message>
 <message>
 <location filename="../basegui.cpp" line="1563"/>
 <source>Check for &amp;updates</source>
- <translation type="unfinished"></translation>
+ <translation>Перевірити &amp;оновлення</translation>
 </message>
 </context>
 <context>
@@ -1939,17 +1939,17 @@
 <message>
 <location filename="../core.cpp" line="504"/>
 <source>Connecting to %1</source>
- <translation type="unfinished"></translation>
+ <translation>З&apos;єднання з %1</translation>
 </message>
 <message>
 <location filename="../core.cpp" line="508"/>
 <source>Unable to retrieve youtube page</source>
- <translation type="unfinished"></translation>
+ <translation>Не вдається витягти сторінку youtube</translation>
 </message>
 <message>
 <location filename="../core.cpp" line="512"/>
 <source>Unable to locate the url of the video</source>
- <translation type="unfinished"></translation>
+ <translation>Не вдається визначити url відео</translation>
 </message>
 </context>
 <context>
@@ -2012,22 +2012,22 @@
 <message>
 <location filename="../defaultgui.cpp" line="515"/>
 <source>Edit main &amp;toolbar</source>
- <translation type="unfinished"></translation>
+ <translation>Редагувати головну &amp;панель</translation>
 </message>
 <message>
 <location filename="../defaultgui.cpp" line="516"/>
 <source>Edit &amp;control bar</source>
- <translation type="unfinished"></translation>
+ <translation>Редагувати панель &amp;керування</translation>
 </message>
 <message>
 <location filename="../defaultgui.cpp" line="517"/>
 <source>Edit m&amp;ini control bar</source>
- <translation type="unfinished"></translation>
+ <translation>Редагувати &amp;міні-панель керування</translation>
 </message>
 <message>
 <location filename="../defaultgui.cpp" line="518"/>
 <source>Edit &amp;floating control</source>
- <translation type="unfinished"></translation>
+ <translation>Редагувати с&amp;пливаючу панель</translation>
 </message>
 <message>
 <location filename="../defaultgui.cpp" line="549"/>
@@ -2146,12 +2146,12 @@
 <message>
 <location filename="../favoriteeditor.ui" line="51"/>
 <source>&amp;New item</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Новий елемент</translation>
 </message>
 <message>
 <location filename="../favoriteeditor.ui" line="85"/>
 <source>New &amp;submenu</source>
- <translation type="unfinished"></translation>
+ <translation>Новий &amp;субелемент</translation>
 </message>
 </context>
 <context>
@@ -2169,27 +2169,27 @@
 <message>
 <location filename="../favorites.cpp" line="89"/>
 <source>&amp;Edit...</source>
- <translation type="unfinished">&amp;Редагувати...</translation>
+ <translation>&amp;Редагувати...</translation>
 </message>
 <message>
 <location filename="../favorites.cpp" line="90"/>
 <source>&amp;Jump...</source>
- <translation type="unfinished">&amp;Перейти...</translation>
+ <translation>&amp;Перейти...</translation>
 </message>
 <message>
 <location filename="../favorites.cpp" line="91"/>
 <source>&amp;Next</source>
- <translation type="unfinished">&amp;Наступний</translation>
+ <translation>&amp;Наступний</translation>
 </message>
 <message>
 <location filename="../favorites.cpp" line="92"/>
 <source>&amp;Previous</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Попередній</translation>
 </message>
 <message>
 <location filename="../favorites.cpp" line="93"/>
 <source>&amp;Add current media</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Додати поточне медіа</translation>
 </message>
 </context>
 <context>
@@ -2197,7 +2197,7 @@
 <message>
 <location filename="../filechooser.cpp" line="54"/>
 <source>Click to select a file or folder</source>
- <translation type="unfinished"></translation>
+ <translation>Клікніть для вибору файла чи теки</translation>
 </message>
 </context>
 <context>
@@ -2401,12 +2401,12 @@
 <message>
 <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="20"/>
 <source>Server</source>
- <translation type="unfinished"></translation>
+ <translation>Сервер</translation>
 </message>
 <message>
 <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="26"/>
 <source>&amp;Opensubtitles server:</source>
- <translation type="unfinished"></translation>
+ <translation>С&amp;ервер Opensubtitles:</translation>
 </message>
 <message>
 <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="42"/>
@@ -2479,7 +2479,7 @@
 <message>
 <location filename="../findsubtitles/findsubtitleswindow.cpp" line="215"/>
 <source>Portuguese - Brasil</source>
- <translation type="unfinished"></translation>
+ <translation>Португальський (Бразилія)</translation>
 </message>
 <message>
 <location filename="../findsubtitles/findsubtitleswindow.cpp" line="228"/>
@@ -2494,16 +2494,16 @@
 <message numerus="yes">
 <location filename="../findsubtitles/findsubtitleswindow.cpp" line="564"/>
 <source>%n subtitle(s) extracted</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n субтитр витягнутий</numerusform>
+ <numerusform>%n субтитра витягнуті</numerusform>
+ <numerusform>%n субтитрів витягнуто</numerusform>
 </translation>
 </message>
 <message>
 <location filename="../findsubtitles/findsubtitleswindow.cpp" line="623"/>
 <source>Error fixing the subtitle lines</source>
- <translation type="unfinished"></translation>
+ <translation>Помилка виправлення рядків субтитрів</translation>
 </message>
 <message>
 <location filename="../findsubtitles/findsubtitleswindow.ui" line="136"/>
@@ -3324,7 +3324,7 @@
 <message>
 <location filename="../languages.cpp" line="141"/>
 <source>Norwegian Nynorsk</source>
- <translation type="unfinished"></translation>
+ <translation>Норвезька Нюношк</translation>
 </message>
 <message>
 <location filename="../languages.cpp" line="142"/>
@@ -4090,12 +4090,12 @@
 <message>
 <location filename="../minigui.cpp" line="160"/>
 <source>Edit &amp;control bar</source>
- <translation type="unfinished"></translation>
+ <translation>Редагувати панель &amp;керування</translation>
 </message>
 <message>
 <location filename="../minigui.cpp" line="161"/>
 <source>Edit &amp;floating control</source>
- <translation type="unfinished"></translation>
+ <translation>Редагувати с&amp;пливаючу панель</translation>
 </message>
 </context>
 <context>
@@ -4108,7 +4108,7 @@
 <message>
 <location filename="../mpcgui/mpcgui.cpp" line="134"/>
 <source>Seek bar</source>
- <translation type="unfinished"></translation>
+ <translation>Полоса перемотки</translation>
 </message>
 <message>
 <location filename="../mpcgui/mpcgui.cpp" line="427"/>
@@ -4293,7 +4293,7 @@
 <message>
 <location filename="../playlist.cpp" line="1020"/>
 <source>Multimedia</source>
- <translation type="unfinished">Мультимедіа</translation>
+ <translation>Мультимедіа</translation>
 </message>
 </context>
 <context>
@@ -4402,12 +4402,12 @@
 <message>
 <location filename="../prefadvanced.ui" line="526"/>
 <source>MPlayer</source>
- <translation type="unfinished"></translation>
+ <translation>MPlayer</translation>
 </message>
 <message>
 <location filename="../prefadvanced.ui" line="591"/>
 <source>SMPlayer</source>
- <translation type="unfinished"></translation>
+ <translation>SMPlayer</translation>
 </message>
 <message>
 <location filename="../prefadvanced.ui" line="597"/>
@@ -4697,17 +4697,17 @@
 <message>
 <location filename="../prefadvanced.cpp" line="456"/>
 <source>Show tag info in window title</source>
- <translation type="unfinished"></translation>
+ <translation>Відображати інформацію з тегів у заголовку вікна</translation>
 </message>
 <message>
 <location filename="../prefadvanced.cpp" line="457"/>
 <source>If this option is enabled, information from tags will be shown in window title. Otherwise only the filename will be shown.</source>
- <translation type="unfinished"></translation>
+ <translation>Якщо ця опція ввімкнена, в заголовку вікна буде відображена інформація з тегів. Якщо ні - буде показано лише ім&apos;я файла.</translation>
 </message>
 <message>
 <location filename="../prefadvanced.ui" line="261"/>
 <source>Show tag in&amp;fo in window title</source>
- <translation type="unfinished"></translation>
+ <translation>Відображати інформацію з тегів у &amp;заголовку вікна</translation>
 </message>
 </context>
 <context>
@@ -5660,32 +5660,32 @@
 <message>
 <location filename="../prefgeneral.cpp" line="337"/>
 <source>snap mode</source>
- <translation type="unfinished"></translation>
+ <translation>режим знімків</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="338"/>
 <source>slower dive mode</source>
- <translation type="unfinished"></translation>
+ <translation>режим повільних скачків</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="388"/>
 <source>uniaud mode</source>
- <translation type="unfinished"></translation>
+ <translation>режим uniaud</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="389"/>
 <source>dart mode</source>
- <translation type="unfinished"></translation>
+ <translation>режим ривків</translation>
 </message>
 <message>
 <location filename="../prefgeneral.cpp" line="985"/>
 <source>%1 is the recommended one. %2 is only available on older MPlayer (before version %3)</source>
- <translation type="unfinished"></translation>
+ <translation>%1 рекомендований режим. %2 доступний тільки на старих версіях MPlayer (до версії %3)</translation>
 </message>
 <message>
 <location filename="../prefgeneral.ui" line="257"/>
 <source>Configu&amp;re...</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Налаштування...</translation>
 </message>
 </context>
 <context>
@@ -6588,37 +6588,37 @@
 <message>
 <location filename="../prefinterface.cpp" line="527"/>
 <source>Hide video window when playing audio files</source>
- <translation type="unfinished"></translation>
+ <translation>Ховати вікно відео при відтворенні аудіофайлів</translation>
 </message>
 <message>
 <location filename="../prefinterface.cpp" line="528"/>
 <source>If this option is enabled the video window will be hidden when playing audio files.</source>
- <translation type="unfinished"></translation>
+ <translation>При ввімкненні цієї опції при відтворенні аудіофайла вікно відео буде сховано.</translation>
 </message>
 <message>
 <location filename="../prefinterface.ui" line="108"/>
 <source>&amp;Hide video window when playing audio files</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Ховати вікно відео при відтворенні аудіофайлів</translation>
 </message>
 <message>
 <location filename="../prefinterface.cpp" line="583"/>
 <source>Precise seeking</source>
- <translation type="unfinished"></translation>
+ <translation>Точне позиціонування</translation>
 </message>
 <message>
 <location filename="../prefinterface.cpp" line="584"/>
 <source>If this option is enabled, seeks are more accurate but they can be a little bit slower. May not work with some video formats.</source>
- <translation type="unfinished"></translation>
+ <translation>При ввімкненні цієї опції, перемотка буде більш точною, але може бути трішки повільнішою. Може не працювати з деякими форматами відео.</translation>
 </message>
 <message>
 <location filename="../prefinterface.cpp" line="586"/>
 <source>Note: this option only works with MPlayer2</source>
- <translation type="unfinished"></translation>
+ <translation>Увага: ця опція працює тільки з MPlayer2</translation>
 </message>
 <message>
 <location filename="../prefinterface.ui" line="561"/>
 <source>&amp;Precise seeking</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Точне позиціонування</translation>
 </message>
 </context>
 <context>
@@ -6938,17 +6938,17 @@
 <message>
 <location filename="../prefperformance.cpp" line="333"/>
 <source>Youtube quality</source>
- <translation type="unfinished"></translation>
+ <translation>Якість відео з YouTube</translation>
 </message>
 <message>
 <location filename="../prefperformance.cpp" line="334"/>
 <source>Select the preferred quality for youtube videos.</source>
- <translation type="unfinished"></translation>
+ <translation>Виберіть бажану якість для відео з YouTube.</translation>
 </message>
 <message>
 <location filename="../prefperformance.ui" line="348"/>
 <source>Youtube &amp;quality</source>
- <translation type="unfinished"></translation>
+ <translation>Якість відео з &amp;YouTube</translation>
 </message>
 </context>
 <context>
@@ -7922,20 +7922,20 @@
 <location filename="../helper.cpp" line="77"/>
 <location filename="../helper.cpp" line="83"/>
 <source>%n second(s)</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n секунда</numerusform>
+ <numerusform>%n секунди</numerusform>
+ <numerusform>%n секунд</numerusform>
 </translation>
 </message>
 <message numerus="yes">
 <location filename="../helper.cpp" line="80"/>
 <location filename="../helper.cpp" line="82"/>
 <source>%n minute(s)</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- <numerusform></numerusform>
- <numerusform></numerusform>
+ <translation>
+ <numerusform>%n хвилина</numerusform>
+ <numerusform>%n хвилини</numerusform>
+ <numerusform>%n хвилин</numerusform>
 </translation>
 </message>
 <message>
@@ -7994,7 +7994,7 @@
 <message>
 <location filename="../clhelp.cpp" line="172"/>
 <source>&apos;media&apos; is any kind of file that SMPlayer can open. It can be a local file, a DVD (e.g. dvd://1), an Internet stream (e.g. mms://....) or a local playlist in format m3u or pls.</source>
- <translation type="unfinished"></translation>
+ <translation>&apos;елемент&apos; – будь-який тип файла, який може відкрити SMPlayer. Це може бути файл, DVD (напр. dvd://1), інтернет-потік (напр. mms://....) чи локальний список у форматі m3u чи pls.</translation>
 </message>
 </context>
 <context>
@@ -8095,73 +8095,73 @@
 <message>
 <location filename="../toolbareditor.ui" line="14"/>
 <source>Toolbar Editor</source>
- <translation type="unfinished"></translation>
+ <translation>Редактор панелів інструментів</translation>
 </message>
 <message>
 <location filename="../toolbareditor.ui" line="22"/>
 <source>&amp;Available actions:</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Доступні дії:</translation>
 </message>
 <message>
 <location filename="../toolbareditor.ui" line="57"/>
 <source>&amp;Left</source>
- <translation type="unfinished"></translation>
+ <translation>В&amp;ліво</translation>
 </message>
 <message>
 <location filename="../toolbareditor.ui" line="67"/>
 <source>&amp;Right</source>
- <translation type="unfinished"></translation>
+ <translation>В&amp;право</translation>
 </message>
 <message>
 <location filename="../toolbareditor.ui" line="77"/>
 <source>&amp;Down</source>
- <translation type="unfinished">В&amp;низ</translation>
+ <translation>В&amp;низ</translation>
 </message>
 <message>
 <location filename="../toolbareditor.ui" line="87"/>
 <source>&amp;Up</source>
- <translation type="unfinished">В&amp;гору</translation>
+ <translation>В&amp;гору</translation>
 </message>
 <message>
 <location filename="../toolbareditor.ui" line="113"/>
 <source>Curre&amp;nt actions:</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Поточні дії:</translation>
 </message>
 <message>
 <location filename="../toolbareditor.ui" line="143"/>
 <source>Add &amp;separator</source>
- <translation type="unfinished"></translation>
+ <translation>Додати &amp;розділювач</translation>
 </message>
 <message>
 <location filename="../toolbareditor.cpp" line="87"/>
 <location filename="../toolbareditor.cpp" line="180"/>
 <source>(separator)</source>
- <translation type="unfinished"></translation>
+ <translation>(розділювач)</translation>
 </message>
 <message>
 <location filename="../toolbareditor.cpp" line="239"/>
 <source>Time slider</source>
- <translation type="unfinished"></translation>
+ <translation>Повнунок часу</translation>
 </message>
 <message>
 <location filename="../toolbareditor.cpp" line="241"/>
 <source>Volume slider</source>
- <translation type="unfinished"></translation>
+ <translation>Повнунок гучності</translation>
 </message>
 <message>
 <location filename="../toolbareditor.cpp" line="243"/>
 <source>Display time</source>
- <translation type="unfinished"></translation>
+ <translation>Відображення часу</translation>
 </message>
 <message>
 <location filename="../toolbareditor.cpp" line="245"/>
 <source>3 in 1 rewind</source>
- <translation type="unfinished"></translation>
+ <translation>3 в 1 перемотка назад</translation>
 </message>
 <message>
 <location filename="../toolbareditor.cpp" line="247"/>
 <source>3 in 1 forward</source>
- <translation type="unfinished"></translation>
+ <translation>3 в 1 перемотка вперед</translation>
 </message>
 </context>
 <context>
@@ -8187,42 +8187,42 @@
 <message>
 <location filename="../vdpauproperties.ui" line="13"/>
 <source>VDPAU Properties</source>
- <translation type="unfinished"></translation>
+ <translation>Налаштування VDPAU</translation>
 </message>
 <message>
 <location filename="../vdpauproperties.ui" line="19"/>
 <source>Select the vdpau codecs to use. Not all of them may work.</source>
- <translation type="unfinished"></translation>
+ <translation>Вкажіть кодеки vdpau для використання. Деякі можуть не працювати.</translation>
 </message>
 <message>
 <location filename="../vdpauproperties.ui" line="29"/>
 <source>ffh&amp;264vdpau</source>
- <translation type="unfinished"></translation>
+ <translation>ffh&amp;264vdpau</translation>
 </message>
 <message>
 <location filename="../vdpauproperties.ui" line="36"/>
 <source>ff&amp;mpeg12vdpau</source>
- <translation type="unfinished"></translation>
+ <translation>ff&amp;mpeg12vdpau</translation>
 </message>
 <message>
 <location filename="../vdpauproperties.ui" line="43"/>
 <source>ff&amp;wmv3vdpau</source>
- <translation type="unfinished"></translation>
+ <translation>ff&amp;wmv3vdpau</translation>
 </message>
 <message>
 <location filename="../vdpauproperties.ui" line="50"/>
 <source>ff&amp;vc1vdpau</source>
- <translation type="unfinished"></translation>
+ <translation>ff&amp;vc1vdpau</translation>
 </message>
 <message>
 <location filename="../vdpauproperties.ui" line="57"/>
 <source>ffodiv&amp;xvdpau</source>
- <translation type="unfinished"></translation>
+ <translation>ffodiv&amp;xvdpau</translation>
 </message>
 <message>
 <location filename="../vdpauproperties.ui" line="71"/>
 <source>&amp;Disable software video filters</source>
- <translation type="unfinished"></translation>
+ <translation>&amp;Вимкнути програмні відеофільтри</translation>
 </message>
 </context>
 <context>

smplayer-0.8.0.tar.bz2/src/translations/smplayer_zh_CN.ts -> smplayer-0.8.1.tar.bz2/src/translations/smplayer_zh_CN.ts Changed

@@ -1,8580 +1,8580 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.0" language="zh_CN">
-<context>
+ <context>
 <name>About</name>
 <message>
- <location filename="../about.ui" line="13"/>
- <source>About SMPlayer</source>
- <translation>关于 SMPlayer</translation>
+ <location filename="../about.ui" line="13"/>
+ <source>About SMPlayer</source>
+ <translation>关于 SMPlayer</translation>
 </message>
 <message>
- <location filename="../about.ui" line="32"/>
- <source>&amp;Info</source>
- <translation>信息(&amp;I)</translation>
+ <location filename="../about.ui" line="32"/>
+ <source>&amp;Info</source>
+ <translation>信息(&amp;I)</translation>
 </message>
 <message>
- <location filename="../about.ui" line="52"/>
- <location filename="../about.ui" line="108"/>
- <location filename="../about.ui" line="164"/>
- <location filename="../about.ui" line="220"/>
- <source>icon</source>
- <translation>icon</translation>
+ <location filename="../about.ui" line="52"/>
+ <location filename="../about.ui" line="108"/>
+ <location filename="../about.ui" line="164"/>
+ <location filename="../about.ui" line="220"/>
+ <source>icon</source>
+ <translation>icon</translation>
 </message>
 <message>
- <location filename="../about.ui" line="88"/>
- <source>&amp;Contributions</source>
- <translation>贡献(&amp;C)</translation>
+ <location filename="../about.ui" line="88"/>
+ <source>&amp;Contributions</source>
+ <translation>贡献(&amp;C)</translation>
 </message>
 <message>
- <location filename="../about.ui" line="144"/>
- <source>&amp;Translators</source>
- <translation>翻译(&amp;T)</translation>
+ <location filename="../about.ui" line="144"/>
+ <source>&amp;Translators</source>
+ <translation>翻译(&amp;T)</translation>
 </message>
 <message>
- <location filename="../about.ui" line="200"/>
- <source>&amp;License</source>
- <translation>许可证(&amp;L)</translation>
+ <location filename="../about.ui" line="200"/>
+ <source>&amp;License</source>
+ <translation>许可证(&amp;L)</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="46"/>
- <source>Using MPlayer2 %1</source>
- <translation>使用 MPlayer2 %1</translation>
+ <location filename="../about.cpp" line="46"/>
+ <source>Using MPlayer2 %1</source>
+ <translation>使用 MPlayer2 %1</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="48"/>
- <source>Using MPlayer %1</source>
- <translation>使用 MPlayer %1</translation>
+ <location filename="../about.cpp" line="48"/>
+ <source>Using MPlayer %1</source>
+ <translation>使用 MPlayer %1</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="55"/>
- <source>Version: %1</source>
- <translation>版本: %1</translation>
+ <location filename="../about.cpp" line="55"/>
+ <source>Version: %1</source>
+ <translation>版本: %1</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="57"/>
- <source>Portable Edition</source>
- <translation>便携版</translation>
+ <location filename="../about.cpp" line="57"/>
+ <source>Portable Edition</source>
+ <translation>便携版</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="63"/>
- <source>Using Qt %1 (compiled with Qt %2)</source>
- <translation>使用 Qt %1 (由 Qt %2 编译)</translation>
+ <location filename="../about.cpp" line="63"/>
+ <source>Using Qt %1 (compiled with Qt %2)</source>
+ <translation>使用 Qt %1 (由 Qt %2 编译)</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="65"/>
- <source>Visit our web for updates:</source>
- <translation>访问我们的网站获取更新信息:</translation>
+ <location filename="../about.cpp" line="65"/>
+ <source>Visit our web for updates:</source>
+ <translation>访问我们的网站获取更新信息:</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="68"/>
- <source>Get help in our forum:</source>
- <translation>从我们的论坛获取帮助:</translation>
+ <location filename="../about.cpp" line="68"/>
+ <source>Get help in our forum:</source>
+ <translation>从我们的论坛获取帮助:</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="104"/>
- <source>SMPlayer logo by %1</source>
- <translation>SMPlayer 徽标由 %1 提供</translation>
+ <location filename="../about.cpp" line="104"/>
+ <source>SMPlayer logo by %1</source>
+ <translation>SMPlayer 徽标由 %1 提供</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="141"/>
- <source>The following people have contributed with translations:</source>
- <translation>以下人员贡献了翻译:</translation>
+ <location filename="../about.cpp" line="141"/>
+ <source>The following people have contributed with translations:</source>
+ <translation>以下人员贡献了翻译:</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="143"/>
- <source>Spanish</source>
- <translation>西班牙语</translation>
+ <location filename="../about.cpp" line="143"/>
+ <source>Spanish</source>
+ <translation>西班牙语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="144"/>
- <source>German</source>
- <translation>德语</translation>
+ <location filename="../about.cpp" line="144"/>
+ <source>German</source>
+ <translation>德语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="145"/>
- <source>Slovak</source>
- <translation>斯洛伐克语</translation>
+ <location filename="../about.cpp" line="145"/>
+ <source>Slovak</source>
+ <translation>斯洛伐克语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="146"/>
- <source>Italian</source>
- <translation>意大利语</translation>
+ <location filename="../about.cpp" line="146"/>
+ <source>Italian</source>
+ <translation>意大利语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="149"/>
- <source>French</source>
- <translation>法语</translation>
+ <location filename="../about.cpp" line="149"/>
+ <source>French</source>
+ <translation>法语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="153"/>
- <source>Simplified-Chinese</source>
- <translation>简体中文</translation>
+ <location filename="../about.cpp" line="153"/>
+ <source>Simplified-Chinese</source>
+ <translation>简体中文</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="156"/>
- <source>Russian</source>
- <translation>俄语</translation>
+ <location filename="../about.cpp" line="156"/>
+ <source>Russian</source>
+ <translation>俄语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="157"/>
- <source>Hungarian</source>
- <translation>匈牙利语</translation>
+ <location filename="../about.cpp" line="157"/>
+ <source>Hungarian</source>
+ <translation>匈牙利语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="160"/>
- <source>Polish</source>
- <translation>波兰语</translation>
+ <location filename="../about.cpp" line="160"/>
+ <source>Polish</source>
+ <translation>波兰语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="164"/>
- <source>Japanese</source>
- <translation>日语</translation>
+ <location filename="../about.cpp" line="164"/>
+ <source>Japanese</source>
+ <translation>日语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="165"/>
- <source>Dutch</source>
- <translation>荷兰语</translation>
+ <location filename="../about.cpp" line="165"/>
+ <source>Dutch</source>
+ <translation>荷兰语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="169"/>
- <source>Ukrainian</source>
- <translation>乌克兰语</translation>
+ <location filename="../about.cpp" line="169"/>
+ <source>Ukrainian</source>
+ <translation>乌克兰语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="172"/>
- <source>Portuguese - Brazil</source>
- <translation>葡萄牙语-巴西</translation>
+ <location filename="../about.cpp" line="172"/>
+ <source>Portuguese - Brazil</source>
+ <translation>葡萄牙语-巴西</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="173"/>
- <source>Georgian</source>
- <translation>格鲁吉亚语</translation>
+ <location filename="../about.cpp" line="173"/>
+ <source>Georgian</source>
+ <translation>格鲁吉亚语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="174"/>
- <source>Czech</source>
- <translation>捷克语</translation>
+ <location filename="../about.cpp" line="174"/>
+ <source>Czech</source>
+ <translation>捷克语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="177"/>
- <source>Bulgarian</source>
- <translation>保加利亚语</translation>
+ <location filename="../about.cpp" line="177"/>
+ <source>Bulgarian</source>
+ <translation>保加利亚语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="178"/>
- <source>Turkish</source>
- <translation>土耳其语</translation>
+ <location filename="../about.cpp" line="178"/>
+ <source>Turkish</source>
+ <translation>土耳其语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="179"/>
- <source>Swedish</source>
- <translation>瑞典语</translation>
+ <location filename="../about.cpp" line="179"/>
+ <source>Swedish</source>
+ <translation>瑞典语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="180"/>
- <source>Serbian</source>
- <translation>塞尔维亚语</translation>
+ <location filename="../about.cpp" line="180"/>
+ <source>Serbian</source>
+ <translation>塞尔维亚语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="181"/>
- <source>Traditional Chinese</source>
- <translation>繁体中文</translation>
+ <location filename="../about.cpp" line="181"/>
+ <source>Traditional Chinese</source>
+ <translation>繁体中文</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="182"/>
- <source>Romanian</source>
- <translation>罗马尼亚语</translation>
+ <location filename="../about.cpp" line="182"/>
+ <source>Romanian</source>
+ <translation>罗马尼亚语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="183"/>
- <source>Portuguese - Portugal</source>
- <translation>葡萄牙语-葡萄牙</translation>
+ <location filename="../about.cpp" line="183"/>
+ <source>Portuguese - Portugal</source>
+ <translation>葡萄牙语-葡萄牙</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="186"/>
- <source>Greek</source>
- <translation>希腊语</translation>
+ <location filename="../about.cpp" line="186"/>
+ <source>Greek</source>
+ <translation>希腊语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="187"/>
- <source>Finnish</source>
- <translation>芬兰语</translation>
+ <location filename="../about.cpp" line="187"/>
+ <source>Finnish</source>
+ <translation>芬兰语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="188"/>
- <source>Korean</source>
- <translation>韩国语</translation>
+ <location filename="../about.cpp" line="188"/>
+ <source>Korean</source>
+ <translation>韩国语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="189"/>
- <source>Macedonian</source>
- <translation>马其顿语</translation>
+ <location filename="../about.cpp" line="189"/>
+ <source>Macedonian</source>
+ <translation>马其顿语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="190"/>
- <source>Basque</source>
- <translation>巴斯克语</translation>
+ <location filename="../about.cpp" line="190"/>
+ <source>Basque</source>
+ <translation>巴斯克语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="193"/>
- <source>Catalan</source>
- <translation>加泰罗尼亚语</translation>
+ <location filename="../about.cpp" line="193"/>
+ <source>Catalan</source>
+ <translation>加泰罗尼亚语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="194"/>
- <source>Slovenian</source>
- <translation>斯洛文尼亚语</translation>
+ <location filename="../about.cpp" line="194"/>
+ <source>Slovenian</source>
+ <translation>斯洛文尼亚语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="195"/>
- <source>Arabic</source>
- <translation>阿拉伯语</translation>
+ <location filename="../about.cpp" line="195"/>
+ <source>Arabic</source>
+ <translation>阿拉伯语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="196"/>
- <source>Kurdish</source>
- <translation>库尔德语</translation>
+ <location filename="../about.cpp" line="196"/>
+ <source>Kurdish</source>
+ <translation>库尔德语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="197"/>
- <source>Galician</source>
- <translation>加利西亚语</translation>
+ <location filename="../about.cpp" line="197"/>
+ <source>Galician</source>
+ <translation>加利西亚语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="198"/>
- <source>Vietnamese</source>
- <translation>越南语</translation>
+ <location filename="../about.cpp" line="198"/>
+ <source>Vietnamese</source>
+ <translation>越南语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="199"/>
- <source>Estonian</source>
- <translation>爱沙尼亚语</translation>
+ <location filename="../about.cpp" line="199"/>
+ <source>Estonian</source>
+ <translation>爱沙尼亚语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="200"/>
- <source>Lithuanian</source>
- <translation>立陶宛语</translation>
+ <location filename="../about.cpp" line="200"/>
+ <source>Lithuanian</source>
+ <translation>立陶宛语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="203"/>
- <source>Danish</source>
- <translation>丹麦语</translation>
+ <location filename="../about.cpp" line="203"/>
+ <source>Danish</source>
+ <translation>丹麦语</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="204"/>
- <source>Croatian</source>
- <translation>克罗地亚语</translation>
+ <location filename="../about.cpp" line="204"/>
+ <source>Croatian</source>
+ <translation>克罗地亚语</translation>
 </message>
 <message>
- <source>%1 and %2</source>
- <translation type="obsolete">%1 和 %2</translation>
+ <source>%1 and %2</source>
+ <translation>%1 和 %2</translation>
 </message>
 <message>
- <source>%1, %2 and %3</source>
- <translation type="obsolete">%1, %2 和 %3</translation>
+ <source>%1, %2 and %3</source>
+ <translation>%1, %2 和 %3</translation>
 </message>
 <message>
- <source>%1, %2, %3 and %4</source>
- <translation type="obsolete">%1, %2, %3 和 %4</translation>
+ <source>%1, %2, %3 and %4</source>
+ <translation>%1, %2, %3 和 %4</translation>
 </message>
 <message>
- <source>%1, %2, %3, %4 and %5</source>
- <translation type="obsolete">%1, %2, %3, %4 和 %5</translation>
+ <source>%1, %2, %3, %4 and %5</source>
+ <translation>%1, %2, %3, %4 和 %5</translation>
 </message>
 <message>
- <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
- <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;: %2</translation>
+ <source>&lt;b&gt;%1&lt;/b&gt;: %2</source>
+ <translation>&lt;b&gt;%1&lt;/b&gt;: %2</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="228"/>
- <source>&lt;b&gt;%1&lt;/b&gt; (%2)</source>
- <translation>&lt;b&gt;%1&lt;/b&gt; (%2)</translation>
+ <location filename="../about.cpp" line="228"/>
+ <source>&lt;b&gt;%1&lt;/b&gt; (%2)</source>
+ <translation>&lt;b&gt;%1&lt;/b&gt; (%2)</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="70"/>
- <source>SMPlayer uses the award-winning MPlayer as playback engine. See %1</source>
- <translation>SMPlayer 使用屡获殊荣的 MPlayer 作为播放引擎。详见 %1</translation>
+ <location filename="../about.cpp" line="70"/>
+ <source>SMPlayer uses the award-winning MPlayer as playback engine. See %1</source>
+ <translation>SMPlayer 使用屡获殊荣的 MPlayer 作为播放引擎。详见 %1</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="85"/>
- <source>Read the entire license</source>
- <translation>阅读整个许可证</translation>
+ <location filename="../about.cpp" line="85"/>
+ <source>Read the entire license</source>
+ <translation>阅读整个许可证</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="93"/>
- <source>Read a translation</source>
- <translation>阅读翻译</translation>
+ <location filename="../about.cpp" line="93"/>
+ <source>Read a translation</source>
+ <translation>阅读翻译</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="105"/>
- <source>Packages for Windows created by %1</source>
- <translation>用于 Windows 的软件包由 %1 创建</translation>
+ <location filename="../about.cpp" line="105"/>
+ <source>Packages for Windows created by %1</source>
+ <translation>用于 Windows 的软件包由 %1 创建</translation>
 </message>
 <message>
- <location filename="../about.cpp" line="106"/>
- <source>Many other people contributed with patches. See the Changelog for details.</source>
- <translation>许多其他人贡献了补丁。详见变更日志。</translation>
+ <location filename="../about.cpp" line="106"/>
+ <source>Many other people contributed with patches. See the Changelog for details.</source>
+ <translation>许多其他人贡献了补丁。详见变更日志。</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>ActionsEditor</name>
 <message>
- <location filename="../actionseditor.cpp" line="207"/>
- <source>Shortcut</source>
- <translation>快捷键</translation>
+ <location filename="../actionseditor.cpp" line="207"/>
+ <source>Shortcut</source>
+ <translation>快捷键</translation>
 </message>
 <message>
- <location filename="../actionseditor.cpp" line="207"/>
- <source>Description</source>
- <translation>描述</translation>
+ <location filename="../actionseditor.cpp" line="207"/>
+ <source>Description</source>
+ <translation>描述</translation>
 </message>
 <message>
- <location filename="../actionseditor.cpp" line="207"/>
- <source>Name</source>
- <translation>名称</translation>
+ <location filename="../actionseditor.cpp" line="207"/>
+ <source>Name</source>
+ <translation>名称</translation>
 </message>
 <message>
- <location filename="../actionseditor.cpp" line="209"/>
- <source>&amp;Save</source>
- <translation>保存(&amp;S)</translation>
+ <location filename="../actionseditor.cpp" line="209"/>
+ <source>&amp;Save</source>
+ <translation>保存(&amp;S)</translation>
 </message>
 <message>
- <location filename="../actionseditor.cpp" line="212"/>
- <source>&amp;Load</source>
- <translation>加载(&amp;L)</translation>
+ <location filename="../actionseditor.cpp" line="212"/>
+ <source>&amp;Load</source>
+ <translation>加载(&amp;L)</translation>
 </message>
 <message>
- <location filename="../actionseditor.cpp" line="216"/>
- <source>&amp;Change shortcut...</source>
- <translation>更改快捷键(&amp;C)...</translation>
+ <location filename="../actionseditor.cpp" line="216"/>
+ <source>&amp;Change shortcut...</source>
+ <translation>更改快捷键(&amp;C)...</translation>
 </message>
 <message>
- <location filename="../actionseditor.cpp" line="428"/>
- <source>Choose a filename</source>
- <translation>选择一个文件名</translation>
+ <location filename="../actionseditor.cpp" line="428"/>
+ <source>Choose a filename</source>
+ <translation>选择一个文件名</translation>
 </message>
 <message>
- <location filename="../actionseditor.cpp" line="430"/>
- <location filename="../actionseditor.cpp" line="480"/>
- <source>Key files</source>
- <translation>键文件</translation>
+ <location filename="../actionseditor.cpp" line="430"/>
+ <location filename="../actionseditor.cpp" line="480"/>
+ <source>Key files</source>
+ <translation>键文件</translation>
 </message>
 <message>
- <location filename="../actionseditor.cpp" line="439"/>
- <source>Confirm overwrite?</source>
- <translation>确认覆盖?</translation>
+ <location filename="../actionseditor.cpp" line="439"/>
+ <source>Confirm overwrite?</source>
+ <translation>确认覆盖?</translation>
 </message>
 <message>
- <location filename="../actionseditor.cpp" line="440"/>
- <source>The file %1 already exists.
+ <location filename="../actionseditor.cpp" line="440"/>
+ <source>The file %1 already exists.
 Do you want to overwrite?</source>
- <translation>文件 %1 已经存在。
+ <translation>文件 %1 已经存在。
 是否覆盖?</translation>
 </message>
 <message>
- <location filename="../actionseditor.cpp" line="452"/>
- <location filename="../actionseditor.cpp" line="486"/>
- <source>Error</source>
- <translation>错误</translation>
+ <location filename="../actionseditor.cpp" line="452"/>
+ <location filename="../actionseditor.cpp" line="486"/>
+ <source>Error</source>
+ <translation>错误</translation>
 </message>
 <message>
- <location filename="../actionseditor.cpp" line="453"/>
- <source>The file couldn&apos;t be saved</source>
- <translation>无法保存该文件</translation>
+ <location filename="../actionseditor.cpp" line="453"/>
+ <source>The file couldn&apos;t be saved</source>
+ <translation>无法保存该文件</translation>
 </message>
 <message>
- <location filename="../actionseditor.cpp" line="479"/>
- <source>Choose a file</source>
- <translation>选择一个文件</translation>
+ <location filename="../actionseditor.cpp" line="479"/>
+ <source>Choose a file</source>
+ <translation>选择一个文件</translation>
 </message>
 <message>
- <location filename="../actionseditor.cpp" line="487"/>
- <source>The file couldn&apos;t be loaded</source>
- <translation>无法加载该文件</translation>
+ <location filename="../actionseditor.cpp" line="487"/>
+ <source>The file couldn&apos;t be loaded</source>
+ <translation>无法加载该文件</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>AudioEqualizer</name>
 <message>
- <location filename="../audioequalizer.cpp" line="71"/>
- <source>Audio Equalizer</source>
- <translation>音频均衡器</translation>
+ <location filename="../audioequalizer.cpp" line="71"/>
+ <source>Audio Equalizer</source>
+ <translation>音频均衡器</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="74"/>
- <source>31.25 Hz</source>
- <translation>31.25 Hz</translation>
+ <location filename="../audioequalizer.cpp" line="74"/>
+ <source>31.25 Hz</source>
+ <translation>31.25 Hz</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="75"/>
- <source>62.50 Hz</source>
- <translation>62.50 Hz</translation>
+ <location filename="../audioequalizer.cpp" line="75"/>
+ <source>62.50 Hz</source>
+ <translation>62.50 Hz</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="76"/>
- <source>125.0 Hz</source>
- <translation>125.0 Hz</translation>
+ <location filename="../audioequalizer.cpp" line="76"/>
+ <source>125.0 Hz</source>
+ <translation>125.0 Hz</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="77"/>
- <source>250.0 Hz</source>
- <translation>250.0 Hz</translation>
+ <location filename="../audioequalizer.cpp" line="77"/>
+ <source>250.0 Hz</source>
+ <translation>250.0 Hz</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="78"/>
- <source>500.0 Hz</source>
- <translation>500.0 Hz</translation>
+ <location filename="../audioequalizer.cpp" line="78"/>
+ <source>500.0 Hz</source>
+ <translation>500.0 Hz</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="79"/>
- <source>1.000 kHz</source>
- <translation>1.000 kHz</translation>
+ <location filename="../audioequalizer.cpp" line="79"/>
+ <source>1.000 kHz</source>
+ <translation>1.000 kHz</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="80"/>
- <source>2.000 kHz</source>
- <translation>2.000 kHz</translation>
+ <location filename="../audioequalizer.cpp" line="80"/>
+ <source>2.000 kHz</source>
+ <translation>2.000 kHz</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="81"/>
- <source>4.000 kHz</source>
- <translation>4.000 kHz</translation>
+ <location filename="../audioequalizer.cpp" line="81"/>
+ <source>4.000 kHz</source>
+ <translation>4.000 kHz</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="82"/>
- <source>8.000 kHz</source>
- <translation>8.000 kHz</translation>
+ <location filename="../audioequalizer.cpp" line="82"/>
+ <source>8.000 kHz</source>
+ <translation>8.000 kHz</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="83"/>
- <source>16.00 kHz</source>
- <translation>16.00 kHz</translation>
+ <location filename="../audioequalizer.cpp" line="83"/>
+ <source>16.00 kHz</source>
+ <translation>16.00 kHz</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="85"/>
- <source>&amp;Apply</source>
- <translation>应用(&amp;A)</translation>
+ <location filename="../audioequalizer.cpp" line="85"/>
+ <source>&amp;Apply</source>
+ <translation>应用(&amp;A)</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="86"/>
- <source>&amp;Reset</source>
- <translation>重置(&amp;R)</translation>
+ <location filename="../audioequalizer.cpp" line="86"/>
+ <source>&amp;Reset</source>
+ <translation>重置(&amp;R)</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="87"/>
- <source>&amp;Set as default values</source>
- <translation>设为默认值(&amp;S)</translation>
+ <location filename="../audioequalizer.cpp" line="87"/>
+ <source>&amp;Set as default values</source>
+ <translation>设为默认值(&amp;S)</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="91"/>
- <source>Use the current values as default values for new videos.</source>
- <translation>使用当前设置的值作为播放新视频时的默认值。</translation>
+ <location filename="../audioequalizer.cpp" line="91"/>
+ <source>Use the current values as default values for new videos.</source>
+ <translation>使用当前设置的值作为播放新视频时的默认值。</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="93"/>
- <source>Set all controls to zero.</source>
- <translation>全部控制设置为零。</translation>
+ <location filename="../audioequalizer.cpp" line="93"/>
+ <source>Set all controls to zero.</source>
+ <translation>全部控制设置为零。</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="110"/>
- <source>Information</source>
- <translation>信息</translation>
+ <location filename="../audioequalizer.cpp" line="110"/>
+ <source>Information</source>
+ <translation>信息</translation>
 </message>
 <message>
- <location filename="../audioequalizer.cpp" line="111"/>
- <source>The current values have been stored to be used as default.</source>
- <translation>当前的值已被储存将在默认情况下使用。</translation>
+ <location filename="../audioequalizer.cpp" line="111"/>
+ <source>The current values have been stored to be used as default.</source>
+ <translation>当前的值已被储存将在默认情况下使用。</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>BaseGui</name>
 <message>
- <location filename="../basegui.cpp" line="1347"/>
- <source>Video filters are disabled when using vdpau</source>
- <translation>使用 VDPAU 时视频过滤器将被禁用</translation>
+ <location filename="../basegui.cpp" line="1347"/>
+ <source>Video filters are disabled when using vdpau</source>
+ <translation>使用 VDPAU 时视频过滤器将被禁用</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1390"/>
- <source>&amp;File...</source>
- <translation>文件(&amp;F)...</translation>
+ <location filename="../basegui.cpp" line="1390"/>
+ <source>&amp;File...</source>
+ <translation>文件(&amp;F)...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1391"/>
- <source>D&amp;irectory...</source>
- <translation>目录(&amp;I)...</translation>
+ <location filename="../basegui.cpp" line="1391"/>
+ <source>D&amp;irectory...</source>
+ <translation>目录(&amp;I)...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1392"/>
- <source>&amp;Playlist...</source>
- <translation>播放列表(&amp;P)...</translation>
+ <location filename="../basegui.cpp" line="1392"/>
+ <source>&amp;Playlist...</source>
+ <translation>播放列表(&amp;P)...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1393"/>
- <source>V&amp;CD</source>
- <translation>VCD(&amp;C)</translation>
+ <location filename="../basegui.cpp" line="1393"/>
+ <source>V&amp;CD</source>
+ <translation>VCD(&amp;C)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1394"/>
- <source>&amp;Audio CD</source>
- <translation>音频 CD(&amp;A)</translation>
+ <location filename="../basegui.cpp" line="1394"/>
+ <source>&amp;Audio CD</source>
+ <translation>音频 CD(&amp;A)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1395"/>
- <source>&amp;DVD from drive</source>
- <translation>从驱动器播放 DVD(&amp;D)</translation>
+ <location filename="../basegui.cpp" line="1395"/>
+ <source>&amp;DVD from drive</source>
+ <translation>从驱动器播放 DVD(&amp;D)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1396"/>
- <source>D&amp;VD from folder...</source>
- <translation>从文件夹播放 DVD(&amp;V)...</translation>
+ <location filename="../basegui.cpp" line="1396"/>
+ <source>D&amp;VD from folder...</source>
+ <translation>从文件夹播放 DVD(&amp;V)...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1397"/>
- <source>&amp;URL...</source>
- <translation>URL 地址(&amp;U)...</translation>
+ <location filename="../basegui.cpp" line="1397"/>
+ <source>&amp;URL...</source>
+ <translation>URL 地址(&amp;U)...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1398"/>
- <source>C&amp;lose</source>
- <translation>关闭(&amp;L)</translation>
+ <location filename="../basegui.cpp" line="1398"/>
+ <source>C&amp;lose</source>
+ <translation>关闭(&amp;L)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1421"/>
- <source>P&amp;lay</source>
- <translation>播放(&amp;L)</translation>
+ <location filename="../basegui.cpp" line="1421"/>
+ <source>P&amp;lay</source>
+ <translation>播放(&amp;L)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1427"/>
- <source>&amp;Pause</source>
- <translation>暂停(&amp;P)</translation>
+ <location filename="../basegui.cpp" line="1427"/>
+ <source>&amp;Pause</source>
+ <translation>暂停(&amp;P)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1428"/>
- <source>&amp;Stop</source>
- <translation>停止(&amp;S)</translation>
+ <location filename="../basegui.cpp" line="1428"/>
+ <source>&amp;Stop</source>
+ <translation>停止(&amp;S)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1429"/>
- <source>&amp;Frame step</source>
- <translation>逐帧步进(&amp;F)</translation>
+ <location filename="../basegui.cpp" line="1429"/>
+ <source>&amp;Frame step</source>
+ <translation>逐帧步进(&amp;F)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1431"/>
- <source>Play / Pause</source>
- <translation>播放 / 暂停</translation>
+ <location filename="../basegui.cpp" line="1431"/>
+ <source>Play / Pause</source>
+ <translation>播放 / 暂停</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1437"/>
- <source>Pause / Frame step</source>
- <translation>暂停 / 逐帧步进</translation>
+ <location filename="../basegui.cpp" line="1437"/>
+ <source>Pause / Frame step</source>
+ <translation>暂停 / 逐帧步进</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1442"/>
- <source>Set &amp;A marker</source>
- <translation>设置 A 标记(&amp;A)</translation>
+ <location filename="../basegui.cpp" line="1442"/>
+ <source>Set &amp;A marker</source>
+ <translation>设置 A 标记(&amp;A)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1443"/>
- <source>Set &amp;B marker</source>
- <translation>设置 B 标记(&amp;B)</translation>
+ <location filename="../basegui.cpp" line="1443"/>
+ <source>Set &amp;B marker</source>
+ <translation>设置 B 标记(&amp;B)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1444"/>
- <source>&amp;Clear A-B markers</source>
- <translation>清除 A-B 标记(&amp;C)</translation>
+ <location filename="../basegui.cpp" line="1444"/>
+ <source>&amp;Clear A-B markers</source>
+ <translation>清除 A-B 标记(&amp;C)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1445"/>
- <source>&amp;Repeat</source>
- <translation>重复(&amp;R)</translation>
+ <location filename="../basegui.cpp" line="1445"/>
+ <source>&amp;Repeat</source>
+ <translation>重复(&amp;R)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1447"/>
- <source>&amp;Jump to...</source>
- <translation>跳转到(&amp;J)...</translation>
+ <location filename="../basegui.cpp" line="1447"/>
+ <source>&amp;Jump to...</source>
+ <translation>跳转到(&amp;J)...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1450"/>
- <source>&amp;Normal speed</source>
- <translation>普通速度(&amp;N)</translation>
+ <location filename="../basegui.cpp" line="1450"/>
+ <source>&amp;Normal speed</source>
+ <translation>普通速度(&amp;N)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1451"/>
- <source>&amp;Halve speed</source>
- <translation>半速(&amp;H)</translation>
+ <location filename="../basegui.cpp" line="1451"/>
+ <source>&amp;Halve speed</source>
+ <translation>半速(&amp;H)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1452"/>
- <source>&amp;Double speed</source>
- <translation>双速(&amp;D)</translation>
+ <location filename="../basegui.cpp" line="1452"/>
+ <source>&amp;Double speed</source>
+ <translation>双速(&amp;D)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1453"/>
- <source>Speed &amp;-10%</source>
- <translation>速度 -10%(&amp;-)</translation>
+ <location filename="../basegui.cpp" line="1453"/>
+ <source>Speed &amp;-10%</source>
+ <translation>速度 -10%(&amp;-)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1454"/>
- <source>Speed &amp;+10%</source>
- <translation>速度 +10%(&amp;+)</translation>
+ <location filename="../basegui.cpp" line="1454"/>
+ <source>Speed &amp;+10%</source>
+ <translation>速度 +10%(&amp;+)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1455"/>
- <source>Speed -&amp;4%</source>
- <translation>速度 -4%(&amp;4)</translation>
+ <location filename="../basegui.cpp" line="1455"/>
+ <source>Speed -&amp;4%</source>
+ <translation>速度 -4%(&amp;4)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1456"/>
- <source>&amp;Speed +4%</source>
- <translation>速度 +4%(&amp;S)</translation>
+ <location filename="../basegui.cpp" line="1456"/>
+ <source>&amp;Speed +4%</source>
+ <translation>速度 +4%(&amp;S)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1457"/>
- <source>Speed -&amp;1%</source>
- <translation>速度 -1%(&amp;1)</translation>
+ <location filename="../basegui.cpp" line="1457"/>
+ <source>Speed -&amp;1%</source>
+ <translation>速度 -1%(&amp;1)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1458"/>
- <source>S&amp;peed +1%</source>
- <translation>速度 +1%(&amp;P)</translation>
+ <location filename="../basegui.cpp" line="1458"/>
+ <source>S&amp;peed +1%</source>
+ <translation>速度 +1%(&amp;P)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1461"/>
- <source>&amp;Fullscreen</source>
- <translation>全屏(&amp;F)</translation>
+ <location filename="../basegui.cpp" line="1461"/>
+ <source>&amp;Fullscreen</source>
+ <translation>全屏(&amp;F)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1462"/>
- <source>&amp;Compact mode</source>
- <translation>紧凑模式(&amp;C)</translation>
+ <location filename="../basegui.cpp" line="1462"/>
+ <source>&amp;Compact mode</source>
+ <translation>紧凑模式(&amp;C)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1463"/>
- <source>&amp;Equalizer</source>
- <translation>均衡器(&amp;E)</translation>
+ <location filename="../basegui.cpp" line="1463"/>
+ <source>&amp;Equalizer</source>
+ <translation>均衡器(&amp;E)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1464"/>
- <source>&amp;Screenshot</source>
- <translation>屏幕截图(&amp;S)</translation>
+ <location filename="../basegui.cpp" line="1464"/>
+ <source>&amp;Screenshot</source>
+ <translation>屏幕截图(&amp;S)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1465"/>
- <source>Start/stop takin&amp;g screenshots</source>
- <translation>开始/停止自动屏幕截图(&amp;G)</translation>
+ <location filename="../basegui.cpp" line="1465"/>
+ <source>Start/stop takin&amp;g screenshots</source>
+ <translation>开始/停止自动屏幕截图(&amp;G)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1467"/>
- <source>Pre&amp;view...</source>
- <translation>预览图像(&amp;V)...</translation>
+ <location filename="../basegui.cpp" line="1467"/>
+ <source>Pre&amp;view...</source>
+ <translation>预览图像(&amp;V)...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1469"/>
- <source>Fli&amp;p image</source>
- <translation>垂直镜像(&amp;P)</translation>
+ <location filename="../basegui.cpp" line="1469"/>
+ <source>Fli&amp;p image</source>
+ <translation>垂直镜像(&amp;P)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1470"/>
- <source>Mirr&amp;or image</source>
- <translation>水平镜像(&amp;O)</translation>
+ <location filename="../basegui.cpp" line="1470"/>
+ <source>Mirr&amp;or image</source>
+ <translation>水平镜像(&amp;O)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1472"/>
- <source>Zoom &amp;-</source>
- <translation>缩小(&amp;-)</translation>
+ <location filename="../basegui.cpp" line="1472"/>
+ <source>Zoom &amp;-</source>
+ <translation>缩小(&amp;-)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1473"/>
- <source>Zoom &amp;+</source>
- <translation>放大(&amp;+)</translation>
+ <location filename="../basegui.cpp" line="1473"/>
+ <source>Zoom &amp;+</source>
+ <translation>放大(&amp;+)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1474"/>
- <source>&amp;Reset</source>
- <translation>重置(&amp;R)</translation>
+ <location filename="../basegui.cpp" line="1474"/>
+ <source>&amp;Reset</source>
+ <translation>重置(&amp;R)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1475"/>
- <source>&amp;Auto zoom</source>
- <translation>自动缩放(&amp;A)</translation>
+ <location filename="../basegui.cpp" line="1475"/>
+ <source>&amp;Auto zoom</source>
+ <translation>自动缩放(&amp;A)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1476"/>
- <source>Zoom for &amp;16:9</source>
- <translation>缩放为 16:9 (&amp;1)</translation>
+ <location filename="../basegui.cpp" line="1476"/>
+ <source>Zoom for &amp;16:9</source>
+ <translation>缩放为 16:9 (&amp;1)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1477"/>
- <source>Zoom for &amp;2.35:1</source>
- <translation>缩放为 2.35:1 (&amp;2)</translation>
+ <location filename="../basegui.cpp" line="1477"/>
+ <source>Zoom for &amp;2.35:1</source>
+ <translation>缩放为 2.35:1 (&amp;2)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1478"/>
- <source>Move &amp;left</source>
- <translation>向左移动(&amp;L)</translation>
+ <location filename="../basegui.cpp" line="1478"/>
+ <source>Move &amp;left</source>
+ <translation>向左移动(&amp;L)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1479"/>
- <source>Move &amp;right</source>
- <translation>向右移动(&amp;R)</translation>
+ <location filename="../basegui.cpp" line="1479"/>
+ <source>Move &amp;right</source>
+ <translation>向右移动(&amp;R)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1480"/>
- <source>Move &amp;up</source>
- <translation>向上移动(&amp;U)</translation>
+ <location filename="../basegui.cpp" line="1480"/>
+ <source>Move &amp;up</source>
+ <translation>向上移动(&amp;U)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1481"/>
- <source>Move &amp;down</source>
- <translation>向下移动(&amp;D)</translation>
+ <location filename="../basegui.cpp" line="1481"/>
+ <source>Move &amp;down</source>
+ <translation>向下移动(&amp;D)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1489"/>
- <source>&amp;Postprocessing</source>
- <translation>后处理(&amp;P)</translation>
+ <location filename="../basegui.cpp" line="1489"/>
+ <source>&amp;Postprocessing</source>
+ <translation>后处理(&amp;P)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1490"/>
- <source>&amp;Autodetect phase</source>
- <translation>自动检测相位(&amp;A)</translation>
+ <location filename="../basegui.cpp" line="1490"/>
+ <source>&amp;Autodetect phase</source>
+ <translation>自动检测相位(&amp;A)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1491"/>
- <source>&amp;Deblock</source>
- <translation>去块(&amp;D)</translation>
+ <location filename="../basegui.cpp" line="1491"/>
+ <source>&amp;Deblock</source>
+ <translation>去块(&amp;D)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1492"/>
- <source>De&amp;ring</source>
- <translation>去环状块(&amp;R)</translation>
+ <location filename="../basegui.cpp" line="1492"/>
+ <source>De&amp;ring</source>
+ <translation>去环状块(&amp;R)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1493"/>
- <source>Debanding (&amp;gradfun)</source>
- <translation>去带(Gradfun)(&amp;G)</translation>
+ <location filename="../basegui.cpp" line="1493"/>
+ <source>Debanding (&amp;gradfun)</source>
+ <translation>去带(Gradfun)(&amp;G)</translation>
 </message>
 <message>
- <source>B&amp;lur</source>
- <translation type="obsolete">模糊(&amp;L)</translation>
+ <source>B&amp;lur</source>
+ <translation>模糊(&amp;L)</translation>
 </message>
 <message>
- <source>S&amp;harpen</source>
- <translation type="obsolete">锐化(&amp;H)</translation>
+ <source>S&amp;harpen</source>
+ <translation>锐化(&amp;H)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1494"/>
- <source>Add n&amp;oise</source>
- <translation>添加噪点(&amp;O)</translation>
+ <location filename="../basegui.cpp" line="1494"/>
+ <source>Add n&amp;oise</source>
+ <translation>添加噪点(&amp;O)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1495"/>
- <source>Add &amp;black borders</source>
- <translation>添加黑色边框(&amp;B)</translation>
+ <location filename="../basegui.cpp" line="1495"/>
+ <source>Add &amp;black borders</source>
+ <translation>添加黑色边框(&amp;B)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1496"/>
- <source>Soft&amp;ware scaling</source>
- <translation>软件缩放(&amp;W)</translation>
+ <location filename="../basegui.cpp" line="1496"/>
+ <source>Soft&amp;ware scaling</source>
+ <translation>软件缩放(&amp;W)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1499"/>
- <source>E&amp;qualizer</source>
- <translation>均衡器(&amp;Q)</translation>
+ <location filename="../basegui.cpp" line="1499"/>
+ <source>E&amp;qualizer</source>
+ <translation>均衡器(&amp;Q)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1502"/>
- <source>&amp;Mute</source>
- <translation>静音(&amp;M)</translation>
+ <location filename="../basegui.cpp" line="1502"/>
+ <source>&amp;Mute</source>
+ <translation>静音(&amp;M)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1503"/>
- <source>Volume &amp;-</source>
- <translation>音量 -(&amp;-)</translation>
+ <location filename="../basegui.cpp" line="1503"/>
+ <source>Volume &amp;-</source>
+ <translation>音量 -(&amp;-)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1504"/>
- <source>Volume &amp;+</source>
- <translation>音量 +(&amp;+)</translation>
+ <location filename="../basegui.cpp" line="1504"/>
+ <source>Volume &amp;+</source>
+ <translation>音量 +(&amp;+)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1505"/>
- <source>&amp;Delay -</source>
- <translation>延时 -(&amp;D)</translation>
+ <location filename="../basegui.cpp" line="1505"/>
+ <source>&amp;Delay -</source>
+ <translation>延时 -(&amp;D)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1506"/>
- <source>D&amp;elay +</source>
- <translation>延时 +(&amp;E)</translation>
+ <location filename="../basegui.cpp" line="1506"/>
+ <source>D&amp;elay +</source>
+ <translation>延时 +(&amp;E)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1507"/>
- <source>Set dela&amp;y...</source>
- <translation>设置延时(&amp;Y)...</translation>
+ <location filename="../basegui.cpp" line="1507"/>
+ <source>Set dela&amp;y...</source>
+ <translation>设置延时(&amp;Y)...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1508"/>
- <source>&amp;Load external file...</source>
- <translation>加载外部文件(&amp;L)...</translation>
+ <location filename="../basegui.cpp" line="1508"/>
+ <source>&amp;Load external file...</source>
+ <translation>加载外部文件(&amp;L)...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1509"/>
- <location filename="../basegui.cpp" line="1518"/>
- <source>U&amp;nload</source>
- <translation>卸载(&amp;N)</translation>
+ <location filename="../basegui.cpp" line="1509"/>
+ <location filename="../basegui.cpp" line="1518"/>
+ <source>U&amp;nload</source>
+ <translation>卸载(&amp;N)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1512"/>
- <source>&amp;Extrastereo</source>
- <translation>增强立体声(&amp;E)</translation>
+ <location filename="../basegui.cpp" line="1512"/>
+ <source>&amp;Extrastereo</source>
+ <translation>增强立体声(&amp;E)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1513"/>
- <source>&amp;Karaoke</source>
- <translation>卡拉OK(&amp;K)</translation>
+ <location filename="../basegui.cpp" line="1513"/>
+ <source>&amp;Karaoke</source>
+ <translation>卡拉OK(&amp;K)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1514"/>
- <source>Volume &amp;normalization</source>
- <translation>音量标准化(&amp;N)</translation>
+ <location filename="../basegui.cpp" line="1514"/>
+ <source>Volume &amp;normalization</source>
+ <translation>音量标准化(&amp;N)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1517"/>
- <source>&amp;Load...</source>
- <translation>加载(&amp;L)...</translation>
+ <location filename="../basegui.cpp" line="1517"/>
+ <source>&amp;Load...</source>
+ <translation>加载(&amp;L)...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1519"/>
- <source>Delay &amp;-</source>
- <translation>延时 -(&amp;-)</translation>
+ <location filename="../basegui.cpp" line="1519"/>
+ <source>Delay &amp;-</source>
+ <translation>延时 -(&amp;-)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1520"/>
- <source>Delay &amp;+</source>
- <translation>延时 +(&amp;+)</translation>
+ <location filename="../basegui.cpp" line="1520"/>
+ <source>Delay &amp;+</source>
+ <translation>延时 +(&amp;+)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1521"/>
- <source>Se&amp;t delay...</source>
- <translation>设置延时(&amp;T)...</translation>
+ <location filename="../basegui.cpp" line="1521"/>
+ <source>Se&amp;t delay...</source>
+ <translation>设置延时(&amp;T)...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1522"/>
- <source>&amp;Up</source>
- <translation>向上(&amp;U)</translation>
+ <location filename="../basegui.cpp" line="1522"/>
+ <source>&amp;Up</source>
+ <translation>向上(&amp;U)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1523"/>
- <source>&amp;Down</source>
- <translation>向下(&amp;D)</translation>
+ <location filename="../basegui.cpp" line="1523"/>
+ <source>&amp;Down</source>
+ <translation>向下(&amp;D)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1524"/>
- <source>S&amp;ize -</source>
- <translation>大小 -(&amp;I)</translation>
+ <location filename="../basegui.cpp" line="1524"/>
+ <source>S&amp;ize -</source>
+ <translation>大小 -(&amp;I)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1525"/>
- <source>Si&amp;ze +</source>
- <translation>大小 +(&amp;Z)</translation>
+ <location filename="../basegui.cpp" line="1525"/>
+ <source>Si&amp;ze +</source>
+ <translation>大小 +(&amp;Z)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1527"/>
- <source>&amp;Previous line in subtitles</source>
- <translation>前一行字幕(&amp;P)</translation>
+ <location filename="../basegui.cpp" line="1527"/>
+ <source>&amp;Previous line in subtitles</source>
+ <translation>前一行字幕(&amp;P)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1529"/>
- <source>N&amp;ext line in subtitles</source>
- <translation>后一行字幕(&amp;E)</translation>
+ <location filename="../basegui.cpp" line="1529"/>
+ <source>N&amp;ext line in subtitles</source>
+ <translation>后一行字幕(&amp;E)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1530"/>
- <source>Use SSA/&amp;ASS library</source>
- <translation>使用 SSA/ASS 库(&amp;A)</translation>
+ <location filename="../basegui.cpp" line="1530"/>
+ <source>Use SSA/&amp;ASS library</source>
+ <translation>使用 SSA/ASS 库(&amp;A)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1531"/>
- <source>&amp;Forced subtitles only</source>
- <translation>仅强制字幕(&amp;F)</translation>
+ <location filename="../basegui.cpp" line="1531"/>
+ <source>&amp;Forced subtitles only</source>
+ <translation>仅强制字幕(&amp;F)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1533"/>
- <source>Subtitle &amp;visibility</source>
- <translation>字幕可见(&amp;V)</translation>
+ <location filename="../basegui.cpp" line="1533"/>
+ <source>Subtitle &amp;visibility</source>
+ <translation>字幕可见(&amp;V)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1536"/>
- <source>Find subtitles on &amp;OpenSubtitles.org...</source>
- <translation>在 OpenSubtitles.org 上查找字幕(&amp;O)...</translation>
+ <location filename="../basegui.cpp" line="1536"/>
+ <source>Find subtitles on &amp;OpenSubtitles.org...</source>
+ <translation>在 OpenSubtitles.org 上查找字幕(&amp;O)...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1537"/>
- <source>Upload su&amp;btitles to OpenSubtitles.org...</source>
- <translation>上传字幕到 OpenSubtitles.org (&amp;B)...</translation>
+ <location filename="../basegui.cpp" line="1537"/>
+ <source>Upload su&amp;btitles to OpenSubtitles.org...</source>
+ <translation>上传字幕到 OpenSubtitles.org (&amp;B)...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1729"/>
- <source>&amp;Off</source>
- <comment>denoise menu</comment>
- <translation>关(&amp;O)</translation>
+ <location filename="../basegui.cpp" line="1729"/>
+ <source>&amp;Off</source>
+ <comment>denoise menu</comment>
+ <translation>关(&amp;O)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1730"/>
- <source>&amp;Normal</source>
- <comment>denoise menu</comment>
- <translation>普通(&amp;N)</translation>
+ <location filename="../basegui.cpp" line="1730"/>
+ <source>&amp;Normal</source>
+ <comment>denoise menu</comment>
+ <translation>普通(&amp;N)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1731"/>
- <source>&amp;Soft</source>
- <comment>denoise menu</comment>
- <translation>软件(&amp;S)</translation>
+ <location filename="../basegui.cpp" line="1731"/>
+ <source>&amp;Soft</source>
+ <comment>denoise menu</comment>
+ <translation>软件(&amp;S)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1733"/>
- <source>&amp;None</source>
- <comment>unsharp menu</comment>
- <translation>无(&amp;N)</translation>
+ <location filename="../basegui.cpp" line="1733"/>
+ <source>&amp;None</source>
+ <comment>unsharp menu</comment>
+ <translation>无(&amp;N)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1734"/>
- <source>&amp;Blur</source>
- <comment>unsharp menu</comment>
- <translation>模糊(&amp;B)</translation>
+ <location filename="../basegui.cpp" line="1734"/>
+ <source>&amp;Blur</source>
+ <comment>unsharp menu</comment>
+ <translation>模糊(&amp;B)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1735"/>
- <source>&amp;Sharpen</source>
- <comment>unsharp menu</comment>
- <translation>锐化(&amp;S)</translation>
+ <location filename="../basegui.cpp" line="1735"/>
+ <source>&amp;Sharpen</source>
+ <comment>unsharp menu</comment>
+ <translation>锐化(&amp;S)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1737"/>
- <source>&amp;Off</source>
- <translation>关(&amp;O)</translation>
+ <location filename="../basegui.cpp" line="1737"/>
+ <source>&amp;Off</source>
+ <translation>关(&amp;O)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1547"/>
- <source>&amp;Playlist</source>
- <translation>播放列表(&amp;P)</translation>
+ <location filename="../basegui.cpp" line="1547"/>
+ <source>&amp;Playlist</source>
+ <translation>播放列表(&amp;P)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1540"/>
- <source>&amp;Off</source>
- <comment>closed captions menu</comment>
- <translation>关(&amp;O)</translation>
+ <location filename="../basegui.cpp" line="1540"/>
+ <source>&amp;Off</source>
+ <comment>closed captions menu</comment>
+ <translation>关(&amp;O)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1548"/>
- <source>View &amp;info and properties...</source>
- <translation>查看信息和属性(&amp;I)...</translation>
+ <location filename="../basegui.cpp" line="1548"/>
+ <source>View &amp;info and properties...</source>
+ <translation>查看信息和属性(&amp;I)...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1549"/>
- <source>P&amp;references</source>
- <translation>首选项(&amp;R)</translation>
+ <location filename="../basegui.cpp" line="1549"/>
+ <source>P&amp;references</source>
+ <translation>首选项(&amp;R)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1550"/>
- <source>&amp;YouTube browser</source>
- <translation>YouTube 浏览器(&amp;Y)</translation>
+ <location filename="../basegui.cpp" line="1550"/>
+ <source>&amp;YouTube browser</source>
+ <translation>YouTube 浏览器(&amp;Y)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1561"/>
- <source>&amp;FAQ</source>
- <translation>FAQ(&amp;F)</translation>
+ <location filename="../basegui.cpp" line="1561"/>
+ <source>&amp;FAQ</source>
+ <translation>FAQ(&amp;F)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1562"/>
- <source>&amp;Command line options</source>
- <translation>命令行选项(&amp;C)</translation>
+ <location filename="../basegui.cpp" line="1562"/>
+ <source>&amp;Command line options</source>
+ <translation>命令行选项(&amp;C)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1564"/>
- <source>&amp;Donate</source>
- <translation>捐赠(&amp;D)</translation>
+ <location filename="../basegui.cpp" line="1564"/>
+ <source>&amp;Donate</source>
+ <translation>捐赠(&amp;D)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1565"/>
- <source>About &amp;Qt</source>
- <translation>关于 Qt(&amp;Q)</translation>
+ <location filename="../basegui.cpp" line="1565"/>
+ <source>About &amp;Qt</source>
+ <translation>关于 Qt(&amp;Q)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1566"/>
- <source>About &amp;SMPlayer</source>
- <translation>关于 SMPlayer(&amp;S)</translation>
+ <location filename="../basegui.cpp" line="1566"/>
+ <source>About &amp;SMPlayer</source>
+ <translation>关于 SMPlayer(&amp;S)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1569"/>
- <source>&amp;Next</source>
- <translation>下一个(&amp;N)</translation>
+ <location filename="../basegui.cpp" line="1569"/>
+ <source>&amp;Next</source>
+ <translation>下一个(&amp;N)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1570"/>
- <source>Pre&amp;vious</source>
- <translation>上一个(&amp;V)</translation>
+ <location filename="../basegui.cpp" line="1570"/>
+ <source>Pre&amp;vious</source>
+ <translation>上一个(&amp;V)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1584"/>
- <source>Dec volume (2)</source>
- <translation>降低音量(2)</translation>
+ <location filename="../basegui.cpp" line="1584"/>
+ <source>Dec volume (2)</source>
+ <translation>降低音量(2)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1585"/>
- <source>Inc volume (2)</source>
- <translation>提高音量(2)</translation>
+ <location filename="../basegui.cpp" line="1585"/>
+ <source>Inc volume (2)</source>
+ <translation>提高音量(2)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1588"/>
- <source>Exit fullscreen</source>
- <translation>退出全屏</translation>
+ <location filename="../basegui.cpp" line="1588"/>
+ <source>Exit fullscreen</source>
+ <translation>退出全屏</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1590"/>
- <source>OSD - Next level</source>
- <translation>OSD - 下一模式</translation>
+ <location filename="../basegui.cpp" line="1590"/>
+ <source>OSD - Next level</source>
+ <translation>OSD - 下一模式</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1591"/>
- <source>Dec contrast</source>
- <translation>降低对比度</translation>
+ <location filename="../basegui.cpp" line="1591"/>
+ <source>Dec contrast</source>
+ <translation>降低对比度</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1592"/>
- <source>Inc contrast</source>
- <translation>提高对比度</translation>
+ <location filename="../basegui.cpp" line="1592"/>
+ <source>Inc contrast</source>
+ <translation>提高对比度</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1593"/>
- <source>Dec brightness</source>
- <translation>降低亮度</translation>
+ <location filename="../basegui.cpp" line="1593"/>
+ <source>Dec brightness</source>
+ <translation>降低亮度</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1594"/>
- <source>Inc brightness</source>
- <translation>增加亮度</translation>
+ <location filename="../basegui.cpp" line="1594"/>
+ <source>Inc brightness</source>
+ <translation>增加亮度</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1595"/>
- <source>Dec hue</source>
- <translation>减少色调</translation>
+ <location filename="../basegui.cpp" line="1595"/>
+ <source>Dec hue</source>
+ <translation>减少色调</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1596"/>
- <source>Inc hue</source>
- <translation>增加色调</translation>
+ <location filename="../basegui.cpp" line="1596"/>
+ <source>Inc hue</source>
+ <translation>增加色调</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1597"/>
- <source>Dec saturation</source>
- <translation>降低饱和度</translation>
+ <location filename="../basegui.cpp" line="1597"/>
+ <source>Dec saturation</source>
+ <translation>降低饱和度</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1598"/>
- <source>Inc saturation</source>
- <translation>增加饱和度</translation>
+ <location filename="../basegui.cpp" line="1598"/>
+ <source>Inc saturation</source>
+ <translation>增加饱和度</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1599"/>
- <source>Dec gamma</source>
- <translation>减少伽玛</translation>
+ <location filename="../basegui.cpp" line="1599"/>
+ <source>Dec gamma</source>
+ <translation>减少伽玛</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1600"/>
- <source>Inc gamma</source>
- <translation>增加伽玛</translation>
+ <location filename="../basegui.cpp" line="1600"/>
+ <source>Inc gamma</source>
+ <translation>增加伽玛</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1601"/>
- <source>Next video</source>
- <translation>下一视频</translation>
+ <location filename="../basegui.cpp" line="1601"/>
+ <source>Next video</source>
+ <translation>下一视频</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1602"/>
- <source>Next audio</source>
- <translation>下一音轨</translation>
+ <location filename="../basegui.cpp" line="1602"/>
+ <source>Next audio</source>
+ <translation>下一音轨</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1603"/>
- <source>Next subtitle</source>
- <translation>下一字幕</translation>
+ <location filename="../basegui.cpp" line="1603"/>
+ <source>Next subtitle</source>
+ <translation>下一字幕</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1604"/>
- <source>Next chapter</source>
- <translation>下一章节</translation>
+ <location filename="../basegui.cpp" line="1604"/>
+ <source>Next chapter</source>
+ <translation>下一章节</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1605"/>
- <source>Previous chapter</source>
- <translation>前一章节</translation>
+ <location filename="../basegui.cpp" line="1605"/>
+ <source>Previous chapter</source>
+ <translation>前一章节</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1606"/>
- <source>&amp;Toggle double size</source>
- <translation>切换双倍大小(&amp;T)</translation>
+ <location filename="../basegui.cpp" line="1606"/>
+ <source>&amp;Toggle double size</source>
+ <translation>切换双倍大小(&amp;T)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1607"/>
- <source>Reset video equalizer</source>
- <translation>重置视频均衡器</translation>
+ <location filename="../basegui.cpp" line="1607"/>
+ <source>Reset video equalizer</source>
+ <translation>重置视频均衡器</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1608"/>
- <source>Reset audio equalizer</source>
- <translation>重置音频均衡器</translation>
+ <location filename="../basegui.cpp" line="1608"/>
+ <source>Reset audio equalizer</source>
+ <translation>重置音频均衡器</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1609"/>
- <source>Show context menu</source>
- <translation>显示上下文菜单</translation>
+ <location filename="../basegui.cpp" line="1609"/>
+ <source>Show context menu</source>
+ <translation>显示上下文菜单</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1610"/>
- <source>Next aspect ratio</source>
- <translation>下一个纵横比</translation>
+ <location filename="../basegui.cpp" line="1610"/>
+ <source>Next aspect ratio</source>
+ <translation>下一个纵横比</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1611"/>
- <source>Next wheel function</source>
- <translation>下一个滚轮动作</translation>
+ <location filename="../basegui.cpp" line="1611"/>
+ <source>Next wheel function</source>
+ <translation>下一个滚轮动作</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1613"/>
- <source>Show filename on OSD</source>
- <translation>在 OSD 上显示文件名</translation>
+ <location filename="../basegui.cpp" line="1613"/>
+ <source>Show filename on OSD</source>
+ <translation>在 OSD 上显示文件名</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1614"/>
- <source>Toggle deinterlacing</source>
- <translation>切换反交错</translation>
+ <location filename="../basegui.cpp" line="1614"/>
+ <source>Toggle deinterlacing</source>
+ <translation>切换反交错</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1618"/>
- <source>Subtitles onl&amp;y</source>
- <translation>仅字幕(&amp;Y)</translation>
+ <location filename="../basegui.cpp" line="1618"/>
+ <source>Subtitles onl&amp;y</source>
+ <translation>仅字幕(&amp;Y)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1619"/>
- <source>Volume + &amp;Seek</source>
- <translation>音量+定位(&amp;S)</translation>
+ <location filename="../basegui.cpp" line="1619"/>
+ <source>Volume + &amp;Seek</source>
+ <translation>音量+定位(&amp;S)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1620"/>
- <source>Volume + Seek + &amp;Timer</source>
- <translation>音量+定位+计时器(&amp;T)</translation>
+ <location filename="../basegui.cpp" line="1620"/>
+ <source>Volume + Seek + &amp;Timer</source>
+ <translation>音量+定位+计时器(&amp;T)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1621"/>
- <source>Volume + Seek + Timer + T&amp;otal time</source>
- <translation>音量+定位+计时器+总计时间(&amp;O)</translation>
+ <location filename="../basegui.cpp" line="1621"/>
+ <source>Volume + Seek + Timer + T&amp;otal time</source>
+ <translation>音量+定位+计时器+总计时间(&amp;O)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1625"/>
- <source>&amp;Open</source>
- <translation>打开(&amp;O)</translation>
+ <location filename="../basegui.cpp" line="1625"/>
+ <source>&amp;Open</source>
+ <translation>打开(&amp;O)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1626"/>
- <source>&amp;Play</source>
- <translation>播放(&amp;P)</translation>
+ <location filename="../basegui.cpp" line="1626"/>
+ <source>&amp;Play</source>
+ <translation>播放(&amp;P)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1627"/>
- <source>&amp;Video</source>
- <translation>视频(&amp;V)</translation>
+ <location filename="../basegui.cpp" line="1627"/>
+ <source>&amp;Video</source>
+ <translation>视频(&amp;V)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1628"/>
- <source>&amp;Audio</source>
- <translation>音频(&amp;A)</translation>
+ <location filename="../basegui.cpp" line="1628"/>
+ <source>&amp;Audio</source>
+ <translation>音频(&amp;A)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1629"/>
- <source>&amp;Subtitles</source>
- <translation>字幕(&amp;S)</translation>
+ <location filename="../basegui.cpp" line="1629"/>
+ <source>&amp;Subtitles</source>
+ <translation>字幕(&amp;S)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1630"/>
- <source>&amp;Browse</source>
- <translation>浏览(&amp;B)</translation>
+ <location filename="../basegui.cpp" line="1630"/>
+ <source>&amp;Browse</source>
+ <translation>浏览(&amp;B)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1631"/>
- <source>Op&amp;tions</source>
- <translation>选项(&amp;T)</translation>
+ <location filename="../basegui.cpp" line="1631"/>
+ <source>Op&amp;tions</source>
+ <translation>选项(&amp;T)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1632"/>
- <source>&amp;Help</source>
- <translation>帮助(&amp;H)</translation>
+ <location filename="../basegui.cpp" line="1632"/>
+ <source>&amp;Help</source>
+ <translation>帮助(&amp;H)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1646"/>
- <source>&amp;Recent files</source>
- <translation>最近访问的文件(&amp;R)</translation>
+ <location filename="../basegui.cpp" line="1646"/>
+ <source>&amp;Recent files</source>
+ <translation>最近访问的文件(&amp;R)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1648"/>
- <source>&amp;Clear</source>
- <translation>清除(&amp;C)</translation>
+ <location filename="../basegui.cpp" line="1648"/>
+ <source>&amp;Clear</source>
+ <translation>清除(&amp;C)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1650"/>
- <source>&amp;Disc</source>
- <translation>光盘(&amp;D)</translation>
+ <location filename="../basegui.cpp" line="1650"/>
+ <source>&amp;Disc</source>
+ <translation>光盘(&amp;D)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1654"/>
- <source>F&amp;avorites</source>
- <translation>收藏(&amp;A)</translation>
+ <location filename="../basegui.cpp" line="1654"/>
+ <source>F&amp;avorites</source>
+ <translation>收藏(&amp;A)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1657"/>
- <source>&amp;TV</source>
- <translation>电视(&amp;T)</translation>
+ <location filename="../basegui.cpp" line="1657"/>
+ <source>&amp;TV</source>
+ <translation>电视(&amp;T)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1660"/>
- <source>Radi&amp;o</source>
- <translation>广播(&amp;O)</translation>
+ <location filename="../basegui.cpp" line="1660"/>
+ <source>Radi&amp;o</source>
+ <translation>广播(&amp;O)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1664"/>
- <source>Sp&amp;eed</source>
- <translation>速度(&amp;E)</translation>
+ <location filename="../basegui.cpp" line="1664"/>
+ <source>Sp&amp;eed</source>
+ <translation>速度(&amp;E)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1667"/>
- <source>&amp;A-B section</source>
- <translation>A-B 段(&amp;A)</translation>
+ <location filename="../basegui.cpp" line="1667"/>
+ <source>&amp;A-B section</source>
+ <translation>A-B 段(&amp;A)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1671"/>
- <source>&amp;Track</source>
- <comment>video</comment>
- <translation>视轨(&amp;T)</translation>
+ <location filename="../basegui.cpp" line="1671"/>
+ <source>&amp;Track</source>
+ <comment>video</comment>
+ <translation>视轨(&amp;T)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1674"/>
- <source>Si&amp;ze</source>
- <translation>大小(&amp;Z)</translation>
+ <location filename="../basegui.cpp" line="1674"/>
+ <source>Si&amp;ze</source>
+ <translation>大小(&amp;Z)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1681"/>
- <source>Zoo&amp;m</source>
- <translation>缩放(&amp;M)</translation>
+ <location filename="../basegui.cpp" line="1681"/>
+ <source>Zoo&amp;m</source>
+ <translation>缩放(&amp;M)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1684"/>
- <source>&amp;Aspect ratio</source>
- <translation>纵横比(&amp;A)</translation>
+ <location filename="../basegui.cpp" line="1684"/>
+ <source>&amp;Aspect ratio</source>
+ <translation>纵横比(&amp;A)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1687"/>
- <source>&amp;Deinterlace</source>
- <translation>反交错(&amp;D)</translation>
+ <location filename="../basegui.cpp" line="1687"/>
+ <source>&amp;Deinterlace</source>
+ <translation>反交错(&amp;D)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1690"/>
- <source>F&amp;ilters</source>
- <translation>过滤器(&amp;I)</translation>
+ <location filename="../basegui.cpp" line="1690"/>
+ <source>F&amp;ilters</source>
+ <translation>过滤器(&amp;I)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1693"/>
- <source>&amp;Rotate</source>
- <translation>旋转(&amp;R)</translation>
+ <location filename="../basegui.cpp" line="1693"/>
+ <source>&amp;Rotate</source>
+ <translation>旋转(&amp;R)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1696"/>
- <source>S&amp;tay on top</source>
- <translation>总在最前端(&amp;T)</translation>
+ <location filename="../basegui.cpp" line="1696"/>
+ <source>S&amp;tay on top</source>
+ <translation>总在最前端(&amp;T)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1700"/>
- <source>Scree&amp;n</source>
- <translation>屏幕(&amp;N)</translation>
+ <location filename="../basegui.cpp" line="1700"/>
+ <source>Scree&amp;n</source>
+ <translation>屏幕(&amp;N)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1704"/>
- <source>De&amp;noise</source>
- <translation>降噪(&amp;N)</translation>
+ <location filename="../basegui.cpp" line="1704"/>
+ <source>De&amp;noise</source>
+ <translation>降噪(&amp;N)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1707"/>
- <source>Blur/S&amp;harp</source>
- <translation>模糊/锐化(&amp;H)</translation>
+ <location filename="../basegui.cpp" line="1707"/>
+ <source>Blur/S&amp;harp</source>
+ <translation>模糊/锐化(&amp;H)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1710"/>
- <source>&amp;Auto</source>
- <translation>自动(&amp;A)</translation>
+ <location filename="../basegui.cpp" line="1710"/>
+ <source>&amp;Auto</source>
+ <translation>自动(&amp;A)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1720"/>
- <source>&amp;Disabled</source>
- <translation>禁用(&amp;D)</translation>
+ <location filename="../basegui.cpp" line="1720"/>
+ <source>&amp;Disabled</source>
+ <translation>禁用(&amp;D)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1722"/>
- <location filename="../basegui.cpp" line="2951"/>
- <source>&amp;None</source>
- <translation>无(&amp;N)</translation>
+ <location filename="../basegui.cpp" line="1722"/>
+ <location filename="../basegui.cpp" line="2951"/>
+ <source>&amp;None</source>
+ <translation>无(&amp;N)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1723"/>
- <source>&amp;Lowpass5</source>
- <translation>Lowpass5 反交错(&amp;L)</translation>
+ <location filename="../basegui.cpp" line="1723"/>
+ <source>&amp;Lowpass5</source>
+ <translation>Lowpass5 反交错(&amp;L)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1724"/>
- <source>&amp;Yadif (normal)</source>
- <translation>Yadif 反交错(普通)(&amp;Y)</translation>
+ <location filename="../basegui.cpp" line="1724"/>
+ <source>&amp;Yadif (normal)</source>
+ <translation>Yadif 反交错(普通)(&amp;Y)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1725"/>
- <source>Y&amp;adif (double framerate)</source>
- <translation>Yadif 反交错(双倍帧率)(&amp;A)</translation>
+ <location filename="../basegui.cpp" line="1725"/>
+ <source>Y&amp;adif (double framerate)</source>
+ <translation>Yadif 反交错(双倍帧率)(&amp;A)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1726"/>
- <source>Linear &amp;Blend</source>
- <translation>线性混合(&amp;B)</translation>
+ <location filename="../basegui.cpp" line="1726"/>
+ <source>Linear &amp;Blend</source>
+ <translation>线性混合(&amp;B)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1727"/>
- <source>&amp;Kerndeint</source>
- <translation>Kerndeint 自适应反交错(&amp;K)</translation>
+ <location filename="../basegui.cpp" line="1727"/>
+ <source>&amp;Kerndeint</source>
+ <translation>Kerndeint 自适应反交错(&amp;K)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1822"/>
- <source>SMPlayer - MPlayer log</source>
- <translation>SMPlayer - MPlayer 日志</translation>
+ <location filename="../basegui.cpp" line="1822"/>
+ <source>SMPlayer - MPlayer log</source>
+ <translation>SMPlayer - MPlayer 日志</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1825"/>
- <source>SMPlayer - SMPlayer log</source>
- <translation>SMPlayer - SMPlayer 日志</translation>
+ <location filename="../basegui.cpp" line="1825"/>
+ <source>SMPlayer - SMPlayer log</source>
+ <translation>SMPlayer - SMPlayer 日志</translation>
 </message>
 <message>
- <source>Denoise o&amp;ff</source>
- <translation type="obsolete">降噪(关)(&amp;F)</translation>
+ <source>Denoise o&amp;ff</source>
+ <translation>降噪(关)(&amp;F)</translation>
 </message>
 <message>
- <source>Denoise nor&amp;mal</source>
- <translation type="obsolete">降噪(普通)(&amp;M)</translation>
+ <source>Denoise nor&amp;mal</source>
+ <translation>降噪(普通)(&amp;M)</translation>
 </message>
 <message>
- <source>Denoise &amp;soft</source>
- <translation type="obsolete">降噪(软件)(&amp;S)</translation>
+ <source>Denoise &amp;soft</source>
+ <translation>降噪(软件)(&amp;S)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1738"/>
- <source>&amp;Rotate by 90 degrees clockwise and flip</source>
- <translation>顺时针旋转90度并垂直镜像(&amp;R)</translation>
+ <location filename="../basegui.cpp" line="1738"/>
+ <source>&amp;Rotate by 90 degrees clockwise and flip</source>
+ <translation>顺时针旋转90度并垂直镜像(&amp;R)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1739"/>
- <source>Rotate by 90 degrees &amp;clockwise</source>
- <translation>顺时针旋转90度(&amp;C)</translation>
+ <location filename="../basegui.cpp" line="1739"/>
+ <source>Rotate by 90 degrees &amp;clockwise</source>
+ <translation>顺时针旋转90度(&amp;C)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1740"/>
- <source>Rotate by 90 degrees counterclock&amp;wise</source>
- <translation>逆时针旋转90度(&amp;W)</translation>
+ <location filename="../basegui.cpp" line="1740"/>
+ <source>Rotate by 90 degrees counterclock&amp;wise</source>
+ <translation>逆时针旋转90度(&amp;W)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1741"/>
- <source>Rotate by 90 degrees counterclockwise and &amp;flip</source>
- <translation>逆时针旋转90度并垂直镜像(&amp;F)</translation>
+ <location filename="../basegui.cpp" line="1741"/>
+ <source>Rotate by 90 degrees counterclockwise and &amp;flip</source>
+ <translation>逆时针旋转90度并垂直镜像(&amp;F)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1743"/>
- <source>&amp;Always</source>
- <translation>始终(&amp;A)</translation>
+ <location filename="../basegui.cpp" line="1743"/>
+ <source>&amp;Always</source>
+ <translation>始终(&amp;A)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1744"/>
- <source>&amp;Never</source>
- <translation>从不(&amp;N)</translation>
+ <location filename="../basegui.cpp" line="1744"/>
+ <source>&amp;Never</source>
+ <translation>从不(&amp;N)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1745"/>
- <source>While &amp;playing</source>
- <translation>当播放时(&amp;P)</translation>
+ <location filename="../basegui.cpp" line="1745"/>
+ <source>While &amp;playing</source>
+ <translation>当播放时(&amp;P)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1746"/>
- <source>Toggle stay on top</source>
- <translation>切换是否总在最前端显示</translation>
+ <location filename="../basegui.cpp" line="1746"/>
+ <source>Toggle stay on top</source>
+ <translation>切换是否总在最前端显示</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1749"/>
- <source>&amp;Default</source>
- <translation>默认(&amp;D)</translation>
+ <location filename="../basegui.cpp" line="1749"/>
+ <source>&amp;Default</source>
+ <translation>默认(&amp;D)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1753"/>
- <source>&amp;Track</source>
- <comment>audio</comment>
- <translation>音轨(&amp;T)</translation>
+ <location filename="../basegui.cpp" line="1753"/>
+ <source>&amp;Track</source>
+ <comment>audio</comment>
+ <translation>音轨(&amp;T)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1756"/>
- <source>&amp;Filters</source>
- <translation>过滤器(&amp;F)</translation>
+ <location filename="../basegui.cpp" line="1756"/>
+ <source>&amp;Filters</source>
+ <translation>过滤器(&amp;F)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1759"/>
- <source>&amp;Channels</source>
- <translation>声道(&amp;C)</translation>
+ <location filename="../basegui.cpp" line="1759"/>
+ <source>&amp;Channels</source>
+ <translation>声道(&amp;C)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1762"/>
- <source>&amp;Stereo mode</source>
- <translation>立体声模式(&amp;S)</translation>
+ <location filename="../basegui.cpp" line="1762"/>
+ <source>&amp;Stereo mode</source>
+ <translation>立体声模式(&amp;S)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1766"/>
- <location filename="../basegui.cpp" line="1770"/>
- <source>&amp;Stereo</source>
- <translation>立体声(&amp;S)</translation>
+ <location filename="../basegui.cpp" line="1766"/>
+ <location filename="../basegui.cpp" line="1770"/>
+ <source>&amp;Stereo</source>
+ <translation>立体声(&amp;S)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1767"/>
- <source>&amp;4.0 Surround</source>
- <translation>4.0 环绕(&amp;4)</translation>
+ <location filename="../basegui.cpp" line="1767"/>
+ <source>&amp;4.0 Surround</source>
+ <translation>4.0 环绕(&amp;4)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1768"/>
- <source>&amp;5.1 Surround</source>
- <translation>5.1 环绕(&amp;5)</translation>
+ <location filename="../basegui.cpp" line="1768"/>
+ <source>&amp;5.1 Surround</source>
+ <translation>5.1 环绕(&amp;5)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1771"/>
- <source>&amp;Left channel</source>
- <translation>左声道(&amp;L)</translation>
+ <location filename="../basegui.cpp" line="1771"/>
+ <source>&amp;Left channel</source>
+ <translation>左声道(&amp;L)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1772"/>
- <source>&amp;Right channel</source>
- <translation>右声道(&amp;R)</translation>
+ <location filename="../basegui.cpp" line="1772"/>
+ <source>&amp;Right channel</source>
+ <translation>右声道(&amp;R)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1775"/>
- <source>&amp;Select</source>
- <translation>选择(&amp;S)</translation>
+ <location filename="../basegui.cpp" line="1775"/>
+ <source>&amp;Select</source>
+ <translation>选择(&amp;S)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1778"/>
- <source>&amp;Closed captions</source>
- <translation>隐藏式字幕(&amp;C)</translation>
+ <location filename="../basegui.cpp" line="1778"/>
+ <source>&amp;Closed captions</source>
+ <translation>隐藏式字幕(&amp;C)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1782"/>
- <source>&amp;Title</source>
- <translation>标题(&amp;T)</translation>
+ <location filename="../basegui.cpp" line="1782"/>
+ <source>&amp;Title</source>
+ <translation>标题(&amp;T)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1785"/>
- <source>&amp;Chapter</source>
- <translation>章节(&amp;C)</translation>
+ <location filename="../basegui.cpp" line="1785"/>
+ <source>&amp;Chapter</source>
+ <translation>章节(&amp;C)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1788"/>
- <source>&amp;Angle</source>
- <translation>角度(&amp;A)</translation>
+ <location filename="../basegui.cpp" line="1788"/>
+ <source>&amp;Angle</source>
+ <translation>角度(&amp;A)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1792"/>
- <source>P&amp;rogram</source>
- <comment>program</comment>
- <translation>程序(&amp;R)</translation>
+ <location filename="../basegui.cpp" line="1792"/>
+ <source>P&amp;rogram</source>
+ <comment>program</comment>
+ <translation>程序(&amp;R)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1798"/>
- <source>DVD menu, move up</source>
- <translation>DVD 菜单，上移</translation>
+ <location filename="../basegui.cpp" line="1798"/>
+ <source>DVD menu, move up</source>
+ <translation>DVD 菜单，上移</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1799"/>
- <source>DVD menu, move down</source>
- <translation>DVD 菜单，下移</translation>
+ <location filename="../basegui.cpp" line="1799"/>
+ <source>DVD menu, move down</source>
+ <translation>DVD 菜单，下移</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1800"/>
- <source>DVD menu, move left</source>
- <translation>DVD 菜单，左移</translation>
+ <location filename="../basegui.cpp" line="1800"/>
+ <source>DVD menu, move left</source>
+ <translation>DVD 菜单，左移</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1801"/>
- <source>DVD menu, move right</source>
- <translation>DVD 菜单，右移</translation>
+ <location filename="../basegui.cpp" line="1801"/>
+ <source>DVD menu, move right</source>
+ <translation>DVD 菜单，右移</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1802"/>
- <source>DVD &amp;menu</source>
- <translation>DVD 菜单(&amp;M)</translation>
+ <location filename="../basegui.cpp" line="1802"/>
+ <source>DVD &amp;menu</source>
+ <translation>DVD 菜单(&amp;M)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1803"/>
- <source>DVD menu, select option</source>
- <translation>DVD 菜单，选项</translation>
+ <location filename="../basegui.cpp" line="1803"/>
+ <source>DVD menu, select option</source>
+ <translation>DVD 菜单，选项</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1804"/>
- <source>DVD &amp;previous menu</source>
- <translation>DVD 前一菜单(&amp;P)</translation>
+ <location filename="../basegui.cpp" line="1804"/>
+ <source>DVD &amp;previous menu</source>
+ <translation>DVD 前一菜单(&amp;P)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1805"/>
- <source>DVD menu, mouse click</source>
- <translation>DVD 菜单，鼠标单击</translation>
+ <location filename="../basegui.cpp" line="1805"/>
+ <source>DVD menu, mouse click</source>
+ <translation>DVD 菜单，鼠标单击</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1809"/>
- <source>&amp;OSD</source>
- <translation>OSD(&amp;O)</translation>
+ <location filename="../basegui.cpp" line="1809"/>
+ <source>&amp;OSD</source>
+ <translation>OSD(&amp;O)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1813"/>
- <source>&amp;View logs</source>
- <translation>查看日志(&amp;V)</translation>
+ <location filename="../basegui.cpp" line="1813"/>
+ <source>&amp;View logs</source>
+ <translation>查看日志(&amp;V)</translation>
 </message>
 <message>
- <source>SMPlayer - mplayer log</source>
- <translation type="obsolete">SMPlayer - MPlayer 日志</translation>
+ <source>SMPlayer - mplayer log</source>
+ <translation>SMPlayer - MPlayer 日志</translation>
 </message>
 <message>
- <source>SMPlayer - smplayer log</source>
- <translation type="obsolete">SMPlayer - SMPlayer 日志</translation>
+ <source>SMPlayer - smplayer log</source>
+ <translation>SMPlayer - SMPlayer 日志</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1838"/>
- <location filename="../basegui.cpp" line="1839"/>
- <location filename="../basegui.cpp" line="1840"/>
- <source>-%1</source>
- <translation>-%1</translation>
+ <location filename="../basegui.cpp" line="1838"/>
+ <location filename="../basegui.cpp" line="1839"/>
+ <location filename="../basegui.cpp" line="1840"/>
+ <source>-%1</source>
+ <translation>-%1</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1842"/>
- <location filename="../basegui.cpp" line="1843"/>
- <location filename="../basegui.cpp" line="1844"/>
- <source>+%1</source>
- <translation>+%1</translation>
+ <location filename="../basegui.cpp" line="1842"/>
+ <location filename="../basegui.cpp" line="1843"/>
+ <location filename="../basegui.cpp" line="1844"/>
+ <source>+%1</source>
+ <translation>+%1</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="2714"/>
- <source>Information</source>
- <translation>信息</translation>
+ <location filename="../basegui.cpp" line="2714"/>
+ <source>Information</source>
+ <translation>信息</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="2715"/>
- <source>You need to restart SMPlayer to use the new GUI.</source>
- <translation>您需要重新启动 SMPlayer 以使用新的图形用户界面。</translation>
+ <location filename="../basegui.cpp" line="2715"/>
+ <source>You need to restart SMPlayer to use the new GUI.</source>
+ <translation>您需要重新启动 SMPlayer 以使用新的图形用户界面。</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="2965"/>
- <location filename="../basegui.cpp" line="2981"/>
- <location filename="../basegui.cpp" line="2997"/>
- <location filename="../basegui.cpp" line="3012"/>
- <location filename="../basegui.cpp" line="3044"/>
- <location filename="../basegui.cpp" line="3064"/>
- <location filename="../basegui.cpp" line="3100"/>
- <source>&lt;empty&gt;</source>
- <translation>&lt;空&gt;</translation>
+ <location filename="../basegui.cpp" line="2965"/>
+ <location filename="../basegui.cpp" line="2981"/>
+ <location filename="../basegui.cpp" line="2997"/>
+ <location filename="../basegui.cpp" line="3012"/>
+ <location filename="../basegui.cpp" line="3044"/>
+ <location filename="../basegui.cpp" line="3064"/>
+ <location filename="../basegui.cpp" line="3100"/>
+ <source>&lt;empty&gt;</source>
+ <translation>&lt;空&gt;</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3468"/>
- <location filename="../basegui.cpp" line="3638"/>
- <location filename="../basegui.cpp" line="3659"/>
- <source>Choose a file</source>
- <translation>选择一个文件</translation>
+ <location filename="../basegui.cpp" line="3468"/>
+ <location filename="../basegui.cpp" line="3638"/>
+ <location filename="../basegui.cpp" line="3659"/>
+ <source>Choose a file</source>
+ <translation>选择一个文件</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3469"/>
- <source>Multimedia</source>
- <translation>多媒体</translation>
+ <location filename="../basegui.cpp" line="3469"/>
+ <source>Multimedia</source>
+ <translation>多媒体</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3470"/>
- <source>Video</source>
- <translation>视频</translation>
+ <location filename="../basegui.cpp" line="3470"/>
+ <source>Video</source>
+ <translation>视频</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3471"/>
- <location filename="../basegui.cpp" line="3661"/>
- <source>Audio</source>
- <translation>音频</translation>
+ <location filename="../basegui.cpp" line="3471"/>
+ <location filename="../basegui.cpp" line="3661"/>
+ <source>Audio</source>
+ <translation>音频</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3472"/>
- <source>Playlists</source>
- <translation>播放列表</translation>
+ <location filename="../basegui.cpp" line="3472"/>
+ <source>Playlists</source>
+ <translation>播放列表</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3473"/>
- <location filename="../basegui.cpp" line="3641"/>
- <location filename="../basegui.cpp" line="3662"/>
- <source>All files</source>
- <translation>所有文件</translation>
+ <location filename="../basegui.cpp" line="3473"/>
+ <location filename="../basegui.cpp" line="3641"/>
+ <location filename="../basegui.cpp" line="3662"/>
+ <source>All files</source>
+ <translation>所有文件</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3520"/>
- <source>SMPlayer - Information</source>
- <translation>SMPlayer - 信息</translation>
+ <location filename="../basegui.cpp" line="3520"/>
+ <source>SMPlayer - Information</source>
+ <translation>SMPlayer - 信息</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3521"/>
- <source>The CDROM / DVD drives are not configured yet.
+ <location filename="../basegui.cpp" line="3521"/>
+ <source>The CDROM / DVD drives are not configured yet.
 The configuration dialog will be shown now, so you can do it.</source>
- <translation>还没有配置 CDROM / DVD 驱动器。
+ <translation>还没有配置 CDROM / DVD 驱动器。
 请单击确定以打开配置对话框来指定您的驱动器。</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3604"/>
- <source>Choose a directory</source>
- <translation>选择一个目录</translation>
+ <location filename="../basegui.cpp" line="3604"/>
+ <source>Choose a directory</source>
+ <translation>选择一个目录</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3640"/>
- <source>Subtitles</source>
- <translation>字幕</translation>
+ <location filename="../basegui.cpp" line="3640"/>
+ <source>Subtitles</source>
+ <translation>字幕</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3677"/>
- <source>SMPlayer command line options</source>
- <translation>SMPlayer 命令行选项</translation>
+ <location filename="../basegui.cpp" line="3677"/>
+ <source>SMPlayer command line options</source>
+ <translation>SMPlayer 命令行选项</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3689"/>
- <source>Donate</source>
- <translation>捐赠</translation>
+ <location filename="../basegui.cpp" line="3689"/>
+ <source>Donate</source>
+ <translation>捐赠</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3690"/>
- <source>If you like SMPlayer, a really good way to support it is by sending a donation, even the smallest one is highly appreciated.</source>
- <translation>如果您喜欢 SMPlayer，通过捐赠来支持它是一个很好的方式，即使是最小的一个捐赠也不胜感激。</translation>
+ <location filename="../basegui.cpp" line="3690"/>
+ <source>If you like SMPlayer, a really good way to support it is by sending a donation, even the smallest one is highly appreciated.</source>
+ <translation>如果您喜欢 SMPlayer，通过捐赠来支持它是一个很好的方式，即使是最小的一个捐赠也不胜感激。</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3691"/>
- <source>You can send your donation using %1.</source>
- <translation>您可以使用 %1 进行捐赠。</translation>
+ <location filename="../basegui.cpp" line="3691"/>
+ <source>You can send your donation using %1.</source>
+ <translation>您可以使用 %1 进行捐赠。</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3691"/>
- <source>this form</source>
- <translation>这种形式</translation>
+ <location filename="../basegui.cpp" line="3691"/>
+ <source>this form</source>
+ <translation>这种形式</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3703"/>
- <source>About Qt</source>
- <translation>关于 Qt</translation>
+ <location filename="../basegui.cpp" line="3703"/>
+ <source>About Qt</source>
+ <translation>关于 Qt</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3708"/>
- <source>&amp;Jump to:</source>
- <translation>跳转到(&amp;J):</translation>
+ <location filename="../basegui.cpp" line="3708"/>
+ <source>&amp;Jump to:</source>
+ <translation>跳转到(&amp;J):</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3709"/>
- <source>SMPlayer - Seek</source>
- <translation>SMPlayer - 定位</translation>
+ <location filename="../basegui.cpp" line="3709"/>
+ <source>SMPlayer - Seek</source>
+ <translation>SMPlayer - 定位</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3719"/>
- <source>SMPlayer - Audio delay</source>
- <translation>SMPlayer - 音频延时</translation>
+ <location filename="../basegui.cpp" line="3719"/>
+ <source>SMPlayer - Audio delay</source>
+ <translation>SMPlayer - 音频延时</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3720"/>
- <source>Audio delay (in milliseconds):</source>
- <translation>音频延时(毫秒):</translation>
+ <location filename="../basegui.cpp" line="3720"/>
+ <source>Audio delay (in milliseconds):</source>
+ <translation>音频延时(毫秒):</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3729"/>
- <source>SMPlayer - Subtitle delay</source>
- <translation>SMPlayer - 字幕延时</translation>
+ <location filename="../basegui.cpp" line="3729"/>
+ <source>SMPlayer - Subtitle delay</source>
+ <translation>SMPlayer - 字幕延时</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3730"/>
- <source>Subtitle delay (in milliseconds):</source>
- <translation>字幕延时(毫秒):</translation>
+ <location filename="../basegui.cpp" line="3730"/>
+ <source>Subtitle delay (in milliseconds):</source>
+ <translation>字幕延时(毫秒):</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3997"/>
- <source>Warning - Using old MPlayer</source>
- <translation>警告 - 正在使用旧的 MPlayer</translation>
+ <location filename="../basegui.cpp" line="3997"/>
+ <source>Warning - Using old MPlayer</source>
+ <translation>警告 - 正在使用旧的 MPlayer</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="3998"/>
- <source>The version of MPlayer (%1) installed on your system is obsolete. SMPlayer can&apos;t work well with it: some options won&apos;t work, subtitle selection may fail...</source>
- <translation>安装在您系统中的 MPlayer (%1) 版本已经过时。SMPlayer 不能和它一起很好地工作: 一些选项将无法工作，字幕选择可能会失效...</translation>
+ <location filename="../basegui.cpp" line="3998"/>
+ <source>The version of MPlayer (%1) installed on your system is obsolete. SMPlayer can&apos;t work well with it: some options won&apos;t work, subtitle selection may fail...</source>
+ <translation>安装在您系统中的 MPlayer (%1) 版本已经过时。SMPlayer 不能和它一起很好地工作: 一些选项将无法工作，字幕选择可能会失效...</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="4003"/>
- <source>Please, update your MPlayer.</source>
- <translation>请更新您的 MPlayer。</translation>
+ <location filename="../basegui.cpp" line="4003"/>
+ <source>Please, update your MPlayer.</source>
+ <translation>请更新您的 MPlayer。</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="4005"/>
- <source>(This warning won&apos;t be displayed anymore)</source>
- <translation>(此警告将不会再显示)</translation>
+ <location filename="../basegui.cpp" line="4005"/>
+ <source>(This warning won&apos;t be displayed anymore)</source>
+ <translation>(此警告将不会再显示)</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="4175"/>
- <source>Playing %1</source>
- <translation>正在播放 %1</translation>
+ <location filename="../basegui.cpp" line="4175"/>
+ <source>Playing %1</source>
+ <translation>正在播放 %1</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="4176"/>
- <source>Pause</source>
- <translation>暂停</translation>
+ <location filename="../basegui.cpp" line="4176"/>
+ <source>Pause</source>
+ <translation>暂停</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="4177"/>
- <source>Stop</source>
- <translation>停止</translation>
+ <location filename="../basegui.cpp" line="4177"/>
+ <source>Stop</source>
+ <translation>停止</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="4297"/>
- <source>Jump to %1</source>
- <translation>跳转到 %1</translation>
+ <location filename="../basegui.cpp" line="4297"/>
+ <source>Jump to %1</source>
+ <translation>跳转到 %1</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="4560"/>
- <source>MPlayer has finished unexpectedly.</source>
- <translation>MPlayer 意外结束。</translation>
+ <location filename="../basegui.cpp" line="4560"/>
+ <source>MPlayer has finished unexpectedly.</source>
+ <translation>MPlayer 意外结束。</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="4561"/>
- <source>Exit code: %1</source>
- <translation>退出代码: %1</translation>
+ <location filename="../basegui.cpp" line="4561"/>
+ <source>Exit code: %1</source>
+ <translation>退出代码: %1</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="4580"/>
- <source>MPlayer failed to start.</source>
- <translation>MPlayer 启动失败。</translation>
+ <location filename="../basegui.cpp" line="4580"/>
+ <source>MPlayer failed to start.</source>
+ <translation>MPlayer 启动失败。</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="4581"/>
- <source>Please check the MPlayer path in preferences.</source>
- <translation>请检查首选项中的 MPlayer 路径。</translation>
+ <location filename="../basegui.cpp" line="4581"/>
+ <source>Please check the MPlayer path in preferences.</source>
+ <translation>请检查首选项中的 MPlayer 路径。</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="4583"/>
- <source>MPlayer has crashed.</source>
- <translation>MPlayer 已经崩溃。</translation>
+ <location filename="../basegui.cpp" line="4583"/>
+ <source>MPlayer has crashed.</source>
+ <translation>MPlayer 已经崩溃。</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="4584"/>
- <source>See the log for more info.</source>
- <translation>查看日志可获取更多信息。</translation>
+ <location filename="../basegui.cpp" line="4584"/>
+ <source>See the log for more info.</source>
+ <translation>查看日志可获取更多信息。</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="4661"/>
- <source>An error happened - SMPlayer</source>
- <translation>发生错误 - SMPlayer</translation>
+ <location filename="../basegui.cpp" line="4661"/>
+ <source>An error happened - SMPlayer</source>
+ <translation>发生错误 - SMPlayer</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="4661"/>
- <source>The YouTube Browser couldn&apos;t be launched</source>
- <translation>YouTube 浏览器无法启动</translation>
+ <location filename="../basegui.cpp" line="4661"/>
+ <source>The YouTube Browser couldn&apos;t be launched</source>
+ <translation>YouTube 浏览器无法启动</translation>
 </message>
 <message>
- <location filename="../basegui.cpp" line="1563"/>
- <source>Check for &amp;updates</source>
- <translation>检查更新(&amp;U)</translation>
+ <location filename="../basegui.cpp" line="1563"/>
+ <source>Check for &amp;updates</source>
+ <translation>检查更新(&amp;U)</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>BaseGuiPlus</name>
 <message>
- <location filename="../baseguiplus.cpp" line="188"/>
- <source>SMPlayer is still running here</source>
- <translation>SMPlayer 仍在运行</translation>
+ <location filename="../baseguiplus.cpp" line="188"/>
+ <source>SMPlayer is still running here</source>
+ <translation>SMPlayer 仍在运行</translation>
 </message>
 <message>
- <location filename="../baseguiplus.cpp" line="208"/>
- <source>&amp;Quit</source>
- <translation>退出(&amp;Q)</translation>
+ <location filename="../baseguiplus.cpp" line="208"/>
+ <source>&amp;Quit</source>
+ <translation>退出(&amp;Q)</translation>
 </message>
 <message>
- <location filename="../baseguiplus.cpp" line="209"/>
- <source>S&amp;how icon in system tray</source>
- <translation>在系统托盘上显示图标(&amp;H)</translation>
+ <location filename="../baseguiplus.cpp" line="209"/>
+ <source>S&amp;how icon in system tray</source>
+ <translation>在系统托盘上显示图标(&amp;H)</translation>
 </message>
 <message>
- <location filename="../baseguiplus.cpp" line="214"/>
- <source>Playlist</source>
- <translation>播放列表</translation>
+ <location filename="../baseguiplus.cpp" line="214"/>
+ <source>Playlist</source>
+ <translation>播放列表</translation>
 </message>
 <message>
- <location filename="../baseguiplus.cpp" line="220"/>
- <source>&amp;Hide</source>
- <translation>隐藏(&amp;H)</translation>
+ <location filename="../baseguiplus.cpp" line="220"/>
+ <source>&amp;Hide</source>
+ <translation>隐藏(&amp;H)</translation>
 </message>
 <message>
- <location filename="../baseguiplus.cpp" line="222"/>
- <source>&amp;Restore</source>
- <translation>还原(&amp;R)</translation>
+ <location filename="../baseguiplus.cpp" line="222"/>
+ <source>&amp;Restore</source>
+ <translation>还原(&amp;R)</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>Core</name>
 <message>
- <location filename="../core.cpp" line="1239"/>
- <source>Screenshot NOT taken, folder not configured</source>
- <translation>无法进行屏幕截图，没有配置文件夹</translation>
+ <location filename="../core.cpp" line="1239"/>
+ <source>Screenshot NOT taken, folder not configured</source>
+ <translation>无法进行屏幕截图，没有配置文件夹</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="1252"/>
- <source>Screenshots NOT taken, folder not configured</source>
- <translation>无法进行自动屏幕截图，没有配置文件夹</translation>
+ <location filename="../core.cpp" line="1252"/>
+ <source>Screenshots NOT taken, folder not configured</source>
+ <translation>无法进行自动屏幕截图，没有配置文件夹</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="2466"/>
- <source>&quot;A&quot; marker set to %1</source>
- <translation>“A”标记设置为 %1</translation>
+ <location filename="../core.cpp" line="2466"/>
+ <source>&quot;A&quot; marker set to %1</source>
+ <translation>“A”标记设置为 %1</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="2483"/>
- <source>&quot;B&quot; marker set to %1</source>
- <translation>“B”标记设置为 %1</translation>
+ <location filename="../core.cpp" line="2483"/>
+ <source>&quot;B&quot; marker set to %1</source>
+ <translation>“B”标记设置为 %1</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="2498"/>
- <source>A-B markers cleared</source>
- <translation>A-B 标记已清除</translation>
+ <location filename="../core.cpp" line="2498"/>
+ <source>A-B markers cleared</source>
+ <translation>A-B 标记已清除</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="2731"/>
- <source>Brightness: %1</source>
- <translation>亮度: %1</translation>
+ <location filename="../core.cpp" line="2731"/>
+ <source>Brightness: %1</source>
+ <translation>亮度: %1</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="2746"/>
- <source>Contrast: %1</source>
- <translation>对比度: %1</translation>
+ <location filename="../core.cpp" line="2746"/>
+ <source>Contrast: %1</source>
+ <translation>对比度: %1</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="2760"/>
- <source>Gamma: %1</source>
- <translation>伽玛: %1</translation>
+ <location filename="../core.cpp" line="2760"/>
+ <source>Gamma: %1</source>
+ <translation>伽玛: %1</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="2774"/>
- <source>Hue: %1</source>
- <translation>色调: %1</translation>
+ <location filename="../core.cpp" line="2774"/>
+ <source>Hue: %1</source>
+ <translation>色调: %1</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="2788"/>
- <source>Saturation: %1</source>
- <translation>饱和度: %1</translation>
+ <location filename="../core.cpp" line="2788"/>
+ <source>Saturation: %1</source>
+ <translation>饱和度: %1</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="2842"/>
- <source>Speed: %1</source>
- <translation>速度: %1</translation>
+ <location filename="../core.cpp" line="2842"/>
+ <source>Speed: %1</source>
+ <translation>速度: %1</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="2917"/>
- <source>Volume: %1</source>
- <translation>音量: %1</translation>
+ <location filename="../core.cpp" line="2917"/>
+ <source>Volume: %1</source>
+ <translation>音量: %1</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="2959"/>
- <source>Subtitle delay: %1 ms</source>
- <translation>字幕延时: %1 毫秒</translation>
+ <location filename="../core.cpp" line="2959"/>
+ <source>Subtitle delay: %1 ms</source>
+ <translation>字幕延时: %1 毫秒</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="2976"/>
- <source>Audio delay: %1 ms</source>
- <translation>音频延时: %1 毫秒</translation>
+ <location filename="../core.cpp" line="2976"/>
+ <source>Audio delay: %1 ms</source>
+ <translation>音频延时: %1 毫秒</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="3033"/>
- <location filename="../core.cpp" line="3045"/>
- <source>Font scale: %1</source>
- <translation>字体比例: %1</translation>
+ <location filename="../core.cpp" line="3033"/>
+ <location filename="../core.cpp" line="3045"/>
+ <source>Font scale: %1</source>
+ <translation>字体比例: %1</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="3088"/>
- <source>Subtitles on</source>
- <translation>开启字幕</translation>
+ <location filename="../core.cpp" line="3088"/>
+ <source>Subtitles on</source>
+ <translation>开启字幕</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="3090"/>
- <source>Subtitles off</source>
- <translation>关闭字幕</translation>
+ <location filename="../core.cpp" line="3090"/>
+ <source>Subtitles off</source>
+ <translation>关闭字幕</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="3552"/>
- <source>Aspect ratio: %1</source>
- <translation>纵横比: %1</translation>
+ <location filename="../core.cpp" line="3552"/>
+ <source>Aspect ratio: %1</source>
+ <translation>纵横比: %1</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="3599"/>
- <source>Mouse wheel seeks now</source>
- <translation>鼠标滚轮即时定位</translation>
+ <location filename="../core.cpp" line="3599"/>
+ <source>Mouse wheel seeks now</source>
+ <translation>鼠标滚轮即时定位</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="3602"/>
- <source>Mouse wheel changes volume now</source>
- <translation>鼠标滚轮即时更改音量</translation>
+ <location filename="../core.cpp" line="3602"/>
+ <source>Mouse wheel changes volume now</source>
+ <translation>鼠标滚轮即时更改音量</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="3605"/>
- <source>Mouse wheel changes zoom level now</source>
- <translation>鼠标滚轮即时更改缩放等级</translation>
+ <location filename="../core.cpp" line="3605"/>
+ <source>Mouse wheel changes zoom level now</source>
+ <translation>鼠标滚轮即时更改缩放等级</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="3608"/>
- <source>Mouse wheel changes speed now</source>
- <translation>鼠标滚轮即时更改速度</translation>
+ <location filename="../core.cpp" line="3608"/>
+ <source>Mouse wheel changes speed now</source>
+ <translation>鼠标滚轮即时更改速度</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="3681"/>
- <source>Zoom: %1</source>
- <translation>缩放: %1</translation>
+ <location filename="../core.cpp" line="3681"/>
+ <source>Zoom: %1</source>
+ <translation>缩放: %1</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="3924"/>
- <source>Updating the font cache. This may take some seconds...</source>
- <translation>正在更新字体缓存。这可能需要几秒钟...</translation>
+ <location filename="../core.cpp" line="3924"/>
+ <source>Updating the font cache. This may take some seconds...</source>
+ <translation>正在更新字体缓存。这可能需要几秒钟...</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="504"/>
- <source>Connecting to %1</source>
- <translation>正在连接到 1%</translation>
+ <location filename="../core.cpp" line="504"/>
+ <source>Connecting to %1</source>
+ <translation>正在连接到 1%</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="508"/>
- <source>Unable to retrieve youtube page</source>
- <translation>无法检索 Youtube 页面</translation>
+ <location filename="../core.cpp" line="508"/>
+ <source>Unable to retrieve youtube page</source>
+ <translation>无法检索 Youtube 页面</translation>
 </message>
 <message>
- <location filename="../core.cpp" line="512"/>
- <source>Unable to locate the url of the video</source>
- <translation>无法确定视频的 URL</translation>
+ <location filename="../core.cpp" line="512"/>
+ <source>Unable to locate the url of the video</source>
+ <translation>无法确定视频的 URL</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>DefaultGui</name>
 <message>
- <location filename="../defaultgui.cpp" line="480"/>
- <source>Welcome to SMPlayer</source>
- <translation>欢迎使用 SMPlayer</translation>
+ <location filename="../defaultgui.cpp" line="480"/>
+ <source>Welcome to SMPlayer</source>
+ <translation>欢迎使用 SMPlayer</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="496"/>
- <source>&amp;Toolbars</source>
- <translation>工具栏(&amp;T)</translation>
+ <location filename="../defaultgui.cpp" line="496"/>
+ <source>&amp;Toolbars</source>
+ <translation>工具栏(&amp;T)</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="499"/>
- <source>Status&amp;bar</source>
- <translation>状态栏(&amp;B)</translation>
+ <location filename="../defaultgui.cpp" line="499"/>
+ <source>Status&amp;bar</source>
+ <translation>状态栏(&amp;B)</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="502"/>
- <source>&amp;Main toolbar</source>
- <translation>主工具栏(&amp;M)</translation>
+ <location filename="../defaultgui.cpp" line="502"/>
+ <source>&amp;Main toolbar</source>
+ <translation>主工具栏(&amp;M)</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="505"/>
- <source>&amp;Language toolbar</source>
- <translation>语言工具栏(&amp;L)</translation>
+ <location filename="../defaultgui.cpp" line="505"/>
+ <source>&amp;Language toolbar</source>
+ <translation>语言工具栏(&amp;L)</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="508"/>
- <source>Audio</source>
- <translation>音频</translation>
+ <location filename="../defaultgui.cpp" line="508"/>
+ <source>Audio</source>
+ <translation>音频</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="509"/>
- <source>Subtitle</source>
- <translation>字幕</translation>
+ <location filename="../defaultgui.cpp" line="509"/>
+ <source>Subtitle</source>
+ <translation>字幕</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="511"/>
- <source>&amp;Video info</source>
- <translation>视频信息(&amp;V)</translation>
+ <location filename="../defaultgui.cpp" line="511"/>
+ <source>&amp;Video info</source>
+ <translation>视频信息(&amp;V)</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="512"/>
- <source>&amp;Frame counter</source>
- <translation>帧计数器(&amp;F)</translation>
+ <location filename="../defaultgui.cpp" line="512"/>
+ <source>&amp;Frame counter</source>
+ <translation>帧计数器(&amp;F)</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="515"/>
- <source>Edit main &amp;toolbar</source>
- <translation>编辑主工具栏(&amp;T)</translation>
+ <location filename="../defaultgui.cpp" line="515"/>
+ <source>Edit main &amp;toolbar</source>
+ <translation>编辑主工具栏(&amp;T)</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="516"/>
- <source>Edit &amp;control bar</source>
- <translation>编辑控制栏(&amp;C)</translation>
+ <location filename="../defaultgui.cpp" line="516"/>
+ <source>Edit &amp;control bar</source>
+ <translation>编辑控制栏(&amp;C)</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="517"/>
- <source>Edit m&amp;ini control bar</source>
- <translation>编译迷你控制栏(&amp;I)</translation>
+ <location filename="../defaultgui.cpp" line="517"/>
+ <source>Edit m&amp;ini control bar</source>
+ <translation>编译迷你控制栏(&amp;I)</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="518"/>
- <source>Edit &amp;floating control</source>
- <translation>编辑浮动控件(&amp;F)</translation>
+ <location filename="../defaultgui.cpp" line="518"/>
+ <source>Edit &amp;floating control</source>
+ <translation>编辑浮动控件(&amp;F)</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="536"/>
- <source>A:%1</source>
- <translation>A:%1</translation>
+ <location filename="../defaultgui.cpp" line="536"/>
+ <source>A:%1</source>
+ <translation>A:%1</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="540"/>
- <source>B:%1</source>
- <translation>B:%1</translation>
+ <location filename="../defaultgui.cpp" line="540"/>
+ <source>B:%1</source>
+ <translation>B:%1</translation>
 </message>
 <message>
- <location filename="../defaultgui.cpp" line="549"/>
- <source>%1x%2 %3 fps</source>
- <comment>width + height + fps</comment>
- <translation>%1x%2 %3帧</translation>
+ <location filename="../defaultgui.cpp" line="549"/>
+ <source>%1x%2 %3 fps</source>
+ <comment>width + height + fps</comment>
+ <translation>%1x%2 %3帧</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>EqSlider</name>
 <message>
- <location filename="../eqslider.ui" line="22"/>
- <source>icon</source>
- <translation>icon</translation>
+ <location filename="../eqslider.ui" line="22"/>
+ <source>icon</source>
+ <translation>icon</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>ErrorDialog</name>
 <message>
- <location filename="../errordialog.ui" line="13"/>
- <source>MPlayer Error</source>
- <translation>MPlayer 错误</translation>
+ <location filename="../errordialog.ui" line="13"/>
+ <source>MPlayer Error</source>
+ <translation>MPlayer 错误</translation>
 </message>
 <message>
- <location filename="../errordialog.ui" line="41"/>
- <source>icon</source>
- <translation>icon</translation>
+ <location filename="../errordialog.ui" line="41"/>
+ <source>icon</source>
+ <translation>icon</translation>
 </message>
 <message>
- <location filename="../errordialog.ui" line="67"/>
- <source>Error</source>
- <translation>错误</translation>
+ <location filename="../errordialog.ui" line="67"/>
+ <source>Error</source>
+ <translation>错误</translation>
 </message>
 <message>
- <location filename="../errordialog.ui" line="87"/>
- <location filename="../errordialog.cpp" line="57"/>
- <source>Show log</source>
- <translation>显示日志</translation>
+ <location filename="../errordialog.ui" line="87"/>
+ <location filename="../errordialog.cpp" line="57"/>
+ <source>Show log</source>
+ <translation>显示日志</translation>
 </message>
 <message>
- <location filename="../errordialog.cpp" line="55"/>
- <source>Hide log</source>
- <translation>隐藏日志</translation>
+ <location filename="../errordialog.cpp" line="55"/>
+ <source>Hide log</source>
+ <translation>隐藏日志</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>FavoriteEditor</name>
 <message>
- <location filename="../favoriteeditor.ui" line="18"/>
- <source>icon</source>
- <translation>icon</translation>
+ <location filename="../favoriteeditor.ui" line="18"/>
+ <source>icon</source>
+ <translation>icon</translation>
 </message>
 <message>
- <location filename="../favoriteeditor.ui" line="34"/>
- <location filename="../favoriteeditor.cpp" line="109"/>
- <location filename="../favoriteeditor.cpp" line="168"/>
- <location filename="../favoriteeditor.cpp" line="268"/>
- <source>Favorite list</source>
- <translation>收藏列表</translation>
+ <location filename="../favoriteeditor.ui" line="34"/>
+ <location filename="../favoriteeditor.cpp" line="109"/>
+ <location filename="../favoriteeditor.cpp" line="168"/>
+ <location filename="../favoriteeditor.cpp" line="268"/>
+ <source>Favorite list</source>
+ <translation>收藏列表</translation>
 </message>
 <message>
- <location filename="../favoriteeditor.ui" line="51"/>
- <source>&amp;New item</source>
- <translation>新建项目(&amp;N)</translation>
+ <location filename="../favoriteeditor.ui" line="51"/>
+ <source>&amp;New item</source>
+ <translation>新建项目(&amp;N)</translation>
 </message>
 <message>
- <location filename="../favoriteeditor.ui" line="71"/>
- <source>D&amp;elete</source>
- <translation>删除(&amp;E)</translation>
+ <location filename="../favoriteeditor.ui" line="71"/>
+ <source>D&amp;elete</source>
+ <translation>删除(&amp;E)</translation>
 </message>
 <message>
- <location filename="../favoriteeditor.ui" line="78"/>
- <source>&amp;Up</source>
- <translation>向上(&amp;U)</translation>
+ <location filename="../favoriteeditor.ui" line="78"/>
+ <source>&amp;Up</source>
+ <translation>向上(&amp;U)</translation>
 </message>
 <message>
- <location filename="../favoriteeditor.ui" line="85"/>
- <source>New &amp;submenu</source>
- <translation>新建子菜单(&amp;S)</translation>
+ <location filename="../favoriteeditor.ui" line="85"/>
+ <source>New &amp;submenu</source>
+ <translation>新建子菜单(&amp;S)</translation>
 </message>
 <message>
- <location filename="../favoriteeditor.ui" line="105"/>
- <source>Delete &amp;all</source>
- <translation>删除全部(&amp;A)</translation>
+ <location filename="../favoriteeditor.ui" line="105"/>
+ <source>Delete &amp;all</source>
+ <translation>删除全部(&amp;A)</translation>
 </message>
 <message>
- <location filename="../favoriteeditor.ui" line="112"/>
- <source>&amp;Down</source>
- <translation>向下(&amp;D)</translation>
+ <location filename="../favoriteeditor.ui" line="112"/>
+ <source>&amp;Down</source>
+ <translation>向下(&amp;D)</translation>
 </message>
 <message>
- <location filename="../favoriteeditor.cpp" line="94"/>
- <source>Icon</source>
- <translation>图标</translation>
+ <location filename="../favoriteeditor.cpp" line="94"/>
+ <source>Icon</source>
+ <translation>图标</translation>
 </message>
 <message>
- <location filename="../favoriteeditor.cpp" line="94"/>
- <source>Name</source>
- <translation>名称</translation>
+ <location filename="../favoriteeditor.cpp" line="94"/>
+ <source>Name</source>
+ <translation>名称</translation>
 </message>
 <message>
- <location filename="../favoriteeditor.cpp" line="94"/>
- <source>Media</source>
- <translation>媒体</translation>
+ <location filename="../favoriteeditor.cpp" line="94"/>
+ <source>Media</source>
+ <translation>媒体</translation>
 </message>
 <message>
- <location filename="../favoriteeditor.cpp" line="107"/>
- <source>Favorite editor</source>
- <translation>收藏编辑器</translation>
+ <location filename="../favoriteeditor.cpp" line="107"/>
+ <source>Favorite editor</source>
+ <translation>收藏编辑器</translation>
 </message>
 <message>
- <location filename="../favoriteeditor.cpp" line="110"/>
- <source>You can edit, delete, sort or add new items. Double click on a cell to edit its contents.</source>
- <translation>您可以编辑、删除、排序或添加新的项目。双击一个单元格可以编辑其内容。</translation>
+ <location filename="../favoriteeditor.cpp" line="110"/>
+ <source>You can edit, delete, sort or add new items. Double click on a cell to edit its contents.</source>
+ <translation>您可以编辑、删除、排序或添加新的项目。双击一个单元格可以编辑其内容。</translation>
 </message>
 <message>
- <location filename="../favoriteeditor.cpp" line="341"/>
- <source>Select an icon file</source>
- <translation>选择一个图标文件</translation>
+ <location filename="../favoriteeditor.cpp" line="341"/>
+ <source>Select an icon file</source>
+ <translation>选择一个图标文件</translation>
 </message>
 <message>
- <location filename="../favoriteeditor.cpp" line="343"/>
- <source>Images</source>
- <translation>图像</translation>
+ <location filename="../favoriteeditor.cpp" line="343"/>
+ <source>Images</source>
+ <translation>图像</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>Favorites</name>
 <message>
- <location filename="../favorites.cpp" line="89"/>
- <source>&amp;Edit...</source>
- <translation>编辑(&amp;E)...</translation>
+ <location filename="../favorites.cpp" line="89"/>
+ <source>&amp;Edit...</source>
+ <translation>编辑(&amp;E)...</translation>
 </message>
 <message>
- <location filename="../favorites.cpp" line="90"/>
- <source>&amp;Jump...</source>
- <translation>跳转(&amp;J)...</translation>
+ <location filename="../favorites.cpp" line="90"/>
+ <source>&amp;Jump...</source>
+ <translation>跳转(&amp;J)...</translation>
 </message>
 <message>
- <location filename="../favorites.cpp" line="91"/>
- <source>&amp;Next</source>
- <translation>下一个(&amp;N)</translation>
+ <location filename="../favorites.cpp" line="91"/>
+ <source>&amp;Next</source>
+ <translation>下一个(&amp;N)</translation>
 </message>
 <message>
- <location filename="../favorites.cpp" line="92"/>
- <source>&amp;Previous</source>
- <translation>上一个(&amp;P)</translation>
+ <location filename="../favorites.cpp" line="92"/>
+ <source>&amp;Previous</source>
+ <translation>上一个(&amp;P)</translation>
 </message>
 <message>
- <location filename="../favorites.cpp" line="93"/>
- <source>&amp;Add current media</source>
- <translation>添加当前媒体(&amp;A)</translation>
+ <location filename="../favorites.cpp" line="93"/>
+ <source>&amp;Add current media</source>
+ <translation>添加当前媒体(&amp;A)</translation>
 </message>
 <message>
- <location filename="../favorites.cpp" line="348"/>
- <source>Jump to item</source>
- <translation>跳转到项目</translation>
+ <location filename="../favorites.cpp" line="348"/>
+ <source>Jump to item</source>
+ <translation>跳转到项目</translation>
 </message>
 <message>
- <location filename="../favorites.cpp" line="349"/>
- <source>Enter the number of the item in the list to jump:</source>
- <translation>输入需要在列表中跳转到的项目序号:</translation>
+ <location filename="../favorites.cpp" line="349"/>
+ <source>Enter the number of the item in the list to jump:</source>
+ <translation>输入需要在列表中跳转到的项目序号:</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>FileChooser</name>
 <message>
- <location filename="../filechooser.cpp" line="54"/>
- <source>Click to select a file or folder</source>
- <translation>单击选择一个文件或文件夹</translation>
+ <location filename="../filechooser.cpp" line="54"/>
+ <source>Click to select a file or folder</source>
+ <translation>单击选择一个文件或文件夹</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>FileDownloader</name>
 <message>
- <location filename="../findsubtitles/filedownloader/filedownloader.cpp" line="40"/>
- <source>Downloading...</source>
- <translation>正在下载...</translation>
+ <location filename="../findsubtitles/filedownloader/filedownloader.cpp" line="40"/>
+ <source>Downloading...</source>
+ <translation>正在下载...</translation>
 </message>
 <message>
- <location filename="../findsubtitles/filedownloader/filedownloader.cpp" line="66"/>
- <source>Downloading %1</source>
- <translation>正在下载 %1</translation>
+ <location filename="../findsubtitles/filedownloader/filedownloader.cpp" line="66"/>
+ <source>Downloading %1</source>
+ <translation>正在下载 %1</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>FilePropertiesDialog</name>
 <message>
- <location filename="../filepropertiesdialog.ui" line="14"/>
- <source>SMPlayer - File properties</source>
- <translation>SMPlayer - 文件属性</translation>
+ <location filename="../filepropertiesdialog.ui" line="14"/>
+ <source>SMPlayer - File properties</source>
+ <translation>SMPlayer - 文件属性</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="33"/>
- <source>&amp;Information</source>
- <translation>信息(&amp;I)</translation>
+ <location filename="../filepropertiesdialog.ui" line="33"/>
+ <source>&amp;Information</source>
+ <translation>信息(&amp;I)</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="53"/>
- <source>&amp;Demuxer</source>
- <translation>分离器(&amp;D)</translation>
+ <location filename="../filepropertiesdialog.ui" line="53"/>
+ <source>&amp;Demuxer</source>
+ <translation>分离器(&amp;D)</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="65"/>
- <source>&amp;Select the demuxer that will be used for this file:</source>
- <translation>选择将用于该文件的分离器(&amp;S):</translation>
+ <location filename="../filepropertiesdialog.ui" line="65"/>
+ <source>&amp;Select the demuxer that will be used for this file:</source>
+ <translation>选择将用于该文件的分离器(&amp;S):</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="105"/>
- <location filename="../filepropertiesdialog.ui" line="167"/>
- <location filename="../filepropertiesdialog.ui" line="229"/>
- <source>&amp;Reset</source>
- <translation>重置(&amp;R)</translation>
+ <location filename="../filepropertiesdialog.ui" line="105"/>
+ <location filename="../filepropertiesdialog.ui" line="167"/>
+ <location filename="../filepropertiesdialog.ui" line="229"/>
+ <source>&amp;Reset</source>
+ <translation>重置(&amp;R)</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="115"/>
- <source>&amp;Video codec</source>
- <translation>视频编解码器(&amp;V)</translation>
+ <location filename="../filepropertiesdialog.ui" line="115"/>
+ <source>&amp;Video codec</source>
+ <translation>视频编解码器(&amp;V)</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="127"/>
- <source>&amp;Select the video codec:</source>
- <translation>选择视频编解码器(&amp;S):</translation>
+ <location filename="../filepropertiesdialog.ui" line="127"/>
+ <source>&amp;Select the video codec:</source>
+ <translation>选择视频编解码器(&amp;S):</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="177"/>
- <source>A&amp;udio codec</source>
- <translation>音频编解码器(&amp;U)</translation>
+ <location filename="../filepropertiesdialog.ui" line="177"/>
+ <source>A&amp;udio codec</source>
+ <translation>音频编解码器(&amp;U)</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="189"/>
- <source>&amp;Select the audio codec:</source>
- <translation>选择音频编解码器(&amp;S):</translation>
+ <location filename="../filepropertiesdialog.ui" line="189"/>
+ <source>&amp;Select the audio codec:</source>
+ <translation>选择音频编解码器(&amp;S):</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="239"/>
- <source>&amp;MPlayer options</source>
- <translation>MPlayer 选项(&amp;M)</translation>
+ <location filename="../filepropertiesdialog.ui" line="239"/>
+ <source>&amp;MPlayer options</source>
+ <translation>MPlayer 选项(&amp;M)</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="251"/>
- <source>Additional Options for MPlayer</source>
- <translation>MPlayer 附加选项</translation>
+ <location filename="../filepropertiesdialog.ui" line="251"/>
+ <source>Additional Options for MPlayer</source>
+ <translation>MPlayer 附加选项</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="263"/>
- <source>Here you can pass extra options to MPlayer.
+ <location filename="../filepropertiesdialog.ui" line="263"/>
+ <source>Here you can pass extra options to MPlayer.
 Write them separated by spaces.
 Example: -flip -nosound</source>
- <translation>在这里您可以传送附加选项至 MPlayer。
+ <translation>在这里您可以传送附加选项至 MPlayer。
 请用空格分开写入它们。
 实例: -flip -nosound</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="286"/>
- <source>&amp;Options:</source>
- <translation>选项(&amp;O):</translation>
+ <location filename="../filepropertiesdialog.ui" line="286"/>
+ <source>&amp;Options:</source>
+ <translation>选项(&amp;O):</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="325"/>
- <source>You can also pass additional video filters.
+ <location filename="../filepropertiesdialog.ui" line="325"/>
+ <source>You can also pass additional video filters.
 Separate them with &quot;,&quot;. Do not use spaces!
 Example: scale=512:-2,eq2=1.1</source>
- <translation>您还可以传送附加的视频过滤器。
+ <translation>您还可以传送附加的视频过滤器。
 请用“,”分隔它们。不要使用空格!
 实例: scale=512:-2,eq2=1.1</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="348"/>
- <source>V&amp;ideo filters:</source>
- <translation>视频过滤器(&amp;I):</translation>
+ <location filename="../filepropertiesdialog.ui" line="348"/>
+ <source>V&amp;ideo filters:</source>
+ <translation>视频过滤器(&amp;I):</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="387"/>
- <source>And finally audio filters. Same rule as for video filters.
+ <location filename="../filepropertiesdialog.ui" line="387"/>
+ <source>And finally audio filters. Same rule as for video filters.
 Example: resample=44100:0:0,volnorm</source>
- <translation>最后是音频过滤器。和视频过滤器的规则一样。
+ <translation>最后是音频过滤器。和视频过滤器的规则一样。
 实例: resample=44100:0:0,volnorm</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.ui" line="409"/>
- <source>Audio &amp;filters:</source>
- <translation>音频过滤器(&amp;F):</translation>
+ <location filename="../filepropertiesdialog.ui" line="409"/>
+ <source>Audio &amp;filters:</source>
+ <translation>音频过滤器(&amp;F):</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.cpp" line="70"/>
- <source>OK</source>
- <translation>确定</translation>
+ <location filename="../filepropertiesdialog.cpp" line="70"/>
+ <source>OK</source>
+ <translation>确定</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.cpp" line="71"/>
- <source>Cancel</source>
- <translation>取消</translation>
+ <location filename="../filepropertiesdialog.cpp" line="71"/>
+ <source>Cancel</source>
+ <translation>取消</translation>
 </message>
 <message>
- <location filename="../filepropertiesdialog.cpp" line="72"/>
- <source>Apply</source>
- <translation>应用</translation>
+ <location filename="../filepropertiesdialog.cpp" line="72"/>
+ <source>Apply</source>
+ <translation>应用</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>Filters</name>
 <message>
- <source>add noise</source>
- <translation type="obsolete">添加噪点</translation>
+ <source>add noise</source>
+ <translation>添加噪点</translation>
 </message>
 <message>
- <source>deblock</source>
- <translation type="obsolete">去块</translation>
+ <source>deblock</source>
+ <translation>去块</translation>
 </message>
 <message>
- <source>gradfun</source>
- <translation type="obsolete">Gradfun</translation>
+ <source>gradfun</source>
+ <translation>Gradfun</translation>
 </message>
 <message>
- <source>normal denoise</source>
- <translation type="obsolete">降噪(普通)</translation>
+ <source>normal denoise</source>
+ <translation>降噪(普通)</translation>
 </message>
 <message>
- <source>soft denoise</source>
- <translation type="obsolete">降噪(软件)</translation>
+ <source>soft denoise</source>
+ <translation>降噪(软件)</translation>
 </message>
 <message>
- <source>blur</source>
- <translation type="obsolete">模糊</translation>
+ <source>blur</source>
+ <translation>模糊</translation>
 </message>
 <message>
- <source>sharpen</source>
- <translation type="obsolete">锐化</translation>
+ <source>sharpen</source>
+ <translation>锐化</translation>
 </message>
 <message>
- <source>volume normalization</source>
- <translation type="obsolete">音量标准化</translation>
+ <source>volume normalization</source>
+ <translation>音量标准化</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>FindSubtitlesConfigDialog</name>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="14"/>
- <source>Advanced options</source>
- <translation>高级选项</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="14"/>
+ <source>Advanced options</source>
+ <translation>高级选项</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="20"/>
- <source>Server</source>
- <translation>服务器</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="20"/>
+ <source>Server</source>
+ <translation>服务器</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="26"/>
- <source>&amp;Opensubtitles server:</source>
- <translation>Opensubtitles 服务器(&amp;O):</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="26"/>
+ <source>&amp;Opensubtitles server:</source>
+ <translation>Opensubtitles 服务器(&amp;O):</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="42"/>
- <source>Proxy</source>
- <translation>代理</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="42"/>
+ <source>Proxy</source>
+ <translation>代理</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="48"/>
- <source>&amp;Enable proxy</source>
- <translation>启用代理(&amp;E)</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="48"/>
+ <source>&amp;Enable proxy</source>
+ <translation>启用代理(&amp;E)</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="61"/>
- <source>&amp;Host:</source>
- <translation>主机(&amp;H):</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="61"/>
+ <source>&amp;Host:</source>
+ <translation>主机(&amp;H):</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="74"/>
- <source>&amp;Port:</source>
- <translation>端口(&amp;P):</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="74"/>
+ <source>&amp;Port:</source>
+ <translation>端口(&amp;P):</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="94"/>
- <source>&amp;Username:</source>
- <translation>用户名(&amp;U):</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="94"/>
+ <source>&amp;Username:</source>
+ <translation>用户名(&amp;U):</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="107"/>
- <source>Pa&amp;ssword:</source>
- <translation>密码(&amp;S):</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="107"/>
+ <source>Pa&amp;ssword:</source>
+ <translation>密码(&amp;S):</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="124"/>
- <source>&amp;Type:</source>
- <translation>类型(&amp;T):</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.ui" line="124"/>
+ <source>&amp;Type:</source>
+ <translation>类型(&amp;T):</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="27"/>
- <source>Http</source>
- <translation>Http</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="27"/>
+ <source>Http</source>
+ <translation>Http</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="28"/>
- <source>Socks5</source>
- <translation>Socks5</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="28"/>
+ <source>Socks5</source>
+ <translation>Socks5</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="30"/>
- <source>Enable/disable the use of the proxy.</source>
- <translation>启用/禁用代理。</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="30"/>
+ <source>Enable/disable the use of the proxy.</source>
+ <translation>启用/禁用代理。</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="31"/>
- <source>The host name of the proxy.</source>
- <translation>代理服务器的主机名。</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="31"/>
+ <source>The host name of the proxy.</source>
+ <translation>代理服务器的主机名。</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="32"/>
- <source>The port of the proxy.</source>
- <translation>代理服务器的端口。</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="32"/>
+ <source>The port of the proxy.</source>
+ <translation>代理服务器的端口。</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="33"/>
- <source>If the proxy requires authentication, this sets the username.</source>
- <translation>如果代理需要身份验证，在此设置用户名。</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="33"/>
+ <source>If the proxy requires authentication, this sets the username.</source>
+ <translation>如果代理需要身份验证，在此设置用户名。</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="35"/>
- <source>The password for the proxy. &lt;b&gt;Warning:&lt;/b&gt; the password will be saved as plain text in the configuration file.</source>
- <translation>代理的密码。&lt;b&gt;警告:&lt;/b&gt; 密码将被作为纯文本保存在配置文件中。</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="35"/>
+ <source>The password for the proxy. &lt;b&gt;Warning:&lt;/b&gt; the password will be saved as plain text in the configuration file.</source>
+ <translation>代理的密码。&lt;b&gt;警告:&lt;/b&gt; 密码将被作为纯文本保存在配置文件中。</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="37"/>
- <source>Select the proxy type to be used.</source>
- <translation>选择要使用的代理的类型。</translation>
+ <location filename="../findsubtitles/findsubtitlesconfigdialog.cpp" line="37"/>
+ <source>Select the proxy type to be used.</source>
+ <translation>选择要使用的代理的类型。</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>FindSubtitlesWindow</name>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.ui" line="13"/>
- <source>Find Subtitles</source>
- <translation>查找字幕</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.ui" line="13"/>
+ <source>Find Subtitles</source>
+ <translation>查找字幕</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.ui" line="51"/>
- <source>&amp;Subtitles for</source>
- <translation>字幕用于(&amp;S)</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.ui" line="51"/>
+ <source>&amp;Subtitles for</source>
+ <translation>字幕用于(&amp;S)</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.ui" line="86"/>
- <source>&amp;Language:</source>
- <translation>语言(&amp;L):</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.ui" line="86"/>
+ <source>&amp;Language:</source>
+ <translation>语言(&amp;L):</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.ui" line="116"/>
- <source>&amp;Options</source>
- <translation>选项(&amp;O)</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.ui" line="116"/>
+ <source>&amp;Options</source>
+ <translation>选项(&amp;O)</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.ui" line="126"/>
- <source>&amp;Refresh</source>
- <translation>刷新(&amp;R)</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.ui" line="126"/>
+ <source>&amp;Refresh</source>
+ <translation>刷新(&amp;R)</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.ui" line="136"/>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="239"/>
- <source>&amp;Download</source>
- <translation>下载(&amp;D)</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.ui" line="136"/>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="239"/>
+ <source>&amp;Download</source>
+ <translation>下载(&amp;D)</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="199"/>
- <source>Language</source>
- <translation>语言</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="199"/>
+ <source>Language</source>
+ <translation>语言</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="199"/>
- <source>Name</source>
- <translation>名称</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="199"/>
+ <source>Name</source>
+ <translation>名称</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="199"/>
- <source>Format</source>
- <translation>格式</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="199"/>
+ <source>Format</source>
+ <translation>格式</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="200"/>
- <source>Files</source>
- <translation>文件</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="200"/>
+ <source>Files</source>
+ <translation>文件</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="200"/>
- <source>Date</source>
- <translation>日期</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="200"/>
+ <source>Date</source>
+ <translation>日期</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="200"/>
- <source>Uploaded by</source>
- <translation>上传者</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="200"/>
+ <source>Uploaded by</source>
+ <translation>上传者</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="215"/>
- <source>Portuguese - Brasil</source>
- <translation type="unfinished"></translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="215"/>
+ <source>Portuguese - Brasil</source>
+ <translation>葡萄牙语 - 巴西</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="228"/>
- <source>All</source>
- <translation>全部</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="228"/>
+ <source>All</source>
+ <translation>全部</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="235"/>
- <source>Close</source>
- <translation>关闭</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="235"/>
+ <source>Close</source>
+ <translation>关闭</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="240"/>
- <source>&amp;Copy link to clipboard</source>
- <translation>复制链接到剪贴板(&amp;C)</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="240"/>
+ <source>&amp;Copy link to clipboard</source>
+ <translation>复制链接到剪贴板(&amp;C)</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="319"/>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="490"/>
- <source>Download failed</source>
- <translation>下载失败</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="319"/>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="490"/>
+ <source>Download failed</source>
+ <translation>下载失败</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="321"/>
- <source>Error</source>
- <translation>错误</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="321"/>
+ <source>Error</source>
+ <translation>错误</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="322"/>
- <source>Download failed: %1.</source>
- <translation>下载失败: %1。</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="322"/>
+ <source>Download failed: %1.</source>
+ <translation>下载失败: %1。</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="327"/>
- <source>Connecting to %1...</source>
- <translation>正在连接到 %1 ...</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="327"/>
+ <source>Connecting to %1...</source>
+ <translation>正在连接到 %1 ...</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="333"/>
- <source>Downloading...</source>
- <translation>正在下载...</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="333"/>
+ <source>Downloading...</source>
+ <translation>正在下载...</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="341"/>
- <source>Done.</source>
- <translation>完成。</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="341"/>
+ <source>Done.</source>
+ <translation>完成。</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="387"/>
- <source>%1 files available</source>
- <translation>%1 个文件可用</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="387"/>
+ <source>%1 files available</source>
+ <translation>%1 个文件可用</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="396"/>
- <source>Failed to parse the received data.</source>
- <translation>无法分析接收到的数据。</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="396"/>
+ <source>Failed to parse the received data.</source>
+ <translation>无法分析接收到的数据。</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="474"/>
- <source>Temporary file %1</source>
- <translation>临时文件 %1</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="474"/>
+ <source>Temporary file %1</source>
+ <translation>临时文件 %1</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="496"/>
- <source>Error saving file</source>
- <translation>保存文件时出错</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="496"/>
+ <source>Error saving file</source>
+ <translation>保存文件时出错</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="497"/>
- <source>It wasn&apos;t possible to save the downloaded
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="497"/>
+ <source>It wasn&apos;t possible to save the downloaded
 file in folder %1
 Please check the permissions of that folder.</source>
- <translation>无法将下载的文件保存到文件夹
+ <translation>无法将下载的文件保存到文件夹
 %1
 请检查该文件夹的权限。</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="541"/>
- <source>Subtitle saved as %1</source>
- <translation>字幕被保存为 %1</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="541"/>
+ <source>Subtitle saved as %1</source>
+ <translation>字幕被保存为 %1</translation>
 </message>
 <message numerus="yes">
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="564"/>
- <source>%n subtitle(s) extracted</source>
- <translation type="unfinished">
- <numerusform></numerusform>
- </translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="564"/>
+ <source>%n subtitle(s) extracted</source>
+ <translation>
+ <numerusform>%n 个字幕被提取</numerusform>
+ </translation>
 </message>
 <message numerus="yes">
- <source>%1 subtitle(s) extracted</source>
- <translation type="obsolete">
- <numerusform>%1 个字幕被提取</numerusform>
- </translation>
+ <source>%1 subtitle(s) extracted</source>
+ <translation>
+ <numerusform>%1 个字幕被提取</numerusform>
+ </translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="578"/>
- <source>Overwrite?</source>
- <translation>是否覆盖?</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="578"/>
+ <source>Overwrite?</source>
+ <translation>是否覆盖?</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="579"/>
- <source>The file %1 already exits, overwrite?</source>
- <translation>文件 %1 己存在，是否覆盖?</translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="579"/>
+ <source>The file %1 already exits, overwrite?</source>
+ <translation>文件 %1 己存在，是否覆盖?</translation>
 </message>
 <message>
- <location filename="../findsubtitles/findsubtitleswindow.cpp" line="623"/>
- <source>Error fixing the subtitle lines</source>
- <translation type="unfinished"></translation>
+ <location filename="../findsubtitles/findsubtitleswindow.cpp" line="623"/>
+ <source>Error fixing the subtitle lines</source>
+ <translation>修复字幕线错误</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>InfoFile</name>
 <message>
- <location filename="../infofile.cpp" line="62"/>
- <source>General</source>
- <translation>常规</translation>
+ <location filename="../infofile.cpp" line="62"/>
+ <source>General</source>
+ <translation>常规</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="65"/>
- <source>File</source>
- <translation>文件</translation>
+ <location filename="../infofile.cpp" line="65"/>
+ <source>File</source>
+ <translation>文件</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="66"/>
- <source>Size</source>
- <translation>大小</translation>
+ <location filename="../infofile.cpp" line="66"/>
+ <source>Size</source>
+ <translation>大小</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="66"/>
- <source>%1 KB (%2 MB)</source>
- <translation>%1 KB (%2 MB)</translation>
+ <location filename="../infofile.cpp" line="66"/>
+ <source>%1 KB (%2 MB)</source>
+ <translation>%1 KB (%2 MB)</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="70"/>
- <source>URL</source>
- <translation>URL 地址</translation>
+ <location filename="../infofile.cpp" line="70"/>
+ <source>URL</source>
+ <translation>URL 地址</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="72"/>
- <source>Length</source>
- <translation>长度</translation>
+ <location filename="../infofile.cpp" line="72"/>
+ <source>Length</source>
+ <translation>长度</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="73"/>
- <source>Demuxer</source>
- <translation>分离器</translation>
+ <location filename="../infofile.cpp" line="73"/>
+ <source>Demuxer</source>
+ <translation>分离器</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="78"/>
- <location filename="../infofile.cpp" line="124"/>
- <location filename="../infofile.cpp" line="149"/>
- <source>Name</source>
- <translation>名称</translation>
+ <location filename="../infofile.cpp" line="78"/>
+ <location filename="../infofile.cpp" line="124"/>
+ <location filename="../infofile.cpp" line="149"/>
+ <source>Name</source>
+ <translation>名称</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="79"/>
- <source>Artist</source>
- <translation>艺术家</translation>
+ <location filename="../infofile.cpp" line="79"/>
+ <source>Artist</source>
+ <translation>艺术家</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="80"/>
- <source>Author</source>
- <translation>作者</translation>
+ <location filename="../infofile.cpp" line="80"/>
+ <source>Author</source>
+ <translation>作者</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="81"/>
- <source>Album</source>
- <translation>专辑</translation>
+ <location filename="../infofile.cpp" line="81"/>
+ <source>Album</source>
+ <translation>专辑</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="82"/>
- <source>Genre</source>
- <translation>流派</translation>
+ <location filename="../infofile.cpp" line="82"/>
+ <source>Genre</source>
+ <translation>流派</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="83"/>
- <source>Date</source>
- <translation>日期</translation>
+ <location filename="../infofile.cpp" line="83"/>
+ <source>Date</source>
+ <translation>日期</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="84"/>
- <source>Track</source>
- <translation>音轨</translation>
+ <location filename="../infofile.cpp" line="84"/>
+ <source>Track</source>
+ <translation>音轨</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="85"/>
- <source>Copyright</source>
- <translation>版权</translation>
+ <location filename="../infofile.cpp" line="85"/>
+ <source>Copyright</source>
+ <translation>版权</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="86"/>
- <source>Comment</source>
- <translation>注释</translation>
+ <location filename="../infofile.cpp" line="86"/>
+ <source>Comment</source>
+ <translation>注释</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="87"/>
- <source>Software</source>
- <translation>软件</translation>
+ <location filename="../infofile.cpp" line="87"/>
+ <source>Software</source>
+ <translation>软件</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="88"/>
- <source>Stream title</source>
- <translation>流标题</translation>
+ <location filename="../infofile.cpp" line="88"/>
+ <source>Stream title</source>
+ <translation>流标题</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="89"/>
- <source>Stream URL</source>
- <translation>流 URL 地址</translation>
+ <location filename="../infofile.cpp" line="89"/>
+ <source>Stream URL</source>
+ <translation>流 URL 地址</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="92"/>
- <source>Clip info</source>
- <translation>剪辑信息</translation>
+ <location filename="../infofile.cpp" line="92"/>
+ <source>Clip info</source>
+ <translation>剪辑信息</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="99"/>
- <source>Video</source>
- <translation>视频</translation>
+ <location filename="../infofile.cpp" line="99"/>
+ <source>Video</source>
+ <translation>视频</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="100"/>
- <source>Resolution</source>
- <translation>分辨率</translation>
+ <location filename="../infofile.cpp" line="100"/>
+ <source>Resolution</source>
+ <translation>分辨率</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="101"/>
- <source>Aspect ratio</source>
- <translation>纵横比</translation>
+ <location filename="../infofile.cpp" line="101"/>
+ <source>Aspect ratio</source>
+ <translation>纵横比</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="102"/>
- <location filename="../infofile.cpp" line="111"/>
- <source>Format</source>
- <translation>格式</translation>
+ <location filename="../infofile.cpp" line="102"/>
+ <location filename="../infofile.cpp" line="111"/>
+ <source>Format</source>
+ <translation>格式</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="103"/>
- <location filename="../infofile.cpp" line="112"/>
- <source>Bitrate</source>
- <translation>比特率</translation>
+ <location filename="../infofile.cpp" line="103"/>
+ <location filename="../infofile.cpp" line="112"/>
+ <source>Bitrate</source>
+ <translation>比特率</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="103"/>
- <location filename="../infofile.cpp" line="112"/>
- <source>%1 kbps</source>
- <translation>%1 kbps</translation>
+ <location filename="../infofile.cpp" line="103"/>
+ <location filename="../infofile.cpp" line="112"/>
+ <source>%1 kbps</source>
+ <translation>%1 kbps</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="104"/>
- <source>Frames per second</source>
- <translation>帧(每秒)</translation>
+ <location filename="../infofile.cpp" line="104"/>
+ <source>Frames per second</source>
+ <translation>帧(每秒)</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="105"/>
- <location filename="../infofile.cpp" line="115"/>
- <source>Selected codec</source>
- <translation>已选择的编解码器</translation>
+ <location filename="../infofile.cpp" line="105"/>
+ <location filename="../infofile.cpp" line="115"/>
+ <source>Selected codec</source>
+ <translation>已选择的编解码器</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="110"/>
- <source>Initial Audio Stream</source>
- <translation>初始音频流</translation>
+ <location filename="../infofile.cpp" line="110"/>
+ <source>Initial Audio Stream</source>
+ <translation>初始音频流</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="113"/>
- <source>Rate</source>
- <translation>比率</translation>
+ <location filename="../infofile.cpp" line="113"/>
+ <source>Rate</source>
+ <translation>比率</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="113"/>
- <source>%1 Hz</source>
- <translation>%1 Hz</translation>
+ <location filename="../infofile.cpp" line="113"/>
+ <source>%1 Hz</source>
+ <translation>%1 Hz</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="114"/>
- <source>Channels</source>
- <translation>声道</translation>
+ <location filename="../infofile.cpp" line="114"/>
+ <source>Channels</source>
+ <translation>声道</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="120"/>
- <source>Audio Streams</source>
- <translation>音频流</translation>
+ <location filename="../infofile.cpp" line="120"/>
+ <source>Audio Streams</source>
+ <translation>音频流</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="123"/>
- <location filename="../infofile.cpp" line="147"/>
- <source>#</source>
- <comment>Info for translators: this is a abbreviation for number</comment>
- <translation>#</translation>
+ <location filename="../infofile.cpp" line="123"/>
+ <location filename="../infofile.cpp" line="147"/>
+ <source>#</source>
+ <comment>Info for translators: this is a abbreviation for number</comment>
+ <translation>#</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="124"/>
- <location filename="../infofile.cpp" line="149"/>
- <source>Language</source>
- <translation>语言</translation>
+ <location filename="../infofile.cpp" line="124"/>
+ <location filename="../infofile.cpp" line="149"/>
+ <source>Language</source>
+ <translation>语言</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="125"/>
- <location filename="../infofile.cpp" line="150"/>
- <source>ID</source>
- <comment>Info for translators: this is a identification code</comment>
- <translation>ID</translation>
+ <location filename="../infofile.cpp" line="125"/>
+ <location filename="../infofile.cpp" line="150"/>
+ <source>ID</source>
+ <comment>Info for translators: this is a identification code</comment>
+ <translation>ID</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="131"/>
- <location filename="../infofile.cpp" line="133"/>
- <location filename="../infofile.cpp" line="162"/>
- <location filename="../infofile.cpp" line="164"/>
- <source>empty</source>
- <translation>空</translation>
+ <location filename="../infofile.cpp" line="131"/>
+ <location filename="../infofile.cpp" line="133"/>
+ <location filename="../infofile.cpp" line="162"/>
+ <location filename="../infofile.cpp" line="164"/>
+ <source>empty</source>
+ <translation>空</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="144"/>
- <source>Subtitles</source>
- <translation>字幕</translation>
+ <location filename="../infofile.cpp" line="144"/>
+ <source>Subtitles</source>
+ <translation>字幕</translation>
 </message>
 <message>
- <location filename="../infofile.cpp" line="148"/>
- <source>Type</source>
- <translation>类型</translation>
+ <location filename="../infofile.cpp" line="148"/>
+ <source>Type</source>
+ <translation>类型</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>InputDVDDirectory</name>
 <message>
- <location filename="../inputdvddirectory.ui" line="13"/>
- <source>SMPlayer - Play a DVD from a folder</source>
- <translation>SMPlayer - 从文件夹播放 DVD</translation>
+ <location filename="../inputdvddirectory.ui" line="13"/>
+ <source>SMPlayer - Play a DVD from a folder</source>
+ <translation>SMPlayer - 从文件夹播放 DVD</translation>
 </message>
 <message>
- <location filename="../inputdvddirectory.ui" line="36"/>
- <source>You can play a dvd from your hard disc. Just select the folder which contains the VIDEO_TS and AUDIO_TS directories.</source>
- <translation>您可以从您的硬盘中播放 DVD。只需选择包含 VIDEO_TS 和 AUDIO_TS 目录的文件夹即可。</translation>
+ <location filename="../inputdvddirectory.ui" line="36"/>
+ <source>You can play a dvd from your hard disc. Just select the folder which contains the VIDEO_TS and AUDIO_TS directories.</source>
+ <translation>您可以从您的硬盘中播放 DVD。只需选择包含 VIDEO_TS 和 AUDIO_TS 目录的文件夹即可。</translation>
 </message>
 <message>
- <location filename="../inputdvddirectory.ui" line="69"/>
- <source>Choose a directory...</source>
- <translation>选择一个目录...</translation>
+ <location filename="../inputdvddirectory.ui" line="69"/>
+ <source>Choose a directory...</source>
+ <translation>选择一个目录...</translation>
 </message>
 <message>
- <location filename="../inputdvddirectory.cpp" line="43"/>
- <source>Choose a directory</source>
- <translation>选择一个目录</translation>
+ <location filename="../inputdvddirectory.cpp" line="43"/>
+ <source>Choose a directory</source>
+ <translation>选择一个目录</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>InputMplayerVersion</name>
 <message>
- <location filename="../inputmplayerversion.ui" line="14"/>
- <source>SMPlayer - Enter the MPlayer version</source>
- <translation>SMPlayer - 输入 MPlayer 版本</translation>
+ <location filename="../inputmplayerversion.ui" line="14"/>
+ <source>SMPlayer - Enter the MPlayer version</source>
+ <translation>SMPlayer - 输入 MPlayer 版本</translation>
 </message>
 <message>
- <location filename="../inputmplayerversion.ui" line="35"/>
- <source>SMPlayer couldn&apos;t identify the MPlayer version you&apos;re using.</source>
- <translation>SMPlayer 无法识别您正在使用的 MPlayer 版本。</translation>
+ <location filename="../inputmplayerversion.ui" line="35"/>
+ <source>SMPlayer couldn&apos;t identify the MPlayer version you&apos;re using.</source>
+ <translation>SMPlayer 无法识别您正在使用的 MPlayer 版本。</translation>
 </message>
 <message>
- <location filename="../inputmplayerversion.ui" line="58"/>
- <source>Version reported by MPlayer:</source>
- <translation>MPlayer 报告的版本:</translation>
+ <location filename="../inputmplayerversion.ui" line="58"/>
+ <source>Version reported by MPlayer:</source>
+ <translation>MPlayer 报告的版本:</translation>
 </message>
 <message>
- <location filename="../inputmplayerversion.ui" line="102"/>
- <source>Please, &amp;select the correct version:</source>
- <translation>请选择正确的版本(&amp;S):</translation>
+ <location filename="../inputmplayerversion.ui" line="102"/>
+ <source>Please, &amp;select the correct version:</source>
+ <translation>请选择正确的版本(&amp;S):</translation>
 </message>
 <message>
- <location filename="../inputmplayerversion.ui" line="113"/>
- <source>1.0rc1 or older</source>
- <translation>1.0rc1 或更旧</translation>
+ <location filename="../inputmplayerversion.ui" line="113"/>
+ <source>1.0rc1 or older</source>
+ <translation>1.0rc1 或更旧</translation>
 </message>
 <message>
- <location filename="../inputmplayerversion.ui" line="118"/>
- <source>1.0rc2</source>
- <translation>1.0rc2</translation>
+ <location filename="../inputmplayerversion.ui" line="118"/>
+ <source>1.0rc2</source>
+ <translation>1.0rc2</translation>
 </message>
 <message>
- <location filename="../inputmplayerversion.ui" line="123"/>
- <source>1.0rc3 or newer</source>
- <translation>10rc3 或更新</translation>
+ <location filename="../inputmplayerversion.ui" line="123"/>
+ <source>1.0rc3 or newer</source>
+ <translation>10rc3 或更新</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>InputURL</name>
 <message>
- <location filename="../inputurl.ui" line="13"/>
- <source>SMPlayer - Enter URL</source>
- <translation>SMPlayer - 输入 URL 地址</translation>
+ <location filename="../inputurl.ui" line="13"/>
+ <source>SMPlayer - Enter URL</source>
+ <translation>SMPlayer - 输入 URL 地址</translation>
 </message>
 <message>
- <location filename="../inputurl.ui" line="64"/>
- <source>&amp;URL:</source>
- <translation>URL 地址(&amp;U):</translation>
+ <location filename="../inputurl.ui" line="64"/>
+ <source>&amp;URL:</source>
+ <translation>URL 地址(&amp;U):</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>Languages</name>
 <message>
- <location filename="../languages.cpp" line="24"/>
- <source>Afar</source>
- <translation>阿法尔语</translation>
+ <location filename="../languages.cpp" line="24"/>
+ <source>Afar</source>
+ <translation>阿法尔语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="25"/>
- <source>Abkhazian</source>
- <translation>阿布哈兹语</translation>
+ <location filename="../languages.cpp" line="25"/>
+ <source>Abkhazian</source>
+ <translation>阿布哈兹语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="26"/>
- <source>Avestan</source>
- <translation>阿维斯陀语</translation>
+ <location filename="../languages.cpp" line="26"/>
+ <source>Avestan</source>
+ <translation>阿维斯陀语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="27"/>
- <source>Afrikaans</source>
- <translation>南非语</translation>
+ <location filename="../languages.cpp" line="27"/>
+ <source>Afrikaans</source>
+ <translation>南非语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="28"/>
- <source>Akan</source>
- <translation>阿坎语</translation>
+ <location filename="../languages.cpp" line="28"/>
+ <source>Akan</source>
+ <translation>阿坎语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="29"/>
- <source>Amharic</source>
- <translation>阿姆哈拉语</translation>
+ <location filename="../languages.cpp" line="29"/>
+ <source>Amharic</source>
+ <translation>阿姆哈拉语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="30"/>
- <source>Aragonese</source>
- <translation>阿拉贡语</translation>
+ <location filename="../languages.cpp" line="30"/>
+ <source>Aragonese</source>
+ <translation>阿拉贡语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="31"/>
- <location filename="../languages.cpp" line="235"/>
- <location filename="../languages.cpp" line="288"/>
- <source>Arabic</source>
- <translation>阿拉伯语</translation>
+ <location filename="../languages.cpp" line="31"/>
+ <location filename="../languages.cpp" line="235"/>
+ <location filename="../languages.cpp" line="288"/>
+ <source>Arabic</source>
+ <translation>阿拉伯语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="32"/>
- <source>Assamese</source>
- <translation>阿萨姆语</translation>
+ <location filename="../languages.cpp" line="32"/>
+ <source>Assamese</source>
+ <translation>阿萨姆语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="33"/>
- <source>Avaric</source>
- <translation>阿瓦尔语</translation>
+ <location filename="../languages.cpp" line="33"/>
+ <source>Avaric</source>
+ <translation>阿瓦尔语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="34"/>
- <source>Aymara</source>
- <translation>艾马拉语</translation>
+ <location filename="../languages.cpp" line="34"/>
+ <source>Aymara</source>
+ <translation>艾马拉语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="35"/>
- <source>Azerbaijani</source>
- <translation>阿塞拜疆语</translation>
+ <location filename="../languages.cpp" line="35"/>
+ <source>Azerbaijani</source>
+ <translation>阿塞拜疆语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="36"/>
- <source>Bashkir</source>
- <translation>巴什基尔语</translation>
+ <location filename="../languages.cpp" line="36"/>
+ <source>Bashkir</source>
+ <translation>巴什基尔语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="37"/>
- <source>Belarusian</source>
- <translation>白俄罗斯语</translation>
+ <location filename="../languages.cpp" line="37"/>
+ <source>Belarusian</source>
+ <translation>白俄罗斯语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="38"/>
- <location filename="../languages.cpp" line="236"/>
- <source>Bulgarian</source>
- <translation>保加利亚语</translation>
+ <location filename="../languages.cpp" line="38"/>
+ <location filename="../languages.cpp" line="236"/>
+ <source>Bulgarian</source>
+ <translation>保加利亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="39"/>
- <source>Bihari</source>
- <translation>比哈尔语</translation>
+ <location filename="../languages.cpp" line="39"/>
+ <source>Bihari</source>
+ <translation>比哈尔语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="40"/>
- <source>Bislama</source>
- <translation>比斯拉马语</translation>
+ <location filename="../languages.cpp" line="40"/>
+ <source>Bislama</source>
+ <translation>比斯拉马语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="41"/>
- <source>Bambara</source>
- <translation>班巴拉语</translation>
+ <location filename="../languages.cpp" line="41"/>
+ <source>Bambara</source>
+ <translation>班巴拉语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="42"/>
- <source>Bengali</source>
- <translation>孟加拉语</translation>
+ <location filename="../languages.cpp" line="42"/>
+ <source>Bengali</source>
+ <translation>孟加拉语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="43"/>
- <source>Tibetan</source>
- <translation>藏语</translation>
+ <location filename="../languages.cpp" line="43"/>
+ <source>Tibetan</source>
+ <translation>藏语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="44"/>
- <source>Breton</source>
- <translation>布列塔尼语</translation>
+ <location filename="../languages.cpp" line="44"/>
+ <source>Breton</source>
+ <translation>布列塔尼语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="45"/>
- <source>Bosnian</source>
- <translation>波斯尼亚语</translation>
+ <location filename="../languages.cpp" line="45"/>
+ <source>Bosnian</source>
+ <translation>波斯尼亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="46"/>
- <location filename="../languages.cpp" line="237"/>
- <source>Catalan</source>
- <translation>加泰罗尼亚语</translation>
+ <location filename="../languages.cpp" line="46"/>
+ <location filename="../languages.cpp" line="237"/>
+ <source>Catalan</source>
+ <translation>加泰罗尼亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="47"/>
- <source>Chechen</source>
- <translation>车臣语</translation>
+ <location filename="../languages.cpp" line="47"/>
+ <source>Chechen</source>
+ <translation>车臣语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="48"/>
- <source>Corsican</source>
- <translation>科西嘉语</translation>
+ <location filename="../languages.cpp" line="48"/>
+ <source>Corsican</source>
+ <translation>科西嘉语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="49"/>
- <source>Cree</source>
- <translation>克里语</translation>
+ <location filename="../languages.cpp" line="49"/>
+ <source>Cree</source>
+ <translation>克里语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="50"/>
- <location filename="../languages.cpp" line="238"/>
- <source>Czech</source>
- <translation>捷克语</translation>
+ <location filename="../languages.cpp" line="50"/>
+ <location filename="../languages.cpp" line="238"/>
+ <source>Czech</source>
+ <translation>捷克语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="51"/>
- <source>Church</source>
- <translation>古教会斯拉夫语</translation>
+ <location filename="../languages.cpp" line="51"/>
+ <source>Church</source>
+ <translation>古教会斯拉夫语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="52"/>
- <source>Chuvash</source>
- <translation>楚瓦什语</translation>
+ <location filename="../languages.cpp" line="52"/>
+ <source>Chuvash</source>
+ <translation>楚瓦什语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="53"/>
- <source>Welsh</source>
- <translation>威尔士语</translation>
+ <location filename="../languages.cpp" line="53"/>
+ <source>Welsh</source>
+ <translation>威尔士语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="54"/>
- <location filename="../languages.cpp" line="239"/>
- <source>Danish</source>
- <translation>丹麦语</translation>
+ <location filename="../languages.cpp" line="54"/>
+ <location filename="../languages.cpp" line="239"/>
+ <source>Danish</source>
+ <translation>丹麦语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="55"/>
- <location filename="../languages.cpp" line="216"/>
- <location filename="../languages.cpp" line="240"/>
- <source>German</source>
- <translation>德语</translation>
+ <location filename="../languages.cpp" line="55"/>
+ <location filename="../languages.cpp" line="216"/>
+ <location filename="../languages.cpp" line="240"/>
+ <source>German</source>
+ <translation>德语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="56"/>
- <source>Divehi</source>
- <translation>迪维希语</translation>
+ <location filename="../languages.cpp" line="56"/>
+ <source>Divehi</source>
+ <translation>迪维希语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="57"/>
- <source>Dzongkha</source>
- <translation>宗卡语</translation>
+ <location filename="../languages.cpp" line="57"/>
+ <source>Dzongkha</source>
+ <translation>宗卡语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="58"/>
- <source>Ewe</source>
- <translation>埃维语</translation>
+ <location filename="../languages.cpp" line="58"/>
+ <source>Ewe</source>
+ <translation>埃维语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="59"/>
- <location filename="../languages.cpp" line="241"/>
- <source>Greek</source>
- <translation>希腊语</translation>
+ <location filename="../languages.cpp" line="59"/>
+ <location filename="../languages.cpp" line="241"/>
+ <source>Greek</source>
+ <translation>希腊语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="60"/>
- <location filename="../languages.cpp" line="217"/>
- <location filename="../languages.cpp" line="242"/>
- <source>English</source>
- <translation>英语</translation>
+ <location filename="../languages.cpp" line="60"/>
+ <location filename="../languages.cpp" line="217"/>
+ <location filename="../languages.cpp" line="242"/>
+ <source>English</source>
+ <translation>英语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="61"/>
- <source>Esperanto</source>
- <translation>世界语</translation>
+ <location filename="../languages.cpp" line="61"/>
+ <source>Esperanto</source>
+ <translation>世界语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="62"/>
- <location filename="../languages.cpp" line="218"/>
- <location filename="../languages.cpp" line="243"/>
- <source>Spanish</source>
- <translation>西班牙语</translation>
+ <location filename="../languages.cpp" line="62"/>
+ <location filename="../languages.cpp" line="218"/>
+ <location filename="../languages.cpp" line="243"/>
+ <source>Spanish</source>
+ <translation>西班牙语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="63"/>
- <location filename="../languages.cpp" line="244"/>
- <source>Estonian</source>
- <translation>爱沙尼亚语</translation>
+ <location filename="../languages.cpp" line="63"/>
+ <location filename="../languages.cpp" line="244"/>
+ <source>Estonian</source>
+ <translation>爱沙尼亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="64"/>
- <location filename="../languages.cpp" line="245"/>
- <source>Basque</source>
- <translation>巴斯克语</translation>
+ <location filename="../languages.cpp" line="64"/>
+ <location filename="../languages.cpp" line="245"/>
+ <source>Basque</source>
+ <translation>巴斯克语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="65"/>
- <source>Persian</source>
- <translation>波斯语</translation>
+ <location filename="../languages.cpp" line="65"/>
+ <source>Persian</source>
+ <translation>波斯语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="66"/>
- <source>Fulah</source>
- <translation>富拉语</translation>
+ <location filename="../languages.cpp" line="66"/>
+ <source>Fulah</source>
+ <translation>富拉语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="67"/>
- <location filename="../languages.cpp" line="219"/>
- <location filename="../languages.cpp" line="246"/>
- <source>Finnish</source>
- <translation>芬兰语</translation>
+ <location filename="../languages.cpp" line="67"/>
+ <location filename="../languages.cpp" line="219"/>
+ <location filename="../languages.cpp" line="246"/>
+ <source>Finnish</source>
+ <translation>芬兰语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="68"/>
- <source>Fijian</source>
- <translation>斐济语</translation>
+ <location filename="../languages.cpp" line="68"/>
+ <source>Fijian</source>
+ <translation>斐济语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="69"/>
- <source>Faroese</source>
- <translation>法罗语</translation>
+ <location filename="../languages.cpp" line="69"/>
+ <source>Faroese</source>
+ <translation>法罗语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="70"/>
- <location filename="../languages.cpp" line="220"/>
- <location filename="../languages.cpp" line="247"/>
- <source>French</source>
- <translation>法语</translation>
+ <location filename="../languages.cpp" line="70"/>
+ <location filename="../languages.cpp" line="220"/>
+ <location filename="../languages.cpp" line="247"/>
+ <source>French</source>
+ <translation>法语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="71"/>
- <source>Frisian</source>
- <translation>弗里西亚语</translation>
+ <location filename="../languages.cpp" line="71"/>
+ <source>Frisian</source>
+ <translation>弗里西亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="72"/>
- <source>Irish</source>
- <translation>爱尔兰语</translation>
+ <location filename="../languages.cpp" line="72"/>
+ <source>Irish</source>
+ <translation>爱尔兰语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="73"/>
- <source>Gaelic</source>
- <translation>苏格兰盖尔语</translation>
+ <location filename="../languages.cpp" line="73"/>
+ <source>Gaelic</source>
+ <translation>苏格兰盖尔语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="74"/>
- <location filename="../languages.cpp" line="248"/>
- <source>Galician</source>
- <translation>加利西亚语</translation>
+ <location filename="../languages.cpp" line="74"/>
+ <location filename="../languages.cpp" line="248"/>
+ <source>Galician</source>
+ <translation>加利西亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="75"/>
- <source>Guarani</source>
- <translation>瓜拉尼语</translation>
+ <location filename="../languages.cpp" line="75"/>
+ <source>Guarani</source>
+ <translation>瓜拉尼语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="76"/>
- <source>Gujarati</source>
- <translation>古吉拉特语</translation>
+ <location filename="../languages.cpp" line="76"/>
+ <source>Gujarati</source>
+ <translation>古吉拉特语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="77"/>
- <source>Manx</source>
- <translation>马恩岛语</translation>
+ <location filename="../languages.cpp" line="77"/>
+ <source>Manx</source>
+ <translation>马恩岛语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="78"/>
- <source>Hausa</source>
- <translation>豪萨语</translation>
+ <location filename="../languages.cpp" line="78"/>
+ <source>Hausa</source>
+ <translation>豪萨语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="79"/>
- <source>Hebrew</source>
- <translation>希伯来语</translation>
+ <location filename="../languages.cpp" line="79"/>
+ <source>Hebrew</source>
+ <translation>希伯来语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="80"/>
- <source>Hindi</source>
- <translation>印地语</translation>
+ <location filename="../languages.cpp" line="80"/>
+ <source>Hindi</source>
+ <translation>印地语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="81"/>
- <source>Hiri</source>
- <translation>希里莫图语</translation>
+ <location filename="../languages.cpp" line="81"/>
+ <source>Hiri</source>
+ <translation>希里莫图语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="82"/>
- <location filename="../languages.cpp" line="249"/>
- <source>Croatian</source>
- <translation>克罗地亚语</translation>
+ <location filename="../languages.cpp" line="82"/>
+ <location filename="../languages.cpp" line="249"/>
+ <source>Croatian</source>
+ <translation>克罗地亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="83"/>
- <source>Haitian</source>
- <translation>海地克里奥尔语</translation>
+ <location filename="../languages.cpp" line="83"/>
+ <source>Haitian</source>
+ <translation>海地克里奥尔语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="84"/>
- <location filename="../languages.cpp" line="250"/>
- <source>Hungarian</source>
- <translation>匈牙利语</translation>
+ <location filename="../languages.cpp" line="84"/>
+ <location filename="../languages.cpp" line="250"/>
+ <source>Hungarian</source>
+ <translation>匈牙利语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="85"/>
- <source>Armenian</source>
- <translation>亚美尼亚语</translation>
+ <location filename="../languages.cpp" line="85"/>
+ <source>Armenian</source>
+ <translation>亚美尼亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="86"/>
- <source>Herero</source>
- <translation>赫雷罗语</translation>
+ <location filename="../languages.cpp" line="86"/>
+ <source>Herero</source>
+ <translation>赫雷罗语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="87"/>
- <source>Chamorro</source>
- <translation>查莫罗语</translation>
+ <location filename="../languages.cpp" line="87"/>
+ <source>Chamorro</source>
+ <translation>查莫罗语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="88"/>
- <source>Interlingua</source>
- <translation>国际语A</translation>
+ <location filename="../languages.cpp" line="88"/>
+ <source>Interlingua</source>
+ <translation>国际语A</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="89"/>
- <source>Indonesian</source>
- <translation>印度尼西亚语</translation>
+ <location filename="../languages.cpp" line="89"/>
+ <source>Indonesian</source>
+ <translation>印度尼西亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="90"/>
- <source>Interlingue</source>
- <translation>国际语E</translation>
+ <location filename="../languages.cpp" line="90"/>
+ <source>Interlingue</source>
+ <translation>国际语E</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="91"/>
- <source>Igbo</source>
- <translation>伊博语</translation>
+ <location filename="../languages.cpp" line="91"/>
+ <source>Igbo</source>
+ <translation>伊博语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="92"/>
- <source>Sichuan</source>
- <translation>四川彝语</translation>
+ <location filename="../languages.cpp" line="92"/>
+ <source>Sichuan</source>
+ <translation>四川彝语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="93"/>
- <source>Inupiaq</source>
- <translation>依努庇克语</translation>
+ <location filename="../languages.cpp" line="93"/>
+ <source>Inupiaq</source>
+ <translation>依努庇克语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="94"/>
- <source>Ido</source>
- <translation>伊多语</translation>
+ <location filename="../languages.cpp" line="94"/>
+ <source>Ido</source>
+ <translation>伊多语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="95"/>
- <source>Icelandic</source>
- <translation>冰岛语</translation>
+ <location filename="../languages.cpp" line="95"/>
+ <source>Icelandic</source>
+ <translation>冰岛语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="96"/>
- <location filename="../languages.cpp" line="221"/>
- <location filename="../languages.cpp" line="251"/>
- <source>Italian</source>
- <translation>意大利语</translation>
+ <location filename="../languages.cpp" line="96"/>
+ <location filename="../languages.cpp" line="221"/>
+ <location filename="../languages.cpp" line="251"/>
+ <source>Italian</source>
+ <translation>意大利语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="97"/>
- <source>Inuktitut</source>
- <translation>因纽特语</translation>
+ <location filename="../languages.cpp" line="97"/>
+ <source>Inuktitut</source>
+ <translation>因纽特语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="98"/>
- <location filename="../languages.cpp" line="222"/>
- <location filename="../languages.cpp" line="252"/>
- <source>Japanese</source>
- <translation>日语</translation>
+ <location filename="../languages.cpp" line="98"/>
+ <location filename="../languages.cpp" line="222"/>
+ <location filename="../languages.cpp" line="252"/>
+ <source>Japanese</source>
+ <translation>日语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="99"/>
- <source>Javanese</source>
- <translation>爪哇语</translation>
+ <location filename="../languages.cpp" line="99"/>
+ <source>Javanese</source>
+ <translation>爪哇语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="100"/>
- <location filename="../languages.cpp" line="253"/>
- <source>Georgian</source>
- <translation>格鲁吉亚语</translation>
+ <location filename="../languages.cpp" line="100"/>
+ <location filename="../languages.cpp" line="253"/>
+ <source>Georgian</source>
+ <translation>格鲁吉亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="101"/>
- <source>Kongo</source>
- <translation>刚果语</translation>
+ <location filename="../languages.cpp" line="101"/>
+ <source>Kongo</source>
+ <translation>刚果语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="102"/>
- <source>Kikuyu</source>
- <translation>基库尤语</translation>
+ <location filename="../languages.cpp" line="102"/>
+ <source>Kikuyu</source>
+ <translation>基库尤语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="103"/>
- <source>Kuanyama</source>
- <translation>宽亚玛语</translation>
+ <location filename="../languages.cpp" line="103"/>
+ <source>Kuanyama</source>
+ <translation>宽亚玛语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="104"/>
- <source>Kazakh</source>
- <translation>哈萨克语</translation>
+ <location filename="../languages.cpp" line="104"/>
+ <source>Kazakh</source>
+ <translation>哈萨克语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="105"/>
- <source>Greenlandic</source>
- <translation>格陵兰语</translation>
+ <location filename="../languages.cpp" line="105"/>
+ <source>Greenlandic</source>
+ <translation>格陵兰语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="106"/>
- <source>Khmer</source>
- <translation>高棉语</translation>
+ <location filename="../languages.cpp" line="106"/>
+ <source>Khmer</source>
+ <translation>高棉语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="107"/>
- <source>Kannada</source>
- <translation>卡纳达语</translation>
+ <location filename="../languages.cpp" line="107"/>
+ <source>Kannada</source>
+ <translation>卡纳达语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="108"/>
- <location filename="../languages.cpp" line="254"/>
- <source>Korean</source>
- <translation>韩国语</translation>
+ <location filename="../languages.cpp" line="108"/>
+ <location filename="../languages.cpp" line="254"/>
+ <source>Korean</source>
+ <translation>韩国语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="109"/>
- <source>Kanuri</source>
- <translation>卡努里语</translation>
+ <location filename="../languages.cpp" line="109"/>
+ <source>Kanuri</source>
+ <translation>卡努里语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="110"/>
- <source>Kashmiri</source>
- <translation>克什米尔语</translation>
+ <location filename="../languages.cpp" line="110"/>
+ <source>Kashmiri</source>
+ <translation>克什米尔语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="111"/>
- <location filename="../languages.cpp" line="255"/>
- <source>Kurdish</source>
- <translation>库尔德语</translation>
+ <location filename="../languages.cpp" line="111"/>
+ <location filename="../languages.cpp" line="255"/>
+ <source>Kurdish</source>
+ <translation>库尔德语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="112"/>
- <source>Komi</source>
- <translation>科米语</translation>
+ <location filename="../languages.cpp" line="112"/>
+ <source>Komi</source>
+ <translation>科米语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="113"/>
- <source>Cornish</source>
- <translation>康瓦尔语</translation>
+ <location filename="../languages.cpp" line="113"/>
+ <source>Cornish</source>
+ <translation>康瓦尔语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="114"/>
- <source>Kirghiz</source>
- <translation>吉尔吉斯语</translation>
+ <location filename="../languages.cpp" line="114"/>
+ <source>Kirghiz</source>
+ <translation>吉尔吉斯语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="115"/>
- <source>Latin</source>
- <translation>拉丁语</translation>
+ <location filename="../languages.cpp" line="115"/>
+ <source>Latin</source>
+ <translation>拉丁语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="116"/>
- <source>Luxembourgish</source>
- <translation>卢森堡语</translation>
+ <location filename="../languages.cpp" line="116"/>
+ <source>Luxembourgish</source>
+ <translation>卢森堡语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="117"/>
- <source>Ganda</source>
- <translation>卢干达语</translation>
+ <location filename="../languages.cpp" line="117"/>
+ <source>Ganda</source>
+ <translation>卢干达语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="118"/>
- <source>Limburgan</source>
- <translation>林堡语</translation>
+ <location filename="../languages.cpp" line="118"/>
+ <source>Limburgan</source>
+ <translation>林堡语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="119"/>
- <source>Lingala</source>
- <translation>林加拉语</translation>
+ <location filename="../languages.cpp" line="119"/>
+ <source>Lingala</source>
+ <translation>林加拉语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="120"/>
- <source>Lao</source>
- <translation>老挝语</translation>
+ <location filename="../languages.cpp" line="120"/>
+ <source>Lao</source>
+ <translation>老挝语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="121"/>
- <location filename="../languages.cpp" line="256"/>
- <source>Lithuanian</source>
- <translation>立陶宛语</translation>
+ <location filename="../languages.cpp" line="121"/>
+ <location filename="../languages.cpp" line="256"/>
+ <source>Lithuanian</source>
+ <translation>立陶宛语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="122"/>
- <source>Luba-Katanga</source>
- <translation>卢巴-加丹加语</translation>
+ <location filename="../languages.cpp" line="122"/>
+ <source>Luba-Katanga</source>
+ <translation>卢巴-加丹加语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="123"/>
- <source>Latvian</source>
- <translation>拉脱维亚语</translation>
+ <location filename="../languages.cpp" line="123"/>
+ <source>Latvian</source>
+ <translation>拉脱维亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="124"/>
- <source>Malagasy</source>
- <translation>马达加斯加语</translation>
+ <location filename="../languages.cpp" line="124"/>
+ <source>Malagasy</source>
+ <translation>马达加斯加语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="125"/>
- <source>Marshallese</source>
- <translation>马绍尔语</translation>
+ <location filename="../languages.cpp" line="125"/>
+ <source>Marshallese</source>
+ <translation>马绍尔语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="126"/>
- <source>Maori</source>
- <translation>毛利语</translation>
+ <location filename="../languages.cpp" line="126"/>
+ <source>Maori</source>
+ <translation>毛利语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="127"/>
- <location filename="../languages.cpp" line="257"/>
- <source>Macedonian</source>
- <translation>马其顿语</translation>
+ <location filename="../languages.cpp" line="127"/>
+ <location filename="../languages.cpp" line="257"/>
+ <source>Macedonian</source>
+ <translation>马其顿语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="128"/>
- <source>Malayalam</source>
- <translation>马拉雅拉姆语</translation>
+ <location filename="../languages.cpp" line="128"/>
+ <source>Malayalam</source>
+ <translation>马拉雅拉姆语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="129"/>
- <source>Mongolian</source>
- <translation>蒙古语</translation>
+ <location filename="../languages.cpp" line="129"/>
+ <source>Mongolian</source>
+ <translation>蒙古语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="130"/>
- <source>Moldavian</source>
- <translation>摩尔达维亚语</translation>
+ <location filename="../languages.cpp" line="130"/>
+ <source>Moldavian</source>
+ <translation>摩尔达维亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="131"/>
- <source>Marathi</source>
- <translation>马拉地语</translation>
+ <location filename="../languages.cpp" line="131"/>
+ <source>Marathi</source>
+ <translation>马拉地语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="132"/>
- <source>Malay</source>
- <translation>马来语</translation>
+ <location filename="../languages.cpp" line="132"/>
+ <source>Malay</source>
+ <translation>马来语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="133"/>
- <source>Maltese</source>
- <translation>马耳他语</translation>
+ <location filename="../languages.cpp" line="133"/>
+ <source>Maltese</source>
+ <translation>马耳他语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="134"/>
- <source>Burmese</source>
- <translation>缅甸语</translation>
+ <location filename="../languages.cpp" line="134"/>
+ <source>Burmese</source>
+ <translation>缅甸语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="135"/>
- <source>Nauru</source>
- <translation>瑙鲁语</translation>
+ <location filename="../languages.cpp" line="135"/>
+ <source>Nauru</source>
+ <translation>瑙鲁语</translation>
 </message>
 <message utf8="true">
- <location filename="../languages.cpp" line="136"/>
- <source>Bokmål</source>
- <translation>波克莫尔语</translation>
+ <location filename="../languages.cpp" line="136"/>
+ <source>Bokmål</source>
+ <translation>波克莫尔语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="137"/>
- <location filename="../languages.cpp" line="143"/>
- <source>Ndebele</source>
- <translation>南恩德贝勒语</translation>
+ <location filename="../languages.cpp" line="137"/>
+ <location filename="../languages.cpp" line="143"/>
+ <source>Ndebele</source>
+ <translation>南恩德贝勒语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="138"/>
- <source>Nepali</source>
- <translation>尼泊尔语</translation>
+ <location filename="../languages.cpp" line="138"/>
+ <source>Nepali</source>
+ <translation>尼泊尔语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="139"/>
- <source>Ndonga</source>
- <translation>恩敦加语</translation>
+ <location filename="../languages.cpp" line="139"/>
+ <source>Ndonga</source>
+ <translation>恩敦加语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="140"/>
- <location filename="../languages.cpp" line="223"/>
- <location filename="../languages.cpp" line="258"/>
- <source>Dutch</source>
- <translation>荷兰语</translation>
+ <location filename="../languages.cpp" line="140"/>
+ <location filename="../languages.cpp" line="223"/>
+ <location filename="../languages.cpp" line="258"/>
+ <source>Dutch</source>
+ <translation>荷兰语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="141"/>
- <source>Norwegian Nynorsk</source>
- <translation type="unfinished"></translation>
+ <location filename="../languages.cpp" line="141"/>
+ <source>Norwegian Nynorsk</source>
+ <translation>耐诺斯克挪威语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="142"/>
- <location filename="../languages.cpp" line="224"/>
- <source>Norwegian</source>
- <translation>挪威语</translation>
+ <location filename="../languages.cpp" line="142"/>
+ <location filename="../languages.cpp" line="224"/>
+ <source>Norwegian</source>
+ <translation>挪威语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="144"/>
- <source>Navajo</source>
- <translation>纳瓦霍语</translation>
+ <location filename="../languages.cpp" line="144"/>
+ <source>Navajo</source>
+ <translation>纳瓦霍语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="145"/>
- <source>Chichewa</source>
- <translation>尼扬贾语</translation>
+ <location filename="../languages.cpp" line="145"/>
+ <source>Chichewa</source>
+ <translation>尼扬贾语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="146"/>
- <source>Occitan</source>
- <translation>奥克西唐语</translation>
+ <location filename="../languages.cpp" line="146"/>
+ <source>Occitan</source>
+ <translation>奥克西唐语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="147"/>
- <source>Ojibwa</source>
- <translation>奥吉布瓦语</translation>
+ <location filename="../languages.cpp" line="147"/>
+ <source>Ojibwa</source>
+ <translation>奥吉布瓦语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="148"/>
- <source>Oromo</source>
- <translation>奥罗莫语</translation>
+ <location filename="../languages.cpp" line="148"/>
+ <source>Oromo</source>
+ <translation>奥罗莫语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="149"/>
- <source>Oriya</source>
- <translation>奥里亚语</translation>
+ <location filename="../languages.cpp" line="149"/>
+ <source>Oriya</source>
+ <translation>奥里亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="150"/>
- <source>Ossetian</source>
- <translation>奥塞梯语</translation>
+ <location filename="../languages.cpp" line="150"/>
+ <source>Ossetian</source>
+ <translation>奥塞梯语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="151"/>
- <source>Panjabi</source>
- <translation>旁遮普语</translation>
+ <location filename="../languages.cpp" line="151"/>
+ <source>Panjabi</source>
+ <translation>旁遮普语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="152"/>
- <source>Pali</source>
- <translation>巴利语</translation>
+ <location filename="../languages.cpp" line="152"/>
+ <source>Pali</source>
+ <translation>巴利语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="153"/>
- <location filename="../languages.cpp" line="259"/>
- <source>Polish</source>
- <translation>波兰语</translation>
+ <location filename="../languages.cpp" line="153"/>
+ <location filename="../languages.cpp" line="259"/>
+ <source>Polish</source>
+ <translation>波兰语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="154"/>
- <source>Pushto</source>
- <translation>普什图语</translation>
+ <location filename="../languages.cpp" line="154"/>
+ <source>Pushto</source>
+ <translation>普什图语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="155"/>
- <location filename="../languages.cpp" line="225"/>
- <source>Portuguese</source>
- <translation>葡萄牙语</translation>
+ <location filename="../languages.cpp" line="155"/>
+ <location filename="../languages.cpp" line="225"/>
+ <source>Portuguese</source>
+ <translation>葡萄牙语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="156"/>
- <source>Quechua</source>
- <translation>克丘亚语</translation>
+ <location filename="../languages.cpp" line="156"/>
+ <source>Quechua</source>
+ <translation>克丘亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="157"/>
- <source>Romansh</source>
- <translation>罗曼什语</translation>
+ <location filename="../languages.cpp" line="157"/>
+ <source>Romansh</source>
+ <translation>罗曼什语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="158"/>
- <source>Rundi</source>
- <translation>基隆迪语</translation>
+ <location filename="../languages.cpp" line="158"/>
+ <source>Rundi</source>
+ <translation>基隆迪语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="159"/>
- <location filename="../languages.cpp" line="262"/>
- <source>Romanian</source>
- <translation>罗马尼亚语</translation>
+ <location filename="../languages.cpp" line="159"/>
+ <location filename="../languages.cpp" line="262"/>
+ <source>Romanian</source>
+ <translation>罗马尼亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="160"/>
- <location filename="../languages.cpp" line="226"/>
- <location filename="../languages.cpp" line="263"/>
- <location filename="../languages.cpp" line="294"/>
- <source>Russian</source>
- <translation>俄语</translation>
+ <location filename="../languages.cpp" line="160"/>
+ <location filename="../languages.cpp" line="226"/>
+ <location filename="../languages.cpp" line="263"/>
+ <location filename="../languages.cpp" line="294"/>
+ <source>Russian</source>
+ <translation>俄语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="161"/>
- <source>Kinyarwanda</source>
- <translation>卢旺达语</translation>
+ <location filename="../languages.cpp" line="161"/>
+ <source>Kinyarwanda</source>
+ <translation>卢旺达语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="162"/>
- <source>Sanskrit</source>
- <translation>梵语</translation>
+ <location filename="../languages.cpp" line="162"/>
+ <source>Sanskrit</source>
+ <translation>梵语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="163"/>
- <source>Sardinian</source>
- <translation>萨丁尼亚语</translation>
+ <location filename="../languages.cpp" line="163"/>
+ <source>Sardinian</source>
+ <translation>萨丁尼亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="164"/>
- <source>Sindhi</source>
- <translation>信德语</translation>
+ <location filename="../languages.cpp" line="164"/>
+ <source>Sindhi</source>
+ <translation>信德语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="165"/>
- <source>Sami</source>
- <translation>北萨米语</translation>
+ <location filename="../languages.cpp" line="165"/>
+ <source>Sami</source>
+ <translation>北萨米语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="166"/>
- <source>Sango</source>
- <translation>桑戈语</translation>
+ <location filename="../languages.cpp" line="166"/>
+ <source>Sango</source>
+ <translation>桑戈语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="167"/>
- <source>Sinhala</source>
- <translation>僧加罗语</translation>
+ <location filename="../languages.cpp" line="167"/>
+ <source>Sinhala</source>
+ <translation>僧加罗语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="168"/>
- <location filename="../languages.cpp" line="264"/>
- <source>Slovak</source>
- <translation>斯洛伐克语</translation>
+ <location filename="../languages.cpp" line="168"/>
+ <location filename="../languages.cpp" line="264"/>
+ <source>Slovak</source>
+ <translation>斯洛伐克语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="169"/>
- <location filename="../languages.cpp" line="265"/>
- <source>Slovenian</source>
- <translation>斯洛文尼亚语</translation>
+ <location filename="../languages.cpp" line="169"/>
+ <location filename="../languages.cpp" line="265"/>
+ <source>Slovenian</source>
+ <translation>斯洛文尼亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="170"/>
- <source>Samoan</source>
- <translation>萨摩亚语</translation>
+ <location filename="../languages.cpp" line="170"/>
+ <source>Samoan</source>
+ <translation>萨摩亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="171"/>
- <source>Shona</source>
- <translation>绍纳语</translation>
+ <location filename="../languages.cpp" line="171"/>
+ <source>Shona</source>
+ <translation>绍纳语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="172"/>
- <source>Somali</source>
- <translation>索马里语</translation>
+ <location filename="../languages.cpp" line="172"/>
+ <source>Somali</source>
+ <translation>索马里语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="173"/>
- <source>Albanian</source>
- <translation>阿尔巴尼亚语</translation>
+ <location filename="../languages.cpp" line="173"/>
+ <source>Albanian</source>
+ <translation>阿尔巴尼亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="174"/>
- <location filename="../languages.cpp" line="266"/>
- <source>Serbian</source>
- <translation>塞尔维亚语</translation>
+ <location filename="../languages.cpp" line="174"/>
+ <location filename="../languages.cpp" line="266"/>
+ <source>Serbian</source>
+ <translation>塞尔维亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="175"/>
- <source>Swati</source>
- <translation>斯瓦特语</translation>
+ <location filename="../languages.cpp" line="175"/>
+ <source>Swati</source>
+ <translation>斯瓦特语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="176"/>
- <source>Sotho</source>
- <translation>南索托语</translation>
+ <location filename="../languages.cpp" line="176"/>
+ <source>Sotho</source>
+ <translation>南索托语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="177"/>
- <source>Sundanese</source>
- <translation>巽他语</translation>
+ <location filename="../languages.cpp" line="177"/>
+ <source>Sundanese</source>
+ <translation>巽他语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="178"/>
- <location filename="../languages.cpp" line="227"/>
- <location filename="../languages.cpp" line="267"/>
- <source>Swedish</source>
- <translation>瑞典语</translation>
+ <location filename="../languages.cpp" line="178"/>
+ <location filename="../languages.cpp" line="227"/>
+ <location filename="../languages.cpp" line="267"/>
+ <source>Swedish</source>
+ <translation>瑞典语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="179"/>
- <source>Swahili</source>
- <translation>斯瓦希里语</translation>
+ <location filename="../languages.cpp" line="179"/>
+ <source>Swahili</source>
+ <translation>斯瓦希里语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="180"/>
- <source>Tamil</source>
- <translation>泰米尔语</translation>
+ <location filename="../languages.cpp" line="180"/>
+ <source>Tamil</source>
+ <translation>泰米尔语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="181"/>
- <source>Telugu</source>
- <translation>泰卢固语</translation>
+ <location filename="../languages.cpp" line="181"/>
+ <source>Telugu</source>
+ <translation>泰卢固语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="182"/>
- <source>Tajik</source>
- <translation>塔吉克语</translation>
+ <location filename="../languages.cpp" line="182"/>
+ <source>Tajik</source>
+ <translation>塔吉克语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="183"/>
- <source>Thai</source>
- <translation>泰语</translation>
+ <location filename="../languages.cpp" line="183"/>
+ <source>Thai</source>
+ <translation>泰语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="184"/>
- <source>Tigrinya</source>
- <translation>提格里尼亚语</translation>
+ <location filename="../languages.cpp" line="184"/>
+ <source>Tigrinya</source>
+ <translation>提格里尼亚语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="185"/>
- <source>Turkmen</source>
- <translation>土库曼语</translation>
+ <location filename="../languages.cpp" line="185"/>
+ <source>Turkmen</source>
+ <translation>土库曼语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="186"/>
- <source>Tagalog</source>
- <translation>塔加洛语</translation>
+ <location filename="../languages.cpp" line="186"/>
+ <source>Tagalog</source>
+ <translation>塔加洛语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="187"/>
- <source>Tswana</source>
- <translation>茨瓦纳语</translation>
+ <location filename="../languages.cpp" line="187"/>
+ <source>Tswana</source>
+ <translation>茨瓦纳语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="188"/>
- <source>Tonga</source>
- <translation>汤加语</translation>
+ <location filename="../languages.cpp" line="188"/>
+ <source>Tonga</source>
+ <translation>汤加语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="189"/>
- <location filename="../languages.cpp" line="268"/>
- <location filename="../languages.cpp" line="290"/>
- <source>Turkish</source>
- <translation>土耳其语</translation>
+ <location filename="../languages.cpp" line="189"/>
+ <location filename="../languages.cpp" line="268"/>
+ <location filename="../languages.cpp" line="290"/>
+ <source>Turkish</source>
+ <translation>土耳其语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="190"/>
- <source>Tsonga</source>
- <translation>聪加语</translation>
+ <location filename="../languages.cpp" line="190"/>
+ <source>Tsonga</source>
+ <translation>聪加语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="191"/>
- <source>Tatar</source>
- <translation>塔塔尔语</translation>
+ <location filename="../languages.cpp" line="191"/>
+ <source>Tatar</source>
+ <translation>塔塔尔语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="192"/>
- <source>Twi</source>
- <translation>契维语</translation>
+ <location filename="../languages.cpp" line="192"/>
+ <source>Twi</source>
+ <translation>契维语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="193"/>
- <source>Tahitian</source>
- <translation>塔希提语</translation>
+ <location filename="../languages.cpp" line="193"/>
+ <source>Tahitian</source>
+ <translation>塔希提语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="194"/>
- <source>Uighur</source>
- <translation>维吾尔语</translation>
+ <location filename="../languages.cpp" line="194"/>
+ <source>Uighur</source>
+ <translation>维吾尔语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="195"/>
- <location filename="../languages.cpp" line="269"/>
- <source>Ukrainian</source>
- <translation>乌克兰语</translation>
+ <location filename="../languages.cpp" line="195"/>
+ <location filename="../languages.cpp" line="269"/>
+ <source>Ukrainian</source>
+ <translation>乌克兰语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="196"/>
- <source>Urdu</source>
- <translation>乌尔都语</translation>
+ <location filename="../languages.cpp" line="196"/>
+ <source>Urdu</source>
+ <translation>乌尔都语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="197"/>
- <source>Uzbek</source>
- <translation>乌兹别克语</translation>
+ <location filename="../languages.cpp" line="197"/>
+ <source>Uzbek</source>
+ <translation>乌兹别克语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="198"/>
- <source>Venda</source>
- <translation>文达语</translation>
+ <location filename="../languages.cpp" line="198"/>
+ <source>Venda</source>
+ <translation>文达语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="199"/>
- <location filename="../languages.cpp" line="270"/>
- <source>Vietnamese</source>
- <translation>越南语</translation>
+ <location filename="../languages.cpp" line="199"/>
+ <location filename="../languages.cpp" line="270"/>
+ <source>Vietnamese</source>
+ <translation>越南语</translation>
 </message>
 <message utf8="true">
- <location filename="../languages.cpp" line="200"/>
- <source>Volapük</source>
- <translation>沃拉普克语</translation>
+ <location filename="../languages.cpp" line="200"/>
+ <source>Volapük</source>
+ <translation>沃拉普克语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="201"/>
- <source>Walloon</source>
- <translation>瓦龙语</translation>
+ <location filename="../languages.cpp" line="201"/>
+ <source>Walloon</source>
+ <translation>瓦龙语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="202"/>
- <source>Wolof</source>
- <translation>沃洛夫语</translation>
+ <location filename="../languages.cpp" line="202"/>
+ <source>Wolof</source>
+ <translation>沃洛夫语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="203"/>
- <source>Xhosa</source>
- <translation>科萨语</translation>
+ <location filename="../languages.cpp" line="203"/>
+ <source>Xhosa</source>
+ <translation>科萨语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="204"/>
- <source>Yiddish</source>
- <translation>依地语</translation>
+ <location filename="../languages.cpp" line="204"/>
+ <source>Yiddish</source>
+ <translation>依地语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="205"/>
- <source>Yoruba</source>
- <translation>约鲁巴语</translation>
+ <location filename="../languages.cpp" line="205"/>
+ <source>Yoruba</source>
+ <translation>约鲁巴语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="206"/>
- <source>Zhuang</source>
- <translation>壮语</translation>
+ <location filename="../languages.cpp" line="206"/>
+ <source>Zhuang</source>
+ <translation>壮语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="207"/>
- <location filename="../languages.cpp" line="228"/>
- <source>Chinese</source>
- <translation>汉语</translation>
+ <location filename="../languages.cpp" line="207"/>
+ <location filename="../languages.cpp" line="228"/>
+ <source>Chinese</source>
+ <translation>汉语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="208"/>
- <source>Zulu</source>
- <translation>祖鲁语</translation>
+ <location filename="../languages.cpp" line="208"/>
+ <source>Zulu</source>
+ <translation>祖鲁语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="260"/>
- <source>Portuguese - Brazil</source>
- <translation>葡萄牙语 - 巴西</translation>
+ <location filename="../languages.cpp" line="260"/>
+ <source>Portuguese - Brazil</source>
+ <translation>葡萄牙语 - 巴西</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="261"/>
- <source>Portuguese - Portugal</source>
- <translation>葡萄牙语 - 葡萄牙</translation>
+ <location filename="../languages.cpp" line="261"/>
+ <source>Portuguese - Portugal</source>
+ <translation>葡萄牙语 - 葡萄牙</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="271"/>
- <source>Simplified-Chinese</source>
- <translation>简体中文</translation>
+ <location filename="../languages.cpp" line="271"/>
+ <source>Simplified-Chinese</source>
+ <translation>简体中文</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="272"/>
- <source>Traditional Chinese</source>
- <translation>繁体中文</translation>
+ <location filename="../languages.cpp" line="272"/>
+ <source>Traditional Chinese</source>
+ <translation>繁体中文</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="280"/>
- <source>Unicode</source>
- <translation>Unicode</translation>
+ <location filename="../languages.cpp" line="280"/>
+ <source>Unicode</source>
+ <translation>Unicode</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="281"/>
- <source>UTF-8</source>
- <translation>UTF-8</translation>
+ <location filename="../languages.cpp" line="281"/>
+ <source>UTF-8</source>
+ <translation>UTF-8</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="282"/>
- <source>Western European Languages</source>
- <translation>西欧</translation>
+ <location filename="../languages.cpp" line="282"/>
+ <source>Western European Languages</source>
+ <translation>西欧</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="283"/>
- <source>Western European Languages with Euro</source>
- <translation>西欧（欧盟）</translation>
+ <location filename="../languages.cpp" line="283"/>
+ <source>Western European Languages with Euro</source>
+ <translation>西欧（欧盟）</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="284"/>
- <source>Slavic/Central European Languages</source>
- <translation>斯拉夫语/中欧</translation>
+ <location filename="../languages.cpp" line="284"/>
+ <source>Slavic/Central European Languages</source>
+ <translation>斯拉夫语/中欧</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="285"/>
- <source>Esperanto, Galician, Maltese, Turkish</source>
- <translation>世界语，加利西亚，马耳他，土耳其</translation>
+ <location filename="../languages.cpp" line="285"/>
+ <source>Esperanto, Galician, Maltese, Turkish</source>
+ <translation>世界语，加利西亚，马耳他，土耳其</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="286"/>
- <source>Old Baltic charset</source>
- <translation>旧波罗的海字符集</translation>
+ <location filename="../languages.cpp" line="286"/>
+ <source>Old Baltic charset</source>
+ <translation>旧波罗的海字符集</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="287"/>
- <source>Cyrillic</source>
- <translation>西里尔文</translation>
+ <location filename="../languages.cpp" line="287"/>
+ <source>Cyrillic</source>
+ <translation>西里尔文</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="289"/>
- <source>Modern Greek</source>
- <translation>现代希腊语</translation>
+ <location filename="../languages.cpp" line="289"/>
+ <source>Modern Greek</source>
+ <translation>现代希腊语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="291"/>
- <source>Baltic</source>
- <translation>波罗的海语</translation>
+ <location filename="../languages.cpp" line="291"/>
+ <source>Baltic</source>
+ <translation>波罗的海语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="292"/>
- <source>Celtic</source>
- <translation>凯尔特语</translation>
+ <location filename="../languages.cpp" line="292"/>
+ <source>Celtic</source>
+ <translation>凯尔特语</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="293"/>
- <source>Hebrew charsets</source>
- <translation>希伯来语字符集</translation>
+ <location filename="../languages.cpp" line="293"/>
+ <source>Hebrew charsets</source>
+ <translation>希伯来语字符集</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="295"/>
- <source>Ukrainian, Belarusian</source>
- <translation>乌克兰语，白俄罗斯</translation>
+ <location filename="../languages.cpp" line="295"/>
+ <source>Ukrainian, Belarusian</source>
+ <translation>乌克兰语，白俄罗斯</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="296"/>
- <source>Simplified Chinese charset</source>
- <translation>简体中文字符集</translation>
+ <location filename="../languages.cpp" line="296"/>
+ <source>Simplified Chinese charset</source>
+ <translation>简体中文字符集</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="297"/>
- <source>Traditional Chinese charset</source>
- <translation>繁体中文字符集</translation>
+ <location filename="../languages.cpp" line="297"/>
+ <source>Traditional Chinese charset</source>
+ <translation>繁体中文字符集</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="298"/>
- <source>Japanese charsets</source>
- <translation>日语字符集</translation>
+ <location filename="../languages.cpp" line="298"/>
+ <source>Japanese charsets</source>
+ <translation>日语字符集</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="299"/>
- <source>Korean charset</source>
- <translation>朝鲜语字符集</translation>
+ <location filename="../languages.cpp" line="299"/>
+ <source>Korean charset</source>
+ <translation>朝鲜语字符集</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="300"/>
- <source>Thai charset</source>
- <translation>泰语字符集</translation>
+ <location filename="../languages.cpp" line="300"/>
+ <source>Thai charset</source>
+ <translation>泰语字符集</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="301"/>
- <source>Cyrillic Windows</source>
- <translation>西里尔文 Windows</translation>
+ <location filename="../languages.cpp" line="301"/>
+ <source>Cyrillic Windows</source>
+ <translation>西里尔文 Windows</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="302"/>
- <source>Slavic/Central European Windows</source>
- <translation>斯拉夫语/中欧 Windows</translation>
+ <location filename="../languages.cpp" line="302"/>
+ <source>Slavic/Central European Windows</source>
+ <translation>斯拉夫语/中欧 Windows</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="303"/>
- <source>Arabic Windows</source>
- <translation>阿拉伯语 Windows</translation>
+ <location filename="../languages.cpp" line="303"/>
+ <source>Arabic Windows</source>
+ <translation>阿拉伯语 Windows</translation>
 </message>
 <message>
- <location filename="../languages.cpp" line="304"/>
- <source>Modern Greek Windows</source>
- <translation>现代希腊语 Windows</translation>
+ <location filename="../languages.cpp" line="304"/>
+ <source>Modern Greek Windows</source>
+ <translation>现代希腊语 Windows</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>LogWindow</name>
 <message>
- <location filename="../logwindow.cpp" line="99"/>
- <source>Choose a filename to save under</source>
- <translation>在下面选择要保存的文件名</translation>
+ <location filename="../logwindow.cpp" line="99"/>
+ <source>Choose a filename to save under</source>
+ <translation>在下面选择要保存的文件名</translation>
 </message>
 <message>
- <location filename="../logwindow.cpp" line="100"/>
- <source>Logs</source>
- <translation>日志</translation>
+ <location filename="../logwindow.cpp" line="100"/>
+ <source>Logs</source>
+ <translation>日志</translation>
 </message>
 <message>
- <location filename="../logwindow.cpp" line="105"/>
- <source>Confirm overwrite?</source>
- <translation>确认覆盖?</translation>
+ <location filename="../logwindow.cpp" line="105"/>
+ <source>Confirm overwrite?</source>
+ <translation>确认覆盖?</translation>
 </message>
 <message>
- <location filename="../logwindow.cpp" line="106"/>
- <source>The file already exists.
+ <location filename="../logwindow.cpp" line="106"/>
+ <source>The file already exists.
 Do you want to overwrite?</source>
- <translation>文件己存在。
+ <translation>文件己存在。
 是否覆盖?</translation>
 </message>
 <message>
- <location filename="../logwindow.cpp" line="125"/>
- <source>Error saving file</source>
- <translation>保存文件时出错</translation>
+ <location filename="../logwindow.cpp" line="125"/>
+ <source>Error saving file</source>
+ <translation>保存文件时出错</translation>
 </message>
 <message>
- <location filename="../logwindow.cpp" line="126"/>
- <source>The log couldn&apos;t be saved</source>
- <translation>日志不能被保存</translation>
+ <location filename="../logwindow.cpp" line="126"/>
+ <source>The log couldn&apos;t be saved</source>
+ <translation>日志不能被保存</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>LogWindowBase</name>
 <message>
- <location filename="../logwindowbase.ui" line="14"/>
- <source>Log Window</source>
- <translation>日志窗口</translation>
+ <location filename="../logwindowbase.ui" line="14"/>
+ <source>Log Window</source>
+ <translation>日志窗口</translation>
 </message>
 <message>
- <location filename="../logwindowbase.ui" line="57"/>
- <location filename="../logwindowbase.ui" line="60"/>
- <source>Save</source>
- <translation>保存</translation>
+ <location filename="../logwindowbase.ui" line="57"/>
+ <location filename="../logwindowbase.ui" line="60"/>
+ <source>Save</source>
+ <translation>保存</translation>
 </message>
 <message>
- <location filename="../logwindowbase.ui" line="67"/>
- <location filename="../logwindowbase.ui" line="70"/>
- <source>Copy to clipboard</source>
- <translation>复制到剪贴板</translation>
+ <location filename="../logwindowbase.ui" line="67"/>
+ <location filename="../logwindowbase.ui" line="70"/>
+ <source>Copy to clipboard</source>
+ <translation>复制到剪贴板</translation>
 </message>
 <message>
- <location filename="../logwindowbase.ui" line="77"/>
- <source>Close</source>
- <translation>关闭</translation>
+ <location filename="../logwindowbase.ui" line="77"/>
+ <source>Close</source>
+ <translation>关闭</translation>
 </message>
 <message>
- <location filename="../logwindowbase.ui" line="80"/>
- <source>&amp;Close</source>
- <translation>关闭(&amp;C)</translation>
+ <location filename="../logwindowbase.ui" line="80"/>
+ <source>&amp;Close</source>
+ <translation>关闭(&amp;C)</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>MiniGui</name>
 <message>
- <location filename="../minigui.cpp" line="157"/>
- <source>Control bar</source>
- <translation>控制栏</translation>
+ <location filename="../minigui.cpp" line="157"/>
+ <source>Control bar</source>
+ <translation>控制栏</translation>
 </message>
 <message>
- <location filename="../minigui.cpp" line="160"/>
- <source>Edit &amp;control bar</source>
- <translation>编辑控制栏(&amp;C)</translation>
+ <location filename="../minigui.cpp" line="160"/>
+ <source>Edit &amp;control bar</source>
+ <translation>编辑控制栏(&amp;C)</translation>
 </message>
 <message>
- <location filename="../minigui.cpp" line="161"/>
- <source>Edit &amp;floating control</source>
- <translation>编辑浮动控件(&amp;F)</translation>
+ <location filename="../minigui.cpp" line="161"/>
+ <source>Edit &amp;floating control</source>
+ <translation>编辑浮动控件(&amp;F)</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>MpcGui</name>
 <message>
- <location filename="../mpcgui/mpcgui.cpp" line="133"/>
- <source>Control bar</source>
- <translation>控制栏</translation>
+ <location filename="../mpcgui/mpcgui.cpp" line="133"/>
+ <source>Control bar</source>
+ <translation>控制栏</translation>
 </message>
 <message>
- <location filename="../mpcgui/mpcgui.cpp" line="134"/>
- <source>Seek bar</source>
- <translation>定位栏</translation>
+ <location filename="../mpcgui/mpcgui.cpp" line="134"/>
+ <source>Seek bar</source>
+ <translation>定位栏</translation>
 </message>
 <message>
- <location filename="../mpcgui/mpcgui.cpp" line="427"/>
- <location filename="../mpcgui/mpcgui.cpp" line="428"/>
- <location filename="../mpcgui/mpcgui.cpp" line="429"/>
- <source>-%1</source>
- <translation>-%1</translation>
+ <location filename="../mpcgui/mpcgui.cpp" line="427"/>
+ <location filename="../mpcgui/mpcgui.cpp" line="428"/>
+ <location filename="../mpcgui/mpcgui.cpp" line="429"/>
+ <source>-%1</source>
+ <translation>-%1</translation>
 </message>
 <message>
- <location filename="../mpcgui/mpcgui.cpp" line="431"/>
- <location filename="../mpcgui/mpcgui.cpp" line="432"/>
- <location filename="../mpcgui/mpcgui.cpp" line="433"/>
- <source>+%1</source>
- <translation>+%1</translation>
+ <location filename="../mpcgui/mpcgui.cpp" line="431"/>
+ <location filename="../mpcgui/mpcgui.cpp" line="432"/>
+ <location filename="../mpcgui/mpcgui.cpp" line="433"/>
+ <source>+%1</source>
+ <translation>+%1</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>Playlist</name>
 <message>
- <location filename="../playlist.cpp" line="281"/>
- <source>Name</source>
- <translation>名称</translation>
+ <location filename="../playlist.cpp" line="281"/>
+ <source>Name</source>
+ <translation>名称</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="281"/>
- <source>Length</source>
- <translation>长度</translation>
+ <location filename="../playlist.cpp" line="281"/>
+ <source>Length</source>
+ <translation>长度</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="283"/>
- <source>&amp;Load</source>
- <translation>加载(&amp;L)</translation>
+ <location filename="../playlist.cpp" line="283"/>
+ <source>&amp;Load</source>
+ <translation>加载(&amp;L)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="284"/>
- <source>&amp;Save</source>
- <translation>保存(&amp;S)</translation>
+ <location filename="../playlist.cpp" line="284"/>
+ <source>&amp;Save</source>
+ <translation>保存(&amp;S)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="286"/>
- <source>&amp;Play</source>
- <translation>播放(&amp;P)</translation>
+ <location filename="../playlist.cpp" line="286"/>
+ <source>&amp;Play</source>
+ <translation>播放(&amp;P)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="288"/>
- <source>&amp;Next</source>
- <translation>下一个(&amp;N)</translation>
+ <location filename="../playlist.cpp" line="288"/>
+ <source>&amp;Next</source>
+ <translation>下一个(&amp;N)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="289"/>
- <source>Pre&amp;vious</source>
- <translation>上一个(&amp;V)</translation>
+ <location filename="../playlist.cpp" line="289"/>
+ <source>Pre&amp;vious</source>
+ <translation>上一个(&amp;V)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="301"/>
- <source>Move &amp;up</source>
- <translation>向上移动(&amp;U)</translation>
+ <location filename="../playlist.cpp" line="301"/>
+ <source>Move &amp;up</source>
+ <translation>向上移动(&amp;U)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="302"/>
- <source>Move &amp;down</source>
- <translation>向下移动(&amp;D)</translation>
+ <location filename="../playlist.cpp" line="302"/>
+ <source>Move &amp;down</source>
+ <translation>向下移动(&amp;D)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="304"/>
- <source>&amp;Repeat</source>
- <translation>重复(&amp;R)</translation>
+ <location filename="../playlist.cpp" line="304"/>
+ <source>&amp;Repeat</source>
+ <translation>重复(&amp;R)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="305"/>
- <source>S&amp;huffle</source>
- <translation>乱序(&amp;H)</translation>
+ <location filename="../playlist.cpp" line="305"/>
+ <source>S&amp;huffle</source>
+ <translation>乱序(&amp;H)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="308"/>
- <source>Add &amp;current file</source>
- <translation>添加当前文件(&amp;C)</translation>
+ <location filename="../playlist.cpp" line="308"/>
+ <source>Add &amp;current file</source>
+ <translation>添加当前文件(&amp;C)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="309"/>
- <source>Add &amp;file(s)</source>
- <translation>添加文件(&amp;F)</translation>
+ <location filename="../playlist.cpp" line="309"/>
+ <source>Add &amp;file(s)</source>
+ <translation>添加文件(&amp;F)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="310"/>
- <source>Add &amp;directory</source>
- <translation>添加目录(&amp;D)</translation>
+ <location filename="../playlist.cpp" line="310"/>
+ <source>Add &amp;directory</source>
+ <translation>添加目录(&amp;D)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="313"/>
- <source>Remove &amp;selected</source>
- <translation>删除选定(&amp;S)</translation>
+ <location filename="../playlist.cpp" line="313"/>
+ <source>Remove &amp;selected</source>
+ <translation>删除选定(&amp;S)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="314"/>
- <source>Remove &amp;all</source>
- <translation>删除全部(&amp;A)</translation>
+ <location filename="../playlist.cpp" line="314"/>
+ <source>Remove &amp;all</source>
+ <translation>删除全部(&amp;A)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="317"/>
- <source>&amp;Edit</source>
- <translation>编辑(&amp;E)</translation>
+ <location filename="../playlist.cpp" line="317"/>
+ <source>&amp;Edit</source>
+ <translation>编辑(&amp;E)</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="321"/>
- <source>Add...</source>
- <translation>添加...</translation>
+ <location filename="../playlist.cpp" line="321"/>
+ <source>Add...</source>
+ <translation>添加...</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="323"/>
- <source>Remove...</source>
- <translation>删除...</translation>
+ <location filename="../playlist.cpp" line="323"/>
+ <source>Remove...</source>
+ <translation>删除...</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="327"/>
- <source>SMPlayer - Playlist</source>
- <translation>SMPlayer - 播放列表</translation>
+ <location filename="../playlist.cpp" line="327"/>
+ <source>SMPlayer - Playlist</source>
+ <translation>SMPlayer - 播放列表</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="804"/>
- <source>Choose a file</source>
- <translation>选择一个文件</translation>
+ <location filename="../playlist.cpp" line="804"/>
+ <source>Choose a file</source>
+ <translation>选择一个文件</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="806"/>
- <location filename="../playlist.cpp" line="824"/>
- <source>Playlists</source>
- <translation>播放列表</translation>
+ <location filename="../playlist.cpp" line="806"/>
+ <location filename="../playlist.cpp" line="824"/>
+ <source>Playlists</source>
+ <translation>播放列表</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="822"/>
- <source>Choose a filename</source>
- <translation>选择一个文件名</translation>
+ <location filename="../playlist.cpp" line="822"/>
+ <source>Choose a filename</source>
+ <translation>选择一个文件名</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="833"/>
- <source>Confirm overwrite?</source>
- <translation>确认覆盖?</translation>
+ <location filename="../playlist.cpp" line="833"/>
+ <source>Confirm overwrite?</source>
+ <translation>确认覆盖?</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="834"/>
- <source>The file %1 already exists.
+ <location filename="../playlist.cpp" line="834"/>
+ <source>The file %1 already exists.
 Do you want to overwrite?</source>
- <translation>文件 %1 己存在。
+ <translation>文件 %1 己存在。
 是否覆盖?</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="859"/>
- <source>Playlist modified</source>
- <translation>播放列表己修改</translation>
+ <location filename="../playlist.cpp" line="859"/>
+ <source>Playlist modified</source>
+ <translation>播放列表己修改</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="860"/>
- <source>There are unsaved changes, do you want to save the playlist?</source>
- <translation>有未保存的更改，您要保存播放列表吗?</translation>
+ <location filename="../playlist.cpp" line="860"/>
+ <source>There are unsaved changes, do you want to save the playlist?</source>
+ <translation>有未保存的更改，您要保存播放列表吗?</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="1018"/>
- <source>Select one or more files to open</source>
- <translation>选择一个或多个文件打开</translation>
+ <location filename="../playlist.cpp" line="1018"/>
+ <source>Select one or more files to open</source>
+ <translation>选择一个或多个文件打开</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="1020"/>
- <source>Multimedia</source>
- <translation>多媒体</translation>
+ <location filename="../playlist.cpp" line="1020"/>
+ <source>Multimedia</source>
+ <translation>多媒体</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="1021"/>
- <source>All files</source>
- <translation>所有文件</translation>
+ <location filename="../playlist.cpp" line="1021"/>
+ <source>All files</source>
+ <translation>所有文件</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="1074"/>
- <source>Choose a directory</source>
- <translation>选择一个目录</translation>
+ <location filename="../playlist.cpp" line="1074"/>
+ <source>Choose a directory</source>
+ <translation>选择一个目录</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="1274"/>
- <source>Edit name</source>
- <translation>编辑名称</translation>
+ <location filename="../playlist.cpp" line="1274"/>
+ <source>Edit name</source>
+ <translation>编辑名称</translation>
 </message>
 <message>
- <location filename="../playlist.cpp" line="1275"/>
- <source>Type the name that will be displayed in the playlist for this file:</source>
- <translation>给该文件键入一个将显示在播放列表中的名称:</translation>
+ <location filename="../playlist.cpp" line="1275"/>
+ <source>Type the name that will be displayed in the playlist for this file:</source>
+ <translation>给该文件键入一个将显示在播放列表中的名称:</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>PrefAdvanced</name>
 <message>
- <location filename="../prefadvanced.ui" line="24"/>
- <source>&amp;Advanced</source>
- <translation>高级(&amp;A)</translation>
+ <location filename="../prefadvanced.ui" line="24"/>
+ <source>&amp;Advanced</source>
+ <translation>高级(&amp;A)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="38"/>
- <source>icon</source>
- <translation>icon</translation>
+ <location filename="../prefadvanced.ui" line="38"/>
+ <source>icon</source>
+ <translation>icon</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="48"/>
- <source>&amp;Monitor aspect:</source>
- <translation>显示器纵横比(&amp;M):</translation>
+ <location filename="../prefadvanced.ui" line="48"/>
+ <source>&amp;Monitor aspect:</source>
+ <translation>显示器纵横比(&amp;M):</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="105"/>
- <source>&amp;Run MPlayer in its own window</source>
- <translation>让 MPlayer 在自己的窗口中运行(&amp;R)</translation>
+ <location filename="../prefadvanced.ui" line="105"/>
+ <source>&amp;Run MPlayer in its own window</source>
+ <translation>让 MPlayer 在自己的窗口中运行(&amp;R)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="112"/>
- <source>Rebuild &amp;index if needed</source>
- <translation>需要时重建索引(&amp;I)</translation>
+ <location filename="../prefadvanced.ui" line="112"/>
+ <source>Rebuild &amp;index if needed</source>
+ <translation>需要时重建索引(&amp;I)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="121"/>
- <source>C&amp;orrect PTS:</source>
- <translation>修正 PTS(&amp;O):</translation>
+ <location filename="../prefadvanced.ui" line="121"/>
+ <source>C&amp;orrect PTS:</source>
+ <translation>修正 PTS(&amp;O):</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="149"/>
- <source>&amp;Pass short filenames (8+3) to MPlayer</source>
- <translation>传送短文件名 (8+3) 至 MPlayer (&amp;P)</translation>
+ <location filename="../prefadvanced.ui" line="149"/>
+ <source>&amp;Pass short filenames (8+3) to MPlayer</source>
+ <translation>传送短文件名 (8+3) 至 MPlayer (&amp;P)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="156"/>
- <source>Repaint the backgroun&amp;d of the video window</source>
- <translation>重绘视频窗口背景(&amp;D)</translation>
+ <location filename="../prefadvanced.ui" line="156"/>
+ <source>Repaint the backgroun&amp;d of the video window</source>
+ <translation>重绘视频窗口背景(&amp;D)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="176"/>
- <source>R&amp;un the following actions every time a file is opened. The actions must be separated with spaces:</source>
- <translation>每次打开文件时执行以下动作。动作之间必需用空格隔开(&amp;U):</translation>
+ <location filename="../prefadvanced.ui" line="176"/>
+ <source>R&amp;un the following actions every time a file is opened. The actions must be separated with spaces:</source>
+ <translation>每次打开文件时执行以下动作。动作之间必需用空格隔开(&amp;U):</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="213"/>
- <source>&amp;Colorkey:</source>
- <translation>色键(&amp;C):</translation>
+ <location filename="../prefadvanced.ui" line="213"/>
+ <source>&amp;Colorkey:</source>
+ <translation>色键(&amp;C):</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="236"/>
- <source>C&amp;hange...</source>
- <translation>更改(&amp;H)...</translation>
+ <location filename="../prefadvanced.ui" line="236"/>
+ <source>C&amp;hange...</source>
+ <translation>更改(&amp;H)...</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="261"/>
- <source>Show tag in&amp;fo in window title</source>
- <translation>在窗口标题上显示标签信息(&amp;F)</translation>
+ <location filename="../prefadvanced.ui" line="261"/>
+ <source>Show tag in&amp;fo in window title</source>
+ <translation>在窗口标题上显示标签信息(&amp;F)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="285"/>
- <source>Options for MP&amp;layer</source>
- <translation>MPlayer 选项(&amp;L)</translation>
+ <location filename="../prefadvanced.ui" line="285"/>
+ <source>Options for MP&amp;layer</source>
+ <translation>MPlayer 选项(&amp;L)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="297"/>
- <source>Here you can pass extra options to MPlayer.
+ <location filename="../prefadvanced.ui" line="297"/>
+ <source>Here you can pass extra options to MPlayer.
 Write them separated by spaces.
 Example: -flip -nosound</source>
- <translation>在这里您可以传送附加选项至 MPlayer。
+ <translation>在这里您可以传送附加选项至 MPlayer。
 请用空格分开写入它们。
 实例: -flip -nosound</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="320"/>
- <source>&amp;Options:</source>
- <translation>选项(&amp;O):</translation>
+ <location filename="../prefadvanced.ui" line="320"/>
+ <source>&amp;Options:</source>
+ <translation>选项(&amp;O):</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="357"/>
- <source>You can also pass additional video filters.
+ <location filename="../prefadvanced.ui" line="357"/>
+ <source>You can also pass additional video filters.
 Separate them with &quot;,&quot;. Do not use spaces!
 Example: scale=512:-2,eq2=1.1</source>
- <translation>您还可以传送附加的视频过滤器。
+ <translation>您还可以传送附加的视频过滤器。
 请用“,”分隔它们。不要使用空格!
 实例: scale=512:-2,eq2=1.1</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="380"/>
- <source>V&amp;ideo filters:</source>
- <translation>视频过滤器(&amp;I):</translation>
+ <location filename="../prefadvanced.ui" line="380"/>
+ <source>V&amp;ideo filters:</source>
+ <translation>视频过滤器(&amp;I):</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="417"/>
- <source>And finally audio filters. Same rule as for video filters.
+ <location filename="../prefadvanced.ui" line="417"/>
+ <source>And finally audio filters. Same rule as for video filters.
 Example: resample=44100:0:0,volnorm</source>
- <translation>最后是音频过滤器。和视频过滤器的规则一样。
+ <translation>最后是音频过滤器。和视频过滤器的规则一样。
 实例: resample=44100:0:0,volnorm</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="439"/>
- <source>Audio &amp;filters:</source>
- <translation>音频过滤器(&amp;F):</translation>
+ <location filename="../prefadvanced.ui" line="439"/>
+ <source>Audio &amp;filters:</source>
+ <translation>音频过滤器(&amp;F):</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="471"/>
- <source>&amp;Network</source>
- <translation>网络(&amp;N)</translation>
+ <location filename="../prefadvanced.ui" line="471"/>
+ <source>&amp;Network</source>
+ <translation>网络(&amp;N)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="477"/>
- <source>Network Connection</source>
- <translation>网络连接</translation>
+ <location filename="../prefadvanced.ui" line="477"/>
+ <source>Network Connection</source>
+ <translation>网络连接</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="489"/>
- <source>IPv&amp;4</source>
- <translation>IPv4(&amp;4)</translation>
+ <location filename="../prefadvanced.ui" line="489"/>
+ <source>IPv&amp;4</source>
+ <translation>IPv4(&amp;4)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="496"/>
- <source>IPv&amp;6</source>
- <translation>IPv6(&amp;6)</translation>
+ <location filename="../prefadvanced.ui" line="496"/>
+ <source>IPv&amp;6</source>
+ <translation>IPv6(&amp;6)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="520"/>
- <source>Lo&amp;gs</source>
- <translation>日志(&amp;G)</translation>
+ <location filename="../prefadvanced.ui" line="520"/>
+ <source>Lo&amp;gs</source>
+ <translation>日志(&amp;G)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="526"/>
- <source>MPlayer</source>
- <translation>MPlayer</translation>
+ <location filename="../prefadvanced.ui" line="526"/>
+ <source>MPlayer</source>
+ <translation>MPlayer</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="591"/>
- <source>SMPlayer</source>
- <translation>SMPlayer</translation>
+ <location filename="../prefadvanced.ui" line="591"/>
+ <source>SMPlayer</source>
+ <translation>SMPlayer</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="597"/>
- <source>Log &amp;SMPlayer output</source>
- <translation>记录 SMPlayer 输出(&amp;S)</translation>
+ <location filename="../prefadvanced.ui" line="597"/>
+ <source>Log &amp;SMPlayer output</source>
+ <translation>记录 SMPlayer 输出(&amp;S)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="629"/>
- <source>Sa&amp;ve SMPlayer log to a file</source>
- <translation>保存 SMPlayer 日志到一个文件(&amp;V)</translation>
+ <location filename="../prefadvanced.ui" line="629"/>
+ <source>Sa&amp;ve SMPlayer log to a file</source>
+ <translation>保存 SMPlayer 日志到一个文件(&amp;V)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="532"/>
- <source>Log MPlayer &amp;output</source>
- <translation>记录 MPlayer 输出(&amp;O)</translation>
+ <location filename="../prefadvanced.ui" line="532"/>
+ <source>Log MPlayer &amp;output</source>
+ <translation>记录 MPlayer 输出(&amp;O)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="564"/>
- <source>&amp;Verbose</source>
- <translation>详细信息(&amp;V)</translation>
+ <location filename="../prefadvanced.ui" line="564"/>
+ <source>&amp;Verbose</source>
+ <translation>详细信息(&amp;V)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="571"/>
- <source>A&amp;utosave MPlayer log to file</source>
- <translation>自动保存 MPlayer 日志到文件(&amp;U)</translation>
+ <location filename="../prefadvanced.ui" line="571"/>
+ <source>A&amp;utosave MPlayer log to file</source>
+ <translation>自动保存 MPlayer 日志到文件(&amp;U)</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="658"/>
- <source>This option is mainly intended for debugging the application.</source>
- <translation>这个选项主要用于调试应用程序。</translation>
+ <location filename="../prefadvanced.ui" line="658"/>
+ <source>This option is mainly intended for debugging the application.</source>
+ <translation>这个选项主要用于调试应用程序。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.ui" line="668"/>
- <source>&amp;Filter for SMPlayer logs:</source>
- <translation>过滤 SMPlayer 日志(&amp;F):</translation>
+ <location filename="../prefadvanced.ui" line="668"/>
+ <source>&amp;Filter for SMPlayer logs:</source>
+ <translation>过滤 SMPlayer 日志(&amp;F):</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="74"/>
- <location filename="../prefadvanced.cpp" line="392"/>
- <source>Advanced</source>
- <translation>高级</translation>
+ <location filename="../prefadvanced.cpp" line="74"/>
+ <location filename="../prefadvanced.cpp" line="392"/>
+ <source>Advanced</source>
+ <translation>高级</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="87"/>
- <source>Auto</source>
- <translation>自动</translation>
+ <location filename="../prefadvanced.cpp" line="87"/>
+ <source>Auto</source>
+ <translation>自动</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="394"/>
- <source>Monitor aspect</source>
- <translation>显示器纵横比</translation>
+ <location filename="../prefadvanced.cpp" line="394"/>
+ <source>Monitor aspect</source>
+ <translation>显示器纵横比</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="395"/>
- <source>Select the aspect ratio of your monitor.</source>
- <translation>选择您的显示器的纵横比。</translation>
+ <location filename="../prefadvanced.cpp" line="395"/>
+ <source>Select the aspect ratio of your monitor.</source>
+ <translation>选择您的显示器的纵横比。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="397"/>
- <source>Run MPlayer in its own window</source>
- <translation>让 MPlayer 在自己的窗口中运行</translation>
+ <location filename="../prefadvanced.cpp" line="397"/>
+ <source>Run MPlayer in its own window</source>
+ <translation>让 MPlayer 在自己的窗口中运行</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="398"/>
- <source>If you check this option, the MPlayer video window won&apos;t be embedded in SMPlayer&apos;s main window but instead it will use its own window. Note that mouse and keyboard events will be handled directly by MPlayer, that means key shortcuts and mouse clicks probably won&apos;t work as expected when the MPlayer window has the focus.</source>
- <translation>如果选中此选项，MPlayer 的视频窗口将不会被嵌入到 SMPlayer 的主窗口中，它会使用其自己的窗口。请注意，键盘和鼠标事件将可直接由 MPlayer 处理，这意味着当焦点在 MPlayer 窗口时快捷键和鼠标点击动作很可能无法按预期工作。</translation>
+ <location filename="../prefadvanced.cpp" line="398"/>
+ <source>If you check this option, the MPlayer video window won&apos;t be embedded in SMPlayer&apos;s main window but instead it will use its own window. Note that mouse and keyboard events will be handled directly by MPlayer, that means key shortcuts and mouse clicks probably won&apos;t work as expected when the MPlayer window has the focus.</source>
+ <translation>如果选中此选项，MPlayer 的视频窗口将不会被嵌入到 SMPlayer 的主窗口中，它会使用其自己的窗口。请注意，键盘和鼠标事件将可直接由 MPlayer 处理，这意味着当焦点在 MPlayer 窗口时快捷键和鼠标点击动作很可能无法按预期工作。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="405"/>
- <source>Rebuild index if needed</source>
- <translation>需要时重建索引</translation>
+ <location filename="../prefadvanced.cpp" line="405"/>
+ <source>Rebuild index if needed</source>
+ <translation>需要时重建索引</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="406"/>
- <source>Rebuilds index of files if no index was found, allowing seeking. Useful with broken/incomplete downloads, or badly created files. This option only works if the underlying media supports seeking (i.e. not with stdin, pipe, etc).&lt;br&gt; &lt;b&gt;Note:&lt;/b&gt; the creation of the index may take some time.</source>
- <translation>在没有找到索引的情况下重建索引文件，从而允许定位。对于损坏/未完成下载或制作低劣的文件有用。此选项仅对原本支持定位的媒体有效(即不能是 stdin, pipe 等)。&lt;br&gt;&lt;b&gt;注意:&lt;/b&gt; 创建索引可能需要一些时间。</translation>
+ <location filename="../prefadvanced.cpp" line="406"/>
+ <source>Rebuilds index of files if no index was found, allowing seeking. Useful with broken/incomplete downloads, or badly created files. This option only works if the underlying media supports seeking (i.e. not with stdin, pipe, etc).&lt;br&gt; &lt;b&gt;Note:&lt;/b&gt; the creation of the index may take some time.</source>
+ <translation>在没有找到索引的情况下重建索引文件，从而允许定位。对于损坏/未完成下载或制作低劣的文件有用。此选项仅对原本支持定位的媒体有效(即不能是 stdin, pipe 等)。&lt;br&gt;&lt;b&gt;注意:&lt;/b&gt; 创建索引可能需要一些时间。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="412"/>
- <source>Correct pts</source>
- <translation>修正 PTS</translation>
+ <location filename="../prefadvanced.cpp" line="412"/>
+ <source>Correct pts</source>
+ <translation>修正 PTS</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="413"/>
- <source>Switches MPlayer to an experimental mode where timestamps for video frames are calculated differently and video filters which add new frames or modify timestamps of existing ones are supported. The more accurate timestamps can be visible for example when playing subtitles timed to scene changes with the SSA/ASS library enabled. Without correct pts the subtitle timing will typically be off by some frames. This option does not work correctly with some demuxers and codecs.</source>
- <translation>切换 MPlayer 到试验模式，其中视频帧的时间戳计算不同，且支持视频过滤器添加新的帧或修改已有的时间戳。可以看到更精确的时间戳，例如通过启用 SSA/ASS 库修改播放字幕与场景同步。如果没有修正 PTS，字幕同步通常会被某些帧关闭。此选项不能与某些分离器和编解码器一起正常工作。</translation>
+ <location filename="../prefadvanced.cpp" line="413"/>
+ <source>Switches MPlayer to an experimental mode where timestamps for video frames are calculated differently and video filters which add new frames or modify timestamps of existing ones are supported. The more accurate timestamps can be visible for example when playing subtitles timed to scene changes with the SSA/ASS library enabled. Without correct pts the subtitle timing will typically be off by some frames. This option does not work correctly with some demuxers and codecs.</source>
+ <translation>切换 MPlayer 到试验模式，其中视频帧的时间戳计算不同，且支持视频过滤器添加新的帧或修改已有的时间戳。可以看到更精确的时间戳，例如通过启用 SSA/ASS 库修改播放字幕与场景同步。如果没有修正 PTS，字幕同步通常会被某些帧关闭。此选项不能与某些分离器和编解码器一起正常工作。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="423"/>
- <source>Pass short filenames (8+3) to MPlayer</source>
- <translation>传送短文件名 (8+3) 至 MPlayer</translation>
+ <location filename="../prefadvanced.cpp" line="423"/>
+ <source>Pass short filenames (8+3) to MPlayer</source>
+ <translation>传送短文件名 (8+3) 至 MPlayer</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="424"/>
- <source>Currently MPlayer can&apos;t open filenames which contains characters outside the local codepage. Checking this option will make SMPlayer to pass to MPlayer the short version of the filenames, and thus it will able to open them.</source>
- <translation>目前 MPlayer 无法打开包含本地代码页以外字符的文件名。选中此选项 SMPlayer 将生成短文版的文件名传送至 MPlayer，从而使其能够打开它们。</translation>
+ <location filename="../prefadvanced.cpp" line="424"/>
+ <source>Currently MPlayer can&apos;t open filenames which contains characters outside the local codepage. Checking this option will make SMPlayer to pass to MPlayer the short version of the filenames, and thus it will able to open them.</source>
+ <translation>目前 MPlayer 无法打开包含本地代码页以外字符的文件名。选中此选项 SMPlayer 将生成短文版的文件名传送至 MPlayer，从而使其能够打开它们。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="432"/>
- <source>Repaint the background of the video window</source>
- <translation>重绘视频窗口背景</translation>
+ <location filename="../prefadvanced.cpp" line="432"/>
+ <source>Repaint the background of the video window</source>
+ <translation>重绘视频窗口背景</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="433"/>
- <source>Checking this option may reduce flickering, but it also might produce that the video won&apos;t be displayed properly.</source>
- <translation>选中此选项可能会减少闪烁，但它也可能导致视频无法正确显示。</translation>
+ <location filename="../prefadvanced.cpp" line="433"/>
+ <source>Checking this option may reduce flickering, but it also might produce that the video won&apos;t be displayed properly.</source>
+ <translation>选中此选项可能会减少闪烁，但它也可能导致视频无法正确显示。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="438"/>
- <source>Colorkey</source>
- <translation>色键</translation>
+ <location filename="../prefadvanced.cpp" line="438"/>
+ <source>Colorkey</source>
+ <translation>色键</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="439"/>
- <source>If you see parts of the video over any other window, you can change the colorkey to fix it. Try to select a color close to black.</source>
- <translation>如果您看到视频部分出现在任何其他窗口上，您可以通过更改色键来修复它。请尽量选中接近黑色的颜色。</translation>
+ <location filename="../prefadvanced.cpp" line="439"/>
+ <source>If you see parts of the video over any other window, you can change the colorkey to fix it. Try to select a color close to black.</source>
+ <translation>如果您看到视频部分出现在任何其他窗口上，您可以通过更改色键来修复它。请尽量选中接近黑色的颜色。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="444"/>
- <source>Actions list</source>
- <translation>动作列表</translation>
+ <location filename="../prefadvanced.cpp" line="444"/>
+ <source>Actions list</source>
+ <translation>动作列表</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="445"/>
- <source>Here you can specify a list of &lt;i&gt;actions&lt;/i&gt; which will be run every time a file is opened. You&apos;ll find all available actions in the key shortcut editor in the &lt;b&gt;Keyboard and mouse&lt;/b&gt; section. The actions must be separated by spaces. Checkable actions can be followed by &lt;i&gt;true&lt;/i&gt; or &lt;i&gt;false&lt;/i&gt; to enable or disable the action.</source>
- <translation>在这里您可以指定在每个文件被打开时将执行的&lt;i&gt;动作&lt;/i&gt;列表。您可以在&lt;b&gt;键盘和鼠标&lt;/b&gt;的快捷键编辑器中查找所有可用的动作。动作之间必需用空格隔开。可以在动作后面用 &lt;i&gt;true&lt;/i&gt; 或 &lt;i&gt;false&lt;/i&gt; 来启用或禁用它们。</translation>
+ <location filename="../prefadvanced.cpp" line="445"/>
+ <source>Here you can specify a list of &lt;i&gt;actions&lt;/i&gt; which will be run every time a file is opened. You&apos;ll find all available actions in the key shortcut editor in the &lt;b&gt;Keyboard and mouse&lt;/b&gt; section. The actions must be separated by spaces. Checkable actions can be followed by &lt;i&gt;true&lt;/i&gt; or &lt;i&gt;false&lt;/i&gt; to enable or disable the action.</source>
+ <translation>在这里您可以指定在每个文件被打开时将执行的&lt;i&gt;动作&lt;/i&gt;列表。您可以在&lt;b&gt;键盘和鼠标&lt;/b&gt;的快捷键编辑器中查找所有可用的动作。动作之间必需用空格隔开。可以在动作后面用 &lt;i&gt;true&lt;/i&gt; 或 &lt;i&gt;false&lt;/i&gt; 来启用或禁用它们。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="451"/>
- <source>Example:</source>
- <translation>实例:</translation>
+ <location filename="../prefadvanced.cpp" line="451"/>
+ <source>Example:</source>
+ <translation>实例:</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="452"/>
- <source>Limitation: the actions are run only when a file is opened and not when the mplayer process is restarted (e.g. you select an audio or video filter).</source>
- <translation>限制: 只有当文件被打开时才会执行动作，MPlayer 进程重启时动作是无效的(例如您选择音频或视频过滤器时)。</translation>
+ <location filename="../prefadvanced.cpp" line="452"/>
+ <source>Limitation: the actions are run only when a file is opened and not when the mplayer process is restarted (e.g. you select an audio or video filter).</source>
+ <translation>限制: 只有当文件被打开时才会执行动作，MPlayer 进程重启时动作是无效的(例如您选择音频或视频过滤器时)。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="456"/>
- <source>Show tag info in window title</source>
- <translation>在窗口标题上显示标签信息</translation>
+ <location filename="../prefadvanced.cpp" line="456"/>
+ <source>Show tag info in window title</source>
+ <translation>在窗口标题上显示标签信息</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="457"/>
- <source>If this option is enabled, information from tags will be shown in window title. Otherwise only the filename will be shown.</source>
- <translation>如果启用此选项，标签信息将显示在窗口标题上。否则将只会显示文件名。</translation>
+ <location filename="../prefadvanced.cpp" line="457"/>
+ <source>If this option is enabled, information from tags will be shown in window title. Otherwise only the filename will be shown.</source>
+ <translation>如果启用此选项，标签信息将显示在窗口标题上。否则将只会显示文件名。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="461"/>
- <source>Options for MPlayer</source>
- <translation>MPlayer 选项</translation>
+ <location filename="../prefadvanced.cpp" line="461"/>
+ <source>Options for MPlayer</source>
+ <translation>MPlayer 选项</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="463"/>
- <source>Options</source>
- <translation>选项</translation>
+ <location filename="../prefadvanced.cpp" line="463"/>
+ <source>Options</source>
+ <translation>选项</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="464"/>
- <source>Here you can type options for MPlayer. Write them separated by spaces.</source>
- <translation>您可以在这里键入 MPlayer 选项。请用空格分开写入它们。</translation>
+ <location filename="../prefadvanced.cpp" line="464"/>
+ <source>Here you can type options for MPlayer. Write them separated by spaces.</source>
+ <translation>您可以在这里键入 MPlayer 选项。请用空格分开写入它们。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="467"/>
- <source>Video filters</source>
- <translation>视频过滤器</translation>
+ <location filename="../prefadvanced.cpp" line="467"/>
+ <source>Video filters</source>
+ <translation>视频过滤器</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="468"/>
- <source>Here you can add video filters for MPlayer. Write them separated by commas. Don&apos;t use spaces!</source>
- <translation>您可以在这里添加 MPlayer 视频过滤器。请用逗号分开写入它们。不要使用空格!</translation>
+ <location filename="../prefadvanced.cpp" line="468"/>
+ <source>Here you can add video filters for MPlayer. Write them separated by commas. Don&apos;t use spaces!</source>
+ <translation>您可以在这里添加 MPlayer 视频过滤器。请用逗号分开写入它们。不要使用空格!</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="471"/>
- <source>Audio filters</source>
- <translation>音频过滤器</translation>
+ <location filename="../prefadvanced.cpp" line="471"/>
+ <source>Audio filters</source>
+ <translation>音频过滤器</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="472"/>
- <source>Here you can add audio filters for MPlayer. Write them separated by commas. Don&apos;t use spaces!</source>
- <translation>您可以在这里添加 MPlayer 音频过滤器。请用逗号分开写入它们。不要使用空格!</translation>
+ <location filename="../prefadvanced.cpp" line="472"/>
+ <source>Here you can add audio filters for MPlayer. Write them separated by commas. Don&apos;t use spaces!</source>
+ <translation>您可以在这里添加 MPlayer 音频过滤器。请用逗号分开写入它们。不要使用空格!</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="475"/>
- <source>Network</source>
- <translation>网络</translation>
+ <location filename="../prefadvanced.cpp" line="475"/>
+ <source>Network</source>
+ <translation>网络</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="477"/>
- <source>IPv4</source>
- <translation>IPv4</translation>
+ <location filename="../prefadvanced.cpp" line="477"/>
+ <source>IPv4</source>
+ <translation>IPv4</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="478"/>
- <source>Use IPv4 on network connections. Falls back on IPv6 automatically.</source>
- <translation>使用 IPv4 网络连接。失败后自动使用 IPv6。</translation>
+ <location filename="../prefadvanced.cpp" line="478"/>
+ <source>Use IPv4 on network connections. Falls back on IPv6 automatically.</source>
+ <translation>使用 IPv4 网络连接。失败后自动使用 IPv6。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="480"/>
- <source>IPv6</source>
- <translation>IPv6</translation>
+ <location filename="../prefadvanced.cpp" line="480"/>
+ <source>IPv6</source>
+ <translation>IPv6</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="481"/>
- <source>Use IPv6 on network connections. Falls back on IPv4 automatically.</source>
- <translation>使用 IPv6 网络连接。失败后自动使用 IPv4。</translation>
+ <location filename="../prefadvanced.cpp" line="481"/>
+ <source>Use IPv6 on network connections. Falls back on IPv4 automatically.</source>
+ <translation>使用 IPv6 网络连接。失败后自动使用 IPv4。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="483"/>
- <source>Logs</source>
- <translation>日志</translation>
+ <location filename="../prefadvanced.cpp" line="483"/>
+ <source>Logs</source>
+ <translation>日志</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="486"/>
- <source>Log SMPlayer output</source>
- <translation>记录 SMPlayer 输出</translation>
+ <location filename="../prefadvanced.cpp" line="486"/>
+ <source>Log SMPlayer output</source>
+ <translation>记录 SMPlayer 输出</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="487"/>
- <source>If this option is checked, SMPlayer will store the debugging messages that SMPlayer outputs (you can see the log in &lt;b&gt;Options -&gt; View logs -&gt; SMPlayer&lt;/b&gt;). This information can be very useful for the developer in case you find a bug.</source>
- <translation>如果这个选项被选中，SMPlayer 将存储其输出的调试信息(您可以通过打开 &lt;b&gt;选项-&gt;查看日志-&gt;SMPlayer&lt;/b&gt; 看到它)。如果您找到了一个 Bug，这些信息将对开发人员很有用。</translation>
+ <location filename="../prefadvanced.cpp" line="487"/>
+ <source>If this option is checked, SMPlayer will store the debugging messages that SMPlayer outputs (you can see the log in &lt;b&gt;Options -&gt; View logs -&gt; SMPlayer&lt;/b&gt;). This information can be very useful for the developer in case you find a bug.</source>
+ <translation>如果这个选项被选中，SMPlayer 将存储其输出的调试信息(您可以通过打开 &lt;b&gt;选项-&gt;查看日志-&gt;SMPlayer&lt;/b&gt; 看到它)。如果您找到了一个 Bug，这些信息将对开发人员很有用。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="493"/>
- <source>Save SMPlayer log to file</source>
- <translation>保存 SMPlayer 日志到文件</translation>
+ <location filename="../prefadvanced.cpp" line="493"/>
+ <source>Save SMPlayer log to file</source>
+ <translation>保存 SMPlayer 日志到文件</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="494"/>
- <source>If this option is checked, the SMPlayer log wil be recorded to %1</source>
- <translation>如果这个选项被选中，SMPlayer 日志将被记录到 %1</translation>
+ <location filename="../prefadvanced.cpp" line="494"/>
+ <source>If this option is checked, the SMPlayer log wil be recorded to %1</source>
+ <translation>如果这个选项被选中，SMPlayer 日志将被记录到 %1</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="499"/>
- <source>Log MPlayer output</source>
- <translation>记录 MPlayer 输出</translation>
+ <location filename="../prefadvanced.cpp" line="499"/>
+ <source>Log MPlayer output</source>
+ <translation>记录 MPlayer 输出</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="500"/>
- <source>If checked, SMPlayer will store the output of MPlayer (you can see it in &lt;b&gt;Options -&gt; View logs -&gt; MPlayer&lt;/b&gt;). In case of problems this log can contain important information, so it&apos;s recommended to keep this option checked.</source>
- <translation>如果选中，SMPlayer 将存储 MPlayer 的输出(您可以通过打开 &lt;b&gt;选项-&gt;查看日志-&gt;MPlayer&lt;/b&gt; 看到它)。如果出现问题，这个日志中包含有可备查用的重要信息，因此建议保留选中此选项。</translation>
+ <location filename="../prefadvanced.cpp" line="500"/>
+ <source>If checked, SMPlayer will store the output of MPlayer (you can see it in &lt;b&gt;Options -&gt; View logs -&gt; MPlayer&lt;/b&gt;). In case of problems this log can contain important information, so it&apos;s recommended to keep this option checked.</source>
+ <translation>如果选中，SMPlayer 将存储 MPlayer 的输出(您可以通过打开 &lt;b&gt;选项-&gt;查看日志-&gt;MPlayer&lt;/b&gt; 看到它)。如果出现问题，这个日志中包含有可备查用的重要信息，因此建议保留选中此选项。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="505"/>
- <source>Autosave MPlayer log</source>
- <translation>自动保存 MPlayer 日志</translation>
+ <location filename="../prefadvanced.cpp" line="505"/>
+ <source>Autosave MPlayer log</source>
+ <translation>自动保存 MPlayer 日志</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="506"/>
- <source>If this option is checked, the MPlayer log will be saved to the specified file every time a new file starts to play. It&apos;s intended for external applications, so they can get info about the file you&apos;re playing.</source>
- <translation>如果这个选项被选中，每次开始播放新文件时 MPlayer 日志将被保存到指定的文件。它是用于外部程序的，这样外部程序可以获取有关您正在播放文件的信息。</translation>
+ <location filename="../prefadvanced.cpp" line="506"/>
+ <source>If this option is checked, the MPlayer log will be saved to the specified file every time a new file starts to play. It&apos;s intended for external applications, so they can get info about the file you&apos;re playing.</source>
+ <translation>如果这个选项被选中，每次开始播放新文件时 MPlayer 日志将被保存到指定的文件。它是用于外部程序的，这样外部程序可以获取有关您正在播放文件的信息。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="511"/>
- <source>Autosave MPlayer log filename</source>
- <translation>自动保存 MPlayer 日志的文件名</translation>
+ <location filename="../prefadvanced.cpp" line="511"/>
+ <source>Autosave MPlayer log filename</source>
+ <translation>自动保存 MPlayer 日志的文件名</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="512"/>
- <source>Enter here the path and filename that will be used to save the MPlayer log.</source>
- <translation>在此输入将被用于保存 MPlayer 日志的路径和文件名。</translation>
+ <location filename="../prefadvanced.cpp" line="512"/>
+ <source>Enter here the path and filename that will be used to save the MPlayer log.</source>
+ <translation>在此输入将被用于保存 MPlayer 日志的路径和文件名。</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="517"/>
- <source>Filter for SMPlayer logs</source>
- <translation>过滤 SMPlayer 日志</translation>
+ <location filename="../prefadvanced.cpp" line="517"/>
+ <source>Filter for SMPlayer logs</source>
+ <translation>过滤 SMPlayer 日志</translation>
 </message>
 <message>
- <location filename="../prefadvanced.cpp" line="518"/>
- <source>This option allows to filter the SMPlayer messages that will be stored in the log. Here you can write any regular expression.&lt;br&gt;For instance: &lt;i&gt;^Core::.*&lt;/i&gt; will display only the lines starting with &lt;i&gt;Core::&lt;/i&gt;</source>
- <translation>此选项允许过滤将要被存储在日志中的 SMPlayer 信息。您可以在这里写入任何正则表达式。&lt;br&gt;例如: &lt;i&gt;^Core::..*&lt;/i&gt; 将只显示以 &lt;i&gt;Core::&lt;/i&gt; 开始的行</translation>
+ <location filename="../prefadvanced.cpp" line="518"/>
+ <source>This option allows to filter the SMPlayer messages that will be stored in the log. Here you can write any regular expression.&lt;br&gt;For instance: &lt;i&gt;^Core::.*&lt;/i&gt; will display only the lines starting with &lt;i&gt;Core::&lt;/i&gt;</source>
+ <translation>此选项允许过滤将要被存储在日志中的 SMPlayer 信息。您可以在这里写入任何正则表达式。&lt;br&gt;例如: &lt;i&gt;^Core::..*&lt;/i&gt; 将只显示以 &lt;i&gt;Core::&lt;/i&gt; 开始的行</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>PrefAssociations</name>
 <message>
- <location filename="../prefassociations.ui" line="26"/>
- <source>File types</source>
- <translation>文件类型</translation>
+ <location filename="../prefassociations.ui" line="26"/>
+ <source>File types</source>
+ <translation>文件类型</translation>
 </message>
 <message>
- <location filename="../prefassociations.ui" line="38"/>
- <source>Media files handled by SMPlayer:</source>
- <translation>由 SMPlayer 处理的媒体文件:</translation>
+ <location filename="../prefassociations.ui" line="38"/>
+ <source>Media files handled by SMPlayer:</source>
+ <translation>由 SMPlayer 处理的媒体文件:</translation>
 </message>
 <message>
- <location filename="../prefassociations.ui" line="91"/>
- <source>Select All</source>
- <translation>选择全部</translation>
+ <location filename="../prefassociations.ui" line="91"/>
+ <source>Select All</source>
+ <translation>选择全部</translation>
 </message>
 <message>
- <location filename="../prefassociations.ui" line="98"/>
- <source>Select None</source>
- <translation>取消选择</translation>
+ <location filename="../prefassociations.ui" line="98"/>
+ <source>Select None</source>
+ <translation>取消选择</translation>
 </message>
 <message>
- <location filename="../prefassociations.cpp" line="196"/>
- <source>Warning</source>
- <translation>警告</translation>
+ <location filename="../prefassociations.cpp" line="196"/>
+ <source>Warning</source>
+ <translation>警告</translation>
 </message>
 <message>
- <location filename="../prefassociations.cpp" line="197"/>
- <source>Not all files could be associated. Please check your security permissions and retry.</source>
- <translation>并非所有文件都被关联。请检查您的安全权限并重试。</translation>
+ <location filename="../prefassociations.cpp" line="197"/>
+ <source>Not all files could be associated. Please check your security permissions and retry.</source>
+ <translation>并非所有文件都被关联。请检查您的安全权限并重试。</translation>
 </message>
 <message>
- <location filename="../prefassociations.cpp" line="207"/>
- <source>File Types</source>
- <translation>文件类型</translation>
+ <location filename="../prefassociations.cpp" line="207"/>
+ <source>File Types</source>
+ <translation>文件类型</translation>
 </message>
 <message>
- <location filename="../prefassociations.cpp" line="224"/>
- <source>Select all</source>
- <translation>选择全部</translation>
+ <location filename="../prefassociations.cpp" line="224"/>
+ <source>Select all</source>
+ <translation>选择全部</translation>
 </message>
 <message>
- <location filename="../prefassociations.cpp" line="225"/>
- <source>Check all file types in the list</source>
- <translation>选中列表中的所有文件类型</translation>
+ <location filename="../prefassociations.cpp" line="225"/>
+ <source>Check all file types in the list</source>
+ <translation>选中列表中的所有文件类型</translation>
 </message>
 <message>
- <location filename="../prefassociations.cpp" line="227"/>
- <source>Select none</source>
- <translation>取消选择</translation>
+ <location filename="../prefassociations.cpp" line="227"/>
+ <source>Select none</source>
+ <translation>取消选择</translation>
 </message>
 <message>
- <location filename="../prefassociations.cpp" line="228"/>
- <source>Uncheck all file types in the list</source>
- <translation>取消选中列表中的所有文件类型</translation>
+ <location filename="../prefassociations.cpp" line="228"/>
+ <source>Uncheck all file types in the list</source>
+ <translation>取消选中列表中的所有文件类型</translation>
 </message>
 <message>
- <location filename="../prefassociations.cpp" line="230"/>
- <source>List of file types</source>
- <translation>文件类型列表</translation>
+ <location filename="../prefassociations.cpp" line="230"/>
+ <source>List of file types</source>
+ <translation>文件类型列表</translation>
 </message>
 <message>
- <location filename="../prefassociations.cpp" line="231"/>
- <source>Check the media file extensions you would like SMPlayer to handle. When you click Apply, the checked files will be associated with SMPlayer. If you uncheck a media type, the file association will be restored.</source>
- <translation>选择您想使用 SMPlayer 处理的媒体文件扩展名。当您单击应用后选中的文件将被关联至 SMPlayer。如果您取消选择一种媒体类型，该文件关联将被恢复。</translation>
+ <location filename="../prefassociations.cpp" line="231"/>
+ <source>Check the media file extensions you would like SMPlayer to handle. When you click Apply, the checked files will be associated with SMPlayer. If you uncheck a media type, the file association will be restored.</source>
+ <translation>选择您想使用 SMPlayer 处理的媒体文件扩展名。当您单击应用后选中的文件将被关联至 SMPlayer。如果您取消选择一种媒体类型，该文件关联将被恢复。</translation>
 </message>
 <message>
- <location filename="../prefassociations.cpp" line="235"/>
- <source> &lt;b&gt;Note:&lt;/b&gt; (Restoration doesn&apos;t work on Windows Vista).</source>
- <translation> &lt;b&gt;注意:&lt;/b&gt; (恢复功能在 Windows Vista 中可能无法工作)。</translation>
+ <location filename="../prefassociations.cpp" line="235"/>
+ <source> &lt;b&gt;Note:&lt;/b&gt; (Restoration doesn&apos;t work on Windows Vista).</source>
+ <translation> &lt;b&gt;注意:&lt;/b&gt; (恢复功能在 Windows Vista 中可能无法工作)。</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>PrefDrives</name>
 <message>
- <location filename="../prefdrives.ui" line="35"/>
- <location filename="../prefdrives.cpp" line="73"/>
- <source>Drives</source>
- <translation>驱动器</translation>
+ <location filename="../prefdrives.ui" line="35"/>
+ <location filename="../prefdrives.cpp" line="73"/>
+ <source>Drives</source>
+ <translation>驱动器</translation>
 </message>
 <message>
- <location filename="../prefdrives.ui" line="56"/>
- <source>SMPlayer does not choose any CDROM or DVD devices by default. So before you can actually play a CD or DVD you have to select the devices you want to use (they can be the same).</source>
- <translation>SMPlayer 默认不选择任何 CDROM 或 DVD 驱动器。因此在您实际播放 CD 或 DVD 以前您必须选择您想要使用的驱动器(它们可以是相同的)。</translation>
+ <location filename="../prefdrives.ui" line="56"/>
+ <source>SMPlayer does not choose any CDROM or DVD devices by default. So before you can actually play a CD or DVD you have to select the devices you want to use (they can be the same).</source>
+ <translation>SMPlayer 默认不选择任何 CDROM 或 DVD 驱动器。因此在您实际播放 CD 或 DVD 以前您必须选择您想要使用的驱动器(它们可以是相同的)。</translation>
 </message>
 <message>
- <location filename="../prefdrives.ui" line="86"/>
- <location filename="../prefdrives.ui" line="202"/>
- <source>icon</source>
- <translation>icon</translation>
+ <location filename="../prefdrives.ui" line="86"/>
+ <location filename="../prefdrives.ui" line="202"/>
+ <source>icon</source>
+ <translation>icon</translation>
 </message>
 <message>
- <location filename="../prefdrives.ui" line="113"/>
- <source>Select your &amp;CD device:</source>
- <translation>选择您的 CD 驱动器(&amp;C):</translation>
+ <location filename="../prefdrives.ui" line="113"/>
+ <source>Select your &amp;CD device:</source>
+ <translation>选择您的 CD 驱动器(&amp;C):</translation>
 </message>
 <message>
- <location filename="../prefdrives.ui" line="157"/>
- <source>&amp;Scan for CD/DVD drives</source>
- <translation>扫描 CD/DVD 驱动器(&amp;S)</translation>
+ <location filename="../prefdrives.ui" line="157"/>
+ <source>&amp;Scan for CD/DVD drives</source>
+ <translation>扫描 CD/DVD 驱动器(&amp;S)</translation>
 </message>
 <message>
- <location filename="../prefdrives.ui" line="229"/>
- <source>Select your &amp;DVD device:</source>
- <translation>选择您的 DVD 驱动器(&amp;D):</translation>
+ <location filename="../prefdrives.ui" line="229"/>
+ <source>Select your &amp;DVD device:</source>
+ <translation>选择您的 DVD 驱动器(&amp;D):</translation>
 </message>
 <message>
- <location filename="../prefdrives.ui" line="278"/>
- <source>&amp;Enable DVD menus (experimental)</source>
- <translation>启用 DVD 菜单 (试验)(&amp;E)</translation>
+ <location filename="../prefdrives.ui" line="278"/>
+ <source>&amp;Enable DVD menus (experimental)</source>
+ <translation>启用 DVD 菜单 (试验)(&amp;E)</translation>
 </message>
 <message>
- <location filename="../prefdrives.cpp" line="185"/>
- <source>CD device</source>
- <translation>CD 驱动器</translation>
+ <location filename="../prefdrives.cpp" line="185"/>
+ <source>CD device</source>
+ <translation>CD 驱动器</translation>
 </message>
 <message>
- <location filename="../prefdrives.cpp" line="186"/>
- <source>Choose your CDROM device. It will be used to play VCDs and Audio CDs.</source>
- <translation>选择您的 CDROM 驱动器。它将被用来播放 VCD 和音频 CD。</translation>
+ <location filename="../prefdrives.cpp" line="186"/>
+ <source>Choose your CDROM device. It will be used to play VCDs and Audio CDs.</source>
+ <translation>选择您的 CDROM 驱动器。它将被用来播放 VCD 和音频 CD。</translation>
 </message>
 <message>
- <location filename="../prefdrives.cpp" line="189"/>
- <source>DVD device</source>
- <translation>DVD 驱动器</translation>
+ <location filename="../prefdrives.cpp" line="189"/>
+ <source>DVD device</source>
+ <translation>DVD 驱动器</translation>
 </message>
 <message>
- <location filename="../prefdrives.cpp" line="190"/>
- <source>Choose your DVD device. It will be used to play DVDs.</source>
- <translation>选择您的 DVD 驱动器。它将被用来播放 DVD。</translation>
+ <location filename="../prefdrives.cpp" line="190"/>
+ <source>Choose your DVD device. It will be used to play DVDs.</source>
+ <translation>选择您的 DVD 驱动器。它将被用来播放 DVD。</translation>
 </message>
 <message>
- <location filename="../prefdrives.cpp" line="193"/>
- <source>Enable DVD menus</source>
- <translation>启用 DVD 菜单</translation>
+ <location filename="../prefdrives.cpp" line="193"/>
+ <source>Enable DVD menus</source>
+ <translation>启用 DVD 菜单</translation>
 </message>
 <message>
- <location filename="../prefdrives.cpp" line="194"/>
- <source>If this option is checked, smplayer will play DVDs using dvdnav. Requires a recent version of mplayer compiled with dvdnav support.</source>
- <translation>如果这个选项被选中，SMPlayer 将使用 DVDNav 播放 DVD。需要最新版本已编译有 DVDNav 支持的 MPlayer。</translation>
+ <location filename="../prefdrives.cpp" line="194"/>
+ <source>If this option is checked, smplayer will play DVDs using dvdnav. Requires a recent version of mplayer compiled with dvdnav support.</source>
+ <translation>如果这个选项被选中，SMPlayer 将使用 DVDNav 播放 DVD。需要最新版本已编译有 DVDNav 支持的 MPlayer。</translation>
 </message>
 <message>
- <location filename="../prefdrives.cpp" line="197"/>
- <source>&lt;b&gt;Note 1&lt;/b&gt;: cache will be disabled, this can affect performance.</source>
- <translation>&lt;b&gt;注意1&lt;/b&gt;: 缓存将被禁用，这可能会影响性能。</translation>
+ <location filename="../prefdrives.cpp" line="197"/>
+ <source>&lt;b&gt;Note 1&lt;/b&gt;: cache will be disabled, this can affect performance.</source>
+ <translation>&lt;b&gt;注意1&lt;/b&gt;: 缓存将被禁用，这可能会影响性能。</translation>
 </message>
 <message>
- <location filename="../prefdrives.cpp" line="198"/>
- <source>&lt;b&gt;Note 2&lt;/b&gt;: you may want to assign the action &quot;activate option in DVD menus&quot; to one of the mouse buttons.</source>
- <translation>&lt;b&gt;注意2&lt;/b&gt;: 您可能需要指派“激活 DVD 菜单选项”动作到某一鼠标按钮。</translation>
+ <location filename="../prefdrives.cpp" line="198"/>
+ <source>&lt;b&gt;Note 2&lt;/b&gt;: you may want to assign the action &quot;activate option in DVD menus&quot; to one of the mouse buttons.</source>
+ <translation>&lt;b&gt;注意2&lt;/b&gt;: 您可能需要指派“激活 DVD 菜单选项”动作到某一鼠标按钮。</translation>
 </message>
 <message>
- <location filename="../prefdrives.cpp" line="200"/>
- <source>&lt;b&gt;Note 3&lt;/b&gt;: this feature is under development, expect a lot of issues with it.</source>
- <translation>&lt;b&gt;注意3&lt;/b&gt;: 此特性正在开发中，可能会有很多问题。</translation>
+ <location filename="../prefdrives.cpp" line="200"/>
+ <source>&lt;b&gt;Note 3&lt;/b&gt;: this feature is under development, expect a lot of issues with it.</source>
+ <translation>&lt;b&gt;注意3&lt;/b&gt;: 此特性正在开发中，可能会有很多问题。</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>PrefGeneral</name>
 <message>
- <location filename="../prefgeneral.ui" line="35"/>
- <source>&amp;General</source>
- <translation>常规(&amp;G)</translation>
+ <location filename="../prefgeneral.ui" line="35"/>
+ <source>&amp;General</source>
+ <translation>常规(&amp;G)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="43"/>
- <source>&amp;MPlayer executable:</source>
- <translation>MPlayer 可执行文件(&amp;M):</translation>
+ <location filename="../prefgeneral.ui" line="43"/>
+ <source>&amp;MPlayer executable:</source>
+ <translation>MPlayer 可执行文件(&amp;M):</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="61"/>
- <source>Media settings</source>
- <translation>媒体设置</translation>
+ <location filename="../prefgeneral.ui" line="61"/>
+ <source>Media settings</source>
+ <translation>媒体设置</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="67"/>
- <source>&amp;Remember settings for all files (audio track, subtitles...)</source>
- <translation>记住所有文件的设置 (音轨，字幕...)(&amp;R)</translation>
+ <location filename="../prefgeneral.ui" line="67"/>
+ <source>&amp;Remember settings for all files (audio track, subtitles...)</source>
+ <translation>记住所有文件的设置 (音轨，字幕...)(&amp;R)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="101"/>
- <source>Remember &amp;time position</source>
- <translation>记住时间位置(&amp;T)</translation>
+ <location filename="../prefgeneral.ui" line="101"/>
+ <source>Remember &amp;time position</source>
+ <translation>记住时间位置(&amp;T)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="113"/>
- <source>&amp;Store settings in</source>
- <translation>存储设置于(&amp;S)</translation>
+ <location filename="../prefgeneral.ui" line="113"/>
+ <source>&amp;Store settings in</source>
+ <translation>存储设置于(&amp;S)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="150"/>
- <source>Screenshots</source>
- <translation>屏幕截图</translation>
+ <location filename="../prefgeneral.ui" line="150"/>
+ <source>Screenshots</source>
+ <translation>屏幕截图</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="156"/>
- <source>&amp;Enable screenshots</source>
- <translation>启用屏幕截图(&amp;E)</translation>
+ <location filename="../prefgeneral.ui" line="156"/>
+ <source>&amp;Enable screenshots</source>
+ <translation>启用屏幕截图(&amp;E)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="166"/>
- <source>&amp;Folder:</source>
- <translation>文件夹(&amp;F):</translation>
+ <location filename="../prefgeneral.ui" line="166"/>
+ <source>&amp;Folder:</source>
+ <translation>文件夹(&amp;F):</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="189"/>
- <source>&amp;Close when finished playback</source>
- <translation>完成播放后关闭(&amp;C)</translation>
+ <location filename="../prefgeneral.ui" line="189"/>
+ <source>&amp;Close when finished playback</source>
+ <translation>完成播放后关闭(&amp;C)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="196"/>
- <source>&amp;Pause when minimized</source>
- <translation>最小化时暂停(&amp;P)</translation>
+ <location filename="../prefgeneral.ui" line="196"/>
+ <source>&amp;Pause when minimized</source>
+ <translation>最小化时暂停(&amp;P)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="220"/>
- <source>&amp;Video</source>
- <translation>视频(&amp;V)</translation>
+ <location filename="../prefgeneral.ui" line="220"/>
+ <source>&amp;Video</source>
+ <translation>视频(&amp;V)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="228"/>
- <location filename="../prefgeneral.ui" line="569"/>
- <source>Ou&amp;tput driver:</source>
- <translation>输出驱动(&amp;T):</translation>
+ <location filename="../prefgeneral.ui" line="228"/>
+ <location filename="../prefgeneral.ui" line="569"/>
+ <source>Ou&amp;tput driver:</source>
+ <translation>输出驱动(&amp;T):</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="257"/>
- <source>Configu&amp;re...</source>
- <translation>配置(&amp;R)...</translation>
+ <location filename="../prefgeneral.ui" line="257"/>
+ <source>Configu&amp;re...</source>
+ <translation>配置(&amp;R)...</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="309"/>
- <source>&amp;Enable postprocessing by default</source>
- <translation>默认启用后处理(&amp;E)</translation>
+ <location filename="../prefgeneral.ui" line="309"/>
+ <source>&amp;Enable postprocessing by default</source>
+ <translation>默认启用后处理(&amp;E)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="329"/>
- <source>&amp;Quality:</source>
- <translation>质量(&amp;Q):</translation>
+ <location filename="../prefgeneral.ui" line="329"/>
+ <source>&amp;Quality:</source>
+ <translation>质量(&amp;Q):</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="371"/>
- <source>Dei&amp;nterlace by default (except for TV):</source>
- <translation>默认反交错(电视除外)(&amp;N):</translation>
+ <location filename="../prefgeneral.ui" line="371"/>
+ <source>Dei&amp;nterlace by default (except for TV):</source>
+ <translation>默认反交错(电视除外)(&amp;N):</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="408"/>
- <source>Default &amp;zoom:</source>
- <translation>默认缩放(&amp;Z):</translation>
+ <location filename="../prefgeneral.ui" line="408"/>
+ <source>Default &amp;zoom:</source>
+ <translation>默认缩放(&amp;Z):</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="462"/>
- <source>Use s&amp;oftware video equalizer</source>
- <translation>使用软件视频均衡器(&amp;O)</translation>
+ <location filename="../prefgeneral.ui" line="462"/>
+ <source>Use s&amp;oftware video equalizer</source>
+ <translation>使用软件视频均衡器(&amp;O)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="469"/>
- <source>D&amp;irect rendering</source>
- <translation>直接渲染(&amp;I)</translation>
+ <location filename="../prefgeneral.ui" line="469"/>
+ <source>D&amp;irect rendering</source>
+ <translation>直接渲染(&amp;I)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="476"/>
- <source>Dou&amp;ble buffering</source>
- <translation>双缓冲(&amp;B)</translation>
+ <location filename="../prefgeneral.ui" line="476"/>
+ <source>Dou&amp;ble buffering</source>
+ <translation>双缓冲(&amp;B)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="483"/>
- <source>Dra&amp;w video using slices</source>
- <translation>使用切片方式绘制视频(&amp;W)</translation>
+ <location filename="../prefgeneral.ui" line="483"/>
+ <source>Dra&amp;w video using slices</source>
+ <translation>使用切片方式绘制视频(&amp;W)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="503"/>
- <source>Start videos in &amp;fullscreen</source>
- <translation>以全屏启动视频(&amp;F)</translation>
+ <location filename="../prefgeneral.ui" line="503"/>
+ <source>Start videos in &amp;fullscreen</source>
+ <translation>以全屏启动视频(&amp;F)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="510"/>
- <source>&amp;Add black borders on fullscreen</source>
- <translation>全屏时添加黑色边框(&amp;A)</translation>
+ <location filename="../prefgeneral.ui" line="510"/>
+ <source>&amp;Add black borders on fullscreen</source>
+ <translation>全屏时添加黑色边框(&amp;A)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="517"/>
- <source>Disable &amp;screensaver</source>
- <translation>禁用屏幕保护程序(&amp;S)</translation>
+ <location filename="../prefgeneral.ui" line="517"/>
+ <source>Disable &amp;screensaver</source>
+ <translation>禁用屏幕保护程序(&amp;S)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="524"/>
- <source>Screensaver</source>
- <translation>屏幕保护程序</translation>
+ <location filename="../prefgeneral.ui" line="524"/>
+ <source>Screensaver</source>
+ <translation>屏幕保护程序</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="530"/>
- <source>Swit&amp;ch screensaver off</source>
- <translation>切换关闭屏幕保护程序(&amp;C)</translation>
+ <location filename="../prefgeneral.ui" line="530"/>
+ <source>Swit&amp;ch screensaver off</source>
+ <translation>切换关闭屏幕保护程序(&amp;C)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="537"/>
- <source>Avoid &amp;screensaver</source>
- <translation>避免屏幕保护程序(&amp;S)</translation>
+ <location filename="../prefgeneral.ui" line="537"/>
+ <source>Avoid &amp;screensaver</source>
+ <translation>避免屏幕保护程序(&amp;S)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="561"/>
- <source>A&amp;udio</source>
- <translation>音频(&amp;U)</translation>
+ <location filename="../prefgeneral.ui" line="561"/>
+ <source>A&amp;udio</source>
+ <translation>音频(&amp;U)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="626"/>
- <source>&amp;Enable the audio equalizer</source>
- <translation>启用音频均衡器(&amp;E)</translation>
+ <location filename="../prefgeneral.ui" line="626"/>
+ <source>&amp;Enable the audio equalizer</source>
+ <translation>启用音频均衡器(&amp;E)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="633"/>
- <source>&amp;AC3/DTS pass-through S/PDIF</source>
- <translation>AC3/DTS 通过 S/PDIF 输出(&amp;A)</translation>
+ <location filename="../prefgeneral.ui" line="633"/>
+ <source>&amp;AC3/DTS pass-through S/PDIF</source>
+ <translation>AC3/DTS 通过 S/PDIF 输出(&amp;A)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="657"/>
- <source>C&amp;hannels by default:</source>
- <translation>默认通道(&amp;H):</translation>
+ <location filename="../prefgeneral.ui" line="657"/>
+ <source>C&amp;hannels by default:</source>
+ <translation>默认通道(&amp;H):</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="702"/>
- <source>High speed &amp;playback without altering pitch</source>
- <translation>高速播放(不改变间隔)(&amp;P)</translation>
+ <location filename="../prefgeneral.ui" line="702"/>
+ <source>High speed &amp;playback without altering pitch</source>
+ <translation>高速播放(不改变间隔)(&amp;P)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="737"/>
- <source>Volume</source>
- <translation>音量</translation>
+ <location filename="../prefgeneral.ui" line="737"/>
+ <source>Volume</source>
+ <translation>音量</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="755"/>
- <source>Glo&amp;bal volume</source>
- <translation>全局音量(&amp;B)</translation>
+ <location filename="../prefgeneral.ui" line="755"/>
+ <source>Glo&amp;bal volume</source>
+ <translation>全局音量(&amp;B)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="779"/>
- <source>Use s&amp;oftware volume control</source>
- <translation>使用软件音量控制(&amp;O)</translation>
+ <location filename="../prefgeneral.ui" line="779"/>
+ <source>Use s&amp;oftware volume control</source>
+ <translation>使用软件音量控制(&amp;O)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="802"/>
- <source>Ma&amp;x. Amplification:</source>
- <translation>最大放大率(&amp;X):</translation>
+ <location filename="../prefgeneral.ui" line="802"/>
+ <source>Ma&amp;x. Amplification:</source>
+ <translation>最大放大率(&amp;X):</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="830"/>
- <source>Volume &amp;normalization by default</source>
- <translation>默认音量标准化(&amp;N)</translation>
+ <location filename="../prefgeneral.ui" line="830"/>
+ <source>Volume &amp;normalization by default</source>
+ <translation>默认音量标准化(&amp;N)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="840"/>
- <source>Synchronization</source>
- <translation>同步</translation>
+ <location filename="../prefgeneral.ui" line="840"/>
+ <source>Synchronization</source>
+ <translation>同步</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="860"/>
- <source>Audio/video auto &amp;synchronization</source>
- <translation>音频/视频 自动同步(&amp;S)</translation>
+ <location filename="../prefgeneral.ui" line="860"/>
+ <source>Audio/video auto &amp;synchronization</source>
+ <translation>音频/视频 自动同步(&amp;S)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="886"/>
- <source>&amp;Factor:</source>
- <translation>因子(&amp;F):</translation>
+ <location filename="../prefgeneral.ui" line="886"/>
+ <source>&amp;Factor:</source>
+ <translation>因子(&amp;F):</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="922"/>
- <source>A-V sync &amp;correction</source>
- <translation>A-V 同步修正(&amp;C)</translation>
+ <location filename="../prefgeneral.ui" line="922"/>
+ <source>A-V sync &amp;correction</source>
+ <translation>A-V 同步修正(&amp;C)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="945"/>
- <source>&amp;Max. correction:</source>
- <translation>最大修正(&amp;M):</translation>
+ <location filename="../prefgeneral.ui" line="945"/>
+ <source>&amp;Max. correction:</source>
+ <translation>最大修正(&amp;M):</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="990"/>
- <source>Preferre&amp;d audio and subtitles</source>
- <translation>首选音频和字幕(&amp;D)</translation>
+ <location filename="../prefgeneral.ui" line="990"/>
+ <source>Preferre&amp;d audio and subtitles</source>
+ <translation>首选音频和字幕(&amp;D)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="1011"/>
- <source>&lt;Here it goes an explanation text&gt;
+ <location filename="../prefgeneral.ui" line="1011"/>
+ <source>&lt;Here it goes an explanation text&gt;
 For translators: don&apos;t translate this text, it will be replaced with another one at runtime.</source>
- <translation type="unfinished"></translation>
+ <translation type="unfinished"></translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="1084"/>
- <source>&amp;Audio:</source>
- <translation>音频(&amp;A):</translation>
+ <location filename="../prefgeneral.ui" line="1084"/>
+ <source>&amp;Audio:</source>
+ <translation>音频(&amp;A):</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="1103"/>
- <source>Su&amp;btitles:</source>
- <translation>字幕(&amp;B):</translation>
+ <location filename="../prefgeneral.ui" line="1103"/>
+ <source>Su&amp;btitles:</source>
+ <translation>字幕(&amp;B):</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="1119"/>
- <source>Preferred language:</source>
- <translation>首选语言:</translation>
+ <location filename="../prefgeneral.ui" line="1119"/>
+ <source>Preferred language:</source>
+ <translation>首选语言:</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="1165"/>
- <source>Audi&amp;o:</source>
- <translation>音频(&amp;O):</translation>
+ <location filename="../prefgeneral.ui" line="1165"/>
+ <source>Audi&amp;o:</source>
+ <translation>音频(&amp;O):</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="1178"/>
- <source>&amp;Subtitle:</source>
- <translation>字幕(&amp;S):</translation>
+ <location filename="../prefgeneral.ui" line="1178"/>
+ <source>&amp;Subtitle:</source>
+ <translation>字幕(&amp;S):</translation>
 </message>
 <message>
- <location filename="../prefgeneral.ui" line="1224"/>
- <source>Or choose a track number:</source>
- <translation>或选择一个轨道号:</translation>
+ <location filename="../prefgeneral.ui" line="1224"/>
+ <source>Or choose a track number:</source>
+ <translation>或选择一个轨道号:</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="85"/>
- <location filename="../prefgeneral.cpp" line="835"/>
- <source>General</source>
- <translation>常规</translation>
+ <location filename="../prefgeneral.cpp" line="85"/>
+ <location filename="../prefgeneral.cpp" line="835"/>
+ <source>General</source>
+ <translation>常规</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="95"/>
- <source>2 (Stereo)</source>
- <translation>2 (立体声)</translation>
+ <location filename="../prefgeneral.cpp" line="95"/>
+ <source>2 (Stereo)</source>
+ <translation>2 (立体声)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="96"/>
- <source>4 (4.0 Surround)</source>
- <translation>4 (4.0 环绕)</translation>
+ <location filename="../prefgeneral.cpp" line="96"/>
+ <source>4 (4.0 Surround)</source>
+ <translation>4 (4.0 环绕)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="97"/>
- <source>6 (5.1 Surround)</source>
- <translation>6 (5.1 环绕)</translation>
+ <location filename="../prefgeneral.cpp" line="97"/>
+ <source>6 (5.1 Surround)</source>
+ <translation>6 (5.1 环绕)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="101"/>
- <source>None</source>
- <translation>无</translation>
+ <location filename="../prefgeneral.cpp" line="101"/>
+ <source>None</source>
+ <translation>无</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="102"/>
- <source>Lowpass5</source>
- <translation>Lowpass5 反交错</translation>
+ <location filename="../prefgeneral.cpp" line="102"/>
+ <source>Lowpass5</source>
+ <translation>Lowpass5 反交错</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="103"/>
- <source>Yadif (normal)</source>
- <translation>Yadif 反交错(普通)</translation>
+ <location filename="../prefgeneral.cpp" line="103"/>
+ <source>Yadif (normal)</source>
+ <translation>Yadif 反交错(普通)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="104"/>
- <source>Yadif (double framerate)</source>
- <translation>Yadif 反交错(双倍帧率)</translation>
+ <location filename="../prefgeneral.cpp" line="104"/>
+ <source>Yadif (double framerate)</source>
+ <translation>Yadif 反交错(双倍帧率)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="105"/>
- <source>Linear Blend</source>
- <translation>线性混合</translation>
+ <location filename="../prefgeneral.cpp" line="105"/>
+ <source>Linear Blend</source>
+ <translation>线性混合</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="106"/>
- <source>Kerndeint</source>
- <translation>Kerndeint 自适应反交错</translation>
+ <location filename="../prefgeneral.cpp" line="106"/>
+ <source>Kerndeint</source>
+ <translation>Kerndeint 自适应反交错</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="111"/>
- <source>one ini file</source>
- <translation>一个 ini 文件</translation>
+ <location filename="../prefgeneral.cpp" line="111"/>
+ <source>one ini file</source>
+ <translation>一个 ini 文件</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="112"/>
- <source>multiple ini files</source>
- <translation>多个 ini 文件</translation>
+ <location filename="../prefgeneral.cpp" line="112"/>
+ <source>multiple ini files</source>
+ <translation>多个 ini 文件</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="123"/>
- <source>Select the mplayer executable</source>
- <translation>选择 MPlayer 可执行文件</translation>
+ <location filename="../prefgeneral.cpp" line="123"/>
+ <source>Select the mplayer executable</source>
+ <translation>选择 MPlayer 可执行文件</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="125"/>
- <source>Executables</source>
- <translation>可执行文件</translation>
+ <location filename="../prefgeneral.cpp" line="125"/>
+ <source>Executables</source>
+ <translation>可执行文件</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="127"/>
- <source>All files</source>
- <translation>所有文件</translation>
+ <location filename="../prefgeneral.cpp" line="127"/>
+ <source>All files</source>
+ <translation>所有文件</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="129"/>
- <source>Select a directory</source>
- <translation>选择一个目录</translation>
+ <location filename="../prefgeneral.cpp" line="129"/>
+ <source>Select a directory</source>
+ <translation>选择一个目录</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="132"/>
- <source>Here you can type your preferred language for the audio and subtitle streams. When a media with multiple audio or subtitle streams is found, SMPlayer will try to use your preferred language. This only will work with media that offer info about the language of audio and subtitle streams, like DVDs or mkv files.&lt;br&gt;These fields accept regular expressions. Example: &lt;b&gt;es|esp|spa&lt;/b&gt; will select the track if it matches with &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; or &lt;i&gt;spa&lt;/i&gt;.</source>
- <translation>在这里可以键入您的音频和字幕流的首选语言。当在媒体中发现多重音频或字幕流时，SMPlayer 将尝试使用您的首选语言。这仅工作于提供有关音频和字幕流语言信息的媒体，比如 DVD 或 MKV 文件。&lt;br&gt;这些字段接受正则表达式。实例: &lt;b&gt;es|esp|spa&lt;/b&gt; 将选择匹配 &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; 或 &lt;i&gt;spa&lt;/i&gt; 的轨道。</translation>
+ <location filename="../prefgeneral.cpp" line="132"/>
+ <source>Here you can type your preferred language for the audio and subtitle streams. When a media with multiple audio or subtitle streams is found, SMPlayer will try to use your preferred language. This only will work with media that offer info about the language of audio and subtitle streams, like DVDs or mkv files.&lt;br&gt;These fields accept regular expressions. Example: &lt;b&gt;es|esp|spa&lt;/b&gt; will select the track if it matches with &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; or &lt;i&gt;spa&lt;/i&gt;.</source>
+ <translation>在这里可以键入您的音频和字幕流的首选语言。当在媒体中发现多重音频或字幕流时，SMPlayer 将尝试使用您的首选语言。这仅工作于提供有关音频和字幕流语言信息的媒体，比如 DVD 或 MKV 文件。&lt;br&gt;这些字段接受正则表达式。实例: &lt;b&gt;es|esp|spa&lt;/b&gt; 将选择匹配 &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; 或 &lt;i&gt;spa&lt;/i&gt; 的轨道。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="329"/>
- <location filename="../prefgeneral.cpp" line="336"/>
- <location filename="../prefgeneral.cpp" line="362"/>
- <source>fast</source>
- <translation>启用加速</translation>
+ <location filename="../prefgeneral.cpp" line="329"/>
+ <location filename="../prefgeneral.cpp" line="336"/>
+ <location filename="../prefgeneral.cpp" line="362"/>
+ <source>fast</source>
+ <translation>启用加速</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="330"/>
- <location filename="../prefgeneral.cpp" line="358"/>
- <source>slow</source>
- <translation>禁用加速</translation>
+ <location filename="../prefgeneral.cpp" line="330"/>
+ <location filename="../prefgeneral.cpp" line="358"/>
+ <source>slow</source>
+ <translation>禁用加速</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="337"/>
- <source>snap mode</source>
- <translation>捕捉模式</translation>
+ <location filename="../prefgeneral.cpp" line="337"/>
+ <source>snap mode</source>
+ <translation>捕捉模式</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="338"/>
- <source>slower dive mode</source>
- <translation>较慢的 DIVE 模式</translation>
+ <location filename="../prefgeneral.cpp" line="338"/>
+ <source>slower dive mode</source>
+ <translation>较慢的 DIVE 模式</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="363"/>
- <source>fast - ATI cards</source>
- <translation>启用加速 - ATI 卡</translation>
+ <location filename="../prefgeneral.cpp" line="363"/>
+ <source>fast - ATI cards</source>
+ <translation>启用加速 - ATI 卡</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="380"/>
- <location filename="../prefgeneral.cpp" line="409"/>
- <source>User defined...</source>
- <translation>用户定义...</translation>
+ <location filename="../prefgeneral.cpp" line="380"/>
+ <location filename="../prefgeneral.cpp" line="409"/>
+ <source>User defined...</source>
+ <translation>用户定义...</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="388"/>
- <source>uniaud mode</source>
- <translation>UNIAUD 模式</translation>
+ <location filename="../prefgeneral.cpp" line="388"/>
+ <source>uniaud mode</source>
+ <translation>UNIAUD 模式</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="389"/>
- <source>dart mode</source>
- <translation>DART 模式</translation>
+ <location filename="../prefgeneral.cpp" line="389"/>
+ <source>dart mode</source>
+ <translation>DART 模式</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="837"/>
- <source>MPlayer executable</source>
- <translation>MPlayer 可执行文件</translation>
+ <location filename="../prefgeneral.cpp" line="837"/>
+ <source>MPlayer executable</source>
+ <translation>MPlayer 可执行文件</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="838"/>
- <source>Here you must specify the mplayer executable that SMPlayer will use.&lt;br&gt;SMPlayer requires at least MPlayer 1.0rc1 (although a recent revision from SVN is highly recommended).</source>
- <translation>在这里您必须指定 SMPlayer 将使用的 MPlayer 可执行文件。&lt;br&gt;SMPlayer 至少需要 MPlayer 1.0rc1 (但是强烈推荐 SVN 最新修订版)。</translation>
+ <location filename="../prefgeneral.cpp" line="838"/>
+ <source>Here you must specify the mplayer executable that SMPlayer will use.&lt;br&gt;SMPlayer requires at least MPlayer 1.0rc1 (although a recent revision from SVN is highly recommended).</source>
+ <translation>在这里您必须指定 SMPlayer 将使用的 MPlayer 可执行文件。&lt;br&gt;SMPlayer 至少需要 MPlayer 1.0rc1 (但是强烈推荐 SVN 最新修订版)。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="842"/>
- <source>If this setting is wrong, SMPlayer won&apos;t be able to play anything!</source>
- <translation>如果此设置是错误的，SMPlayer 将不能播放任何东西!</translation>
+ <location filename="../prefgeneral.cpp" line="842"/>
+ <source>If this setting is wrong, SMPlayer won&apos;t be able to play anything!</source>
+ <translation>如果此设置是错误的，SMPlayer 将不能播放任何东西!</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="845"/>
- <source>Remember settings</source>
- <translation>记住设置</translation>
+ <location filename="../prefgeneral.cpp" line="845"/>
+ <source>Remember settings</source>
+ <translation>记住设置</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="846"/>
- <source>Usually SMPlayer will remember the settings for each file you play (audio track selected, volume, filters...). Disable this option if you don&apos;t like this feature.</source>
- <translation>通常 SMPlayer 会记住您播放每个文件的设置(音轨选择、音量、过滤器...)。如果您不喜欢这个功能可禁用此选项。</translation>
+ <location filename="../prefgeneral.cpp" line="846"/>
+ <source>Usually SMPlayer will remember the settings for each file you play (audio track selected, volume, filters...). Disable this option if you don&apos;t like this feature.</source>
+ <translation>通常 SMPlayer 会记住您播放每个文件的设置(音轨选择、音量、过滤器...)。如果您不喜欢这个功能可禁用此选项。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="850"/>
- <source>Remember time position</source>
- <translation>记住时间位置</translation>
+ <location filename="../prefgeneral.cpp" line="850"/>
+ <source>Remember time position</source>
+ <translation>记住时间位置</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="851"/>
- <source>If you check this option, SMPlayer will remember the last position of the file when you open it again. This option works only with regular files (not with DVDs, CDs, URLs...).</source>
- <translation>如果选中此选项，SMPlayer 将记住文件的最后播放位置，当您再次打开它时可由此位置开始播放。此选项仅可用于常规文件(不包括 DVD, CD, URL 地址...)。</translation>
+ <location filename="../prefgeneral.cpp" line="851"/>
+ <source>If you check this option, SMPlayer will remember the last position of the file when you open it again. This option works only with regular files (not with DVDs, CDs, URLs...).</source>
+ <translation>如果选中此选项，SMPlayer 将记住文件的最后播放位置，当您再次打开它时可由此位置开始播放。此选项仅可用于常规文件(不包括 DVD, CD, URL 地址...)。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="855"/>
- <source>Method to store the file settings</source>
- <translation>存储文件设置的方法</translation>
+ <location filename="../prefgeneral.cpp" line="855"/>
+ <source>Method to store the file settings</source>
+ <translation>存储文件设置的方法</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="856"/>
- <source>This option allows to change the way the file settings would be stored. The following options are available:</source>
- <translation>这个选项允许更改文件设置的存储方式。下列选项可用:</translation>
+ <location filename="../prefgeneral.cpp" line="856"/>
+ <source>This option allows to change the way the file settings would be stored. The following options are available:</source>
+ <translation>这个选项允许更改文件设置的存储方式。下列选项可用:</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="858"/>
- <source>&lt;b&gt;one ini file&lt;/b&gt;: the settings for all played files will be saved in a single ini file (%1)</source>
- <translation>&lt;b&gt;一个 ini 文件&lt;/b&gt;: 所有播放文件的设置将被保存于单个 ini 文件中 (%1)</translation>
+ <location filename="../prefgeneral.cpp" line="858"/>
+ <source>&lt;b&gt;one ini file&lt;/b&gt;: the settings for all played files will be saved in a single ini file (%1)</source>
+ <translation>&lt;b&gt;一个 ini 文件&lt;/b&gt;: 所有播放文件的设置将被保存于单个 ini 文件中 (%1)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="860"/>
- <source>&lt;b&gt;multiple ini files&lt;/b&gt;: one ini file will be used for each played file. Those ini files will be saved in the folder %1</source>
- <translation>&lt;b&gt;多个 ini 文件&lt;/b&gt;: 每个播放文件的设置都将被分别保存于其各自的 ini 文件中。这些 ini 文件将被保存在文件夹 %1</translation>
+ <location filename="../prefgeneral.cpp" line="860"/>
+ <source>&lt;b&gt;multiple ini files&lt;/b&gt;: one ini file will be used for each played file. Those ini files will be saved in the folder %1</source>
+ <translation>&lt;b&gt;多个 ini 文件&lt;/b&gt;: 每个播放文件的设置都将被分别保存于其各自的 ini 文件中。这些 ini 文件将被保存在文件夹 %1</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="862"/>
- <source>The latter method could be faster if there is info for a lot of files.</source>
- <translation>如果有大量文件的信息，后一种方法可以更快。</translation>
+ <location filename="../prefgeneral.cpp" line="862"/>
+ <source>The latter method could be faster if there is info for a lot of files.</source>
+ <translation>如果有大量文件的信息，后一种方法可以更快。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="864"/>
- <source>Enable screenshots</source>
- <translation>启用屏幕截图</translation>
+ <location filename="../prefgeneral.cpp" line="864"/>
+ <source>Enable screenshots</source>
+ <translation>启用屏幕截图</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="865"/>
- <source>You can use this option to enable or disable the possibility to take screenshots.</source>
- <translation>您可以使用该选项启用或禁用是否可以进行屏幕截图。</translation>
+ <location filename="../prefgeneral.cpp" line="865"/>
+ <source>You can use this option to enable or disable the possibility to take screenshots.</source>
+ <translation>您可以使用该选项启用或禁用是否可以进行屏幕截图。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="868"/>
- <source>Screenshots folder</source>
- <translation>屏幕截图文件夹</translation>
+ <location filename="../prefgeneral.cpp" line="868"/>
+ <source>Screenshots folder</source>
+ <translation>屏幕截图文件夹</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="869"/>
- <source>Here you can specify a folder where the screenshots taken by SMPlayer will be stored. If the folder is not valid the screenshot feature will be disabled.</source>
- <translation>在这里您可以指定一个将被 SMPlayer 用来存储屏幕截图的文件夹。如果该文件夹是无效的，屏幕截图功能将被禁用。</translation>
+ <location filename="../prefgeneral.cpp" line="869"/>
+ <source>Here you can specify a folder where the screenshots taken by SMPlayer will be stored. If the folder is not valid the screenshot feature will be disabled.</source>
+ <translation>在这里您可以指定一个将被 SMPlayer 用来存储屏幕截图的文件夹。如果该文件夹是无效的，屏幕截图功能将被禁用。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="873"/>
- <source>Close when finished</source>
- <translation>完成后关闭</translation>
+ <location filename="../prefgeneral.cpp" line="873"/>
+ <source>Close when finished</source>
+ <translation>完成后关闭</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="874"/>
- <source>If this option is checked, the main window will be automatically closed when the current file/playlist finishes.</source>
- <translation>如果这个选项被选中，主窗口将在当前文件/播放列表播放完成后自动关闭。</translation>
+ <location filename="../prefgeneral.cpp" line="874"/>
+ <source>If this option is checked, the main window will be automatically closed when the current file/playlist finishes.</source>
+ <translation>如果这个选项被选中，主窗口将在当前文件/播放列表播放完成后自动关闭。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="877"/>
- <source>Pause when minimized</source>
- <translation>最小化时暂停</translation>
+ <location filename="../prefgeneral.cpp" line="877"/>
+ <source>Pause when minimized</source>
+ <translation>最小化时暂停</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="878"/>
- <source>If this option is enabled, the file will be paused when the main window is hidden. When the window is restored, playback will be resumed.</source>
- <translation>如果这个选项被启用，当主窗口被隐藏时文件将被暂停播放。窗口还原时，将恢复播放。</translation>
+ <location filename="../prefgeneral.cpp" line="878"/>
+ <source>If this option is enabled, the file will be paused when the main window is hidden. When the window is restored, playback will be resumed.</source>
+ <translation>如果这个选项被启用，当主窗口被隐藏时文件将被暂停播放。窗口还原时，将恢复播放。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="883"/>
- <source>Video</source>
- <translation>视频</translation>
+ <location filename="../prefgeneral.cpp" line="883"/>
+ <source>Video</source>
+ <translation>视频</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="885"/>
- <source>Video output driver</source>
- <translation>视频输出驱动</translation>
+ <location filename="../prefgeneral.cpp" line="885"/>
+ <source>Video output driver</source>
+ <translation>视频输出驱动</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="886"/>
- <source>Select the video output driver. %1 provides the best performance.</source>
- <translation>选择视频输出驱动。%1 可提供最佳性能。</translation>
+ <location filename="../prefgeneral.cpp" line="886"/>
+ <source>Select the video output driver. %1 provides the best performance.</source>
+ <translation>选择视频输出驱动。%1 可提供最佳性能。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="906"/>
- <source>Enable postprocessing by default</source>
- <translation>默认启用后处理</translation>
+ <location filename="../prefgeneral.cpp" line="906"/>
+ <source>Enable postprocessing by default</source>
+ <translation>默认启用后处理</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="907"/>
- <source>Postprocessing will be used by default on new opened files.</source>
- <translation>新打开文件时后处理将被默认使用。</translation>
+ <location filename="../prefgeneral.cpp" line="907"/>
+ <source>Postprocessing will be used by default on new opened files.</source>
+ <translation>新打开文件时后处理将被默认使用。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="909"/>
- <source>Postprocessing quality</source>
- <translation>后处理质量</translation>
+ <location filename="../prefgeneral.cpp" line="909"/>
+ <source>Postprocessing quality</source>
+ <translation>后处理质量</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="910"/>
- <source>Dynamically changes the level of postprocessing depending on the available spare CPU time. The number you specify will be the maximum level used. Usually you can use some big number.</source>
- <translation>根据可用的 CPU 空闲时间动态更改后处理的级别。您指定的数字将被作为最高级别使用。通常您可以使用大一些的数字以提高级别。</translation>
+ <location filename="../prefgeneral.cpp" line="910"/>
+ <source>Dynamically changes the level of postprocessing depending on the available spare CPU time. The number you specify will be the maximum level used. Usually you can use some big number.</source>
+ <translation>根据可用的 CPU 空闲时间动态更改后处理的级别。您指定的数字将被作为最高级别使用。通常您可以使用大一些的数字以提高级别。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="914"/>
- <source>Deinterlace by default</source>
- <translation>默认反交错</translation>
+ <location filename="../prefgeneral.cpp" line="914"/>
+ <source>Deinterlace by default</source>
+ <translation>默认反交错</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="915"/>
- <source>Select the deinterlace filter that you want to be used for new videos opened.</source>
- <translation>选择您想在打开新视频时使用的反交错过滤器。</translation>
+ <location filename="../prefgeneral.cpp" line="915"/>
+ <source>Select the deinterlace filter that you want to be used for new videos opened.</source>
+ <translation>选择您想在打开新视频时使用的反交错过滤器。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="917"/>
- <source>&lt;b&gt;Note:&lt;/b&gt; This option won&apos;t be used for TV channels.</source>
- <translation>&lt;b&gt;注意:&lt;/b&gt; 此选项不会被用于电视频道。</translation>
+ <location filename="../prefgeneral.cpp" line="917"/>
+ <source>&lt;b&gt;Note:&lt;/b&gt; This option won&apos;t be used for TV channels.</source>
+ <translation>&lt;b&gt;注意:&lt;/b&gt; 此选项不会被用于电视频道。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="919"/>
- <source>Default zoom</source>
- <translation>默认缩放</translation>
+ <location filename="../prefgeneral.cpp" line="919"/>
+ <source>Default zoom</source>
+ <translation>默认缩放</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="920"/>
- <source>This option sets the default zoom which will be used for new videos.</source>
- <translation>这个选项可设置将被新视频使用的默认缩放。</translation>
+ <location filename="../prefgeneral.cpp" line="920"/>
+ <source>This option sets the default zoom which will be used for new videos.</source>
+ <translation>这个选项可设置将被新视频使用的默认缩放。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="923"/>
- <source>Software video equalizer</source>
- <translation>软件视频均衡器</translation>
+ <location filename="../prefgeneral.cpp" line="923"/>
+ <source>Software video equalizer</source>
+ <translation>软件视频均衡器</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="924"/>
- <source>You can check this option if video equalizer is not supported by your graphic card or the selected video output driver.&lt;br&gt;&lt;b&gt;Note:&lt;/b&gt; this option can be incompatible with some video output drivers.</source>
- <translation>如果您的显示卡或选择的视频输出驱动不支持视频均衡器，您可以选中此选项。&lt;br&gt;&lt;b&gt;注意:&lt;/b&gt; 此选项可能与某些视频输出驱动不兼容。</translation>
+ <location filename="../prefgeneral.cpp" line="924"/>
+ <source>You can check this option if video equalizer is not supported by your graphic card or the selected video output driver.&lt;br&gt;&lt;b&gt;Note:&lt;/b&gt; this option can be incompatible with some video output drivers.</source>
+ <translation>如果您的显示卡或选择的视频输出驱动不支持视频均衡器，您可以选中此选项。&lt;br&gt;&lt;b&gt;注意:&lt;/b&gt; 此选项可能与某些视频输出驱动不兼容。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="929"/>
- <source>Direct rendering</source>
- <translation>直接渲染</translation>
+ <location filename="../prefgeneral.cpp" line="929"/>
+ <source>Direct rendering</source>
+ <translation>直接渲染</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="930"/>
- <source>If checked, turns on direct rendering (not supported by all codecs and video outputs)&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; May cause OSD/SUB corruption!</source>
- <translation>如果选中，将打开直接渲染(还不被所有的编解码器和视频输出支持)&lt;br&gt;&lt;b&gt;警告:&lt;/b&gt; 可能导致 OSD/字幕 损坏!</translation>
+ <location filename="../prefgeneral.cpp" line="930"/>
+ <source>If checked, turns on direct rendering (not supported by all codecs and video outputs)&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; May cause OSD/SUB corruption!</source>
+ <translation>如果选中，将打开直接渲染(还不被所有的编解码器和视频输出支持)&lt;br&gt;&lt;b&gt;警告:&lt;/b&gt; 可能导致 OSD/字幕 损坏!</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="934"/>
- <source>Double buffering</source>
- <translation>双缓冲</translation>
+ <location filename="../prefgeneral.cpp" line="934"/>
+ <source>Double buffering</source>
+ <translation>双缓冲</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="935"/>
- <source>Double buffering fixes flicker by storing two frames in memory, and displaying one while decoding another. If disabled it can affect OSD negatively, but often removes OSD flickering.</source>
- <translation>双缓冲通过在内存中存储两帧来解决闪烁问题，在显示一帧的同时解码另一帧。如果禁用它会负面影响 OSD，但常常能去除 OSD 的闪烁。</translation>
+ <location filename="../prefgeneral.cpp" line="935"/>
+ <source>Double buffering fixes flicker by storing two frames in memory, and displaying one while decoding another. If disabled it can affect OSD negatively, but often removes OSD flickering.</source>
+ <translation>双缓冲通过在内存中存储两帧来解决闪烁问题，在显示一帧的同时解码另一帧。如果禁用它会负面影响 OSD，但常常能去除 OSD 的闪烁。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="939"/>
- <source>Draw video using slices</source>
- <translation>使用切片方式绘制视频</translation>
+ <location filename="../prefgeneral.cpp" line="939"/>
+ <source>Draw video using slices</source>
+ <translation>使用切片方式绘制视频</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="940"/>
- <source>Enable/disable drawing video by 16-pixel height slices/bands. If disabled, the whole frame is drawn in a single run. May be faster or slower, depending on video card and available cache. It has effect only with libmpeg2 and libavcodec codecs.</source>
- <translation>启用/禁用 16-像素高的 片/带 方式绘制视频。如果禁用，将一次运行绘制整个帧。可能更快或更慢，这取决于显卡和可用的缓存。它只对 libmpeg2 和 libavcodec 编解码器有效果。</translation>
+ <location filename="../prefgeneral.cpp" line="940"/>
+ <source>Enable/disable drawing video by 16-pixel height slices/bands. If disabled, the whole frame is drawn in a single run. May be faster or slower, depending on video card and available cache. It has effect only with libmpeg2 and libavcodec codecs.</source>
+ <translation>启用/禁用 16-像素高的 片/带 方式绘制视频。如果禁用，将一次运行绘制整个帧。可能更快或更慢，这取决于显卡和可用的缓存。它只对 libmpeg2 和 libavcodec 编解码器有效果。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="945"/>
- <source>Start videos in fullscreen</source>
- <translation>以全屏启动视频</translation>
+ <location filename="../prefgeneral.cpp" line="945"/>
+ <source>Start videos in fullscreen</source>
+ <translation>以全屏启动视频</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="946"/>
- <source>If this option is checked, all videos will start to play in fullscreen mode.</source>
- <translation>如果这个选项被选中，所有视频将以全屏模式启动播放。</translation>
+ <location filename="../prefgeneral.cpp" line="946"/>
+ <source>If this option is checked, all videos will start to play in fullscreen mode.</source>
+ <translation>如果这个选项被选中，所有视频将以全屏模式启动播放。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="949"/>
- <source>Add black borders on fullscreen</source>
- <translation>全屏时添加黑色边框</translation>
+ <location filename="../prefgeneral.cpp" line="949"/>
+ <source>Add black borders on fullscreen</source>
+ <translation>全屏时添加黑色边框</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="950"/>
- <source>If this option is enabled, black borders will be added to the image in fullscreen mode. This allows subtitles to be displayed on the black borders.</source>
- <translation>如果这个选项被启用，黑色边框将被添加到全屏模式的图像中。这将允许字幕在黑色边框上显示。</translation>
+ <location filename="../prefgeneral.cpp" line="950"/>
+ <source>If this option is enabled, black borders will be added to the image in fullscreen mode. This allows subtitles to be displayed on the black borders.</source>
+ <translation>如果这个选项被启用，黑色边框将被添加到全屏模式的图像中。这将允许字幕在黑色边框上显示。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="958"/>
- <source>Switch screensaver off</source>
- <translation>切换关闭屏幕保护程序</translation>
+ <location filename="../prefgeneral.cpp" line="958"/>
+ <source>Switch screensaver off</source>
+ <translation>切换关闭屏幕保护程序</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="959"/>
- <source>This option switches the screensaver off just before starting to play a file and switches it on when playback finishes. If this option is enabled, the screensaver won&apos;t appear even if playing audio files or when a file is paused.</source>
- <translation>此选项在开始播放文件之前切换关闭屏幕保护程序，当播放完成后切换开启屏幕保护程序。如果启用该选项，即使播放音频文件或文件暂停时屏幕保护程序都不会出现。</translation>
+ <location filename="../prefgeneral.cpp" line="959"/>
+ <source>This option switches the screensaver off just before starting to play a file and switches it on when playback finishes. If this option is enabled, the screensaver won&apos;t appear even if playing audio files or when a file is paused.</source>
+ <translation>此选项在开始播放文件之前切换关闭屏幕保护程序，当播放完成后切换开启屏幕保护程序。如果启用该选项，即使播放音频文件或文件暂停时屏幕保护程序都不会出现。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="964"/>
- <source>Avoid screensaver</source>
- <translation>避免屏幕保护程序</translation>
+ <location filename="../prefgeneral.cpp" line="964"/>
+ <source>Avoid screensaver</source>
+ <translation>避免屏幕保护程序</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="965"/>
- <source>When this option is checked, SMPlayer will try to prevent the screensaver to be shown when playing a video file. The screensaver will be allowed to be shown if playing an audio file or in pause mode. This option only works if the SMPlayer window is in the foreground.</source>
- <translation>当这个选项被选中，SMPlayer 将试图阻止屏幕保护程序在播放视频文件时显示。如果播放音频文件或处于暂停模式，屏幕保护程序将被允许显示。此选项仅在 SMPlayer 窗口位于前台时有效。</translation>
+ <location filename="../prefgeneral.cpp" line="965"/>
+ <source>When this option is checked, SMPlayer will try to prevent the screensaver to be shown when playing a video file. The screensaver will be allowed to be shown if playing an audio file or in pause mode. This option only works if the SMPlayer window is in the foreground.</source>
+ <translation>当这个选项被选中，SMPlayer 将试图阻止屏幕保护程序在播放视频文件时显示。如果播放音频文件或处于暂停模式，屏幕保护程序将被允许显示。此选项仅在 SMPlayer 窗口位于前台时有效。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="971"/>
- <source>Disable screensaver</source>
- <translation>禁用屏幕保护程序</translation>
+ <location filename="../prefgeneral.cpp" line="971"/>
+ <source>Disable screensaver</source>
+ <translation>禁用屏幕保护程序</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="972"/>
- <source>Check this option to disable the screensaver while playing.&lt;br&gt;The screensaver will enabled again when play finishes.</source>
- <translation>选中此选项可在播放时禁用屏幕保护程序。&lt;br&gt;播放完成后将再次启用屏幕保护程序。</translation>
+ <location filename="../prefgeneral.cpp" line="972"/>
+ <source>Check this option to disable the screensaver while playing.&lt;br&gt;The screensaver will enabled again when play finishes.</source>
+ <translation>选中此选项可在播放时禁用屏幕保护程序。&lt;br&gt;播放完成后将再次启用屏幕保护程序。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="978"/>
- <source>Audio</source>
- <translation>音频</translation>
+ <location filename="../prefgeneral.cpp" line="978"/>
+ <source>Audio</source>
+ <translation>音频</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="980"/>
- <source>Audio output driver</source>
- <translation>音频输出驱动</translation>
+ <location filename="../prefgeneral.cpp" line="980"/>
+ <source>Audio output driver</source>
+ <translation>音频输出驱动</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="981"/>
- <source>Select the audio output driver.</source>
- <translation>选择音频输出驱动。</translation>
+ <location filename="../prefgeneral.cpp" line="981"/>
+ <source>Select the audio output driver.</source>
+ <translation>选择音频输出驱动。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="985"/>
- <source>%1 is the recommended one. %2 is only available on older MPlayer (before version %3)</source>
- <translation>%1 是建议之一。%2 仅适用于旧版 MPlayer（%3 之前的版本）</translation>
+ <location filename="../prefgeneral.cpp" line="985"/>
+ <source>%1 is the recommended one. %2 is only available on older MPlayer (before version %3)</source>
+ <translation>%1 是建议之一。%2 仅适用于旧版 MPlayer（%3 之前的版本）</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="991"/>
- <source>%1 is the recommended one. Try to avoid %2 and %3, they are slow and can have an impact on performance.</source>
- <translation>%1 是建议之一。尽量避免 %2 和 %3 ，它们速度很慢，且会影响性能。</translation>
+ <location filename="../prefgeneral.cpp" line="991"/>
+ <source>%1 is the recommended one. Try to avoid %2 and %3, they are slow and can have an impact on performance.</source>
+ <translation>%1 是建议之一。尽量避免 %2 和 %3 ，它们速度很慢，且会影响性能。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1000"/>
- <source>Enable the audio equalizer</source>
- <translation>启用音频均衡器</translation>
+ <location filename="../prefgeneral.cpp" line="1000"/>
+ <source>Enable the audio equalizer</source>
+ <translation>启用音频均衡器</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1001"/>
- <source>Check this option if you want to use the audio equalizer.</source>
- <translation>如果您想使用音频均衡器请选中此项。</translation>
+ <location filename="../prefgeneral.cpp" line="1001"/>
+ <source>Check this option if you want to use the audio equalizer.</source>
+ <translation>如果您想使用音频均衡器请选中此项。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1003"/>
- <source>AC3/DTS pass-through S/PDIF</source>
- <translation>AC3/DTS 通过 S/PDIF 输出</translation>
+ <location filename="../prefgeneral.cpp" line="1003"/>
+ <source>AC3/DTS pass-through S/PDIF</source>
+ <translation>AC3/DTS 通过 S/PDIF 输出</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1004"/>
- <source>Uses hardware AC3 passthrough.</source>
- <translation>使用 AC3 通过 S/PDIF 输出。</translation>
+ <location filename="../prefgeneral.cpp" line="1004"/>
+ <source>Uses hardware AC3 passthrough.</source>
+ <translation>使用 AC3 通过 S/PDIF 输出。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1005"/>
- <source>&lt;b&gt;Note:&lt;/b&gt; none of the audio filters will be used when this option is enabled.</source>
- <translation>&lt;b&gt;注意:&lt;/b&gt; 当该选项被启用时将不会使用音频过滤器。</translation>
+ <location filename="../prefgeneral.cpp" line="1005"/>
+ <source>&lt;b&gt;Note:&lt;/b&gt; none of the audio filters will be used when this option is enabled.</source>
+ <translation>&lt;b&gt;注意:&lt;/b&gt; 当该选项被启用时将不会使用音频过滤器。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1008"/>
- <source>Channels by default</source>
- <translation>默认通道</translation>
+ <location filename="../prefgeneral.cpp" line="1008"/>
+ <source>Channels by default</source>
+ <translation>默认通道</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1009"/>
- <source>Requests the number of playback channels. MPlayer asks the decoder to decode the audio into as many channels as specified. Then it is up to the decoder to fulfill the requirement. This is usually only important when playing videos with AC3 audio (like DVDs). In that case liba52 does the decoding by default and correctly downmixes the audio into the requested number of channels. &lt;b&gt;Note&lt;/b&gt;: This option is honored by codecs (AC3 only), filters (surround) and audio output drivers (OSS at least).</source>
- <translation>请求播放的声道数。MPlayer 要求解码器把音频解码到指定数量的声道。然后由解码器来实现这个要求。此选项通常只有在播放带 AC-3 音频(比如 DVD) 的视频时才显得重要。在那时默认使用 liba52 解码并把音频正确地混合到需要的声道数。&lt;b&gt;注意&lt;/b&gt;: 此选项可以被解码器(仅适用于 AC3)，过滤器(环绕立体声)和音频输出驱动(至少 OSS 可以)接受。</translation>
+ <location filename="../prefgeneral.cpp" line="1009"/>
+ <source>Requests the number of playback channels. MPlayer asks the decoder to decode the audio into as many channels as specified. Then it is up to the decoder to fulfill the requirement. This is usually only important when playing videos with AC3 audio (like DVDs). In that case liba52 does the decoding by default and correctly downmixes the audio into the requested number of channels. &lt;b&gt;Note&lt;/b&gt;: This option is honored by codecs (AC3 only), filters (surround) and audio output drivers (OSS at least).</source>
+ <translation>请求播放的声道数。MPlayer 要求解码器把音频解码到指定数量的声道。然后由解码器来实现这个要求。此选项通常只有在播放带 AC-3 音频(比如 DVD) 的视频时才显得重要。在那时默认使用 liba52 解码并把音频正确地混合到需要的声道数。&lt;b&gt;注意&lt;/b&gt;: 此选项可以被解码器(仅适用于 AC3)，过滤器(环绕立体声)和音频输出驱动(至少 OSS 可以)接受。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1019"/>
- <source>High speed playback without altering pitch</source>
- <translation>高速播放(不改变间隔)</translation>
+ <location filename="../prefgeneral.cpp" line="1019"/>
+ <source>High speed playback without altering pitch</source>
+ <translation>高速播放(不改变间隔)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1020"/>
- <source>Allows to change the playback speed without altering pitch. Requires at least MPlayer dev-SVN-r24924.</source>
- <translation>允许改变播放速度(不改变间隔)。至少需要 MPlayer dev-SVN-r24924。</translation>
+ <location filename="../prefgeneral.cpp" line="1020"/>
+ <source>Allows to change the playback speed without altering pitch. Requires at least MPlayer dev-SVN-r24924.</source>
+ <translation>允许改变播放速度(不改变间隔)。至少需要 MPlayer dev-SVN-r24924。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1023"/>
- <source>Global volume</source>
- <translation>全局音量</translation>
+ <location filename="../prefgeneral.cpp" line="1023"/>
+ <source>Global volume</source>
+ <translation>全局音量</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1024"/>
- <source>If this option is checked, the same volume will be used for all files you play. If the option is not checked each file uses its own volume.</source>
- <translation>如果这个选项被选中，您播放的所有文件都将使用相同的音量。如果该选项未被选中，每个文件将使用自己的音量。</translation>
+ <location filename="../prefgeneral.cpp" line="1024"/>
+ <source>If this option is checked, the same volume will be used for all files you play. If the option is not checked each file uses its own volume.</source>
+ <translation>如果这个选项被选中，您播放的所有文件都将使用相同的音量。如果该选项未被选中，每个文件将使用自己的音量。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1027"/>
- <source>This option also applies for the mute control.</source>
- <translation>这个选项同样适用于静音控制。</translation>
+ <location filename="../prefgeneral.cpp" line="1027"/>
+ <source>This option also applies for the mute control.</source>
+ <translation>这个选项同样适用于静音控制。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1029"/>
- <source>Software volume control</source>
- <translation>软件音量控制</translation>
+ <location filename="../prefgeneral.cpp" line="1029"/>
+ <source>Software volume control</source>
+ <translation>软件音量控制</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1030"/>
- <source>Check this option to use the software mixer, instead of using the sound card mixer.</source>
- <translation>选中此选项可使用软件混音器，这将替代声卡混音器。</translation>
+ <location filename="../prefgeneral.cpp" line="1030"/>
+ <source>Check this option to use the software mixer, instead of using the sound card mixer.</source>
+ <translation>选中此选项可使用软件混音器，这将替代声卡混音器。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1033"/>
- <source>Max. Amplification</source>
- <translation>最大放大率</translation>
+ <location filename="../prefgeneral.cpp" line="1033"/>
+ <source>Max. Amplification</source>
+ <translation>最大放大率</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1034"/>
- <source>Sets the maximum amplification level in percent (default: 110). A value of 200 will allow you to adjust the volume up to a maximum of double the current level. With values below 100 the initial volume (which is 100%) will be above the maximum, which e.g. the OSD cannot display correctly.</source>
- <translation>以百分比设置最大放大率级别(默认: 110)。该值为200时允许您调整的音量最大达到目前级别的两倍。该值低于100时，初始音量(为100%)会高于设置的最大值，这时例如 OSD 将不能正确显示。</translation>
+ <location filename="../prefgeneral.cpp" line="1034"/>
+ <source>Sets the maximum amplification level in percent (default: 110). A value of 200 will allow you to adjust the volume up to a maximum of double the current level. With values below 100 the initial volume (which is 100%) will be above the maximum, which e.g. the OSD cannot display correctly.</source>
+ <translation>以百分比设置最大放大率级别(默认: 110)。该值为200时允许您调整的音量最大达到目前级别的两倍。该值低于100时，初始音量(为100%)会高于设置的最大值，这时例如 OSD 将不能正确显示。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1040"/>
- <source>Volume normalization by default</source>
- <translation>默认音量标准化</translation>
+ <location filename="../prefgeneral.cpp" line="1040"/>
+ <source>Volume normalization by default</source>
+ <translation>默认音量标准化</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1041"/>
- <source>Maximizes the volume without distorting the sound.</source>
- <translation>声音没有失真的最大音量。</translation>
+ <location filename="../prefgeneral.cpp" line="1041"/>
+ <source>Maximizes the volume without distorting the sound.</source>
+ <translation>声音没有失真的最大音量。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1043"/>
- <source>Audio/video auto synchronization</source>
- <translation>音频/视频 自动同步</translation>
+ <location filename="../prefgeneral.cpp" line="1043"/>
+ <source>Audio/video auto synchronization</source>
+ <translation>音频/视频 自动同步</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1044"/>
- <source>Gradually adjusts the A/V sync based on audio delay measurements.</source>
- <translation>基于音频延迟的检测逐步调整 A/V 同步。</translation>
+ <location filename="../prefgeneral.cpp" line="1044"/>
+ <source>Gradually adjusts the A/V sync based on audio delay measurements.</source>
+ <translation>基于音频延迟的检测逐步调整 A/V 同步。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1047"/>
- <source>A-V sync correction</source>
- <translation>A-V 同步修正</translation>
+ <location filename="../prefgeneral.cpp" line="1047"/>
+ <source>A-V sync correction</source>
+ <translation>A-V 同步修正</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1048"/>
- <source>Maximum A-V sync correction per frame (in seconds)</source>
- <translation>每帧的最大 A-V 同步修正(以秒为单位)</translation>
+ <location filename="../prefgeneral.cpp" line="1048"/>
+ <source>Maximum A-V sync correction per frame (in seconds)</source>
+ <translation>每帧的最大 A-V 同步修正(以秒为单位)</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1050"/>
- <source>Preferred audio and subtitles</source>
- <translation>首选音频和字幕</translation>
+ <location filename="../prefgeneral.cpp" line="1050"/>
+ <source>Preferred audio and subtitles</source>
+ <translation>首选音频和字幕</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1052"/>
- <source>Preferred audio language</source>
- <translation>首选音频语言</translation>
+ <location filename="../prefgeneral.cpp" line="1052"/>
+ <source>Preferred audio language</source>
+ <translation>首选音频语言</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1053"/>
- <source>Here you can type your preferred language for the audio streams. When a media with multiple audio streams is found, SMPlayer will try to use your preferred language.&lt;br&gt;This only will work with media that offer info about the language of the audio streams, like DVDs or mkv files.&lt;br&gt;This field accepts regular expressions. Example: &lt;b&gt;es|esp|spa&lt;/b&gt; will select the audio track if it matches with &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; or &lt;i&gt;spa&lt;/i&gt;.</source>
- <translation>在这里您可以键入您的音频流首选语言。当在媒体中发现多重音频流时，SMPlayer 将尝试使用您的首选语言。&lt;br&gt;这仅工作于提供有关音频流语言信息的媒体，比如 DVD 或 MKV 文件。&lt;br&gt;这些字段接受正则表达式。实例: &lt;b&gt;es|esp|spa&lt;/b&gt; 将选择匹配 &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; 或 &lt;i&gt;spa&lt;/i&gt; 的音轨。</translation>
+ <location filename="../prefgeneral.cpp" line="1053"/>
+ <source>Here you can type your preferred language for the audio streams. When a media with multiple audio streams is found, SMPlayer will try to use your preferred language.&lt;br&gt;This only will work with media that offer info about the language of the audio streams, like DVDs or mkv files.&lt;br&gt;This field accepts regular expressions. Example: &lt;b&gt;es|esp|spa&lt;/b&gt; will select the audio track if it matches with &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; or &lt;i&gt;spa&lt;/i&gt;.</source>
+ <translation>在这里您可以键入您的音频流首选语言。当在媒体中发现多重音频流时，SMPlayer 将尝试使用您的首选语言。&lt;br&gt;这仅工作于提供有关音频流语言信息的媒体，比如 DVD 或 MKV 文件。&lt;br&gt;这些字段接受正则表达式。实例: &lt;b&gt;es|esp|spa&lt;/b&gt; 将选择匹配 &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; 或 &lt;i&gt;spa&lt;/i&gt; 的音轨。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1062"/>
- <source>Preferred subtitle language</source>
- <translation>首选字幕语言</translation>
+ <location filename="../prefgeneral.cpp" line="1062"/>
+ <source>Preferred subtitle language</source>
+ <translation>首选字幕语言</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1063"/>
- <source>Here you can type your preferred language for the subtitle stream. When a media with multiple subtitle streams is found, SMPlayer will try to use your preferred language.&lt;br&gt;This only will work with media that offer info about the language of the subtitle streams, like DVDs or mkv files.&lt;br&gt;This field accepts regular expressions. Example: &lt;b&gt;es|esp|spa&lt;/b&gt; will select the subtitle stream if it matches with &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; or &lt;i&gt;spa&lt;/i&gt;.</source>
- <translation>在这里您可以键入您的字幕流首选语言。当在媒体中发现多重字幕流时，SMPlayer 将尝试使用您的首选语言。&lt;br&gt;这仅工作于提供有关字幕流语言信息的媒体，比如 DVD 或 MKV 文件。&lt;br&gt;这些字段接受正则表达式。实例: &lt;b&gt;es|esp|spa&lt;/b&gt; 将选择匹配 &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; 或 &lt;i&gt;spa&lt;/i&gt; 的字幕流。</translation>
+ <location filename="../prefgeneral.cpp" line="1063"/>
+ <source>Here you can type your preferred language for the subtitle stream. When a media with multiple subtitle streams is found, SMPlayer will try to use your preferred language.&lt;br&gt;This only will work with media that offer info about the language of the subtitle streams, like DVDs or mkv files.&lt;br&gt;This field accepts regular expressions. Example: &lt;b&gt;es|esp|spa&lt;/b&gt; will select the subtitle stream if it matches with &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; or &lt;i&gt;spa&lt;/i&gt;.</source>
+ <translation>在这里您可以键入您的字幕流首选语言。当在媒体中发现多重字幕流时，SMPlayer 将尝试使用您的首选语言。&lt;br&gt;这仅工作于提供有关字幕流语言信息的媒体，比如 DVD 或 MKV 文件。&lt;br&gt;这些字段接受正则表达式。实例: &lt;b&gt;es|esp|spa&lt;/b&gt; 将选择匹配 &lt;i&gt;es&lt;/i&gt;, &lt;i&gt;esp&lt;/i&gt; 或 &lt;i&gt;spa&lt;/i&gt; 的字幕流。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1072"/>
- <source>Audio track</source>
- <translation>音轨</translation>
+ <location filename="../prefgeneral.cpp" line="1072"/>
+ <source>Audio track</source>
+ <translation>音轨</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1073"/>
- <source>Specifies the default audio track which will be used when playing new files. If the track doesn&apos;t exist, the first one will be used. &lt;br&gt;&lt;b&gt;Note:&lt;/b&gt; the &lt;i&gt;&quot;preferred audio language&quot;&lt;/i&gt; has preference over this option.</source>
- <translation>指定播放新文件时将被使用的默认音轨。如果所选轨道不存在，将使用第一个轨道。&lt;br&gt;&lt;b&gt;注意:&lt;/b&gt; &lt;i&gt;“首选音频语言”&lt;/i&gt;优先于此选项。</translation>
+ <location filename="../prefgeneral.cpp" line="1073"/>
+ <source>Specifies the default audio track which will be used when playing new files. If the track doesn&apos;t exist, the first one will be used. &lt;br&gt;&lt;b&gt;Note:&lt;/b&gt; the &lt;i&gt;&quot;preferred audio language&quot;&lt;/i&gt; has preference over this option.</source>
+ <translation>指定播放新文件时将被使用的默认音轨。如果所选轨道不存在，将使用第一个轨道。&lt;br&gt;&lt;b&gt;注意:&lt;/b&gt; &lt;i&gt;“首选音频语言”&lt;/i&gt;优先于此选项。</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1078"/>
- <source>Subtitle track</source>
- <translation>字幕轨道</translation>
+ <location filename="../prefgeneral.cpp" line="1078"/>
+ <source>Subtitle track</source>
+ <translation>字幕轨道</translation>
 </message>
 <message>
- <location filename="../prefgeneral.cpp" line="1079"/>
- <source>Specifies the default subtitle track which will be used when playing new files. If the track doesn&apos;t exist, the first one will be used. &lt;br&gt;&lt;b&gt;Note:&lt;/b&gt; the &lt;i&gt;&quot;preferred subtitle language&quot;&lt;/i&gt; has preference over this option.</source>
- <translation>指定播放新文件时将被使用的默认字幕轨道。如果所选轨道不存在，将使用第一个轨道。&lt;br&gt;&lt;b&gt;注意:&lt;/b&gt; &lt;i&gt;“首选字幕语言”优先于此选项。</translation>
+ <location filename="../prefgeneral.cpp" line="1079"/>
+ <source>Specifies the default subtitle track which will be used when playing new files. If the track doesn&apos;t exist, the first one will be used. &lt;br&gt;&lt;b&gt;Note:&lt;/b&gt; the &lt;i&gt;&quot;preferred subtitle language&quot;&lt;/i&gt; has preference over this option.</source>
+ <translation>指定播放新文件时将被使用的默认字幕轨道。如果所选轨道不存在，将使用第一个轨道。&lt;br&gt;&lt;b&gt;注意:&lt;/b&gt; &lt;i&gt;“首选字幕语言”优先于此选项。</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>PrefInput</name>
 <message>
- <location filename="../prefinput.ui" line="32"/>
- <source>&amp;Keyboard</source>
- <translation>键盘(&amp;K)</translation>
+ <location filename="../prefinput.ui" line="32"/>
+ <source>&amp;Keyboard</source>
+ <translation>键盘(&amp;K)</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="70"/>
- <location filename="../prefinput.ui" line="344"/>
- <source>icon</source>
- <translation>icon</translation>
+ <location filename="../prefinput.ui" line="70"/>
+ <location filename="../prefinput.ui" line="344"/>
+ <source>icon</source>
+ <translation>icon</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="86"/>
- <source>Here you can change any key shortcut. To do it double click or press enter over a shortcut cell. Optionally you can also save the list to share it with other people or load it in another computer.</source>
- <translation>在这里您可以更改任何快捷键。要做到这一点，请在一个快捷键单元格上双击以开始键入。您也可以选择性地保存此列表来与他人分享，或在另一台计算机上加载。</translation>
+ <location filename="../prefinput.ui" line="86"/>
+ <source>Here you can change any key shortcut. To do it double click or press enter over a shortcut cell. Optionally you can also save the list to share it with other people or load it in another computer.</source>
+ <translation>在这里您可以更改任何快捷键。要做到这一点，请在一个快捷键单元格上双击以开始键入。您也可以选择性地保存此列表来与他人分享，或在另一台计算机上加载。</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="112"/>
- <source>&amp;Mouse</source>
- <translation>鼠标(&amp;M)</translation>
+ <location filename="../prefinput.ui" line="112"/>
+ <source>&amp;Mouse</source>
+ <translation>鼠标(&amp;M)</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="136"/>
- <source>Button functions:</source>
- <translation>按钮功能:</translation>
+ <location filename="../prefinput.ui" line="136"/>
+ <source>Button functions:</source>
+ <translation>按钮功能:</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="172"/>
- <source>&amp;Double click</source>
- <translation>双击(&amp;D)</translation>
+ <location filename="../prefinput.ui" line="172"/>
+ <source>&amp;Double click</source>
+ <translation>双击(&amp;D)</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="217"/>
- <source>M&amp;iddle click</source>
- <translation>中键单击(&amp;I)</translation>
+ <location filename="../prefinput.ui" line="217"/>
+ <source>M&amp;iddle click</source>
+ <translation>中键单击(&amp;I)</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="243"/>
- <source>X Button &amp;1</source>
- <translation>X 按钮 1(&amp;1)</translation>
+ <location filename="../prefinput.ui" line="243"/>
+ <source>X Button &amp;1</source>
+ <translation>X 按钮 1(&amp;1)</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="269"/>
- <source>X Button &amp;2</source>
- <translation>X 按钮 2(&amp;2)</translation>
+ <location filename="../prefinput.ui" line="269"/>
+ <source>X Button &amp;2</source>
+ <translation>X 按钮 2(&amp;2)</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="314"/>
- <source>&amp;Left click</source>
- <translation>左键单击(&amp;L)</translation>
+ <location filename="../prefinput.ui" line="314"/>
+ <source>&amp;Left click</source>
+ <translation>左键单击(&amp;L)</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="392"/>
- <source>&amp;Wheel function:</source>
- <translation>滚轮功能(&amp;W):</translation>
+ <location filename="../prefinput.ui" line="392"/>
+ <source>&amp;Wheel function:</source>
+ <translation>滚轮功能(&amp;W):</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="431"/>
- <source>R&amp;everse wheel media seeking</source>
- <translation>反向鼠标滚轮定位(&amp;E)</translation>
+ <location filename="../prefinput.ui" line="431"/>
+ <source>R&amp;everse wheel media seeking</source>
+ <translation>反向鼠标滚轮定位(&amp;E)</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="450"/>
- <source>&amp;Right click</source>
- <translation>右键单击(&amp;R)</translation>
+ <location filename="../prefinput.ui" line="450"/>
+ <source>&amp;Right click</source>
+ <translation>右键单击(&amp;R)</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="490"/>
- <source>M&amp;ouse wheel functions</source>
- <translation>鼠标滚轮功能(&amp;O)</translation>
+ <location filename="../prefinput.ui" line="490"/>
+ <source>M&amp;ouse wheel functions</source>
+ <translation>鼠标滚轮功能(&amp;O)</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="502"/>
- <source>Select the actions that should be cycled through when using the &quot;Change function of wheel&quot; option.</source>
- <translation>选择使用“更改滚轮功能”选项时应被循环的动作。</translation>
+ <location filename="../prefinput.ui" line="502"/>
+ <source>Select the actions that should be cycled through when using the &quot;Change function of wheel&quot; option.</source>
+ <translation>选择使用“更改滚轮功能”选项时应被循环的动作。</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="512"/>
- <location filename="../prefinput.cpp" line="149"/>
- <source>Media &amp;seeking</source>
- <translation>媒体定位(&amp;S)</translation>
+ <location filename="../prefinput.ui" line="512"/>
+ <location filename="../prefinput.cpp" line="149"/>
+ <source>Media &amp;seeking</source>
+ <translation>媒体定位(&amp;S)</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="519"/>
- <location filename="../prefinput.cpp" line="151"/>
- <source>&amp;Volume control</source>
- <translation>音量控制(&amp;V)</translation>
+ <location filename="../prefinput.ui" line="519"/>
+ <location filename="../prefinput.cpp" line="151"/>
+ <source>&amp;Volume control</source>
+ <translation>音量控制(&amp;V)</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="526"/>
- <location filename="../prefinput.cpp" line="150"/>
- <source>&amp;Zoom video</source>
- <translation>缩放视频(&amp;Z)</translation>
+ <location filename="../prefinput.ui" line="526"/>
+ <location filename="../prefinput.cpp" line="150"/>
+ <source>&amp;Zoom video</source>
+ <translation>缩放视频(&amp;Z)</translation>
 </message>
 <message>
- <location filename="../prefinput.ui" line="533"/>
- <location filename="../prefinput.cpp" line="152"/>
- <source>&amp;Change speed</source>
- <translation>更改速度(&amp;C)</translation>
+ <location filename="../prefinput.ui" line="533"/>
+ <location filename="../prefinput.cpp" line="152"/>
+ <source>&amp;Change speed</source>
+ <translation>更改速度(&amp;C)</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="38"/>
- <source>Keyboard and mouse</source>
- <translation>键盘和鼠标</translation>
+ <location filename="../prefinput.cpp" line="38"/>
+ <source>Keyboard and mouse</source>
+ <translation>键盘和鼠标</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="53"/>
- <source>None</source>
- <translation>无</translation>
+ <location filename="../prefinput.cpp" line="53"/>
+ <source>None</source>
+ <translation>无</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="54"/>
- <source>Play</source>
- <translation>播放</translation>
+ <location filename="../prefinput.cpp" line="54"/>
+ <source>Play</source>
+ <translation>播放</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="55"/>
- <source>Play / Pause</source>
- <translation>播放 / 暂停</translation>
+ <location filename="../prefinput.cpp" line="55"/>
+ <source>Play / Pause</source>
+ <translation>播放 / 暂停</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="56"/>
- <source>Pause</source>
- <translation>暂停</translation>
+ <location filename="../prefinput.cpp" line="56"/>
+ <source>Pause</source>
+ <translation>暂停</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="57"/>
- <source>Pause / Frame step</source>
- <translation>暂停 / 逐帧步进</translation>
+ <location filename="../prefinput.cpp" line="57"/>
+ <source>Pause / Frame step</source>
+ <translation>暂停 / 逐帧步进</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="58"/>
- <source>Stop</source>
- <translation>停止</translation>
+ <location filename="../prefinput.cpp" line="58"/>
+ <source>Stop</source>
+ <translation>停止</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="59"/>
- <source>Go backward (short)</source>
- <translation>后退（短）</translation>
+ <location filename="../prefinput.cpp" line="59"/>
+ <source>Go backward (short)</source>
+ <translation>后退（短）</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="60"/>
- <source>Go backward (medium)</source>
- <translation>后退（中）</translation>
+ <location filename="../prefinput.cpp" line="60"/>
+ <source>Go backward (medium)</source>
+ <translation>后退（中）</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="61"/>
- <source>Go backward (long)</source>
- <translation>后退（长）</translation>
+ <location filename="../prefinput.cpp" line="61"/>
+ <source>Go backward (long)</source>
+ <translation>后退（长）</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="62"/>
- <source>Go forward (short)</source>
- <translation>前进（短）</translation>
+ <location filename="../prefinput.cpp" line="62"/>
+ <source>Go forward (short)</source>
+ <translation>前进（短）</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="63"/>
- <source>Go forward (medium)</source>
- <translation>前进（中）</translation>
+ <location filename="../prefinput.cpp" line="63"/>
+ <source>Go forward (medium)</source>
+ <translation>前进（中）</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="64"/>
- <source>Go forward (long)</source>
- <translation>前进（长）</translation>
+ <location filename="../prefinput.cpp" line="64"/>
+ <source>Go forward (long)</source>
+ <translation>前进（长）</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="65"/>
- <source>Increase volume</source>
- <translation>提高音量</translation>
+ <location filename="../prefinput.cpp" line="65"/>
+ <source>Increase volume</source>
+ <translation>提高音量</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="66"/>
- <source>Decrease volume</source>
- <translation>降低音量</translation>
+ <location filename="../prefinput.cpp" line="66"/>
+ <source>Decrease volume</source>
+ <translation>降低音量</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="67"/>
- <source>Fullscreen</source>
- <translation>全屏</translation>
+ <location filename="../prefinput.cpp" line="67"/>
+ <source>Fullscreen</source>
+ <translation>全屏</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="68"/>
- <source>Compact</source>
- <translation>紧凑模式</translation>
+ <location filename="../prefinput.cpp" line="68"/>
+ <source>Compact</source>
+ <translation>紧凑模式</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="69"/>
- <source>Screenshot</source>
- <translation>屏幕截图</translation>
+ <location filename="../prefinput.cpp" line="69"/>
+ <source>Screenshot</source>
+ <translation>屏幕截图</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="70"/>
- <source>Always on top</source>
- <translation>始终在最前端</translation>
+ <location filename="../prefinput.cpp" line="70"/>
+ <source>Always on top</source>
+ <translation>始终在最前端</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="71"/>
- <source>Never on top</source>
- <translation>从不在最前端</translation>
+ <location filename="../prefinput.cpp" line="71"/>
+ <source>Never on top</source>
+ <translation>从不在最前端</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="72"/>
- <source>On top while playing</source>
- <translation>当播放时在最前端</translation>
+ <location filename="../prefinput.cpp" line="72"/>
+ <source>On top while playing</source>
+ <translation>当播放时在最前端</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="73"/>
- <source>Mute</source>
- <translation>静音</translation>
+ <location filename="../prefinput.cpp" line="73"/>
+ <source>Mute</source>
+ <translation>静音</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="74"/>
- <source>OSD - Next level</source>
- <translation>OSD - 下一模式</translation>
+ <location filename="../prefinput.cpp" line="74"/>
+ <source>OSD - Next level</source>
+ <translation>OSD - 下一模式</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="75"/>
- <source>Playlist</source>
- <translation>播放列表</translation>
+ <location filename="../prefinput.cpp" line="75"/>
+ <source>Playlist</source>
+ <translation>播放列表</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="76"/>
- <source>Reset zoom</source>
- <translation>重置缩放</translation>
+ <location filename="../prefinput.cpp" line="76"/>
+ <source>Reset zoom</source>
+ <translation>重置缩放</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="77"/>
- <source>Exit fullscreen</source>
- <translation>退出全屏</translation>
+ <location filename="../prefinput.cpp" line="77"/>
+ <source>Exit fullscreen</source>
+ <translation>退出全屏</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="78"/>
- <source>Normal speed</source>
- <translation>普通速度</translation>
+ <location filename="../prefinput.cpp" line="78"/>
+ <source>Normal speed</source>
+ <translation>普通速度</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="79"/>
- <source>Frame counter</source>
- <translation>帧计数器</translation>
+ <location filename="../prefinput.cpp" line="79"/>
+ <source>Frame counter</source>
+ <translation>帧计数器</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="80"/>
- <source>Preferences</source>
- <translation>首选项</translation>
+ <location filename="../prefinput.cpp" line="80"/>
+ <source>Preferences</source>
+ <translation>首选项</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="81"/>
- <source>Double size</source>
- <translation>双倍大小</translation>
+ <location filename="../prefinput.cpp" line="81"/>
+ <source>Double size</source>
+ <translation>双倍大小</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="82"/>
- <source>Show video equalizer</source>
- <translation>显示视频均衡器</translation>
+ <location filename="../prefinput.cpp" line="82"/>
+ <source>Show video equalizer</source>
+ <translation>显示视频均衡器</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="83"/>
- <source>Show audio equalizer</source>
- <translation>显示音频均衡器</translation>
+ <location filename="../prefinput.cpp" line="83"/>
+ <source>Show audio equalizer</source>
+ <translation>显示音频均衡器</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="84"/>
- <source>Show context menu</source>
- <translation>显示上下文菜单</translation>
+ <location filename="../prefinput.cpp" line="84"/>
+ <source>Show context menu</source>
+ <translation>显示上下文菜单</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="85"/>
- <source>Change function of wheel</source>
- <translation>更改滚轮功能</translation>
+ <location filename="../prefinput.cpp" line="85"/>
+ <source>Change function of wheel</source>
+ <translation>更改滚轮功能</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="87"/>
- <source>Activate option under mouse in DVD menus</source>
- <translation>DVD 菜单下激活鼠标选项</translation>
+ <location filename="../prefinput.cpp" line="87"/>
+ <source>Activate option under mouse in DVD menus</source>
+ <translation>DVD 菜单下激活鼠标选项</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="88"/>
- <source>Return to main DVD menu</source>
- <translation>返回 DVD 主菜单</translation>
+ <location filename="../prefinput.cpp" line="88"/>
+ <source>Return to main DVD menu</source>
+ <translation>返回 DVD 主菜单</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="89"/>
- <source>Return to previous menu in DVD menus</source>
- <translation>返回前一个 DVD 菜单</translation>
+ <location filename="../prefinput.cpp" line="89"/>
+ <source>Return to previous menu in DVD menus</source>
+ <translation>返回前一个 DVD 菜单</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="90"/>
- <source>Move cursor up in DVD menus</source>
- <translation>DVD 菜单中向上移动光标</translation>
+ <location filename="../prefinput.cpp" line="90"/>
+ <source>Move cursor up in DVD menus</source>
+ <translation>DVD 菜单中向上移动光标</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="91"/>
- <source>Move cursor down in DVD menus</source>
- <translation>DVD 菜单中向下移动光标</translation>
+ <location filename="../prefinput.cpp" line="91"/>
+ <source>Move cursor down in DVD menus</source>
+ <translation>DVD 菜单中向下移动光标</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="92"/>
- <source>Move cursor left in DVD menus</source>
- <translation>DVD 菜单中向左移动光标</translation>
+ <location filename="../prefinput.cpp" line="92"/>
+ <source>Move cursor left in DVD menus</source>
+ <translation>DVD 菜单中向左移动光标</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="93"/>
- <source>Move cursor right in DVD menus</source>
- <translation>DVD 菜单中向右移动光标</translation>
+ <location filename="../prefinput.cpp" line="93"/>
+ <source>Move cursor right in DVD menus</source>
+ <translation>DVD 菜单中向右移动光标</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="94"/>
- <source>Activate highlighted option in DVD menus</source>
- <translation>激活 DVD 菜单高亮选项</translation>
+ <location filename="../prefinput.cpp" line="94"/>
+ <source>Activate highlighted option in DVD menus</source>
+ <translation>激活 DVD 菜单高亮选项</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="142"/>
- <source>No function</source>
- <translation>无功能</translation>
+ <location filename="../prefinput.cpp" line="142"/>
+ <source>No function</source>
+ <translation>无功能</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="143"/>
- <location filename="../prefinput.cpp" line="342"/>
- <source>Media seeking</source>
- <translation>媒体定位</translation>
+ <location filename="../prefinput.cpp" line="143"/>
+ <location filename="../prefinput.cpp" line="342"/>
+ <source>Media seeking</source>
+ <translation>媒体定位</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="144"/>
- <location filename="../prefinput.cpp" line="345"/>
- <source>Volume control</source>
- <translation>音量控制</translation>
+ <location filename="../prefinput.cpp" line="144"/>
+ <location filename="../prefinput.cpp" line="345"/>
+ <source>Volume control</source>
+ <translation>音量控制</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="145"/>
- <location filename="../prefinput.cpp" line="348"/>
- <source>Zoom video</source>
- <translation>缩放视频</translation>
+ <location filename="../prefinput.cpp" line="145"/>
+ <location filename="../prefinput.cpp" line="348"/>
+ <source>Zoom video</source>
+ <translation>缩放视频</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="146"/>
- <location filename="../prefinput.cpp" line="351"/>
- <source>Change speed</source>
- <translation>更改速度</translation>
+ <location filename="../prefinput.cpp" line="146"/>
+ <location filename="../prefinput.cpp" line="351"/>
+ <source>Change speed</source>
+ <translation>更改速度</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="156"/>
- <source>Here you can change any key shortcut. To do it double click or start typing over a shortcut cell. Optionally you can also save the list to share it with other people or load it in another computer.</source>
- <translation>在这里您可以更改任何快捷键。要做到这一点，请在一个快捷键单元格上双击以开始键入。您也可以选择性地保存此列表来与他人分享，或在另一台计算机上加载。</translation>
+ <location filename="../prefinput.cpp" line="156"/>
+ <source>Here you can change any key shortcut. To do it double click or start typing over a shortcut cell. Optionally you can also save the list to share it with other people or load it in another computer.</source>
+ <translation>在这里您可以更改任何快捷键。要做到这一点，请在一个快捷键单元格上双击以开始键入。您也可以选择性地保存此列表来与他人分享，或在另一台计算机上加载。</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="307"/>
- <source>Keyboard</source>
- <translation>键盘</translation>
+ <location filename="../prefinput.cpp" line="307"/>
+ <source>Keyboard</source>
+ <translation>键盘</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="309"/>
- <source>Shortcut editor</source>
- <translation>快捷键编辑器</translation>
+ <location filename="../prefinput.cpp" line="309"/>
+ <source>Shortcut editor</source>
+ <translation>快捷键编辑器</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="310"/>
- <source>This table allows you to change the key shortcuts of most available actions. Double click or press enter on a item, or press the &lt;b&gt;Change shortcut&lt;/b&gt; button to enter in the &lt;i&gt;Modify shortcut&lt;/i&gt; dialog. There are two ways to change a shortcut: if the &lt;b&gt;Capture&lt;/b&gt; button is on then just press the new key or combination of keys that you want to assign for the action (unfortunately this doesn&apos;t work for all keys). If the &lt;b&gt;Capture&lt;/b&gt; button is off then you could enter the full name of the key.</source>
- <translation>该表格允许您更改大多数可用动作的快捷键。双击或按回车打开一个项目，也可按&lt;b&gt;更改快捷键&lt;/b&gt;按钮以进入&lt;i&gt;修改快捷键&lt;/i&gt;对话框。有两种方法来更改快捷键: 如果&lt;b&gt;捕捉&lt;/b&gt;按钮已打开，那么只要按下您想要分配用于此动作的新按键或按键组合(很遗憾这不适用于所有按键)。如果&lt;b&gt;捕捉&lt;/b&gt;已关闭，那么您可以输入按键的完整名称。</translation>
+ <location filename="../prefinput.cpp" line="310"/>
+ <source>This table allows you to change the key shortcuts of most available actions. Double click or press enter on a item, or press the &lt;b&gt;Change shortcut&lt;/b&gt; button to enter in the &lt;i&gt;Modify shortcut&lt;/i&gt; dialog. There are two ways to change a shortcut: if the &lt;b&gt;Capture&lt;/b&gt; button is on then just press the new key or combination of keys that you want to assign for the action (unfortunately this doesn&apos;t work for all keys). If the &lt;b&gt;Capture&lt;/b&gt; button is off then you could enter the full name of the key.</source>
+ <translation>该表格允许您更改大多数可用动作的快捷键。双击或按回车打开一个项目，也可按&lt;b&gt;更改快捷键&lt;/b&gt;按钮以进入&lt;i&gt;修改快捷键&lt;/i&gt;对话框。有两种方法来更改快捷键: 如果&lt;b&gt;捕捉&lt;/b&gt;按钮已打开，那么只要按下您想要分配用于此动作的新按键或按键组合(很遗憾这不适用于所有按键)。如果&lt;b&gt;捕捉&lt;/b&gt;已关闭，那么您可以输入按键的完整名称。</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="320"/>
- <source>Mouse</source>
- <translation>鼠标</translation>
+ <location filename="../prefinput.cpp" line="320"/>
+ <source>Mouse</source>
+ <translation>鼠标</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="322"/>
- <source>Left click</source>
- <translation>左键单击</translation>
+ <location filename="../prefinput.cpp" line="322"/>
+ <source>Left click</source>
+ <translation>左键单击</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="323"/>
- <source>Select the action for left click on the mouse.</source>
- <translation>选择用于鼠标左键单击的动作。</translation>
+ <location filename="../prefinput.cpp" line="323"/>
+ <source>Select the action for left click on the mouse.</source>
+ <translation>选择用于鼠标左键单击的动作。</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="325"/>
- <source>Double click</source>
- <translation>双击</translation>
+ <location filename="../prefinput.cpp" line="325"/>
+ <source>Double click</source>
+ <translation>双击</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="326"/>
- <source>Select the action for double click on the mouse.</source>
- <translation>选择用于鼠标双击的动作。</translation>
+ <location filename="../prefinput.cpp" line="326"/>
+ <source>Select the action for double click on the mouse.</source>
+ <translation>选择用于鼠标双击的动作。</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="328"/>
- <source>Middle click</source>
- <translation>中键单击</translation>
+ <location filename="../prefinput.cpp" line="328"/>
+ <source>Middle click</source>
+ <translation>中键单击</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="329"/>
- <source>Select the action for middle click on the mouse.</source>
- <translation>选择用于鼠标中键单击的动作。</translation>
+ <location filename="../prefinput.cpp" line="329"/>
+ <source>Select the action for middle click on the mouse.</source>
+ <translation>选择用于鼠标中键单击的动作。</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="331"/>
- <source>X Button 1</source>
- <translation>X 按钮 1</translation>
+ <location filename="../prefinput.cpp" line="331"/>
+ <source>X Button 1</source>
+ <translation>X 按钮 1</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="332"/>
- <source>Select the action for the X button 1.</source>
- <translation>选择用于 X 按钮 1 的动作。</translation>
+ <location filename="../prefinput.cpp" line="332"/>
+ <source>Select the action for the X button 1.</source>
+ <translation>选择用于 X 按钮 1 的动作。</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="334"/>
- <source>X Button 2</source>
- <translation>X 按钮 2</translation>
+ <location filename="../prefinput.cpp" line="334"/>
+ <source>X Button 2</source>
+ <translation>X 按钮 2</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="335"/>
- <source>Select the action for the X button 2.</source>
- <translation>选择用于 X 按钮 2 的动作。</translation>
+ <location filename="../prefinput.cpp" line="335"/>
+ <source>Select the action for the X button 2.</source>
+ <translation>选择用于 X 按钮 2 的动作。</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="337"/>
- <source>Wheel function</source>
- <translation>滚轮功能</translation>
+ <location filename="../prefinput.cpp" line="337"/>
+ <source>Wheel function</source>
+ <translation>滚轮功能</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="338"/>
- <source>Select the action for the mouse wheel.</source>
- <translation>选择用于鼠标滚轮的动作。</translation>
+ <location filename="../prefinput.cpp" line="338"/>
+ <source>Select the action for the mouse wheel.</source>
+ <translation>选择用于鼠标滚轮的动作。</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="340"/>
- <source>Mouse wheel functions</source>
- <translation>鼠标滚轮功能</translation>
+ <location filename="../prefinput.cpp" line="340"/>
+ <source>Mouse wheel functions</source>
+ <translation>鼠标滚轮功能</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="343"/>
- <source>Check it to enable seeking as one function.</source>
- <translation>选取它以启用定位作为一个功能。</translation>
+ <location filename="../prefinput.cpp" line="343"/>
+ <source>Check it to enable seeking as one function.</source>
+ <translation>选取它以启用定位作为一个功能。</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="346"/>
- <source>Check it to enable changing volume as one function.</source>
- <translation>选取它以启用更改音量作为一个功能。</translation>
+ <location filename="../prefinput.cpp" line="346"/>
+ <source>Check it to enable changing volume as one function.</source>
+ <translation>选取它以启用更改音量作为一个功能。</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="349"/>
- <source>Check it to enable zooming as one function.</source>
- <translation>选取它以启用缩放作为一个功能。</translation>
+ <location filename="../prefinput.cpp" line="349"/>
+ <source>Check it to enable zooming as one function.</source>
+ <translation>选取它以启用缩放作为一个功能。</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="352"/>
- <source>Check it to enable changing speed as one function.</source>
- <translation>选取它以启用更改速度作为一个功能。</translation>
+ <location filename="../prefinput.cpp" line="352"/>
+ <source>Check it to enable changing speed as one function.</source>
+ <translation>选取它以启用更改速度作为一个功能。</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="354"/>
- <source>Reverse mouse wheel seeking</source>
- <translation>反向鼠标滚轮定位</translation>
+ <location filename="../prefinput.cpp" line="354"/>
+ <source>Reverse mouse wheel seeking</source>
+ <translation>反向鼠标滚轮定位</translation>
 </message>
 <message>
- <location filename="../prefinput.cpp" line="355"/>
- <source>Check it to seek in the opposite direction.</source>
- <translation>选中它以启用相反方向的定位。</translation>
+ <location filename="../prefinput.cpp" line="355"/>
+ <source>Check it to seek in the opposite direction.</source>
+ <translation>选中它以启用相反方向的定位。</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>PrefInterface</name>
 <message>
- <location filename="../prefinterface.ui" line="27"/>
- <source>&amp;Interface</source>
- <translation>界面(&amp;I)</translation>
+ <location filename="../prefinterface.ui" line="27"/>
+ <source>&amp;Interface</source>
+ <translation>界面(&amp;I)</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="39"/>
- <source>Main window</source>
- <translation>主窗口</translation>
+ <location filename="../prefinterface.ui" line="39"/>
+ <source>Main window</source>
+ <translation>主窗口</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="51"/>
- <location filename="../prefinterface.ui" line="577"/>
- <source>TextLabel</source>
- <translation>TextLabel</translation>
+ <location filename="../prefinterface.ui" line="51"/>
+ <location filename="../prefinterface.ui" line="577"/>
+ <source>TextLabel</source>
+ <translation>TextLabel</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="66"/>
- <source>Auto&amp;resize:</source>
- <translation>自动调整大小(&amp;R):</translation>
+ <location filename="../prefinterface.ui" line="66"/>
+ <source>Auto&amp;resize:</source>
+ <translation>自动调整大小(&amp;R):</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="83"/>
- <source>Never</source>
- <translation>从不</translation>
+ <location filename="../prefinterface.ui" line="83"/>
+ <source>Never</source>
+ <translation>从不</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="88"/>
- <source>Whenever it&apos;s needed</source>
- <translation>当需要时</translation>
+ <location filename="../prefinterface.ui" line="88"/>
+ <source>Whenever it&apos;s needed</source>
+ <translation>当需要时</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="93"/>
- <source>Only after loading a new video</source>
- <translation>仅在加载新视频后</translation>
+ <location filename="../prefinterface.ui" line="93"/>
+ <source>Only after loading a new video</source>
+ <translation>仅在加载新视频后</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="101"/>
- <source>R&amp;emember position and size</source>
- <translation>记住位置和大小(&amp;E)</translation>
+ <location filename="../prefinterface.ui" line="101"/>
+ <source>R&amp;emember position and size</source>
+ <translation>记住位置和大小(&amp;E)</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="108"/>
- <source>&amp;Hide video window when playing audio files</source>
- <translation>播放音频文件时隐藏视频窗口(&amp;H)</translation>
+ <location filename="../prefinterface.ui" line="108"/>
+ <source>&amp;Hide video window when playing audio files</source>
+ <translation>播放音频文件时隐藏视频窗口(&amp;H)</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="133"/>
- <location filename="../prefinterface.cpp" line="530"/>
- <source>Recent files</source>
- <translation>最近访问的文件</translation>
+ <location filename="../prefinterface.ui" line="133"/>
+ <location filename="../prefinterface.cpp" line="530"/>
+ <source>Recent files</source>
+ <translation>最近访问的文件</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="145"/>
- <source>Ma&amp;x. items</source>
- <translation>最大项目(&amp;X)</translation>
+ <location filename="../prefinterface.ui" line="145"/>
+ <source>Ma&amp;x. items</source>
+ <translation>最大项目(&amp;X)</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="205"/>
- <source>L&amp;anguage:</source>
- <translation>语言(&amp;A):</translation>
+ <location filename="../prefinterface.ui" line="205"/>
+ <source>L&amp;anguage:</source>
+ <translation>语言(&amp;A):</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="218"/>
- <source>Ico&amp;n set:</source>
- <translation>图标集(&amp;N):</translation>
+ <location filename="../prefinterface.ui" line="218"/>
+ <source>Ico&amp;n set:</source>
+ <translation>图标集(&amp;N):</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="264"/>
- <source>St&amp;yle:</source>
- <translation>样式(&amp;Y):</translation>
+ <location filename="../prefinterface.ui" line="264"/>
+ <source>St&amp;yle:</source>
+ <translation>样式(&amp;Y):</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="313"/>
- <source>&amp;GUI</source>
- <translation>GUI(&amp;G)</translation>
+ <location filename="../prefinterface.ui" line="313"/>
+ <source>&amp;GUI</source>
+ <translation>GUI(&amp;G)</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="369"/>
- <source>Default font:</source>
- <translation>默认字体:</translation>
+ <location filename="../prefinterface.ui" line="369"/>
+ <source>Default font:</source>
+ <translation>默认字体:</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="383"/>
- <source>&amp;Change...</source>
- <translation>更改(&amp;C)...</translation>
+ <location filename="../prefinterface.ui" line="383"/>
+ <source>&amp;Change...</source>
+ <translation>更改(&amp;C)...</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="406"/>
- <source>&amp;Seeking</source>
- <translation>定位(&amp;S)</translation>
+ <location filename="../prefinterface.ui" line="406"/>
+ <source>&amp;Seeking</source>
+ <translation>定位(&amp;S)</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="468"/>
- <source>&amp;Behaviour of time slider:</source>
- <translation>时间滑动块行为(&amp;B):</translation>
+ <location filename="../prefinterface.ui" line="468"/>
+ <source>&amp;Behaviour of time slider:</source>
+ <translation>时间滑动块行为(&amp;B):</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="485"/>
- <source>Seek to position while dragging</source>
- <translation>定位到拖动时的位置</translation>
+ <location filename="../prefinterface.ui" line="485"/>
+ <source>Seek to position while dragging</source>
+ <translation>定位到拖动时的位置</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="490"/>
- <source>Seek to position when released</source>
- <translation>定位到放开时的位置</translation>
+ <location filename="../prefinterface.ui" line="490"/>
+ <source>Seek to position when released</source>
+ <translation>定位到放开时的位置</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="513"/>
- <location filename="../prefinterface.cpp" line="578"/>
- <source>Seeking method</source>
- <translation>定位方法</translation>
+ <location filename="../prefinterface.ui" line="513"/>
+ <location filename="../prefinterface.cpp" line="578"/>
+ <source>Seeking method</source>
+ <translation>定位方法</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="525"/>
- <source>&amp;Absolute seeking</source>
- <translation>绝对定位(&amp;A)</translation>
+ <location filename="../prefinterface.ui" line="525"/>
+ <source>&amp;Absolute seeking</source>
+ <translation>绝对定位(&amp;A)</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="538"/>
- <source>&amp;Relative seeking</source>
- <translation>相对定位(&amp;R)</translation>
+ <location filename="../prefinterface.ui" line="538"/>
+ <source>&amp;Relative seeking</source>
+ <translation>相对定位(&amp;R)</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="561"/>
- <source>&amp;Precise seeking</source>
- <translation>精确定位(&amp;P)</translation>
+ <location filename="../prefinterface.ui" line="561"/>
+ <source>&amp;Precise seeking</source>
+ <translation>精确定位(&amp;P)</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="569"/>
- <source>Ins&amp;tances</source>
- <translation>实例(&amp;T)</translation>
+ <location filename="../prefinterface.ui" line="569"/>
+ <source>Ins&amp;tances</source>
+ <translation>实例(&amp;T)</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="584"/>
- <source>&amp;Use only one running instance of SMPlayer</source>
- <translation>仅使用一个正在运行的 SMPlayer 实例(&amp;U)</translation>
+ <location filename="../prefinterface.ui" line="584"/>
+ <source>&amp;Use only one running instance of SMPlayer</source>
+ <translation>仅使用一个正在运行的 SMPlayer 实例(&amp;U)</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="620"/>
- <source>&amp;Floating control</source>
- <translation>浮动控件(&amp;F)</translation>
+ <location filename="../prefinterface.ui" line="620"/>
+ <source>&amp;Floating control</source>
+ <translation>浮动控件(&amp;F)</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="626"/>
- <source>The floating control appears in fullscreen mode when the mouse is moved to the bottom of the screen.</source>
- <translation>全屏模式中当鼠标移动到屏幕底部时浮动控件将会出现。</translation>
+ <location filename="../prefinterface.ui" line="626"/>
+ <source>The floating control appears in fullscreen mode when the mouse is moved to the bottom of the screen.</source>
+ <translation>全屏模式中当鼠标移动到屏幕底部时浮动控件将会出现。</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="636"/>
- <source>&amp;Animated</source>
- <translation>动画(&amp;A)</translation>
+ <location filename="../prefinterface.ui" line="636"/>
+ <source>&amp;Animated</source>
+ <translation>动画(&amp;A)</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="645"/>
- <source>&amp;Width:</source>
- <translation>宽度(&amp;W):</translation>
+ <location filename="../prefinterface.ui" line="645"/>
+ <source>&amp;Width:</source>
+ <translation>宽度(&amp;W):</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="671"/>
- <location filename="../prefinterface.ui" line="704"/>
- <source>0</source>
- <translation>0</translation>
+ <location filename="../prefinterface.ui" line="671"/>
+ <location filename="../prefinterface.ui" line="704"/>
+ <source>0</source>
+ <translation>0</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="678"/>
- <source>&amp;Margin:</source>
- <translation>边距(&amp;M):</translation>
+ <location filename="../prefinterface.ui" line="678"/>
+ <source>&amp;Margin:</source>
+ <translation>边距(&amp;M):</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="713"/>
- <source>Display in &amp;compact mode too</source>
- <translation>紧凑模式中也显示(&amp;C)</translation>
+ <location filename="../prefinterface.ui" line="713"/>
+ <source>Display in &amp;compact mode too</source>
+ <translation>紧凑模式中也显示(&amp;C)</translation>
 </message>
 <message>
- <location filename="../prefinterface.ui" line="720"/>
- <source>&amp;Bypass window manager</source>
- <translation>绕过窗口管理器(&amp;B)</translation>
+ <location filename="../prefinterface.ui" line="720"/>
+ <source>&amp;Bypass window manager</source>
+ <translation>绕过窗口管理器(&amp;B)</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="88"/>
- <location filename="../prefinterface.cpp" line="517"/>
- <source>Interface</source>
- <translation>界面</translation>
+ <location filename="../prefinterface.cpp" line="88"/>
+ <location filename="../prefinterface.cpp" line="517"/>
+ <source>Interface</source>
+ <translation>界面</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="103"/>
- <source>&lt;Autodetect&gt;</source>
- <translation>&lt;自动检测&gt;</translation>
+ <location filename="../prefinterface.cpp" line="103"/>
+ <source>&lt;Autodetect&gt;</source>
+ <translation>&lt;自动检测&gt;</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="132"/>
- <source>&amp;Short jump</source>
- <translation>短跳转(&amp;S)</translation>
+ <location filename="../prefinterface.cpp" line="132"/>
+ <source>&amp;Short jump</source>
+ <translation>短跳转(&amp;S)</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="133"/>
- <source>&amp;Medium jump</source>
- <translation>中等跳转(&amp;M)</translation>
+ <location filename="../prefinterface.cpp" line="133"/>
+ <source>&amp;Medium jump</source>
+ <translation>中等跳转(&amp;M)</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="134"/>
- <source>&amp;Long jump</source>
- <translation>长跳转(&amp;L)</translation>
+ <location filename="../prefinterface.cpp" line="134"/>
+ <source>&amp;Long jump</source>
+ <translation>长跳转(&amp;L)</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="135"/>
- <source>Mouse &amp;wheel jump</source>
- <translation>鼠标滚轮跳转(&amp;W)</translation>
+ <location filename="../prefinterface.cpp" line="135"/>
+ <source>Mouse &amp;wheel jump</source>
+ <translation>鼠标滚轮跳转(&amp;W)</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="154"/>
- <location filename="../prefinterface.cpp" line="157"/>
- <source>Default</source>
- <translation>默认</translation>
+ <location filename="../prefinterface.cpp" line="154"/>
+ <location filename="../prefinterface.cpp" line="157"/>
+ <source>Default</source>
+ <translation>默认</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="162"/>
- <source>Default GUI</source>
- <translation>默认图形用户界面</translation>
+ <location filename="../prefinterface.cpp" line="162"/>
+ <source>Default GUI</source>
+ <translation>默认图形用户界面</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="163"/>
- <source>Mini GUI</source>
- <translation>迷你图形用户界面</translation>
+ <location filename="../prefinterface.cpp" line="163"/>
+ <source>Mini GUI</source>
+ <translation>迷你图形用户界面</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="164"/>
- <source>Mpc GUI</source>
- <translation>MPC 图形用户界面</translation>
+ <location filename="../prefinterface.cpp" line="164"/>
+ <source>Mpc GUI</source>
+ <translation>MPC 图形用户界面</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="519"/>
- <source>Autoresize</source>
- <translation>自动调整大小</translation>
+ <location filename="../prefinterface.cpp" line="519"/>
+ <source>Autoresize</source>
+ <translation>自动调整大小</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="520"/>
- <source>The main window can be resized automatically. Select the option you prefer.</source>
- <translation>主窗口可以被自动调整大小。请选择您需要的选项。</translation>
+ <location filename="../prefinterface.cpp" line="520"/>
+ <source>The main window can be resized automatically. Select the option you prefer.</source>
+ <translation>主窗口可以被自动调整大小。请选择您需要的选项。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="523"/>
- <source>Remember position and size</source>
- <translation>记住位置和大小</translation>
+ <location filename="../prefinterface.cpp" line="523"/>
+ <source>Remember position and size</source>
+ <translation>记住位置和大小</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="524"/>
- <source>If you check this option, the position and size of the main window will be saved and restored when you run SMPlayer again.</source>
- <translation>如果您选中此选项，主窗口的位置和大小将被保存并在您再次运行 SMPlayer 时恢复它们。</translation>
+ <location filename="../prefinterface.cpp" line="524"/>
+ <source>If you check this option, the position and size of the main window will be saved and restored when you run SMPlayer again.</source>
+ <translation>如果您选中此选项，主窗口的位置和大小将被保存并在您再次运行 SMPlayer 时恢复它们。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="527"/>
- <source>Hide video window when playing audio files</source>
- <translation>播放音频文件时隐藏视频窗口</translation>
+ <location filename="../prefinterface.cpp" line="527"/>
+ <source>Hide video window when playing audio files</source>
+ <translation>播放音频文件时隐藏视频窗口</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="528"/>
- <source>If this option is enabled the video window will be hidden when playing audio files.</source>
- <translation>如果启用此选项，播放音频文件时视频窗口将被隐藏。</translation>
+ <location filename="../prefinterface.cpp" line="528"/>
+ <source>If this option is enabled the video window will be hidden when playing audio files.</source>
+ <translation>如果启用此选项，播放音频文件时视频窗口将被隐藏。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="531"/>
- <source>Select the maximum number of items that will be shown in the &lt;b&gt;Open-&gt;Recent files&lt;/b&gt; submenu. If you set it to 0 that menu won&apos;t be shown at all.</source>
- <translation>选择 &lt;b&gt;打开 -&gt; 最近访问的文件&lt;/b&gt; 子菜单中将显示项目的最大数量。如果您把它设置为 0 即表示菜单将不会显示。</translation>
+ <location filename="../prefinterface.cpp" line="531"/>
+ <source>Select the maximum number of items that will be shown in the &lt;b&gt;Open-&gt;Recent files&lt;/b&gt; submenu. If you set it to 0 that menu won&apos;t be shown at all.</source>
+ <translation>选择 &lt;b&gt;打开 -&gt; 最近访问的文件&lt;/b&gt; 子菜单中将显示项目的最大数量。如果您把它设置为 0 即表示菜单将不会显示。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="535"/>
- <source>Language</source>
- <translation>语言</translation>
+ <location filename="../prefinterface.cpp" line="535"/>
+ <source>Language</source>
+ <translation>语言</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="536"/>
- <source>Here you can change the language of the application.</source>
- <translation>在这里您可以更改应用程序的语言。</translation>
+ <location filename="../prefinterface.cpp" line="536"/>
+ <source>Here you can change the language of the application.</source>
+ <translation>在这里您可以更改应用程序的语言。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="538"/>
- <source>Icon set</source>
- <translation>图标集</translation>
+ <location filename="../prefinterface.cpp" line="538"/>
+ <source>Icon set</source>
+ <translation>图标集</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="539"/>
- <source>Select the icon set you prefer for the application.</source>
- <translation>选择您喜欢的应用程序图标集。</translation>
+ <location filename="../prefinterface.cpp" line="539"/>
+ <source>Select the icon set you prefer for the application.</source>
+ <translation>选择您喜欢的应用程序图标集。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="541"/>
- <source>Style</source>
- <translation>样式</translation>
+ <location filename="../prefinterface.cpp" line="541"/>
+ <source>Style</source>
+ <translation>样式</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="542"/>
- <source>Select the style you prefer for the application.</source>
- <translation>选择您喜欢的应用程序样式。</translation>
+ <location filename="../prefinterface.cpp" line="542"/>
+ <source>Select the style you prefer for the application.</source>
+ <translation>选择您喜欢的应用程序样式。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="544"/>
- <source>GUI</source>
- <translation>GUI</translation>
+ <location filename="../prefinterface.cpp" line="544"/>
+ <source>GUI</source>
+ <translation>GUI</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="545"/>
- <source>Select the GUI you prefer for the application. Currently there are two available: Default GUI and Mini GUI.&lt;br&gt;The &lt;b&gt;Default GUI&lt;/b&gt; provides the traditional GUI, with the toolbar and control bar. The &lt;b&gt;Mini GUI&lt;/b&gt; provides a more simple GUI, without toolbar and a control bar with few buttons.&lt;br&gt;&lt;b&gt;Note:&lt;/b&gt; this option will take effect the next time you run SMPlayer.</source>
- <translation>选择您喜欢的应用程序用户图形界面 (GUI)。目前有三个可供选择: 默认图形用户界面，迷你图形用户界面 和 MPC 图形用户界面。&lt;br&gt;&lt;b&gt;默认图形用户界面&lt;/b&gt; 提供传统的图形用户界面，包括工具栏和控制栏。&lt;b&gt;迷你图形用户界面&lt;/b&gt; 提供更加简易的用户图形界面，包括几个按钮，没有工具栏和控制栏。&lt;b&gt;MPC 图形用户界面&lt;/b&gt; 提供一个与 Media Player Classic 播放器类似的用户图形界面。&lt;br&gt;&lt;b&gt;注意:&lt;/b&gt; 此选项将在您下次运行 SMPlayer 时生效。</translation>
+ <location filename="../prefinterface.cpp" line="545"/>
+ <source>Select the GUI you prefer for the application. Currently there are two available: Default GUI and Mini GUI.&lt;br&gt;The &lt;b&gt;Default GUI&lt;/b&gt; provides the traditional GUI, with the toolbar and control bar. The &lt;b&gt;Mini GUI&lt;/b&gt; provides a more simple GUI, without toolbar and a control bar with few buttons.&lt;br&gt;&lt;b&gt;Note:&lt;/b&gt; this option will take effect the next time you run SMPlayer.</source>
+ <translation>选择您喜欢的应用程序用户图形界面 (GUI)。目前有三个可供选择: 默认图形用户界面，迷你图形用户界面 和 MPC 图形用户界面。&lt;br&gt;&lt;b&gt;默认图形用户界面&lt;/b&gt; 提供传统的图形用户界面，包括工具栏和控制栏。&lt;b&gt;迷你图形用户界面&lt;/b&gt; 提供更加简易的用户图形界面，包括几个按钮，没有工具栏和控制栏。&lt;b&gt;MPC 图形用户界面&lt;/b&gt; 提供一个与 Media Player Classic 播放器类似的用户图形界面。&lt;br&gt;&lt;b&gt;注意:&lt;/b&gt; 此选项将在您下次运行 SMPlayer 时生效。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="554"/>
- <source>Default font</source>
- <translation>默认字体</translation>
+ <location filename="../prefinterface.cpp" line="554"/>
+ <source>Default font</source>
+ <translation>默认字体</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="555"/>
- <source>You can change here the application&apos;s font.</source>
- <translation>在这里您可以更改应用程序的字体。</translation>
+ <location filename="../prefinterface.cpp" line="555"/>
+ <source>You can change here the application&apos;s font.</source>
+ <translation>在这里您可以更改应用程序的字体。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="557"/>
- <source>Seeking</source>
- <translation>定位</translation>
+ <location filename="../prefinterface.cpp" line="557"/>
+ <source>Seeking</source>
+ <translation>定位</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="559"/>
- <source>Short jump</source>
- <translation>短跳转</translation>
+ <location filename="../prefinterface.cpp" line="559"/>
+ <source>Short jump</source>
+ <translation>短跳转</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="560"/>
- <location filename="../prefinterface.cpp" line="564"/>
- <location filename="../prefinterface.cpp" line="568"/>
- <source>Select the time that should be go forward or backward when you choose the %1 action.</source>
- <translation>选择您选定 %1 动作后应前进或后退的时间。</translation>
+ <location filename="../prefinterface.cpp" line="560"/>
+ <location filename="../prefinterface.cpp" line="564"/>
+ <location filename="../prefinterface.cpp" line="568"/>
+ <source>Select the time that should be go forward or backward when you choose the %1 action.</source>
+ <translation>选择您选定 %1 动作后应前进或后退的时间。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="561"/>
- <source>short jump</source>
- <translation>短跳转</translation>
+ <location filename="../prefinterface.cpp" line="561"/>
+ <source>short jump</source>
+ <translation>短跳转</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="563"/>
- <source>Medium jump</source>
- <translation>中等跳转</translation>
+ <location filename="../prefinterface.cpp" line="563"/>
+ <source>Medium jump</source>
+ <translation>中等跳转</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="565"/>
- <source>medium jump</source>
- <translation>中等跳转</translation>
+ <location filename="../prefinterface.cpp" line="565"/>
+ <source>medium jump</source>
+ <translation>中等跳转</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="567"/>
- <source>Long jump</source>
- <translation>长跳转</translation>
+ <location filename="../prefinterface.cpp" line="567"/>
+ <source>Long jump</source>
+ <translation>长跳转</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="569"/>
- <source>long jump</source>
- <translation>长跳转</translation>
+ <location filename="../prefinterface.cpp" line="569"/>
+ <source>long jump</source>
+ <translation>长跳转</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="571"/>
- <source>Mouse wheel jump</source>
- <translation>鼠标滚轮跳转</translation>
+ <location filename="../prefinterface.cpp" line="571"/>
+ <source>Mouse wheel jump</source>
+ <translation>鼠标滚轮跳转</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="572"/>
- <source>Select the time that should be go forward or backward when you move the mouse wheel.</source>
- <translation>选择您滚动鼠标滚轮时应前进或后退的时间。</translation>
+ <location filename="../prefinterface.cpp" line="572"/>
+ <source>Select the time that should be go forward or backward when you move the mouse wheel.</source>
+ <translation>选择您滚动鼠标滚轮时应前进或后退的时间。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="575"/>
- <source>Behaviour of time slider</source>
- <translation>时间滑动块行为</translation>
+ <location filename="../prefinterface.cpp" line="575"/>
+ <source>Behaviour of time slider</source>
+ <translation>时间滑动块行为</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="576"/>
- <source>Select what to do when dragging the time slider.</source>
- <translation>选择拖动时间滑动块时该做什么。</translation>
+ <location filename="../prefinterface.cpp" line="576"/>
+ <source>Select what to do when dragging the time slider.</source>
+ <translation>选择拖动时间滑动块时该做什么。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="579"/>
- <source>Sets the method to be used when seeking with the slider. Absolute seeking may be a little bit more accurate, while relative seeking may work better with files with a wrong length.</source>
- <translation>设置用滑块定位时将使用的方法。绝对定位可以更精确一点，而相对定位可以在文件有错误长度时更好地工作。</translation>
+ <location filename="../prefinterface.cpp" line="579"/>
+ <source>Sets the method to be used when seeking with the slider. Absolute seeking may be a little bit more accurate, while relative seeking may work better with files with a wrong length.</source>
+ <translation>设置用滑块定位时将使用的方法。绝对定位可以更精确一点，而相对定位可以在文件有错误长度时更好地工作。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="583"/>
- <source>Precise seeking</source>
- <translation>精确定位</translation>
+ <location filename="../prefinterface.cpp" line="583"/>
+ <source>Precise seeking</source>
+ <translation>精确定位</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="584"/>
- <source>If this option is enabled, seeks are more accurate but they can be a little bit slower. May not work with some video formats.</source>
- <translation>如果启用此选项，定位会更精确，但它稍有点慢。一些视频格式可能无法工作。</translation>
+ <location filename="../prefinterface.cpp" line="584"/>
+ <source>If this option is enabled, seeks are more accurate but they can be a little bit slower. May not work with some video formats.</source>
+ <translation>如果启用此选项，定位会更精确，但它稍有点慢。一些视频格式可能无法工作。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="586"/>
- <source>Note: this option only works with MPlayer2</source>
- <translation>注意: 此选项仅工作于 MPlayer2</translation>
+ <location filename="../prefinterface.cpp" line="586"/>
+ <source>Note: this option only works with MPlayer2</source>
+ <translation>注意: 此选项仅工作于 MPlayer2</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="589"/>
- <source>Instances</source>
- <translation>实例</translation>
+ <location filename="../prefinterface.cpp" line="589"/>
+ <source>Instances</source>
+ <translation>实例</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="592"/>
- <source>Use only one running instance of SMPlayer</source>
- <translation>仅使用一个正在运行的 SMPlayer 实例</translation>
+ <location filename="../prefinterface.cpp" line="592"/>
+ <source>Use only one running instance of SMPlayer</source>
+ <translation>仅使用一个正在运行的 SMPlayer 实例</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="593"/>
- <source>Check this option if you want to use an already running instance of SMPlayer when opening other files.</source>
- <translation>如果您想要在打开其他文件时使用一个已经运行的 SMPlayer 实例，请选中此选项。</translation>
+ <location filename="../prefinterface.cpp" line="593"/>
+ <source>Check this option if you want to use an already running instance of SMPlayer when opening other files.</source>
+ <translation>如果您想要在打开其他文件时使用一个已经运行的 SMPlayer 实例，请选中此选项。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="597"/>
- <source>Floating control</source>
- <translation>浮动控件</translation>
+ <location filename="../prefinterface.cpp" line="597"/>
+ <source>Floating control</source>
+ <translation>浮动控件</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="599"/>
- <source>Animated</source>
- <translation>动画</translation>
+ <location filename="../prefinterface.cpp" line="599"/>
+ <source>Animated</source>
+ <translation>动画</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="600"/>
- <source>If this option is enabled, the floating control will appear with an animation.</source>
- <translation>如果这个选项被启用，浮动控件将以动画形式出现。</translation>
+ <location filename="../prefinterface.cpp" line="600"/>
+ <source>If this option is enabled, the floating control will appear with an animation.</source>
+ <translation>如果这个选项被启用，浮动控件将以动画形式出现。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="603"/>
- <source>Width</source>
- <translation>宽度</translation>
+ <location filename="../prefinterface.cpp" line="603"/>
+ <source>Width</source>
+ <translation>宽度</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="604"/>
- <source>Specifies the width of the control (as a percentage).</source>
- <translation>指定控件的宽度(百分比)。</translation>
+ <location filename="../prefinterface.cpp" line="604"/>
+ <source>Specifies the width of the control (as a percentage).</source>
+ <translation>指定控件的宽度(百分比)。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="606"/>
- <source>Margin</source>
- <translation>边距</translation>
+ <location filename="../prefinterface.cpp" line="606"/>
+ <source>Margin</source>
+ <translation>边距</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="607"/>
- <source>This option sets the number of pixels that the floating control will be away from the bottom of the screen. Useful when the screen is a TV, as the overscan might prevent the control to be visible.</source>
- <translation>这个选项设置浮动控件与屏幕底部距离的像素数。当屏幕是电视时有用，因为 过扫描 可能会阻止对控件的可见。</translation>
+ <location filename="../prefinterface.cpp" line="607"/>
+ <source>This option sets the number of pixels that the floating control will be away from the bottom of the screen. Useful when the screen is a TV, as the overscan might prevent the control to be visible.</source>
+ <translation>这个选项设置浮动控件与屏幕底部距离的像素数。当屏幕是电视时有用，因为 过扫描 可能会阻止对控件的可见。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="612"/>
- <source>Display in compact mode too</source>
- <translation>紧凑模式中也显示</translation>
+ <location filename="../prefinterface.cpp" line="612"/>
+ <source>Display in compact mode too</source>
+ <translation>紧凑模式中也显示</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="613"/>
- <source>If this option is enabled, the floating control will appear in compact mode too. &lt;b&gt;Warning:&lt;/b&gt; the floating control has not been designed for compact mode and it might not work properly.</source>
- <translation>如果这个选项被启用，浮动控件在紧凑模式中也将出现。&lt;b&gt;警告:&lt;/b&gt; 浮动控件并不是为紧凑模式而设计的，它可能无法正常工作。</translation>
+ <location filename="../prefinterface.cpp" line="613"/>
+ <source>If this option is enabled, the floating control will appear in compact mode too. &lt;b&gt;Warning:&lt;/b&gt; the floating control has not been designed for compact mode and it might not work properly.</source>
+ <translation>如果这个选项被启用，浮动控件在紧凑模式中也将出现。&lt;b&gt;警告:&lt;/b&gt; 浮动控件并不是为紧凑模式而设计的，它可能无法正常工作。</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="618"/>
- <source>Bypass window manager</source>
- <translation>绕过窗口管理器</translation>
+ <location filename="../prefinterface.cpp" line="618"/>
+ <source>Bypass window manager</source>
+ <translation>绕过窗口管理器</translation>
 </message>
 <message>
- <location filename="../prefinterface.cpp" line="619"/>
- <source>If this option is checked, the control is displayed bypassing the window manager. Disable this option if the floating control doesn&apos;t work well with your window manager.</source>
- <translation>如果这个选项被选中，控件将会绕过窗口管理器显示。如果浮动控件无法与您的窗口管理器很好的工作，请禁用此选项。</translation>
+ <location filename="../prefinterface.cpp" line="619"/>
+ <source>If this option is checked, the control is displayed bypassing the window manager. Disable this option if the floating control doesn&apos;t work well with your window manager.</source>
+ <translation>如果这个选项被选中，控件将会绕过窗口管理器显示。如果浮动控件无法与您的窗口管理器很好的工作，请禁用此选项。</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>PrefPerformance</name>
 <message>
- <location filename="../prefperformance.ui" line="35"/>
- <source>&amp;Performance</source>
- <translation>首选项(&amp;P)</translation>
+ <location filename="../prefperformance.ui" line="35"/>
+ <source>&amp;Performance</source>
+ <translation>首选项(&amp;P)</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="41"/>
- <location filename="../prefperformance.cpp" line="281"/>
- <source>Priority</source>
- <translation>优先级</translation>
+ <location filename="../prefperformance.ui" line="41"/>
+ <location filename="../prefperformance.cpp" line="281"/>
+ <source>Priority</source>
+ <translation>优先级</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="62"/>
- <source>Select the priority for the MPlayer process.</source>
- <translation>选择用于 MPlayer 进程的优先级。</translation>
+ <location filename="../prefperformance.ui" line="62"/>
+ <source>Select the priority for the MPlayer process.</source>
+ <translation>选择用于 MPlayer 进程的优先级。</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="89"/>
- <source>Priorit&amp;y:</source>
- <translation>优先级(&amp;Y):</translation>
+ <location filename="../prefperformance.ui" line="89"/>
+ <source>Priorit&amp;y:</source>
+ <translation>优先级(&amp;Y):</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="103"/>
- <source>realtime</source>
- <translation>实时</translation>
+ <location filename="../prefperformance.ui" line="103"/>
+ <source>realtime</source>
+ <translation>实时</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="108"/>
- <source>high</source>
- <translation>高</translation>
+ <location filename="../prefperformance.ui" line="108"/>
+ <source>high</source>
+ <translation>高</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="113"/>
- <source>abovenormal</source>
- <translation>高于普通</translation>
+ <location filename="../prefperformance.ui" line="113"/>
+ <source>abovenormal</source>
+ <translation>高于普通</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="118"/>
- <source>normal</source>
- <translation>普通</translation>
+ <location filename="../prefperformance.ui" line="118"/>
+ <source>normal</source>
+ <translation>普通</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="123"/>
- <source>belownormal</source>
- <translation>低于普通</translation>
+ <location filename="../prefperformance.ui" line="123"/>
+ <source>belownormal</source>
+ <translation>低于普通</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="128"/>
- <source>idle</source>
- <translation>空闲</translation>
+ <location filename="../prefperformance.ui" line="128"/>
+ <source>idle</source>
+ <translation>空闲</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="157"/>
- <source>&amp;Allow frame drop</source>
- <translation>允许丢帧(&amp;A)</translation>
+ <location filename="../prefperformance.ui" line="157"/>
+ <source>&amp;Allow frame drop</source>
+ <translation>允许丢帧(&amp;A)</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="164"/>
- <source>Allow &amp;hard frame drop (can lead to image distortion)</source>
- <translation>允许强制丢帧(会导致图像失真)(&amp;H)</translation>
+ <location filename="../prefperformance.ui" line="164"/>
+ <source>Allow &amp;hard frame drop (can lead to image distortion)</source>
+ <translation>允许强制丢帧(会导致图像失真)(&amp;H)</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="188"/>
- <source>&amp;Threads for decoding (MPEG-1/2 and H.264 only):</source>
- <translation>解码线程(仅用于 MPEG-1/2 和 H.264)(&amp;T):</translation>
+ <location filename="../prefperformance.ui" line="188"/>
+ <source>&amp;Threads for decoding (MPEG-1/2 and H.264 only):</source>
+ <translation>解码线程(仅用于 MPEG-1/2 和 H.264)(&amp;T):</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="226"/>
- <source>H.264</source>
- <translation>H.264</translation>
+ <location filename="../prefperformance.ui" line="226"/>
+ <source>H.264</source>
+ <translation>H.264</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="249"/>
- <source>Loop &amp;filter</source>
- <translation>循环过滤器(&amp;F)</translation>
+ <location filename="../prefperformance.ui" line="249"/>
+ <source>Loop &amp;filter</source>
+ <translation>循环过滤器(&amp;F)</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="277"/>
- <source>&amp;Use CoreAVC if no other codec specified</source>
- <translation>没有指定其他编解码器时使用 CoreAVC(&amp;U)</translation>
+ <location filename="../prefperformance.ui" line="277"/>
+ <source>&amp;Use CoreAVC if no other codec specified</source>
+ <translation>没有指定其他编解码器时使用 CoreAVC(&amp;U)</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="304"/>
- <source>&amp;Fast audio track switching</source>
- <translation>快速切换音轨(&amp;F)</translation>
+ <location filename="../prefperformance.ui" line="304"/>
+ <source>&amp;Fast audio track switching</source>
+ <translation>快速切换音轨(&amp;F)</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="332"/>
- <source>Fast &amp;seek to chapters in dvds</source>
- <translation>快速定位 DVD 章节(&amp;S)</translation>
+ <location filename="../prefperformance.ui" line="332"/>
+ <source>Fast &amp;seek to chapters in dvds</source>
+ <translation>快速定位 DVD 章节(&amp;S)</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="348"/>
- <source>Youtube &amp;quality</source>
- <translation>Youtube 质量(&amp;Q)</translation>
+ <location filename="../prefperformance.ui" line="348"/>
+ <source>Youtube &amp;quality</source>
+ <translation>Youtube 质量(&amp;Q)</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="390"/>
- <source>&amp;Cache</source>
- <translation>缓存(&amp;C)</translation>
+ <location filename="../prefperformance.ui" line="390"/>
+ <source>&amp;Cache</source>
+ <translation>缓存(&amp;C)</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="396"/>
- <source>Setting a cache may improve performance on slow media</source>
- <translation>设置缓存可以提高播放慢速媒体的性能</translation>
+ <location filename="../prefperformance.ui" line="396"/>
+ <source>Setting a cache may improve performance on slow media</source>
+ <translation>设置缓存可以提高播放慢速媒体的性能</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="406"/>
- <source>Cache for &amp;local files:</source>
- <translation>本地文件缓存(&amp;L):</translation>
+ <location filename="../prefperformance.ui" line="406"/>
+ <source>Cache for &amp;local files:</source>
+ <translation>本地文件缓存(&amp;L):</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="423"/>
- <location filename="../prefperformance.ui" line="460"/>
- <location filename="../prefperformance.ui" line="497"/>
- <location filename="../prefperformance.ui" line="534"/>
- <location filename="../prefperformance.ui" line="571"/>
- <location filename="../prefperformance.ui" line="608"/>
- <source>KB</source>
- <translation>KB</translation>
+ <location filename="../prefperformance.ui" line="423"/>
+ <location filename="../prefperformance.ui" line="460"/>
+ <location filename="../prefperformance.ui" line="497"/>
+ <location filename="../prefperformance.ui" line="534"/>
+ <location filename="../prefperformance.ui" line="571"/>
+ <location filename="../prefperformance.ui" line="608"/>
+ <source>KB</source>
+ <translation>KB</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="443"/>
- <source>Cache for &amp;streams:</source>
- <translation>流缓存(&amp;S):</translation>
+ <location filename="../prefperformance.ui" line="443"/>
+ <source>Cache for &amp;streams:</source>
+ <translation>流缓存(&amp;S):</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="480"/>
- <source>Cache for &amp;DVDs:</source>
- <translation>DVD 缓存(&amp;D):</translation>
+ <location filename="../prefperformance.ui" line="480"/>
+ <source>Cache for &amp;DVDs:</source>
+ <translation>DVD 缓存(&amp;D):</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="517"/>
- <source>Cache for &amp;audio CDs:</source>
- <translation>音频 CD 缓存(&amp;A):</translation>
+ <location filename="../prefperformance.ui" line="517"/>
+ <source>Cache for &amp;audio CDs:</source>
+ <translation>音频 CD 缓存(&amp;A):</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="554"/>
- <source>Cache for &amp;VCDs:</source>
- <translation>VCD 缓存(&amp;V):</translation>
+ <location filename="../prefperformance.ui" line="554"/>
+ <source>Cache for &amp;VCDs:</source>
+ <translation>VCD 缓存(&amp;V):</translation>
 </message>
 <message>
- <location filename="../prefperformance.ui" line="591"/>
- <source>Cache for &amp;TV:</source>
- <translation>电视缓存(&amp;T):</translation>
+ <location filename="../prefperformance.ui" line="591"/>
+ <source>Cache for &amp;TV:</source>
+ <translation>电视缓存(&amp;T):</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="74"/>
- <location filename="../prefperformance.cpp" line="277"/>
- <source>Performance</source>
- <translation>首选项</translation>
+ <location filename="../prefperformance.cpp" line="74"/>
+ <location filename="../prefperformance.cpp" line="277"/>
+ <source>Performance</source>
+ <translation>首选项</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="89"/>
- <source>Enabled</source>
- <translation>启用</translation>
+ <location filename="../prefperformance.cpp" line="89"/>
+ <source>Enabled</source>
+ <translation>启用</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="90"/>
- <source>Skip (always)</source>
- <translation>跳过(始终)</translation>
+ <location filename="../prefperformance.cpp" line="90"/>
+ <source>Skip (always)</source>
+ <translation>跳过(始终)</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="91"/>
- <source>Skip only on HD videos</source>
- <translation>仅跳过高清视频</translation>
+ <location filename="../prefperformance.cpp" line="91"/>
+ <source>Skip only on HD videos</source>
+ <translation>仅跳过高清视频</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="282"/>
- <source>Set process priority for mplayer according to the predefined priorities available under Windows.&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; Using realtime priority can cause system lockup.</source>
- <translation>根据 Windows 下可用的预定义优先顺序设置 MPlayer 进程的优先级。&lt;br&gt;&lt;b&gt;警告:&lt;/b&gt; 使用实时优先级会引起系统锁死。</translation>
+ <location filename="../prefperformance.cpp" line="282"/>
+ <source>Set process priority for mplayer according to the predefined priorities available under Windows.&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; Using realtime priority can cause system lockup.</source>
+ <translation>根据 Windows 下可用的预定义优先顺序设置 MPlayer 进程的优先级。&lt;br&gt;&lt;b&gt;警告:&lt;/b&gt; 使用实时优先级会引起系统锁死。</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="287"/>
- <source>Allow frame drop</source>
- <translation>允许丢帧</translation>
+ <location filename="../prefperformance.cpp" line="287"/>
+ <source>Allow frame drop</source>
+ <translation>允许丢帧</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="288"/>
- <source>Skip displaying some frames to maintain A/V sync on slow systems.</source>
- <translation>跳过显示一些帧从而在缓慢系统中保持 A/V 同步。</translation>
+ <location filename="../prefperformance.cpp" line="288"/>
+ <source>Skip displaying some frames to maintain A/V sync on slow systems.</source>
+ <translation>跳过显示一些帧从而在缓慢系统中保持 A/V 同步。</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="290"/>
- <source>Allow hard frame drop</source>
- <translation>允许大量丢帧</translation>
+ <location filename="../prefperformance.cpp" line="290"/>
+ <source>Allow hard frame drop</source>
+ <translation>允许大量丢帧</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="291"/>
- <source>More intense frame dropping (breaks decoding). Leads to image distortion!</source>
- <translation>更加密集的丢帧(中断解码过程)。将导致图像失真!</translation>
+ <location filename="../prefperformance.cpp" line="291"/>
+ <source>More intense frame dropping (breaks decoding). Leads to image distortion!</source>
+ <translation>更加密集的丢帧(中断解码过程)。将导致图像失真!</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="294"/>
- <source>Threads for decoding</source>
- <translation>解码线程</translation>
+ <location filename="../prefperformance.cpp" line="294"/>
+ <source>Threads for decoding</source>
+ <translation>解码线程</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="295"/>
- <source>Sets the number of threads to use for decoding. Only for MPEG-1/2 and H.264</source>
- <translation>设置解码使用的线程数。仅用于 MPEG-1/2 和 H.264</translation>
+ <location filename="../prefperformance.cpp" line="295"/>
+ <source>Sets the number of threads to use for decoding. Only for MPEG-1/2 and H.264</source>
+ <translation>设置解码使用的线程数。仅用于 MPEG-1/2 和 H.264</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="298"/>
- <source>Use CoreAVC if no other codec specified</source>
- <translation>没有指定其他编解码器时使用 CoreAVC</translation>
+ <location filename="../prefperformance.cpp" line="298"/>
+ <source>Use CoreAVC if no other codec specified</source>
+ <translation>没有指定其他编解码器时使用 CoreAVC</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="299"/>
- <source>Try to use non-free CoreAVC codec with no other codec is specified and non-VDPAU video output selected. Requires MPlayer build with CoreAVC support.</source>
- <translation>没有指定其他编解码器和选择非 VDPAU 视频输出时尝试使用非自由软件 CoreAVC 编解码器。需要 MPlayer 编译有 CoreAVC 支持。</translation>
+ <location filename="../prefperformance.cpp" line="299"/>
+ <source>Try to use non-free CoreAVC codec with no other codec is specified and non-VDPAU video output selected. Requires MPlayer build with CoreAVC support.</source>
+ <translation>没有指定其他编解码器和选择非 VDPAU 视频输出时尝试使用非自由软件 CoreAVC 编解码器。需要 MPlayer 编译有 CoreAVC 支持。</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="301"/>
- <source>Skip loop filter</source>
- <translation>跳过循环过滤器</translation>
+ <location filename="../prefperformance.cpp" line="301"/>
+ <source>Skip loop filter</source>
+ <translation>跳过循环过滤器</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="302"/>
- <source>This option allows to skips the loop filter (AKA deblocking) during H.264 decoding. Since the filtered frame is supposed to be used as reference for decoding dependent frames this has a worse effect on quality than not doing deblocking on e.g. MPEG-2 video. But at least for high bitrate HDTV this provides a big speedup with no visible quality loss.</source>
- <translation>此选项允许在 H.264 解码期间跳过循环过滤器(亦称为“去块”)。既然被过滤的帧被当作解码依赖帧的引用，在品质上这比不进行去块步骤，如不对 MPEG-2 视频去块，效果更差。但是至少对高比特流的 HDTV 提供了大的提速且不损失视觉品质。</translation>
+ <location filename="../prefperformance.cpp" line="302"/>
+ <source>This option allows to skips the loop filter (AKA deblocking) during H.264 decoding. Since the filtered frame is supposed to be used as reference for decoding dependent frames this has a worse effect on quality than not doing deblocking on e.g. MPEG-2 video. But at least for high bitrate HDTV this provides a big speedup with no visible quality loss.</source>
+ <translation>此选项允许在 H.264 解码期间跳过循环过滤器(亦称为“去块”)。既然被过滤的帧被当作解码依赖帧的引用，在品质上这比不进行去块步骤，如不对 MPEG-2 视频去块，效果更差。但是至少对高比特流的 HDTV 提供了大的提速且不损失视觉品质。</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="309"/>
- <source>Possible values:</source>
- <translation>可能的值:</translation>
+ <location filename="../prefperformance.cpp" line="309"/>
+ <source>Possible values:</source>
+ <translation>可能的值:</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="310"/>
- <source>&lt;b&gt;Enabled&lt;/b&gt;: the loop filter is not skipped</source>
- <translation>&lt;b&gt;启用&lt;/b&gt;: 不跳过循环过滤器</translation>
+ <location filename="../prefperformance.cpp" line="310"/>
+ <source>&lt;b&gt;Enabled&lt;/b&gt;: the loop filter is not skipped</source>
+ <translation>&lt;b&gt;启用&lt;/b&gt;: 不跳过循环过滤器</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="311"/>
- <source>&lt;b&gt;Skip (always)&lt;/b&gt;: the loop filter is skipped no matter the resolution of the video</source>
- <translation>&lt;b&gt;跳过（始终）&lt;/b&gt;: 跳过循环过滤器，不论视频的分辨率</translation>
+ <location filename="../prefperformance.cpp" line="311"/>
+ <source>&lt;b&gt;Skip (always)&lt;/b&gt;: the loop filter is skipped no matter the resolution of the video</source>
+ <translation>&lt;b&gt;跳过（始终）&lt;/b&gt;: 跳过循环过滤器，不论视频的分辨率</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="313"/>
- <source>&lt;b&gt;Skip only on HD videos&lt;/b&gt;: the loop filter will be skipped only on videos which height is %1 or greater.</source>
- <translation>&lt;b&gt;仅跳过高清视频&lt;/b&gt;: 循环过滤器将仅跳过高度是 %1 或更大的视频。</translation>
+ <location filename="../prefperformance.cpp" line="313"/>
+ <source>&lt;b&gt;Skip only on HD videos&lt;/b&gt;: the loop filter will be skipped only on videos which height is %1 or greater.</source>
+ <translation>&lt;b&gt;仅跳过高清视频&lt;/b&gt;: 循环过滤器将仅跳过高度是 %1 或更大的视频。</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="317"/>
- <source>Fast audio track switching</source>
- <translation>快速切换音轨</translation>
+ <location filename="../prefperformance.cpp" line="317"/>
+ <source>Fast audio track switching</source>
+ <translation>快速切换音轨</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="318"/>
- <source>Possible values:&lt;br&gt; &lt;b&gt;Yes&lt;/b&gt;: it will try the fastest method to switch the audio track (it might not work with some formats).&lt;br&gt; &lt;b&gt;No&lt;/b&gt;: the MPlayer process will be restarted whenever you change the audio track.&lt;br&gt; &lt;b&gt;Auto&lt;/b&gt;: SMPlayer will decide what to do according to the MPlayer version.</source>
- <translation>可能的值:&lt;br&gt; &lt;b&gt;是&lt;/b&gt;: 它会尝试以最快的方法来切换音轨(它可能无法工作于某些格式)。&lt;br&gt; &lt;b&gt;否&lt;/b&gt;: 每当您更改音轨，MPlayer 进程将被重新启动。&lt;br&gt; &lt;b&gt;自动&lt;/b&gt;: SMPlayer 将根据 MPlayer 版本来决定做什么。</translation>
+ <location filename="../prefperformance.cpp" line="318"/>
+ <source>Possible values:&lt;br&gt; &lt;b&gt;Yes&lt;/b&gt;: it will try the fastest method to switch the audio track (it might not work with some formats).&lt;br&gt; &lt;b&gt;No&lt;/b&gt;: the MPlayer process will be restarted whenever you change the audio track.&lt;br&gt; &lt;b&gt;Auto&lt;/b&gt;: SMPlayer will decide what to do according to the MPlayer version.</source>
+ <translation>可能的值:&lt;br&gt; &lt;b&gt;是&lt;/b&gt;: 它会尝试以最快的方法来切换音轨(它可能无法工作于某些格式)。&lt;br&gt; &lt;b&gt;否&lt;/b&gt;: 每当您更改音轨，MPlayer 进程将被重新启动。&lt;br&gt; &lt;b&gt;自动&lt;/b&gt;: SMPlayer 将根据 MPlayer 版本来决定做什么。</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="327"/>
- <source>Fast seek to chapters in dvds</source>
- <translation>快速定位 DVD 章节</translation>
+ <location filename="../prefperformance.cpp" line="327"/>
+ <source>Fast seek to chapters in dvds</source>
+ <translation>快速定位 DVD 章节</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="328"/>
- <source>If checked, it will try the fastest method to seek to chapters but it might not work with some discs.</source>
- <translation>如果选中，它将尝试以最快的方法定位章节，但它可能无法工作于某些光盘。</translation>
+ <location filename="../prefperformance.cpp" line="328"/>
+ <source>If checked, it will try the fastest method to seek to chapters but it might not work with some discs.</source>
+ <translation>如果选中，它将尝试以最快的方法定位章节，但它可能无法工作于某些光盘。</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="333"/>
- <source>Youtube quality</source>
- <translation>Youtube 质量</translation>
+ <location filename="../prefperformance.cpp" line="333"/>
+ <source>Youtube quality</source>
+ <translation>Youtube 质量</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="334"/>
- <source>Select the preferred quality for youtube videos.</source>
- <translation>选择用于 Youtube 视频的首选质量。</translation>
+ <location filename="../prefperformance.cpp" line="334"/>
+ <source>Select the preferred quality for youtube videos.</source>
+ <translation>选择用于 Youtube 视频的首选质量。</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="337"/>
- <source>Cache</source>
- <translation>缓存</translation>
+ <location filename="../prefperformance.cpp" line="337"/>
+ <source>Cache</source>
+ <translation>缓存</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="339"/>
- <source>Cache for files</source>
- <translation>文件缓存</translation>
+ <location filename="../prefperformance.cpp" line="339"/>
+ <source>Cache for files</source>
+ <translation>文件缓存</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="340"/>
- <source>This option specifies how much memory (in kBytes) to use when precaching a file.</source>
- <translation>此选项指定预缓存文件时使用多少内存(以 KB 为单位)。</translation>
+ <location filename="../prefperformance.cpp" line="340"/>
+ <source>This option specifies how much memory (in kBytes) to use when precaching a file.</source>
+ <translation>此选项指定预缓存文件时使用多少内存(以 KB 为单位)。</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="343"/>
- <source>Cache for streams</source>
- <translation>流缓存</translation>
+ <location filename="../prefperformance.cpp" line="343"/>
+ <source>Cache for streams</source>
+ <translation>流缓存</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="344"/>
- <source>This option specifies how much memory (in kBytes) to use when precaching a URL.</source>
- <translation>此选项指定预缓存 URL 地址时使用多少内存(以 KB 为单位)。</translation>
+ <location filename="../prefperformance.cpp" line="344"/>
+ <source>This option specifies how much memory (in kBytes) to use when precaching a URL.</source>
+ <translation>此选项指定预缓存 URL 地址时使用多少内存(以 KB 为单位)。</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="347"/>
- <source>Cache for DVDs</source>
- <translation>DVD 缓存</translation>
+ <location filename="../prefperformance.cpp" line="347"/>
+ <source>Cache for DVDs</source>
+ <translation>DVD 缓存</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="348"/>
- <source>This option specifies how much memory (in kBytes) to use when precaching a DVD.&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; Seeking might not work properly (including chapter switching) when using a cache for DVDs.</source>
- <translation>此选项指定预缓存 DVD 时使用多少内存(以 KB 为单位)。&lt;br&gt;&lt;b&gt;警告:&lt;/b&gt; 使用缓存 DVD 时定位可能无法正常工作(包括切换章节)。</translation>
+ <location filename="../prefperformance.cpp" line="348"/>
+ <source>This option specifies how much memory (in kBytes) to use when precaching a DVD.&lt;br&gt;&lt;b&gt;Warning:&lt;/b&gt; Seeking might not work properly (including chapter switching) when using a cache for DVDs.</source>
+ <translation>此选项指定预缓存 DVD 时使用多少内存(以 KB 为单位)。&lt;br&gt;&lt;b&gt;警告:&lt;/b&gt; 使用缓存 DVD 时定位可能无法正常工作(包括切换章节)。</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="352"/>
- <source>Cache for audio CDs</source>
- <translation>音频 CD 缓存</translation>
+ <location filename="../prefperformance.cpp" line="352"/>
+ <source>Cache for audio CDs</source>
+ <translation>音频 CD 缓存</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="353"/>
- <source>This option specifies how much memory (in kBytes) to use when precaching an audio CD.</source>
- <translation>此选项指定预缓存音频 CD 时使用多少内存(以 KB 为单位)。</translation>
+ <location filename="../prefperformance.cpp" line="353"/>
+ <source>This option specifies how much memory (in kBytes) to use when precaching an audio CD.</source>
+ <translation>此选项指定预缓存音频 CD 时使用多少内存(以 KB 为单位)。</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="356"/>
- <source>Cache for VCDs</source>
- <translation>VCD 缓存</translation>
+ <location filename="../prefperformance.cpp" line="356"/>
+ <source>Cache for VCDs</source>
+ <translation>VCD 缓存</translation>
 </message>
 <message>
- <location filename="../prefperformance.cpp" line="357"/>
- <source>This option specifies how much memory (in kBytes) to use when precaching a VCD.</source>
- <translation>此选项指定预缓存 VCD 时使用多少内存(以 KB 为单位)。</translation>
+ <location filename="../prefperformance.cpp" line="357"/>
+ <source>This option specifies how much memory (in kBytes) to use when precaching a VCD.</source>
+ <translation>此选项指定预缓存 VCD 时使用多少内存(以 KB 为单位)。</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>PrefPlaylist</name>
 <message>
- <location filename="../prefplaylist.ui" line="32"/>
- <source>&amp;Playlist</source>
- <translation>播放列表(&amp;P)</translation>
+ <location filename="../prefplaylist.ui" line="32"/>
+ <source>&amp;Playlist</source>
+ <translation>播放列表(&amp;P)</translation>
 </message>
 <message>
- <location filename="../prefplaylist.ui" line="38"/>
- <source>&amp;Automatically add files to playlist</source>
- <translation>自动将文件添加到播放列表(&amp;A)</translation>
+ <location filename="../prefplaylist.ui" line="38"/>
+ <source>&amp;Automatically add files to playlist</source>
+ <translation>自动将文件添加到播放列表(&amp;A)</translation>
 </message>
 <message>
- <location filename="../prefplaylist.ui" line="72"/>
- <source>Add &amp;consecutive files</source>
- <translation>添加连续文件(&amp;C)</translation>
+ <location filename="../prefplaylist.ui" line="72"/>
+ <source>Add &amp;consecutive files</source>
+ <translation>添加连续文件(&amp;C)</translation>
 </message>
 <message>
- <location filename="../prefplaylist.ui" line="94"/>
- <source>P&amp;lay files from start</source>
- <translation>从起点播放文件(&amp;L)</translation>
+ <location filename="../prefplaylist.ui" line="94"/>
+ <source>P&amp;lay files from start</source>
+ <translation>从起点播放文件(&amp;L)</translation>
 </message>
 <message>
- <location filename="../prefplaylist.ui" line="101"/>
- <source>Add files in directories &amp;recursively</source>
- <translation>递归添加目录中的文件(&amp;R)</translation>
+ <location filename="../prefplaylist.ui" line="101"/>
+ <source>Add files in directories &amp;recursively</source>
+ <translation>递归添加目录中的文件(&amp;R)</translation>
 </message>
 <message>
- <location filename="../prefplaylist.ui" line="108"/>
- <source>Get &amp;info automatically about files added (slow)</source>
- <translation>自动获取有关被添加文件的信息(慢)(&amp;I)</translation>
+ <location filename="../prefplaylist.ui" line="108"/>
+ <source>Get &amp;info automatically about files added (slow)</source>
+ <translation>自动获取有关被添加文件的信息(慢)(&amp;I)</translation>
 </message>
 <message>
- <location filename="../prefplaylist.ui" line="115"/>
- <source>&amp;Save copy of playlist on exit</source>
- <translation>退出时保存播放列表副本(&amp;S)</translation>
+ <location filename="../prefplaylist.ui" line="115"/>
+ <source>&amp;Save copy of playlist on exit</source>
+ <translation>退出时保存播放列表副本(&amp;S)</translation>
 </message>
 <message>
- <location filename="../prefplaylist.cpp" line="36"/>
- <source>Playlist</source>
- <translation>播放列表</translation>
+ <location filename="../prefplaylist.cpp" line="36"/>
+ <source>Playlist</source>
+ <translation>播放列表</translation>
 </message>
 <message>
- <location filename="../prefplaylist.cpp" line="111"/>
- <source>Automatically add files to playlist</source>
- <translation>自动将文件添加到播放列表</translation>
+ <location filename="../prefplaylist.cpp" line="111"/>
+ <source>Automatically add files to playlist</source>
+ <translation>自动将文件添加到播放列表</translation>
 </message>
 <message>
- <location filename="../prefplaylist.cpp" line="112"/>
- <source>If this option is enabled, every time a file is opened, SMPlayer will first clear the playlist and then add the file to it. In case of DVDs, CDs and VCDs, all titles in the disc will be added to the playlist.</source>
- <translation>如果这个选项被启用，每当打开文件时，SMPlayer 将首先清除播放列表然后再添加该文件。若打开的是 DVD, CD 和 VCD，光盘上的所有标题都将被添加到播放列表。</translation>
+ <location filename="../prefplaylist.cpp" line="112"/>
+ <source>If this option is enabled, every time a file is opened, SMPlayer will first clear the playlist and then add the file to it. In case of DVDs, CDs and VCDs, all titles in the disc will be added to the playlist.</source>
+ <translation>如果这个选项被启用，每当打开文件时，SMPlayer 将首先清除播放列表然后再添加该文件。若打开的是 DVD, CD 和 VCD，光盘上的所有标题都将被添加到播放列表。</translation>
 </message>
 <message>
- <location filename="../prefplaylist.cpp" line="117"/>
- <source>Add consecutive files</source>
- <translation>添加连续文件</translation>
+ <location filename="../prefplaylist.cpp" line="117"/>
+ <source>Add consecutive files</source>
+ <translation>添加连续文件</translation>
 </message>
 <message>
- <location filename="../prefplaylist.cpp" line="118"/>
- <source>If this option is enabled, SMPlayer will look for consecutive files (e.g. video_1.avi, video_2.avi...) and if found, they&apos;ll be added to the playlist.</source>
- <translation>如果该选项被启用，SMPlayer 将会寻找连续的文件(例如 video_1.avi, video_2.avi...)，如果找到，它们将被添加到播放列表。</translation>
+ <location filename="../prefplaylist.cpp" line="118"/>
+ <source>If this option is enabled, SMPlayer will look for consecutive files (e.g. video_1.avi, video_2.avi...) and if found, they&apos;ll be added to the playlist.</source>
+ <translation>如果该选项被启用，SMPlayer 将会寻找连续的文件(例如 video_1.avi, video_2.avi...)，如果找到，它们将被添加到播放列表。</translation>
 </message>
 <message>
- <location filename="../prefplaylist.cpp" line="122"/>
- <source>Add files in directories recursively</source>
- <translation>递归添加目录中的文件</translation>
+ <location filename="../prefplaylist.cpp" line="122"/>
+ <source>Add files in directories recursively</source>
+ <translation>递归添加目录中的文件</translation>
 </message>
 <message>
- <location filename="../prefplaylist.cpp" line="123"/>
- <source>Check this option if you want that adding a directory will also add the files in subdirectories recursively. Otherwise only the files in the selected directory will be added.</source>
- <translation>如果您想在添加一个目录时也递归添加子目录中的文件，请选中此选项。否则将只添加选定目录中的文件。</translation>
+ <location filename="../prefplaylist.cpp" line="123"/>
+ <source>Check this option if you want that adding a directory will also add the files in subdirectories recursively. Otherwise only the files in the selected directory will be added.</source>
+ <translation>如果您想在添加一个目录时也递归添加子目录中的文件，请选中此选项。否则将只添加选定目录中的文件。</translation>
 </message>
 <message>
- <location filename="../prefplaylist.cpp" line="127"/>
- <source>Add info automatically about files added</source>
- <translation>自动添加有关被添加文件的信息</translation>
+ <location filename="../prefplaylist.cpp" line="127"/>
+ <source>Add info automatically about files added</source>
+ <translation>自动添加有关被添加文件的信息</translation>
 </message>
 <message>
- <location filename="../prefplaylist.cpp" line="128"/>
- <source>Check this option to inquire the files to be added to the playlist for some info. That allows to show the title name (if available) and length of the files. Otherwise this info won&apos;t be available until the file is actually played. Beware: this option can be slow, specially if you add many files.</source>
- <translation>选中此选项可以查询被添加到播放列表中的文件的一些信息。这将允许预显示文件的标题名称(如果可用)和长度。否则只有在文件被实际播放时这些信息才会显示。请注意: 此选项可能会很慢，特别是如果您添加的文件过多时。</translation>
+ <location filename="../prefplaylist.cpp" line="128"/>
+ <source>Check this option to inquire the files to be added to the playlist for some info. That allows to show the title name (if available) and length of the files. Otherwise this info won&apos;t be available until the file is actually played. Beware: this option can be slow, specially if you add many files.</source>
+ <translation>选中此选项可以查询被添加到播放列表中的文件的一些信息。这将允许预显示文件的标题名称(如果可用)和长度。否则只有在文件被实际播放时这些信息才会显示。请注意: 此选项可能会很慢，特别是如果您添加的文件过多时。</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>PrefSubtitles</name>
 <message>
- <location filename="../prefsubtitles.ui" line="35"/>
- <source>&amp;Subtitles</source>
- <translation>字幕(&amp;S)</translation>
+ <location filename="../prefsubtitles.ui" line="35"/>
+ <source>&amp;Subtitles</source>
+ <translation>字幕(&amp;S)</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="44"/>
- <location filename="../prefsubtitles.cpp" line="413"/>
- <source>Autoload</source>
- <translation>自动加载</translation>
+ <location filename="../prefsubtitles.ui" line="44"/>
+ <location filename="../prefsubtitles.cpp" line="413"/>
+ <source>Autoload</source>
+ <translation>自动加载</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="68"/>
- <source>Au&amp;toload subtitles files (*.srt, *.sub...):</source>
- <translation>自动加载字幕文件 (*.srt, *.sub...)(&amp;T):</translation>
+ <location filename="../prefsubtitles.ui" line="68"/>
+ <source>Au&amp;toload subtitles files (*.srt, *.sub...):</source>
+ <translation>自动加载字幕文件 (*.srt, *.sub...)(&amp;T):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="81"/>
- <source>S&amp;elect first available subtitle</source>
- <translation>选择首个可用的字幕(&amp;E)</translation>
+ <location filename="../prefsubtitles.ui" line="81"/>
+ <source>S&amp;elect first available subtitle</source>
+ <translation>选择首个可用的字幕(&amp;E)</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="89"/>
- <source>Same name as movie</source>
- <translation>和电影的名称相同</translation>
+ <location filename="../prefsubtitles.ui" line="89"/>
+ <source>Same name as movie</source>
+ <translation>和电影的名称相同</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="94"/>
- <source>All subs containing movie name</source>
- <translation>所有包含电影名称的字幕</translation>
+ <location filename="../prefsubtitles.ui" line="94"/>
+ <source>All subs containing movie name</source>
+ <translation>所有包含电影名称的字幕</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="99"/>
- <source>All subs in directory</source>
- <translation>目录中的所有字幕</translation>
+ <location filename="../prefsubtitles.ui" line="99"/>
+ <source>All subs in directory</source>
+ <translation>目录中的所有字幕</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="126"/>
- <source>Encoding</source>
- <translation>编码</translation>
+ <location filename="../prefsubtitles.ui" line="126"/>
+ <source>Encoding</source>
+ <translation>编码</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="149"/>
- <source>&amp;Default subtitle encoding:</source>
- <translation>默认字幕编码(&amp;D):</translation>
+ <location filename="../prefsubtitles.ui" line="149"/>
+ <source>&amp;Default subtitle encoding:</source>
+ <translation>默认字幕编码(&amp;D):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="198"/>
- <source>Try to a&amp;utodetect for this language:</source>
- <translation>尝试自动检测此语言(&amp;U):</translation>
+ <location filename="../prefsubtitles.ui" line="198"/>
+ <source>Try to a&amp;utodetect for this language:</source>
+ <translation>尝试自动检测此语言(&amp;U):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="236"/>
- <source>&amp;Include subtitles on screenshots</source>
- <translation>屏幕截图时包含字幕(&amp;I)</translation>
+ <location filename="../prefsubtitles.ui" line="236"/>
+ <source>&amp;Include subtitles on screenshots</source>
+ <translation>屏幕截图时包含字幕(&amp;I)</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="256"/>
- <source>Freet&amp;ype support</source>
- <translation>Freetype 支持(&amp;Y)</translation>
+ <location filename="../prefsubtitles.ui" line="256"/>
+ <source>Freet&amp;ype support</source>
+ <translation>Freetype 支持(&amp;Y)</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="280"/>
- <source>&amp;Font and colors</source>
- <translation>字体和颜色(&amp;F)</translation>
+ <location filename="../prefsubtitles.ui" line="280"/>
+ <source>&amp;Font and colors</source>
+ <translation>字体和颜色(&amp;F)</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="286"/>
- <source>Enable &amp;normal subtitles</source>
- <translation>启用普通字幕(&amp;N)</translation>
+ <location filename="../prefsubtitles.ui" line="286"/>
+ <source>Enable &amp;normal subtitles</source>
+ <translation>启用普通字幕(&amp;N)</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="299"/>
- <source>Enable SSA/&amp;ASS subtitles</source>
- <translation>启用 SSA/ASS 字幕(&amp;A)</translation>
+ <location filename="../prefsubtitles.ui" line="299"/>
+ <source>Enable SSA/&amp;ASS subtitles</source>
+ <translation>启用 SSA/ASS 字幕(&amp;A)</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="344"/>
- <location filename="../prefsubtitles.ui" line="804"/>
- <location filename="../prefsubtitles.cpp" line="448"/>
- <location filename="../prefsubtitles.cpp" line="510"/>
- <source>Font</source>
- <translation>字体</translation>
+ <location filename="../prefsubtitles.ui" line="344"/>
+ <location filename="../prefsubtitles.ui" line="804"/>
+ <location filename="../prefsubtitles.cpp" line="448"/>
+ <location filename="../prefsubtitles.cpp" line="510"/>
+ <source>Font</source>
+ <translation>字体</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="388"/>
- <source>Select the font which will be used for subtitles (and OSD):</source>
- <translation>选择将被应用于字幕(和 OSD)的字体:</translation>
+ <location filename="../prefsubtitles.ui" line="388"/>
+ <source>Select the font which will be used for subtitles (and OSD):</source>
+ <translation>选择将被应用于字幕(和 OSD)的字体:</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="398"/>
- <source>S&amp;ystem font:</source>
- <translation>系统字体(&amp;Y):</translation>
+ <location filename="../prefsubtitles.ui" line="398"/>
+ <source>S&amp;ystem font:</source>
+ <translation>系统字体(&amp;Y):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="418"/>
- <source>&amp;TTF font:</source>
- <translation>TTF 字体(&amp;T):</translation>
+ <location filename="../prefsubtitles.ui" line="418"/>
+ <source>&amp;TTF font:</source>
+ <translation>TTF 字体(&amp;T):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="428"/>
- <location filename="../prefsubtitles.cpp" line="513"/>
- <source>Size</source>
- <translation>大小</translation>
+ <location filename="../prefsubtitles.ui" line="428"/>
+ <location filename="../prefsubtitles.cpp" line="513"/>
+ <source>Size</source>
+ <translation>大小</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="469"/>
- <source>A&amp;utoscale:</source>
- <translation>自动缩放(&amp;U):</translation>
+ <location filename="../prefsubtitles.ui" line="469"/>
+ <source>A&amp;utoscale:</source>
+ <translation>自动缩放(&amp;U):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="483"/>
- <source>No autoscale</source>
- <translation>不自动缩放</translation>
+ <location filename="../prefsubtitles.ui" line="483"/>
+ <source>No autoscale</source>
+ <translation>不自动缩放</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="488"/>
- <source>Proportional to movie height</source>
- <translation>电影高度成比例</translation>
+ <location filename="../prefsubtitles.ui" line="488"/>
+ <source>Proportional to movie height</source>
+ <translation>电影高度成比例</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="493"/>
- <source>Proportional to movie width</source>
- <translation>电影宽度成比例</translation>
+ <location filename="../prefsubtitles.ui" line="493"/>
+ <source>Proportional to movie width</source>
+ <translation>电影宽度成比例</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="498"/>
- <source>Proportional to movie diagonal</source>
- <translation>电影对角线成比例</translation>
+ <location filename="../prefsubtitles.ui" line="498"/>
+ <source>Proportional to movie diagonal</source>
+ <translation>电影对角线成比例</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="544"/>
- <source>Default s&amp;cale:</source>
- <translation>默认比例(&amp;C):</translation>
+ <location filename="../prefsubtitles.ui" line="544"/>
+ <source>Default s&amp;cale:</source>
+ <translation>默认比例(&amp;C):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="560"/>
- <source>Position</source>
- <translation>位置</translation>
+ <location filename="../prefsubtitles.ui" line="560"/>
+ <source>Position</source>
+ <translation>位置</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="581"/>
- <source>Default &amp;position of the subtitles on screen</source>
- <translation>在屏幕上字幕的默认位置(&amp;P)</translation>
+ <location filename="../prefsubtitles.ui" line="581"/>
+ <source>Default &amp;position of the subtitles on screen</source>
+ <translation>在屏幕上字幕的默认位置(&amp;P)</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="636"/>
- <source>0</source>
- <translation>0</translation>
+ <location filename="../prefsubtitles.ui" line="636"/>
+ <source>0</source>
+ <translation>0</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="665"/>
- <source>Top</source>
- <translation>顶部</translation>
+ <location filename="../prefsubtitles.ui" line="665"/>
+ <source>Top</source>
+ <translation>顶部</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="691"/>
- <source>Bottom</source>
- <translation>底部</translation>
+ <location filename="../prefsubtitles.ui" line="691"/>
+ <source>Bottom</source>
+ <translation>底部</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="725"/>
- <source>Defa&amp;ult scale:</source>
- <translation>默认比例(&amp;U):</translation>
+ <location filename="../prefsubtitles.ui" line="725"/>
+ <source>Defa&amp;ult scale:</source>
+ <translation>默认比例(&amp;U):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="764"/>
- <source>&amp;Line spacing:</source>
- <translation>行距(&amp;L):</translation>
+ <location filename="../prefsubtitles.ui" line="764"/>
+ <source>&amp;Line spacing:</source>
+ <translation>行距(&amp;L):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="831"/>
- <source>Si&amp;ze:</source>
- <translation>大小(&amp;Z):</translation>
+ <location filename="../prefsubtitles.ui" line="831"/>
+ <source>Si&amp;ze:</source>
+ <translation>大小(&amp;Z):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="873"/>
- <source>Bol&amp;d</source>
- <translation>粗体(&amp;D)</translation>
+ <location filename="../prefsubtitles.ui" line="873"/>
+ <source>Bol&amp;d</source>
+ <translation>粗体(&amp;D)</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="880"/>
- <source>&amp;Italic</source>
- <translation>斜体(&amp;I)</translation>
+ <location filename="../prefsubtitles.ui" line="880"/>
+ <source>&amp;Italic</source>
+ <translation>斜体(&amp;I)</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="892"/>
- <source>Colors</source>
- <translation>颜色</translation>
+ <location filename="../prefsubtitles.ui" line="892"/>
+ <source>Colors</source>
+ <translation>颜色</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="910"/>
- <source>&amp;Text:</source>
- <translation>文本(&amp;T):</translation>
+ <location filename="../prefsubtitles.ui" line="910"/>
+ <source>&amp;Text:</source>
+ <translation>文本(&amp;T):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="936"/>
- <source>&amp;Border:</source>
- <translation>边框(&amp;B):</translation>
+ <location filename="../prefsubtitles.ui" line="936"/>
+ <source>&amp;Border:</source>
+ <translation>边框(&amp;B):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="962"/>
- <source>Shadow:</source>
- <translation>阴影:</translation>
+ <location filename="../prefsubtitles.ui" line="962"/>
+ <source>Shadow:</source>
+ <translation>阴影:</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="988"/>
- <source>Margins</source>
- <translation>边距</translation>
+ <location filename="../prefsubtitles.ui" line="988"/>
+ <source>Margins</source>
+ <translation>边距</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="1006"/>
- <source>L&amp;eft:</source>
- <translation>左(&amp;E):</translation>
+ <location filename="../prefsubtitles.ui" line="1006"/>
+ <source>L&amp;eft:</source>
+ <translation>左(&amp;E):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="1022"/>
- <source>&amp;Right:</source>
- <translation>右(&amp;R):</translation>
+ <location filename="../prefsubtitles.ui" line="1022"/>
+ <source>&amp;Right:</source>
+ <translation>右(&amp;R):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="1038"/>
- <source>Verti&amp;cal:</source>
- <translation>垂直(&amp;C):</translation>
+ <location filename="../prefsubtitles.ui" line="1038"/>
+ <source>Verti&amp;cal:</source>
+ <translation>垂直(&amp;C):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="1070"/>
- <source>Alignment</source>
- <translation>对齐</translation>
+ <location filename="../prefsubtitles.ui" line="1070"/>
+ <source>Alignment</source>
+ <translation>对齐</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="1088"/>
- <source>&amp;Horizontal:</source>
- <translation>水平(&amp;H):</translation>
+ <location filename="../prefsubtitles.ui" line="1088"/>
+ <source>&amp;Horizontal:</source>
+ <translation>水平(&amp;H):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="1104"/>
- <source>&amp;Vertical:</source>
- <translation>垂直(&amp;V):</translation>
+ <location filename="../prefsubtitles.ui" line="1104"/>
+ <source>&amp;Vertical:</source>
+ <translation>垂直(&amp;V):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="1125"/>
- <source>Border st&amp;yle:</source>
- <translation>边框样式(&amp;Y):</translation>
+ <location filename="../prefsubtitles.ui" line="1125"/>
+ <source>Border st&amp;yle:</source>
+ <translation>边框样式(&amp;Y):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="1151"/>
- <source>&amp;Outline:</source>
- <translation>轮廓(&amp;O):</translation>
+ <location filename="../prefsubtitles.ui" line="1151"/>
+ <source>&amp;Outline:</source>
+ <translation>轮廓(&amp;O):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="1171"/>
- <source>Shado&amp;w:</source>
- <translation>阴影(&amp;W):</translation>
+ <location filename="../prefsubtitles.ui" line="1171"/>
+ <source>Shado&amp;w:</source>
+ <translation>阴影(&amp;W):</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="1211"/>
- <source>A&amp;pply style to ass files too</source>
- <translation>应用样式到 ASS 文件(&amp;P)</translation>
+ <location filename="../prefsubtitles.ui" line="1211"/>
+ <source>A&amp;pply style to ass files too</source>
+ <translation>应用样式到 ASS 文件(&amp;P)</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.ui" line="1234"/>
- <source>Custo&amp;mize...</source>
- <translation>自定义(&amp;M)...</translation>
+ <location filename="../prefsubtitles.ui" line="1234"/>
+ <source>Custo&amp;mize...</source>
+ <translation>自定义(&amp;M)...</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="51"/>
- <location filename="../prefsubtitles.cpp" line="411"/>
- <source>Subtitles</source>
- <translation>字幕</translation>
+ <location filename="../prefsubtitles.cpp" line="51"/>
+ <location filename="../prefsubtitles.cpp" line="411"/>
+ <source>Subtitles</source>
+ <translation>字幕</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="94"/>
- <source>Choose a ttf file</source>
- <translation>选择一个 TTF 文件</translation>
+ <location filename="../prefsubtitles.cpp" line="94"/>
+ <source>Choose a ttf file</source>
+ <translation>选择一个 TTF 文件</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="95"/>
- <source>Truetype Fonts</source>
- <translation>Truetype 字体</translation>
+ <location filename="../prefsubtitles.cpp" line="95"/>
+ <source>Truetype Fonts</source>
+ <translation>Truetype 字体</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="100"/>
- <source>Left</source>
- <comment>horizontal alignment</comment>
- <translation>左</translation>
+ <location filename="../prefsubtitles.cpp" line="100"/>
+ <source>Left</source>
+ <comment>horizontal alignment</comment>
+ <translation>左</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="101"/>
- <source>Centered</source>
- <comment>horizontal alignment</comment>
- <translation>居中</translation>
+ <location filename="../prefsubtitles.cpp" line="101"/>
+ <source>Centered</source>
+ <comment>horizontal alignment</comment>
+ <translation>居中</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="102"/>
- <source>Right</source>
- <comment>horizontal alignment</comment>
- <translation>右</translation>
+ <location filename="../prefsubtitles.cpp" line="102"/>
+ <source>Right</source>
+ <comment>horizontal alignment</comment>
+ <translation>右</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="107"/>
- <source>Bottom</source>
- <comment>vertical alignment</comment>
- <translation>底部</translation>
+ <location filename="../prefsubtitles.cpp" line="107"/>
+ <source>Bottom</source>
+ <comment>vertical alignment</comment>
+ <translation>底部</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="108"/>
- <source>Middle</source>
- <comment>vertical alignment</comment>
- <translation>中部</translation>
+ <location filename="../prefsubtitles.cpp" line="108"/>
+ <source>Middle</source>
+ <comment>vertical alignment</comment>
+ <translation>中部</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="109"/>
- <source>Top</source>
- <comment>vertical alignment</comment>
- <translation>顶部</translation>
+ <location filename="../prefsubtitles.cpp" line="109"/>
+ <source>Top</source>
+ <comment>vertical alignment</comment>
+ <translation>顶部</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="114"/>
- <source>Outline</source>
- <comment>border style</comment>
- <translation>轮廓</translation>
+ <location filename="../prefsubtitles.cpp" line="114"/>
+ <source>Outline</source>
+ <comment>border style</comment>
+ <translation>轮廓</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="115"/>
- <source>Opaque box</source>
- <comment>border style</comment>
- <translation>不透明框</translation>
+ <location filename="../prefsubtitles.cpp" line="115"/>
+ <source>Opaque box</source>
+ <comment>border style</comment>
+ <translation>不透明框</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="381"/>
- <source>Customize SSA/ASS style</source>
- <translation>自定义 SSA/ASS 样式</translation>
+ <location filename="../prefsubtitles.cpp" line="381"/>
+ <source>Customize SSA/ASS style</source>
+ <translation>自定义 SSA/ASS 样式</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="382"/>
- <source>Here you can enter your customized SSA/ASS style.</source>
- <translation>在这里您可以输入您的自定义 SSA/ASS 样式。</translation>
+ <location filename="../prefsubtitles.cpp" line="382"/>
+ <source>Here you can enter your customized SSA/ASS style.</source>
+ <translation>在这里您可以输入您的自定义 SSA/ASS 样式。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="383"/>
- <source>Clear the edit line to disable the customized style.</source>
- <translation>清除编辑行可禁用自定义样式。</translation>
+ <location filename="../prefsubtitles.cpp" line="383"/>
+ <source>Clear the edit line to disable the customized style.</source>
+ <translation>清除编辑行可禁用自定义样式。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="414"/>
- <source>Select the subtitle autoload method.</source>
- <translation>选择字幕自动加载的方法。</translation>
+ <location filename="../prefsubtitles.cpp" line="414"/>
+ <source>Select the subtitle autoload method.</source>
+ <translation>选择字幕自动加载的方法。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="416"/>
- <source>Select first available subtitle</source>
- <translation>选择首个可用的字幕</translation>
+ <location filename="../prefsubtitles.cpp" line="416"/>
+ <source>Select first available subtitle</source>
+ <translation>选择首个可用的字幕</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="417"/>
- <source>If there are one or more subtitle tracks available, one of them will be automatically selected, usually the first one, although if one of them matches the user&apos;s preferred language that one will be used instead.</source>
- <translation>如果有一个或多个可用的字幕，其中一个将被自动选择，通常是第一个，但如果其中一个匹配用户的首选语言，该字幕将被使用。</translation>
+ <location filename="../prefsubtitles.cpp" line="417"/>
+ <source>If there are one or more subtitle tracks available, one of them will be automatically selected, usually the first one, although if one of them matches the user&apos;s preferred language that one will be used instead.</source>
+ <translation>如果有一个或多个可用的字幕，其中一个将被自动选择，通常是第一个，但如果其中一个匹配用户的首选语言，该字幕将被使用。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="422"/>
- <source>Default subtitle encoding</source>
- <translation>默认字幕编码</translation>
+ <location filename="../prefsubtitles.cpp" line="422"/>
+ <source>Default subtitle encoding</source>
+ <translation>默认字幕编码</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="423"/>
- <source>Select the encoding which will be used for subtitle files by default.</source>
- <translation>选择将应用于字幕文件的默认编码。</translation>
+ <location filename="../prefsubtitles.cpp" line="423"/>
+ <source>Select the encoding which will be used for subtitle files by default.</source>
+ <translation>选择将应用于字幕文件的默认编码。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="426"/>
- <source>Try to autodetect for this language</source>
- <translation>尝试自动检测此语言</translation>
+ <location filename="../prefsubtitles.cpp" line="426"/>
+ <source>Try to autodetect for this language</source>
+ <translation>尝试自动检测此语言</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="427"/>
- <source>When this option is on, the encoding of the subtitles will be tried to be autodetected for the given language. It will fall back to the default encoding if the autodetection fails. This option requires a MPlayer compiled with ENCA support.</source>
- <translation>当此选项开启时，字幕将被设法自动检测特定语言的编码。如果自动检测失败，它将退回到默认编码。此选项需要 MPlayer 已编译有 ENCA 支持。</translation>
+ <location filename="../prefsubtitles.cpp" line="427"/>
+ <source>When this option is on, the encoding of the subtitles will be tried to be autodetected for the given language. It will fall back to the default encoding if the autodetection fails. This option requires a MPlayer compiled with ENCA support.</source>
+ <translation>当此选项开启时，字幕将被设法自动检测特定语言的编码。如果自动检测失败，它将退回到默认编码。此选项需要 MPlayer 已编译有 ENCA 支持。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="433"/>
- <source>Subtitle language</source>
- <translation>字幕语言</translation>
+ <location filename="../prefsubtitles.cpp" line="433"/>
+ <source>Subtitle language</source>
+ <translation>字幕语言</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="434"/>
- <source>Select the language for which you want the encoding to be guessed automatically.</source>
- <translation>选择要被自动猜测编码的语言。</translation>
+ <location filename="../prefsubtitles.cpp" line="434"/>
+ <source>Select the language for which you want the encoding to be guessed automatically.</source>
+ <translation>选择要被自动猜测编码的语言。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="438"/>
- <source>Include subtitles on screenshots</source>
- <translation>屏幕截图时包含字幕</translation>
+ <location filename="../prefsubtitles.cpp" line="438"/>
+ <source>Include subtitles on screenshots</source>
+ <translation>屏幕截图时包含字幕</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="439"/>
- <source>If this option is checked, the subtitles will appear in the screenshots. &lt;b&gt;Note:&lt;/b&gt; it may cause some troubles sometimes.</source>
- <translation>如果这个选项被选中，字幕将会出现在屏幕截图中。&lt;b&gt;注意:&lt;/b&gt; 它有时可能会造成一些麻烦。</translation>
+ <location filename="../prefsubtitles.cpp" line="439"/>
+ <source>If this option is checked, the subtitles will appear in the screenshots. &lt;b&gt;Note:&lt;/b&gt; it may cause some troubles sometimes.</source>
+ <translation>如果这个选项被选中，字幕将会出现在屏幕截图中。&lt;b&gt;注意:&lt;/b&gt; 它有时可能会造成一些麻烦。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="442"/>
- <source>Freetype support</source>
- <translation>Freetype 支持</translation>
+ <location filename="../prefsubtitles.cpp" line="442"/>
+ <source>Freetype support</source>
+ <translation>Freetype 支持</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="443"/>
- <source>You should normally not disable this option. Do it only if your MPlayer is compiled without freetype support. &lt;b&gt;Disabling this option could make that subtitles won&apos;t work at all!&lt;/b&gt;</source>
- <translation>您通常不应禁用此选项，除非您的 MPlayer 没有编译有 Freetype 支持。&lt;b&gt;禁用此选项可致使字幕无法工作!&lt;/b&gt;</translation>
+ <location filename="../prefsubtitles.cpp" line="443"/>
+ <source>You should normally not disable this option. Do it only if your MPlayer is compiled without freetype support. &lt;b&gt;Disabling this option could make that subtitles won&apos;t work at all!&lt;/b&gt;</source>
+ <translation>您通常不应禁用此选项，除非您的 MPlayer 没有编译有 Freetype 支持。&lt;b&gt;禁用此选项可致使字幕无法工作!&lt;/b&gt;</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="450"/>
- <source>Enable normal subtitles</source>
- <translation>启用普通字幕</translation>
+ <location filename="../prefsubtitles.cpp" line="450"/>
+ <source>Enable normal subtitles</source>
+ <translation>启用普通字幕</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="451"/>
- <source>Click this button to select the normal/traditional subtitles. This kind of subtitles can only display white subtitles.</source>
- <translation>点击这个按钮以选择 普通/传统 字幕。这种字幕只能显示白色字幕。</translation>
+ <location filename="../prefsubtitles.cpp" line="451"/>
+ <source>Click this button to select the normal/traditional subtitles. This kind of subtitles can only display white subtitles.</source>
+ <translation>点击这个按钮以选择 普通/传统 字幕。这种字幕只能显示白色字幕。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="454"/>
- <source>Enable SSA/ASS subtitles</source>
- <translation>启用 SSA/ASS 字幕</translation>
+ <location filename="../prefsubtitles.cpp" line="454"/>
+ <source>Enable SSA/ASS subtitles</source>
+ <translation>启用 SSA/ASS 字幕</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="455"/>
- <source>Click this button to enable the new SSA/ASS library. This allows to display subtitles with multiple colors, fonts...</source>
- <translation>点击此按钮以启用新式 SSA/ASS 库。这允许显示多种颜色，字体的字幕...</translation>
+ <location filename="../prefsubtitles.cpp" line="455"/>
+ <source>Click this button to enable the new SSA/ASS library. This allows to display subtitles with multiple colors, fonts...</source>
+ <translation>点击此按钮以启用新式 SSA/ASS 库。这允许显示多种颜色，字体的字幕...</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="458"/>
- <source>Normal subtitles</source>
- <translation>普通字幕</translation>
+ <location filename="../prefsubtitles.cpp" line="458"/>
+ <source>Normal subtitles</source>
+ <translation>普通字幕</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="460"/>
- <source>TTF font</source>
- <translation>TTF 字体</translation>
+ <location filename="../prefsubtitles.cpp" line="460"/>
+ <source>TTF font</source>
+ <translation>TTF 字体</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="461"/>
- <source>Here you can select a ttf font to be used for the subtitles. Usually you&apos;ll find a lot of ttf fonts in %1</source>
- <translation>在这里您可以选择一个用于字幕的 TTF 字体。通常在 %1 中您会发现大量的 TTF 字体</translation>
+ <location filename="../prefsubtitles.cpp" line="461"/>
+ <source>Here you can select a ttf font to be used for the subtitles. Usually you&apos;ll find a lot of ttf fonts in %1</source>
+ <translation>在这里您可以选择一个用于字幕的 TTF 字体。通常在 %1 中您会发现大量的 TTF 字体</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="474"/>
- <source>System font</source>
- <translation>系统字体</translation>
+ <location filename="../prefsubtitles.cpp" line="474"/>
+ <source>System font</source>
+ <translation>系统字体</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="475"/>
- <source>Here you can select a system font to be used for the subtitles and OSD. &lt;b&gt;Note:&lt;/b&gt; requires a MPlayer with fontconfig support.</source>
- <translation>在这里您可以选择被应用于字幕和 OSD 的系统字体。&lt;b&gt;注意:&lt;/b&gt; 需要 MPlayer 有 fontconfig 支持。</translation>
+ <location filename="../prefsubtitles.cpp" line="475"/>
+ <source>Here you can select a system font to be used for the subtitles and OSD. &lt;b&gt;Note:&lt;/b&gt; requires a MPlayer with fontconfig support.</source>
+ <translation>在这里您可以选择被应用于字幕和 OSD 的系统字体。&lt;b&gt;注意:&lt;/b&gt; 需要 MPlayer 有 fontconfig 支持。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="478"/>
- <source>Autoscale</source>
- <translation>自动缩放</translation>
+ <location filename="../prefsubtitles.cpp" line="478"/>
+ <source>Autoscale</source>
+ <translation>自动缩放</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="479"/>
- <source>Select the subtitle autoscaling method.</source>
- <translation>选择字幕自动加载的方法。</translation>
+ <location filename="../prefsubtitles.cpp" line="479"/>
+ <source>Select the subtitle autoscaling method.</source>
+ <translation>选择字幕自动加载的方法。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="481"/>
- <source>This option does NOT change the size of the subtitles in the current video. To do so, use the options &lt;i&gt;Size+&lt;/i&gt; and &lt;i&gt;Size-&lt;/i&gt; in the subtitles menu.</source>
- <translation>此选项不改变当前视频字幕的大小。为此可以使用字幕菜单中的 &lt;i&gt;大小+&lt;/i&gt; 和 &lt;i&gt;大小-&lt;/i&gt; 选项。</translation>
+ <location filename="../prefsubtitles.cpp" line="481"/>
+ <source>This option does NOT change the size of the subtitles in the current video. To do so, use the options &lt;i&gt;Size+&lt;/i&gt; and &lt;i&gt;Size-&lt;/i&gt; in the subtitles menu.</source>
+ <translation>此选项不改变当前视频字幕的大小。为此可以使用字幕菜单中的 &lt;i&gt;大小+&lt;/i&gt; 和 &lt;i&gt;大小-&lt;/i&gt; 选项。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="485"/>
- <location filename="../prefsubtitles.cpp" line="497"/>
- <source>Default scale</source>
- <translation>默认比例</translation>
+ <location filename="../prefsubtitles.cpp" line="485"/>
+ <location filename="../prefsubtitles.cpp" line="497"/>
+ <source>Default scale</source>
+ <translation>默认比例</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="486"/>
- <source>This option specifies the default font scale for normal subtitles which will be used for new opened files.</source>
- <translation>此选项可为将被新打开的文件指定用于普通字幕的默认字体比例。</translation>
+ <location filename="../prefsubtitles.cpp" line="486"/>
+ <source>This option specifies the default font scale for normal subtitles which will be used for new opened files.</source>
+ <translation>此选项可为将被新打开的文件指定用于普通字幕的默认字体比例。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="490"/>
- <source>Subtitle position</source>
- <translation>字幕位置</translation>
+ <location filename="../prefsubtitles.cpp" line="490"/>
+ <source>Subtitle position</source>
+ <translation>字幕位置</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="491"/>
- <source>This option specifies the position of the subtitles over the video window. &lt;i&gt;100&lt;/i&gt; means the bottom, while &lt;i&gt;0&lt;/i&gt; means the top.</source>
- <translation>此选项指定在视频窗口中的字幕位置。&lt;i&gt;100&lt;/i&gt; 指底部，&lt;i&gt;0&lt;/i&gt; 指顶部。</translation>
+ <location filename="../prefsubtitles.cpp" line="491"/>
+ <source>This option specifies the position of the subtitles over the video window. &lt;i&gt;100&lt;/i&gt; means the bottom, while &lt;i&gt;0&lt;/i&gt; means the top.</source>
+ <translation>此选项指定在视频窗口中的字幕位置。&lt;i&gt;100&lt;/i&gt; 指底部，&lt;i&gt;0&lt;/i&gt; 指顶部。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="495"/>
- <source>SSA/ASS subtitles</source>
- <translation>SSA/ASS 字幕</translation>
+ <location filename="../prefsubtitles.cpp" line="495"/>
+ <source>SSA/ASS subtitles</source>
+ <translation>SSA/ASS 字幕</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="498"/>
- <source>This option specifies the default font scale for SSA/ASS subtitles which will be used for new opened files.</source>
- <translation>此选项可为将被新打开的文件指定用于 SSA/ASS 字幕的默认字体比例。</translation>
+ <location filename="../prefsubtitles.cpp" line="498"/>
+ <source>This option specifies the default font scale for SSA/ASS subtitles which will be used for new opened files.</source>
+ <translation>此选项可为将被新打开的文件指定用于 SSA/ASS 字幕的默认字体比例。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="502"/>
- <source>Line spacing</source>
- <translation>行距</translation>
+ <location filename="../prefsubtitles.cpp" line="502"/>
+ <source>Line spacing</source>
+ <translation>行距</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="503"/>
- <source>This specifies the spacing that will be used to separate multiple lines. It can have negative values.</source>
- <translation>指定将被用来分隔多行的间距。它可以有负值。</translation>
+ <location filename="../prefsubtitles.cpp" line="503"/>
+ <source>This specifies the spacing that will be used to separate multiple lines. It can have negative values.</source>
+ <translation>指定将被用来分隔多行的间距。它可以有负值。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="506"/>
- <source>SSA/ASS style</source>
- <translation>SSA/ASS 样式</translation>
+ <location filename="../prefsubtitles.cpp" line="506"/>
+ <source>SSA/ASS style</source>
+ <translation>SSA/ASS 样式</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="507"/>
- <source>The following options allows you to define the style to be used for non-styled subtitles (srt, sub...).</source>
- <translation>下面的选项允许您定义用于无样式字幕 (srt，sub...) 的样式。</translation>
+ <location filename="../prefsubtitles.cpp" line="507"/>
+ <source>The following options allows you to define the style to be used for non-styled subtitles (srt, sub...).</source>
+ <translation>下面的选项允许您定义用于无样式字幕 (srt，sub...) 的样式。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="511"/>
- <source>Select the font for the subtitles.</source>
- <translation>选择字幕字体。</translation>
+ <location filename="../prefsubtitles.cpp" line="511"/>
+ <source>Select the font for the subtitles.</source>
+ <translation>选择字幕字体。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="514"/>
- <source>The size in pixels.</source>
- <translation>以像素为单位的大小。</translation>
+ <location filename="../prefsubtitles.cpp" line="514"/>
+ <source>The size in pixels.</source>
+ <translation>以像素为单位的大小。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="516"/>
- <source>Bold</source>
- <translation>粗体</translation>
+ <location filename="../prefsubtitles.cpp" line="516"/>
+ <source>Bold</source>
+ <translation>粗体</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="517"/>
- <source>If checked, the text will be displayed in &lt;b&gt;bold&lt;/b&gt;.</source>
- <translation>如果选中，文本将被显示为&lt;b&gt;粗体&lt;/b&gt;。</translation>
+ <location filename="../prefsubtitles.cpp" line="517"/>
+ <source>If checked, the text will be displayed in &lt;b&gt;bold&lt;/b&gt;.</source>
+ <translation>如果选中，文本将被显示为&lt;b&gt;粗体&lt;/b&gt;。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="519"/>
- <source>Italic</source>
- <translation>斜体</translation>
+ <location filename="../prefsubtitles.cpp" line="519"/>
+ <source>Italic</source>
+ <translation>斜体</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="520"/>
- <source>If checked, the text will be displayed in &lt;i&gt;italic&lt;/i&gt;.</source>
- <translation>如果选中，文本将被显示为&lt;i&gt;斜体&lt;/i&gt;。</translation>
+ <location filename="../prefsubtitles.cpp" line="520"/>
+ <source>If checked, the text will be displayed in &lt;i&gt;italic&lt;/i&gt;.</source>
+ <translation>如果选中，文本将被显示为&lt;i&gt;斜体&lt;/i&gt;。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="522"/>
- <source>Text color</source>
- <translation>文本颜色</translation>
+ <location filename="../prefsubtitles.cpp" line="522"/>
+ <source>Text color</source>
+ <translation>文本颜色</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="523"/>
- <source>Select the color for the text of the subtitles.</source>
- <translation>选择用于字幕文本的颜色。</translation>
+ <location filename="../prefsubtitles.cpp" line="523"/>
+ <source>Select the color for the text of the subtitles.</source>
+ <translation>选择用于字幕文本的颜色。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="525"/>
- <source>Border color</source>
- <translation>边框颜色</translation>
+ <location filename="../prefsubtitles.cpp" line="525"/>
+ <source>Border color</source>
+ <translation>边框颜色</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="526"/>
- <source>Select the color for the border of the subtitles.</source>
- <translation>选择用于字幕的边框颜色。</translation>
+ <location filename="../prefsubtitles.cpp" line="526"/>
+ <source>Select the color for the border of the subtitles.</source>
+ <translation>选择用于字幕的边框颜色。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="528"/>
- <source>Shadow color</source>
- <translation>阴影颜色</translation>
+ <location filename="../prefsubtitles.cpp" line="528"/>
+ <source>Shadow color</source>
+ <translation>阴影颜色</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="529"/>
- <source>This color will be used for the shadow of the subtitles.</source>
- <translation>该颜色将用于字幕的阴影。</translation>
+ <location filename="../prefsubtitles.cpp" line="529"/>
+ <source>This color will be used for the shadow of the subtitles.</source>
+ <translation>该颜色将用于字幕的阴影。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="531"/>
- <source>Left margin</source>
- <translation>左边距</translation>
+ <location filename="../prefsubtitles.cpp" line="531"/>
+ <source>Left margin</source>
+ <translation>左边距</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="532"/>
- <source>Specifies the left margin in pixels.</source>
- <translation>以像素为单位指定左边距。</translation>
+ <location filename="../prefsubtitles.cpp" line="532"/>
+ <source>Specifies the left margin in pixels.</source>
+ <translation>以像素为单位指定左边距。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="534"/>
- <source>Right margin</source>
- <translation>右边距</translation>
+ <location filename="../prefsubtitles.cpp" line="534"/>
+ <source>Right margin</source>
+ <translation>右边距</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="535"/>
- <source>Specifies the right margin in pixels.</source>
- <translation>以像素为单位指定右边距。</translation>
+ <location filename="../prefsubtitles.cpp" line="535"/>
+ <source>Specifies the right margin in pixels.</source>
+ <translation>以像素为单位指定右边距。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="537"/>
- <source>Vertical margin</source>
- <translation>垂直边距</translation>
+ <location filename="../prefsubtitles.cpp" line="537"/>
+ <source>Vertical margin</source>
+ <translation>垂直边距</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="538"/>
- <source>Specifies the vertical margin in pixels.</source>
- <translation>以像素为单位指定垂直边距。</translation>
+ <location filename="../prefsubtitles.cpp" line="538"/>
+ <source>Specifies the vertical margin in pixels.</source>
+ <translation>以像素为单位指定垂直边距。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="540"/>
- <source>Horizontal alignment</source>
- <translation>水平对齐</translation>
+ <location filename="../prefsubtitles.cpp" line="540"/>
+ <source>Horizontal alignment</source>
+ <translation>水平对齐</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="541"/>
- <source>Specifies the horizontal alignment. Possible values are left, centered and right.</source>
- <translation>指定水平对齐方式。可取值有 左，居中和右。</translation>
+ <location filename="../prefsubtitles.cpp" line="541"/>
+ <source>Specifies the horizontal alignment. Possible values are left, centered and right.</source>
+ <translation>指定水平对齐方式。可取值有 左，居中和右。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="544"/>
- <source>Vertical alignment</source>
- <translation>垂直对齐</translation>
+ <location filename="../prefsubtitles.cpp" line="544"/>
+ <source>Vertical alignment</source>
+ <translation>垂直对齐</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="545"/>
- <source>Specifies the vertical alignment. Possible values: bottom, middle and top.</source>
- <translation>指定垂直对齐方式。可取值: 底部，中部和顶部。</translation>
+ <location filename="../prefsubtitles.cpp" line="545"/>
+ <source>Specifies the vertical alignment. Possible values: bottom, middle and top.</source>
+ <translation>指定垂直对齐方式。可取值: 底部，中部和顶部。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="548"/>
- <source>Border style</source>
- <translation>边框样式</translation>
+ <location filename="../prefsubtitles.cpp" line="548"/>
+ <source>Border style</source>
+ <translation>边框样式</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="549"/>
- <source>Specifies the border style. Possible values: outline and opaque box.</source>
- <translation>指定边框样式。可取值: 轮廓和不透明框。</translation>
+ <location filename="../prefsubtitles.cpp" line="549"/>
+ <source>Specifies the border style. Possible values: outline and opaque box.</source>
+ <translation>指定边框样式。可取值: 轮廓和不透明框。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="552"/>
- <source>Outline</source>
- <translation>轮廓</translation>
+ <location filename="../prefsubtitles.cpp" line="552"/>
+ <source>Outline</source>
+ <translation>轮廓</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="553"/>
- <source>If border style is set to &lt;i&gt;outline&lt;/i&gt;, this option specifies the width of the outline around the text in pixels.</source>
- <translation>如果边框样式设置为&lt;i&gt;轮廓&lt;/i&gt;，此选项以像素为单位指定文本周围轮廓的宽度。</translation>
+ <location filename="../prefsubtitles.cpp" line="553"/>
+ <source>If border style is set to &lt;i&gt;outline&lt;/i&gt;, this option specifies the width of the outline around the text in pixels.</source>
+ <translation>如果边框样式设置为&lt;i&gt;轮廓&lt;/i&gt;，此选项以像素为单位指定文本周围轮廓的宽度。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="556"/>
- <source>Shadow</source>
- <translation>阴影</translation>
+ <location filename="../prefsubtitles.cpp" line="556"/>
+ <source>Shadow</source>
+ <translation>阴影</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="557"/>
- <source>If border style is set to &lt;i&gt;outline&lt;/i&gt;, this option specifies the depth of the drop shadow behind the text in pixels.</source>
- <translation>如果边框样式设置为&lt;i&gt;轮廓&lt;/i&gt;，此选项以像素为单位指定文本后面阴影效果的深度。</translation>
+ <location filename="../prefsubtitles.cpp" line="557"/>
+ <source>If border style is set to &lt;i&gt;outline&lt;/i&gt;, this option specifies the depth of the drop shadow behind the text in pixels.</source>
+ <translation>如果边框样式设置为&lt;i&gt;轮廓&lt;/i&gt;，此选项以像素为单位指定文本后面阴影效果的深度。</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="560"/>
- <source>Apply style to ass files too</source>
- <translation>应用样式到 ASS 文件</translation>
+ <location filename="../prefsubtitles.cpp" line="560"/>
+ <source>Apply style to ass files too</source>
+ <translation>应用样式到 ASS 文件</translation>
 </message>
 <message>
- <location filename="../prefsubtitles.cpp" line="561"/>
- <source>If this option is checked, the style defined above will be applied to ass subtitles too.</source>
- <translation>如果这个选项被选中，上面定义的样式也将被应用到 ASS 字幕。</translation>
+ <location filename="../prefsubtitles.cpp" line="561"/>
+ <source>If this option is checked, the style defined above will be applied to ass subtitles too.</source>
+ <translation>如果这个选项被选中，上面定义的样式也将被应用到 ASS 字幕。</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>PrefTV</name>
 <message>
- <location filename="../preftv.ui" line="32"/>
- <source>&amp;TV and radio</source>
- <translation>电视和广播(&amp;T)</translation>
+ <location filename="../preftv.ui" line="32"/>
+ <source>&amp;TV and radio</source>
+ <translation>电视和广播(&amp;T)</translation>
 </message>
 <message>
- <location filename="../preftv.ui" line="55"/>
- <source>Dei&amp;nterlace by default for TV:</source>
- <translation>默认电视反交错(&amp;N):</translation>
+ <location filename="../preftv.ui" line="55"/>
+ <source>Dei&amp;nterlace by default for TV:</source>
+ <translation>默认电视反交错(&amp;N):</translation>
 </message>
 <message>
- <location filename="../preftv.ui" line="90"/>
- <source>&amp;Check for new channels on startup</source>
- <translation>启动时检查新频道(&amp;C)</translation>
+ <location filename="../preftv.ui" line="90"/>
+ <source>&amp;Check for new channels on startup</source>
+ <translation>启动时检查新频道(&amp;C)</translation>
 </message>
 <message>
- <location filename="../preftv.cpp" line="41"/>
- <source>TV and radio</source>
- <translation>电视和广播</translation>
+ <location filename="../preftv.cpp" line="41"/>
+ <source>TV and radio</source>
+ <translation>电视和广播</translation>
 </message>
 <message>
- <location filename="../preftv.cpp" line="53"/>
- <source>None</source>
- <translation>无</translation>
+ <location filename="../preftv.cpp" line="53"/>
+ <source>None</source>
+ <translation>无</translation>
 </message>
 <message>
- <location filename="../preftv.cpp" line="54"/>
- <source>Lowpass5</source>
- <translation>Lowpass5 反交错</translation>
+ <location filename="../preftv.cpp" line="54"/>
+ <source>Lowpass5</source>
+ <translation>Lowpass5 反交错</translation>
 </message>
 <message>
- <location filename="../preftv.cpp" line="55"/>
- <source>Yadif (normal)</source>
- <translation>Yadif 反交错(普通)</translation>
+ <location filename="../preftv.cpp" line="55"/>
+ <source>Yadif (normal)</source>
+ <translation>Yadif 反交错(普通)</translation>
 </message>
 <message>
- <location filename="../preftv.cpp" line="56"/>
- <source>Yadif (double framerate)</source>
- <translation>Yadif 反交错(双倍帧率)</translation>
+ <location filename="../preftv.cpp" line="56"/>
+ <source>Yadif (double framerate)</source>
+ <translation>Yadif 反交错(双倍帧率)</translation>
 </message>
 <message>
- <location filename="../preftv.cpp" line="57"/>
- <source>Linear Blend</source>
- <translation>线性混合</translation>
+ <location filename="../preftv.cpp" line="57"/>
+ <source>Linear Blend</source>
+ <translation>线性混合</translation>
 </message>
 <message>
- <location filename="../preftv.cpp" line="58"/>
- <source>Kerndeint</source>
- <translation>Kerndeint 自适应反交错</translation>
+ <location filename="../preftv.cpp" line="58"/>
+ <source>Kerndeint</source>
+ <translation>Kerndeint 自适应反交错</translation>
 </message>
 <message>
- <location filename="../preftv.cpp" line="105"/>
- <source>Deinterlace by default for TV</source>
- <translation>默认电视反交错</translation>
+ <location filename="../preftv.cpp" line="105"/>
+ <source>Deinterlace by default for TV</source>
+ <translation>默认电视反交错</translation>
 </message>
 <message>
- <location filename="../preftv.cpp" line="106"/>
- <source>Select the deinterlace filter that you want to be used for TV channels.</source>
- <translation>选择电视频道使用的反交错过滤器。</translation>
+ <location filename="../preftv.cpp" line="106"/>
+ <source>Select the deinterlace filter that you want to be used for TV channels.</source>
+ <translation>选择电视频道使用的反交错过滤器。</translation>
 </message>
 <message>
- <location filename="../preftv.cpp" line="109"/>
- <source>Rescan ~/.mplayer/channels.conf on startup</source>
- <translation>启动时重新扫描 ~/.mplayer/channels.conf</translation>
+ <location filename="../preftv.cpp" line="109"/>
+ <source>Rescan ~/.mplayer/channels.conf on startup</source>
+ <translation>启动时重新扫描 ~/.mplayer/channels.conf</translation>
 </message>
 <message>
- <location filename="../preftv.cpp" line="110"/>
- <source>If this option is enabled, SMPlayer will look for new TV and radio channels on ~/.mplayer/channels.conf.ter or ~/.mplayer/channels.conf.</source>
- <translation>如果这个选项被启用，SMPlayer 将在 ~/.mplayer/channels.conf.ter 或 ~/.mplayer/channels.conf 中寻找新的电视和广播频道。</translation>
+ <location filename="../preftv.cpp" line="110"/>
+ <source>If this option is enabled, SMPlayer will look for new TV and radio channels on ~/.mplayer/channels.conf.ter or ~/.mplayer/channels.conf.</source>
+ <translation>如果这个选项被启用，SMPlayer 将在 ~/.mplayer/channels.conf.ter 或 ~/.mplayer/channels.conf 中寻找新的电视和广播频道。</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>PreferencesDialog</name>
 <message>
- <location filename="../preferencesdialog.ui" line="13"/>
- <source>SMPlayer - Preferences</source>
- <translation>SMPlayer - 首选项</translation>
+ <location filename="../preferencesdialog.ui" line="13"/>
+ <source>SMPlayer - Preferences</source>
+ <translation>SMPlayer - 首选项</translation>
 </message>
 <message>
- <location filename="../preferencesdialog.cpp" line="64"/>
- <location filename="../preferencesdialog.cpp" line="130"/>
- <source>SMPlayer - Help</source>
- <translation>SMPlayer - 帮助</translation>
+ <location filename="../preferencesdialog.cpp" line="64"/>
+ <location filename="../preferencesdialog.cpp" line="130"/>
+ <source>SMPlayer - Help</source>
+ <translation>SMPlayer - 帮助</translation>
 </message>
 <message>
- <location filename="../preferencesdialog.cpp" line="134"/>
- <source>OK</source>
- <translation>确定</translation>
+ <location filename="../preferencesdialog.cpp" line="134"/>
+ <source>OK</source>
+ <translation>确定</translation>
 </message>
 <message>
- <location filename="../preferencesdialog.cpp" line="135"/>
- <source>Cancel</source>
- <translation>取消</translation>
+ <location filename="../preferencesdialog.cpp" line="135"/>
+ <source>Cancel</source>
+ <translation>取消</translation>
 </message>
 <message>
- <location filename="../preferencesdialog.cpp" line="136"/>
- <source>Apply</source>
- <translation>应用</translation>
+ <location filename="../preferencesdialog.cpp" line="136"/>
+ <source>Apply</source>
+ <translation>应用</translation>
 </message>
 <message>
- <location filename="../preferencesdialog.cpp" line="137"/>
- <source>Help</source>
- <translation>帮助</translation>
+ <location filename="../preferencesdialog.cpp" line="137"/>
+ <source>Help</source>
+ <translation>帮助</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>QObject</name>
 <message>
- <location filename="../clhelp.cpp" line="93"/>
- <source>directory</source>
- <translation>目录</translation>
+ <location filename="../clhelp.cpp" line="93"/>
+ <source>directory</source>
+ <translation>目录</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="94"/>
- <source>action_name</source>
- <translation>action_name</translation>
+ <location filename="../clhelp.cpp" line="94"/>
+ <source>action_name</source>
+ <translation>action_name</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="95"/>
- <source>action_list</source>
- <translation>action_list</translation>
+ <location filename="../clhelp.cpp" line="95"/>
+ <source>action_list</source>
+ <translation>action_list</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="96"/>
- <source>subtitle_file</source>
- <translation>subtitle_file</translation>
+ <location filename="../clhelp.cpp" line="96"/>
+ <source>subtitle_file</source>
+ <translation>subtitle_file</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="97"/>
- <source>width</source>
- <translation>宽度</translation>
+ <location filename="../clhelp.cpp" line="97"/>
+ <source>width</source>
+ <translation>宽度</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="97"/>
- <source>height</source>
- <translation>高度</translation>
+ <location filename="../clhelp.cpp" line="97"/>
+ <source>height</source>
+ <translation>高度</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="98"/>
- <location filename="../clhelp.cpp" line="172"/>
- <source>media</source>
- <translation>媒体</translation>
+ <location filename="../clhelp.cpp" line="98"/>
+ <location filename="../clhelp.cpp" line="172"/>
+ <source>media</source>
+ <translation>媒体</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="103"/>
- <location filename="../clhelp.cpp" line="106"/>
- <source>Usage:</source>
- <translation>用法:</translation>
+ <location filename="../clhelp.cpp" line="103"/>
+ <location filename="../clhelp.cpp" line="106"/>
+ <source>Usage:</source>
+ <translation>用法:</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="111"/>
- <source>Restores the old associations and cleans up the registry.</source>
- <translation>恢复旧的关联并清理注册表。</translation>
+ <location filename="../clhelp.cpp" line="111"/>
+ <source>Restores the old associations and cleans up the registry.</source>
+ <translation>恢复旧的关联并清理注册表。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="114"/>
- <source>opens the mini gui instead of the default one.</source>
- <translation>打开迷你图形用户界面而不是默认界面。</translation>
+ <location filename="../clhelp.cpp" line="114"/>
+ <source>opens the mini gui instead of the default one.</source>
+ <translation>打开迷你图形用户界面而不是默认界面。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="117"/>
- <source>opens the mpc gui.</source>
- <translation>打开 MPC 图形用户界面。</translation>
+ <location filename="../clhelp.cpp" line="117"/>
+ <source>opens the mpc gui.</source>
+ <translation>打开 MPC 图形用户界面。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="120"/>
- <source>opens the default gui.</source>
- <translation>打开默认图形用户界面。</translation>
+ <location filename="../clhelp.cpp" line="120"/>
+ <source>opens the default gui.</source>
+ <translation>打开默认图形用户界面。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="123"/>
- <source>specifies the directory where smplayer will store its configuration files (smplayer.ini, smplayer_files.ini...)</source>
- <translation>指定 SMPlayer 将存储其配置文件 (smplayer.ini、smplayer_files.ini...) 的目录</translation>
+ <location filename="../clhelp.cpp" line="123"/>
+ <source>specifies the directory where smplayer will store its configuration files (smplayer.ini, smplayer_files.ini...)</source>
+ <translation>指定 SMPlayer 将存储其配置文件 (smplayer.ini、smplayer_files.ini...) 的目录</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="127"/>
- <source>tries to make a connection to another running instance and send to it the specified action. Example: -send-action pause The rest of options (if any) will be ignored and the application will exit. It will return 0 on success or -1 on failure.</source>
- <translation>尝试建立连接到另一个正在运行的实例，并发送给它指定的动作。例如: -send-action pause 其余的选项(如果有的话)将被忽略，应用程序将退出。它会在成功时返回值 0，失败时返回 -1。</translation>
+ <location filename="../clhelp.cpp" line="127"/>
+ <source>tries to make a connection to another running instance and send to it the specified action. Example: -send-action pause The rest of options (if any) will be ignored and the application will exit. It will return 0 on success or -1 on failure.</source>
+ <translation>尝试建立连接到另一个正在运行的实例，并发送给它指定的动作。例如: -send-action pause 其余的选项(如果有的话)将被忽略，应用程序将退出。它会在成功时返回值 0，失败时返回 -1。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="134"/>
- <source>action_list is a list of actions separated by spaces. The actions will be executed just after loading the file (if any) in the same order you entered. For checkable actions you can pass true or false as parameter. Example: -actions &quot;fullscreen compact true&quot;. Quotes are necessary in case you pass more than one action.</source>
- <translation>action_list 是个由空格隔开的动作列表。文件(如有)加载后您输入的一些指令动作将被执行。您可以传送 true 或 false 参数用于可选动作。例如: -actions &quot;fullscreen compact true&quot;。您传送一个以上的动作时必须要用引号。</translation>
+ <location filename="../clhelp.cpp" line="134"/>
+ <source>action_list is a list of actions separated by spaces. The actions will be executed just after loading the file (if any) in the same order you entered. For checkable actions you can pass true or false as parameter. Example: -actions &quot;fullscreen compact true&quot;. Quotes are necessary in case you pass more than one action.</source>
+ <translation>action_list 是个由空格隔开的动作列表。文件(如有)加载后您输入的一些指令动作将被执行。您可以传送 true 或 false 参数用于可选动作。例如: -actions &quot;fullscreen compact true&quot;。您传送一个以上的动作时必须要用引号。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="142"/>
- <source>the main window will be closed when the file/playlist finishes.</source>
- <translation>当 文件/播放列表 完成后主窗口将被关闭。</translation>
+ <location filename="../clhelp.cpp" line="142"/>
+ <source>the main window will be closed when the file/playlist finishes.</source>
+ <translation>当 文件/播放列表 完成后主窗口将被关闭。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="145"/>
- <source>the main window won&apos;t be closed when the file/playlist finishes.</source>
- <translation>当 文件/播放列表 完成时主窗口不会被关闭。</translation>
+ <location filename="../clhelp.cpp" line="145"/>
+ <source>the main window won&apos;t be closed when the file/playlist finishes.</source>
+ <translation>当 文件/播放列表 完成时主窗口不会被关闭。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="148"/>
- <source>the video will be played in fullscreen mode.</source>
- <translation>视频将被在全屏模式中播放。</translation>
+ <location filename="../clhelp.cpp" line="148"/>
+ <source>the video will be played in fullscreen mode.</source>
+ <translation>视频将被在全屏模式中播放。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="151"/>
- <source>the video will be played in window mode.</source>
- <translation>视频将被在窗口模式中播放。</translation>
+ <location filename="../clhelp.cpp" line="151"/>
+ <source>the video will be played in window mode.</source>
+ <translation>视频将被在窗口模式中播放。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="154"/>
- <source>specifies the subtitle file to be loaded for the first video.</source>
- <translation>指定首个视频要加载的字幕文件。</translation>
+ <location filename="../clhelp.cpp" line="154"/>
+ <source>specifies the subtitle file to be loaded for the first video.</source>
+ <translation>指定首个视频要加载的字幕文件。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="157"/>
- <source>specifies the coordinates where the main window will be displayed.</source>
- <translation>指定将显示主窗口的坐标位置。</translation>
+ <location filename="../clhelp.cpp" line="157"/>
+ <source>specifies the coordinates where the main window will be displayed.</source>
+ <translation>指定将显示主窗口的坐标位置。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="160"/>
- <source>specifies the size of the main window.</source>
- <translation>指定主窗口的大小。</translation>
+ <location filename="../clhelp.cpp" line="160"/>
+ <source>specifies the size of the main window.</source>
+ <translation>指定主窗口的大小。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="163"/>
- <source>will show this message and then will exit.</source>
- <translation>将显示此信息，然后将退出。</translation>
+ <location filename="../clhelp.cpp" line="163"/>
+ <source>will show this message and then will exit.</source>
+ <translation>将显示此信息，然后将退出。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="166"/>
- <source>if there&apos;s another instance running, the media will be added to that instance&apos;s playlist. If there&apos;s no other instance, this option will be ignored and the files will be opened in a new instance.</source>
- <translation>如果有另外一个实例正在运行，媒体将被添加到该实例的播放列表。如果没有其他实例，此选项将被忽略，文件将被在一个新的实例中打开。</translation>
+ <location filename="../clhelp.cpp" line="166"/>
+ <source>if there&apos;s another instance running, the media will be added to that instance&apos;s playlist. If there&apos;s no other instance, this option will be ignored and the files will be opened in a new instance.</source>
+ <translation>如果有另外一个实例正在运行，媒体将被添加到该实例的播放列表。如果没有其他实例，此选项将被忽略，文件将被在一个新的实例中打开。</translation>
 </message>
 <message>
- <location filename="../clhelp.cpp" line="172"/>
- <source>&apos;media&apos; is any kind of file that SMPlayer can open. It can be a local file, a DVD (e.g. dvd://1), an Internet stream (e.g. mms://....) or a local playlist in format m3u or pls.</source>
- <translation>“媒体” 是 SMPlayer 可以打开的任何类型的文件。它可以是本地文件、DVD（例如 dvd://1）、网络流（例如 mms://....）或 m3u/pls 格式的本地播放列表。</translation>
+ <location filename="../clhelp.cpp" line="172"/>
+ <source>&apos;media&apos; is any kind of file that SMPlayer can open. It can be a local file, a DVD (e.g. dvd://1), an Internet stream (e.g. mms://....) or a local playlist in format m3u or pls.</source>
+ <translation>“媒体” 是 SMPlayer 可以打开的任何类型的文件。它可以是本地文件、DVD（例如 dvd://1）、网络流（例如 mms://....）或 m3u/pls 格式的本地播放列表。</translation>
 </message>
 <message numerus="yes">
- <location filename="../helper.cpp" line="77"/>
- <location filename="../helper.cpp" line="83"/>
- <source>%n second(s)</source>
- <translation>
- <numerusform>%n 秒</numerusform>
- </translation>
+ <location filename="../helper.cpp" line="77"/>
+ <location filename="../helper.cpp" line="83"/>
+ <source>%n second(s)</source>
+ <translation>
+ <numerusform>%n 秒</numerusform>
+ </translation>
 </message>
 <message numerus="yes">
- <location filename="../helper.cpp" line="80"/>
- <location filename="../helper.cpp" line="82"/>
- <source>%n minute(s)</source>
- <translation>
- <numerusform>%n 分</numerusform>
- </translation>
+ <location filename="../helper.cpp" line="80"/>
+ <location filename="../helper.cpp" line="82"/>
+ <source>%n minute(s)</source>
+ <translation>
+ <numerusform>%n 分</numerusform>
+ </translation>
 </message>
 <message>
- <location filename="../helper.cpp" line="84"/>
- <source>%1 and %2</source>
- <translation>%1 和 %2</translation>
+ <location filename="../helper.cpp" line="84"/>
+ <source>%1 and %2</source>
+ <translation>%1 和 %2</translation>
 </message>
 <message>
- <location filename="../mediasettings.cpp" line="157"/>
- <source>disabled</source>
- <comment>aspect_ratio</comment>
- <translation>禁用</translation>
+ <location filename="../mediasettings.cpp" line="157"/>
+ <source>disabled</source>
+ <comment>aspect_ratio</comment>
+ <translation>禁用</translation>
 </message>
 <message>
- <location filename="../mediasettings.cpp" line="167"/>
- <source>auto</source>
- <comment>aspect_ratio</comment>
- <translation>自动</translation>
+ <location filename="../mediasettings.cpp" line="167"/>
+ <source>auto</source>
+ <comment>aspect_ratio</comment>
+ <translation>自动</translation>
 </message>
 <message>
- <location filename="../mediasettings.cpp" line="168"/>
- <source>unknown</source>
- <comment>aspect_ratio</comment>
- <translation>未知</translation>
+ <location filename="../mediasettings.cpp" line="168"/>
+ <source>unknown</source>
+ <comment>aspect_ratio</comment>
+ <translation>未知</translation>
 </message>
 <message>
- <location filename="../smplayer.cpp" line="409"/>
- <source>This is SMPlayer v. %1 running on %2</source>
- <translation>这是在 %2 上运行的 SMPlayer v. %1</translation>
+ <location filename="../smplayer.cpp" line="409"/>
+ <source>This is SMPlayer v. %1 running on %2</source>
+ <translation>这是在 %2 上运行的 SMPlayer v. %1</translation>
 </message>
 <message>
- <location filename="../winfileassoc.cpp" line="305"/>
- <source>Enqueue in SMPlayer</source>
- <translation>添加到 SMPlayer 队列</translation>
+ <location filename="../winfileassoc.cpp" line="305"/>
+ <source>Enqueue in SMPlayer</source>
+ <translation>添加到 SMPlayer 队列</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>QuaZipFile</name>
 <message>
- <location filename="../findsubtitles/quazip/quazipfile.cpp" line="141"/>
- <source>ZIP/UNZIP API error %1</source>
- <translation>ZIP/UNZIP API 错误 %1</translation>
+ <location filename="../findsubtitles/quazip/quazipfile.cpp" line="141"/>
+ <source>ZIP/UNZIP API error %1</source>
+ <translation>ZIP/UNZIP API 错误 %1</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>SeekWidget</name>
 <message>
- <location filename="../seekwidget.ui" line="22"/>
- <source>icon</source>
- <translation>icon</translation>
+ <location filename="../seekwidget.ui" line="22"/>
+ <source>icon</source>
+ <translation>icon</translation>
 </message>
 <message>
- <location filename="../seekwidget.ui" line="40"/>
- <source>label</source>
- <translation>label</translation>
+ <location filename="../seekwidget.ui" line="40"/>
+ <source>label</source>
+ <translation>label</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>ShortcutGetter</name>
 <message>
- <location filename="../shortcutgetter.cpp" line="268"/>
- <source>Modify shortcut</source>
- <translation>修改快捷键</translation>
+ <location filename="../shortcutgetter.cpp" line="268"/>
+ <source>Modify shortcut</source>
+ <translation>修改快捷键</translation>
 </message>
 <message>
- <location filename="../shortcutgetter.cpp" line="276"/>
- <source>Press the key combination you want to assign</source>
- <translation>按下您要指派的组合键</translation>
+ <location filename="../shortcutgetter.cpp" line="276"/>
+ <source>Press the key combination you want to assign</source>
+ <translation>按下您要指派的组合键</translation>
 </message>
 <message>
- <location filename="../shortcutgetter.cpp" line="291"/>
- <source>Clear</source>
- <translation>清除</translation>
+ <location filename="../shortcutgetter.cpp" line="291"/>
+ <source>Clear</source>
+ <translation>清除</translation>
 </message>
 <message>
- <location filename="../shortcutgetter.cpp" line="293"/>
- <source>Capture</source>
- <translation>捕捉</translation>
+ <location filename="../shortcutgetter.cpp" line="293"/>
+ <source>Capture</source>
+ <translation>捕捉</translation>
 </message>
 <message>
- <location filename="../shortcutgetter.cpp" line="294"/>
- <source>Capture keystrokes</source>
- <translation>捕捉按键</translation>
+ <location filename="../shortcutgetter.cpp" line="294"/>
+ <source>Capture keystrokes</source>
+ <translation>捕捉按键</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>SubChooserDialog</name>
 <message>
- <location filename="../findsubtitles/subchooserdialog.ui" line="13"/>
- <source>Subtitle selection</source>
- <translation>字幕选择</translation>
+ <location filename="../findsubtitles/subchooserdialog.ui" line="13"/>
+ <source>Subtitle selection</source>
+ <translation>字幕选择</translation>
 </message>
 <message>
- <location filename="../findsubtitles/subchooserdialog.ui" line="19"/>
- <source>This archive contains more than one subtitle file. Please choose the ones you want to extract.</source>
- <translation>此存档包含多个字幕文件。请选择一个您要提取的。</translation>
+ <location filename="../findsubtitles/subchooserdialog.ui" line="19"/>
+ <source>This archive contains more than one subtitle file. Please choose the ones you want to extract.</source>
+ <translation>此存档包含多个字幕文件。请选择一个您要提取的。</translation>
 </message>
 <message>
- <location filename="../findsubtitles/subchooserdialog.ui" line="68"/>
- <source>Select All</source>
- <translation>选择全部</translation>
+ <location filename="../findsubtitles/subchooserdialog.ui" line="68"/>
+ <source>Select All</source>
+ <translation>选择全部</translation>
 </message>
 <message>
- <location filename="../findsubtitles/subchooserdialog.ui" line="75"/>
- <source>Select None</source>
- <translation>取消选择</translation>
+ <location filename="../findsubtitles/subchooserdialog.ui" line="75"/>
+ <source>Select None</source>
+ <translation>取消选择</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>TVList</name>
 <message>
- <location filename="../tvlist.cpp" line="94"/>
- <source>Channel editor</source>
- <translation>频道编辑器</translation>
+ <location filename="../tvlist.cpp" line="94"/>
+ <source>Channel editor</source>
+ <translation>频道编辑器</translation>
 </message>
 <message>
- <location filename="../tvlist.cpp" line="95"/>
- <source>TV/Radio list</source>
- <translation>电视/广播 列表</translation>
+ <location filename="../tvlist.cpp" line="95"/>
+ <source>TV/Radio list</source>
+ <translation>电视/广播 列表</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>TimeDialog</name>
 <message>
- <location filename="../timedialog.ui" line="54"/>
- <source>&amp;Jump to:</source>
- <translation>跳转到(&amp;J):</translation>
+ <location filename="../timedialog.ui" line="54"/>
+ <source>&amp;Jump to:</source>
+ <translation>跳转到(&amp;J):</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>ToolbarEditor</name>
 <message>
- <location filename="../toolbareditor.ui" line="14"/>
- <source>Toolbar Editor</source>
- <translation>工具栏编辑器</translation>
+ <location filename="../toolbareditor.ui" line="14"/>
+ <source>Toolbar Editor</source>
+ <translation>工具栏编辑器</translation>
 </message>
 <message>
- <location filename="../toolbareditor.ui" line="22"/>
- <source>&amp;Available actions:</source>
- <translation>可用动作(&amp;A):</translation>
+ <location filename="../toolbareditor.ui" line="22"/>
+ <source>&amp;Available actions:</source>
+ <translation>可用动作(&amp;A):</translation>
 </message>
 <message>
- <location filename="../toolbareditor.ui" line="57"/>
- <source>&amp;Left</source>
- <translation>向左(&amp;L)</translation>
+ <location filename="../toolbareditor.ui" line="57"/>
+ <source>&amp;Left</source>
+ <translation>向左(&amp;L)</translation>
 </message>
 <message>
- <location filename="../toolbareditor.ui" line="67"/>
- <source>&amp;Right</source>
- <translation>向右(&amp;R)</translation>
+ <location filename="../toolbareditor.ui" line="67"/>
+ <source>&amp;Right</source>
+ <translation>向右(&amp;R)</translation>
 </message>
 <message>
- <location filename="../toolbareditor.ui" line="77"/>
- <source>&amp;Down</source>
- <translation>向下(&amp;D)</translation>
+ <location filename="../toolbareditor.ui" line="77"/>
+ <source>&amp;Down</source>
+ <translation>向下(&amp;D)</translation>
 </message>
 <message>
- <location filename="../toolbareditor.ui" line="87"/>
- <source>&amp;Up</source>
- <translation>向上(&amp;U)</translation>
+ <location filename="../toolbareditor.ui" line="87"/>
+ <source>&amp;Up</source>
+ <translation>向上(&amp;U)</translation>
 </message>
 <message>
- <location filename="../toolbareditor.ui" line="113"/>
- <source>Curre&amp;nt actions:</source>
- <translation>当前动作(&amp;N):</translation>
+ <location filename="../toolbareditor.ui" line="113"/>
+ <source>Curre&amp;nt actions:</source>
+ <translation>当前动作(&amp;N):</translation>
 </message>
 <message>
- <location filename="../toolbareditor.ui" line="143"/>
- <source>Add &amp;separator</source>
- <translation>添加分隔符(&amp;S)</translation>
+ <location filename="../toolbareditor.ui" line="143"/>
+ <source>Add &amp;separator</source>
+ <translation>添加分隔符(&amp;S)</translation>
 </message>
 <message>
- <location filename="../toolbareditor.cpp" line="87"/>
- <location filename="../toolbareditor.cpp" line="180"/>
- <source>(separator)</source>
- <translation>(分隔符)</translation>
+ <location filename="../toolbareditor.cpp" line="87"/>
+ <location filename="../toolbareditor.cpp" line="180"/>
+ <source>(separator)</source>
+ <translation>(分隔符)</translation>
 </message>
 <message>
- <location filename="../toolbareditor.cpp" line="239"/>
- <source>Time slider</source>
- <translation>时间滑块</translation>
+ <location filename="../toolbareditor.cpp" line="239"/>
+ <source>Time slider</source>
+ <translation>时间滑块</translation>
 </message>
 <message>
- <location filename="../toolbareditor.cpp" line="241"/>
- <source>Volume slider</source>
- <translation>音量滑块</translation>
+ <location filename="../toolbareditor.cpp" line="241"/>
+ <source>Volume slider</source>
+ <translation>音量滑块</translation>
 </message>
 <message>
- <location filename="../toolbareditor.cpp" line="243"/>
- <source>Display time</source>
- <translation>显示时间</translation>
+ <location filename="../toolbareditor.cpp" line="243"/>
+ <source>Display time</source>
+ <translation>显示时间</translation>
 </message>
 <message>
- <location filename="../toolbareditor.cpp" line="245"/>
- <source>3 in 1 rewind</source>
- <translation>3合1后退</translation>
+ <location filename="../toolbareditor.cpp" line="245"/>
+ <source>3 in 1 rewind</source>
+ <translation>3合1后退</translation>
 </message>
 <message>
- <location filename="../toolbareditor.cpp" line="247"/>
- <source>3 in 1 forward</source>
- <translation>3合1前进</translation>
+ <location filename="../toolbareditor.cpp" line="247"/>
+ <source>3 in 1 forward</source>
+ <translation>3合1前进</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>TristateCombo</name>
 <message>
- <location filename="../tristatecombo.cpp" line="34"/>
- <source>Auto</source>
- <translation>自动</translation>
+ <location filename="../tristatecombo.cpp" line="34"/>
+ <source>Auto</source>
+ <translation>自动</translation>
 </message>
 <message>
- <location filename="../tristatecombo.cpp" line="35"/>
- <source>Yes</source>
- <translation>是</translation>
+ <location filename="../tristatecombo.cpp" line="35"/>
+ <source>Yes</source>
+ <translation>是</translation>
 </message>
 <message>
- <location filename="../tristatecombo.cpp" line="36"/>
- <source>No</source>
- <translation>否</translation>
+ <location filename="../tristatecombo.cpp" line="36"/>
+ <source>No</source>
+ <translation>否</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>VDPAUProperties</name>
 <message>
- <location filename="../vdpauproperties.ui" line="13"/>
- <source>VDPAU Properties</source>
- <translation>VDPAU 属性</translation>
+ <location filename="../vdpauproperties.ui" line="13"/>
+ <source>VDPAU Properties</source>
+ <translation>VDPAU 属性</translation>
 </message>
 <message>
- <location filename="../vdpauproperties.ui" line="19"/>
- <source>Select the vdpau codecs to use. Not all of them may work.</source>
- <translation>选择要使用的 VDPAU 编解码器。它们并非都能工作。</translation>
+ <location filename="../vdpauproperties.ui" line="19"/>
+ <source>Select the vdpau codecs to use. Not all of them may work.</source>
+ <translation>选择要使用的 VDPAU 编解码器。它们并非都能工作。</translation>
 </message>
 <message>
- <location filename="../vdpauproperties.ui" line="29"/>
- <source>ffh&amp;264vdpau</source>
- <translation>ffh264vdpau(&amp;2)</translation>
+ <location filename="../vdpauproperties.ui" line="29"/>
+ <source>ffh&amp;264vdpau</source>
+ <translation>ffh264vdpau(&amp;2)</translation>
 </message>
 <message>
- <location filename="../vdpauproperties.ui" line="36"/>
- <source>ff&amp;mpeg12vdpau</source>
- <translation>ffmpeg12vdpau(&amp;M)</translation>
+ <location filename="../vdpauproperties.ui" line="36"/>
+ <source>ff&amp;mpeg12vdpau</source>
+ <translation>ffmpeg12vdpau(&amp;M)</translation>
 </message>
 <message>
- <location filename="../vdpauproperties.ui" line="43"/>
- <source>ff&amp;wmv3vdpau</source>
- <translation>ffwmv3vdpau(&amp;W)</translation>
+ <location filename="../vdpauproperties.ui" line="43"/>
+ <source>ff&amp;wmv3vdpau</source>
+ <translation>ffwmv3vdpau(&amp;W)</translation>
 </message>
 <message>
- <location filename="../vdpauproperties.ui" line="50"/>
- <source>ff&amp;vc1vdpau</source>
- <translation>ffvc1vdpau(&amp;V)</translation>
+ <location filename="../vdpauproperties.ui" line="50"/>
+ <source>ff&amp;vc1vdpau</source>
+ <translation>ffvc1vdpau(&amp;V)</translation>
 </message>
 <message>
- <location filename="../vdpauproperties.ui" line="57"/>
- <source>ffodiv&amp;xvdpau</source>
- <translation>ffodivxvdpau(&amp;X)</translation>
+ <location filename="../vdpauproperties.ui" line="57"/>
+ <source>ffodiv&amp;xvdpau</source>
+ <translation>ffodivxvdpau(&amp;X)</translation>
 </message>
 <message>
- <location filename="../vdpauproperties.ui" line="71"/>
- <source>&amp;Disable software video filters</source>
- <translation>禁用软件视频过滤器(&amp;D)</translation>
+ <location filename="../vdpauproperties.ui" line="71"/>
+ <source>&amp;Disable software video filters</source>
+ <translation>禁用软件视频过滤器(&amp;D)</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>VideoEqualizer</name>
 <message>
- <location filename="../videoequalizer.cpp" line="69"/>
- <source>Video Equalizer</source>
- <translation>视频均衡器</translation>
+ <location filename="../videoequalizer.cpp" line="69"/>
+ <source>Video Equalizer</source>
+ <translation>视频均衡器</translation>
 </message>
 <message>
- <location filename="../videoequalizer.cpp" line="72"/>
- <location filename="../videoequalizer.cpp" line="73"/>
- <source>Contrast</source>
- <translation>对比度</translation>
+ <location filename="../videoequalizer.cpp" line="72"/>
+ <location filename="../videoequalizer.cpp" line="73"/>
+ <source>Contrast</source>
+ <translation>对比度</translation>
 </message>
 <message>
- <location filename="../videoequalizer.cpp" line="76"/>
- <location filename="../videoequalizer.cpp" line="77"/>
- <source>Brightness</source>
- <translation>亮度</translation>
+ <location filename="../videoequalizer.cpp" line="76"/>
+ <location filename="../videoequalizer.cpp" line="77"/>
+ <source>Brightness</source>
+ <translation>亮度</translation>
 </message>
 <message>
- <location filename="../videoequalizer.cpp" line="80"/>
- <location filename="../videoequalizer.cpp" line="81"/>
- <source>Hue</source>
- <translation>色调</translation>
+ <location filename="../videoequalizer.cpp" line="80"/>
+ <location filename="../videoequalizer.cpp" line="81"/>
+ <source>Hue</source>
+ <translation>色调</translation>
 </message>
 <message>
- <location filename="../videoequalizer.cpp" line="84"/>
- <location filename="../videoequalizer.cpp" line="85"/>
- <source>Saturation</source>
- <translation>饱和度</translation>
+ <location filename="../videoequalizer.cpp" line="84"/>
+ <location filename="../videoequalizer.cpp" line="85"/>
+ <source>Saturation</source>
+ <translation>饱和度</translation>
 </message>
 <message>
- <location filename="../videoequalizer.cpp" line="88"/>
- <location filename="../videoequalizer.cpp" line="89"/>
- <source>Gamma</source>
- <translation>伽玛</translation>
+ <location filename="../videoequalizer.cpp" line="88"/>
+ <location filename="../videoequalizer.cpp" line="89"/>
+ <source>Gamma</source>
+ <translation>伽玛</translation>
 </message>
 <message>
- <location filename="../videoequalizer.cpp" line="92"/>
- <source>&amp;Reset</source>
- <translation>重置(&amp;R)</translation>
+ <location filename="../videoequalizer.cpp" line="92"/>
+ <source>&amp;Reset</source>
+ <translation>重置(&amp;R)</translation>
 </message>
 <message>
- <location filename="../videoequalizer.cpp" line="93"/>
- <source>&amp;Set as default values</source>
- <translation>设为默认值(&amp;S)</translation>
+ <location filename="../videoequalizer.cpp" line="93"/>
+ <source>&amp;Set as default values</source>
+ <translation>设为默认值(&amp;S)</translation>
 </message>
 <message>
- <location filename="../videoequalizer.cpp" line="97"/>
- <source>Use the current values as default values for new videos.</source>
- <translation>使用当前值作为新视频的默认值。</translation>
+ <location filename="../videoequalizer.cpp" line="97"/>
+ <source>Use the current values as default values for new videos.</source>
+ <translation>使用当前值作为新视频的默认值。</translation>
 </message>
 <message>
- <location filename="../videoequalizer.cpp" line="99"/>
- <source>Set all controls to zero.</source>
- <translation>全部控制设置为零。</translation>
+ <location filename="../videoequalizer.cpp" line="99"/>
+ <source>Set all controls to zero.</source>
+ <translation>全部控制设置为零。</translation>
 </message>
 <message>
- <location filename="../videoequalizer.cpp" line="118"/>
- <source>Information</source>
- <translation>信息</translation>
+ <location filename="../videoequalizer.cpp" line="118"/>
+ <source>Information</source>
+ <translation>信息</translation>
 </message>
 <message>
- <location filename="../videoequalizer.cpp" line="119"/>
- <source>The current values have been stored to be used as default.</source>
- <translation>当前的值已被储存将在默认情况下使用。</translation>
+ <location filename="../videoequalizer.cpp" line="119"/>
+ <source>The current values have been stored to be used as default.</source>
+ <translation>当前的值已被储存将在默认情况下使用。</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>VideoPreview</name>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="134"/>
- <location filename="../videopreview/videopreview.cpp" line="395"/>
- <source>Video preview</source>
- <translation>视频预览图像</translation>
+ <location filename="../videopreview/videopreview.cpp" line="134"/>
+ <location filename="../videopreview/videopreview.cpp" line="395"/>
+ <source>Video preview</source>
+ <translation>视频预览图像</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="135"/>
- <source>Cancel</source>
- <translation>取消</translation>
+ <location filename="../videopreview/videopreview.cpp" line="135"/>
+ <source>Cancel</source>
+ <translation>取消</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="137"/>
- <source>Generated by SMPlayer</source>
- <translation>由 SMPlayer 生成</translation>
+ <location filename="../videopreview/videopreview.cpp" line="137"/>
+ <source>Generated by SMPlayer</source>
+ <translation>由 SMPlayer 生成</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="182"/>
- <source>Error</source>
- <translation>错误</translation>
+ <location filename="../videopreview/videopreview.cpp" line="182"/>
+ <source>Error</source>
+ <translation>错误</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="183"/>
- <source>The following error has occurred while creating the thumbnails:</source>
- <translation>创建缩略图时发生以下错误:</translation>
+ <location filename="../videopreview/videopreview.cpp" line="183"/>
+ <source>The following error has occurred while creating the thumbnails:</source>
+ <translation>创建缩略图时发生以下错误:</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="200"/>
- <source>The length of the video is 0</source>
- <translation>视频的长度为 0</translation>
+ <location filename="../videopreview/videopreview.cpp" line="200"/>
+ <source>The length of the video is 0</source>
+ <translation>视频的长度为 0</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="209"/>
- <source>The temporary directory (%1) can&apos;t be created</source>
- <translation>临时目录 (%1) 无法创建</translation>
+ <location filename="../videopreview/videopreview.cpp" line="209"/>
+ <source>The temporary directory (%1) can&apos;t be created</source>
+ <translation>临时目录 (%1) 无法创建</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="226"/>
- <source>Creating thumbnails...</source>
- <translation>正在创建缩略图...</translation>
+ <location filename="../videopreview/videopreview.cpp" line="226"/>
+ <source>Creating thumbnails...</source>
+ <translation>正在创建缩略图...</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="244"/>
- <source>The file %1 doesn&apos;t exist</source>
- <translation>文件 %1 不存在</translation>
+ <location filename="../videopreview/videopreview.cpp" line="244"/>
+ <source>The file %1 doesn&apos;t exist</source>
+ <translation>文件 %1 不存在</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="304"/>
- <source>The mplayer process didn&apos;t run</source>
- <translation>MPlayer 进程没有运行</translation>
+ <location filename="../videopreview/videopreview.cpp" line="304"/>
+ <source>The mplayer process didn&apos;t run</source>
+ <translation>MPlayer 进程没有运行</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="322"/>
- <source>The file %1 can&apos;t be loaded</source>
- <translation>文件 %1 无法加载</translation>
+ <location filename="../videopreview/videopreview.cpp" line="322"/>
+ <source>The file %1 can&apos;t be loaded</source>
+ <translation>文件 %1 无法加载</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="368"/>
- <source>No info</source>
- <translation>无信息</translation>
+ <location filename="../videopreview/videopreview.cpp" line="368"/>
+ <source>No info</source>
+ <translation>无信息</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="371"/>
- <location filename="../videopreview/videopreview.cpp" line="372"/>
- <source>%1 kbps</source>
- <translation>%1 Kbps</translation>
+ <location filename="../videopreview/videopreview.cpp" line="371"/>
+ <location filename="../videopreview/videopreview.cpp" line="372"/>
+ <source>%1 kbps</source>
+ <translation>%1 Kbps</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="373"/>
- <source>%1 Hz</source>
- <translation>%1 Hz</translation>
+ <location filename="../videopreview/videopreview.cpp" line="373"/>
+ <source>%1 Hz</source>
+ <translation>%1 Hz</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="379"/>
- <source>Size: %1 MB</source>
- <translation>大小: %1 MB</translation>
+ <location filename="../videopreview/videopreview.cpp" line="379"/>
+ <source>Size: %1 MB</source>
+ <translation>大小: %1 MB</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="380"/>
- <source>Resolution: %1x%2</source>
- <translation>分辨率: %1x%2</translation>
+ <location filename="../videopreview/videopreview.cpp" line="380"/>
+ <source>Resolution: %1x%2</source>
+ <translation>分辨率: %1x%2</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="381"/>
- <source>Length: %1</source>
- <translation>长度: %1</translation>
+ <location filename="../videopreview/videopreview.cpp" line="381"/>
+ <source>Length: %1</source>
+ <translation>长度: %1</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="384"/>
- <source>Video format: %1</source>
- <translation>视频格式: %1</translation>
+ <location filename="../videopreview/videopreview.cpp" line="384"/>
+ <source>Video format: %1</source>
+ <translation>视频格式: %1</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="385"/>
- <source>Frames per second: %1</source>
- <translation>每秒帧数: %1</translation>
+ <location filename="../videopreview/videopreview.cpp" line="385"/>
+ <source>Frames per second: %1</source>
+ <translation>每秒帧数: %1</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="386"/>
- <source>Aspect ratio: %1</source>
- <translation>纵横比: %1</translation>
+ <location filename="../videopreview/videopreview.cpp" line="386"/>
+ <source>Aspect ratio: %1</source>
+ <translation>纵横比: %1</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="389"/>
- <source>Video bitrate: %1</source>
- <translation>视频比特率: %1</translation>
+ <location filename="../videopreview/videopreview.cpp" line="389"/>
+ <source>Video bitrate: %1</source>
+ <translation>视频比特率: %1</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="390"/>
- <source>Audio bitrate: %1</source>
- <translation>音频比特率: %1</translation>
+ <location filename="../videopreview/videopreview.cpp" line="390"/>
+ <source>Audio bitrate: %1</source>
+ <translation>音频比特率: %1</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="391"/>
- <source>Audio rate: %1</source>
- <translation>音频比率: %1</translation>
+ <location filename="../videopreview/videopreview.cpp" line="391"/>
+ <source>Audio rate: %1</source>
+ <translation>音频比率: %1</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="421"/>
- <source>No filename</source>
- <translation>没有文件名</translation>
+ <location filename="../videopreview/videopreview.cpp" line="421"/>
+ <source>No filename</source>
+ <translation>没有文件名</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="481"/>
- <source>The mplayer process didn&apos;t start while trying to get info about the video</source>
- <translation>试图获取视频信息时 MPlayer 的进程没有启动</translation>
+ <location filename="../videopreview/videopreview.cpp" line="481"/>
+ <source>The mplayer process didn&apos;t start while trying to get info about the video</source>
+ <translation>试图获取视频信息时 MPlayer 的进程没有启动</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="523"/>
- <source>Save file</source>
- <translation>保存文件</translation>
+ <location filename="../videopreview/videopreview.cpp" line="523"/>
+ <source>Save file</source>
+ <translation>保存文件</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="524"/>
- <source>Images</source>
- <translation>图像</translation>
+ <location filename="../videopreview/videopreview.cpp" line="524"/>
+ <source>Images</source>
+ <translation>图像</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="531"/>
- <source>Error saving file</source>
- <translation>保存文件时出错</translation>
+ <location filename="../videopreview/videopreview.cpp" line="531"/>
+ <source>Error saving file</source>
+ <translation>保存文件时出错</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreview.cpp" line="532"/>
- <source>The file couldn&apos;t be saved</source>
- <translation>该文件无法保存</translation>
+ <location filename="../videopreview/videopreview.cpp" line="532"/>
+ <source>The file couldn&apos;t be saved</source>
+ <translation>该文件无法保存</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>VideoPreviewConfigDialog</name>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.ui" line="13"/>
- <source>Video Preview</source>
- <translation>视频预览图像</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.ui" line="13"/>
+ <source>Video Preview</source>
+ <translation>视频预览图像</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.ui" line="21"/>
- <source>&amp;File:</source>
- <translation>文件(&amp;F):</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.ui" line="21"/>
+ <source>&amp;File:</source>
+ <translation>文件(&amp;F):</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.ui" line="38"/>
- <source>&amp;DVD device:</source>
- <translation>DVD 驱动器(&amp;D):</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.ui" line="38"/>
+ <source>&amp;DVD device:</source>
+ <translation>DVD 驱动器(&amp;D):</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.ui" line="55"/>
- <source>&amp;Columns:</source>
- <translation>列(&amp;C):</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.ui" line="55"/>
+ <source>&amp;Columns:</source>
+ <translation>列(&amp;C):</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.ui" line="91"/>
- <source>&amp;Rows:</source>
- <translation>行(&amp;R):</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.ui" line="91"/>
+ <source>&amp;Rows:</source>
+ <translation>行(&amp;R):</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.ui" line="113"/>
- <source>Add playing &amp;time to thumbnails</source>
- <translation>添加播放时间到缩略图(&amp;T)</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.ui" line="113"/>
+ <source>Add playing &amp;time to thumbnails</source>
+ <translation>添加播放时间到缩略图(&amp;T)</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.ui" line="135"/>
- <source>&amp;Aspect ratio:</source>
- <translation>纵横比(&amp;A):</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.ui" line="135"/>
+ <source>&amp;Aspect ratio:</source>
+ <translation>纵横比(&amp;A):</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.ui" line="165"/>
- <source>&amp;Seconds to skip at the beginnning:</source>
- <translation>开始时跳过的秒数(&amp;S):</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.ui" line="165"/>
+ <source>&amp;Seconds to skip at the beginnning:</source>
+ <translation>开始时跳过的秒数(&amp;S):</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.ui" line="199"/>
- <source>&amp;Maximum width:</source>
- <translation>最大宽度(&amp;M):</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.ui" line="199"/>
+ <source>&amp;Maximum width:</source>
+ <translation>最大宽度(&amp;M):</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.ui" line="249"/>
- <source>&amp;Extract frames as</source>
- <translation>提取帧为(&amp;E)</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.ui" line="249"/>
+ <source>&amp;Extract frames as</source>
+ <translation>提取帧为(&amp;E)</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.ui" line="290"/>
- <source>Remember folder used to &amp;save the preview</source>
- <translation>记住用来保存预览图像的文件夹(&amp;S)</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.ui" line="290"/>
+ <source>Remember folder used to &amp;save the preview</source>
+ <translation>记住用来保存预览图像的文件夹(&amp;S)</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.cpp" line="33"/>
- <source>Default</source>
- <translation>默认</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.cpp" line="33"/>
+ <source>Default</source>
+ <translation>默认</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.cpp" line="43"/>
- <source>The preview will be created for the video you specify here.</source>
- <translation>您在这里指定的视频将被创建预览图像。</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.cpp" line="43"/>
+ <source>The preview will be created for the video you specify here.</source>
+ <translation>您在这里指定的视频将被创建预览图像。</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.cpp" line="44"/>
- <source>Enter here the DVD device or a folder with a DVD image.</source>
- <translation>在这里输入 DVD 驱动器或带有 DVD 映像的文件夹。</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.cpp" line="44"/>
+ <source>Enter here the DVD device or a folder with a DVD image.</source>
+ <translation>在这里输入 DVD 驱动器或带有 DVD 映像的文件夹。</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.cpp" line="45"/>
- <location filename="../videopreview/videopreviewconfigdialog.cpp" line="46"/>
- <source>The thumbnails will be arranged on a table.</source>
- <translation>缩略图将被排列在一个表格中。</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.cpp" line="45"/>
+ <location filename="../videopreview/videopreviewconfigdialog.cpp" line="46"/>
+ <source>The thumbnails will be arranged on a table.</source>
+ <translation>缩略图将被排列在一个表格中。</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.cpp" line="45"/>
- <source>This option specifies the number of columns of the table.</source>
- <translation>此选项指定表格的列数。</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.cpp" line="45"/>
+ <source>This option specifies the number of columns of the table.</source>
+ <translation>此选项指定表格的列数。</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.cpp" line="46"/>
- <source>This option specifies the number of rows of the table.</source>
- <translation>此选项指定表格的行数。</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.cpp" line="46"/>
+ <source>This option specifies the number of rows of the table.</source>
+ <translation>此选项指定表格的行数。</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.cpp" line="47"/>
- <source>If you check this option, the playing time will be displayed at the bottom of each thumbnail.</source>
- <translation>如果选中此选项，播放时间将被显示在每个缩略图的底部。</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.cpp" line="47"/>
+ <source>If you check this option, the playing time will be displayed at the bottom of each thumbnail.</source>
+ <translation>如果选中此选项，播放时间将被显示在每个缩略图的底部。</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.cpp" line="48"/>
- <source>If the aspect ratio of the video is wrong, you can specify a different one here.</source>
- <translation>如果视频的纵横比是错的，您可以在这里指定另一个。</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.cpp" line="48"/>
+ <source>If the aspect ratio of the video is wrong, you can specify a different one here.</source>
+ <translation>如果视频的纵横比是错的，您可以在这里指定另一个。</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.cpp" line="49"/>
- <source>Usually the first frames are black, so it&apos;s a good idea to skip some seconds at the beginning of the video. This option allows to specify how many seconds will be skipped.</source>
- <translation>通常情况下视频的首帧都是黑色的，因此跳过视频开始的几秒钟是个好主意。这个选项允许指定多少秒将被跳过。</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.cpp" line="49"/>
+ <source>Usually the first frames are black, so it&apos;s a good idea to skip some seconds at the beginning of the video. This option allows to specify how many seconds will be skipped.</source>
+ <translation>通常情况下视频的首帧都是黑色的，因此跳过视频开始的几秒钟是个好主意。这个选项允许指定多少秒将被跳过。</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.cpp" line="51"/>
- <source>This option specifies the maximum width in pixels that the generated preview image will have.</source>
- <translation>此选项指定生成预览图像时以像素为单位的最大宽度。</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.cpp" line="51"/>
+ <source>This option specifies the maximum width in pixels that the generated preview image will have.</source>
+ <translation>此选项指定生成预览图像时以像素为单位的最大宽度。</translation>
 </message>
 <message>
- <location filename="../videopreview/videopreviewconfigdialog.cpp" line="52"/>
- <source>Some frames will be extracted from the video in order to create the preview. Here you can choose the image format for the extracted frames. PNG may give better quality.</source>
- <translation>创建预览图像时一些帧将被从视频中提取。在这里您可以选择用于提取帧的图像格式。PNG 可提供更好的质量。</translation>
+ <location filename="../videopreview/videopreviewconfigdialog.cpp" line="52"/>
+ <source>Some frames will be extracted from the video in order to create the preview. Here you can choose the image format for the extracted frames. PNG may give better quality.</source>
+ <translation>创建预览图像时一些帧将被从视频中提取。在这里您可以选择用于提取帧的图像格式。PNG 可提供更好的质量。</translation>
 </message>
-</context>
-<context>
+ </context>
+ <context>
 <name>VolumeSliderAction</name>
 <message>
- <location filename="../widgetactions.cpp" line="182"/>
- <source>Volume</source>
- <translation>音量</translation>
+ <location filename="../widgetactions.cpp" line="182"/>
+ <source>Volume</source>
+ <translation>音量</translation>
 </message>
-</context>
+ </context>
 </TS>

smplayer-0.8.0.tar.bz2/src/version.cpp -> smplayer-0.8.1.tar.bz2/src/version.cpp Changed

smplayer-0.8.0.tar.bz2/src/widgetactions.cpp -> smplayer-0.8.1.tar.bz2/src/widgetactions.cpp Changed

smplayer-0.8.0.tar.bz2/src/winfileassoc.cpp -> smplayer-0.8.1.tar.bz2/src/winfileassoc.cpp Changed

@@ -15,23 +15,23 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-
 	Winfileassoc.cpp
 
-	Handles file associations in Windows Vista/XP/2000/NT/ME/98/95.
+	Handles file associations in Windows 7/Vista/XP/2000.
 	We assume that the code is run without administrator privileges, so the associations are done for current user only.
 	System-wide associations require writing to HKEY_CLASSES_ROOT and we don't want to get our hands dirty with that.
 	Each user on the computer can configure his own set of file associations for SMPlayer, which is extremely cool.
 
 	Optionally, during uninstall, it would be a good idea to call RestoreFileAssociations for all media types so
-	that we can clean up the registry and restore the old associations for current user. 
+	that we can clean up the registry and restore the old associations for current user.
 
 	Vista:
-	The code can only register the app as default program for selected extensions and check if it is the default. 
+	The code can only register the app as default program for selected extensions and check if it is the default.
 	It cannot restore 'old' default application, since this doesn't seem to be possible with the current Vista API.
 
-	Tested on: Win98, Win2000, WinXP, Vista. 
-	NOT tested on: Win95, ME and NT 4.0 (it should work on 95, ME; Not sure about NT 4.0).
+	Add libole32.a library if compiling with MinGW. In smplayer.pro, under 'win32 {': LIBS += libole32
+
+	Tested on: WinXP, Vista, Win7.
 
 	Author: Florin Braghis (florin@libertv.ro)
 */
@@ -40,410 +40,332 @@
 #include <QSettings>
 #include <QApplication>
 #include <QFileInfo>
+#include <windows.h>
 
-WinFileAssoc::WinFileAssoc( const QString ClassId, const QString AppName )
+WinFileAssoc::WinFileAssoc(const QString ClassId, const QString AppName)
 {
-	m_ClassId = ClassId;
-	m_AppName = AppName; 
-	m_ClassId2 = QFileInfo(QApplication::applicationFilePath()).fileName(); 
+ m_ClassId = ClassId;
+ m_AppName = AppName;
+ m_ClassId2 = QFileInfo(QApplication::applicationFilePath()).fileName();
 }
 
-//Associates all extensions in the fileExtensions list with current app.
-//Returns number of extensions processed successfully. 
-int WinFileAssoc::CreateFileAssociations(const QStringList& fileExtensions)
+// Associates all extensions in the fileExtensions list with current app.
+// Returns number of extensions processed successfully.
+int WinFileAssoc::CreateFileAssociations(const QStringList &fileExtensions)
 {
-	if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
-	{
-		return VistaSetAppsAsDefault(fileExtensions); 
-	}
-
-	QSettings RegCR ("HKEY_CLASSES_ROOT", QSettings::NativeFormat); //Read only on NT+
-	QSettings RegCU ("HKEY_CURRENT_USER", QSettings::NativeFormat);
-
-	if (!RegCU.isWritable() || RegCU.status() != QSettings::NoError)
-		return 0; 
-
-	if (RegCR.status() != QSettings::NoError)
-		return 0; 
-
-	if (QSysInfo::WindowsVersion < QSysInfo::WV_NT && !RegCR.isWritable())	//Win98
-		return 0; 
-
-	//Check if classId exists in the registry
-	if (!RegCR.contains(m_ClassId) && !RegCU.contains("Software/Classes/" + m_ClassId))
-	{
-		//If doesn't exist (user didn't run the setup program), try to create the ClassId for current user.
-		if (!CreateClassId(QApplication::applicationFilePath(), "SMPlayer Media Player"))
-			return 0; 
-	}
-	
-	int count = 0; 
-	foreach(const QString& fileExtension, fileExtensions)
-	{
-		QString ExtKeyName = QString("Software/Microsoft/Windows/CurrentVersion/Explorer/FileExts/.%1").arg(fileExtension);
-		QString ClassesKeyName = m_ClassId;
-
-		QString BackupKeyName = ClassesKeyName + "/" + fileExtension; 
-		QString CUKeyName = "Software/Classes/." + fileExtension; 
-
-		//Save current ClassId for current user
-		QString KeyVal = RegCU.value(CUKeyName + "/.").toString(); 
-
-		if (KeyVal.length() == 0 || KeyVal == m_ClassId)
-		{
-			//No registered app for this extension for current user.
-			//Check the system-wide (HKEY_CLASSES_ROOT) ClassId for this extension 
-			KeyVal = RegCR.value("." + fileExtension + "/.").toString();
-		}
-
-		if (KeyVal != m_ClassId)
-			RegCU.setValue(CUKeyName + "/MPlayer_Backup", KeyVal); 
-
-		//Save last ProgId and Application values from the Exts key
-		KeyVal = RegCU.value(ExtKeyName + "/Progid").toString();
-		
-		if (KeyVal != m_ClassId && KeyVal != m_ClassId2)
-			RegCU.setValue(ExtKeyName + "/MPlayer_Backup_ProgId", KeyVal);
-
-		KeyVal = RegCU.value(ExtKeyName + "/Application").toString(); 
-		if (KeyVal != m_ClassId || KeyVal != m_ClassId2) 
-			RegCU.setValue(ExtKeyName + "/MPlayer_Backup_Application", KeyVal); 
-
-		//Create the associations
-		if (QSysInfo::WindowsVersion >= QSysInfo::WV_NT)
-		{
-			RegCU.setValue(CUKeyName + "/.", m_ClassId); 		//Extension class
-			RegCU.setValue(ExtKeyName + "/Progid", m_ClassId);	//Explorer FileExt association
-
-		}
-		else
-		{
-			//Windows ME/98/95 support
-			RegCR.setValue("." + fileExtension + "/.", m_ClassId); 
-		}
-
-		if (RegCU.status() == QSettings::NoError && RegCR.status() == QSettings::NoError)
-			count++; 
-	}
-
-	return count; 
+ if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA) {
+ return VistaSetAppsAsDefault(fileExtensions);
+ }
+
+ QSettings RegCR("HKEY_CLASSES_ROOT", QSettings::NativeFormat); //Read only on NT+
+ QSettings RegCU("HKEY_CURRENT_USER", QSettings::NativeFormat);
+
+ if (!RegCU.isWritable() || RegCU.status() != QSettings::NoError)
+ return 0;
+
+ if (RegCR.status() != QSettings::NoError)
+ return 0;
+
+ // Check if classId exists in the registry
+ if (!RegCR.contains(m_ClassId) && !RegCU.contains("Software/Classes/" + m_ClassId)) {
+ // If doesn't exist (user didn't run the setup program), try to create the ClassId for current user.
+ if (!CreateClassId(QApplication::applicationFilePath(), "SMPlayer Media Player"))
+ return 0;
+ }
+
+ int count = 0;
+ foreach(const QString & fileExtension, fileExtensions) {
+ QString ExtKeyName = QString("Software/Microsoft/Windows/CurrentVersion/Explorer/FileExts/.%1").arg(fileExtension);
+ QString ClassesKeyName = m_ClassId;
+
+ QString BackupKeyName = ClassesKeyName + "/" + fileExtension;
+ QString CUKeyName = "Software/Classes/." + fileExtension;
+
+ // Save current ClassId for current user
+ QString KeyVal = RegCU.value(CUKeyName + "/.").toString();
+
+ if (KeyVal.length() == 0 || KeyVal == m_ClassId) {
+ // No registered app for this extension for current user.
+ // Check the system-wide (HKEY_CLASSES_ROOT) ClassId for this extension
+ KeyVal = RegCR.value("." + fileExtension + "/.").toString();
+ }
+
+ if (KeyVal != m_ClassId)
+ RegCU.setValue(CUKeyName + "/MPlayer_Backup", KeyVal);
+
+ // Save last ProgId and Application values from the Exts key
+ KeyVal = RegCU.value(ExtKeyName + "/Progid").toString();
+
+ if (KeyVal != m_ClassId && KeyVal != m_ClassId2)
+ RegCU.setValue(ExtKeyName + "/MPlayer_Backup_ProgId", KeyVal);
+
+ KeyVal = RegCU.value(ExtKeyName + "/Application").toString();
+
+ if (KeyVal != m_ClassId || KeyVal != m_ClassId2)
+ RegCU.setValue(ExtKeyName + "/MPlayer_Backup_Application", KeyVal);
+
+ // Create the associations
+ RegCU.setValue(CUKeyName + "/.", m_ClassId); 		// Extension class
+ RegCU.setValue(ExtKeyName + "/Progid", m_ClassId);	// Explorer FileExt association
+
+ if (RegCU.status() == QSettings::NoError && RegCR.status() == QSettings::NoError)
+ count++;
+ }
+
+ return count;
 }
 
-//Checks if extensions in extensionsToCheck are registered with this application. Returns a list of registered extensions. 
-//Returns false if there was an error accessing the registry. 
-//Returns true and 0 elements in registeredExtensions if no extension is associated with current app.
-bool WinFileAssoc::GetRegisteredExtensions( const QStringList& extensionsToCheck, QStringList& registeredExtensions)
+// Checks if extensions in extensionsToCheck are registered with this application. Returns a list of registered extensions.
+// Returns false if there was an error accessing the registry.
+// Returns true and 0 elements in registeredExtensions if no extension is associated with current app.
+bool WinFileAssoc::GetRegisteredExtensions(const QStringList &extensionsToCheck, QStringList &registeredExtensions)
 {
-	registeredExtensions.clear(); 
-
-	if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
-	{
-		return VistaGetDefaultApps(extensionsToCheck, registeredExtensions); 
-	}
-
-	QSettings RegCR ("HKEY_CLASSES_ROOT", QSettings::NativeFormat);
-	QSettings RegCU ("HKEY_CURRENT_USER", QSettings::NativeFormat);
-
-	if (RegCR.status() != QSettings::NoError)
-		return false; 
-
-	if (RegCU.status() != QSettings::NoError)
-		return false; 
-
-	foreach(const QString& fileExtension, extensionsToCheck)
-	{
-		bool bRegistered = false; 
-		//Check the explorer extension (Always use this program to open this kind of file...)
-
-		if (QSysInfo::WindowsVersion >= QSysInfo::WV_NT)
-		{
-			QString FileExtsKey = QString("Software/Microsoft/Windows/CurrentVersion/Explorer/FileExts/.%1").arg(fileExtension);
-			QString CurClassId = RegCU.value(FileExtsKey + "/Progid").toString(); 
-			QString CurAppId = RegCU.value(FileExtsKey + "/Application").toString();
-
-			if (CurClassId.size())	//Registered with Open With... / ProgId ?
-			{
-				bRegistered = (CurClassId == m_ClassId) || (0 == CurClassId.compare(m_ClassId2, Qt::CaseInsensitive));
-			}
-			else
-			if (CurAppId.size())
-			{
-				//If user uses Open With..., explorer creates it's own ClassId under Application, usually "smplayer.exe"
-				bRegistered = (CurAppId == m_ClassId) || (0 == CurAppId.compare(m_ClassId2, Qt::CaseInsensitive)); 
-			}
-			else
-			{
-				//No classId means that no associations exists in Default Programs or Explorer
-				//Check the default per-user association 
-				bRegistered = RegCU.value("Software/Classes/." + fileExtension + "/.").toString() == m_ClassId; 
-			}
-		}
-		
-		//Finally, check the system-wide association
-		if (!bRegistered)
-			bRegistered = RegCR.value("." + fileExtension + "/.").toString() == m_ClassId;
-
-
-		if (bRegistered)
-			registeredExtensions.append(fileExtension); 
-	}
-	
-	return true; 
+ registeredExtensions.clear();
+
+ if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA) {
+ return VistaGetDefaultApps(extensionsToCheck, registeredExtensions);
+ }
+
+ QSettings RegCR("HKEY_CLASSES_ROOT", QSettings::NativeFormat);
+ QSettings RegCU("HKEY_CURRENT_USER", QSettings::NativeFormat);
+
+ if (RegCR.status() != QSettings::NoError)
+ return false;
+
+ if (RegCU.status() != QSettings::NoError)
+ return false;
+
+ foreach(const QString & fileExtension, extensionsToCheck) {
+ bool bRegistered = false;
+ // Check the Explorer extension (Always use this program to open this kind of file...)
+
+ QString FileExtsKey = QString("Software/Microsoft/Windows/CurrentVersion/Explorer/FileExts/.%1").arg(fileExtension);
+ QString CurClassId = RegCU.value(FileExtsKey + "/Progid").toString();
+ QString CurAppId = RegCU.value(FileExtsKey + "/Application").toString();
+
+ if (CurClassId.size()) {	// Registered with Open With... / ProgId ?
+ bRegistered = (CurClassId == m_ClassId) || (0 == CurClassId.compare(m_ClassId2, Qt::CaseInsensitive));
+ } else if (CurAppId.size()) {
+ // If user uses Open With..., explorer creates it's own ClassId under Application, usually "smplayer.exe"
+ bRegistered = (CurAppId == m_ClassId) || (0 == CurAppId.compare(m_ClassId2, Qt::CaseInsensitive));
+ } else {
+ // No classId means that no associations exists in Default Programs or Explorer
+ // Check the default per-user association
+ bRegistered = RegCU.value("Software/Classes/." + fileExtension + "/.").toString() == m_ClassId;
+ }
+
+ // Finally, check the system-wide association
+ if (!bRegistered)
+ bRegistered = RegCR.value("." + fileExtension + "/.").toString() == m_ClassId;
+
+ if (bRegistered)
+ registeredExtensions.append(fileExtension);
+ }
+
+ return true;
 }
 
-//Restores file associations to old defaults (if any) for all extensions in the fileExtensions list.
-//Cleans up our backup keys from the registry.
-//Returns number of extensions successfully processed (error if fileExtensions.count() != return value && count > 0).
-int WinFileAssoc::RestoreFileAssociations(const QStringList& fileExtensions)
+// Restores file associations to old defaults (if any) for all extensions in the fileExtensions list.
+// Cleans up our backup keys from the registry.
+// Returns number of extensions successfully processed (error if fileExtensions.count() != return value && count > 0).
+int WinFileAssoc::RestoreFileAssociations(const QStringList &fileExtensions)
 {
-	if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
-		return 0; //Not supported by the API
-
-	QSettings RegCR ("HKEY_CLASSES_ROOT", QSettings::NativeFormat);
-	QSettings RegCU ("HKEY_CURRENT_USER", QSettings::NativeFormat);
-
-	if (!RegCU.isWritable() || RegCU.status() != QSettings::NoError)
-		return 0; 
-
-	if (RegCR.status() != QSettings::NoError)
-		return 0; 
-
-	if (QSysInfo::WindowsVersion < QSysInfo::WV_NT && !RegCR.isWritable())	//Win98
-		return 0; 
-
-	int count = 0; 
-	foreach(const QString& fileExtension, fileExtensions)
-	{
-		QString ExtKeyName = QString("Software/Microsoft/Windows/CurrentVersion/Explorer/FileExts/.%1").arg(fileExtension);
-		QString OldProgId = RegCU.value(ExtKeyName + "/MPlayer_Backup_ProgId").toString(); 
-		QString OldApp = RegCU.value(ExtKeyName + "/MPlayer_Backup_Application").toString(); 
-		QString OldClassId = RegCU.value("Software/Classes/." + fileExtension + "/MPlayer_Backup").toString(); 
-
-		//Restore old explorer ProgId
-		if (!OldProgId.isEmpty() && OldProgId != m_ClassId)
-			RegCU.setValue(ExtKeyName + "/Progid", OldProgId);
-		else
-		{
-			QString CurProgId = RegCU.value(ExtKeyName + "/Progid").toString();
-			if ((CurProgId == m_ClassId) || (0 == CurProgId.compare(m_ClassId2, Qt::CaseInsensitive))) //Only remove if we own it
-				RegCU.remove(ExtKeyName + "/Progid");	
-		}
-
-		//Restore old explorer Application 
-		if (!OldApp.isEmpty() && OldApp != m_ClassId)
-			RegCU.setValue(ExtKeyName + "/Application", OldApp); 
-		else
-		{
-			QString CurApp = RegCU.value(ExtKeyName + "/Application").toString();
-			if ((CurApp == m_ClassId) || (0 == CurApp.compare(m_ClassId2, Qt::CaseInsensitive))) //Only remove if we own it
-				RegCU.remove(ExtKeyName + "/Application"); 
-		}
-
-		if (QSysInfo::WindowsVersion >= QSysInfo::WV_NT)
-		{
-			//Restore old association for current user
-			if (!OldClassId.isEmpty() && OldClassId != m_ClassId)
-				RegCU.setValue("Software/Classes/." + fileExtension + "/.", OldClassId); 
-			else
-			{
-				if (RegCU.value("Software/Classes/." + fileExtension + "/.").toString() == m_ClassId) //Only remove if we own it
-					RegCU.remove("Software/Classes/." + fileExtension); 
-			}
-		}
-		else
-		{
-			//Windows 98 ==> Write to HKCR
-			if (!OldClassId.isEmpty() && OldClassId != m_ClassId)
-				RegCR.setValue("." + fileExtension + "/.", OldClassId); 
-			else
-			{
-				if (RegCR.value("." + fileExtension + "/.").toString() == m_ClassId)
-					RegCR.remove("." + fileExtension); 
-			}
-		}
-
-		//Remove our keys:
-		//CurrentUserClasses/.ext/MPlayerBackup
-		//Explorer: Backup_Application and Backup_ProgId
-		RegCU.remove("Software/Classes/." + fileExtension + "/MPlayer_Backup"); 
-		RegCU.remove(ExtKeyName + "/MPlayer_Backup_Application"); 
-		RegCU.remove(ExtKeyName + "/MPlayer_Backup_ProgId"); 
-	}
-	return count; 
+ if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA)
+ return 0; // Not supported by the API
+
+ QSettings RegCR("HKEY_CLASSES_ROOT", QSettings::NativeFormat);
+ QSettings RegCU("HKEY_CURRENT_USER", QSettings::NativeFormat);
+
+ if (!RegCU.isWritable() || RegCU.status() != QSettings::NoError)
+ return 0;
+
+ if (RegCR.status() != QSettings::NoError)
+ return 0;
+
+ int count = 0;
+ foreach(const QString & fileExtension, fileExtensions) {
+ QString ExtKeyName = QString("Software/Microsoft/Windows/CurrentVersion/Explorer/FileExts/.%1").arg(fileExtension);
+ QString OldProgId = RegCU.value(ExtKeyName + "/MPlayer_Backup_ProgId").toString();
+ QString OldApp = RegCU.value(ExtKeyName + "/MPlayer_Backup_Application").toString();
+ QString OldClassId = RegCU.value("Software/Classes/." + fileExtension + "/MPlayer_Backup").toString();
+
+ // Restore old explorer ProgId
+ if (!OldProgId.isEmpty() && OldProgId != m_ClassId)
+ RegCU.setValue(ExtKeyName + "/Progid", OldProgId);
+ else {
+ QString CurProgId = RegCU.value(ExtKeyName + "/Progid").toString();
+
+ if ((CurProgId == m_ClassId) || (0 == CurProgId.compare(m_ClassId2, Qt::CaseInsensitive))) //Only remove if we own it
+ RegCU.remove(ExtKeyName + "/Progid");
+ }
+
+ // Restore old explorer Application
+ if (!OldApp.isEmpty() && OldApp != m_ClassId)
+ RegCU.setValue(ExtKeyName + "/Application", OldApp);
+ else {
+ QString CurApp = RegCU.value(ExtKeyName + "/Application").toString();
+
+ if ((CurApp == m_ClassId) || (0 == CurApp.compare(m_ClassId2, Qt::CaseInsensitive))) //Only remove if we own it
+ RegCU.remove(ExtKeyName + "/Application");
+ }
+
+ // Restore old association for current user
+ if (!OldClassId.isEmpty() && OldClassId != m_ClassId)
+ RegCU.setValue("Software/Classes/." + fileExtension + "/.", OldClassId);
+ else {
+ if (RegCU.value("Software/Classes/." + fileExtension + "/.").toString() == m_ClassId) //Only remove if we own it
+ RegCU.remove("Software/Classes/." + fileExtension);
+ }
+
+ // Remove our keys:
+ // CurrentUserClasses/.ext/MPlayerBackup
+ // Explorer: Backup_Application and Backup_ProgId
+ RegCU.remove("Software/Classes/." + fileExtension + "/MPlayer_Backup");
+ RegCU.remove(ExtKeyName + "/MPlayer_Backup_Application");
+ RegCU.remove(ExtKeyName + "/MPlayer_Backup_ProgId");
+ }
+ return count;
 }
 
-//Creates a ClassId for current application. 
-//Note: It's better to create the classId from the installation program.
-bool WinFileAssoc::CreateClassId(const QString& executablePath, const QString& friendlyName)
+// Creates a ClassId for current application.
+// Note: It's better to create the classId from the installation program.
+bool WinFileAssoc::CreateClassId(const QString &executablePath, const QString &friendlyName)
 {
-	QString RootKeyName;
-	QString classId; 
-
-	if (QSysInfo::WindowsVersion >= QSysInfo::WV_NT) 
-	{
-		classId = "Software/Classes/" + m_ClassId; 
-		RootKeyName = "HKEY_CURRENT_USER";
-	}
-	else 
-	{
-		classId = m_ClassId; 
-		RootKeyName = "HKEY_CLASSES_ROOT";	//Windows 95/98/ME
-	}
-
-	QSettings Reg (RootKeyName, QSettings::NativeFormat);
-	if (!Reg.isWritable() || Reg.status() != QSettings::NoError)
-		return false; 
-
-	QString appPath = executablePath;
-	appPath.replace('/', '\\'); //Explorer gives 'Access Denied' if we write the path with forward slashes to the registry
-
-	//Add our ProgId to the HKCR classes
-	Reg.setValue(classId + "/shell/open/FriendlyAppName", friendlyName);
-	Reg.setValue(classId + "/shell/open/command/.", QString("\"%1\" \"%2\"").arg(appPath, "%1"));
-	Reg.setValue(classId + "/DefaultIcon/.", QString("\"%1\",1").arg(appPath));
-	//Add "Enqueue" command
-	Reg.setValue(classId + "/shell/enqueue/.", QObject::tr("Enqueue in SMPlayer"));
-	Reg.setValue(classId + "/shell/enqueue/command/.", QString("\"%1\" -add-to-playlist \"%2\"").arg(appPath, "%1"));
-	return true; 
+ QString RootKeyName;
+ QString classId;
+
+ classId = "Software/Classes/" + m_ClassId;
+ RootKeyName = "HKEY_CURRENT_USER";
+
+ QSettings Reg(RootKeyName, QSettings::NativeFormat);
+
+ if (!Reg.isWritable() || Reg.status() != QSettings::NoError)
+ return false;
+
+ QString appPath = executablePath;
+ appPath.replace('/', '\\'); // Explorer gives 'Access Denied' if we write the path with forward slashes to the registry
+
+ // Add our ProgId to the HKCR classes
+ Reg.setValue(classId + "/shell/open/FriendlyAppName", friendlyName);
+ Reg.setValue(classId + "/shell/open/command/.", QString("\"%1\" \"%2\"").arg(appPath, "%1"));
+ Reg.setValue(classId + "/DefaultIcon/.", QString("\"%1\",1").arg(appPath));
+
+ // Add "Enqueue" command
+ Reg.setValue(classId + "/shell/enqueue/.", QObject::tr("Enqueue in SMPlayer"));
+ Reg.setValue(classId + "/shell/enqueue/command/.", QString("\"%1\" -add-to-playlist \"%2\"").arg(appPath, "%1"));
+ return true;
 }
-//Remove ClassId from the registry.
-//Called when no associations exist. Note: It's better to do this in the Setup program.
+
+// Remove ClassId from the registry.
+// Called when no associations exist. Note: It's better to do this in the Setup program.
 bool WinFileAssoc::RemoveClassId()
 {
-	QString RootKeyName;
-	QString classId; 
-
-	if (QSysInfo::WindowsVersion >= QSysInfo::WV_NT) 
-	{
-		classId = "Software/Classes/" + m_ClassId; 
-		RootKeyName = "HKEY_CURRENT_USER";
-	}
-	else 
-	{
-		classId = m_ClassId; 
-		RootKeyName = "HKEY_CLASSES_ROOT";	//Windows 95/98/ME
-	}
-
-	QSettings RegCU (RootKeyName, QSettings::NativeFormat);
-
-	if (!RegCU.isWritable() || RegCU.status() != QSettings::NoError)
-		return false; 
-
-	RegCU.remove(classId);
-	return true; 
+ QString RootKeyName;
+ QString classId;
+
+ classId = "Software/Classes/" + m_ClassId;
+ RootKeyName = "HKEY_CURRENT_USER";
+
+ QSettings RegCU(RootKeyName, QSettings::NativeFormat);
+
+ if (!RegCU.isWritable() || RegCU.status() != QSettings::NoError)
+ return false;
+
+ RegCU.remove(classId);
+ return true;
 }
 
-//Windows Vista specific implementation
-//Add libole32.a library if compiling with mingw.
-//In smplayer.pro, under win32{ :
-//	LIBS += libole32
-#ifdef WIN32
-#include <windows.h>
+// Windows Vista specific implementation
 
 #if !defined(IApplicationAssociationRegistration)
 
-typedef enum tagASSOCIATIONLEVEL
-{
-	AL_MACHINE,
-	AL_EFFECTIVE,
-	AL_USER
+typedef enum tagASSOCIATIONLEVEL {
+ AL_MACHINE,
+ AL_EFFECTIVE,
+ AL_USER
 } ASSOCIATIONLEVEL;
 
-typedef enum tagASSOCIATIONTYPE
-{
-	AT_FILEEXTENSION,
-	AT_URLPROTOCOL,
-	AT_STARTMENUCLIENT,
-	AT_MIMETYPE
+typedef enum tagASSOCIATIONTYPE {
+ AT_FILEEXTENSION,
+ AT_URLPROTOCOL,
+ AT_STARTMENUCLIENT,
+ AT_MIMETYPE
 } ASSOCIATIONTYPE;
 
 MIDL_INTERFACE("4e530b0a-e611-4c77-a3ac-9031d022281b")
-IApplicationAssociationRegistration : public IUnknown
-{
+IApplicationAssociationRegistration :
+public IUnknown {
 public:
-	virtual HRESULT STDMETHODCALLTYPE QueryCurrentDefault(LPCWSTR pszQuery,
-		ASSOCIATIONTYPE atQueryType,
-		ASSOCIATIONLEVEL alQueryLevel,
-		LPWSTR *ppszAssociation) = 0;
-	virtual HRESULT STDMETHODCALLTYPE QueryAppIsDefault(LPCWSTR pszQuery,
-		ASSOCIATIONTYPE atQueryType,
-		ASSOCIATIONLEVEL alQueryLevel,
-		LPCWSTR pszAppRegistryName,
-		BOOL *pfDefault) = 0;
-	virtual HRESULT STDMETHODCALLTYPE QueryAppIsDefaultAll(ASSOCIATIONLEVEL alQueryLevel,
-		LPCWSTR pszAppRegistryName,
-		BOOL *pfDefault) = 0;
-	virtual HRESULT STDMETHODCALLTYPE SetAppAsDefault(LPCWSTR pszAppRegistryName,
-		LPCWSTR pszSet,
-		ASSOCIATIONTYPE atSetType) = 0;
-	virtual HRESULT STDMETHODCALLTYPE SetAppAsDefaultAll(LPCWSTR pszAppRegistryName) = 0;
-	virtual HRESULT STDMETHODCALLTYPE ClearUserAssociations( void) = 0;
+ virtual HRESULT STDMETHODCALLTYPE QueryCurrentDefault(LPCWSTR pszQuery,
+ ASSOCIATIONTYPE atQueryType,
+ ASSOCIATIONLEVEL alQueryLevel,
+ LPWSTR * ppszAssociation) = 0;
+ virtual HRESULT STDMETHODCALLTYPE QueryAppIsDefault(LPCWSTR pszQuery,
+ ASSOCIATIONTYPE atQueryType,
+ ASSOCIATIONLEVEL alQueryLevel,
+ LPCWSTR pszAppRegistryName,
+ BOOL * pfDefault) = 0;
+ virtual HRESULT STDMETHODCALLTYPE QueryAppIsDefaultAll(ASSOCIATIONLEVEL alQueryLevel,
+ LPCWSTR pszAppRegistryName,
+ BOOL * pfDefault) = 0;
+ virtual HRESULT STDMETHODCALLTYPE SetAppAsDefault(LPCWSTR pszAppRegistryName,
+ LPCWSTR pszSet,
+ ASSOCIATIONTYPE atSetType) = 0;
+ virtual HRESULT STDMETHODCALLTYPE SetAppAsDefaultAll(LPCWSTR pszAppRegistryName) = 0;
+ virtual HRESULT STDMETHODCALLTYPE ClearUserAssociations(void) = 0;
 };
 #endif
 
-static const CLSID CLSID_ApplicationAssociationReg = {0x591209C7,0x767B,0x42B2,{0x9F,0xBA,0x44,0xEE,0x46,0x15,0xF2,0xC7}};
-static const IID IID_IApplicationAssociationReg = {0x4e530b0a,0xe611,0x4c77,{0xa3,0xac,0x90,0x31,0xd0,0x22,0x28,0x1b}};
+static const CLSID CLSID_ApplicationAssociationReg = {0x591209C7, 0x767B, 0x42B2, {0x9F, 0xBA, 0x44, 0xEE, 0x46, 0x15, 0xF2, 0xC7}};
+static const IID IID_IApplicationAssociationReg = {0x4e530b0a, 0xe611, 0x4c77, {0xa3, 0xac, 0x90, 0x31, 0xd0, 0x22, 0x28, 0x1b}};
 
-int WinFileAssoc::VistaSetAppsAsDefault(const QStringList& fileExtensions)
+int WinFileAssoc::VistaSetAppsAsDefault(const QStringList &fileExtensions)
 {
-	IApplicationAssociationRegistration* pAAR;
-	HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationReg,
-		NULL, CLSCTX_INPROC, IID_IApplicationAssociationReg,	(void**)&pAAR);
-
-	int count = 0; 
-	if (SUCCEEDED(hr) && (pAAR != NULL))
-	{
-		foreach(const QString& fileExtension, fileExtensions)
-		{
-			hr = pAAR->SetAppAsDefault((const WCHAR*)m_AppName.utf16(),
-				(const WCHAR*)QString("." + fileExtension).utf16(),
-				AT_FILEEXTENSION);
-
-			if (SUCCEEDED(hr)) 
-				count++; 
-		}
-		pAAR->Release(); 
-	}
-	return count; 
-}
+ IApplicationAssociationRegistration *pAAR;
+ HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationReg,
+ NULL, CLSCTX_INPROC, IID_IApplicationAssociationReg,	(void **)&pAAR);
 
-bool WinFileAssoc::VistaGetDefaultApps(const QStringList &extensions, QStringList& registeredExt)
-{
-	IApplicationAssociationRegistration* pAAR;
-
-	HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationReg,
-		NULL, CLSCTX_INPROC, IID_IApplicationAssociationReg,	(void**)&pAAR);
-
-	if (SUCCEEDED(hr) && (pAAR != NULL))
-	{
-		foreach(const QString& fileExtension, extensions)
-		{
-			BOOL bIsDefault = FALSE; 
-			hr = pAAR->QueryAppIsDefault((const WCHAR*)QString("." + fileExtension).utf16(),
-				AT_FILEEXTENSION,
-				AL_EFFECTIVE,
-				(const WCHAR*)m_AppName.utf16(),
-				&bIsDefault);
-			if (SUCCEEDED(hr) && bIsDefault)
-			{
-				registeredExt.append(fileExtension); 
-			}
-		}
-
-		pAAR->Release();
-		return true;
-	}
-	return false;
-}
-#else
-bool WinFileAssoc::VistaGetDefaultApps(const QStringList &extensions, QStringList& registeredExt)
-{
-	return false; 
+ int count = 0;
+
+ if (SUCCEEDED(hr) && (pAAR != NULL)) {
+ foreach(const QString & fileExtension, fileExtensions) {
+ hr = pAAR->SetAppAsDefault((const WCHAR *)m_AppName.utf16(),
+ (const WCHAR *)QString("." + fileExtension).utf16(),
+ AT_FILEEXTENSION);
+
+ if (SUCCEEDED(hr))
+ count++;
+ }
+ pAAR->Release();
+ }
+
+ return count;
 }
 
-int WinFileAssoc::VistaSetAppsAsDefault(const QStringList& extensions)
+bool WinFileAssoc::VistaGetDefaultApps(const QStringList &extensions, QStringList &registeredExt)
 {
-	return 0; 
+ IApplicationAssociationRegistration *pAAR;
+
+ HRESULT hr = CoCreateInstance(CLSID_ApplicationAssociationReg,
+ NULL, CLSCTX_INPROC, IID_IApplicationAssociationReg,	(void **)&pAAR);
+
+ if (SUCCEEDED(hr) && (pAAR != NULL)) {
+ foreach(const QString & fileExtension, extensions) {
+ BOOL bIsDefault = FALSE;
+ hr = pAAR->QueryAppIsDefault((const WCHAR *)QString("." + fileExtension).utf16(),
+ AT_FILEEXTENSION,
+ AL_EFFECTIVE,
+ (const WCHAR *)m_AppName.utf16(),
+ &bIsDefault);
+
+ if (SUCCEEDED(hr) && bIsDefault) {
+ registeredExt.append(fileExtension);
+ }
+ }
+
+ pAAR->Release();
+ return true;
+ }
+
+ return false;
 }
-#endif
-

smplayer-0.8.0.tar.bz2/src/youtube/retrieveyoutubeurl.cpp -> smplayer-0.8.1.tar.bz2/src/youtube/retrieveyoutubeurl.cpp Changed

@@ -26,8 +26,6 @@
 			this, SLOT(parse(QByteArray)));
 
 	preferred_quality = FLV_360p;
-
-	setUserAgent("Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)");
 }
 
 RetrieveYoutubeUrl::~RetrieveYoutubeUrl() {
@@ -56,7 +54,7 @@
 
     QRegExp regex("\\\"url_encoded_fmt_stream_map\\\"\\s*:\\s*\\\"(^\\\"*)");
     regex.indexIn(replyString);
-    QString fmtArray = regex.cap(1);    
+    QString fmtArray = regex.cap(1);
     fmtArray = sanitizeForUnicodePoint(fmtArray);
     fmtArray.replace(QRegExp("\\\\(.)"), "\\1");
     htmlDecode(fmtArray);
@@ -64,9 +62,13 @@
     QStringList::iterator stIt = codeList.begin();
     foreach(QString code, codeList)
     {
-        code.remove(0, 4);
         QUrl url(code);
-        urlMapurl.queryItemValue("itag").toInt() = code.remove(QRegExp("&itag=\\d+$"));
+        int itag = url.queryItemValue("itag").toInt();
+        //qDebug("itag: %d", itag);
+        code.remove(QRegExp("itag=(\\d+)&url="));
+        code.replace("&sig=", "&signature=");
+        urlMapitag = code;
+        //qDebug("code: '%s'", code.toUtf8().constData());
     }
 
 	qDebug("RetrieveYoutubeUrl::parse: url count: %d", urlMap.count());

smplayer-0.8.1.tar.bz2/zlib Added

smplayer-0.8.1.tar.bz2/zlib/CMakeLists.txt Added

@@ -0,0 +1,211 @@
+cmake_minimum_required(VERSION 2.4.4)
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
+
+project(zlib C)
+
+set(VERSION "1.2.7")
+
+set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
+set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
+set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
+set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
+set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
+
+include(CheckTypeSize)
+include(CheckFunctionExists)
+include(CheckIncludeFile)
+include(CheckCSourceCompiles)
+enable_testing()
+
+check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+check_include_file(stdint.h    HAVE_STDINT_H)
+check_include_file(stddef.h    HAVE_STDDEF_H)
+
+#
+# Check to see if we have large file support
+#
+set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1)
+# We add these other definitions here because CheckTypeSize.cmake
+# in CMake 2.4.x does not automatically do so and we want
+# compatibility with CMake 2.4.x.
+if(HAVE_SYS_TYPES_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H)
+endif()
+if(HAVE_STDINT_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H)
+endif()
+if(HAVE_STDDEF_H)
+    list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H)
+endif()
+check_type_size(off64_t OFF64_T)
+if(HAVE_OFF64_T)
+   add_definitions(-D_LARGEFILE64_SOURCE=1)
+endif()
+set(CMAKE_REQUIRED_DEFINITIONS) # clear variable
+
+#
+# Check for fseeko
+#
+check_function_exists(fseeko HAVE_FSEEKO)
+if(NOT HAVE_FSEEKO)
+    add_definitions(-DNO_FSEEKO)
+endif()
+
+#
+# Check for unistd.h
+#
+check_include_file(unistd.h Z_HAVE_UNISTD_H)
+
+if(MSVC)
+    set(CMAKE_DEBUG_POSTFIX "d")
+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+    include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+endif()
+
+if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
+    # If we're doing an out of source build and the user has a zconf.h
+    # in their source tree...
+    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
+        message(STATUS "Renaming")
+        message(STATUS "    ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
+        message(STATUS "to 'zconf.h.included' because this file is included with zlib")
+        message(STATUS "but CMake generates it automatically in the build directory.")
+        file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
+  endif()
+endif()
+
+set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
+		${ZLIB_PC} @ONLY)
+configure_file(	${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
+		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+
+
+#============================================================================
+# zlib
+#============================================================================
+
+set(ZLIB_PUBLIC_HDRS
+    ${CMAKE_CURRENT_BINARY_DIR}/zconf.h
+    zlib.h
+)
+set(ZLIB_PRIVATE_HDRS
+    crc32.h
+    deflate.h
+    gzguts.h
+    inffast.h
+    inffixed.h
+    inflate.h
+    inftrees.h
+    trees.h
+    zutil.h
+)
+set(ZLIB_SRCS
+    adler32.c
+    compress.c
+    crc32.c
+    deflate.c
+    gzclose.c
+    gzlib.c
+    gzread.c
+    gzwrite.c
+    inflate.c
+    infback.c
+    inftrees.c
+    inffast.c
+    trees.c
+    uncompr.c
+    zutil.c
+)
+
+if(NOT MINGW)
+    set(ZLIB_SRCS ${ZLIB_SRCS}
+        win32/zlib1.rc # If present will override custom build rule below.
+    )
+endif()
+
+# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
+string(REGEX REPLACE ".*#define \t+ZLIB_VERSION \t+\"(-0-9A-Za-z.+)\".*"
+    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
+
+if(MINGW)
+    # This gets us DLL resource information when compiling on MinGW.
+    if(NOT CMAKE_RC_COMPILER)
+        SET(CMAKE_RC_COMPILER windres.exe)
+    endif()
+
+    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                       COMMAND ${CMAKE_RC_COMPILER}
+                            -D GCC_WINDRES
+                            -I ${CMAKE_CURRENT_SOURCE_DIR}
+                            -I ${CMAKE_CURRENT_BINARY_DIR}
+                            -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                            -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
+    set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+endif(MINGW)
+
+add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+set_target_properties(zlib PROPERTIES SOVERSION 1)
+
+if(NOT CYGWIN)
+    # This property causes shared libraries on Linux to have the full version
+    # encoded into their final filename.  We disable this on Cygwin because
+    # it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll
+    # seems to be the default.
+    #
+    # This has no effect with MSVC, on that platform the version info for
+    # the DLL comes from the resource file win32/zlib1.rc
+    set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
+endif()
+
+if(UNIX)
+    # On unix-like platforms the library is almost always called libz
+   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
+   set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/zlib.map")
+elseif(BUILD_SHARED_LIBS AND WIN32)
+    # Creates zlib1.dll when building shared library version
+    set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
+endif()
+
+if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
+    install(TARGETS zlib zlibstatic
+        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
+endif()
+if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
+    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
+endif()
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+    install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")
+endif()
+if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
+    install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
+endif()
+
+#============================================================================
+# Example binaries
+#============================================================================
+
+add_executable(example test/example.c)
+target_link_libraries(example zlib)
+add_test(example example)
+
+add_executable(minigzip test/minigzip.c)
+target_link_libraries(minigzip zlib)
+
+if(HAVE_OFF64_T)
+    add_executable(example64 test/example.c)
+    target_link_libraries(example64 zlib)
+    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+    add_test(example64 example64)
+
+    add_executable(minigzip64 test/minigzip.c)
+    target_link_libraries(minigzip64 zlib)
+    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
+endif()

smplayer-0.8.1.tar.bz2/zlib/ChangeLog Added

@@ -0,0 +1,1409 @@
+
+ ChangeLog file for zlib
+
+Changes in 1.2.7 (2 May 2012)
+- Replace use of memmove() with a simple copy for portability
+- Test for existence of strerror
+- Restore gzgetc_ for backward compatibility with 1.2.6
+- Fix build with non-GNU make on Solaris
+- Require gcc 4.0 or later on Mac OS X to use the hidden attribute
+- Include unistd.h for Watcom C
+- Use __WATCOMC__ instead of __WATCOM__
+- Do not use the visibility attribute if NO_VIZ defined
+- Improve the detection of no hidden visibility attribute
+- Avoid using __int64 for gcc or solo compilation
+- Cast to char * in gzprintf to avoid warnings Zinser
+- Fix make_vms.com for VAX Zinser
+- Don't use library or built-in byte swaps
+- Simplify test and use of gcc hidden attribute
+- Fix bug in gzclose_w() when gzwrite() fails to allocate memory
+- Add "x" (O_EXCL) and "e" (O_CLOEXEC) modes support to gzopen()
+- Fix bug in test/minigzip.c for configure --solo
+- Fix contrib/vstudio project link errors Mohanathas
+- Add ability to choose the builder in make_vms.com Schweda
+- Add DESTDIR support to mingw32 win32/Makefile.gcc
+- Fix comments in win32/Makefile.gcc for proper usage
+- Allow overriding the default install locations for cmake
+- Generate and install the pkg-config file with cmake
+- Build both a static and a shared version of zlib with cmake
+- Include version symbols for cmake builds
+- If using cmake with MSVC, add the source directory to the includes
+- Remove unneeded EXTRA_CFLAGS from win32/Makefile.gcc Truta
+- Move obsolete emx makefile to old Truta
+- Allow the use of -Wundef when compiling or using zlib
+- Avoid the use of the -u option with mktemp
+- Improve inflate() documentation on the use of Z_FINISH
+- Recognize clang as gcc
+- Add gzopen_w() in Windows for wide character path names
+- Rename zconf.h in CMakeLists.txt to move it out of the way
+- Add source directory in CMakeLists.txt for building examples
+- Look in build directory for zlib.pc in CMakeLists.txt
+- Remove gzflags from zlibvc.def in vc9 and vc10
+- Fix contrib/minizip compilation in the MinGW environment
+- Update ./configure for Solaris, support --64 Mooney
+- Remove -R. from Solaris shared build (possible security issue)
+- Avoid race condition for parallel make (-j) running example
+- Fix type mismatch between get_crc_table() and crc_table
+- Fix parsing of version with "-" in CMakeLists.txt Snider, Ziegler
+- Fix the path to zlib.map in CMakeLists.txt
+- Force the native libtool in Mac OS X to avoid GNU libtool Beebe
+- Add instructions to win32/Makefile.gcc for shared install Torri
+
+Changes in 1.2.6.1 (12 Feb 2012)
+- Avoid the use of the Objective-C reserved name "id"
+- Include io.h in gzguts.h for Microsoft compilers
+- Fix problem with ./configure --prefix and gzgetc macro
+- Include gz_header definition when compiling zlib solo
+- Put gzflags() functionality back in zutil.c
+- Avoid library header include in crc32.c for Z_SOLO
+- Use name in GCC_CLASSIC as C compiler for coverage testing, if set
+- Minor cleanup in contrib/minizip/zip.c Vollant
+- Update make_vms.com Zinser
+- Remove unnecessary gzgetc_ function
+- Use optimized byte swap operations for Microsoft and GNU Snyder
+- Fix minor typo in zlib.h comments Rzesniowiecki
+
+Changes in 1.2.6 (29 Jan 2012)
+- Update the Pascal interface in contrib/pascal
+- Fix function numbers for gzgetc_ in zlibvc.def files
+- Fix configure.ac for contrib/minizip Schiffer
+- Fix large-entry detection in minizip on 64-bit systems Schiffer
+- Have ./configure use the compiler return code for error indication
+- Fix CMakeLists.txt for cross compilation McClure
+- Fix contrib/minizip/zip.c for 64-bit architectures Dalsnes
+- Fix compilation of contrib/minizip on FreeBSD Marquez
+- Correct suggested usages in win32/Makefile.msc Shachar, Horvath
+- Include io.h for Turbo C / Borland C on all platforms Truta
+- Make version explicit in contrib/minizip/configure.ac Bosmans
+- Avoid warning for no encryption in contrib/minizip/zip.c Vollant
+- Minor cleanup up contrib/minizip/unzip.c Vollant
+- Fix bug when compiling minizip with C++ Vollant
+- Protect for long name and extra fields in contrib/minizip Vollant
+- Avoid some warnings in contrib/minizip Vollant
+- Add -I../.. -L../.. to CFLAGS for minizip and miniunzip
+- Add missing libs to minizip linker command
+- Add support for VPATH builds in contrib/minizip
+- Add an --enable-demos option to contrib/minizip/configure
+- Add the generation of configure.log by ./configure
+- Exit when required parameters not provided to win32/Makefile.gcc
+- Have gzputc return the character written instead of the argument
+- Use the -m option on ldconfig for BSD systems Tobias
+- Correct in zlib.map when deflateResetKeep was added
+
+Changes in 1.2.5.3 (15 Jan 2012)
+- Restore gzgetc function for binary compatibility
+- Do not use _lseeki64 under Borland C++ Truta
+- Update win32/Makefile.msc to build test/*.c Truta
+- Remove old/visualc6 given CMakefile and other alternatives
+- Update AS400 build files and documentation Monnerat
+- Update win32/Makefile.gcc to build test/*.c Truta
+- Permit stronger flushes after Z_BLOCK flushes
+- Avoid extraneous empty blocks when doing empty flushes
+- Permit Z_NULL arguments to deflatePending
+- Allow deflatePrime() to insert bits in the middle of a stream
+- Remove second empty static block for Z_PARTIAL_FLUSH
+- Write out all of the available bits when using Z_BLOCK
+- Insert the first two strings in the hash table after a flush
+
+Changes in 1.2.5.2 (17 Dec 2011)
+- fix ld error: unable to find version dependency 'ZLIB_1.2.5'
+- use relative symlinks for shared libs
+- Avoid searching past window for Z_RLE strategy
+- Assure that high-water mark initialization is always applied in deflate
+- Add assertions to fill_window() in deflate.c to match comments
+- Update python link in README
+- Correct spelling error in gzread.c
+- Fix bug in gzgets() for a concatenated empty gzip stream
+- Correct error in comment for gz_make()
+- Change gzread() and related to ignore junk after gzip streams
+- Allow gzread() and related to continue after gzclearerr()
+- Allow gzrewind() and gzseek() after a premature end-of-file
+- Simplify gzseek() now that raw after gzip is ignored
+- Change gzgetc() to a macro for speed (~40% speedup in testing)
+- Fix gzclose() to return the actual error last encountered
+- Always add large file support for windows
+- Include zconf.h for windows large file support
+- Include zconf.h.cmakein for windows large file support
+- Update zconf.h.cmakein on make distclean
+- Merge vestigial vsnprintf determination from zutil.h to gzguts.h
+- Clarify how gzopen() appends in zlib.h comments
+- Correct documentation of gzdirect() since junk at end now ignored
+- Add a transparent write mode to gzopen() when 'T' is in the mode
+- Update python link in zlib man page
+- Get inffixed.h and MAKEFIXED result to match
+- Add a ./config --solo option to make zlib subset with no libary use
+- Add undocumented inflateResetKeep() function for CAB file decoding
+- Add --cover option to ./configure for gcc coverage testing
+- Add #define ZLIB_CONST option to use const in the z_stream interface
+- Add comment to gzdopen() in zlib.h to use dup() when using fileno()
+- Note behavior of uncompress() to provide as much data as it can
+- Add files in contrib/minizip to aid in building libminizip
+- Split off AR options in Makefile.in and configure
+- Change ON macro to Z_ARG to avoid application conflicts
+- Facilitate compilation with Borland C++ for pragmas and vsnprintf
+- Include io.h for Turbo C / Borland C++
+- Move example.c and minigzip.c to test/
+- Simplify incomplete code table filling in inflate_table()
+- Remove code from inflate.c and infback.c that is impossible to execute
+- Test the inflate code with full coverage
+- Allow deflateSetDictionary, inflateSetDictionary at any time (in raw)
+- Add deflateResetKeep and fix inflateResetKeep to retain dictionary
+- Fix gzwrite.c to accommodate reduced memory zlib compilation
+- Have inflate() with Z_FINISH avoid the allocation of a window
+- Do not set strm->adler when doing raw inflate
+- Fix gzeof() to behave just like feof() when read is not past end of file
+- Fix bug in gzread.c when end-of-file is reached
+- Avoid use of Z_BUF_ERROR in gz* functions except for premature EOF
+- Document gzread() capability to read concurrently written files
+- Remove hard-coding of resource compiler in CMakeLists.txt Blammo
+
+Changes in 1.2.5.1 (10 Sep 2011)
+- Update FAQ entry on shared builds (#13)
+- Avoid symbolic argument to chmod in Makefile.in
+- Fix bug and add consts in contrib/puff Oberhumer
+- Update contrib/puff/zeros.raw test file to have all block types
+- Add full coverage test for puff in contrib/puff/Makefile
+- Fix static-only-build install in Makefile.in
+- Fix bug in unzGetCurrentFileInfo() in contrib/minizip Kuno
+- Add libz.a dependency to shared in Makefile.in for parallel builds
+- Spell out "number" (instead of "nb") in zlib.h for total_in, total_out
+- Replace $(...) with `...` in configure for non-bash sh Bowler
+- Add darwin* to Darwin* and solaris* to SunOS\ 5* in configure Groffen
+- Add solaris* to Linux* in configure to allow gcc use Groffen
+- Add *bsd* to Linux* case in configure Bar-Lev
+- Add inffast.obj to dependencies in win32/Makefile.msc
+- Correct spelling error in deflate.h Kohler
+- Change libzdll.a again to libz.dll.a (!) in win32/Makefile.gcc
+- Add test to configure for GNU C looking for gcc in output of $cc -v
+- Add zlib.pc generation to win32/Makefile.gcc Weigelt
+- Fix bug in zlib.h for _FILE_OFFSET_BITS set and _LARGEFILE64_SOURCE not
+- Add comment in zlib.h that adler32_combine with len2 < 0 makes no sense
+- Make NO_DIVIDE option in adler32.c much faster (thanks to John Reiser)
+- Make stronger test in zconf.h to include unistd.h for LFS
+- Apply Darwin patches for 64-bit file offsets to contrib/minizip Slack
+- Fix zlib.h LFS support when Z_PREFIX used
+- Add updated as400 support (removed from old) Monnerat
+- Avoid deflate sensitivity to volatile input data
+- Avoid division in adler32_combine for NO_DIVIDE
+- Clarify the use of Z_FINISH with deflateBound() amount of space
+- Set binary for output file in puff.c
+- Use u4 type for crc_table to avoid conversion warnings
+- Apply casts in zlib.h to avoid conversion warnings
+- Add OF to prototypes for adler32_combine_ and crc32_combine_ Miller
+- Improve inflateSync() documentation to note indeterminancy
+- Add deflatePending() function to return the amount of pending output
+- Correct the spelling of "specification" in FAQ Randers-Pehrson
+- Add a check in configure for stdarg.h, use for gzprintf()
+- Check that pointers fit in ints when gzprint() compiled old style
+- Add dummy name before $(SHAREDLIBV) in Makefile Bar-Lev, Bowler
+- Delete line in configure that adds -L. libz.a to LDFLAGS Weigelt
+- Add debug records in assmebler code Londer
+- Update RFC references to use http://tools.ietf.org/html/... Li
+- Add --archs option, use of libtool to configure for Mac OS X Borstel
+
+Changes in 1.2.5 (19 Apr 2010)
+- Disable visibility attribute in win32/Makefile.gcc Bar-Lev
+- Default to libdir as sharedlibdir in configure Nieder
+- Update copyright dates on modified source files
+- Update trees.c to be able to generate modified trees.h
+- Exit configure for MinGW, suggesting win32/Makefile.gcc
+- Check for NULL path in gz_open Homurlu
+
+Changes in 1.2.4.5 (18 Apr 2010)
+- Set sharedlibdir in configure Torok
+- Set LDFLAGS in Makefile.in Bar-Lev
+- Avoid mkdir objs race condition in Makefile.in Bowler
+- Add ZLIB_INTERNAL in front of internal inter-module functions and arrays
+- Define ZLIB_INTERNAL to hide internal functions and arrays for GNU C
+- Don't use hidden attribute when it is a warning generator (e.g. Solaris)
+
+Changes in 1.2.4.4 (18 Apr 2010)
+- Fix CROSS_PREFIX executable testing, CHOST extract, mingw* Torok
+- Undefine _LARGEFILE64_SOURCE in zconf.h if it is zero, but not if empty
+- Try to use bash or ksh regardless of functionality of /bin/sh
+- Fix configure incompatibility with NetBSD sh
+- Remove attempt to run under bash or ksh since have better NetBSD fix
+- Fix win32/Makefile.gcc for MinGW Bar-Lev
+- Add diagnostic messages when using CROSS_PREFIX in configure
+- Added --sharedlibdir option to configure Weigelt
+- Use hidden visibility attribute when available Frysinger
+
+Changes in 1.2.4.3 (10 Apr 2010)
+- Only use CROSS_PREFIX in configure for ar and ranlib if they exist
+- Use CROSS_PREFIX for nm Bar-Lev
+- Assume _LARGEFILE64_SOURCE defined is equivalent to true
+- Avoid use of undefined symbols in #if with && and ||
+- Make *64 prototypes in gzguts.h consistent with functions
+- Add -shared load option for MinGW in configure Bowler
+- Move z_off64_t to public interface, use instead of off64_t
+- Remove ! from shell test in configure (not portable to Solaris)
+- Change +0 macro tests to -0 for possibly increased portability
+
+Changes in 1.2.4.2 (9 Apr 2010)
+- Add consistent carriage returns to readme.txt's in masmx86 and masmx64
+- Really provide prototypes for *64 functions when building without LFS
+- Only define unlink() in minigzip.c if unistd.h not included
+- Update README to point to contrib/vstudio project files
+- Move projects/vc6 to old/ and remove projects/
+- Include stdlib.h in minigzip.c for setmode() definition under WinCE
+- Clean up assembler builds in win32/Makefile.msc Rowe
+- Include sys/types.h for Microsoft for off_t definition
+- Fix memory leak on error in gz_open()
+- Symbolize nm as $NM in configure Weigelt
+- Use TEST_LDSHARED instead of LDSHARED to link test programs Weigelt
+- Add +0 to _FILE_OFFSET_BITS and _LFS64_LARGEFILE in case not defined
+- Fix bug in gzeof() to take into account unused input data
+- Avoid initialization of structures with variables in puff.c
+- Updated win32/README-WIN32.txt Rowe
+
+Changes in 1.2.4.1 (28 Mar 2010)
+- Remove the use of a-z constructs for sed in configure gentoo 310225
+- Remove $(SHAREDLIB) from LIBS in Makefile.in Creech
+- Restore "for debugging" comment on sprintf() in gzlib.c
+- Remove fdopen for MVS from gzguts.h
+- Put new README-WIN32.txt in win32 Rowe
+- Add check for shell to configure and invoke another shell if needed
+- Fix big fat stinking bug in gzseek() on uncompressed files
+- Remove vestigial F_OPEN64 define in zutil.h
+- Set and check the value of _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE
+- Avoid errors on non-LFS systems when applications define LFS macros
+- Set EXE to ".exe" in configure for MINGW Kahle
+- Match crc32() in crc32.c exactly to the prototype in zlib.h Sherrill
+- Add prefix for cross-compilation in win32/makefile.gcc Bar-Lev
+- Add DLL install in win32/makefile.gcc Bar-Lev
+- Allow Linux* or linux* from uname in configure Bar-Lev
+- Allow ldconfig to be redefined in configure and Makefile.in Bar-Lev
+- Add cross-compilation prefixes to configure Bar-Lev
+- Match type exactly in gz_load() invocation in gzread.c
+- Match type exactly of zcalloc() in zutil.c to zlib.h alloc_func
+- Provide prototypes for *64 functions when building zlib without LFS
+- Don't use -lc when linking shared library on MinGW
+- Remove errno.h check in configure and vestigial errno code in zutil.h
+
+Changes in 1.2.4 (14 Mar 2010)
+- Fix VER3 extraction in configure for no fourth subversion
+- Update zlib.3, add docs to Makefile.in to make .pdf out of it
+- Add zlib.3.pdf to distribution
+- Don't set error code in gzerror() if passed pointer is NULL
+- Apply destination directory fixes to CMakeLists.txt Lowman
+- Move #cmakedefine's to a new zconf.in.cmakein
+- Restore zconf.h for builds that don't use configure or cmake
+- Add distclean to dummy Makefile for convenience
+- Update and improve INDEX, README, and FAQ
+- Update CMakeLists.txt for the return of zconf.h Lowman
+- Update contrib/vstudio/vc9 and vc10 Vollant
+- Change libz.dll.a back to libzdll.a in win32/Makefile.gcc
+- Apply license and readme changes to contrib/asm686 Raiter
+- Check file name lengths and add -c option in minigzip.c Li
+- Update contrib/amd64 and contrib/masmx86/ Vollant
+- Avoid use of "eof" parameter in trees.c to not shadow library variable
+- Update make_vms.com for removal of zlibdefs.h Zinser
+- Update assembler code and vstudio projects in contrib Vollant
+- Remove outdated assembler code contrib/masm686 and contrib/asm586
+- Remove old vc7 and vc8 from contrib/vstudio
+- Update win32/Makefile.msc, add ZLIB_VER_SUBREVISION Rowe
+- Fix memory leaks in gzclose_r() and gzclose_w(), file leak in gz_open()
+- Add contrib/gcc_gvmat64 for longest_match and inflate_fast Vollant
+- Remove *64 functions from win32/zlib.def (they're not 64-bit yet)
+- Fix bug in void-returning vsprintf() case in gzwrite.c
+- Fix name change from inflate.h in contrib/inflate86/inffas86.c
+- Check if temporary file exists before removing in make_vms.com Zinser
+- Fix make install and uninstall for --static option
+- Fix usage of _MSC_VER in gzguts.h and zutil.h Truta
+- Update readme.txt in contrib/masmx64 and masmx86 to assemble
+
+Changes in 1.2.3.9 (21 Feb 2010)
+- Expunge gzio.c
+- Move as400 build information to old
+- Fix updates in contrib/minizip and contrib/vstudio
+- Add const to vsnprintf test in configure to avoid warnings Weigelt
+- Delete zconf.h (made by configure) Weigelt
+- Change zconf.in.h to zconf.h.in per convention Weigelt
+- Check for NULL buf in gzgets()
+- Return empty string for gzgets() with len == 1 (like fgets())
+- Fix description of gzgets() in zlib.h for end-of-file, NULL return
+- Update minizip to 1.1 Vollant
+- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c
+- Note in zlib.h that gzerror() should be used to distinguish from EOF
+- Remove use of snprintf() from gzlib.c
+- Fix bug in gzseek()
+- Update contrib/vstudio, adding vc9 and vc10 Kuno, Vollant
+- Fix zconf.h generation in CMakeLists.txt Lowman
+- Improve comments in zconf.h where modified by configure
+
+Changes in 1.2.3.8 (13 Feb 2010)
+- Clean up text files (tabs, trailing whitespace, etc.) Oberhumer
+- Use z_off64_t in gz_zero() and gz_skip() to match state->skip
+- Avoid comparison problem when sizeof(int) == sizeof(z_off64_t)
+- Revert to Makefile.in from 1.2.3.6 (live with the clutter)
+- Fix missing error return in gzflush(), add zlib.h note
+- Add *64 functions to zlib.map Levin
+- Fix signed/unsigned comparison in gz_comp()
+- Use SFLAGS when testing shared linking in configure
+- Add --64 option to ./configure to use -m64 with gcc
+- Fix ./configure --help to correctly name options
+- Have make fail if a test fails Levin
+- Avoid buffer overrun in contrib/masmx64/gvmat64.asm Simpson
+- Remove assembler object files from contrib
+
+Changes in 1.2.3.7 (24 Jan 2010)
+- Always gzopen() with O_LARGEFILE if available
+- Fix gzdirect() to work immediately after gzopen() or gzdopen()
+- Make gzdirect() more precise when the state changes while reading
+- Improve zlib.h documentation in many places
+- Catch memory allocation failure in gz_open()
+- Complete close operation if seek forward in gzclose_w() fails
+- Return Z_ERRNO from gzclose_r() if close() fails
+- Return Z_STREAM_ERROR instead of EOF for gzclose() being passed NULL
+- Return zero for gzwrite() errors to match zlib.h description
+- Return -1 on gzputs() error to match zlib.h description
+- Add zconf.in.h to allow recovery from configure modification Weigelt
+- Fix static library permissions in Makefile.in Weigelt
+- Avoid warnings in configure tests that hide functionality Weigelt
+- Add *BSD and DragonFly to Linux case in configure gentoo 123571
+- Change libzdll.a to libz.dll.a in win32/Makefile.gcc gentoo 288212
+- Avoid access of uninitialized data for first inflateReset2 call Gomes
+- Keep object files in subdirectories to reduce the clutter somewhat
+- Remove default Makefile and zlibdefs.h, add dummy Makefile
+- Add new external functions to Z_PREFIX, remove duplicates, z_z_ -> z_
+- Remove zlibdefs.h completely -- modify zconf.h instead
+
+Changes in 1.2.3.6 (17 Jan 2010)
+- Avoid void * arithmetic in gzread.c and gzwrite.c
+- Make compilers happier with const char * for gz_error message
+- Avoid unused parameter warning in inflate.c
+- Avoid signed-unsigned comparison warning in inflate.c
+- Indent #pragma's for traditional C
+- Fix usage of strwinerror() in glib.c, change to gz_strwinerror()
+- Correct email address in configure for system options
+- Update make_vms.com and add make_vms.com to contrib/minizip Zinser
+- Update zlib.map Brown
+- Fix Makefile.in for Solaris 10 make of example64 and minizip64 Torok
+- Apply various fixes to CMakeLists.txt Lowman
+- Add checks on len in gzread() and gzwrite()
+- Add error message for no more room for gzungetc()
+- Remove zlib version check in gzwrite()
+- Defer compression of gzprintf() result until need to
+- Use snprintf() in gzdopen() if available
+- Remove USE_MMAP configuration determination (only used by minigzip)
+- Remove examples/pigz.c (available separately)
+- Update examples/gun.c to 1.6
+
+Changes in 1.2.3.5 (8 Jan 2010)
+- Add space after #if in zutil.h for some compilers
+- Fix relatively harmless bug in deflate_fast() Exarevsky
+- Fix same problem in deflate_slow()
+- Add $(SHAREDLIBV) to LIBS in Makefile.in Brown
+- Add deflate_rle() for faster Z_RLE strategy run-length encoding
+- Add deflate_huff() for faster Z_HUFFMAN_ONLY encoding
+- Change name of "write" variable in inffast.c to avoid library collisions
+- Fix premature EOF from gzread() in gzio.c Brown
+- Use zlib header window size if windowBits is 0 in inflateInit2()
+- Remove compressBound() call in deflate.c to avoid linking compress.o
+- Replace use of errno in gz* with functions, support WinCE Alves
+- Provide alternative to perror() in minigzip.c for WinCE Alves
+- Don't use _vsnprintf on later versions of MSVC Lowman
+- Add CMake build script and input file Lowman
+- Update contrib/minizip to 1.1 Svensson, Vollant
+- Moved nintendods directory from contrib to .
+- Replace gzio.c with a new set of routines with the same functionality
+- Add gzbuffer(), gzoffset(), gzclose_r(), gzclose_w() as part of above
+- Update contrib/minizip to 1.1b
+- Change gzeof() to return 0 on error instead of -1 to agree with zlib.h
+
+Changes in 1.2.3.4 (21 Dec 2009)
+- Use old school .SUFFIXES in Makefile.in for FreeBSD compatibility
+- Update comments in configure and Makefile.in for default --shared
+- Fix test -z's in configure Marquess
+- Build examplesh and minigzipsh when not testing
+- Change NULL's to Z_NULL's in deflate.c and in comments in zlib.h
+- Import LDFLAGS from the environment in configure
+- Fix configure to populate SFLAGS with discovered CFLAGS options
+- Adapt make_vms.com to the new Makefile.in Zinser
+- Add zlib2ansi script for C++ compilation Marquess
+- Add _FILE_OFFSET_BITS=64 test to make test (when applicable)
+- Add AMD64 assembler code for longest match to contrib Teterin
+- Include options from $SFLAGS when doing $LDSHARED
+- Simplify 64-bit file support by introducing z_off64_t type
+- Make shared object files in objs directory to work around old Sun cc
+- Use only three-part version number for Darwin shared compiles
+- Add rc option to ar in Makefile.in for when ./configure not run
+- Add -WI,-rpath,. to LDFLAGS for OSF 1 V4*
+- Set LD_LIBRARYN32_PATH for SGI IRIX shared compile
+- Protect against _FILE_OFFSET_BITS being defined when compiling zlib
+- Rename Makefile.in targets allstatic to static and allshared to shared
+- Fix static and shared Makefile.in targets to be independent
+- Correct error return bug in gz_open() by setting state Brown
+- Put spaces before ;;'s in configure for better sh compatibility
+- Add pigz.c (parallel implementation of gzip) to examples/
+- Correct constant in crc32.c to UL Leventhal
+- Reject negative lengths in crc32_combine()
+- Add inflateReset2() function to work like inflateEnd()/inflateInit2()
+- Include sys/types.h for _LARGEFILE64_SOURCE Brown
+- Correct typo in doc/algorithm.txt Janik
+- Fix bug in adler32_combine() Zhu
+- Catch missing-end-of-block-code error in all inflates and in puff
+ Assures that random input to inflate eventually results in an error
+- Added enough.c (calculation of ENOUGH for inftrees.h) to examples/
+- Update ENOUGH and its usage to reflect discovered bounds
+- Fix gzerror() error report on empty input file Brown
+- Add ush casts in trees.c to avoid pedantic runtime errors
+- Fix typo in zlib.h uncompress() description Reiss
+- Correct inflate() comments with regard to automatic header detection
+- Remove deprecation comment on Z_PARTIAL_FLUSH (it stays)
+- Put new version of gzlog (2.0) in examples with interruption recovery
+- Add puff compile option to permit invalid distance-too-far streams
+- Add puff TEST command options, ability to read piped input
+- Prototype the *64 functions in zlib.h when _FILE_OFFSET_BITS == 64, but
+ _LARGEFILE64_SOURCE not defined
+- Fix Z_FULL_FLUSH to truly erase the past by resetting s->strstart
+- Fix deflateSetDictionary() to use all 32K for output consistency
+- Remove extraneous #define MIN_LOOKAHEAD in deflate.c (in deflate.h)
+- Clear bytes after deflate lookahead to avoid use of uninitialized data
+- Change a limit in inftrees.c to be more transparent to Coverity Prevent
+- Update win32/zlib.def with exported symbols from zlib.h
+- Correct spelling errors in zlib.h Willem, Sobrado
+- Allow Z_BLOCK for deflate() to force a new block
+- Allow negative bits in inflatePrime() to delete existing bit buffer
+- Add Z_TREES flush option to inflate() to return at end of trees
+- Add inflateMark() to return current state information for random access
+- Add Makefile for NintendoDS to contrib Costa
+- Add -w in configure compile tests to avoid spurious warnings Beucler
+- Fix typos in zlib.h comments for deflateSetDictionary()
+- Fix EOF detection in transparent gzread() Maier
+
+Changes in 1.2.3.3 (2 October 2006)
+- Make --shared the default for configure, add a --static option
+- Add compile option to permit invalid distance-too-far streams
+- Add inflateUndermine() function which is required to enable above
+- Remove use of "this" variable name for C++ compatibility Marquess
+- Add testing of shared library in make test, if shared library built
+- Use ftello() and fseeko() if available instead of ftell() and fseek()
+- Provide two versions of all functions that use the z_off_t type for
+ binary compatibility -- a normal version and a 64-bit offset version,
+ per the Large File Support Extension when _LARGEFILE64_SOURCE is
+ defined; use the 64-bit versions by default when _FILE_OFFSET_BITS
+ is defined to be 64
+- Add a --uname= option to configure to perhaps help with cross-compiling
+
+Changes in 1.2.3.2 (3 September 2006)
+- Turn off silly Borland warnings Hay
+- Use off64_t and define _LARGEFILE64_SOURCE when present
+- Fix missing dependency on inffixed.h in Makefile.in
+- Rig configure --shared to build both shared and static Teredesai, Truta
+- Remove zconf.in.h and instead create a new zlibdefs.h file
+- Fix contrib/minizip/unzip.c non-encrypted after encrypted Vollant
+- Add treebuild.xml (see http://treebuild.metux.de/) Weigelt
+
+Changes in 1.2.3.1 (16 August 2006)
+- Add watcom directory with OpenWatcom make files Daniel
+- Remove #undef of FAR in zconf.in.h for MVS Fedtke
+- Update make_vms.com Zinser
+- Use -fPIC for shared build in configure Teredesai, Nicholson
+- Use only major version number for libz.so on IRIX and OSF1 Reinholdtsen
+- Use fdopen() (not _fdopen()) for Interix in zutil.h Bck
+- Add some FAQ entries about the contrib directory
+- Update the MVS question in the FAQ
+- Avoid extraneous reads after EOF in gzio.c Brown
+- Correct spelling of "successfully" in gzio.c Randers-Pehrson
+- Add comments to zlib.h about gzerror() usage Brown
+- Set extra flags in gzip header in gzopen() like deflate() does
+- Make configure options more compatible with double-dash conventions
+ Weigelt
+- Clean up compilation under Solaris SunStudio cc Rowe, Reinholdtsen
+- Fix uninstall target in Makefile.in Truta
+- Add pkgconfig support Weigelt
+- Use $(DESTDIR) macro in Makefile.in Reinholdtsen, Weigelt
+- Replace set_data_type() with a more accurate detect_data_type() in
+ trees.c, according to the txtvsbin.txt document Truta
+- Swap the order of #include <stdio.h> and #include "zlib.h" in
+ gzio.c, example.c and minigzip.c Truta
+- Shut up annoying VS2005 warnings about standard C deprecation Rowe,
+ Truta (where?)
+- Fix target "clean" from win32/Makefile.bor Truta
+- Create .pdb and .manifest files in win32/makefile.msc Ziegler, Rowe
+- Update zlib www home address in win32/DLL_FAQ.txt Truta
+- Update contrib/masmx86/inffas32.asm for VS2005 Vollant, Van Wassenhove
+- Enable browse info in the "Debug" and "ASM Debug" configurations in
+ the Visual C++ 6 project, and set (non-ASM) "Debug" as default Truta
+- Add pkgconfig support Weigelt
+- Add ZLIB_VER_MAJOR, ZLIB_VER_MINOR and ZLIB_VER_REVISION in zlib.h,
+ for use in win32/zlib1.rc Polushin, Rowe, Truta
+- Add a document that explains the new text detection scheme to
+ doc/txtvsbin.txt Truta
+- Add rfc1950.txt, rfc1951.txt and rfc1952.txt to doc/ Truta
+- Move algorithm.txt into doc/ Truta
+- Synchronize FAQ with website
+- Fix compressBound(), was low for some pathological cases Fearnley
+- Take into account wrapper variations in deflateBound()
+- Set examples/zpipe.c input and output to binary mode for Windows
+- Update examples/zlib_how.html with new zpipe.c (also web site)
+- Fix some warnings in examples/gzlog.c and examples/zran.c (it seems
+ that gcc became pickier in 4.0)
+- Add zlib.map for Linux: "All symbols from zlib-1.1.4 remain
+ un-versioned, the patch adds versioning only for symbols introduced in
+ zlib-1.2.0 or later. It also declares as local those symbols which are
+ not designed to be exported." Levin
+- Update Z_PREFIX list in zconf.in.h, add --zprefix option to configure
+- Do not initialize global static by default in trees.c, add a response
+ NO_INIT_GLOBAL_POINTERS to initialize them if needed Marquess
+- Don't use strerror() in gzio.c under WinCE Yakimov
+- Don't use errno.h in zutil.h under WinCE Yakimov
+- Move arguments for AR to its usage to allow replacing ar Marot
+- Add HAVE_VISIBILITY_PRAGMA in zconf.in.h for Mozilla Randers-Pehrson
+- Improve inflateInit() and inflateInit2() documentation
+- Fix structure size comment in inflate.h
+- Change configure help option from --h* to --help Santos
+
+Changes in 1.2.3 (18 July 2005)
+- Apply security vulnerability fixes to contrib/infback9 as well
+- Clean up some text files (carriage returns, trailing space)
+- Update testzlib, vstudio, masmx64, and masmx86 in contrib Vollant
+
+Changes in 1.2.2.4 (11 July 2005)
+- Add inflatePrime() function for starting inflation at bit boundary
+- Avoid some Visual C warnings in deflate.c
+- Avoid more silly Visual C warnings in inflate.c and inftrees.c for 64-bit
+ compile
+- Fix some spelling errors in comments Betts
+- Correct inflateInit2() error return documentation in zlib.h
+- Add zran.c example of compressed data random access to examples
+ directory, shows use of inflatePrime()
+- Fix cast for assignments to strm->state in inflate.c and infback.c
+- Fix zlibCompileFlags() in zutil.c to use 1L for long shifts Oberhumer
+- Move declarations of gf2 functions to right place in crc32.c Oberhumer
+- Add cast in trees.c t avoid a warning Oberhumer
+- Avoid some warnings in fitblk.c, gun.c, gzjoin.c in examples Oberhumer
+- Update make_vms.com Zinser
+- Initialize state->write in inflateReset() since copied in inflate_fast()
+- Be more strict on incomplete code sets in inflate_table() and increase
+ ENOUGH and MAXD -- this repairs a possible security vulnerability for
+ invalid inflate input. Thanks to Tavis Ormandy and Markus Oberhumer for
+ discovering the vulnerability and providing test cases.
+- Add ia64 support to configure for HP-UX Smith
+- Add error return to gzread() for format or i/o error Levin
+- Use malloc.h for OS/2 Necasek
+
+Changes in 1.2.2.3 (27 May 2005)
+- Replace 1U constants in inflate.c and inftrees.c for 64-bit compile
+- Typecast fread() return values in gzio.c Vollant
+- Remove trailing space in minigzip.c outmode (VC++ can't deal with it)
+- Fix crc check bug in gzread() after gzungetc() Heiner
+- Add the deflateTune() function to adjust internal compression parameters
+- Add a fast gzip decompressor, gun.c, to examples (use of inflateBack)
+- Remove an incorrect assertion in examples/zpipe.c
+- Add C++ wrapper in infback9.h Donais
+- Fix bug in inflateCopy() when decoding fixed codes
+- Note in zlib.h how much deflateSetDictionary() actually uses
+- Remove USE_DICT_HEAD in deflate.c (would mess up inflate if used)
+- Add _WIN32_WCE to define WIN32 in zconf.in.h Spencer
+- Don't include stderr.h or errno.h for _WIN32_WCE in zutil.h Spencer
+- Add gzdirect() function to indicate transparent reads
+- Update contrib/minizip Vollant
+- Fix compilation of deflate.c when both ASMV and FASTEST Oberhumer
+- Add casts in crc32.c to avoid warnings Oberhumer
+- Add contrib/masmx64 Vollant
+- Update contrib/asm586, asm686, masmx86, testzlib, vstudio Vollant
+
+Changes in 1.2.2.2 (30 December 2004)
+- Replace structure assignments in deflate.c and inflate.c with zmemcpy to
+ avoid implicit memcpy calls (portability for no-library compilation)
+- Increase sprintf() buffer size in gzdopen() to allow for large numbers
+- Add INFLATE_STRICT to check distances against zlib header
+- Improve WinCE errno handling and comments Chang
+- Remove comment about no gzip header processing in FAQ
+- Add Z_FIXED strategy option to deflateInit2() to force fixed trees
+- Add updated make_vms.com Coghlan, update README
+- Create a new "examples" directory, move gzappend.c there, add zpipe.c,
+ fitblk.c, gzlog.ch, gzjoin.c, and zlib_how.html.
+- Add FAQ entry and comments in deflate.c on uninitialized memory access
+- Add Solaris 9 make options in configure Gilbert
+- Allow strerror() usage in gzio.c for STDC
+- Fix DecompressBuf in contrib/delphi/ZLib.pas ManChesTer
+- Update contrib/masmx86/inffas32.asm and gvmat32.asm Vollant
+- Use z_off_t for adler32_combine() and crc32_combine() lengths
+- Make adler32() much faster for small len
+- Use OS_CODE in deflate() default gzip header
+
+Changes in 1.2.2.1 (31 October 2004)
+- Allow inflateSetDictionary() call for raw inflate
+- Fix inflate header crc check bug for file names and comments
+- Add deflateSetHeader() and gz_header structure for custom gzip headers
+- Add inflateGetheader() to retrieve gzip headers
+- Add crc32_combine() and adler32_combine() functions
+- Add alloc_func, free_func, in_func, out_func to Z_PREFIX list
+- Use zstreamp consistently in zlib.h (inflate_back functions)
+- Remove GUNZIP condition from definition of inflate_mode in inflate.h
+ and in contrib/inflate86/inffast.S Truta, Anderson
+- Add support for AMD64 in contrib/inflate86/inffas86.c Anderson
+- Update projects/README.projects and projects/visualc6 Truta
+- Update win32/DLL_FAQ.txt Truta
+- Avoid warning under NO_GZCOMPRESS in gzio.c; fix typo Truta
+- Deprecate Z_ASCII; use Z_TEXT instead Truta
+- Use a new algorithm for setting strm->data_type in trees.c Truta
+- Do not define an exit() prototype in zutil.c unless DEBUG defined
+- Remove prototype of exit() from zutil.c, example.c, minigzip.c Truta
+- Add comment in zlib.h for Z_NO_FLUSH parameter to deflate()
+- Fix Darwin build version identification Peterson
+
+Changes in 1.2.2 (3 October 2004)
+- Update zlib.h comments on gzip in-memory processing
+- Set adler to 1 in inflateReset() to support Java test suite Walles
+- Add contrib/dotzlib Ravn
+- Update win32/DLL_FAQ.txt Truta
+- Update contrib/minizip Vollant
+- Move contrib/visual-basic.txt to old/ Truta
+- Fix assembler builds in projects/visualc6/ Truta
+
+Changes in 1.2.1.2 (9 September 2004)
+- Update INDEX file
+- Fix trees.c to update strm->data_type (no one ever noticed!)
+- Fix bug in error case in inflate.c, infback.c, and infback9.c Brown
+- Add "volatile" to crc table flag declaration (for DYNAMIC_CRC_TABLE)
+- Add limited multitasking protection to DYNAMIC_CRC_TABLE
+- Add NO_vsnprintf for VMS in zutil.h Mozilla
+- Don't declare strerror() under VMS Mozilla
+- Add comment to DYNAMIC_CRC_TABLE to use get_crc_table() to initialize
+- Update contrib/ada Anisimkov
+- Update contrib/minizip Vollant
+- Fix configure to not hardcode directories for Darwin Peterson
+- Fix gzio.c to not return error on empty files Brown
+- Fix indentation; update version in contrib/delphi/ZLib.pas and
+ contrib/pascal/zlibpas.pas Truta
+- Update mkasm.bat in contrib/masmx86 Truta
+- Update contrib/untgz Truta
+- Add projects/README.projects Truta
+- Add project for MS Visual C++ 6.0 in projects/visualc6 Cadieux, Truta
+- Update win32/DLL_FAQ.txt Truta
+- Update list of Z_PREFIX symbols in zconf.h Randers-Pehrson, Truta
+- Remove an unnecessary assignment to curr in inftrees.c Truta
+- Add OS/2 to exe builds in configure Poltorak
+- Remove err dummy parameter in zlib.h Kientzle
+
+Changes in 1.2.1.1 (9 January 2004)
+- Update email address in README
+- Several FAQ updates
+- Fix a big fat bug in inftrees.c that prevented decoding valid
+ dynamic blocks with only literals and no distance codes --
+ Thanks to "Hot Emu" for the bug report and sample file
+- Add a note to puff.c on no distance codes case.
+
+Changes in 1.2.1 (17 November 2003)
+- Remove a tab in contrib/gzappend/gzappend.c
+- Update some interfaces in contrib for new zlib functions
+- Update zlib version number in some contrib entries
+- Add Windows CE definition for ptrdiff_t in zutil.h Mai, Truta
+- Support shared libraries on Hurd and KFreeBSD Brown
+- Fix error in NO_DIVIDE option of adler32.c
+
+Changes in 1.2.0.8 (4 November 2003)
+- Update version in contrib/delphi/ZLib.pas and contrib/pascal/zlibpas.pas
+- Add experimental NO_DIVIDE #define in adler32.c
+ - Possibly faster on some processors (let me know if it is)
+- Correct Z_BLOCK to not return on first inflate call if no wrap
+- Fix strm->data_type on inflate() return to correctly indicate EOB
+- Add deflatePrime() function for appending in the middle of a byte
+- Add contrib/gzappend for an example of appending to a stream
+- Update win32/DLL_FAQ.txt Truta
+- Delete Turbo C comment in README Truta
+- Improve some indentation in zconf.h Truta
+- Fix infinite loop on bad input in configure script Church
+- Fix gzeof() for concatenated gzip files Johnson
+- Add example to contrib/visual-basic.txt Michael B.
+- Add -p to mkdir's in Makefile.in vda
+- Fix configure to properly detect presence or lack of printf functions
+- Add AS400 support Monnerat
+- Add a little Cygwin support Wilson
+
+Changes in 1.2.0.7 (21 September 2003)
+- Correct some debug formats in contrib/infback9
+- Cast a type in a debug statement in trees.c
+- Change search and replace delimiter in configure from % to # Beebe
+- Update contrib/untgz to 0.2 with various fixes Truta
+- Add build support for Amiga Nikl
+- Remove some directories in old that have been updated to 1.2
+- Add dylib building for Mac OS X in configure and Makefile.in
+- Remove old distribution stuff from Makefile
+- Update README to point to DLL_FAQ.txt, and add comment on Mac OS X
+- Update links in README
+
+Changes in 1.2.0.6 (13 September 2003)
+- Minor FAQ updates
+- Update contrib/minizip to 1.00 Vollant
+- Remove test of gz functions in example.c when GZ_COMPRESS defined Truta
+- Update POSTINC comment for 68060 Nikl
+- Add contrib/infback9 with deflate64 decoding (unsupported)
+- For MVS define NO_vsnprintf and undefine FAR van Burik
+- Add pragma for fdopen on MVS van Burik
+
+Changes in 1.2.0.5 (8 September 2003)
+- Add OF to inflateBackEnd() declaration in zlib.h
+- Remember start when using gzdopen in the middle of a file
+- Use internal off_t counters in gz* functions to properly handle seeks
+- Perform more rigorous check for distance-too-far in inffast.c
+- Add Z_BLOCK flush option to return from inflate at block boundary
+- Set strm->data_type on return from inflate
+ - Indicate bits unused, if at block boundary, and if in last block
+- Replace size_t with ptrdiff_t in crc32.c, and check for correct size
+- Add condition so old NO_DEFLATE define still works for compatibility
+- FAQ update regarding the Windows DLL Truta
+- INDEX update: add qnx entry, remove aix entry Truta
+- Install zlib.3 into mandir Wilson
+- Move contrib/zlib_dll_FAQ.txt to win32/DLL_FAQ.txt; update Truta
+- Adapt the zlib interface to the new DLL convention guidelines Truta
+- Introduce ZLIB_WINAPI macro to allow the export of functions using
+ the WINAPI calling convention, for Visual Basic Vollant, Truta
+- Update msdos and win32 scripts and makefiles Truta
+- Export symbols by name, not by ordinal, in win32/zlib.def Truta
+- Add contrib/ada Anisimkov
+- Move asm files from contrib/vstudio/vc70_32 to contrib/asm386 Truta
+- Rename contrib/asm386 to contrib/masmx86 Truta, Vollant
+- Add contrib/masm686 Truta
+- Fix offsets in contrib/inflate86 and contrib/masmx86/inffas32.asm
+ Truta, Vollant
+- Update contrib/delphi; rename to contrib/pascal; add example Truta
+- Remove contrib/delphi2; add a new contrib/delphi Truta
+- Avoid inclusion of the nonstandard <memory.h> in contrib/iostream,
+ and fix some method prototypes Truta
+- Fix the ZCR_SEED2 constant to avoid warnings in contrib/minizip
+ Truta
+- Avoid the use of backslash (\) in contrib/minizip Vollant
+- Fix file time handling in contrib/untgz; update makefiles Truta
+- Update contrib/vstudio/vc70_32 to comply with the new DLL guidelines
+ Vollant
+- Remove contrib/vstudio/vc15_16 Vollant
+- Rename contrib/vstudio/vc70_32 to contrib/vstudio/vc7 Truta
+- Update README.contrib Truta
+- Invert the assignment order of match_head and s->prev... in
+ INSERT_STRING Truta
+- Compare TOO_FAR with 32767 instead of 32768, to avoid 16-bit warnings
+ Truta
+- Compare function pointers with 0, not with NULL or Z_NULL Truta
+- Fix prototype of syncsearch in inflate.c Truta
+- Introduce ASMINF macro to be enabled when using an ASM implementation
+ of inflate_fast Truta
+- Change NO_DEFLATE to NO_GZCOMPRESS Truta
+- Modify test_gzio in example.c to take a single file name as a
+ parameter Truta
+- Exit the example.c program if gzopen fails Truta
+- Add type casts around strlen in example.c Truta
+- Remove casting to sizeof in minigzip.c; give a proper type
+ to the variable compared with SUFFIX_LEN Truta
+- Update definitions of STDC and STDC99 in zconf.h Truta
+- Synchronize zconf.h with the new Windows DLL interface Truta
+- Use SYS16BIT instead of __32BIT__ to distinguish between
+ 16- and 32-bit platforms Truta
+- Use far memory allocators in small 16-bit memory models for
+ Turbo C Truta
+- Add info about the use of ASMV, ASMINF and ZLIB_WINAPI in
+ zlibCompileFlags Truta
+- Cygwin has vsnprintf Wilson
+- In Windows16, OS_CODE is 0, as in MSDOS Truta
+- In Cygwin, OS_CODE is 3 (Unix), not 11 (Windows32) Wilson
+
+Changes in 1.2.0.4 (10 August 2003)
+- Minor FAQ updates
+- Be more strict when checking inflateInit2's windowBits parameter
+- Change NO_GUNZIP compile option to NO_GZIP to cover deflate as well
+- Add gzip wrapper option to deflateInit2 using windowBits
+- Add updated QNX rule in configure and qnx directory Bonnefoy
+- Make inflate distance-too-far checks more rigorous
+- Clean up FAR usage in inflate
+- Add casting to sizeof() in gzio.c and minigzip.c
+
+Changes in 1.2.0.3 (19 July 2003)
+- Fix silly error in gzungetc() implementation Vollant
+- Update contrib/minizip and contrib/vstudio Vollant
+- Fix printf format in example.c
+- Correct cdecl support in zconf.in.h Anisimkov
+- Minor FAQ updates
+
+Changes in 1.2.0.2 (13 July 2003)
+- Add ZLIB_VERNUM in zlib.h for numerical preprocessor comparisons
+- Attempt to avoid warnings in crc32.c for pointer-int conversion
+- Add AIX to configure, remove aix directory Bakker
+- Add some casts to minigzip.c
+- Improve checking after insecure sprintf() or vsprintf() calls
+- Remove #elif's from crc32.c
+- Change leave label to inf_leave in inflate.c and infback.c to avoid
+ library conflicts
+- Remove inflate gzip decoding by default--only enable gzip decoding by
+ special request for stricter backward compatibility
+- Add zlibCompileFlags() function to return compilation information
+- More typecasting in deflate.c to avoid warnings
+- Remove leading underscore from _Capital #defines Truta
+- Fix configure to link shared library when testing
+- Add some Windows CE target adjustments Mai
+- Remove #define ZLIB_DLL in zconf.h Vollant
+- Add zlib.3 Rodgers
+- Update RFC URL in deflate.c and algorithm.txt Mai
+- Add zlib_dll_FAQ.txt to contrib Truta
+- Add UL to some constants Truta
+- Update minizip and vstudio Vollant
+- Remove vestigial NEED_DUMMY_RETURN from zconf.in.h
+- Expand use of NO_DUMMY_DECL to avoid all dummy structures
+- Added iostream3 to contrib Schwardt
+- Replace rewind() with fseek() for WinCE Truta
+- Improve setting of zlib format compression level flags
+ - Report 0 for huffman and rle strategies and for level == 0 or 1
+ - Report 2 only for level == 6
+- Only deal with 64K limit when necessary at compile time Truta
+- Allow TOO_FAR check to be turned off at compile time Truta
+- Add gzclearerr() function Souza
+- Add gzungetc() function
+
+Changes in 1.2.0.1 (17 March 2003)
+- Add Z_RLE strategy for run-length encoding Truta
+ - When Z_RLE requested, restrict matches to distance one
+ - Update zlib.h, minigzip.c, gzopen(), gzdopen() for Z_RLE
+- Correct FASTEST compilation to allow level == 0
+- Clean up what gets compiled for FASTEST
+- Incorporate changes to zconf.in.h Vollant
+ - Refine detection of Turbo C need for dummy returns
+ - Refine ZLIB_DLL compilation
+ - Include additional header file on VMS for off_t typedef
+- Try to use _vsnprintf where it supplants vsprintf Vollant
+- Add some casts in inffast.c
+- Enchance comments in zlib.h on what happens if gzprintf() tries to
+ write more than 4095 bytes before compression
+- Remove unused state from inflateBackEnd()
+- Remove exit(0) from minigzip.c, example.c
+- Get rid of all those darn tabs
+- Add "check" target to Makefile.in that does the same thing as "test"
+- Add "mostlyclean" and "maintainer-clean" targets to Makefile.in
+- Update contrib/inflate86 Anderson
+- Update contrib/testzlib, contrib/vstudio, contrib/minizip Vollant
+- Add msdos and win32 directories with makefiles Truta
+- More additions and improvements to the FAQ
+
+Changes in 1.2.0 (9 March 2003)
+- New and improved inflate code
+ - About 20% faster
+ - Does not allocate 32K window unless and until needed
+ - Automatically detects and decompresses gzip streams
+ - Raw inflate no longer needs an extra dummy byte at end
+ - Added inflateBack functions using a callback interface--even faster
+ than inflate, useful for file utilities (gzip, zip)
+ - Added inflateCopy() function to record state for random access on
+ externally generated deflate streams (e.g. in gzip files)
+ - More readable code (I hope)
+- New and improved crc32()
+ - About 50% faster, thanks to suggestions from Rodney Brown
+- Add deflateBound() and compressBound() functions
+- Fix memory leak in deflateInit2()
+- Permit setting dictionary for raw deflate (for parallel deflate)
+- Fix const declaration for gzwrite()
+- Check for some malloc() failures in gzio.c
+- Fix bug in gzopen() on single-byte file 0x1f
+- Fix bug in gzread() on concatenated file with 0x1f at end of buffer
+ and next buffer doesn't start with 0x8b
+- Fix uncompress() to return Z_DATA_ERROR on truncated input
+- Free memory at end of example.c
+- Remove MAX #define in trees.c (conflicted with some libraries)
+- Fix static const's in deflate.c, gzio.c, and zutil.ch
+- Declare malloc() and free() in gzio.c if STDC not defined
+- Use malloc() instead of calloc() in zutil.c if int big enough
+- Define STDC for AIX
+- Add aix/ with approach for compiling shared library on AIX
+- Add HP-UX support for shared libraries in configure
+- Add OpenUNIX support for shared libraries in configure
+- Use $cc instead of gcc to build shared library
+- Make prefix directory if needed when installing
+- Correct Macintosh avoidance of typedef Byte in zconf.h
+- Correct Turbo C memory allocation when under Linux
+- Use libz.a instead of -lz in Makefile (assure use of compiled library)
+- Update configure to check for snprintf or vsnprintf functions and their
+ return value, warn during make if using an insecure function
+- Fix configure problem with compile-time knowledge of HAVE_UNISTD_H that
+ is lost when library is used--resolution is to build new zconf.h
+- Documentation improvements (in zlib.h):
+ - Document raw deflate and inflate
+ - Update RFCs URL
+ - Point out that zlib and gzip formats are different
+ - Note that Z_BUF_ERROR is not fatal
+ - Document string limit for gzprintf() and possible buffer overflow
+ - Note requirement on avail_out when flushing
+ - Note permitted values of flush parameter of inflate()
+- Add some FAQs (and even answers) to the FAQ
+- Add contrib/inflate86/ for x86 faster inflate
+- Add contrib/blast/ for PKWare Data Compression Library decompression
+- Add contrib/puff/ simple inflate for deflate format description
+
+Changes in 1.1.4 (11 March 2002)
+- ZFREE was repeated on same allocation on some error conditions.
+ This creates a security problem described in
+ http://www.zlib.org/advisory-2002-03-11.txt
+- Returned incorrect error (Z_MEM_ERROR) on some invalid data
+- Avoid accesses before window for invalid distances with inflate window
+ less than 32K.
+- force windowBits > 8 to avoid a bug in the encoder for a window size
+ of 256 bytes. (A complete fix will be available in 1.1.5).
+
+Changes in 1.1.3 (9 July 1998)
+- fix "an inflate input buffer bug that shows up on rare but persistent
+ occasions" (Mark)
+- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
+- fix gzseek(..., SEEK_SET) in write mode
+- fix crc check after a gzeek (Frank Faubert)
+- fix miniunzip when the last entry in a zip file is itself a zip file
+ (J Lillge)
+- add contrib/asm586 and contrib/asm686 (Brian Raiter)
+ See http://www.muppetlabs.com/~breadbox/software/assembly.html
+- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
+- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
+- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
+- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
+- added a FAQ file
+
+- Support gzdopen on Mac with Metrowerks (Jason Linhart)
+- Do not redefine Byte on Mac (Brad Pettit & Jason Linhart)
+- define SEEK_END too if SEEK_SET is not defined (Albert Chin-A-Young)
+- avoid some warnings with Borland C (Tom Tanner)
+- fix a problem in contrib/minizip/zip.c for 16-bit MSDOS (Gilles Vollant)
+- emulate utime() for WIN32 in contrib/untgz (Gilles Vollant)
+- allow several arguments to configure (Tim Mooney, Frodo Looijaard)
+- use libdir and includedir in Makefile.in (Tim Mooney)
+- support shared libraries on OSF1 V4 (Tim Mooney)
+- remove so_locations in "make clean" (Tim Mooney)
+- fix maketree.c compilation error (Glenn, Mark)
+- Python interface to zlib now in Python 1.5 (Jeremy Hylton)
+- new Makefile.riscos (Rich Walker)
+- initialize static descriptors in trees.c for embedded targets (Nick Smith)
+- use "foo-gz" in example.c for RISCOS and VMS (Nick Smith)
+- add the OS/2 files in Makefile.in too (Andrew Zabolotny)
+- fix fdopen and halloc macros for Microsoft C 6.0 (Tom Lane)
+- fix maketree.c to allow clean compilation of inffixed.h (Mark)
+- fix parameter check in deflateCopy (Gunther Nikl)
+- cleanup trees.c, use compressed_len only in debug mode (Christian Spieler)
+- Many portability patches by Christian Spieler:
+ . zutil.c, zutil.h: added "const" for zmem*
+ . Make_vms.com: fixed some typos
+ . Make_vms.com: msdos/Makefile.*: removed zutil.h from some dependency lists
+ . msdos/Makefile.msc: remove "default rtl link library" info from obj files
+ . msdos/Makefile.*: use model-dependent name for the built zlib library
+ . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc:
+ new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT)
+- use define instead of typedef for Bytef also for MSC small/medium (Tom Lane)
+- replace __far with _far for better portability (Christian Spieler, Tom Lane)
+- fix test for errno.h in configure (Tim Newsham)
+
+Changes in 1.1.2 (19 March 98)
+- added contrib/minzip, mini zip and unzip based on zlib (Gilles Vollant)
+ See http://www.winimage.com/zLibDll/unzip.html
+- preinitialize the inflate tables for fixed codes, to make the code
+ completely thread safe (Mark)
+- some simplifications and slight speed-up to the inflate code (Mark)
+- fix gzeof on non-compressed files (Allan Schrum)
+- add -std1 option in configure for OSF1 to fix gzprintf (Martin Mokrejs)
+- use default value of 4K for Z_BUFSIZE for 16-bit MSDOS (Tim Wegner + Glenn)
+- added os2/Makefile.def and os2/zlib.def (Andrew Zabolotny)
+- add shared lib support for UNIX_SV4.2MP (MATSUURA Takanori)
+- do not wrap extern "C" around system includes (Tom Lane)
+- mention zlib binding for TCL in README (Andreas Kupries)
+- added amiga/Makefile.pup for Amiga powerUP SAS/C PPC (Andreas Kleinert)
+- allow "make install prefix=..." even after configure (Glenn Randers-Pehrson)
+- allow "configure --prefix $HOME" (Tim Mooney)
+- remove warnings in example.c and gzio.c (Glenn Randers-Pehrson)
+- move Makefile.sas to amiga/Makefile.sas
+
+Changes in 1.1.1 (27 Feb 98)
+- fix macros _tr_tally_* in deflate.h for debug mode (Glenn Randers-Pehrson)
+- remove block truncation heuristic which had very marginal effect for zlib
+ (smaller lit_bufsize than in gzip 1.2.4) and degraded a little the
+ compression ratio on some files. This also allows inlining _tr_tally for
+ matches in deflate_slow.
+- added msdos/Makefile.w32 for WIN32 Microsoft Visual C++ (Bob Frazier)
+
+Changes in 1.1.0 (24 Feb 98)
+- do not return STREAM_END prematurely in inflate (John Bowler)
+- revert to the zlib 1.0.8 inflate to avoid the gcc 2.8.0 bug (Jeremy Buhler)
+- compile with -DFASTEST to get compression code optimized for speed only
+- in minigzip, try mmap'ing the input file first (Miguel Albrecht)
+- increase size of I/O buffers in minigzip.c and gzio.c (not a big gain
+ on Sun but significant on HP)
+
+- add a pointer to experimental unzip library in README (Gilles Vollant)
+- initialize variable gcc in configure (Chris Herborth)
+
+Changes in 1.0.9 (17 Feb 1998)
+- added gzputs and gzgets functions
+- do not clear eof flag in gzseek (Mark Diekhans)
+- fix gzseek for files in transparent mode (Mark Diekhans)
+- do not assume that vsprintf returns the number of bytes written (Jens Krinke)
+- replace EXPORT with ZEXPORT to avoid conflict with other programs
+- added compress2 in zconf.h, zlib.def, zlib.dnt
+- new asm code from Gilles Vollant in contrib/asm386
+- simplify the inflate code (Mark):
+ . Replace ZALLOC's in huft_build() with single ZALLOC in inflate_blocks_new()
+ . ZALLOC the length list in inflate_trees_fixed() instead of using stack
+ . ZALLOC the value area for huft_build() instead of using stack
+ . Simplify Z_FINISH check in inflate()
+
+- Avoid gcc 2.8.0 comparison bug a little differently than zlib 1.0.8
+- in inftrees.c, avoid cc -O bug on HP (Farshid Elahi)
+- in zconf.h move the ZLIB_DLL stuff earlier to avoid problems with
+ the declaration of FAR (Gilles VOllant)
+- install libz.so* with mode 755 (executable) instead of 644 (Marc Lehmann)
+- read_buf buf parameter of type Bytef* instead of charf*
+- zmemcpy parameters are of type Bytef*, not charf* (Joseph Strout)
+- do not redeclare unlink in minigzip.c for WIN32 (John Bowler)
+- fix check for presence of directories in "make install" (Ian Willis)
+
+Changes in 1.0.8 (27 Jan 1998)
+- fixed offsets in contrib/asm386/gvmat32.asm (Gilles Vollant)
+- fix gzgetc and gzputc for big endian systems (Markus Oberhumer)
+- added compress2() to allow setting the compression level
+- include sys/types.h to get off_t on some systems (Marc Lehmann & QingLong)
+- use constant arrays for the static trees in trees.c instead of computing
+ them at run time (thanks to Ken Raeburn for this suggestion). To create
+ trees.h, compile with GEN_TREES_H and run "make test".
+- check return code of example in "make test" and display result
+- pass minigzip command line options to file_compress
+- simplifying code of inflateSync to avoid gcc 2.8 bug
+
+- support CC="gcc -Wall" in configure -s (QingLong)
+- avoid a flush caused by ftell in gzopen for write mode (Ken Raeburn)
+- fix test for shared library support to avoid compiler warnings
+- zlib.lib -> zlib.dll in msdos/zlib.rc (Gilles Vollant)
+- check for TARGET_OS_MAC in addition to MACOS (Brad Pettit)
+- do not use fdopen for Metrowerks on Mac (Brad Pettit))
+- add checks for gzputc and gzputc in example.c
+- avoid warnings in gzio.c and deflate.c (Andreas Kleinert)
+- use const for the CRC table (Ken Raeburn)
+- fixed "make uninstall" for shared libraries
+- use Tracev instead of Trace in infblock.c
+- in example.c use correct compressed length for test_sync
+- suppress +vnocompatwarnings in configure for HPUX (not always supported)
+
+Changes in 1.0.7 (20 Jan 1998)
+- fix gzseek which was broken in write mode
+- return error for gzseek to negative absolute position
+- fix configure for Linux (Chun-Chung Chen)
+- increase stack space for MSC (Tim Wegner)
+- get_crc_table and inflateSyncPoint are EXPORTed (Gilles Vollant)
+- define EXPORTVA for gzprintf (Gilles Vollant)
+- added man page zlib.3 (Rick Rodgers)
+- for contrib/untgz, fix makedir() and improve Makefile
+
+- check gzseek in write mode in example.c
+- allocate extra buffer for seeks only if gzseek is actually called
+- avoid signed/unsigned comparisons (Tim Wegner, Gilles Vollant)
+- add inflateSyncPoint in zconf.h
+- fix list of exported functions in nt/zlib.dnt and mdsos/zlib.def
+
+Changes in 1.0.6 (19 Jan 1998)
+- add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and
+ gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code)
+- Fix a deflate bug occurring only with compression level 0 (thanks to
+ Andy Buckler for finding this one).
+- In minigzip, pass transparently also the first byte for .Z files.
+- return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress()
+- check Z_FINISH in inflate (thanks to Marc Schluper)
+- Implement deflateCopy (thanks to Adam Costello)
+- make static libraries by default in configure, add --shared option.
+- move MSDOS or Windows specific files to directory msdos
+- suppress the notion of partial flush to simplify the interface
+ (but the symbol Z_PARTIAL_FLUSH is kept for compatibility with 1.0.4)
+- suppress history buffer provided by application to simplify the interface
+ (this feature was not implemented anyway in 1.0.4)
+- next_in and avail_in must be initialized before calling inflateInit or
+ inflateInit2
+- add EXPORT in all exported functions (for Windows DLL)
+- added Makefile.nt (thanks to Stephen Williams)
+- added the unsupported "contrib" directory:
+ contrib/asm386/ by Gilles Vollant <info@winimage.com>
+ 386 asm code replacing longest_match().
+ contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
+ A C++ I/O streams interface to the zlib gz* functions
+ contrib/iostream2/ by Tyge Løvset <Tyge.Lovset@cmr.no>
+ Another C++ I/O streams interface
+ contrib/untgz/ by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
+ A very simple tar.gz file extractor using zlib
+ contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
+ How to use compress(), uncompress() and the gz* functions from VB.
+- pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
+ level) in minigzip (thanks to Tom Lane)
+
+- use const for rommable constants in deflate
+- added test for gzseek and gztell in example.c
+- add undocumented function inflateSyncPoint() (hack for Paul Mackerras)
+- add undocumented function zError to convert error code to string
+ (for Tim Smithers)
+- Allow compilation of gzio with -DNO_DEFLATE to avoid the compression code.
+- Use default memcpy for Symantec MSDOS compiler.
+- Add EXPORT keyword for check_func (needed for Windows DLL)
+- add current directory to LD_LIBRARY_PATH for "make test"
+- create also a link for libz.so.1
+- added support for FUJITSU UXP/DS (thanks to Toshiaki Nomura)
+- use $(SHAREDLIB) instead of libz.so in Makefile.in (for HPUX)
+- added -soname for Linux in configure (Chun-Chung Chen,
+- assign numbers to the exported functions in zlib.def (for Windows DLL)
+- add advice in zlib.h for best usage of deflateSetDictionary
+- work around compiler bug on Atari (cast Z_NULL in call of s->checkfn)
+- allow compilation with ANSI keywords only enabled for TurboC in large model
+- avoid "versionString"0 (Borland bug)
+- add NEED_DUMMY_RETURN for Borland
+- use variable z_verbose for tracing in debug mode (L. Peter Deutsch).
+- allow compilation with CC
+- defined STDC for OS/2 (David Charlap)
+- limit external names to 8 chars for MVS (Thomas Lund)
+- in minigzip.c, use static buffers only for 16-bit systems
+- fix suffix check for "minigzip -d foo.gz"
+- do not return an error for the 2nd of two consecutive gzflush() (Felix Lee)
+- use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau)
+- added makelcc.bat for lcc-win32 (Tom St Denis)
+- in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe)
+- Avoid expanded $Id$. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion.
+- check for unistd.h in configure (for off_t)
+- remove useless check parameter in inflate_blocks_free
+- avoid useless assignment of s->check to itself in inflate_blocks_new
+- do not flush twice in gzclose (thanks to Ken Raeburn)
+- rename FOPEN as F_OPEN to avoid clash with /usr/include/sys/file.h
+- use NO_ERRNO_H instead of enumeration of operating systems with errno.h
+- work around buggy fclose on pipes for HP/UX
+- support zlib DLL with BORLAND C++ 5.0 (thanks to Glenn Randers-Pehrson)
+- fix configure if CC is already equal to gcc
+
+Changes in 1.0.5 (3 Jan 98)
+- Fix inflate to terminate gracefully when fed corrupted or invalid data
+- Use const for rommable constants in inflate
+- Eliminate memory leaks on error conditions in inflate
+- Removed some vestigial code in inflate
+- Update web address in README
+
+Changes in 1.0.4 (24 Jul 96)
+- In very rare conditions, deflate(s, Z_FINISH) could fail to produce an EOF
+ bit, so the decompressor could decompress all the correct data but went
+ on to attempt decompressing extra garbage data. This affected minigzip too.
+- zlibVersion and gzerror return const char* (needed for DLL)
+- port to RISCOS (no fdopen, no multiple dots, no unlink, no fileno)
+- use z_error only for DEBUG (avoid problem with DLLs)
+
+Changes in 1.0.3 (2 Jul 96)
+- use z_streamp instead of z_stream *, which is now a far pointer in MSDOS
+ small and medium models; this makes the library incompatible with previous
+ versions for these models. (No effect in large model or on other systems.)
+- return OK instead of BUF_ERROR if previous deflate call returned with
+ avail_out as zero but there is nothing to do
+- added memcmp for non STDC compilers
+- define NO_DUMMY_DECL for more Mac compilers (.h files merged incorrectly)
+- define __32BIT__ if __386__ or i386 is defined (pb. with Watcom and SCO)
+- better check for 16-bit mode MSC (avoids problem with Symantec)
+
+Changes in 1.0.2 (23 May 96)
+- added Windows DLL support
+- added a function zlibVersion (for the DLL support)
+- fixed declarations using Bytef in infutil.c (pb with MSDOS medium model)
+- Bytef is define's instead of typedef'd only for Borland C
+- avoid reading uninitialized memory in example.c
+- mention in README that the zlib format is now RFC1950
+- updated Makefile.dj2
+- added algorithm.doc
+
+Changes in 1.0.1 (20 May 96) 1.0 skipped to avoid confusion
+- fix array overlay in deflate.c which sometimes caused bad compressed data
+- fix inflate bug with empty stored block
+- fix MSDOS medium model which was broken in 0.99
+- fix deflateParams() which could generated bad compressed data.
+- Bytef is define'd instead of typedef'ed (work around Borland bug)
+- added an INDEX file
+- new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
+ Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
+- speed up adler32 for modern machines without auto-increment
+- added -ansi for IRIX in configure
+- static_init_done in trees.c is an int
+- define unlink as delete for VMS
+- fix configure for QNX
+- add configure branch for SCO and HPUX
+- avoid many warnings (unused variables, dead assignments, etc...)
+- no fdopen for BeOS
+- fix the Watcom fix for 32 bit mode (define FAR as empty)
+- removed redefinition of Byte for MKWERKS
+- work around an MWKERKS bug (incorrect merge of all .h files)
+
+Changes in 0.99 (27 Jan 96)
+- allow preset dictionary shared between compressor and decompressor
+- allow compression level 0 (no compression)
+- add deflateParams in zlib.h: allow dynamic change of compression level
+ and compression strategy.
+- test large buffers and deflateParams in example.c
+- add optional "configure" to build zlib as a shared library
+- suppress Makefile.qnx, use configure instead
+- fixed deflate for 64-bit systems (detected on Cray)
+- fixed inflate_blocks for 64-bit systems (detected on Alpha)
+- declare Z_DEFLATED in zlib.h (possible parameter for deflateInit2)
+- always return Z_BUF_ERROR when deflate() has nothing to do
+- deflateInit and inflateInit are now macros to allow version checking
+- prefix all global functions and types with z_ with -DZ_PREFIX
+- make falloc completely reentrant (inftrees.c)
+- fixed very unlikely race condition in ct_static_init
+- free in reverse order of allocation to help memory manager
+- use zlib-1.0/* instead of zlib/* inside the tar.gz
+- make zlib warning-free with "gcc -O3 -Wall -Wwrite-strings -Wpointer-arith
+ -Wconversion -Wstrict-prototypes -Wmissing-prototypes"
+- allow gzread on concatenated .gz files
+- deflateEnd now returns Z_DATA_ERROR if it was premature
+- deflate is finally (?) fully deterministic (no matches beyond end of input)
+- Document Z_SYNC_FLUSH
+- add uninstall in Makefile
+- Check for __cpluplus in zlib.h
+- Better test in ct_align for partial flush
+- avoid harmless warnings for Borland C++
+- initialize hash_head in deflate.c
+- avoid warning on fdopen (gzio.c) for HP cc -Aa
+- include stdlib.h for STDC compilers
+- include errno.h for Cray
+- ignore error if ranlib doesn't exist
+- call ranlib twice for NeXTSTEP
+- use exec_prefix instead of prefix for libz.a
+- renamed ct_* as _tr_* to avoid conflict with applications
+- clear z->msg in inflateInit2 before any error return
+- initialize opaque in example.c, gzio.c, deflate.c and inflate.c
+- fixed typo in zconf.h (_GNUC__ => __GNUC__)
+- check for WIN32 in zconf.h and zutil.c (avoid farmalloc in 32-bit mode)
+- fix typo in Make_vms.com (f$trnlnm -> f$getsyi)
+- in fcalloc, normalize pointer if size > 65520 bytes
+- don't use special fcalloc for 32 bit Borland C++
+- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc...
+- use Z_BINARY instead of BINARY
+- document that gzclose after gzdopen will close the file
+- allow "a" as mode in gzopen.
+- fix error checking in gzread
+- allow skipping .gz extra-field on pipes
+- added reference to Perl interface in README
+- put the crc table in FAR data (I dislike more and more the medium model :)
+- added get_crc_table
+- added a dimension to all arrays (Borland C can't count).
+- workaround Borland C bug in declaration of inflate_codes_new & inflate_fast
+- guard against multiple inclusion of *.h (for precompiled header on Mac)
+- Watcom C pretends to be Microsoft C small model even in 32 bit mode.
+- don't use unsized arrays to avoid silly warnings by Visual C++:
+ warning C4746: 'inflate_mask' : unsized array treated as '__far'
+ (what's wrong with far data in far model?).
+- define enum out of inflate_blocks_state to allow compilation with C++
+
+Changes in 0.95 (16 Aug 95)
+- fix MSDOS small and medium model (now easier to adapt to any compiler)
+- inlined send_bits
+- fix the final (:-) bug for deflate with flush (output was correct but
+ not completely flushed in rare occasions).
+- default window size is same for compression and decompression
+ (it's now sufficient to set MAX_WBITS in zconf.h).
+- voidp -> voidpf and voidnp -> voidp (for consistency with other
+ typedefs and because voidnp was not near in large model).
+
+Changes in 0.94 (13 Aug 95)
+- support MSDOS medium model
+- fix deflate with flush (could sometimes generate bad output)
+- fix deflateReset (zlib header was incorrectly suppressed)
+- added support for VMS
+- allow a compression level in gzopen()
+- gzflush now calls fflush
+- For deflate with flush, flush even if no more input is provided.
+- rename libgz.a as libz.a
+- avoid complex expression in infcodes.c triggering Turbo C bug
+- work around a problem with gcc on Alpha (in INSERT_STRING)
+- don't use inline functions (problem with some gcc versions)
+- allow renaming of Byte, uInt, etc... with #define.
+- avoid warning about (unused) pointer before start of array in deflate.c
+- avoid various warnings in gzio.c, example.c, infblock.c, adler32.c, zutil.c
+- avoid reserved word 'new' in trees.c
+
+Changes in 0.93 (25 June 95)
+- temporarily disable inline functions
+- make deflate deterministic
+- give enough lookahead for PARTIAL_FLUSH
+- Set binary mode for stdin/stdout in minigzip.c for OS/2
+- don't even use signed char in inflate (not portable enough)
+- fix inflate memory leak for segmented architectures
+
+Changes in 0.92 (3 May 95)
+- don't assume that char is signed (problem on SGI)
+- Clear bit buffer when starting a stored block
+- no memcpy on Pyramid
+- suppressed inftest.c
+- optimized fill_window, put longest_match inline for gcc
+- optimized inflate on stored blocks.
+- untabify all sources to simplify patches
+
+Changes in 0.91 (2 May 95)
+- Default MEM_LEVEL is 8 (not 9 for Unix) as documented in zlib.h
+- Document the memory requirements in zconf.h
+- added "make install"
+- fix sync search logic in inflateSync
+- deflate(Z_FULL_FLUSH) now works even if output buffer too short
+- after inflateSync, don't scare people with just "lo world"
+- added support for DJGPP
+
+Changes in 0.9 (1 May 95)
+- don't assume that zalloc clears the allocated memory (the TurboC bug
+ was Mark's bug after all :)
+- let again gzread copy uncompressed data unchanged (was working in 0.71)
+- deflate(Z_FULL_FLUSH), inflateReset and inflateSync are now fully implemented
+- added a test of inflateSync in example.c
+- moved MAX_WBITS to zconf.h because users might want to change that.
+- document explicitly that zalloc(64K) on MSDOS must return a normalized
+ pointer (zero offset)
+- added Makefiles for Microsoft C, Turbo C, Borland C++
+- faster crc32()
+
+Changes in 0.8 (29 April 95)
+- added fast inflate (inffast.c)
+- deflate(Z_FINISH) now returns Z_STREAM_END when done. Warning: this
+ is incompatible with previous versions of zlib which returned Z_OK.
+- work around a TurboC compiler bug (bad code for b << 0, see infutil.h)
+ (actually that was not a compiler bug, see 0.81 above)
+- gzread no longer reads one extra byte in certain cases
+- In gzio destroy(), don't reference a freed structure
+- avoid many warnings for MSDOS
+- avoid the ERROR symbol which is used by MS Windows
+
+Changes in 0.71 (14 April 95)
+- Fixed more MSDOS compilation problems :( There is still a bug with
+ TurboC large model.
+
+Changes in 0.7 (14 April 95)
+- Added full inflate support.
+- Simplified the crc32() interface. The pre- and post-conditioning
+ (one's complement) is now done inside crc32(). WARNING: this is
+ incompatible with previous versions; see zlib.h for the new usage.
+
+Changes in 0.61 (12 April 95)
+- workaround for a bug in TurboC. example and minigzip now work on MSDOS.
+
+Changes in 0.6 (11 April 95)
+- added minigzip.c
+- added gzdopen to reopen a file descriptor as gzFile
+- added transparent reading of non-gziped files in gzread.
+- fixed bug in gzread (don't read crc as data)
+- fixed bug in destroy (gzio.c) (don't return Z_STREAM_END for gzclose).
+- don't allocate big arrays in the stack (for MSDOS)
+- fix some MSDOS compilation problems
+
+Changes in 0.5:
+- do real compression in deflate.c. Z_PARTIAL_FLUSH is supported but
+ not yet Z_FULL_FLUSH.
+- support decompression but only in a single step (forced Z_FINISH)
+- added opaque object for zalloc and zfree.
+- added deflateReset and inflateReset
+- added a variable zlib_version for consistency checking.
+- renamed the 'filter' parameter of deflateInit2 as 'strategy'.
+ Added Z_FILTERED and Z_HUFFMAN_ONLY constants.
+
+Changes in 0.4:
+- avoid "zip" everywhere, use zlib instead of ziplib.
+- suppress Z_BLOCK_FLUSH, interpret Z_PARTIAL_FLUSH as block flush
+ if compression method == 8.
+- added adler32 and crc32
+- renamed deflateOptions as deflateInit2, call one or the other but not both
+- added the method parameter for deflateInit2.
+- added inflateInit2
+- simplied considerably deflateInit and inflateInit by not supporting
+ user-provided history buffer. This is supported only in deflateInit2
+ and inflateInit2.
+
+Changes in 0.3:
+- prefix all macro names with Z_
+- use Z_FINISH instead of deflateEnd to finish compression.
+- added Z_HUFFMAN_ONLY
+- added gzerror()

smplayer-0.8.1.tar.bz2/zlib/FAQ Changed

smplayer-0.8.1.tar.bz2/zlib/INDEX Added

@@ -0,0 +1,68 @@
+CMakeLists.txt  cmake build file
+ChangeLog       history of changes
+FAQ             Frequently Asked Questions about zlib
+INDEX           this file
+Makefile        dummy Makefile that tells you to ./configure
+Makefile.in     template for Unix Makefile
+README          guess what
+configure       configure script for Unix
+make_vms.com    makefile for VMS
+test/example.c  zlib usages examples for build testing
+test/minigzip.c minimal gzip-like functionality for build testing
+test/infcover.c inf*.c code coverage for build coverage testing
+treebuild.xml   XML description of source file dependencies
+zconf.h.cmakein zconf.h template for cmake
+zconf.h.in      zconf.h template for configure
+zlib.3          Man page for zlib
+zlib.3.pdf      Man page in PDF format
+zlib.map        Linux symbol information
+zlib.pc.in      Template for pkg-config descriptor
+zlib.pc.cmakein zlib.pc template for cmake
+zlib2ansi       perl script to convert source files for C++ compilation
+
+amiga/          makefiles for Amiga SAS C
+as400/          makefiles for AS/400
+doc/            documentation for formats and algorithms
+msdos/          makefiles for MSDOS
+nintendods/     makefile for Nintendo DS
+old/            makefiles for various architectures and zlib documentation
+                files that have not yet been updated for zlib 1.2.x
+qnx/            makefiles for QNX
+watcom/         makefiles for OpenWatcom
+win32/          makefiles for Windows
+
+                zlib public header files (required for library use):
+zconf.h
+zlib.h
+
+                private source files used to build the zlib library:
+adler32.c
+compress.c
+crc32.c
+crc32.h
+deflate.c
+deflate.h
+gzclose.c
+gzguts.h
+gzlib.c
+gzread.c
+gzwrite.c
+infback.c
+inffast.c
+inffast.h
+inffixed.h
+inflate.c
+inflate.h
+inftrees.c
+inftrees.h
+trees.c
+trees.h
+uncompr.c
+zutil.c
+zutil.h
+
+                source files for sample programs
+See examples/README.examples
+
+                unsupported contributions by third parties
+See contrib/README.contrib

smplayer-0.8.1.tar.bz2/zlib/Makefile Changed

smplayer-0.8.1.tar.bz2/zlib/Makefile.in Added

@@ -0,0 +1,288 @@
+# Makefile for zlib
+# Copyright (C) 1995-2011 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile and test, type:
+# ./configure; make test
+# Normally configure builds both a static and a shared library.
+# If you want to build just a static library, use: ./configure --static
+
+# To use the asm code, type:
+# cp contrib/asm?86/match.S ./match.S
+# make LOC=-DASMV OBJA=match.o
+
+# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
+# make install
+# To install in $HOME instead of /usr/local, use:
+# make install prefix=$HOME
+
+CC=cc
+
+CFLAGS=-O
+#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#CFLAGS=-g -DDEBUG
+#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+# -Wstrict-prototypes -Wmissing-prototypes
+
+SFLAGS=-O
+LDFLAGS=
+TEST_LDFLAGS=-L. libz.a
+LDSHARED=$(CC)
+CPP=$(CC) -E
+
+STATICLIB=libz.a
+SHAREDLIB=libz.so
+SHAREDLIBV=libz.so.1.2.7
+SHAREDLIBM=libz.so.1
+LIBS=$(STATICLIB) $(SHAREDLIBV)
+
+AR=ar
+ARFLAGS=rc
+RANLIB=ranlib
+LDCONFIG=ldconfig
+LDSHAREDLIBC=-lc
+TAR=tar
+SHELL=/bin/sh
+EXE=
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+libdir = ${exec_prefix}/lib
+sharedlibdir = ${libdir}
+includedir = ${prefix}/include
+mandir = ${prefix}/share/man
+man3dir = ${mandir}/man3
+pkgconfigdir = ${libdir}/pkgconfig
+
+OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
+OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
+OBJC = $(OBJZ) $(OBJG)
+
+PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
+PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
+PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
+
+# to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
+OBJA =
+PIC_OBJA =
+
+OBJS = $(OBJC) $(OBJA)
+
+PIC_OBJS = $(PIC_OBJC) $(PIC_OBJA)
+
+all: static shared
+
+static: example$(EXE) minigzip$(EXE)
+
+shared: examplesh$(EXE) minigzipsh$(EXE)
+
+all64: example64$(EXE) minigzip64$(EXE)
+
+check: test
+
+test: all teststatic testshared
+
+teststatic: static
+	@TMPST=`mktemp fooXXXXXX`; \
+	if echo hello world | ./minigzip | ./minigzip -d && ./example $$TMPST ; then \
+	 echo '		*** zlib test OK ***'; \
+	else \
+	 echo '		*** zlib test FAILED ***'; false; \
+	fi; \
+	rm -f $$TMPST
+
+testshared: shared
+	@LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
+	LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \
+	DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
+	SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
+	TMPSH=`mktemp fooXXXXXX`; \
+	if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh $$TMPSH; then \
+	 echo '		*** zlib shared test OK ***'; \
+	else \
+	 echo '		*** zlib shared test FAILED ***'; false; \
+	fi; \
+	rm -f $$TMPSH
+
+test64: all64
+	@TMP64=`mktemp fooXXXXXX`; \
+	if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \
+	 echo '		*** zlib 64-bit test OK ***'; \
+	else \
+	 echo '		*** zlib 64-bit test FAILED ***'; false; \
+	fi; \
+	rm -f $$TMP64
+
+infcover.o: test/infcover.c zlib.h zconf.h
+	$(CC) $(CFLAGS) -I. -c -o $@ test/infcover.c
+
+infcover: infcover.o libz.a
+	$(CC) $(CFLAGS) -o $@ infcover.o libz.a
+
+cover: infcover
+	rm -f *.gcda
+	./infcover
+	gcov inf*.c
+
+libz.a: $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
+	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
+
+match.o: match.S
+	$(CPP) match.S > _match.s
+	$(CC) -c _match.s
+	mv _match.o match.o
+	rm -f _match.s
+
+match.lo: match.S
+	$(CPP) match.S > _match.s
+	$(CC) -c -fPIC _match.s
+	mv _match.o match.lo
+	rm -f _match.s
+
+example.o: test/example.c zlib.h zconf.h
+	$(CC) $(CFLAGS) -I. -c -o $@ test/example.c
+
+minigzip.o: test/minigzip.c zlib.h zconf.h
+	$(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c
+
+example64.o: test/example.c zlib.h zconf.h
+	$(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/example.c
+
+minigzip64.o: test/minigzip.c zlib.h zconf.h
+	$(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/minigzip.c
+
+.SUFFIXES: .lo
+
+.c.lo:
+	-@mkdir objs 2>/dev/null || test -d objs
+	$(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $<
+	-@mv objs/$*.o $@
+
+placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
+	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
+	rm -f $(SHAREDLIB) $(SHAREDLIBM)
+	ln -s $@ $(SHAREDLIB)
+	ln -s $@ $(SHAREDLIBM)
+	-@rmdir objs
+
+example$(EXE): example.o $(STATICLIB)
+	$(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
+
+minigzip$(EXE): minigzip.o $(STATICLIB)
+	$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
+
+examplesh$(EXE): example.o $(SHAREDLIBV)
+	$(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
+
+minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
+	$(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
+
+example64$(EXE): example64.o $(STATICLIB)
+	$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
+
+minigzip64$(EXE): minigzip64.o $(STATICLIB)
+	$(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
+
+install-libs: $(LIBS)
+	-@if ! -d $(DESTDIR)$(exec_prefix) ; then mkdir -p $(DESTDIR)$(exec_prefix); fi
+	-@if ! -d $(DESTDIR)$(libdir) ; then mkdir -p $(DESTDIR)$(libdir); fi
+	-@if ! -d $(DESTDIR)$(sharedlibdir) ; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
+	-@if ! -d $(DESTDIR)$(man3dir) ; then mkdir -p $(DESTDIR)$(man3dir); fi
+	-@if ! -d $(DESTDIR)$(pkgconfigdir) ; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+	cp $(STATICLIB) $(DESTDIR)$(libdir)
+	chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
+	-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
+	-@if test -n "$(SHAREDLIBV)"; then \
+	 cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
+	 echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
+	 chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
+	 echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
+	 rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+	 ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
+	 ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
+	 ($(LDCONFIG) || true) >/dev/null 2>&1; \
+	fi
+	cp zlib.3 $(DESTDIR)$(man3dir)
+	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
+	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
+	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
+# The ranlib in install is needed on NeXTSTEP which checks file times
+# ldconfig is for Linux
+
+install: install-libs
+	-@if ! -d $(DESTDIR)$(includedir) ; then mkdir -p $(DESTDIR)$(includedir); fi
+	cp zlib.h zconf.h $(DESTDIR)$(includedir)
+	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
+
+uninstall:
+	cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h
+	cd $(DESTDIR)$(libdir); rm -f libz.a; \
+	if test -n "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
+	 rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
+	fi
+	cd $(DESTDIR)$(man3dir); rm -f zlib.3
+	cd $(DESTDIR)$(pkgconfigdir); rm -f zlib.pc
+
+docs: zlib.3.pdf
+
+zlib.3.pdf: zlib.3
+	groff -mandoc -f H -T ps zlib.3 | ps2pdf - zlib.3.pdf
+
+zconf.h.cmakein: zconf.h.in
+	-@ TEMPFILE=`mktemp __XXXXXX`; \
+	echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\
+	sed -f $$TEMPFILE zconf.h.in > zconf.h.cmakein &&\
+	touch -r zconf.h.in zconf.h.cmakein &&\
+	rm $$TEMPFILE
+
+zconf: zconf.h.in
+	cp -p zconf.h.in zconf.h
+
+mostlyclean: clean
+clean:
+	rm -f *.o *.lo *~ \
+	 example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
+	 example64$(EXE) minigzip64$(EXE) \
+	 infcover \
+	 libz.* foo.gz so_locations \
+	 _match.s maketree contrib/infback9/*.o
+	rm -rf objs
+	rm -f *.gcda *.gcno *.gcov
+	rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov
+
+maintainer-clean: distclean
+distclean: clean zconf zconf.h.cmakein docs
+	rm -f Makefile zlib.pc configure.log
+	-@rm -f .DS_Store
+	-@printf 'all:\n\t-@echo "Please use ./configure first. Thank you."\n' > Makefile
+	-@printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile
+	-@touch -r Makefile.in Makefile
+
+tags:
+	etags *.ch
+
+depend:
+	makedepend -- $(CFLAGS) -- *.ch
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+adler32.o zutil.o: zutil.h zlib.h zconf.h
+gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h
+compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h
+crc32.o: zutil.h zlib.h zconf.h crc32.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+infback.o inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
+
+adler32.lo zutil.lo: zutil.h zlib.h zconf.h
+gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h
+compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h
+crc32.lo: zutil.h zlib.h zconf.h crc32.h
+deflate.lo: deflate.h zutil.h zlib.h zconf.h
+infback.lo inflate.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
+inffast.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inftrees.lo: zutil.h zlib.h zconf.h inftrees.h
+trees.lo: deflate.h zutil.h zlib.h zconf.h trees.h

smplayer-0.8.1.tar.bz2/zlib/README Added

@@ -0,0 +1,115 @@
+ZLIB DATA COMPRESSION LIBRARY
+
+zlib 1.2.7 is a general purpose data compression library. All the code is
+thread safe. The data format used by the zlib library is described by RFCs
+(Request for Comments) 1950 to 1952 in the files
+http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
+rfc1952 (gzip format).
+
+All functions of the compression library are documented in the file zlib.h
+(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example
+of the library is given in the file test/example.c which also tests that
+the library is working correctly. Another example is given in the file
+test/minigzip.c. The compression library itself is composed of all source
+files in the root directory.
+
+To compile all files and run the test program, follow the instructions given at
+the top of Makefile.in. In short "./configure; make test", and if that goes
+well, "make install" should work for most flavors of Unix. For Windows, use
+one of the special makefiles in win32/ or contrib/vstudio/ . For VMS, use
+make_vms.com.
+
+Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant
+<info@winimage.com> for the Windows DLL version. The zlib home page is
+http://zlib.net/ . Before reporting a problem, please check this site to
+verify that you have the latest version of zlib; otherwise get the latest
+version and check whether the problem still exists or not.
+
+PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
+
+Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
+issue of Dr. Dobb's Journal; a copy of the article is available at
+http://marknelson.us/1997/01/01/zlib-engine/ .
+
+The changes made in version 1.2.7 are documented in the file ChangeLog.
+
+Unsupported third party contributions are provided in directory contrib/ .
+
+zlib is available in Java using the java.util.zip package, documented at
+http://java.sun.com/developer/technicalArticles/Programming/compression/ .
+
+A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available
+at CPAN (Comprehensive Perl Archive Network) sites, including
+http://search.cpan.org/~pmqs/IO-Compress-Zlib/ .
+
+A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is
+available in Python 1.5 and later versions, see
+http://docs.python.org/library/zlib.html .
+
+zlib is built into tcl: http://wiki.tcl.tk/4610 .
+
+An experimental package to read and write files in .zip format, written on top
+of zlib by Gilles Vollant <info@winimage.com>, is available in the
+contrib/minizip directory of zlib.
+
+
+Notes for some targets:
+
+- For Windows DLL versions, please see win32/DLL_FAQ.txt
+
+- For 64-bit Irix, deflate.c must be compiled without any optimization. With
+ -O, one libpng test fails. The test works in 32 bit mode (with the -n32
+ compiler flag). The compiler bug has been reported to SGI.
+
+- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works
+ when compiled with cc.
+
+- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is
+ necessary to get gzprintf working correctly. This is done by configure.
+
+- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with
+ other compilers. Use "make test" to check your compiler.
+
+- gzdopen is not supported on RISCOS or BEOS.
+
+- For PalmOs, see http://palmzlib.sourceforge.net/
+
+
+Acknowledgments:
+
+ The deflate format used by zlib was defined by Phil Katz. The deflate and
+ zlib specifications were written by L. Peter Deutsch. Thanks to all the
+ people who reported problems and suggested various improvements in zlib; they
+ are too numerous to cite here.
+
+Copyright notice:
+
+ (C) 1995-2012 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly Mark Adler
+ jloup@gzip.org madler@alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not* receiving
+lengthy legal documents to sign. The sources are provided for free but without
+warranty of any kind. The library has been entirely written by Jean-loup
+Gailly and Mark Adler; it does not include third-party code.
+
+If you redistribute modified sources, we would appreciate that you include in
+the file ChangeLog history information documenting your changes. Please read
+the FAQ for more information on the distribution of modified source versions.

smplayer-0.8.1.tar.bz2/zlib/adler32.c Changed

smplayer-0.8.1.tar.bz2/zlib/amiga Added

smplayer-0.8.1.tar.bz2/zlib/amiga/Makefile.pup Changed

smplayer-0.8.1.tar.bz2/zlib/amiga/Makefile.sas Changed

smplayer-0.8.1.tar.bz2/zlib/as400 Added

smplayer-0.8.1.tar.bz2/zlib/as400/bndsrc Added

@@ -0,0 +1,205 @@
+STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.1.3 entry points.                                    */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+/********************************************************************/
+/*   *MODULE      ADLER32      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("adler32")
+
+/********************************************************************/
+/*   *MODULE      COMPRESS     ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("compress")
+  EXPORT SYMBOL("compress2")
+
+/********************************************************************/
+/*   *MODULE      CRC32        ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("crc32")
+  EXPORT SYMBOL("get_crc_table")
+
+/********************************************************************/
+/*   *MODULE      DEFLATE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("deflate")
+  EXPORT SYMBOL("deflateEnd")
+  EXPORT SYMBOL("deflateSetDictionary")
+  EXPORT SYMBOL("deflateCopy")
+  EXPORT SYMBOL("deflateReset")
+  EXPORT SYMBOL("deflateParams")
+  EXPORT SYMBOL("deflatePrime")
+  EXPORT SYMBOL("deflateInit_")
+  EXPORT SYMBOL("deflateInit2_")
+
+/********************************************************************/
+/*   *MODULE      GZIO         ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("gzopen")
+  EXPORT SYMBOL("gzdopen")
+  EXPORT SYMBOL("gzsetparams")
+  EXPORT SYMBOL("gzread")
+  EXPORT SYMBOL("gzwrite")
+  EXPORT SYMBOL("gzprintf")
+  EXPORT SYMBOL("gzputs")
+  EXPORT SYMBOL("gzgets")
+  EXPORT SYMBOL("gzputc")
+  EXPORT SYMBOL("gzgetc")
+  EXPORT SYMBOL("gzflush")
+  EXPORT SYMBOL("gzseek")
+  EXPORT SYMBOL("gzrewind")
+  EXPORT SYMBOL("gztell")
+  EXPORT SYMBOL("gzeof")
+  EXPORT SYMBOL("gzclose")
+  EXPORT SYMBOL("gzerror")
+
+/********************************************************************/
+/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("inflate")
+  EXPORT SYMBOL("inflateEnd")
+  EXPORT SYMBOL("inflateSetDictionary")
+  EXPORT SYMBOL("inflateSync")
+  EXPORT SYMBOL("inflateReset")
+  EXPORT SYMBOL("inflateInit_")
+  EXPORT SYMBOL("inflateInit2_")
+  EXPORT SYMBOL("inflateSyncPoint")
+
+/********************************************************************/
+/*   *MODULE      UNCOMPR      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("uncompress")
+
+/********************************************************************/
+/*   *MODULE      ZUTIL        ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("zlibVersion")
+  EXPORT SYMBOL("zError")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.2.1 additional entry points.                         */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+/********************************************************************/
+/*   *MODULE      COMPRESS     ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("compressBound")
+
+/********************************************************************/
+/*   *MODULE      DEFLATE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("deflateBound")
+
+/********************************************************************/
+/*   *MODULE      GZIO         ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("gzungetc")
+  EXPORT SYMBOL("gzclearerr")
+
+/********************************************************************/
+/*   *MODULE      INFBACK      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("inflateBack")
+  EXPORT SYMBOL("inflateBackEnd")
+  EXPORT SYMBOL("inflateBackInit_")
+
+/********************************************************************/
+/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("inflateCopy")
+
+/********************************************************************/
+/*   *MODULE      ZUTIL        ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("zlibCompileFlags")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.2.5 additional entry points.                         */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+/********************************************************************/
+/*   *MODULE      ADLER32      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("adler32_combine")
+  EXPORT SYMBOL("adler32_combine64")
+
+/********************************************************************/
+/*   *MODULE      CRC32        ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("crc32_combine")
+  EXPORT SYMBOL("crc32_combine64")
+
+/********************************************************************/
+/*   *MODULE      GZLIB        ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("gzbuffer")
+  EXPORT SYMBOL("gzoffset")
+  EXPORT SYMBOL("gzoffset64")
+  EXPORT SYMBOL("gzopen64")
+  EXPORT SYMBOL("gzseek64")
+  EXPORT SYMBOL("gztell64")
+
+/********************************************************************/
+/*   *MODULE      GZREAD       ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("gzclose_r")
+
+/********************************************************************/
+/*   *MODULE      GZWRITE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("gzclose_w")
+
+/********************************************************************/
+/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("inflateMark")
+  EXPORT SYMBOL("inflatePrime")
+  EXPORT SYMBOL("inflateReset2")
+  EXPORT SYMBOL("inflateUndermine")
+
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.2.6 additional entry points.                         */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+/********************************************************************/
+/*   *MODULE      DEFLATE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("deflateResetKeep")
+  EXPORT SYMBOL("deflatePending")
+
+/********************************************************************/
+/*   *MODULE      GZWRITE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("gzgetc_")
+
+/********************************************************************/
+/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("inflateResetKeep")
+
+ENDPGMEXP

smplayer-0.8.1.tar.bz2/zlib/as400/compile.clp Added

@@ -0,0 +1,110 @@
+/******************************************************************************/
+/*                                                                            */
+/*  ZLIB                                                                      */
+/*                                                                            */
+/*    Compile sources into modules and link them into a service program.      */
+/*                                                                            */
+/******************************************************************************/
+
+             PGM
+
+/*      Configuration adjustable parameters.                                  */
+
+             DCL        VAR(&SRCLIB) TYPE(*CHAR) LEN(10) +
+                          VALUE('ZLIB')                         /* Source library. */
+             DCL        VAR(&SRCFILE) TYPE(*CHAR) LEN(10) +
+                          VALUE('SOURCES')                      /* Source member file. */
+             DCL        VAR(&CTLFILE) TYPE(*CHAR) LEN(10) +
+                          VALUE('TOOLS')                        /* Control member file. */
+
+             DCL        VAR(&MODLIB) TYPE(*CHAR) LEN(10) +
+                          VALUE('ZLIB')                         /* Module library. */
+
+             DCL        VAR(&SRVLIB) TYPE(*CHAR) LEN(10) +
+                          VALUE('LGPL')                         /* Service program library. */
+
+             DCL        VAR(&CFLAGS) TYPE(*CHAR) +
+                          VALUE('OPTIMIZE(40)')                 /* Compile options. */
+
+             DCL        VAR(&TGTRLS) TYPE(*CHAR) +
+                          VALUE('V5R3M0')                       /* Target release. */
+
+
+/*      Working storage.                                                      */
+
+             DCL        VAR(&CMDLEN) TYPE(*DEC) LEN(15 5) VALUE(300)    /* Command length. */
+             DCL        VAR(&CMD) TYPE(*CHAR) LEN(512)
+             DCL        VAR(&FIXDCMD) TYPE(*CHAR) LEN(512)
+
+
+/*      Compile sources into modules.                                         */
+
+             CHGVAR     VAR(&FIXDCMD) VALUE('CRTCMOD' *BCAT &CFLAGS *BCAT      +
+                        'SYSIFCOPT(*IFS64IO)' *BCAT                            +
+                        'DEFINE(''_LARGEFILE64_SOURCE''' *BCAT                 +
+                        '''_LFS64_LARGEFILE=1'') TGTRLS(' *TCAT &TGTRLS *TCAT  +
+                        ') SRCFILE(' *TCAT &SRCLIB *TCAT '/' *TCAT             +
+                        &SRCFILE *TCAT ') MODULE(' *TCAT &MODLIB *TCAT '/')
+
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'ADLER32)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'COMPRESS)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'CRC32)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'DEFLATE)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'GZCLOSE)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'GZLIB)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'GZREAD)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'GZWRITE)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'INFBACK)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'INFFAST)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'INFLATE)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'INFTREES)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'TREES)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'UNCOMPR)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'ZUTIL)')
+             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
+
+
+/*      Link modules into a service program.                                  */
+
+             CRTSRVPGM  SRVPGM(&SRVLIB/ZLIB) +
+                          MODULE(&MODLIB/ADLER32     &MODLIB/COMPRESS    +
+                                 &MODLIB/CRC32       &MODLIB/DEFLATE     +
+                                 &MODLIB/GZCLOSE     &MODLIB/GZLIB       +
+                                 &MODLIB/GZREAD      &MODLIB/GZWRITE     +
+                                 &MODLIB/INFBACK     &MODLIB/INFFAST     +
+                                 &MODLIB/INFLATE     &MODLIB/INFTREES    +
+                                 &MODLIB/TREES       &MODLIB/UNCOMPR     +
+                                 &MODLIB/ZUTIL)                          +
+                          SRCFILE(&SRCLIB/&CTLFILE) SRCMBR(BNDSRC)       +
+                          TEXT('ZLIB 1.2.7') TGTRLS(&TGTRLS)
+
+             ENDPGM

smplayer-0.8.1.tar.bz2/zlib/as400/readme.txt Added

@@ -0,0 +1,115 @@
+        ZLIB version 1.2.7 for AS400 installation instructions
+
+I) From an AS400 *SAVF file:
+
+1)      Unpacking archive to an AS400 save file
+
+On the AS400:
+
+_       Create the ZLIB AS400 library:
+
+        CRTLIB LIB(ZLIB) TYPE(*PROD) TEXT('ZLIB compression API library')
+
+_       Create a work save file, for example:
+
+                CRTSAVF FILE(ZLIB/ZLIBSAVF)
+
+On a PC connected to the target AS400:
+
+_       Unpack the save file image to a PC file "ZLIBSAVF"
+_       Upload this file into the save file on the AS400, for example
+                using ftp in BINARY mode.
+
+
+2)      Populating the ZLIB AS400 source library
+
+On the AS400:
+
+_       Extract the saved objects into the ZLIB AS400 library using:
+
+RSTOBJ OBJ(*ALL) SAVLIB(ZLIB) DEV(*SAVF) SAVF(ZLIB/ZLIBSAVF) RSTLIB(ZLIB)
+
+
+3)      Customize installation:
+
+_       Edit CL member ZLIB/TOOLS(COMPILE) and change parameters if needed,
+                according to the comments.
+
+_       Compile this member with:
+
+        CRTCLPGM PGM(ZLIB/COMPILE) SRCFILE(ZLIB/TOOLS) SRCMBR(COMPILE)
+
+
+4)      Compile and generate the service program:
+
+_       This can now be done by executing:
+
+        CALL PGM(ZLIB/COMPILE)
+
+
+
+II) From the original source distribution:
+
+1)      On the AS400, create the source library:
+
+        CRTLIB LIB(ZLIB) TYPE(*PROD) TEXT('ZLIB compression API library')
+
+2)      Create the source files:
+
+        CRTSRCPF FILE(ZLIB/SOURCES) RCDLEN(112) TEXT('ZLIB library modules')
+        CRTSRCPF FILE(ZLIB/H)       RCDLEN(112) TEXT('ZLIB library includes')
+        CRTSRCPF FILE(ZLIB/TOOLS)   RCDLEN(112) TEXT('ZLIB library control utilities')
+
+3)      From the machine hosting the distribution files, upload them (with
+                FTP in text mode, for example) according to the following table:
+
+    Original    AS400   AS400    AS400 AS400
+    file        file    member   type  description
+                SOURCES                Original ZLIB C subprogram sources
+    adler32.c           ADLER32  C     ZLIB - Compute the Adler-32 checksum of a dta strm
+    compress.c          COMPRESS C     ZLIB - Compress a memory buffer
+    crc32.c             CRC32    C     ZLIB - Compute the CRC-32 of a data stream
+    deflate.c           DEFLATE  C     ZLIB - Compress data using the deflation algorithm
+    gzclose.c           GZCLOSE  C     ZLIB - Close .gz files
+    gzlib.c             GZLIB    C     ZLIB - Miscellaneous .gz files IO support
+    gzread.c            GZREAD   C     ZLIB - Read .gz files
+    gzwrite.c           GZWRITE  C     ZLIB - Write .gz files
+    infback.c           INFBACK  C     ZLIB - Inflate using a callback interface
+    inffast.c           INFFAST  C     ZLIB - Fast proc. literals & length/distance pairs
+    inflate.c           INFLATE  C     ZLIB - Interface to inflate modules
+    inftrees.c          INFTREES C     ZLIB - Generate Huffman trees for efficient decode
+    trees.c             TREES    C     ZLIB - Output deflated data using Huffman coding
+    uncompr.c           UNCOMPR  C     ZLIB - Decompress a memory buffer
+    zutil.c             ZUTIL    C     ZLIB - Target dependent utility functions
+                H                      Original ZLIB C and ILE/RPG include files
+    crc32.h             CRC32    C     ZLIB - CRC32 tables
+    deflate.h           DEFLATE  C     ZLIB - Internal compression state
+    gzguts.h            GZGUTS   C     ZLIB - Definitions for the gzclose module
+    inffast.h           INFFAST  C     ZLIB - Header to use inffast.c
+    inffixed.h          INFFIXED C     ZLIB - Table for decoding fixed codes
+    inflate.h           INFLATE  C     ZLIB - Internal inflate state definitions
+    inftrees.h          INFTREES C     ZLIB - Header to use inftrees.c
+    trees.h             TREES    C     ZLIB - Created automatically with -DGEN_TREES_H
+    zconf.h             ZCONF    C     ZLIB - Compression library configuration
+    zlib.h              ZLIB     C     ZLIB - Compression library C user interface
+    as400/zlib.inc      ZLIB.INC RPGLE ZLIB - Compression library ILE RPG user interface
+    zutil.h             ZUTIL    C     ZLIB - Internal interface and configuration
+                TOOLS                  Building source software & AS/400 README
+    as400/bndsrc        BNDSRC         Entry point exportation list
+    as400/compile.clp   COMPILE  CLP   Compile sources & generate service program
+    as400/readme.txt    README   TXT   Installation instructions
+
+4)      Continue as in I)3).
+
+
+
+
+Notes:  For AS400 ILE RPG programmers, a /copy member defining the ZLIB
+                API prototypes for ILE RPG can be found in ZLIB/H(ZLIB.INC).
+                Please read comments in this member for more information.
+
+        Remember that most foreign textual data are ASCII coded: this
+                implementation does not handle conversion from/to ASCII, so
+                text data code conversions must be done explicitely.
+
+        Mainly for the reason above, always open zipped files in binary mode.

smplayer-0.8.1.tar.bz2/zlib/as400/zlib.inc Added

@@ -0,0 +1,445 @@
+      *  ZLIB.INC - Interface to the general purpose compression library
+      *
+      *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
+      *  Version 1.2.7
+      *
+      *
+      *  WARNING:
+      *     Procedures inflateInit(), inflateInit2(), deflateInit(),
+      *         deflateInit2() and inflateBackInit() need to be called with
+      *         two additional arguments:
+      *         the package version string and the stream control structure.
+      *         size. This is needed because RPG lacks some macro feature.
+      *         Call these procedures as:
+      *             inflateInit(...: ZLIB_VERSION: %size(z_stream))
+      *
+      /if not defined(ZLIB_H_)
+      /define ZLIB_H_
+      *
+      **************************************************************************
+      *                               Constants
+      **************************************************************************
+      *
+      *  Versioning information.
+      *
+     D ZLIB_VERSION    C                   '1.2.7'
+     D ZLIB_VERNUM     C                   X'1270'
+     D ZLIB_VER_MAJOR  C                   1
+     D ZLIB_VER_MINOR  C                   2
+     D ZLIB_VER_REVISION...
+     D                 C                   7
+     D ZLIB_VER_SUBREVISION...
+     D                 C                   0
+      *
+      *  Other equates.
+      *
+     D Z_NO_FLUSH      C                   0
+     D Z_PARTIAL_FLUSH...
+     D                 C                   1
+     D Z_SYNC_FLUSH    C                   2
+     D Z_FULL_FLUSH    C                   3
+     D Z_FINISH        C                   4
+     D Z_BLOCK         C                   5
+     D Z_TREES         C                   6
+      *
+     D Z_OK            C                   0
+     D Z_STREAM_END    C                   1
+     D Z_NEED_DICT     C                   2
+     D Z_ERRNO         C                   -1
+     D Z_STREAM_ERROR  C                   -2
+     D Z_DATA_ERROR    C                   -3
+     D Z_MEM_ERROR     C                   -4
+     D Z_BUF_ERROR     C                   -5
+     DZ_VERSION_ERROR  C                   -6
+      *
+     D Z_NO_COMPRESSION...
+     D                 C                   0
+     D Z_BEST_SPEED    C                   1
+     D Z_BEST_COMPRESSION...
+     D                 C                   9
+     D Z_DEFAULT_COMPRESSION...
+     D                 C                   -1
+      *
+     D Z_FILTERED      C                   1
+     D Z_HUFFMAN_ONLY  C                   2
+     D Z_RLE           C                   3
+     D Z_DEFAULT_STRATEGY...
+     D                 C                   0
+      *
+     D Z_BINARY        C                   0
+     D Z_ASCII         C                   1
+     D Z_UNKNOWN       C                   2
+      *
+     D Z_DEFLATED      C                   8
+      *
+     D Z_NULL          C                   0
+      *
+      **************************************************************************
+      *                                 Types
+      **************************************************************************
+      *
+     D z_streamp       S               *                                        Stream struct ptr
+     D gzFile          S               *                                        File pointer
+     D z_off_t         S             10i 0                                      Stream offsets
+     D z_off64_t       S             20i 0                                      Stream offsets
+      *
+      **************************************************************************
+      *                               Structures
+      **************************************************************************
+      *
+      *  The GZIP encode/decode stream support structure.
+      *
+     D z_stream        DS                  align based(z_streamp)
+     D  zs_next_in                     *                                        Next input byte
+     D  zs_avail_in                  10U 0                                      Byte cnt at next_in
+     D  zs_total_in                  10U 0                                      Total bytes read
+     D  zs_next_out                    *                                        Output buffer ptr
+     D  zs_avail_out                 10U 0                                      Room left @ next_out
+     D  zs_total_out                 10U 0                                      Total bytes written
+     D  zs_msg                         *                                        Last errmsg or null
+     D  zs_state                       *                                        Internal state
+     D  zs_zalloc                      *   procptr                              Int. state allocator
+     D  zs_free                        *   procptr                              Int. state dealloc.
+     D  zs_opaque                      *                                        Private alloc. data
+     D  zs_data_type                 10i 0                                      ASC/BIN best guess
+     D  zs_adler                     10u 0                                      Uncompr. adler32 val
+     D                               10U 0                                      Reserved
+     D                               10U 0                                      Ptr. alignment
+      *
+      **************************************************************************
+      *                     Utility function prototypes
+      **************************************************************************
+      *
+     D compress        PR            10I 0 extproc('compress')
+     D  dest                      65535    options(*varsize)                    Destination buffer
+     D  destLen                      10U 0                                      Destination length
+     D  source                    65535    const options(*varsize)              Source buffer
+     D  sourceLen                    10u 0 value                                Source length
+      *
+     D compress2       PR            10I 0 extproc('compress2')
+     D  dest                      65535    options(*varsize)                    Destination buffer
+     D  destLen                      10U 0                                      Destination length
+     D  source                    65535    const options(*varsize)              Source buffer
+     D  sourceLen                    10U 0 value                                Source length
+     D  level                        10I 0 value                                Compression level
+      *
+     D compressBound   PR            10U 0 extproc('compressBound')
+     D  sourceLen                    10U 0 value
+      *
+     D uncompress      PR            10I 0 extproc('uncompress')
+     D  dest                      65535    options(*varsize)                    Destination buffer
+     D  destLen                      10U 0                                      Destination length
+     D  source                    65535    const options(*varsize)              Source buffer
+     D  sourceLen                    10U 0 value                                Source length
+      *
+      /if not defined(LARGE_FILES)
+     D gzopen          PR                  extproc('gzopen')
+     D                                     like(gzFile)
+     D  path                           *   value options(*string)               File pathname
+     D  mode                           *   value options(*string)               Open mode
+      /else
+     D gzopen          PR                  extproc('gzopen64')
+     D                                     like(gzFile)
+     D  path                           *   value options(*string)               File pathname
+     D  mode                           *   value options(*string)               Open mode
+      *
+     D gzopen64        PR                  extproc('gzopen64')
+     D                                     like(gzFile)
+     D  path                           *   value options(*string)               File pathname
+     D  mode                           *   value options(*string)               Open mode
+      /endif
+      *
+     D gzdopen         PR                  extproc('gzdopen')
+     D                                     like(gzFile)
+     D  fd                           10I 0 value                                File descriptor
+     D  mode                           *   value options(*string)               Open mode
+      *
+     D gzbuffer        PR            10I 0 extproc('gzbuffer')
+     D  file                               value like(gzFile)                   File pointer
+     D  size                         10U 0 value
+      *
+     D gzsetparams     PR            10I 0 extproc('gzsetparams')
+     D  file                               value like(gzFile)                   File pointer
+     D  level                        10I 0 value
+     D  strategy                     10I 0 value
+      *
+     D gzread          PR            10I 0 extproc('gzread')
+     D  file                               value like(gzFile)                   File pointer
+     D  buf                       65535    options(*varsize)                    Buffer
+     D  len                          10u 0 value                                Buffer length
+      *
+     D gzwrite         PR            10I 0 extproc('gzwrite')
+     D  file                               value like(gzFile)                   File pointer
+     D  buf                       65535    const options(*varsize)              Buffer
+     D  len                          10u 0 value                                Buffer length
+      *
+     D gzputs          PR            10I 0 extproc('gzputs')
+     D  file                               value like(gzFile)                   File pointer
+     D  s                              *   value options(*string)               String to output
+      *
+     D gzgets          PR              *   extproc('gzgets')
+     D  file                               value like(gzFile)                   File pointer
+     D  buf                       65535    options(*varsize)                    Read buffer
+     D  len                          10i 0 value                                Buffer length
+      *
+     D gzputc          PR            10i 0 extproc('gzputc')
+     D  file                               value like(gzFile)                   File pointer
+     D  c                            10I 0 value                                Character to write
+      *
+     D gzgetc          PR            10i 0 extproc('gzgetc')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzgetc_         PR            10i 0 extproc('gzgetc_')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzungetc        PR            10i 0 extproc('gzungetc')
+     D  c                            10I 0 value                                Character to push
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzflush         PR            10i 0 extproc('gzflush')
+     D  file                               value like(gzFile)                   File pointer
+     D  flush                        10I 0 value                                Type of flush
+      *
+      /if not defined(LARGE_FILES)
+     D gzseek          PR                  extproc('gzseek')
+     D                                     like(z_off_t)
+     D  file                               value like(gzFile)                   File pointer
+     D  offset                             value like(z_off_t)                  Offset
+     D  whence                       10i 0 value                                Origin
+      /else
+     D gzseek          PR                  extproc('gzseek64')
+     D                                     like(z_off_t)
+     D  file                               value like(gzFile)                   File pointer
+     D  offset                             value like(z_off_t)                  Offset
+     D  whence                       10i 0 value                                Origin
+      *
+     D gzseek64        PR                  extproc('gzseek64')
+     D                                     like(z_off64_t)
+     D  file                               value like(gzFile)                   File pointer
+     D  offset                             value like(z_off64_t)                Offset
+     D  whence                       10i 0 value                                Origin
+      /endif
+      *
+     D gzrewind        PR            10i 0 extproc('gzrewind')
+     D  file                               value like(gzFile)                   File pointer
+      *
+      /if not defined(LARGE_FILES)
+     D gztell          PR                  extproc('gztell')
+     D                                     like(z_off_t)
+     D  file                               value like(gzFile)                   File pointer
+      /else
+     D gztell          PR                  extproc('gztell64')
+     D                                     like(z_off_t)
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gztell64        PR                  extproc('gztell64')
+     D                                     like(z_off64_t)
+     D  file                               value like(gzFile)                   File pointer
+      /endif
+      *
+      /if not defined(LARGE_FILES)
+     D gzoffset        PR                  extproc('gzoffset')
+     D                                     like(z_off_t)
+     D  file                               value like(gzFile)                   File pointer
+      /else
+     D gzoffset        PR                  extproc('gzoffset64')
+     D                                     like(z_off_t)
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzoffset64      PR                  extproc('gzoffset64')
+     D                                     like(z_off64_t)
+     D  file                               value like(gzFile)                   File pointer
+      /endif
+      *
+     D gzeof           PR            10i 0 extproc('gzeof')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzclose_r       PR            10i 0 extproc('gzclose_r')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzclose_w       PR            10i 0 extproc('gzclose_w')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzclose         PR            10i 0 extproc('gzclose')
+     D  file                               value like(gzFile)                   File pointer
+      *
+     D gzerror         PR              *   extproc('gzerror')                   Error string
+     D  file                               value like(gzFile)                   File pointer
+     D  errnum                       10I 0                                      Error code
+      *
+     D gzclearerr      PR                  extproc('gzclearerr')
+     D  file                               value like(gzFile)                   File pointer
+      *
+      **************************************************************************
+      *                        Basic function prototypes
+      **************************************************************************
+      *
+     D zlibVersion     PR              *   extproc('zlibVersion')               Version string
+      *
+     D deflateInit     PR            10I 0 extproc('deflateInit_')              Init. compression
+     D  strm                               like(z_stream)                       Compression stream
+     D  level                        10I 0 value                                Compression level
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D deflate         PR            10I 0 extproc('deflate')                   Compress data
+     D  strm                               like(z_stream)                       Compression stream
+     D  flush                        10I 0 value                                Flush type required
+      *
+     D deflateEnd      PR            10I 0 extproc('deflateEnd')                Termin. compression
+     D  strm                               like(z_stream)                       Compression stream
+      *
+     D inflateInit     PR            10I 0 extproc('inflateInit_')              Init. expansion
+     D  strm                               like(z_stream)                       Expansion stream
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D inflate         PR            10I 0 extproc('inflate')                   Expand data
+     D  strm                               like(z_stream)                       Expansion stream
+     D  flush                        10I 0 value                                Flush type required
+      *
+     D inflateEnd      PR            10I 0 extproc('inflateEnd')                Termin. expansion
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+      **************************************************************************
+      *                        Advanced function prototypes
+      **************************************************************************
+      *
+     D deflateInit2    PR            10I 0 extproc('deflateInit2_')             Init. compression
+     D  strm                               like(z_stream)                       Compression stream
+     D  level                        10I 0 value                                Compression level
+     D  method                       10I 0 value                                Compression method
+     D  windowBits                   10I 0 value                                log2(window size)
+     D  memLevel                     10I 0 value                                Mem/cmpress tradeoff
+     D  strategy                     10I 0 value                                Compression stategy
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D deflateSetDictionary...
+     D                 PR            10I 0 extproc('deflateSetDictionary')      Init. dictionary
+     D  strm                               like(z_stream)                       Compression stream
+     D  dictionary                65535    const options(*varsize)              Dictionary bytes
+     D  dictLength                   10U 0 value                                Dictionary length
+      *
+     D deflateCopy     PR            10I 0 extproc('deflateCopy')               Compress strm 2 strm
+     D  dest                               like(z_stream)                       Destination stream
+     D  source                             like(z_stream)                       Source stream
+      *
+     D deflateReset    PR            10I 0 extproc('deflateReset')              End and init. stream
+     D  strm                               like(z_stream)                       Compression stream
+      *
+     D deflateParams   PR            10I 0 extproc('deflateParams')             Change level & strat
+     D  strm                               like(z_stream)                       Compression stream
+     D  level                        10I 0 value                                Compression level
+     D  strategy                     10I 0 value                                Compression stategy
+      *
+     D deflateBound    PR            10U 0 extproc('deflateBound')              Change level & strat
+     D  strm                               like(z_stream)                       Compression stream
+     D  sourcelen                    10U 0 value                                Compression level
+      *
+     D deflatePending  PR            10I 0 extproc('deflatePending')            Change level & strat
+     D  strm                               like(z_stream)                       Compression stream
+     D  pending                      10U 0                                      Pending bytes
+     D  bits                         10I 0                                      Pending bits
+      *
+     D deflatePrime    PR            10I 0 extproc('deflatePrime')              Change level & strat
+     D  strm                               like(z_stream)                       Compression stream
+     D  bits                         10I 0 value                                # of bits to insert
+     D  value                        10I 0 value                                Bits to insert
+      *
+     D inflateInit2    PR            10I 0 extproc('inflateInit2_')             Init. expansion
+     D  strm                               like(z_stream)                       Expansion stream
+     D  windowBits                   10I 0 value                                log2(window size)
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D inflateSetDictionary...
+     D                 PR            10I 0 extproc('inflateSetDictionary')      Init. dictionary
+     D  strm                               like(z_stream)                       Expansion stream
+     D  dictionary                65535    const options(*varsize)              Dictionary bytes
+     D  dictLength                   10U 0 value                                Dictionary length
+      *
+     D inflateSync     PR            10I 0 extproc('inflateSync')               Sync. expansion
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D inflateCopy     PR            10I 0 extproc('inflateCopy')
+     D  dest                               like(z_stream)                       Destination stream
+     D  source                             like(z_stream)                       Source stream
+      *
+     D inflateReset    PR            10I 0 extproc('inflateReset')              End and init. stream
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D inflateReset2   PR            10I 0 extproc('inflateReset2')             End and init. stream
+     D  strm                               like(z_stream)                       Expansion stream
+     D  windowBits                   10I 0 value                                Log2(buffer size)
+      *
+     D inflatePrime    PR            10I 0 extproc('inflatePrime')              Insert bits
+     D  strm                               like(z_stream)                       Expansion stream
+     D  bits                         10I 0 value                                Bit count
+     D  value                        10I 0 value                                Bits to insert
+      *
+     D inflateMark     PR            10I 0 extproc('inflateMark')               Get inflate info
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D inflateBackInit...
+     D                 PR            10I 0 extproc('inflateBackInit_')
+     D  strm                               like(z_stream)                       Expansion stream
+     D  windowBits                   10I 0 value                                Log2(buffer size)
+     D  window                    65535    options(*varsize)                    Buffer
+     D  version                        *   value options(*string)               Version string
+     D  stream_size                  10i 0 value                                Stream struct. size
+      *
+     D inflateBack     PR            10I 0 extproc('inflateBack')
+     D  strm                               like(z_stream)                       Expansion stream
+     D  in                             *   value procptr                        Input function
+     D  in_desc                        *   value                                Input descriptor
+     D  out                            *   value procptr                        Output function
+     D  out_desc                       *   value                                Output descriptor
+      *
+     D inflateBackEnd  PR            10I 0 extproc('inflateBackEnd')
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D zlibCompileFlags...
+     D                 PR            10U 0 extproc('zlibCompileFlags')
+      *
+      **************************************************************************
+      *                        Checksum function prototypes
+      **************************************************************************
+      *
+     D adler32         PR            10U 0 extproc('adler32')                   New checksum
+     D  adler                        10U 0 value                                Old checksum
+     D  buf                       65535    const options(*varsize)              Bytes to accumulate
+     D  len                          10U 0 value                                Buffer length
+      *
+     D crc32           PR            10U 0 extproc('crc32')                     New checksum
+     D  crc                          10U 0 value                                Old checksum
+     D  buf                       65535    const options(*varsize)              Bytes to accumulate
+     D  len                          10U 0 value                                Buffer length
+      *
+      **************************************************************************
+      *                     Miscellaneous function prototypes
+      **************************************************************************
+      *
+     D zError          PR              *   extproc('zError')                    Error string
+     D  err                          10I 0 value                                Error code
+      *
+     D inflateSyncPoint...
+     D                 PR            10I 0 extproc('inflateSyncPoint')
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D get_crc_table   PR              *   extproc('get_crc_table')             Ptr to ulongs
+      *
+     D inflateUndermine...
+     D                 PR            10I 0 extproc('inflateUndermine')
+     D  strm                               like(z_stream)                       Expansion stream
+     D  arg                          10I 0 value                                Error code
+      *
+     D inflateResetKeep...
+     D                 PR            10I 0 extproc('inflateResetKeep')          End and init. stream
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+     D deflateResetKeep...
+     D                 PR            10I 0 extproc('deflateResetKeep')          End and init. stream
+     D  strm                               like(z_stream)                       Expansion stream
+      *
+      /endif

smplayer-0.8.1.tar.bz2/zlib/compress.c Changed

smplayer-0.8.1.tar.bz2/zlib/configure Added

@@ -0,0 +1,818 @@
+#!/bin/sh
+# configure script for zlib.
+#
+# Normally configure builds both a static and a shared library.
+# If you want to build just a static library, use: ./configure --static
+#
+# To impose specific compiler or flags or install directory, use for example:
+# prefix=$HOME CC=cc CFLAGS="-O4" ./configure
+# or for csh/tcsh users:
+# (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure)
+
+# Incorrect settings of CC or CFLAGS may prevent creating a shared library.
+# If you have problems, try without defining CC and CFLAGS before reporting
+# an error.
+
+# start off configure.log
+echo -------------------- >> configure.log
+echo $0 $* >> configure.log
+date >> configure.log
+
+# set command prefix for cross-compilation
+if -n "${CHOST}" ; then
+ uname="`echo "${CHOST}" | sed -e 's/^^-*-$^-*$$/\1/' -e 's/^^-*-^-*-$^-*$$/\1/' -e 's/^^-*-^-*-$^-*$-.*$/\1/'`"
+ CROSS_PREFIX="${CHOST}-"
+fi
+
+# destination name for static library
+STATICLIB=libz.a
+
+# extract zlib version numbers from zlib.h
+VER=`sed -n -e '/VERSION "/s/.*"$.*$".*/\1/p' < zlib.h`
+VER3=`sed -n -e '/VERSION "/s/.*"$0-9*\\.0-9*\\.0-9*$.*/\1/p' < zlib.h`
+VER2=`sed -n -e '/VERSION "/s/.*"$0-9*\\.0-9*$\\..*/\1/p' < zlib.h`
+VER1=`sed -n -e '/VERSION "/s/.*"$0-9*$\\..*/\1/p' < zlib.h`
+
+# establish commands for library building
+if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then
+ AR=${AR-"${CROSS_PREFIX}ar"}
+ test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
+else
+ AR=${AR-"ar"}
+ test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
+fi
+ARFLAGS=${ARFLAGS-"rc"}
+if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then
+ RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"}
+ test -n "${CROSS_PREFIX}" && echo Using ${RANLIB} | tee -a configure.log
+else
+ RANLIB=${RANLIB-"ranlib"}
+fi
+if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then
+ NM=${NM-"${CROSS_PREFIX}nm"}
+ test -n "${CROSS_PREFIX}" && echo Using ${NM} | tee -a configure.log
+else
+ NM=${NM-"nm"}
+fi
+
+# set defaults before processing command line options
+LDCONFIG=${LDCONFIG-"ldconfig"}
+LDSHAREDLIBC="${LDSHAREDLIBC--lc}"
+ARCHS=
+prefix=${prefix-/usr/local}
+exec_prefix=${exec_prefix-'${prefix}'}
+libdir=${libdir-'${exec_prefix}/lib'}
+sharedlibdir=${sharedlibdir-'${libdir}'}
+includedir=${includedir-'${prefix}/include'}
+mandir=${mandir-'${prefix}/share/man'}
+shared_ext='.so'
+shared=1
+solo=0
+cover=0
+zprefix=0
+build64=0
+gcc=0
+old_cc="$CC"
+old_cflags="$CFLAGS"
+OBJC='$(OBJZ) $(OBJG)'
+PIC_OBJC='$(PIC_OBJZ) $(PIC_OBJG)'
+
+# process command line options
+while test $# -ge 1
+do
+case "$1" in
+ -h* | --help)
+ echo 'usage:' | tee -a configure.log
+ echo ' configure --zprefix --prefix=PREFIX --eprefix=EXPREFIX' | tee -a configure.log
+ echo ' --static --64 --libdir=LIBDIR --sharedlibdir=LIBDIR' | tee -a configure.log
+ echo ' --includedir=INCLUDEDIR --archs="-arch i386 -arch x86_64"' | tee -a configure.log
+ exit 0 ;;
+ -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;;
+ -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;;
+ -l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;;
+ --sharedlibdir=*) sharedlibdir=`echo $1 | sed 's/.*=//'`; shift ;;
+ -i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;;
+ -u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;;
+ -p* | --prefix) prefix="$2"; shift; shift ;;
+ -e* | --eprefix) exec_prefix="$2"; shift; shift ;;
+ -l* | --libdir) libdir="$2"; shift; shift ;;
+ -i* | --includedir) includedir="$2"; shift; shift ;;
+ -s* | --shared | --enable-shared) shared=1; shift ;;
+ -t | --static) shared=0; shift ;;
+ --solo) solo=1; shift ;;
+ --cover) cover=1; shift ;;
+ -z* | --zprefix) zprefix=1; shift ;;
+ -6* | --64) build64=1; shift ;;
+ -a*=* | --archs=*) ARCHS=`echo $1 | sed 's/.*=//'`; shift ;;
+ --sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;;
+ --localstatedir=*) echo "ignored option: --localstatedir" | tee -a configure.log; shift ;;
+ *) echo "unknown option: $1"; echo "$0 --help for help" | tee -a configure.log; exit 1 ;;
+ esac
+done
+
+# define functions for testing compiler and library characteristics and logging the results
+test=ztest$$
+
+show()
+{
+ case "$*" in
+ *$test.c*)
+ echo === $test.c === >> configure.log
+ cat $test.c >> configure.log
+ echo === >> configure.log;;
+ esac
+ echo $* >> configure.log
+}
+
+cat > $test.c <<EOF
+#error error
+EOF
+if ($CC -c $CFLAGS $test.c) 2>/dev/null; then
+ try()
+ {
+ show $*
+ test "`( $* ) 2>&1 | tee -a configure.log`" = ""
+ }
+ echo - using any output from compiler to indicate an error >> configure.log
+else
+ try()
+ {
+ show $*
+ ( $* ) >> configure.log 2>&1
+ ret=$?
+ if test $ret -ne 0; then
+ echo "(exit code "$ret")" >> configure.log
+ fi
+ return $ret
+ }
+fi
+
+tryboth()
+{
+ show $*
+ got=`( $* ) 2>&1`
+ ret=$?
+ printf %s "$got" >> configure.log
+ if test $ret -ne 0; then
+ return $ret
+ fi
+ test "$got" = ""
+}
+
+echo >> configure.log
+
+# check for gcc vs. cc and set compile and link flags based on the system identified by uname
+cat > $test.c <<EOF
+extern int getchar();
+int hello() {return getchar();}
+EOF
+
+test -z "$CC" && echo Checking for ${CROSS_PREFIX}gcc... | tee -a configure.log
+cc=${CC-${CROSS_PREFIX}gcc}
+cflags=${CFLAGS-"-O3"}
+# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
+case "$cc" in
+ *gcc*) gcc=1 ;;
+ *clang*) gcc=1 ;;
+esac
+case `$cc -v 2>&1` in
+ *gcc*) gcc=1 ;;
+esac
+
+show $cc -c $cflags $test.c
+if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then
+ echo ... using gcc >> configure.log
+ CC="$cc"
+ CFLAGS="${CFLAGS--O3} ${ARCHS}"
+ SFLAGS="${CFLAGS--O3} -fPIC"
+ LDFLAGS="${LDFLAGS} ${ARCHS}"
+ if test $build64 -eq 1; then
+ CFLAGS="${CFLAGS} -m64"
+ SFLAGS="${SFLAGS} -m64"
+ fi
+ if test "${ZLIBGCCWARN}" = "YES"; then
+ CFLAGS="${CFLAGS} -Wall -Wextra -pedantic"
+ fi
+ if test -z "$uname"; then
+ uname=`(uname -s || echo unknown) 2>/dev/null`
+ fi
+ case "$uname" in
+ Linux* | linux* | GNU | GNU/* | solaris*)
+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
+ *BSD | *bsd* | DragonFly)
+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"}
+ LDCONFIG="ldconfig -m" ;;
+ CYGWIN* | Cygwin* | cygwin* | OS/2*)
+ EXE='.exe' ;;
+ MINGW* | mingw*)
+# temporary bypass
+ rm -f $test.co $test $test$shared_ext
+ echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
+ exit 1
+ LDSHARED=${LDSHARED-"$cc -shared"}
+ LDSHAREDLIBC=""
+ EXE='.exe' ;;
+ QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4
+ # (alain.bonnefoy@icbt.com)
+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"} ;;
+ HP-UX*)
+ LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"}
+ case `(uname -m || echo unknown) 2>/dev/null` in
+ ia64)
+ shared_ext='.so'
+ SHAREDLIB='libz.so' ;;
+ *)
+ shared_ext='.sl'
+ SHAREDLIB='libz.sl' ;;
+ esac ;;
+ Darwin* | darwin*)
+ shared_ext='.dylib'
+ SHAREDLIB=libz$shared_ext
+ SHAREDLIBV=libz.$VER$shared_ext
+ SHAREDLIBM=libz.$VER1$shared_ext
+ LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
+ AR="/usr/bin/libtool"
+ ARFLAGS="-o" ;;
+ *) LDSHARED=${LDSHARED-"$cc -shared"} ;;
+ esac
+else
+ # find system name and corresponding cc options
+ CC=${CC-cc}
+ gcc=0
+ echo ... using $CC >> configure.log
+ if test -z "$uname"; then
+ uname=`(uname -sr || echo unknown) 2>/dev/null`
+ fi
+ case "$uname" in
+ HP-UX*) SFLAGS=${CFLAGS-"-O +z"}
+ CFLAGS=${CFLAGS-"-O"}
+# LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"}
+ LDSHARED=${LDSHARED-"ld -b"}
+ case `(uname -m || echo unknown) 2>/dev/null` in
+ ia64)
+ shared_ext='.so'
+ SHAREDLIB='libz.so' ;;
+ *)
+ shared_ext='.sl'
+ SHAREDLIB='libz.sl' ;;
+ esac ;;
+ IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."}
+ CFLAGS=${CFLAGS-"-ansi -O2"}
+ LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
+ OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"}
+ CFLAGS=${CFLAGS-"-O -std1"}
+ LDFLAGS="${LDFLAGS} -Wl,-rpath,."
+ LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"} ;;
+ OSF1*) SFLAGS=${CFLAGS-"-O -std1"}
+ CFLAGS=${CFLAGS-"-O -std1"}
+ LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;;
+ QNX*) SFLAGS=${CFLAGS-"-4 -O"}
+ CFLAGS=${CFLAGS-"-4 -O"}
+ LDSHARED=${LDSHARED-"cc"}
+ RANLIB=${RANLIB-"true"}
+ AR="cc"
+ ARFLAGS="-A" ;;
+ SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "}
+ CFLAGS=${CFLAGS-"-O3"}
+ LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;;
+ SunOS\ 5* | solaris*)
+ LDSHARED=${LDSHARED-"cc -G -h libz$shared_ext.$VER1"}
+ SFLAGS=${CFLAGS-"-fast -KPIC"}
+ CFLAGS=${CFLAGS-"-fast"}
+ if test $build64 -eq 1; then
+ # old versions of SunPRO/Workshop/Studio don't support -m64,
+ # but newer ones do. Check for it.
+ flag64=`$CC -flags | egrep -- '^-m64'`
+ if test x"$flag64" != x"" ; then
+ CFLAGS="${CFLAGS} -m64"
+ SFLAGS="${SFLAGS} -m64"
+ else
+ case `(uname -m || echo unknown) 2>/dev/null` in
+ i86*)
+ SFLAGS="$SFLAGS -xarch=amd64"
+ CFLAGS="$CFLAGS -xarch=amd64" ;;
+ *)
+ SFLAGS="$SFLAGS -xarch=v9"
+ CFLAGS="$CFLAGS -xarch=v9" ;;
+ esac
+ fi
+ fi
+ ;;
+ SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
+ CFLAGS=${CFLAGS-"-O2"}
+ LDSHARED=${LDSHARED-"ld"} ;;
+ SunStudio\ 9*) SFLAGS=${CFLAGS-"-fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"}
+ CFLAGS=${CFLAGS-"-fast -xtarget=ultra3 -xarch=v9b"}
+ LDSHARED=${LDSHARED-"cc -xarch=v9b"} ;;
+ UNIX_System_V\ 4.2.0)
+ SFLAGS=${CFLAGS-"-KPIC -O"}
+ CFLAGS=${CFLAGS-"-O"}
+ LDSHARED=${LDSHARED-"cc -G"} ;;
+ UNIX_SV\ 4.2MP)
+ SFLAGS=${CFLAGS-"-Kconform_pic -O"}
+ CFLAGS=${CFLAGS-"-O"}
+ LDSHARED=${LDSHARED-"cc -G"} ;;
+ OpenUNIX\ 5)
+ SFLAGS=${CFLAGS-"-KPIC -O"}
+ CFLAGS=${CFLAGS-"-O"}
+ LDSHARED=${LDSHARED-"cc -G"} ;;
+ AIX*) # Courtesy of dbakker@arrayasolutions.com
+ SFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
+ CFLAGS=${CFLAGS-"-O -qmaxmem=8192"}
+ LDSHARED=${LDSHARED-"xlc -G"} ;;
+ # send working options for other systems to zlib@gzip.org
+ *) SFLAGS=${CFLAGS-"-O"}
+ CFLAGS=${CFLAGS-"-O"}
+ LDSHARED=${LDSHARED-"cc -shared"} ;;
+ esac
+fi
+
+# destination names for shared library if not defined above
+SHAREDLIB=${SHAREDLIB-"libz$shared_ext"}
+SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"}
+SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"}
+
+echo >> configure.log
+
+# see if shared library build supported
+if test $shared -eq 1; then
+ echo Checking for shared library support... | tee -a configure.log
+ # we must test in two steps (cc then ld), required at least on SunOS 4.x
+ if try $CC -w -c $SFLAGS $test.c &&
+ try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
+ echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log
+ elif test -z "$old_cc" -a -z "$old_cflags"; then
+ echo No shared library support. | tee -a configure.log
+ shared=0;
+ else
+ echo 'No shared library support; try without defining CC and CFLAGS' | tee -a configure.log
+ shared=0;
+ fi
+fi
+if test $shared -eq 0; then
+ LDSHARED="$CC"
+ ALL="static"
+ TEST="all teststatic"
+ SHAREDLIB=""
+ SHAREDLIBV=""
+ SHAREDLIBM=""
+ echo Building static library $STATICLIB version $VER with $CC. | tee -a configure.log
+else
+ ALL="static shared"
+ TEST="all teststatic testshared"
+fi
+
+echo >> configure.log
+
+# check for underscores in external names for use by assembler code
+CPP=${CPP-"$CC -E"}
+case $CFLAGS in
+ *ASMV*)
+ echo >> configure.log
+ show "$NM $test.o | grep _hello"
+ if test "`$NM $test.o | grep _hello | tee -a configure.log`" = ""; then
+ CPP="$CPP -DNO_UNDERLINE"
+ echo Checking for underline in external names... No. | tee -a configure.log
+ else
+ echo Checking for underline in external names... Yes. | tee -a configure.log
+ fi ;;
+esac
+
+echo >> configure.log
+
+# check for large file support, and if none, check for fseeko()
+cat > $test.c <<EOF
+#include <sys/types.h>
+off64_t dummy = 0;
+EOF
+if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then
+ CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"
+ SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1"
+ ALL="${ALL} all64"
+ TEST="${TEST} test64"
+ echo "Checking for off64_t... Yes." | tee -a configure.log
+ echo "Checking for fseeko... Yes." | tee -a configure.log
+else
+ echo "Checking for off64_t... No." | tee -a configure.log
+ echo >> configure.log
+ cat > $test.c <<EOF
+#include <stdio.h>
+int main(void) {
+ fseeko(NULL, 0, 0);
+ return 0;
+}
+EOF
+ if try $CC $CFLAGS -o $test $test.c; then
+ echo "Checking for fseeko... Yes." | tee -a configure.log
+ else
+ CFLAGS="${CFLAGS} -DNO_FSEEKO"
+ SFLAGS="${SFLAGS} -DNO_FSEEKO"
+ echo "Checking for fseeko... No." | tee -a configure.log
+ fi
+fi
+
+echo >> configure.log
+
+# check for strerror() for use by gz* functions
+cat > $test.c <<EOF
+#include <string.h>
+#include <errno.h>
+int main() { return strlen(strerror(errno)); }
+EOF
+if try $CC $CFLAGS -o $test $test.c; then
+ echo "Checking for strerror... Yes." | tee -a configure.log
+else
+ CFLAGS="${CFLAGS} -DNO_STRERROR"
+ SFLAGS="${SFLAGS} -DNO_STRERROR"
+ echo "Checking for strerror... No." | tee -a configure.log
+fi
+
+# copy clean zconf.h for subsequent edits
+cp -p zconf.h.in zconf.h
+
+echo >> configure.log
+
+# check for unistd.h and save result in zconf.h
+cat > $test.c <<EOF
+#include <unistd.h>
+int main() { return 0; }
+EOF
+if try $CC -c $CFLAGS $test.c; then
+ sed < zconf.h "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H$.*$ may be/ 1\1 was/" > zconf.temp.h
+ mv zconf.temp.h zconf.h
+ echo "Checking for unistd.h... Yes." | tee -a configure.log
+else
+ echo "Checking for unistd.h... No." | tee -a configure.log
+fi
+
+echo >> configure.log
+
+# check for stdarg.h and save result in zconf.h
+cat > $test.c <<EOF
+#include <stdarg.h>
+int main() { return 0; }
+EOF
+if try $CC -c $CFLAGS $test.c; then
+ sed < zconf.h "/^#ifdef HAVE_STDARG_H.* may be/s/def HAVE_STDARG_H$.*$ may be/ 1\1 was/" > zconf.temp.h
+ mv zconf.temp.h zconf.h
+ echo "Checking for stdarg.h... Yes." | tee -a configure.log
+else
+ echo "Checking for stdarg.h... No." | tee -a configure.log
+fi
+
+# if the z_ prefix was requested, save that in zconf.h
+if test $zprefix -eq 1; then
+ sed < zconf.h "/#ifdef Z_PREFIX.* may be/s/def Z_PREFIX$.*$ may be/ 1\1 was/" > zconf.temp.h
+ mv zconf.temp.h zconf.h
+ echo >> configure.log
+ echo "Using z_ prefix on all symbols." | tee -a configure.log
+fi
+
+# if --solo compilation was requested, save that in zconf.h and remove gz stuff from object lists
+if test $solo -eq 1; then
+ sed '/#define ZCONF_H/a\
+#define Z_SOLO
+
+' < zconf.h > zconf.temp.h
+ mv zconf.temp.h zconf.h
+OBJC='$(OBJZ)'
+PIC_OBJC='$(PIC_OBJZ)'
+fi
+
+# if code coverage testing was requested, use older gcc if defined, e.g. "gcc-4.2" on Mac OS X
+if test $cover -eq 1; then
+ CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage"
+ if test -n "$GCC_CLASSIC"; then
+ CC=$GCC_CLASSIC
+ fi
+fi
+
+echo >> configure.log
+
+# conduct a series of tests to resolve eight possible cases of using "vs" or "s" printf functions
+# (using stdarg or not), with or without "n" (proving size of buffer), and with or without a
+# return value. The most secure result is vsnprintf() with a return value. snprintf() with a
+# return value is secure as well, but then gzprintf() will be limited to 20 arguments.
+cat > $test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+#include "zconf.h"
+int main()
+{
+#ifndef STDC
+ choke me
+#endif
+ return 0;
+}
+EOF
+if try $CC -c $CFLAGS $test.c; then
+ echo "Checking whether to use vsnprintf() or snprintf()... using vsnprintf()." | tee -a configure.log
+
+ echo >> configure.log
+ cat > $test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+int mytest(const char *fmt, ...)
+{
+ char buf20;
+ va_list ap;
+ va_start(ap, fmt);
+ vsnprintf(buf, sizeof(buf), fmt, ap);
+ va_end(ap);
+ return 0;
+}
+int main()
+{
+ return (mytest("Hello%d\n", 1));
+}
+EOF
+ if try $CC $CFLAGS -o $test $test.c; then
+ echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log
+
+ echo >> configure.log
+ cat >$test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+int mytest(const char *fmt, ...)
+{
+ int n;
+ char buf20;
+ va_list ap;
+ va_start(ap, fmt);
+ n = vsnprintf(buf, sizeof(buf), fmt, ap);
+ va_end(ap);
+ return n;
+}
+int main()
+{
+ return (mytest("Hello%d\n", 1));
+}
+EOF
+
+ if try $CC -c $CFLAGS $test.c; then
+ echo "Checking for return value of vsnprintf()... Yes." | tee -a configure.log
+ else
+ CFLAGS="$CFLAGS -DHAS_vsnprintf_void"
+ SFLAGS="$SFLAGS -DHAS_vsnprintf_void"
+ echo "Checking for return value of vsnprintf()... No." | tee -a configure.log
+ echo " WARNING: apparently vsnprintf() does not return a value. zlib" | tee -a configure.log
+ echo " can build but will be open to possible string-format security" | tee -a configure.log
+ echo " vulnerabilities." | tee -a configure.log
+ fi
+ else
+ CFLAGS="$CFLAGS -DNO_vsnprintf"
+ SFLAGS="$SFLAGS -DNO_vsnprintf"
+ echo "Checking for vsnprintf() in stdio.h... No." | tee -a configure.log
+ echo " WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" | tee -a configure.log
+ echo " can build but will be open to possible buffer-overflow security" | tee -a configure.log
+ echo " vulnerabilities." | tee -a configure.log
+
+ echo >> configure.log
+ cat >$test.c <<EOF
+#include <stdio.h>
+#include <stdarg.h>
+int mytest(const char *fmt, ...)
+{
+ int n;
+ char buf20;
+ va_list ap;
+ va_start(ap, fmt);
+ n = vsprintf(buf, fmt, ap);
+ va_end(ap);
+ return n;
+}
+int main()
+{
+ return (mytest("Hello%d\n", 1));
+}
+EOF
+
+ if try $CC -c $CFLAGS $test.c; then
+ echo "Checking for return value of vsprintf()... Yes." | tee -a configure.log
+ else
+ CFLAGS="$CFLAGS -DHAS_vsprintf_void"
+ SFLAGS="$SFLAGS -DHAS_vsprintf_void"
+ echo "Checking for return value of vsprintf()... No." | tee -a configure.log
+ echo " WARNING: apparently vsprintf() does not return a value. zlib" | tee -a configure.log
+ echo " can build but will be open to possible string-format security" | tee -a configure.log
+ echo " vulnerabilities." | tee -a configure.log
+ fi
+ fi
+else
+ echo "Checking whether to use vsnprintf() or snprintf()... using snprintf()." | tee -a configure.log
+
+ echo >> configure.log
+ cat >$test.c <<EOF
+#include <stdio.h>
+int mytest()
+{
+ char buf20;
+ snprintf(buf, sizeof(buf), "%s", "foo");
+ return 0;
+}
+int main()
+{
+ return (mytest());
+}
+EOF
+
+ if try $CC $CFLAGS -o $test $test.c; then
+ echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log
+
+ echo >> configure.log
+ cat >$test.c <<EOF
+#include <stdio.h>
+int mytest()
+{
+ char buf20;
+ return snprintf(buf, sizeof(buf), "%s", "foo");
+}
+int main()
+{
+ return (mytest());
+}
+EOF
+
+ if try $CC -c $CFLAGS $test.c; then
+ echo "Checking for return value of snprintf()... Yes." | tee -a configure.log
+ else
+ CFLAGS="$CFLAGS -DHAS_snprintf_void"
+ SFLAGS="$SFLAGS -DHAS_snprintf_void"
+ echo "Checking for return value of snprintf()... No." | tee -a configure.log
+ echo " WARNING: apparently snprintf() does not return a value. zlib" | tee -a configure.log
+ echo " can build but will be open to possible string-format security" | tee -a configure.log
+ echo " vulnerabilities." | tee -a configure.log
+ fi
+ else
+ CFLAGS="$CFLAGS -DNO_snprintf"
+ SFLAGS="$SFLAGS -DNO_snprintf"
+ echo "Checking for snprintf() in stdio.h... No." | tee -a configure.log
+ echo " WARNING: snprintf() not found, falling back to sprintf(). zlib" | tee -a configure.log
+ echo " can build but will be open to possible buffer-overflow security" | tee -a configure.log
+ echo " vulnerabilities." | tee -a configure.log
+
+ echo >> configure.log
+ cat >$test.c <<EOF
+#include <stdio.h>
+int mytest()
+{
+ char buf20;
+ return sprintf(buf, "%s", "foo");
+}
+int main()
+{
+ return (mytest());
+}
+EOF
+
+ if try $CC -c $CFLAGS $test.c; then
+ echo "Checking for return value of sprintf()... Yes." | tee -a configure.log
+ else
+ CFLAGS="$CFLAGS -DHAS_sprintf_void"
+ SFLAGS="$SFLAGS -DHAS_sprintf_void"
+ echo "Checking for return value of sprintf()... No." | tee -a configure.log
+ echo " WARNING: apparently sprintf() does not return a value. zlib" | tee -a configure.log
+ echo " can build but will be open to possible string-format security" | tee -a configure.log
+ echo " vulnerabilities." | tee -a configure.log
+ fi
+ fi
+fi
+
+# see if we can hide zlib internal symbols that are linked between separate source files
+if test "$gcc" -eq 1; then
+ echo >> configure.log
+ cat > $test.c <<EOF
+#define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+int ZLIB_INTERNAL foo;
+int main()
+{
+ return 0;
+}
+EOF
+ if tryboth $CC -c $CFLAGS $test.c; then
+ CFLAGS="$CFLAGS -DHAVE_HIDDEN"
+ SFLAGS="$SFLAGS -DHAVE_HIDDEN"
+ echo "Checking for attribute(visibility) support... Yes." | tee -a configure.log
+ else
+ echo "Checking for attribute(visibility) support... No." | tee -a configure.log
+ fi
+fi
+
+echo >> configure.log
+
+# find a four-byte unsiged integer type for crc calculations
+cat > $test.c <<EOF
+#include <stdio.h>
+#define is32(n,t) for(n=1,k=0;n;n<<=1,k++);if(k==32){puts(t);return 0;}
+int main() {
+ int k;
+ unsigned i;
+ unsigned long l;
+ unsigned short s;
+ is32(i, "unsigned")
+ is32(l, "unsigned long")
+ is32(s, "unsigned short")
+ return 1;
+}
+EOF
+Z_U4=""
+if try $CC $CFLAGS $test.c -o $test && Z_U4=`./$test` && test -n "$Z_U4"; then
+ sed < zconf.h "/#define Z_U4/s/\/\* \.\/configure may/#define Z_U4 $Z_U4 \/* .\/configure put the/" > zconf.temp.h
+ mv zconf.temp.h zconf.h
+ echo "Looking for a four-byte integer type... Found." | tee -a configure.log
+else
+ echo "Looking for a four-byte integer type... Not found." | tee -a configure.log
+fi
+
+# clean up files produced by running the compiler and linker
+rm -f $test.co $test $test$shared_ext $test.gcno
+
+# show the results in the log
+echo >> configure.log
+echo ALL = $ALL >> configure.log
+echo AR = $AR >> configure.log
+echo ARFLAGS = $ARFLAGS >> configure.log
+echo CC = $CC >> configure.log
+echo CFLAGS = $CFLAGS >> configure.log
+echo CPP = $CPP >> configure.log
+echo EXE = $EXE >> configure.log
+echo LDCONFIG = $LDCONFIG >> configure.log
+echo LDFLAGS = $LDFLAGS >> configure.log
+echo LDSHARED = $LDSHARED >> configure.log
+echo LDSHAREDLIBC = $LDSHAREDLIBC >> configure.log
+echo OBJC = $OBJC >> configure.log
+echo PIC_OBJC = $PIC_OBJC >> configure.log
+echo RANLIB = $RANLIB >> configure.log
+echo SFLAGS = $SFLAGS >> configure.log
+echo SHAREDLIB = $SHAREDLIB >> configure.log
+echo SHAREDLIBM = $SHAREDLIBM >> configure.log
+echo SHAREDLIBV = $SHAREDLIBV >> configure.log
+echo STATICLIB = $STATICLIB >> configure.log
+echo TEST = $TEST >> configure.log
+echo VER = $VER >> configure.log
+echo Z_U4 = $Z_U4 >> configure.log
+echo exec_prefix = $exec_prefix >> configure.log
+echo includedir = $includedir >> configure.log
+echo libdir = $libdir >> configure.log
+echo mandir = $mandir >> configure.log
+echo prefix = $prefix >> configure.log
+echo sharedlibdir = $sharedlibdir >> configure.log
+echo uname = $uname >> configure.log
+echo -------------------- >> configure.log
+echo >> configure.log
+echo >> configure.log
+
+# udpate Makefile with the configure results
+sed < Makefile.in "
+/^CC *=/s#=.*#=$CC#
+/^CFLAGS *=/s#=.*#=$CFLAGS#
+/^SFLAGS *=/s#=.*#=$SFLAGS#
+/^LDFLAGS *=/s#=.*#=$LDFLAGS#
+/^LDSHARED *=/s#=.*#=$LDSHARED#
+/^CPP *=/s#=.*#=$CPP#
+/^STATICLIB *=/s#=.*#=$STATICLIB#
+/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
+/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
+/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
+/^AR *=/s#=.*#=$AR#
+/^ARFLAGS *=/s#=.*#=$ARFLAGS#
+/^RANLIB *=/s#=.*#=$RANLIB#
+/^LDCONFIG *=/s#=.*#=$LDCONFIG#
+/^LDSHAREDLIBC *=/s#=.*#=$LDSHAREDLIBC#
+/^EXE *=/s#=.*#=$EXE#
+/^prefix *=/s#=.*#=$prefix#
+/^exec_prefix *=/s#=.*#=$exec_prefix#
+/^libdir *=/s#=.*#=$libdir#
+/^sharedlibdir *=/s#=.*#=$sharedlibdir#
+/^includedir *=/s#=.*#=$includedir#
+/^mandir *=/s#=.*#=$mandir#
+/^OBJC *=/s#=.*#= $OBJC#
+/^PIC_OBJC *=/s#=.*#= $PIC_OBJC#
+/^all: */s#:.*#: $ALL#
+/^test: */s#:.*#: $TEST#
+" > Makefile
+
+# create zlib.pc with the configure results
+sed < zlib.pc.in "
+/^CC *=/s#=.*#=$CC#
+/^CFLAGS *=/s#=.*#=$CFLAGS#
+/^CPP *=/s#=.*#=$CPP#
+/^LDSHARED *=/s#=.*#=$LDSHARED#
+/^STATICLIB *=/s#=.*#=$STATICLIB#
+/^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
+/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#
+/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
+/^AR *=/s#=.*#=$AR#
+/^ARFLAGS *=/s#=.*#=$ARFLAGS#
+/^RANLIB *=/s#=.*#=$RANLIB#
+/^EXE *=/s#=.*#=$EXE#
+/^prefix *=/s#=.*#=$prefix#
+/^exec_prefix *=/s#=.*#=$exec_prefix#
+/^libdir *=/s#=.*#=$libdir#
+/^sharedlibdir *=/s#=.*#=$sharedlibdir#
+/^includedir *=/s#=.*#=$includedir#
+/^mandir *=/s#=.*#=$mandir#
+/^LDFLAGS *=/s#=.*#=$LDFLAGS#
+" | sed -e "
+s/\@VERSION\@/$VER/g;
+" > zlib.pc

smplayer-0.8.1.tar.bz2/zlib/contrib Added

smplayer-0.8.1.tar.bz2/zlib/contrib/README.contrib Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/ada Added

smplayer-0.8.1.tar.bz2/zlib/contrib/ada/buffer_demo.adb Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/ada/mtest.adb Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/ada/read.adb Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/ada/readme.txt Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/ada/test.adb Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/ada/zlib-streams.adb Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/ada/zlib-streams.ads Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/ada/zlib-thin.adb Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/ada/zlib-thin.ads Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/ada/zlib.adb Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/ada/zlib.ads Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/ada/zlib.gpr Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/amd64 Added

smplayer-0.8.1.tar.bz2/zlib/contrib/amd64/amd64-match.S Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/asm686 Added

smplayer-0.8.1.tar.bz2/zlib/contrib/asm686/README.686 Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/asm686/match.S Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/blast Added

smplayer-0.8.1.tar.bz2/zlib/contrib/blast/Makefile Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/blast/README Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/blast/blast.c Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/blast/blast.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/blast/test.pk Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/blast/test.txt Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/delphi Added

smplayer-0.8.1.tar.bz2/zlib/contrib/delphi/ZLib.pas Added

@@ -0,0 +1,557 @@
+{*******************************************************}
+{ }
+{ Borland Delphi Supplemental Components }
+{ ZLIB Data Compression Interface Unit }
+{ }
+{ Copyright (c) 1997,99 Borland Corporation }
+{ }
+{*******************************************************}
+
+{ Updated for zlib 1.2.x by Cosmin Truta <cosmint@cs.ubbcluj.ro> }
+
+unit ZLib;
+
+interface
+
+uses SysUtils, Classes;
+
+type
+ TAlloc = function (AppData: Pointer; Items, Size: Integer): Pointer; cdecl;
+ TFree = procedure (AppData, Block: Pointer); cdecl;
+
+ // Internal structure. Ignore.
+ TZStreamRec = packed record
+ next_in: PChar; // next input byte
+ avail_in: Integer; // number of bytes available at next_in
+ total_in: Longint; // total nb of input bytes read so far
+
+ next_out: PChar; // next output byte should be put here
+ avail_out: Integer; // remaining free space at next_out
+ total_out: Longint; // total nb of bytes output so far
+
+ msg: PChar; // last error message, NULL if no error
+ internal: Pointer; // not visible by applications
+
+ zalloc: TAlloc; // used to allocate the internal state
+ zfree: TFree; // used to free the internal state
+ AppData: Pointer; // private data object passed to zalloc and zfree
+
+ data_type: Integer; // best guess about the data type: ascii or binary
+ adler: Longint; // adler32 value of the uncompressed data
+ reserved: Longint; // reserved for future use
+ end;
+
+ // Abstract ancestor class
+ TCustomZlibStream = class(TStream)
+ private
+ FStrm: TStream;
+ FStrmPos: Integer;
+ FOnProgress: TNotifyEvent;
+ FZRec: TZStreamRec;
+ FBuffer: array Word of Char;
+ protected
+ procedure Progress(Sender: TObject); dynamic;
+ property OnProgress: TNotifyEvent read FOnProgress write FOnProgress;
+ constructor Create(Strm: TStream);
+ end;
+
+{ TCompressionStream compresses data on the fly as data is written to it, and
+ stores the compressed data to another stream.
+
+ TCompressionStream is write-only and strictly sequential. Reading from the
+ stream will raise an exception. Using Seek to move the stream pointer
+ will raise an exception.
+
+ Output data is cached internally, written to the output stream only when
+ the internal output buffer is full. All pending output data is flushed
+ when the stream is destroyed.
+
+ The Position property returns the number of uncompressed bytes of
+ data that have been written to the stream so far.
+
+ CompressionRate returns the on-the-fly percentage by which the original
+ data has been compressed: (1 - (CompressedBytes / UncompressedBytes)) * 100
+ If raw data size = 100 and compressed data size = 25, the CompressionRate
+ is 75%
+
+ The OnProgress event is called each time the output buffer is filled and
+ written to the output stream. This is useful for updating a progress
+ indicator when you are writing a large chunk of data to the compression
+ stream in a single call.}
+
+
+ TCompressionLevel = (clNone, clFastest, clDefault, clMax);
+
+ TCompressionStream = class(TCustomZlibStream)
+ private
+ function GetCompressionRate: Single;
+ public
+ constructor Create(CompressionLevel: TCompressionLevel; Dest: TStream);
+ destructor Destroy; override;
+ function Read(var Buffer; Count: Longint): Longint; override;
+ function Write(const Buffer; Count: Longint): Longint; override;
+ function Seek(Offset: Longint; Origin: Word): Longint; override;
+ property CompressionRate: Single read GetCompressionRate;
+ property OnProgress;
+ end;
+
+{ TDecompressionStream decompresses data on the fly as data is read from it.
+
+ Compressed data comes from a separate source stream. TDecompressionStream
+ is read-only and unidirectional; you can seek forward in the stream, but not
+ backwards. The special case of setting the stream position to zero is
+ allowed. Seeking forward decompresses data until the requested position in
+ the uncompressed data has been reached. Seeking backwards, seeking relative
+ to the end of the stream, requesting the size of the stream, and writing to
+ the stream will raise an exception.
+
+ The Position property returns the number of bytes of uncompressed data that
+ have been read from the stream so far.
+
+ The OnProgress event is called each time the internal input buffer of
+ compressed data is exhausted and the next block is read from the input stream.
+ This is useful for updating a progress indicator when you are reading a
+ large chunk of data from the decompression stream in a single call.}
+
+ TDecompressionStream = class(TCustomZlibStream)
+ public
+ constructor Create(Source: TStream);
+ destructor Destroy; override;
+ function Read(var Buffer; Count: Longint): Longint; override;
+ function Write(const Buffer; Count: Longint): Longint; override;
+ function Seek(Offset: Longint; Origin: Word): Longint; override;
+ property OnProgress;
+ end;
+
+
+
+{ CompressBuf compresses data, buffer to buffer, in one call.
+ In: InBuf = ptr to compressed data
+ InBytes = number of bytes in InBuf
+ Out: OutBuf = ptr to newly allocated buffer containing decompressed data
+ OutBytes = number of bytes in OutBuf }
+procedure CompressBuf(const InBuf: Pointer; InBytes: Integer;
+ out OutBuf: Pointer; out OutBytes: Integer);
+
+
+{ DecompressBuf decompresses data, buffer to buffer, in one call.
+ In: InBuf = ptr to compressed data
+ InBytes = number of bytes in InBuf
+ OutEstimate = zero, or est. size of the decompressed data
+ Out: OutBuf = ptr to newly allocated buffer containing decompressed data
+ OutBytes = number of bytes in OutBuf }
+procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer;
+ OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer);
+
+{ DecompressToUserBuf decompresses data, buffer to buffer, in one call.
+ In: InBuf = ptr to compressed data
+ InBytes = number of bytes in InBuf
+ Out: OutBuf = ptr to user-allocated buffer to contain decompressed data
+ BufSize = number of bytes in OutBuf }
+procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
+ const OutBuf: Pointer; BufSize: Integer);
+
+const
+ zlib_version = '1.2.7';
+
+type
+ EZlibError = class(Exception);
+ ECompressionError = class(EZlibError);
+ EDecompressionError = class(EZlibError);
+
+implementation
+
+uses ZLibConst;
+
+const
+ Z_NO_FLUSH = 0;
+ Z_PARTIAL_FLUSH = 1;
+ Z_SYNC_FLUSH = 2;
+ Z_FULL_FLUSH = 3;
+ Z_FINISH = 4;
+
+ Z_OK = 0;
+ Z_STREAM_END = 1;
+ Z_NEED_DICT = 2;
+ Z_ERRNO = (-1);
+ Z_STREAM_ERROR = (-2);
+ Z_DATA_ERROR = (-3);
+ Z_MEM_ERROR = (-4);
+ Z_BUF_ERROR = (-5);
+ Z_VERSION_ERROR = (-6);
+
+ Z_NO_COMPRESSION = 0;
+ Z_BEST_SPEED = 1;
+ Z_BEST_COMPRESSION = 9;
+ Z_DEFAULT_COMPRESSION = (-1);
+
+ Z_FILTERED = 1;
+ Z_HUFFMAN_ONLY = 2;
+ Z_RLE = 3;
+ Z_DEFAULT_STRATEGY = 0;
+
+ Z_BINARY = 0;
+ Z_ASCII = 1;
+ Z_UNKNOWN = 2;
+
+ Z_DEFLATED = 8;
+
+
+{$L adler32.obj}
+{$L compress.obj}
+{$L crc32.obj}
+{$L deflate.obj}
+{$L infback.obj}
+{$L inffast.obj}
+{$L inflate.obj}
+{$L inftrees.obj}
+{$L trees.obj}
+{$L uncompr.obj}
+{$L zutil.obj}
+
+procedure adler32; external;
+procedure compressBound; external;
+procedure crc32; external;
+procedure deflateInit2_; external;
+procedure deflateParams; external;
+
+function _malloc(Size: Integer): Pointer; cdecl;
+begin
+ Result := AllocMem(Size);
+end;
+
+procedure _free(Block: Pointer); cdecl;
+begin
+ FreeMem(Block);
+end;
+
+procedure _memset(P: Pointer; B: Byte; count: Integer); cdecl;
+begin
+ FillChar(P^, count, B);
+end;
+
+procedure _memcpy(dest, source: Pointer; count: Integer); cdecl;
+begin
+ Move(source^, dest^, count);
+end;
+
+
+
+// deflate compresses data
+function deflateInit_(var strm: TZStreamRec; level: Integer; version: PChar;
+ recsize: Integer): Integer; external;
+function deflate(var strm: TZStreamRec; flush: Integer): Integer; external;
+function deflateEnd(var strm: TZStreamRec): Integer; external;
+
+// inflate decompresses data
+function inflateInit_(var strm: TZStreamRec; version: PChar;
+ recsize: Integer): Integer; external;
+function inflate(var strm: TZStreamRec; flush: Integer): Integer; external;
+function inflateEnd(var strm: TZStreamRec): Integer; external;
+function inflateReset(var strm: TZStreamRec): Integer; external;
+
+
+function zlibAllocMem(AppData: Pointer; Items, Size: Integer): Pointer; cdecl;
+begin
+// GetMem(Result, Items*Size);
+ Result := AllocMem(Items * Size);
+end;
+
+procedure zlibFreeMem(AppData, Block: Pointer); cdecl;
+begin
+ FreeMem(Block);
+end;
+
+{function zlibCheck(code: Integer): Integer;
+begin
+ Result := code;
+ if code < 0 then
+ raise EZlibError.Create('error'); //!!
+end;}
+
+function CCheck(code: Integer): Integer;
+begin
+ Result := code;
+ if code < 0 then
+ raise ECompressionError.Create('error'); //!!
+end;
+
+function DCheck(code: Integer): Integer;
+begin
+ Result := code;
+ if code < 0 then
+ raise EDecompressionError.Create('error'); //!!
+end;
+
+procedure CompressBuf(const InBuf: Pointer; InBytes: Integer;
+ out OutBuf: Pointer; out OutBytes: Integer);
+var
+ strm: TZStreamRec;
+ P: Pointer;
+begin
+ FillChar(strm, sizeof(strm), 0);
+ strm.zalloc := zlibAllocMem;
+ strm.zfree := zlibFreeMem;
+ OutBytes := ((InBytes + (InBytes div 10) + 12) + 255) and not 255;
+ GetMem(OutBuf, OutBytes);
+ try
+ strm.next_in := InBuf;
+ strm.avail_in := InBytes;
+ strm.next_out := OutBuf;
+ strm.avail_out := OutBytes;
+ CCheck(deflateInit_(strm, Z_BEST_COMPRESSION, zlib_version, sizeof(strm)));
+ try
+ while CCheck(deflate(strm, Z_FINISH)) <> Z_STREAM_END do
+ begin
+ P := OutBuf;
+ Inc(OutBytes, 256);
+ ReallocMem(OutBuf, OutBytes);
+ strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P)));
+ strm.avail_out := 256;
+ end;
+ finally
+ CCheck(deflateEnd(strm));
+ end;
+ ReallocMem(OutBuf, strm.total_out);
+ OutBytes := strm.total_out;
+ except
+ FreeMem(OutBuf);
+ raise
+ end;
+end;
+
+
+procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer;
+ OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer);
+var
+ strm: TZStreamRec;
+ P: Pointer;
+ BufInc: Integer;
+begin
+ FillChar(strm, sizeof(strm), 0);
+ strm.zalloc := zlibAllocMem;
+ strm.zfree := zlibFreeMem;
+ BufInc := (InBytes + 255) and not 255;
+ if OutEstimate = 0 then
+ OutBytes := BufInc
+ else
+ OutBytes := OutEstimate;
+ GetMem(OutBuf, OutBytes);
+ try
+ strm.next_in := InBuf;
+ strm.avail_in := InBytes;
+ strm.next_out := OutBuf;
+ strm.avail_out := OutBytes;
+ DCheck(inflateInit_(strm, zlib_version, sizeof(strm)));
+ try
+ while DCheck(inflate(strm, Z_NO_FLUSH)) <> Z_STREAM_END do
+ begin
+ P := OutBuf;
+ Inc(OutBytes, BufInc);
+ ReallocMem(OutBuf, OutBytes);
+ strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P)));
+ strm.avail_out := BufInc;
+ end;
+ finally
+ DCheck(inflateEnd(strm));
+ end;
+ ReallocMem(OutBuf, strm.total_out);
+ OutBytes := strm.total_out;
+ except
+ FreeMem(OutBuf);
+ raise
+ end;
+end;
+
+procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
+ const OutBuf: Pointer; BufSize: Integer);
+var
+ strm: TZStreamRec;
+begin
+ FillChar(strm, sizeof(strm), 0);
+ strm.zalloc := zlibAllocMem;
+ strm.zfree := zlibFreeMem;
+ strm.next_in := InBuf;
+ strm.avail_in := InBytes;
+ strm.next_out := OutBuf;
+ strm.avail_out := BufSize;
+ DCheck(inflateInit_(strm, zlib_version, sizeof(strm)));
+ try
+ if DCheck(inflate(strm, Z_FINISH)) <> Z_STREAM_END then
+ raise EZlibError.CreateRes(@sTargetBufferTooSmall);
+ finally
+ DCheck(inflateEnd(strm));
+ end;
+end;
+
+// TCustomZlibStream
+
+constructor TCustomZLibStream.Create(Strm: TStream);
+begin
+ inherited Create;
+ FStrm := Strm;
+ FStrmPos := Strm.Position;
+ FZRec.zalloc := zlibAllocMem;
+ FZRec.zfree := zlibFreeMem;
+end;
+
+procedure TCustomZLibStream.Progress(Sender: TObject);
+begin
+ if Assigned(FOnProgress) then FOnProgress(Sender);
+end;
+
+
+// TCompressionStream
+
+constructor TCompressionStream.Create(CompressionLevel: TCompressionLevel;
+ Dest: TStream);
+const
+ Levels: array TCompressionLevel of ShortInt =
+ (Z_NO_COMPRESSION, Z_BEST_SPEED, Z_DEFAULT_COMPRESSION, Z_BEST_COMPRESSION);
+begin
+ inherited Create(Dest);
+ FZRec.next_out := FBuffer;
+ FZRec.avail_out := sizeof(FBuffer);
+ CCheck(deflateInit_(FZRec, LevelsCompressionLevel, zlib_version, sizeof(FZRec)));
+end;
+
+destructor TCompressionStream.Destroy;
+begin
+ FZRec.next_in := nil;
+ FZRec.avail_in := 0;
+ try
+ if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
+ while (CCheck(deflate(FZRec, Z_FINISH)) <> Z_STREAM_END)
+ and (FZRec.avail_out = 0) do
+ begin
+ FStrm.WriteBuffer(FBuffer, sizeof(FBuffer));
+ FZRec.next_out := FBuffer;
+ FZRec.avail_out := sizeof(FBuffer);
+ end;
+ if FZRec.avail_out < sizeof(FBuffer) then
+ FStrm.WriteBuffer(FBuffer, sizeof(FBuffer) - FZRec.avail_out);
+ finally
+ deflateEnd(FZRec);
+ end;
+ inherited Destroy;
+end;
+
+function TCompressionStream.Read(var Buffer; Count: Longint): Longint;
+begin
+ raise ECompressionError.CreateRes(@sInvalidStreamOp);
+end;
+
+function TCompressionStream.Write(const Buffer; Count: Longint): Longint;
+begin
+ FZRec.next_in := @Buffer;
+ FZRec.avail_in := Count;
+ if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
+ while (FZRec.avail_in > 0) do
+ begin
+ CCheck(deflate(FZRec, 0));
+ if FZRec.avail_out = 0 then
+ begin
+ FStrm.WriteBuffer(FBuffer, sizeof(FBuffer));
+ FZRec.next_out := FBuffer;
+ FZRec.avail_out := sizeof(FBuffer);
+ FStrmPos := FStrm.Position;
+ Progress(Self);
+ end;
+ end;
+ Result := Count;
+end;
+
+function TCompressionStream.Seek(Offset: Longint; Origin: Word): Longint;
+begin
+ if (Offset = 0) and (Origin = soFromCurrent) then
+ Result := FZRec.total_in
+ else
+ raise ECompressionError.CreateRes(@sInvalidStreamOp);
+end;
+
+function TCompressionStream.GetCompressionRate: Single;
+begin
+ if FZRec.total_in = 0 then
+ Result := 0
+ else
+ Result := (1.0 - (FZRec.total_out / FZRec.total_in)) * 100.0;
+end;
+
+
+// TDecompressionStream
+
+constructor TDecompressionStream.Create(Source: TStream);
+begin
+ inherited Create(Source);
+ FZRec.next_in := FBuffer;
+ FZRec.avail_in := 0;
+ DCheck(inflateInit_(FZRec, zlib_version, sizeof(FZRec)));
+end;
+
+destructor TDecompressionStream.Destroy;
+begin
+ FStrm.Seek(-FZRec.avail_in, 1);
+ inflateEnd(FZRec);
+ inherited Destroy;
+end;
+
+function TDecompressionStream.Read(var Buffer; Count: Longint): Longint;
+begin
+ FZRec.next_out := @Buffer;
+ FZRec.avail_out := Count;
+ if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos;
+ while (FZRec.avail_out > 0) do
+ begin
+ if FZRec.avail_in = 0 then
+ begin
+ FZRec.avail_in := FStrm.Read(FBuffer, sizeof(FBuffer));
+ if FZRec.avail_in = 0 then
+ begin
+ Result := Count - FZRec.avail_out;
+ Exit;
+ end;
+ FZRec.next_in := FBuffer;
+ FStrmPos := FStrm.Position;
+ Progress(Self);
+ end;
+ CCheck(inflate(FZRec, 0));
+ end;
+ Result := Count;
+end;
+
+function TDecompressionStream.Write(const Buffer; Count: Longint): Longint;
+begin
+ raise EDecompressionError.CreateRes(@sInvalidStreamOp);
+end;
+
+function TDecompressionStream.Seek(Offset: Longint; Origin: Word): Longint;
+var
+ I: Integer;
+ Buf: array 0..4095 of Char;
+begin
+ if (Offset = 0) and (Origin = soFromBeginning) then
+ begin
+ DCheck(inflateReset(FZRec));
+ FZRec.next_in := FBuffer;
+ FZRec.avail_in := 0;
+ FStrm.Position := 0;
+ FStrmPos := 0;
+ end
+ else if ( (Offset >= 0) and (Origin = soFromCurrent)) or
+ ( ((Offset - FZRec.total_out) > 0) and (Origin = soFromBeginning)) then
+ begin
+ if Origin = soFromBeginning then Dec(Offset, FZRec.total_out);
+ if Offset > 0 then
+ begin
+ for I := 1 to Offset div sizeof(Buf) do
+ ReadBuffer(Buf, sizeof(Buf));
+ ReadBuffer(Buf, Offset mod sizeof(Buf));
+ end;
+ end
+ else
+ raise EDecompressionError.CreateRes(@sInvalidStreamOp);
+ Result := FZRec.total_out;
+end;
+
+
+end.

smplayer-0.8.1.tar.bz2/zlib/contrib/delphi/ZLibConst.pas Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/delphi/readme.txt Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/delphi/zlibd32.mak Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib Added

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/DotZLib Added

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/DotZLib.build Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/DotZLib.chm Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/DotZLib.sln Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/DotZLib/CodecBase.cs Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/DotZLib/Deflater.cs Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/DotZLib/DotZLib.cs Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/DotZLib/GZipStream.cs Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/DotZLib/Inflater.cs Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/DotZLib/UnitTests.cs Added

@@ -0,0 +1,274 @@
+//
+// © Copyright Henrik Ravn 2004
+//
+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+using System;
+using System.Collections;
+using System.IO;
+
+// uncomment the define below to include unit tests
+//#define nunit
+#if nunit
+using NUnit.Framework;
+
+// Unit tests for the DotZLib class library
+// ----------------------------------------
+//
+// Use this with NUnit 2 from http://www.nunit.org
+//
+
+namespace DotZLibTests
+{
+ using DotZLib;
+
+ // helper methods
+ internal class Utils
+ {
+ public static bool byteArrEqual( byte lhs, byte rhs )
+ {
+ if (lhs.Length != rhs.Length)
+ return false;
+ for (int i = lhs.Length-1; i >= 0; --i)
+ if (lhsi != rhsi)
+ return false;
+ return true;
+ }
+
+ }
+
+
+ TestFixture
+ public class CircBufferTests
+ {
+ #region Circular buffer tests
+ Test
+ public void SinglePutGet()
+ {
+ CircularBuffer buf = new CircularBuffer(10);
+ Assert.AreEqual( 0, buf.Size );
+ Assert.AreEqual( -1, buf.Get() );
+
+ Assert.IsTrue(buf.Put( 1 ));
+ Assert.AreEqual( 1, buf.Size );
+ Assert.AreEqual( 1, buf.Get() );
+ Assert.AreEqual( 0, buf.Size );
+ Assert.AreEqual( -1, buf.Get() );
+ }
+
+ Test
+ public void BlockPutGet()
+ {
+ CircularBuffer buf = new CircularBuffer(10);
+ byte arr = {1,2,3,4,5,6,7,8,9,10};
+ Assert.AreEqual( 10, buf.Put(arr,0,10) );
+ Assert.AreEqual( 10, buf.Size );
+ Assert.IsFalse( buf.Put(11) );
+ Assert.AreEqual( 1, buf.Get() );
+ Assert.IsTrue( buf.Put(11) );
+
+ byte arr2 = (byte)arr.Clone();
+ Assert.AreEqual( 9, buf.Get(arr2,1,9) );
+ Assert.IsTrue( Utils.byteArrEqual(arr,arr2) );
+ }
+
+ #endregion
+ }
+
+ TestFixture
+ public class ChecksumTests
+ {
+ #region CRC32 Tests
+ Test
+ public void CRC32_Null()
+ {
+ CRC32Checksum crc32 = new CRC32Checksum();
+ Assert.AreEqual( 0, crc32.Value );
+
+ crc32 = new CRC32Checksum(1);
+ Assert.AreEqual( 1, crc32.Value );
+
+ crc32 = new CRC32Checksum(556);
+ Assert.AreEqual( 556, crc32.Value );
+ }
+
+ Test
+ public void CRC32_Data()
+ {
+ CRC32Checksum crc32 = new CRC32Checksum();
+ byte data = { 1,2,3,4,5,6,7 };
+ crc32.Update(data);
+ Assert.AreEqual( 0x70e46888, crc32.Value );
+
+ crc32 = new CRC32Checksum();
+ crc32.Update("penguin");
+ Assert.AreEqual( 0x0e5c1a120, crc32.Value );
+
+ crc32 = new CRC32Checksum(1);
+ crc32.Update("penguin");
+ Assert.AreEqual(0x43b6aa94, crc32.Value);
+
+ }
+ #endregion
+
+ #region Adler tests
+
+ Test
+ public void Adler_Null()
+ {
+ AdlerChecksum adler = new AdlerChecksum();
+ Assert.AreEqual(0, adler.Value);
+
+ adler = new AdlerChecksum(1);
+ Assert.AreEqual( 1, adler.Value );
+
+ adler = new AdlerChecksum(556);
+ Assert.AreEqual( 556, adler.Value );
+ }
+
+ Test
+ public void Adler_Data()
+ {
+ AdlerChecksum adler = new AdlerChecksum(1);
+ byte data = { 1,2,3,4,5,6,7 };
+ adler.Update(data);
+ Assert.AreEqual( 0x5b001d, adler.Value );
+
+ adler = new AdlerChecksum();
+ adler.Update("penguin");
+ Assert.AreEqual(0x0bcf02f6, adler.Value );
+
+ adler = new AdlerChecksum(1);
+ adler.Update("penguin");
+ Assert.AreEqual(0x0bd602f7, adler.Value);
+
+ }
+ #endregion
+ }
+
+ TestFixture
+ public class InfoTests
+ {
+ #region Info tests
+ Test
+ public void Info_Version()
+ {
+ Info info = new Info();
+ Assert.AreEqual("1.2.7", Info.Version);
+ Assert.AreEqual(32, info.SizeOfUInt);
+ Assert.AreEqual(32, info.SizeOfULong);
+ Assert.AreEqual(32, info.SizeOfPointer);
+ Assert.AreEqual(32, info.SizeOfOffset);
+ }
+ #endregion
+ }
+
+ TestFixture
+ public class DeflateInflateTests
+ {
+ #region Deflate tests
+ Test
+ public void Deflate_Init()
+ {
+ using (Deflater def = new Deflater(CompressLevel.Default))
+ {
+ }
+ }
+
+ private ArrayList compressedData = new ArrayList();
+ private uint adler1;
+
+ private ArrayList uncompressedData = new ArrayList();
+ private uint adler2;
+
+ public void CDataAvail(byte data, int startIndex, int count)
+ {
+ for (int i = 0; i < count; ++i)
+ compressedData.Add(datai+startIndex);
+ }
+
+ Test
+ public void Deflate_Compress()
+ {
+ compressedData.Clear();
+
+ byte testData = new byte35000;
+ for (int i = 0; i < testData.Length; ++i)
+ testDatai = 5;
+
+ using (Deflater def = new Deflater((CompressLevel)5))
+ {
+ def.DataAvailable += new DataAvailableHandler(CDataAvail);
+ def.Add(testData);
+ def.Finish();
+ adler1 = def.Checksum;
+ }
+ }
+ #endregion
+
+ #region Inflate tests
+ Test
+ public void Inflate_Init()
+ {
+ using (Inflater inf = new Inflater())
+ {
+ }
+ }
+
+ private void DDataAvail(byte data, int startIndex, int count)
+ {
+ for (int i = 0; i < count; ++i)
+ uncompressedData.Add(datai+startIndex);
+ }
+
+ Test
+ public void Inflate_Expand()
+ {
+ uncompressedData.Clear();
+
+ using (Inflater inf = new Inflater())
+ {
+ inf.DataAvailable += new DataAvailableHandler(DDataAvail);
+ inf.Add((byte)compressedData.ToArray(typeof(byte)));
+ inf.Finish();
+ adler2 = inf.Checksum;
+ }
+ Assert.AreEqual( adler1, adler2 );
+ }
+ #endregion
+ }
+
+ TestFixture
+ public class GZipStreamTests
+ {
+ #region GZipStream test
+ Test
+ public void GZipStream_WriteRead()
+ {
+ using (GZipStream gzOut = new GZipStream("gzstream.gz", CompressLevel.Best))
+ {
+ BinaryWriter writer = new BinaryWriter(gzOut);
+ writer.Write("hi there");
+ writer.Write(Math.PI);
+ writer.Write(42);
+ }
+
+ using (GZipStream gzIn = new GZipStream("gzstream.gz"))
+ {
+ BinaryReader reader = new BinaryReader(gzIn);
+ string s = reader.ReadString();
+ Assert.AreEqual("hi there",s);
+ double d = reader.ReadDouble();
+ Assert.AreEqual(Math.PI, d);
+ int i = reader.ReadInt32();
+ Assert.AreEqual(42,i);
+ }
+
+ }
+ #endregion
+	}
+}
+
+#endif

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/LICENSE_1_0.txt Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/dotzlib/readme.txt Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/gcc_gvmat64 Added

smplayer-0.8.1.tar.bz2/zlib/contrib/gcc_gvmat64/gvmat64.S Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/infback9 Added

smplayer-0.8.1.tar.bz2/zlib/contrib/infback9/README Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/infback9/infback9.c Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/infback9/infback9.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/infback9/inffix9.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/infback9/inflate9.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/infback9/inftree9.c Added

@@ -0,0 +1,324 @@
+/* inftree9.c -- generate Huffman trees for efficient decoding
+ * Copyright (C) 1995-2012 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftree9.h"
+
+#define MAXBITS 15
+
+const char inflate9_copyright =
+ " inflate9 1.2.7 Copyright 1995-2012 Mark Adler ";
+/*
+ If you use the zlib library in a product, an acknowledgment is welcome
+ in the documentation of your product. If for some reason you cannot
+ include such an acknowledgment, I would appreciate that you keep this
+ copyright string in the executable of your product.
+ */
+
+/*
+ Build a set of tables to decode the provided canonical Huffman code.
+ The code lengths are lens0..codes-1. The result starts at *table,
+ whose indices are 0..2^bits-1. work is a writable array of at least
+ lens shorts, which is used as a work area. type is the type of code
+ to be generated, CODES, LENS, or DISTS. On return, zero is success,
+ -1 is an invalid code, and +1 means that ENOUGH isn't enough. table
+ on return points to the next available entry's address. bits is the
+ requested root table index bits, and on return it is the actual root
+ table index bits. It will differ if the request is greater than the
+ longest code or if it is less than the shortest code.
+ */
+int inflate_table9(type, lens, codes, table, bits, work)
+codetype type;
+unsigned short FAR *lens;
+unsigned codes;
+code FAR * FAR *table;
+unsigned FAR *bits;
+unsigned short FAR *work;
+{
+ unsigned len; /* a code's length in bits */
+ unsigned sym; /* index of code symbols */
+ unsigned min, max; /* minimum and maximum code lengths */
+ unsigned root; /* number of index bits for root table */
+ unsigned curr; /* number of index bits for current table */
+ unsigned drop; /* code bits to drop for sub-table */
+ int left; /* number of prefix codes available */
+ unsigned used; /* code entries in table used */
+ unsigned huff; /* Huffman code */
+ unsigned incr; /* for incrementing code, index */
+ unsigned fill; /* index for replicating entries */
+ unsigned low; /* low bits for current root entry */
+ unsigned mask; /* mask for low root bits */
+ code this; /* table entry for duplication */
+ code FAR *next; /* next available space in table */
+ const unsigned short FAR *base; /* base value table to use */
+ const unsigned short FAR *extra; /* extra bits table to use */
+ int end; /* use base and extra for symbol > end */
+ unsigned short countMAXBITS+1; /* number of codes of each length */
+ unsigned short offsMAXBITS+1; /* offsets in table for each length */
+ static const unsigned short lbase31 = { /* Length codes 257..285 base */
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17,
+ 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115,
+ 131, 163, 195, 227, 3, 0, 0};
+ static const unsigned short lext31 = { /* Length codes 257..285 extra */
+ 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
+ 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
+ 133, 133, 133, 133, 144, 78, 68};
+ static const unsigned short dbase32 = { /* Distance codes 0..31 base */
+ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
+ 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
+ 4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153};
+ static const unsigned short dext32 = { /* Distance codes 0..31 extra */
+ 128, 128, 128, 128, 129, 129, 130, 130, 131, 131, 132, 132,
+ 133, 133, 134, 134, 135, 135, 136, 136, 137, 137, 138, 138,
+ 139, 139, 140, 140, 141, 141, 142, 142};
+
+ /*
+ Process a set of code lengths to create a canonical Huffman code. The
+ code lengths are lens0..codes-1. Each length corresponds to the
+ symbols 0..codes-1. The Huffman code is generated by first sorting the
+ symbols by length from short to long, and retaining the symbol order
+ for codes with equal lengths. Then the code starts with all zero bits
+ for the first code of the shortest length, and the codes are integer
+ increments for the same length, and zeros are appended as the length
+ increases. For the deflate format, these bits are stored backwards
+ from their more natural integer increment ordering, and so when the
+ decoding tables are built in the large loop below, the integer codes
+ are incremented backwards.
+
+ This routine assumes, but does not check, that all of the entries in
+ lens are in the range 0..MAXBITS. The caller must assure this.
+ 1..MAXBITS is interpreted as that code length. zero means that that
+ symbol does not occur in this code.
+
+ The codes are sorted by computing a count of codes for each length,
+ creating from that a table of starting indices for each length in the
+ sorted table, and then entering the symbols in order in the sorted
+ table. The sorted table is work, with that space being provided by
+ the caller.
+
+ The length counts are used for other purposes as well, i.e. finding
+ the minimum and maximum length codes, determining if there are any
+ codes at all, checking for a valid set of lengths, and looking ahead
+ at length counts to determine sub-table sizes when building the
+ decoding tables.
+ */
+
+ /* accumulate lengths for codes (assumes lens all in 0..MAXBITS) */
+ for (len = 0; len <= MAXBITS; len++)
+ countlen = 0;
+ for (sym = 0; sym < codes; sym++)
+ countlenssym++;
+
+ /* bound code lengths, force root to be within code lengths */
+ root = *bits;
+ for (max = MAXBITS; max >= 1; max--)
+ if (countmax != 0) break;
+ if (root > max) root = max;
+ if (max == 0) return -1; /* no codes! */
+ for (min = 1; min <= MAXBITS; min++)
+ if (countmin != 0) break;
+ if (root < min) root = min;
+
+ /* check for an over-subscribed or incomplete set of lengths */
+ left = 1;
+ for (len = 1; len <= MAXBITS; len++) {
+ left <<= 1;
+ left -= countlen;
+ if (left < 0) return -1; /* over-subscribed */
+ }
+ if (left > 0 && (type == CODES || max != 1))
+ return -1; /* incomplete set */
+
+ /* generate offsets into symbol table for each length for sorting */
+ offs1 = 0;
+ for (len = 1; len < MAXBITS; len++)
+ offslen + 1 = offslen + countlen;
+
+ /* sort symbols by length, by symbol order within each length */
+ for (sym = 0; sym < codes; sym++)
+ if (lenssym != 0) workoffslenssym++ = (unsigned short)sym;
+
+ /*
+ Create and fill in decoding tables. In this loop, the table being
+ filled is at next and has curr index bits. The code being used is huff
+ with length len. That code is converted to an index by dropping drop
+ bits off of the bottom. For codes where len is less than drop + curr,
+ those top drop + curr - len bits are incremented through all values to
+ fill the table with replicated entries.
+
+ root is the number of index bits for the root table. When len exceeds
+ root, sub-tables are created pointed to by the root entry with an index
+ of the low root bits of huff. This is saved in low to check for when a
+ new sub-table should be started. drop is zero when the root table is
+ being filled, and drop is root when sub-tables are being filled.
+
+ When a new sub-table is needed, it is necessary to look ahead in the
+ code lengths to determine what size sub-table is needed. The length
+ counts are used for this, and so count is decremented as codes are
+ entered in the tables.
+
+ used keeps track of how many table entries have been allocated from the
+ provided *table space. It is checked for LENS and DIST tables against
+ the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
+ the initial root table size constants. See the comments in inftree9.h
+ for more information.
+
+ sym increments through all symbols, and the loop terminates when
+ all codes of length max, i.e. all codes, have been processed. This
+ routine permits incomplete codes, so another loop after this one fills
+ in the rest of the decoding tables with invalid code markers.
+ */
+
+ /* set up for code type */
+ switch (type) {
+ case CODES:
+ base = extra = work; /* dummy value--not used */
+ end = 19;
+ break;
+ case LENS:
+ base = lbase;
+ base -= 257;
+ extra = lext;
+ extra -= 257;
+ end = 256;
+ break;
+ default: /* DISTS */
+ base = dbase;
+ extra = dext;
+ end = -1;
+ }
+
+ /* initialize state for loop */
+ huff = 0; /* starting code */
+ sym = 0; /* starting code symbol */
+ len = min; /* starting code length */
+ next = *table; /* current table to fill in */
+ curr = root; /* current table index bits */
+ drop = 0; /* current bits to drop from code for index */
+ low = (unsigned)(-1); /* trigger new sub-table when len > root */
+ used = 1U << root; /* use root table entries */
+ mask = used - 1; /* mask for comparing low */
+
+ /* check available table space */
+ if ((type == LENS && used >= ENOUGH_LENS) ||
+ (type == DISTS && used >= ENOUGH_DISTS))
+ return 1;
+
+ /* process all codes and make table entries */
+ for (;;) {
+ /* create table entry */
+ this.bits = (unsigned char)(len - drop);
+ if ((int)(worksym) < end) {
+ this.op = (unsigned char)0;
+ this.val = worksym;
+ }
+ else if ((int)(worksym) > end) {
+ this.op = (unsigned char)(extraworksym);
+ this.val = baseworksym;
+ }
+ else {
+ this.op = (unsigned char)(32 + 64); /* end of block */
+ this.val = 0;
+ }
+
+ /* replicate for those indices with low len bits equal to huff */
+ incr = 1U << (len - drop);
+ fill = 1U << curr;
+ do {
+ fill -= incr;
+ next(huff >> drop) + fill = this;
+ } while (fill != 0);
+
+ /* backwards increment the len-bit code huff */
+ incr = 1U << (len - 1);
+ while (huff & incr)
+ incr >>= 1;
+ if (incr != 0) {
+ huff &= incr - 1;
+ huff += incr;
+ }
+ else
+ huff = 0;
+
+ /* go to next symbol, update count, len */
+ sym++;
+ if (--(countlen) == 0) {
+ if (len == max) break;
+ len = lensworksym;
+ }
+
+ /* create new sub-table if needed */
+ if (len > root && (huff & mask) != low) {
+ /* if first time, transition to sub-tables */
+ if (drop == 0)
+ drop = root;
+
+ /* increment past last table */
+ next += 1U << curr;
+
+ /* determine length of next table */
+ curr = len - drop;
+ left = (int)(1 << curr);
+ while (curr + drop < max) {
+ left -= countcurr + drop;
+ if (left <= 0) break;
+ curr++;
+ left <<= 1;
+ }
+
+ /* check for enough space */
+ used += 1U << curr;
+ if ((type == LENS && used >= ENOUGH_LENS) ||
+ (type == DISTS && used >= ENOUGH_DISTS))
+ return 1;
+
+ /* point entry in root table to sub-table */
+ low = huff & mask;
+ (*table)low.op = (unsigned char)curr;
+ (*table)low.bits = (unsigned char)root;
+ (*table)low.val = (unsigned short)(next - *table);
+ }
+ }
+
+ /*
+ Fill in rest of table for incomplete codes. This loop is similar to the
+ loop above in incrementing huff for table indices. It is assumed that
+ len is equal to curr + drop, so there is no loop needed to increment
+ through high index bits. When the current sub-table is filled, the loop
+ drops back to the root table to fill in any remaining entries there.
+ */
+ this.op = (unsigned char)64; /* invalid code marker */
+ this.bits = (unsigned char)(len - drop);
+ this.val = (unsigned short)0;
+ while (huff != 0) {
+ /* when done with sub-table, drop back to root table */
+ if (drop != 0 && (huff & mask) != low) {
+ drop = 0;
+ len = root;
+ next = *table;
+ curr = root;
+ this.bits = (unsigned char)len;
+ }
+
+ /* put invalid code marker in table */
+ nexthuff >> drop = this;
+
+ /* backwards increment the len-bit code huff */
+ incr = 1U << (len - 1);
+ while (huff & incr)
+ incr >>= 1;
+ if (incr != 0) {
+ huff &= incr - 1;
+ huff += incr;
+ }
+ else
+ huff = 0;
+ }
+
+ /* set return parameters */
+ *table += used;
+ *bits = root;
+ return 0;
+}

smplayer-0.8.1.tar.bz2/zlib/contrib/infback9/inftree9.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/inflate86 Added

smplayer-0.8.1.tar.bz2/zlib/contrib/inflate86/inffas86.c Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/inflate86/inffast.S Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/iostream Added

smplayer-0.8.1.tar.bz2/zlib/contrib/iostream/test.cpp Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/iostream/zfstream.cpp Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/iostream/zfstream.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/iostream2 Added

smplayer-0.8.1.tar.bz2/zlib/contrib/iostream2/zstream.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/iostream2/zstream_test.cpp Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/iostream3 Added

smplayer-0.8.1.tar.bz2/zlib/contrib/iostream3/README Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/iostream3/TODO Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/iostream3/test.cc Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/iostream3/zfstream.cc Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/iostream3/zfstream.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/masmx64 Added

smplayer-0.8.1.tar.bz2/zlib/contrib/masmx64/bld_ml64.bat Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/masmx64/gvmat64.asm Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/masmx64/inffas8664.c Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/masmx64/inffasx64.asm Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/masmx64/readme.txt Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/masmx86 Added

smplayer-0.8.1.tar.bz2/zlib/contrib/masmx86/bld_ml32.bat Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/masmx86/inffas32.asm Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/masmx86/match686.asm Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/masmx86/readme.txt Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip Added

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/Makefile Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/Makefile.am Added

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/MiniZip64_Changes.txt Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/MiniZip64_info.txt Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/configure.ac Added

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/crypt.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/ioapi.c Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/ioapi.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/iowin32.c Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/iowin32.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/make_vms.com Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/miniunz.c Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/minizip.c Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/minizip.pc.in Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/mztools.c Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/mztools.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/unzip.c Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/unzip.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/zip.c Added

@@ -0,0 +1,2007 @@
+/* zip.c -- IO on .zip files using zlib
+ Version 1.1, February 14h, 2010
+ part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
+
+ Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+ Modifications for Zip64 support
+ Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+ For more info read MiniZip_info.txt
+
+ Changes
+ Oct-2009 - Mathias Svensson - Remove old C style function prototypes
+ Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
+ Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
+ Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
+ It is used when recreting zip archive with RAW when deleting items from a zip.
+ ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed.
+ Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
+ Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
+
+*/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include "zlib.h"
+#include "zip.h"
+
+#ifdef STDC
+# include <stddef.h>
+# include <string.h>
+# include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+ extern int errno;
+#else
+# include <errno.h>
+#endif
+
+
+#ifndef local
+# define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+#ifndef VERSIONMADEBY
+# define VERSIONMADEBY (0x0) /* platform depedent */
+#endif
+
+#ifndef Z_BUFSIZE
+#define Z_BUFSIZE (64*1024) //(16384)
+#endif
+
+#ifndef Z_MAXFILENAMEINZIP
+#define Z_MAXFILENAMEINZIP (256)
+#endif
+
+#ifndef ALLOC
+# define ALLOC(size) (malloc(size))
+#endif
+#ifndef TRYFREE
+# define TRYFREE(p) {if (p) free(p);}
+#endif
+
+/*
+#define SIZECENTRALDIRITEM (0x2e)
+#define SIZEZIPLOCALHEADER (0x1e)
+*/
+
+/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
+
+
+// NOT sure that this work on ALL platform
+#define MAKEULONG64(a, b) ((ZPOS64_T)(((unsigned long)(a)) | ((ZPOS64_T)((unsigned long)(b))) << 32))
+
+#ifndef SEEK_CUR
+#define SEEK_CUR 1
+#endif
+
+#ifndef SEEK_END
+#define SEEK_END 2
+#endif
+
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
+
+#ifndef DEF_MEM_LEVEL
+#if MAX_MEM_LEVEL >= 8
+# define DEF_MEM_LEVEL 8
+#else
+# define DEF_MEM_LEVEL MAX_MEM_LEVEL
+#endif
+#endif
+const char zip_copyright =" zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+
+
+#define SIZEDATA_INDATABLOCK (4096-(4*4))
+
+#define LOCALHEADERMAGIC (0x04034b50)
+#define CENTRALHEADERMAGIC (0x02014b50)
+#define ENDHEADERMAGIC (0x06054b50)
+#define ZIP64ENDHEADERMAGIC (0x6064b50)
+#define ZIP64ENDLOCHEADERMAGIC (0x7064b50)
+
+#define FLAG_LOCALHEADER_OFFSET (0x06)
+#define CRC_LOCALHEADER_OFFSET (0x0e)
+
+#define SIZECENTRALHEADER (0x2e) /* 46 */
+
+typedef struct linkedlist_datablock_internal_s
+{
+ struct linkedlist_datablock_internal_s* next_datablock;
+ uLong avail_in_this_block;
+ uLong filled_in_this_block;
+ uLong unused; /* for future use and alignement */
+ unsigned char dataSIZEDATA_INDATABLOCK;
+} linkedlist_datablock_internal;
+
+typedef struct linkedlist_data_s
+{
+ linkedlist_datablock_internal* first_block;
+ linkedlist_datablock_internal* last_block;
+} linkedlist_data;
+
+
+typedef struct
+{
+ z_stream stream; /* zLib stream structure for inflate */
+#ifdef HAVE_BZIP2
+ bz_stream bstream; /* bzLib stream structure for bziped */
+#endif
+
+ int stream_initialised; /* 1 is stream is initialised */
+ uInt pos_in_buffered_data; /* last written byte in buffered_data */
+
+ ZPOS64_T pos_local_header; /* offset of the local header of the file
+ currenty writing */
+ char* central_header; /* central header data for the current file */
+ uLong size_centralExtra;
+ uLong size_centralheader; /* size of the central header for cur file */
+ uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */
+ uLong flag; /* flag of the file currently writing */
+
+ int method; /* compression method of file currenty wr.*/
+ int raw; /* 1 for directly writing raw data */
+ Byte buffered_dataZ_BUFSIZE;/* buffer contain compressed data to be writ*/
+ uLong dosDate;
+ uLong crc32;
+ int encrypt;
+ int zip64; /* Add ZIP64 extened information in the extra field */
+ ZPOS64_T pos_zip64extrainfo;
+ ZPOS64_T totalCompressedData;
+ ZPOS64_T totalUncompressedData;
+#ifndef NOCRYPT
+ unsigned long keys3; /* keys defining the pseudo-random sequence */
+ const unsigned long* pcrc_32_tab;
+ int crypt_header_size;
+#endif
+} curfile64_info;
+
+typedef struct
+{
+ zlib_filefunc64_32_def z_filefunc;
+ voidpf filestream; /* io structore of the zipfile */
+ linkedlist_data central_dir;/* datablock with central dir in construction*/
+ int in_opened_file_inzip; /* 1 if a file in the zip is currently writ.*/
+ curfile64_info ci; /* info on the file curretly writing */
+
+ ZPOS64_T begin_pos; /* position of the beginning of the zipfile */
+ ZPOS64_T add_position_when_writting_offset;
+ ZPOS64_T number_entry;
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+ char *globalcomment;
+#endif
+
+} zip64_internal;
+
+
+#ifndef NOCRYPT
+#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
+#include "crypt.h"
+#endif
+
+local linkedlist_datablock_internal* allocate_new_datablock()
+{
+ linkedlist_datablock_internal* ldi;
+ ldi = (linkedlist_datablock_internal*)
+ ALLOC(sizeof(linkedlist_datablock_internal));
+ if (ldi!=NULL)
+ {
+ ldi->next_datablock = NULL ;
+ ldi->filled_in_this_block = 0 ;
+ ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
+ }
+ return ldi;
+}
+
+local void free_datablock(linkedlist_datablock_internal* ldi)
+{
+ while (ldi!=NULL)
+ {
+ linkedlist_datablock_internal* ldinext = ldi->next_datablock;
+ TRYFREE(ldi);
+ ldi = ldinext;
+ }
+}
+
+local void init_linkedlist(linkedlist_data* ll)
+{
+ ll->first_block = ll->last_block = NULL;
+}
+
+local void free_linkedlist(linkedlist_data* ll)
+{
+ free_datablock(ll->first_block);
+ ll->first_block = ll->last_block = NULL;
+}
+
+
+local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
+{
+ linkedlist_datablock_internal* ldi;
+ const unsigned char* from_copy;
+
+ if (ll==NULL)
+ return ZIP_INTERNALERROR;
+
+ if (ll->last_block == NULL)
+ {
+ ll->first_block = ll->last_block = allocate_new_datablock();
+ if (ll->first_block == NULL)
+ return ZIP_INTERNALERROR;
+ }
+
+ ldi = ll->last_block;
+ from_copy = (unsigned char*)buf;
+
+ while (len>0)
+ {
+ uInt copy_this;
+ uInt i;
+ unsigned char* to_copy;
+
+ if (ldi->avail_in_this_block==0)
+ {
+ ldi->next_datablock = allocate_new_datablock();
+ if (ldi->next_datablock == NULL)
+ return ZIP_INTERNALERROR;
+ ldi = ldi->next_datablock ;
+ ll->last_block = ldi;
+ }
+
+ if (ldi->avail_in_this_block < len)
+ copy_this = (uInt)ldi->avail_in_this_block;
+ else
+ copy_this = (uInt)len;
+
+ to_copy = &(ldi->dataldi->filled_in_this_block);
+
+ for (i=0;i<copy_this;i++)
+ *(to_copy+i)=*(from_copy+i);
+
+ ldi->filled_in_this_block += copy_this;
+ ldi->avail_in_this_block -= copy_this;
+ from_copy += copy_this ;
+ len -= copy_this;
+ }
+ return ZIP_OK;
+}
+
+
+
+/****************************************************************************/
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+/* ===========================================================================
+ Inputs a long in LSB order to the given file
+ nbByte == 1, 2 ,4 or 8 (byte, short or long, ZPOS64_T)
+*/
+
+local int zip64local_putValue OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte));
+local int zip64local_putValue (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte)
+{
+ unsigned char buf8;
+ int n;
+ for (n = 0; n < nbByte; n++)
+ {
+ bufn = (unsigned char)(x & 0xff);
+ x >>= 8;
+ }
+ if (x != 0)
+ { /* data overflow - hack for ZIP64 (X Roche) */
+ for (n = 0; n < nbByte; n++)
+ {
+ bufn = 0xff;
+ }
+ }
+
+ if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
+ return ZIP_ERRNO;
+ else
+ return ZIP_OK;
+}
+
+local void zip64local_putValue_inmemory OF((void* dest, ZPOS64_T x, int nbByte));
+local void zip64local_putValue_inmemory (void* dest, ZPOS64_T x, int nbByte)
+{
+ unsigned char* buf=(unsigned char*)dest;
+ int n;
+ for (n = 0; n < nbByte; n++) {
+ bufn = (unsigned char)(x & 0xff);
+ x >>= 8;
+ }
+
+ if (x != 0)
+ { /* data overflow - hack for ZIP64 */
+ for (n = 0; n < nbByte; n++)
+ {
+ bufn = 0xff;
+ }
+ }
+}
+
+/****************************************************************************/
+
+
+local uLong zip64local_TmzDateToDosDate(const tm_zip* ptm)
+{
+ uLong year = (uLong)ptm->tm_year;
+ if (year>=1980)
+ year-=1980;
+ else if (year>=80)
+ year-=80;
+ return
+ (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
+ ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
+}
+
+
+/****************************************************************************/
+
+local int zip64local_getByte OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi));
+
+local int zip64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def,voidpf filestream,int* pi)
+{
+ unsigned char c;
+ int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
+ if (err==1)
+ {
+ *pi = (int)c;
+ return ZIP_OK;
+ }
+ else
+ {
+ if (ZERROR64(*pzlib_filefunc_def,filestream))
+ return ZIP_ERRNO;
+ else
+ return ZIP_EOF;
+ }
+}
+
+
+/* ===========================================================================
+ Reads a long in LSB order from the given gz_stream. Sets
+*/
+local int zip64local_getShort OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
+
+local int zip64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
+{
+ uLong x ;
+ int i = 0;
+ int err;
+
+ err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+ x = (uLong)i;
+
+ if (err==ZIP_OK)
+ err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+ x += ((uLong)i)<<8;
+
+ if (err==ZIP_OK)
+ *pX = x;
+ else
+ *pX = 0;
+ return err;
+}
+
+local int zip64local_getLong OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
+
+local int zip64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
+{
+ uLong x ;
+ int i = 0;
+ int err;
+
+ err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+ x = (uLong)i;
+
+ if (err==ZIP_OK)
+ err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+ x += ((uLong)i)<<8;
+
+ if (err==ZIP_OK)
+ err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+ x += ((uLong)i)<<16;
+
+ if (err==ZIP_OK)
+ err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+ x += ((uLong)i)<<24;
+
+ if (err==ZIP_OK)
+ *pX = x;
+ else
+ *pX = 0;
+ return err;
+}
+
+local int zip64local_getLong64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX));
+
+
+local int zip64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX)
+{
+ ZPOS64_T x;
+ int i = 0;
+ int err;
+
+ err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+ x = (ZPOS64_T)i;
+
+ if (err==ZIP_OK)
+ err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+ x += ((ZPOS64_T)i)<<8;
+
+ if (err==ZIP_OK)
+ err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+ x += ((ZPOS64_T)i)<<16;
+
+ if (err==ZIP_OK)
+ err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+ x += ((ZPOS64_T)i)<<24;
+
+ if (err==ZIP_OK)
+ err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+ x += ((ZPOS64_T)i)<<32;
+
+ if (err==ZIP_OK)
+ err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+ x += ((ZPOS64_T)i)<<40;
+
+ if (err==ZIP_OK)
+ err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+ x += ((ZPOS64_T)i)<<48;
+
+ if (err==ZIP_OK)
+ err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
+ x += ((ZPOS64_T)i)<<56;
+
+ if (err==ZIP_OK)
+ *pX = x;
+ else
+ *pX = 0;
+
+ return err;
+}
+
+#ifndef BUFREADCOMMENT
+#define BUFREADCOMMENT (0x400)
+#endif
+/*
+ Locate the Central directory of a zipfile (at the end, just before
+ the global comment)
+*/
+local ZPOS64_T zip64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+
+local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+ unsigned char* buf;
+ ZPOS64_T uSizeFile;
+ ZPOS64_T uBackRead;
+ ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+ ZPOS64_T uPosFound=0;
+
+ if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+ return 0;
+
+
+ uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+ if (uMaxBack>uSizeFile)
+ uMaxBack = uSizeFile;
+
+ buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+ if (buf==NULL)
+ return 0;
+
+ uBackRead = 4;
+ while (uBackRead<uMaxBack)
+ {
+ uLong uReadSize;
+ ZPOS64_T uReadPos ;
+ int i;
+ if (uBackRead+BUFREADCOMMENT>uMaxBack)
+ uBackRead = uMaxBack;
+ else
+ uBackRead+=BUFREADCOMMENT;
+ uReadPos = uSizeFile-uBackRead ;
+
+ uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+ (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+ if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+ break;
+
+ if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+ break;
+
+ for (i=(int)uReadSize-3; (i--)>0;)
+ if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+ ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+ {
+ uPosFound = uReadPos+i;
+ break;
+ }
+
+ if (uPosFound!=0)
+ break;
+ }
+ TRYFREE(buf);
+ return uPosFound;
+}
+
+/*
+Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
+the global comment)
+*/
+local ZPOS64_T zip64local_SearchCentralDir64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
+
+local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
+{
+ unsigned char* buf;
+ ZPOS64_T uSizeFile;
+ ZPOS64_T uBackRead;
+ ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
+ ZPOS64_T uPosFound=0;
+ uLong uL;
+ ZPOS64_T relativeOffset;
+
+ if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+ return 0;
+
+ uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
+
+ if (uMaxBack>uSizeFile)
+ uMaxBack = uSizeFile;
+
+ buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+ if (buf==NULL)
+ return 0;
+
+ uBackRead = 4;
+ while (uBackRead<uMaxBack)
+ {
+ uLong uReadSize;
+ ZPOS64_T uReadPos;
+ int i;
+ if (uBackRead+BUFREADCOMMENT>uMaxBack)
+ uBackRead = uMaxBack;
+ else
+ uBackRead+=BUFREADCOMMENT;
+ uReadPos = uSizeFile-uBackRead ;
+
+ uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+ (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
+ if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+ break;
+
+ if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+ break;
+
+ for (i=(int)uReadSize-3; (i--)>0;)
+ {
+ // Signature "0x07064b50" Zip64 end of central directory locater
+ if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
+ {
+ uPosFound = uReadPos+i;
+ break;
+ }
+ }
+
+ if (uPosFound!=0)
+ break;
+ }
+
+ TRYFREE(buf);
+ if (uPosFound == 0)
+ return 0;
+
+ /* Zip64 end of central directory locator */
+ if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
+ return 0;
+
+ /* the signature, already checked */
+ if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+ return 0;
+
+ /* number of the disk with the start of the zip64 end of central directory */
+ if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+ return 0;
+ if (uL != 0)
+ return 0;
+
+ /* relative offset of the zip64 end of central directory record */
+ if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
+ return 0;
+
+ /* total number of disks */
+ if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+ return 0;
+ if (uL != 1)
+ return 0;
+
+ /* Goto Zip64 end of central directory record */
+ if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
+ return 0;
+
+ /* the signature */
+ if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
+ return 0;
+
+ if (uL != 0x06064b50) // signature of 'Zip64 end of central directory'
+ return 0;
+
+ return relativeOffset;
+}
+
+int LoadCentralDirectoryRecord(zip64_internal* pziinit)
+{
+ int err=ZIP_OK;
+ ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+
+ ZPOS64_T size_central_dir; /* size of the central directory */
+ ZPOS64_T offset_central_dir; /* offset of start of central directory */
+ ZPOS64_T central_pos;
+ uLong uL;
+
+ uLong number_disk; /* number of the current dist, used for
+ spaning ZIP, unsupported, always 0*/
+ uLong number_disk_with_CD; /* number the the disk with central dir, used
+ for spaning ZIP, unsupported, always 0*/
+ ZPOS64_T number_entry;
+ ZPOS64_T number_entry_CD; /* total number of entries in
+ the central dir
+ (same than number_entry on nospan) */
+ uLong VersionMadeBy;
+ uLong VersionNeeded;
+ uLong size_comment;
+
+ int hasZIP64Record = 0;
+
+ // check first if we find a ZIP64 record
+ central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream);
+ if(central_pos > 0)
+ {
+ hasZIP64Record = 1;
+ }
+ else if(central_pos == 0)
+ {
+ central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
+ }
+
+/* disable to allow appending to empty ZIP archive
+ if (central_pos==0)
+ err=ZIP_ERRNO;
+*/
+
+ if(hasZIP64Record)
+ {
+ ZPOS64_T sizeEndOfCentralDirectory;
+ if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
+ err=ZIP_ERRNO;
+
+ /* the signature, already checked */
+ if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
+ err=ZIP_ERRNO;
+
+ /* size of zip64 end of central directory record */
+ if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
+ err=ZIP_ERRNO;
+
+ /* version made by */
+ if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
+ err=ZIP_ERRNO;
+
+ /* version needed to extract */
+ if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
+ err=ZIP_ERRNO;
+
+ /* number of this disk */
+ if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
+ err=ZIP_ERRNO;
+
+ /* number of the disk with the start of the central directory */
+ if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
+ err=ZIP_ERRNO;
+
+ /* total number of entries in the central directory on this disk */
+ if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
+ err=ZIP_ERRNO;
+
+ /* total number of entries in the central directory */
+ if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
+ err=ZIP_ERRNO;
+
+ if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
+ err=ZIP_BADZIPFILE;
+
+ /* size of the central directory */
+ if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
+ err=ZIP_ERRNO;
+
+ /* offset of start of central directory with respect to the
+ starting disk number */
+ if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
+ err=ZIP_ERRNO;
+
+ // TODO..
+ // read the comment from the standard central header.
+ size_comment = 0;
+ }
+ else
+ {
+ // Read End of central Directory info
+ if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+ err=ZIP_ERRNO;
+
+ /* the signature, already checked */
+ if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
+ err=ZIP_ERRNO;
+
+ /* number of this disk */
+ if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
+ err=ZIP_ERRNO;
+
+ /* number of the disk with the start of the central directory */
+ if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
+ err=ZIP_ERRNO;
+
+ /* total number of entries in the central dir on this disk */
+ number_entry = 0;
+ if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+ err=ZIP_ERRNO;
+ else
+ number_entry = uL;
+
+ /* total number of entries in the central dir */
+ number_entry_CD = 0;
+ if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+ err=ZIP_ERRNO;
+ else
+ number_entry_CD = uL;
+
+ if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
+ err=ZIP_BADZIPFILE;
+
+ /* size of the central directory */
+ size_central_dir = 0;
+ if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+ err=ZIP_ERRNO;
+ else
+ size_central_dir = uL;
+
+ /* offset of start of central directory with respect to the starting disk number */
+ offset_central_dir = 0;
+ if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
+ err=ZIP_ERRNO;
+ else
+ offset_central_dir = uL;
+
+
+ /* zipfile global comment length */
+ if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &size_comment)!=ZIP_OK)
+ err=ZIP_ERRNO;
+ }
+
+ if ((central_pos<offset_central_dir+size_central_dir) &&
+ (err==ZIP_OK))
+ err=ZIP_BADZIPFILE;
+
+ if (err!=ZIP_OK)
+ {
+ ZCLOSE64(pziinit->z_filefunc, pziinit->filestream);
+ return ZIP_ERRNO;
+ }
+
+ if (size_comment>0)
+ {
+ pziinit->globalcomment = (char*)ALLOC(size_comment+1);
+ if (pziinit->globalcomment)
+ {
+ size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
+ pziinit->globalcommentsize_comment=0;
+ }
+ }
+
+ byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
+ pziinit->add_position_when_writting_offset = byte_before_the_zipfile;
+
+ {
+ ZPOS64_T size_central_dir_to_read = size_central_dir;
+ size_t buf_size = SIZEDATA_INDATABLOCK;
+ void* buf_read = (void*)ALLOC(buf_size);
+ if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
+ err=ZIP_ERRNO;
+
+ while ((size_central_dir_to_read>0) && (err==ZIP_OK))
+ {
+ ZPOS64_T read_this = SIZEDATA_INDATABLOCK;
+ if (read_this > size_central_dir_to_read)
+ read_this = size_central_dir_to_read;
+
+ if (ZREAD64(pziinit->z_filefunc, pziinit->filestream,buf_read,(uLong)read_this) != read_this)
+ err=ZIP_ERRNO;
+
+ if (err==ZIP_OK)
+ err = add_data_in_datablock(&pziinit->central_dir,buf_read, (uLong)read_this);
+
+ size_central_dir_to_read-=read_this;
+ }
+ TRYFREE(buf_read);
+ }
+ pziinit->begin_pos = byte_before_the_zipfile;
+ pziinit->number_entry = number_entry_CD;
+
+ if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET) != 0)
+ err=ZIP_ERRNO;
+
+ return err;
+}
+
+
+#endif /* !NO_ADDFILEINEXISTINGZIP*/
+
+
+/************************************************************/
+extern zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def)
+{
+ zip64_internal ziinit;
+ zip64_internal* zi;
+ int err=ZIP_OK;
+
+ ziinit.z_filefunc.zseek32_file = NULL;
+ ziinit.z_filefunc.ztell32_file = NULL;
+ if (pzlib_filefunc64_32_def==NULL)
+ fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64);
+ else
+ ziinit.z_filefunc = *pzlib_filefunc64_32_def;
+
+ ziinit.filestream = ZOPEN64(ziinit.z_filefunc,
+ pathname,
+ (append == APPEND_STATUS_CREATE) ?
+ (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
+ (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
+
+ if (ziinit.filestream == NULL)
+ return NULL;
+
+ if (append == APPEND_STATUS_CREATEAFTER)
+ ZSEEK64(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END);
+
+ ziinit.begin_pos = ZTELL64(ziinit.z_filefunc,ziinit.filestream);
+ ziinit.in_opened_file_inzip = 0;
+ ziinit.ci.stream_initialised = 0;
+ ziinit.number_entry = 0;
+ ziinit.add_position_when_writting_offset = 0;
+ init_linkedlist(&(ziinit.central_dir));
+
+
+
+ zi = (zip64_internal*)ALLOC(sizeof(zip64_internal));
+ if (zi==NULL)
+ {
+ ZCLOSE64(ziinit.z_filefunc,ziinit.filestream);
+ return NULL;
+ }
+
+ /* now we add file in a zipfile */
+# ifndef NO_ADDFILEINEXISTINGZIP
+ ziinit.globalcomment = NULL;
+ if (append == APPEND_STATUS_ADDINZIP)
+ {
+ // Read and Cache Central Directory Records
+ err = LoadCentralDirectoryRecord(&ziinit);
+ }
+
+ if (globalcomment)
+ {
+ *globalcomment = ziinit.globalcomment;
+ }
+# endif /* !NO_ADDFILEINEXISTINGZIP*/
+
+ if (err != ZIP_OK)
+ {
+# ifndef NO_ADDFILEINEXISTINGZIP
+ TRYFREE(ziinit.globalcomment);
+# endif /* !NO_ADDFILEINEXISTINGZIP*/
+ TRYFREE(zi);
+ return NULL;
+ }
+ else
+ {
+ *zi = ziinit;
+ return (zipFile)zi;
+ }
+}
+
+extern zipFile ZEXPORT zipOpen2 (const char *pathname, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def)
+{
+ if (pzlib_filefunc32_def != NULL)
+ {
+ zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+ fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
+ return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
+ }
+ else
+ return zipOpen3(pathname, append, globalcomment, NULL);
+}
+
+extern zipFile ZEXPORT zipOpen2_64 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def)
+{
+ if (pzlib_filefunc_def != NULL)
+ {
+ zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
+ zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
+ zlib_filefunc64_32_def_fill.ztell32_file = NULL;
+ zlib_filefunc64_32_def_fill.zseek32_file = NULL;
+ return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
+ }
+ else
+ return zipOpen3(pathname, append, globalcomment, NULL);
+}
+
+
+
+extern zipFile ZEXPORT zipOpen (const char* pathname, int append)
+{
+ return zipOpen3((const void*)pathname,append,NULL,NULL);
+}
+
+extern zipFile ZEXPORT zipOpen64 (const void* pathname, int append)
+{
+ return zipOpen3(pathname,append,NULL,NULL);
+}
+
+int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
+{
+ /* write the local header */
+ int err;
+ uInt size_filename = (uInt)strlen(filename);
+ uInt size_extrafield = size_extrafield_local;
+
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC, 4);
+
+ if (err==ZIP_OK)
+ {
+ if(zi->ci.zip64)
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);/* version needed to extract */
+ else
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
+ }
+
+ if (err==ZIP_OK)
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
+
+ if (err==ZIP_OK)
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
+
+ if (err==ZIP_OK)
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
+
+ // CRC / Compressed size / Uncompressed size will be filled in later and rewritten later
+ if (err==ZIP_OK)
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
+ if (err==ZIP_OK)
+ {
+ if(zi->ci.zip64)
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* compressed size, unknown */
+ else
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
+ }
+ if (err==ZIP_OK)
+ {
+ if(zi->ci.zip64)
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* uncompressed size, unknown */
+ else
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
+ }
+
+ if (err==ZIP_OK)
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
+
+ if(zi->ci.zip64)
+ {
+ size_extrafield += 20;
+ }
+
+ if (err==ZIP_OK)
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield,2);
+
+ if ((err==ZIP_OK) && (size_filename > 0))
+ {
+ if (ZWRITE64(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
+ err = ZIP_ERRNO;
+ }
+
+ if ((err==ZIP_OK) && (size_extrafield_local > 0))
+ {
+ if (ZWRITE64(zi->z_filefunc, zi->filestream, extrafield_local, size_extrafield_local) != size_extrafield_local)
+ err = ZIP_ERRNO;
+ }
+
+
+ if ((err==ZIP_OK) && (zi->ci.zip64))
+ {
+ // write the Zip64 extended info
+ short HeaderID = 1;
+ short DataSize = 16;
+ ZPOS64_T CompressedSize = 0;
+ ZPOS64_T UncompressedSize = 0;
+
+ // Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file)
+ zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
+
+ err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
+ err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
+
+ err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
+ err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
+ }
+
+ return err;
+}
+
+/*
+ NOTE.
+ When writing RAW the ZIP64 extended information in extrafield_local and extrafield_global needs to be stripped
+ before calling this function it can be done with zipRemoveExtraInfoBlock
+
+ It is not done here because then we need to realloc a new buffer since parameters are 'const' and I want to minimize
+ unnecessary allocations.
+ */
+extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+ const void* extrafield_local, uInt size_extrafield_local,
+ const void* extrafield_global, uInt size_extrafield_global,
+ const char* comment, int method, int level, int raw,
+ int windowBits,int memLevel, int strategy,
+ const char* password, uLong crcForCrypting,
+ uLong versionMadeBy, uLong flagBase, int zip64)
+{
+ zip64_internal* zi;
+ uInt size_filename;
+ uInt size_comment;
+ uInt i;
+ int err = ZIP_OK;
+
+# ifdef NOCRYPT
+ (crcForCrypting);
+ if (password != NULL)
+ return ZIP_PARAMERROR;
+# endif
+
+ if (file == NULL)
+ return ZIP_PARAMERROR;
+
+#ifdef HAVE_BZIP2
+ if ((method!=0) && (method!=Z_DEFLATED) && (method!=Z_BZIP2ED))
+ return ZIP_PARAMERROR;
+#else
+ if ((method!=0) && (method!=Z_DEFLATED))
+ return ZIP_PARAMERROR;
+#endif
+
+ zi = (zip64_internal*)file;
+
+ if (zi->in_opened_file_inzip == 1)
+ {
+ err = zipCloseFileInZip (file);
+ if (err != ZIP_OK)
+ return err;
+ }
+
+ if (filename==NULL)
+ filename="-";
+
+ if (comment==NULL)
+ size_comment = 0;
+ else
+ size_comment = (uInt)strlen(comment);
+
+ size_filename = (uInt)strlen(filename);
+
+ if (zipfi == NULL)
+ zi->ci.dosDate = 0;
+ else
+ {
+ if (zipfi->dosDate != 0)
+ zi->ci.dosDate = zipfi->dosDate;
+ else
+ zi->ci.dosDate = zip64local_TmzDateToDosDate(&zipfi->tmz_date);
+ }
+
+ zi->ci.flag = flagBase;
+ if ((level==8) || (level==9))
+ zi->ci.flag |= 2;
+ if (level==2)
+ zi->ci.flag |= 4;
+ if (level==1)
+ zi->ci.flag |= 6;
+ if (password != NULL)
+ zi->ci.flag |= 1;
+
+ zi->ci.crc32 = 0;
+ zi->ci.method = method;
+ zi->ci.encrypt = 0;
+ zi->ci.stream_initialised = 0;
+ zi->ci.pos_in_buffered_data = 0;
+ zi->ci.raw = raw;
+ zi->ci.pos_local_header = ZTELL64(zi->z_filefunc,zi->filestream);
+
+ zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + size_extrafield_global + size_comment;
+ zi->ci.size_centralExtraFree = 32; // Extra space we have reserved in case we need to add ZIP64 extra info data
+
+ zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader + zi->ci.size_centralExtraFree);
+
+ zi->ci.size_centralExtra = size_extrafield_global;
+ zip64local_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
+ /* version info */
+ zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2);
+ zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
+ zip64local_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
+ zip64local_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
+ zip64local_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
+ zip64local_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
+ zip64local_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
+ zip64local_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
+ zip64local_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
+ zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
+ zip64local_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
+ zip64local_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
+
+ if (zipfi==NULL)
+ zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
+ else
+ zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
+
+ if (zipfi==NULL)
+ zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
+ else
+ zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
+
+ if(zi->ci.pos_local_header >= 0xffffffff)
+ zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
+ else
+ zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writting_offset,4);
+
+ for (i=0;i<size_filename;i++)
+ *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
+
+ for (i=0;i<size_extrafield_global;i++)
+ *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
+ *(((const char*)extrafield_global)+i);
+
+ for (i=0;i<size_comment;i++)
+ *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
+ size_extrafield_global+i) = *(comment+i);
+ if (zi->ci.central_header == NULL)
+ return ZIP_INTERNALERROR;
+
+ zi->ci.zip64 = zip64;
+ zi->ci.totalCompressedData = 0;
+ zi->ci.totalUncompressedData = 0;
+ zi->ci.pos_zip64extrainfo = 0;
+
+ err = Write_LocalFileHeader(zi, filename, size_extrafield_local, extrafield_local);
+
+#ifdef HAVE_BZIP2
+ zi->ci.bstream.avail_in = (uInt)0;
+ zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+ zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+ zi->ci.bstream.total_in_hi32 = 0;
+ zi->ci.bstream.total_in_lo32 = 0;
+ zi->ci.bstream.total_out_hi32 = 0;
+ zi->ci.bstream.total_out_lo32 = 0;
+#endif
+
+ zi->ci.stream.avail_in = (uInt)0;
+ zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+ zi->ci.stream.next_out = zi->ci.buffered_data;
+ zi->ci.stream.total_in = 0;
+ zi->ci.stream.total_out = 0;
+ zi->ci.stream.data_type = Z_BINARY;
+
+#ifdef HAVE_BZIP2
+ if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED || zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+#else
+ if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+#endif
+ {
+ if(zi->ci.method == Z_DEFLATED)
+ {
+ zi->ci.stream.zalloc = (alloc_func)0;
+ zi->ci.stream.zfree = (free_func)0;
+ zi->ci.stream.opaque = (voidpf)0;
+
+ if (windowBits>0)
+ windowBits = -windowBits;
+
+ err = deflateInit2(&zi->ci.stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
+
+ if (err==Z_OK)
+ zi->ci.stream_initialised = Z_DEFLATED;
+ }
+ else if(zi->ci.method == Z_BZIP2ED)
+ {
+#ifdef HAVE_BZIP2
+ // Init BZip stuff here
+ zi->ci.bstream.bzalloc = 0;
+ zi->ci.bstream.bzfree = 0;
+ zi->ci.bstream.opaque = (voidpf)0;
+
+ err = BZ2_bzCompressInit(&zi->ci.bstream, level, 0,35);
+ if(err == BZ_OK)
+ zi->ci.stream_initialised = Z_BZIP2ED;
+#endif
+ }
+
+ }
+
+# ifndef NOCRYPT
+ zi->ci.crypt_header_size = 0;
+ if ((err==Z_OK) && (password != NULL))
+ {
+ unsigned char bufHeadRAND_HEAD_LEN;
+ unsigned int sizeHead;
+ zi->ci.encrypt = 1;
+ zi->ci.pcrc_32_tab = get_crc_table();
+ /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
+
+ sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
+ zi->ci.crypt_header_size = sizeHead;
+
+ if (ZWRITE64(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
+ err = ZIP_ERRNO;
+ }
+# endif
+
+ if (err==Z_OK)
+ zi->in_opened_file_inzip = 1;
+ return err;
+}
+
+extern int ZEXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+ const void* extrafield_local, uInt size_extrafield_local,
+ const void* extrafield_global, uInt size_extrafield_global,
+ const char* comment, int method, int level, int raw,
+ int windowBits,int memLevel, int strategy,
+ const char* password, uLong crcForCrypting,
+ uLong versionMadeBy, uLong flagBase)
+{
+ return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+ extrafield_local, size_extrafield_local,
+ extrafield_global, size_extrafield_global,
+ comment, method, level, raw,
+ windowBits, memLevel, strategy,
+ password, crcForCrypting, versionMadeBy, flagBase, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+ const void* extrafield_local, uInt size_extrafield_local,
+ const void* extrafield_global, uInt size_extrafield_global,
+ const char* comment, int method, int level, int raw,
+ int windowBits,int memLevel, int strategy,
+ const char* password, uLong crcForCrypting)
+{
+ return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+ extrafield_local, size_extrafield_local,
+ extrafield_global, size_extrafield_global,
+ comment, method, level, raw,
+ windowBits, memLevel, strategy,
+ password, crcForCrypting, VERSIONMADEBY, 0, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+ const void* extrafield_local, uInt size_extrafield_local,
+ const void* extrafield_global, uInt size_extrafield_global,
+ const char* comment, int method, int level, int raw,
+ int windowBits,int memLevel, int strategy,
+ const char* password, uLong crcForCrypting, int zip64)
+{
+ return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+ extrafield_local, size_extrafield_local,
+ extrafield_global, size_extrafield_global,
+ comment, method, level, raw,
+ windowBits, memLevel, strategy,
+ password, crcForCrypting, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+ const void* extrafield_local, uInt size_extrafield_local,
+ const void* extrafield_global, uInt size_extrafield_global,
+ const char* comment, int method, int level, int raw)
+{
+ return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+ extrafield_local, size_extrafield_local,
+ extrafield_global, size_extrafield_global,
+ comment, method, level, raw,
+ -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+ NULL, 0, VERSIONMADEBY, 0, 0);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
+ const void* extrafield_local, uInt size_extrafield_local,
+ const void* extrafield_global, uInt size_extrafield_global,
+ const char* comment, int method, int level, int raw, int zip64)
+{
+ return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+ extrafield_local, size_extrafield_local,
+ extrafield_global, size_extrafield_global,
+ comment, method, level, raw,
+ -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+ NULL, 0, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+ const void* extrafield_local, uInt size_extrafield_local,
+ const void*extrafield_global, uInt size_extrafield_global,
+ const char* comment, int method, int level, int zip64)
+{
+ return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+ extrafield_local, size_extrafield_local,
+ extrafield_global, size_extrafield_global,
+ comment, method, level, 0,
+ -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+ NULL, 0, VERSIONMADEBY, 0, zip64);
+}
+
+extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
+ const void* extrafield_local, uInt size_extrafield_local,
+ const void*extrafield_global, uInt size_extrafield_global,
+ const char* comment, int method, int level)
+{
+ return zipOpenNewFileInZip4_64 (file, filename, zipfi,
+ extrafield_local, size_extrafield_local,
+ extrafield_global, size_extrafield_global,
+ comment, method, level, 0,
+ -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
+ NULL, 0, VERSIONMADEBY, 0, 0);
+}
+
+local int zip64FlushWriteBuffer(zip64_internal* zi)
+{
+ int err=ZIP_OK;
+
+ if (zi->ci.encrypt != 0)
+ {
+#ifndef NOCRYPT
+ uInt i;
+ int t;
+ for (i=0;i<zi->ci.pos_in_buffered_data;i++)
+ zi->ci.buffered_datai = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_datai,t);
+#endif
+ }
+
+ if (ZWRITE64(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data) != zi->ci.pos_in_buffered_data)
+ err = ZIP_ERRNO;
+
+ zi->ci.totalCompressedData += zi->ci.pos_in_buffered_data;
+
+#ifdef HAVE_BZIP2
+ if(zi->ci.method == Z_BZIP2ED)
+ {
+ zi->ci.totalUncompressedData += zi->ci.bstream.total_in_lo32;
+ zi->ci.bstream.total_in_lo32 = 0;
+ zi->ci.bstream.total_in_hi32 = 0;
+ }
+ else
+#endif
+ {
+ zi->ci.totalUncompressedData += zi->ci.stream.total_in;
+ zi->ci.stream.total_in = 0;
+ }
+
+
+ zi->ci.pos_in_buffered_data = 0;
+
+ return err;
+}
+
+extern int ZEXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned int len)
+{
+ zip64_internal* zi;
+ int err=ZIP_OK;
+
+ if (file == NULL)
+ return ZIP_PARAMERROR;
+ zi = (zip64_internal*)file;
+
+ if (zi->in_opened_file_inzip == 0)
+ return ZIP_PARAMERROR;
+
+ zi->ci.crc32 = crc32(zi->ci.crc32,buf,(uInt)len);
+
+#ifdef HAVE_BZIP2
+ if(zi->ci.method == Z_BZIP2ED && (!zi->ci.raw))
+ {
+ zi->ci.bstream.next_in = (void*)buf;
+ zi->ci.bstream.avail_in = len;
+ err = BZ_RUN_OK;
+
+ while ((err==BZ_RUN_OK) && (zi->ci.bstream.avail_in>0))
+ {
+ if (zi->ci.bstream.avail_out == 0)
+ {
+ if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+ err = ZIP_ERRNO;
+ zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+ zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+ }
+
+
+ if(err != BZ_RUN_OK)
+ break;
+
+ if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+ {
+ uLong uTotalOutBefore_lo = zi->ci.bstream.total_out_lo32;
+// uLong uTotalOutBefore_hi = zi->ci.bstream.total_out_hi32;
+ err=BZ2_bzCompress(&zi->ci.bstream, BZ_RUN);
+
+ zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore_lo) ;
+ }
+ }
+
+ if(err == BZ_RUN_OK)
+ err = ZIP_OK;
+ }
+ else
+#endif
+ {
+ zi->ci.stream.next_in = (Bytef*)buf;
+ zi->ci.stream.avail_in = len;
+
+ while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
+ {
+ if (zi->ci.stream.avail_out == 0)
+ {
+ if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+ err = ZIP_ERRNO;
+ zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+ zi->ci.stream.next_out = zi->ci.buffered_data;
+ }
+
+
+ if(err != ZIP_OK)
+ break;
+
+ if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+ {
+ uLong uTotalOutBefore = zi->ci.stream.total_out;
+ err=deflate(&zi->ci.stream, Z_NO_FLUSH);
+ if(uTotalOutBefore > zi->ci.stream.total_out)
+ {
+ int bBreak = 0;
+ bBreak++;
+ }
+
+ zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+ }
+ else
+ {
+ uInt copy_this,i;
+ if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
+ copy_this = zi->ci.stream.avail_in;
+ else
+ copy_this = zi->ci.stream.avail_out;
+
+ for (i = 0; i < copy_this; i++)
+ *(((char*)zi->ci.stream.next_out)+i) =
+ *(((const char*)zi->ci.stream.next_in)+i);
+ {
+ zi->ci.stream.avail_in -= copy_this;
+ zi->ci.stream.avail_out-= copy_this;
+ zi->ci.stream.next_in+= copy_this;
+ zi->ci.stream.next_out+= copy_this;
+ zi->ci.stream.total_in+= copy_this;
+ zi->ci.stream.total_out+= copy_this;
+ zi->ci.pos_in_buffered_data += copy_this;
+ }
+ }
+ }// while(...)
+ }
+
+ return err;
+}
+
+extern int ZEXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32)
+{
+ return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
+}
+
+extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32)
+{
+ zip64_internal* zi;
+ ZPOS64_T compressed_size;
+ uLong invalidValue = 0xffffffff;
+ short datasize = 0;
+ int err=ZIP_OK;
+
+ if (file == NULL)
+ return ZIP_PARAMERROR;
+ zi = (zip64_internal*)file;
+
+ if (zi->in_opened_file_inzip == 0)
+ return ZIP_PARAMERROR;
+ zi->ci.stream.avail_in = 0;
+
+ if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+ {
+ while (err==ZIP_OK)
+ {
+ uLong uTotalOutBefore;
+ if (zi->ci.stream.avail_out == 0)
+ {
+ if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+ err = ZIP_ERRNO;
+ zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
+ zi->ci.stream.next_out = zi->ci.buffered_data;
+ }
+ uTotalOutBefore = zi->ci.stream.total_out;
+ err=deflate(&zi->ci.stream, Z_FINISH);
+ zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
+ }
+ }
+ else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+ {
+#ifdef HAVE_BZIP2
+ err = BZ_FINISH_OK;
+ while (err==BZ_FINISH_OK)
+ {
+ uLong uTotalOutBefore;
+ if (zi->ci.bstream.avail_out == 0)
+ {
+ if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
+ err = ZIP_ERRNO;
+ zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
+ zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
+ }
+ uTotalOutBefore = zi->ci.bstream.total_out_lo32;
+ err=BZ2_bzCompress(&zi->ci.bstream, BZ_FINISH);
+ if(err == BZ_STREAM_END)
+ err = Z_STREAM_END;
+
+ zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore);
+ }
+
+ if(err == BZ_FINISH_OK)
+ err = ZIP_OK;
+#endif
+ }
+
+ if (err==Z_STREAM_END)
+ err=ZIP_OK; /* this is normal */
+
+ if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
+ {
+ if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
+ err = ZIP_ERRNO;
+ }
+
+ if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
+ {
+ int tmp_err = deflateEnd(&zi->ci.stream);
+ if (err == ZIP_OK)
+ err = tmp_err;
+ zi->ci.stream_initialised = 0;
+ }
+#ifdef HAVE_BZIP2
+ else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
+ {
+ int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
+ if (err==ZIP_OK)
+ err = tmperr;
+ zi->ci.stream_initialised = 0;
+ }
+#endif
+
+ if (!zi->ci.raw)
+ {
+ crc32 = (uLong)zi->ci.crc32;
+ uncompressed_size = zi->ci.totalUncompressedData;
+ }
+ compressed_size = zi->ci.totalCompressedData;
+
+# ifndef NOCRYPT
+ compressed_size += zi->ci.crypt_header_size;
+# endif
+
+ // update Current Item crc and sizes,
+ if(compressed_size >= 0xffffffff || uncompressed_size >= 0xffffffff || zi->ci.pos_local_header >= 0xffffffff)
+ {
+ /*version Made by*/
+ zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)45,2);
+ /*version needed*/
+ zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)45,2);
+
+ }
+
+ zip64local_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
+
+
+ if(compressed_size >= 0xffffffff)
+ zip64local_putValue_inmemory(zi->ci.central_header+20, invalidValue,4); /*compr size*/
+ else
+ zip64local_putValue_inmemory(zi->ci.central_header+20, compressed_size,4); /*compr size*/
+
+ /// set internal file attributes field
+ if (zi->ci.stream.data_type == Z_ASCII)
+ zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
+
+ if(uncompressed_size >= 0xffffffff)
+ zip64local_putValue_inmemory(zi->ci.central_header+24, invalidValue,4); /*uncompr size*/
+ else
+ zip64local_putValue_inmemory(zi->ci.central_header+24, uncompressed_size,4); /*uncompr size*/
+
+ // Add ZIP64 extra info field for uncompressed size
+ if(uncompressed_size >= 0xffffffff)
+ datasize += 8;
+
+ // Add ZIP64 extra info field for compressed size
+ if(compressed_size >= 0xffffffff)
+ datasize += 8;
+
+ // Add ZIP64 extra info field for relative offset to local file header of current file
+ if(zi->ci.pos_local_header >= 0xffffffff)
+ datasize += 8;
+
+ if(datasize > 0)
+ {
+ char* p = NULL;
+
+ if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
+ {
+ // we can not write more data to the buffer that we have room for.
+ return ZIP_BADZIPFILE;
+ }
+
+ p = zi->ci.central_header + zi->ci.size_centralheader;
+
+ // Add Extra Information Header for 'ZIP64 information'
+ zip64local_putValue_inmemory(p, 0x0001, 2); // HeaderID
+ p += 2;
+ zip64local_putValue_inmemory(p, datasize, 2); // DataSize
+ p += 2;
+
+ if(uncompressed_size >= 0xffffffff)
+ {
+ zip64local_putValue_inmemory(p, uncompressed_size, 8);
+ p += 8;
+ }
+
+ if(compressed_size >= 0xffffffff)
+ {
+ zip64local_putValue_inmemory(p, compressed_size, 8);
+ p += 8;
+ }
+
+ if(zi->ci.pos_local_header >= 0xffffffff)
+ {
+ zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
+ p += 8;
+ }
+
+ // Update how much extra free space we got in the memory buffer
+ // and increase the centralheader size so the new ZIP64 fields are included
+ // ( 4 below is the size of HeaderID and DataSize field )
+ zi->ci.size_centralExtraFree -= datasize + 4;
+ zi->ci.size_centralheader += datasize + 4;
+
+ // Update the extra info size field
+ zi->ci.size_centralExtra += datasize + 4;
+ zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
+ }
+
+ if (err==ZIP_OK)
+ err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
+
+ free(zi->ci.central_header);
+
+ if (err==ZIP_OK)
+ {
+ // Update the LocalFileHeader with the new values.
+
+ ZPOS64_T cur_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
+
+ if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
+ err = ZIP_ERRNO;
+
+ if (err==ZIP_OK)
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
+
+ if(uncompressed_size >= 0xffffffff || compressed_size >= 0xffffffff )
+ {
+ if(zi->ci.pos_zip64extrainfo > 0)
+ {
+ // Update the size in the ZIP64 extended field.
+ if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_zip64extrainfo + 4,ZLIB_FILEFUNC_SEEK_SET)!=0)
+ err = ZIP_ERRNO;
+
+ if (err==ZIP_OK) /* compressed size, unknown */
+ err = zip64local_putValue(&zi->z_filefunc, zi->filestream, uncompressed_size, 8);
+
+ if (err==ZIP_OK) /* uncompressed size, unknown */
+ err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8);
+ }
+ else
+ err = ZIP_BADZIPFILE; // Caller passed zip64 = 0, so no room for zip64 info -> fatal
+ }
+ else
+ {
+ if (err==ZIP_OK) /* compressed size, unknown */
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
+
+ if (err==ZIP_OK) /* uncompressed size, unknown */
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
+ }
+
+ if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
+ err = ZIP_ERRNO;
+ }
+
+ zi->number_entry ++;
+ zi->in_opened_file_inzip = 0;
+
+ return err;
+}
+
+extern int ZEXPORT zipCloseFileInZip (zipFile file)
+{
+ return zipCloseFileInZipRaw (file,0,0);
+}
+
+int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
+{
+ int err = ZIP_OK;
+ ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
+
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
+
+ /*num disks*/
+ if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+ /*relative offset*/
+ if (err==ZIP_OK) /* Relative offset to the Zip64EndOfCentralDirectory */
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
+
+ /*total disks*/ /* Do not support spawning of disk so always say 1 here*/
+ if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)1,4);
+
+ return err;
+}
+
+int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+{
+ int err = ZIP_OK;
+
+ uLong Zip64DataSize = 44;
+
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDHEADERMAGIC,4);
+
+ if (err==ZIP_OK) /* size of this 'zip64 end of central directory' */
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)Zip64DataSize,8); // why ZPOS64_T of this ?
+
+ if (err==ZIP_OK) /* version made by */
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
+
+ if (err==ZIP_OK) /* version needed */
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
+
+ if (err==ZIP_OK) /* number of this disk */
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+ if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
+
+ if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
+ err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
+
+ if (err==ZIP_OK) /* total number of entries in the central dir */
+ err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
+
+ if (err==ZIP_OK) /* size of the central directory */
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
+
+ if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
+ {
+ ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
+ }
+ return err;
+}
+int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
+{
+ int err = ZIP_OK;
+
+ /*signature*/
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
+
+ if (err==ZIP_OK) /* number of this disk */
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+
+ if (err==ZIP_OK) /* number of the disk with the start of the central directory */
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
+
+ if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
+ {
+ {
+ if(zi->number_entry >= 0xFFFF)
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
+ else
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+ }
+ }
+
+ if (err==ZIP_OK) /* total number of entries in the central dir */
+ {
+ if(zi->number_entry >= 0xFFFF)
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
+ else
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
+ }
+
+ if (err==ZIP_OK) /* size of the central directory */
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
+
+ if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
+ {
+ ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+ if(pos >= 0xffffffff)
+ {
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
+ }
+ else
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
+ }
+
+ return err;
+}
+
+int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
+{
+ int err = ZIP_OK;
+ uInt size_global_comment = 0;
+
+ if(global_comment != NULL)
+ size_global_comment = (uInt)strlen(global_comment);
+
+ err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
+
+ if (err == ZIP_OK && size_global_comment > 0)
+ {
+ if (ZWRITE64(zi->z_filefunc,zi->filestream, global_comment, size_global_comment) != size_global_comment)
+ err = ZIP_ERRNO;
+ }
+ return err;
+}
+
+extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
+{
+ zip64_internal* zi;
+ int err = 0;
+ uLong size_centraldir = 0;
+ ZPOS64_T centraldir_pos_inzip;
+ ZPOS64_T pos;
+
+ if (file == NULL)
+ return ZIP_PARAMERROR;
+
+ zi = (zip64_internal*)file;
+
+ if (zi->in_opened_file_inzip == 1)
+ {
+ err = zipCloseFileInZip (file);
+ }
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+ if (global_comment==NULL)
+ global_comment = zi->globalcomment;
+#endif
+
+ centraldir_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
+
+ if (err==ZIP_OK)
+ {
+ linkedlist_datablock_internal* ldi = zi->central_dir.first_block;
+ while (ldi!=NULL)
+ {
+ if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
+ {
+ if (ZWRITE64(zi->z_filefunc,zi->filestream, ldi->data, ldi->filled_in_this_block) != ldi->filled_in_this_block)
+ err = ZIP_ERRNO;
+ }
+
+ size_centraldir += ldi->filled_in_this_block;
+ ldi = ldi->next_datablock;
+ }
+ }
+ free_linkedlist(&(zi->central_dir));
+
+ pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
+ if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
+ {
+ ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
+ Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
+
+ Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
+ }
+
+ if (err==ZIP_OK)
+ err = Write_EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
+
+ if(err == ZIP_OK)
+ err = Write_GlobalComment(zi, global_comment);
+
+ if (ZCLOSE64(zi->z_filefunc,zi->filestream) != 0)
+ if (err == ZIP_OK)
+ err = ZIP_ERRNO;
+
+#ifndef NO_ADDFILEINEXISTINGZIP
+ TRYFREE(zi->globalcomment);
+#endif
+ TRYFREE(zi);
+
+ return err;
+}
+
+extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader)
+{
+ char* p = pData;
+ int size = 0;
+ char* pNewHeader;
+ char* pTmp;
+ short header;
+ short dataSize;
+
+ int retVal = ZIP_OK;
+
+ if(pData == NULL || *dataLen < 4)
+ return ZIP_PARAMERROR;
+
+ pNewHeader = (char*)ALLOC(*dataLen);
+ pTmp = pNewHeader;
+
+ while(p < (pData + *dataLen))
+ {
+ header = *(short*)p;
+ dataSize = *(((short*)p)+1);
+
+ if( header == sHeader ) // Header found.
+ {
+ p += dataSize + 4; // skip it. do not copy to temp buffer
+ }
+ else
+ {
+ // Extra Info block should not be removed, So copy it to the temp buffer.
+ memcpy(pTmp, p, dataSize + 4);
+ p += dataSize + 4;
+ size += dataSize + 4;
+ }
+
+ }
+
+ if(size < *dataLen)
+ {
+ // clean old extra info block.
+ memset(pData,0, *dataLen);
+
+ // copy the new extra info block over the old
+ if(size > 0)
+ memcpy(pData, pNewHeader, size);
+
+ // set the new extra info size
+ *dataLen = size;
+
+ retVal = ZIP_OK;
+ }
+ else
+ retVal = ZIP_ERRNO;
+
+ TRYFREE(pNewHeader);
+
+ return retVal;
+}

smplayer-0.8.1.tar.bz2/zlib/contrib/minizip/zip.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/pascal Added

smplayer-0.8.1.tar.bz2/zlib/contrib/pascal/example.pas Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/pascal/readme.txt Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/pascal/zlibd32.mak Added

@@ -0,0 +1,99 @@
+# Makefile for zlib
+# For use with Delphi and C++ Builder under Win32
+# Updated for zlib 1.2.x by Cosmin Truta
+
+# ------------ Borland C++ ------------
+
+# This project uses the Delphi (fastcall/register) calling convention:
+LOC = -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl
+
+CC = bcc32
+LD = bcc32
+AR = tlib
+# do not use "-pr" in CFLAGS
+CFLAGS = -a -d -k- -O2 $(LOC)
+LDFLAGS =
+
+
+# variables
+ZLIB_LIB = zlib.lib
+
+OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
+OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
+OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
+OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
+
+
+# targets
+all: $(ZLIB_LIB) example.exe minigzip.exe
+
+.c.obj:
+	$(CC) -c $(CFLAGS) $*.c
+
+adler32.obj: adler32.c zlib.h zconf.h
+
+compress.obj: compress.c zlib.h zconf.h
+
+crc32.obj: crc32.c zlib.h zconf.h crc32.h
+
+deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h
+
+gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h
+
+gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h
+
+gzread.obj: gzread.c zlib.h zconf.h gzguts.h
+
+gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h
+
+infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h
+
+inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
+ inffast.h inffixed.h
+
+inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h
+
+trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
+
+uncompr.obj: uncompr.c zlib.h zconf.h
+
+zutil.obj: zutil.c zutil.h zlib.h zconf.h
+
+example.obj: test/example.c zlib.h zconf.h
+
+minigzip.obj: test/minigzip.c zlib.h zconf.h
+
+
+# For the sake of the old Borland make,
+# the command line is cut to fit in the MS-DOS 128 byte limit:
+$(ZLIB_LIB): $(OBJ1) $(OBJ2)
+	-del $(ZLIB_LIB)
+	$(AR) $(ZLIB_LIB) $(OBJP1)
+	$(AR) $(ZLIB_LIB) $(OBJP2)
+
+
+# testing
+test: example.exe minigzip.exe
+	example
+	echo hello world | minigzip | minigzip -d
+
+example.exe: example.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
+
+minigzip.exe: minigzip.obj $(ZLIB_LIB)
+	$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
+
+
+# cleanup
+clean:
+	-del *.obj
+	-del *.exe
+	-del *.lib
+	-del *.tds
+	-del zlib.bak
+	-del foo.gz
+

smplayer-0.8.1.tar.bz2/zlib/contrib/pascal/zlibpas.pas Added

@@ -0,0 +1,276 @@
+(* zlibpas -- Pascal interface to the zlib data compression library
+ *
+ * Copyright (C) 2003 Cosmin Truta.
+ * Derived from original sources by Bob Dellaca.
+ * For conditions of distribution and use, see copyright notice in readme.txt
+ *)
+
+unit zlibpas;
+
+interface
+
+const
+  ZLIB_VERSION = '1.2.7';
+  ZLIB_VERNUM  = $1270;
+
+type
+  alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
+                 cdecl;
+  free_func  = procedure(opaque, address: Pointer);
+                 cdecl;
+
+  in_func    = function(opaque: Pointer; var buf: PByte): Integer;
+                 cdecl;
+  out_func   = function(opaque: Pointer; buf: PByte; size: Integer): Integer;
+                 cdecl;
+
+  z_streamp = ^z_stream;
+  z_stream = packed record
+    next_in: PChar;       (* next input byte *)
+    avail_in: Integer;    (* number of bytes available at next_in *)
+    total_in: LongInt;    (* total nb of input bytes read so far *)
+
+    next_out: PChar;      (* next output byte should be put there *)
+    avail_out: Integer;   (* remaining free space at next_out *)
+    total_out: LongInt;   (* total nb of bytes output so far *)
+
+    msg: PChar;           (* last error message, NULL if no error *)
+    state: Pointer;       (* not visible by applications *)
+
+    zalloc: alloc_func;   (* used to allocate the internal state *)
+    zfree: free_func;     (* used to free the internal state *)
+    opaque: Pointer;      (* private data object passed to zalloc and zfree *)
+
+    data_type: Integer;   (* best guess about the data type: ascii or binary *)
+    adler: LongInt;       (* adler32 value of the uncompressed data *)
+    reserved: LongInt;    (* reserved for future use *)
+  end;
+
+  gz_headerp = ^gz_header;
+  gz_header = packed record
+    text: Integer;        (* true if compressed data believed to be text *)
+    time: LongInt;        (* modification time *)
+    xflags: Integer;      (* extra flags (not used when writing a gzip file) *)
+    os: Integer;          (* operating system *)
+    extra: PChar;         (* pointer to extra field or Z_NULL if none *)
+    extra_len: Integer;   (* extra field length (valid if extra != Z_NULL) *)
+    extra_max: Integer;   (* space at extra (only when reading header) *)
+    name: PChar;          (* pointer to zero-terminated file name or Z_NULL *)
+    name_max: Integer;    (* space at name (only when reading header) *)
+    comment: PChar;       (* pointer to zero-terminated comment or Z_NULL *)
+    comm_max: Integer;    (* space at comment (only when reading header) *)
+    hcrc: Integer;        (* true if there was or will be a header crc *)
+    done: Integer;        (* true when done reading gzip header *)
+  end;
+
+(* constants *)
+const
+  Z_NO_FLUSH      = 0;
+  Z_PARTIAL_FLUSH = 1;
+  Z_SYNC_FLUSH    = 2;
+  Z_FULL_FLUSH    = 3;
+  Z_FINISH        = 4;
+  Z_BLOCK         = 5;
+  Z_TREES         = 6;
+
+  Z_OK            =  0;
+  Z_STREAM_END    =  1;
+  Z_NEED_DICT     =  2;
+  Z_ERRNO         = -1;
+  Z_STREAM_ERROR  = -2;
+  Z_DATA_ERROR    = -3;
+  Z_MEM_ERROR     = -4;
+  Z_BUF_ERROR     = -5;
+  Z_VERSION_ERROR = -6;
+
+  Z_NO_COMPRESSION       =  0;
+  Z_BEST_SPEED           =  1;
+  Z_BEST_COMPRESSION     =  9;
+  Z_DEFAULT_COMPRESSION  = -1;
+
+  Z_FILTERED            = 1;
+  Z_HUFFMAN_ONLY        = 2;
+  Z_RLE                 = 3;
+  Z_FIXED               = 4;
+  Z_DEFAULT_STRATEGY    = 0;
+
+  Z_BINARY   = 0;
+  Z_TEXT     = 1;
+  Z_ASCII    = 1;
+  Z_UNKNOWN  = 2;
+
+  Z_DEFLATED = 8;
+
+(* basic functions *)
+function zlibVersion: PChar;
+function deflateInit(var strm: z_stream; level: Integer): Integer;
+function deflate(var strm: z_stream; flush: Integer): Integer;
+function deflateEnd(var strm: z_stream): Integer;
+function inflateInit(var strm: z_stream): Integer;
+function inflate(var strm: z_stream; flush: Integer): Integer;
+function inflateEnd(var strm: z_stream): Integer;
+
+(* advanced functions *)
+function deflateInit2(var strm: z_stream; level, method, windowBits,
+                      memLevel, strategy: Integer): Integer;
+function deflateSetDictionary(var strm: z_stream; const dictionary: PChar;
+                              dictLength: Integer): Integer;
+function deflateCopy(var dest, source: z_stream): Integer;
+function deflateReset(var strm: z_stream): Integer;
+function deflateParams(var strm: z_stream; level, strategy: Integer): Integer;
+function deflateTune(var strm: z_stream; good_length, max_lazy, nice_length, max_chain: Integer): Integer;
+function deflateBound(var strm: z_stream; sourceLen: LongInt): LongInt;
+function deflatePending(var strm: z_stream; var pending: Integer; var bits: Integer): Integer;
+function deflatePrime(var strm: z_stream; bits, value: Integer): Integer;
+function deflateSetHeader(var strm: z_stream; head: gz_header): Integer;
+function inflateInit2(var strm: z_stream; windowBits: Integer): Integer;
+function inflateSetDictionary(var strm: z_stream; const dictionary: PChar;
+                              dictLength: Integer): Integer;
+function inflateSync(var strm: z_stream): Integer;
+function inflateCopy(var dest, source: z_stream): Integer;
+function inflateReset(var strm: z_stream): Integer;
+function inflateReset2(var strm: z_stream; windowBits: Integer): Integer;
+function inflatePrime(var strm: z_stream; bits, value: Integer): Integer;
+function inflateMark(var strm: z_stream): LongInt;
+function inflateGetHeader(var strm: z_stream; var head: gz_header): Integer;
+function inflateBackInit(var strm: z_stream;
+                         windowBits: Integer; window: PChar): Integer;
+function inflateBack(var strm: z_stream; in_fn: in_func; in_desc: Pointer;
+                     out_fn: out_func; out_desc: Pointer): Integer;
+function inflateBackEnd(var strm: z_stream): Integer;
+function zlibCompileFlags: LongInt;
+
+(* utility functions *)
+function compress(dest: PChar; var destLen: LongInt;
+                  const source: PChar; sourceLen: LongInt): Integer;
+function compress2(dest: PChar; var destLen: LongInt;
+                  const source: PChar; sourceLen: LongInt;
+                  level: Integer): Integer;
+function compressBound(sourceLen: LongInt): LongInt;
+function uncompress(dest: PChar; var destLen: LongInt;
+                    const source: PChar; sourceLen: LongInt): Integer;
+
+(* checksum functions *)
+function adler32(adler: LongInt; const buf: PChar; len: Integer): LongInt;
+function adler32_combine(adler1, adler2, len2: LongInt): LongInt;
+function crc32(crc: LongInt; const buf: PChar; len: Integer): LongInt;
+function crc32_combine(crc1, crc2, len2: LongInt): LongInt;
+
+(* various hacks, don't look :) *)
+function deflateInit_(var strm: z_stream; level: Integer;
+                      const version: PChar; stream_size: Integer): Integer;
+function inflateInit_(var strm: z_stream; const version: PChar;
+                      stream_size: Integer): Integer;
+function deflateInit2_(var strm: z_stream;
+                       level, method, windowBits, memLevel, strategy: Integer;
+                       const version: PChar; stream_size: Integer): Integer;
+function inflateInit2_(var strm: z_stream; windowBits: Integer;
+                       const version: PChar; stream_size: Integer): Integer;
+function inflateBackInit_(var strm: z_stream;
+                          windowBits: Integer; window: PChar;
+                          const version: PChar; stream_size: Integer): Integer;
+
+
+implementation
+
+{$L adler32.obj}
+{$L compress.obj}
+{$L crc32.obj}
+{$L deflate.obj}
+{$L infback.obj}
+{$L inffast.obj}
+{$L inflate.obj}
+{$L inftrees.obj}
+{$L trees.obj}
+{$L uncompr.obj}
+{$L zutil.obj}
+
+function adler32; external;
+function adler32_combine; external;
+function compress; external;
+function compress2; external;
+function compressBound; external;
+function crc32; external;
+function crc32_combine; external;
+function deflate; external;
+function deflateBound; external;
+function deflateCopy; external;
+function deflateEnd; external;
+function deflateInit_; external;
+function deflateInit2_; external;
+function deflateParams; external;
+function deflatePending; external;
+function deflatePrime; external;
+function deflateReset; external;
+function deflateSetDictionary; external;
+function deflateSetHeader; external;
+function deflateTune; external;
+function inflate; external;
+function inflateBack; external;
+function inflateBackEnd; external;
+function inflateBackInit_; external;
+function inflateCopy; external;
+function inflateEnd; external;
+function inflateGetHeader; external;
+function inflateInit_; external;
+function inflateInit2_; external;
+function inflateMark; external;
+function inflatePrime; external;
+function inflateReset; external;
+function inflateReset2; external;
+function inflateSetDictionary; external;
+function inflateSync; external;
+function uncompress; external;
+function zlibCompileFlags; external;
+function zlibVersion; external;
+
+function deflateInit(var strm: z_stream; level: Integer): Integer;
+begin
+  Result := deflateInit_(strm, level, ZLIB_VERSION, sizeof(z_stream));
+end;
+
+function deflateInit2(var strm: z_stream; level, method, windowBits, memLevel,
+                      strategy: Integer): Integer;
+begin
+  Result := deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+                          ZLIB_VERSION, sizeof(z_stream));
+end;
+
+function inflateInit(var strm: z_stream): Integer;
+begin
+  Result := inflateInit_(strm, ZLIB_VERSION, sizeof(z_stream));
+end;
+
+function inflateInit2(var strm: z_stream; windowBits: Integer): Integer;
+begin
+  Result := inflateInit2_(strm, windowBits, ZLIB_VERSION, sizeof(z_stream));
+end;
+
+function inflateBackInit(var strm: z_stream;
+                         windowBits: Integer; window: PChar): Integer;
+begin
+  Result := inflateBackInit_(strm, windowBits, window,
+                             ZLIB_VERSION, sizeof(z_stream));
+end;
+
+function _malloc(Size: Integer): Pointer; cdecl;
+begin
+  GetMem(Result, Size);
+end;
+
+procedure _free(Block: Pointer); cdecl;
+begin
+  FreeMem(Block);
+end;
+
+procedure _memset(P: Pointer; B: Byte; count: Integer); cdecl;
+begin
+  FillChar(P^, count, B);
+end;
+
+procedure _memcpy(dest, source: Pointer; count: Integer); cdecl;
+begin
+  Move(source^, dest^, count);
+end;
+
+end.

smplayer-0.8.1.tar.bz2/zlib/contrib/puff Added

smplayer-0.8.1.tar.bz2/zlib/contrib/puff/Makefile Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/puff/README Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/puff/puff.c Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/puff/puff.h Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/puff/pufftest.c Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/puff/zeros.raw Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/testzlib Added

smplayer-0.8.1.tar.bz2/zlib/contrib/testzlib/testzlib.c Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/testzlib/testzlib.txt Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/untgz Added

smplayer-0.8.1.tar.bz2/zlib/contrib/untgz/Makefile Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/untgz/Makefile.msc Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/untgz/untgz.c Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio Added

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/readme.txt Added

@@ -0,0 +1,60 @@
+Building instructions for the DLL versions of Zlib 1.2.7
+========================================================
+
+This directory contains projects that build zlib and minizip using
+Microsoft Visual C++ 9.0/10.0.
+
+You don't need to build these projects yourself. You can download the
+binaries from:
+  http://www.winimage.com/zLibDll
+
+More information can be found at this site.
+
+
+
+
+
+Build instructions for Visual Studio 2008 (32 bits or 64 bits)
+--------------------------------------------------------------
+- Uncompress current zlib, including all contrib/* files
+- Compile assembly code (with Visual Studio Command Prompt) by running:
+   bld_ml64.bat (in contrib\masmx64)
+   bld_ml32.bat (in contrib\masmx86)
+- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
+- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
+
+Build instructions for Visual Studio 2010 (32 bits or 64 bits)
+--------------------------------------------------------------
+- Uncompress current zlib, including all contrib/* files
+- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
+
+
+Important
+---------
+- To use zlibwapi.dll in your application, you must define the
+  macro ZLIB_WINAPI when compiling your application's source files.
+
+
+Additional notes
+----------------
+- This DLL, named zlibwapi.dll, is compatible to the old zlib.dll built
+  by Gilles Vollant from the zlib 1.1.x sources, and distributed at
+    http://www.winimage.com/zLibDll
+  It uses the WINAPI calling convention for the exported functions, and
+  includes the minizip functionality. If your application needs that
+  particular build of zlib.dll, you can rename zlibwapi.dll to zlib.dll.
+
+- The new DLL was renamed because there exist several incompatible
+  versions of zlib.dll on the Internet.
+
+- There is also an official DLL build of zlib, named zlib1.dll. This one
+  is exporting the functions using the CDECL convention. See the file
+  win32\DLL_FAQ.txt found in this zlib distribution.
+
+- There used to be a ZLIB_DLL macro in zlib 1.1.x, but now this symbol
+  has a slightly different effect. To avoid compatibility problems, do
+  not define it here.
+
+
+Gilles Vollant
+info@winimage.com

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10 Added

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/miniunz.vcxproj Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/miniunz.vcxproj.filters Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/miniunz.vcxproj.user Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/minizip.vcxproj Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/minizip.vcxproj.filters Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/minizip.vcxproj.user Added

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/testzlib.vcxproj Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/testzlib.vcxproj.filters Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/testzlib.vcxproj.user Added

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj Added

@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Itanium">
+ <Configuration>Debug</Configuration>
+ <Platform>Itanium</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Itanium">
+ <Configuration>Release</Configuration>
+ <Platform>Itanium</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <OmitFramePointers>true</OmitFramePointers>
+ <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
+ <Midl>
+ <TargetEnvironment>Itanium</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <TargetMachine>MachineIA64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <OmitFramePointers>true</OmitFramePointers>
+ <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
+ <Midl>
+ <TargetEnvironment>Itanium</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <OmitFramePointers>true</OmitFramePointers>
+ <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <TargetMachine>MachineIA64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\testzlib\testzlib.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="zlibvc.vcxproj">
+ <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.filters Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/testzlibdll.vcxproj.user Added

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/zlib.rc Added

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/zlibstat.vcxproj Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.filters Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/zlibstat.vcxproj.user Added

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/zlibvc.def Added

@@ -0,0 +1,139 @@
+LIBRARY
+; zlib data compression and ZIP file I/O library
+
+VERSION		1.2.7
+
+EXPORTS
+        adler32                                  @1
+        compress                                 @2
+        crc32                                    @3
+        deflate                                  @4
+        deflateCopy                              @5
+        deflateEnd                               @6
+        deflateInit2_                            @7
+        deflateInit_                             @8
+        deflateParams                            @9
+        deflateReset                             @10
+        deflateSetDictionary                     @11
+        gzclose                                  @12
+        gzdopen                                  @13
+        gzerror                                  @14
+        gzflush                                  @15
+        gzopen                                   @16
+        gzread                                   @17
+        gzwrite                                  @18
+        inflate                                  @19
+        inflateEnd                               @20
+        inflateInit2_                            @21
+        inflateInit_                             @22
+        inflateReset                             @23
+        inflateSetDictionary                     @24
+        inflateSync                              @25
+        uncompress                               @26
+        zlibVersion                              @27
+        gzprintf                                 @28
+        gzputc                                   @29
+        gzgetc                                   @30
+        gzseek                                   @31
+        gzrewind                                 @32
+        gztell                                   @33
+        gzeof                                    @34
+        gzsetparams                              @35
+        zError                                   @36
+        inflateSyncPoint                         @37
+        get_crc_table                            @38
+        compress2                                @39
+        gzputs                                   @40
+        gzgets                                   @41
+        inflateCopy                              @42
+        inflateBackInit_                         @43
+        inflateBack                              @44
+        inflateBackEnd                           @45
+        compressBound                            @46
+        deflateBound                             @47
+        gzclearerr                               @48
+        gzungetc                                 @49
+        zlibCompileFlags                         @50
+        deflatePrime                             @51
+        deflatePending                           @52
+
+        unzOpen                                  @61
+        unzClose                                 @62
+        unzGetGlobalInfo                         @63
+        unzGetCurrentFileInfo                    @64
+        unzGoToFirstFile                         @65
+        unzGoToNextFile                          @66
+        unzOpenCurrentFile                       @67
+        unzReadCurrentFile                       @68
+        unzOpenCurrentFile3                      @69
+        unztell                                  @70
+        unzeof                                   @71
+        unzCloseCurrentFile                      @72
+        unzGetGlobalComment                      @73
+        unzStringFileNameCompare                 @74
+        unzLocateFile                            @75
+        unzGetLocalExtrafield                    @76
+        unzOpen2                                 @77
+        unzOpenCurrentFile2                      @78
+        unzOpenCurrentFilePassword               @79
+
+        zipOpen                                  @80
+        zipOpenNewFileInZip                      @81
+        zipWriteInFileInZip                      @82
+        zipCloseFileInZip                        @83
+        zipClose                                 @84
+        zipOpenNewFileInZip2                     @86
+        zipCloseFileInZipRaw                     @87
+        zipOpen2                                 @88
+        zipOpenNewFileInZip3                     @89
+
+        unzGetFilePos                            @100
+        unzGoToFilePos                           @101
+
+        fill_win32_filefunc                      @110
+
+; zlibwapi v1.2.4 added:
+        fill_win32_filefunc64                   @111
+        fill_win32_filefunc64A                  @112
+        fill_win32_filefunc64W                  @113
+
+        unzOpen64                               @120
+        unzOpen2_64                             @121
+        unzGetGlobalInfo64                      @122
+        unzGetCurrentFileInfo64                 @124
+        unzGetCurrentFileZStreamPos64           @125
+        unztell64                               @126
+        unzGetFilePos64                         @127
+        unzGoToFilePos64                        @128
+
+        zipOpen64                               @130
+        zipOpen2_64                             @131
+        zipOpenNewFileInZip64                   @132
+        zipOpenNewFileInZip2_64                 @133
+        zipOpenNewFileInZip3_64                 @134
+        zipOpenNewFileInZip4_64                 @135
+        zipCloseFileInZipRaw64                  @136
+
+; zlib1 v1.2.4 added:
+        adler32_combine                         @140
+        crc32_combine                           @142
+        deflateSetHeader                        @144
+        deflateTune                             @145
+        gzbuffer                                @146
+        gzclose_r                               @147
+        gzclose_w                               @148
+        gzdirect                                @149
+        gzoffset                                @150
+        inflateGetHeader                        @156
+        inflateMark                             @157
+        inflatePrime                            @158
+        inflateReset2                           @159
+        inflateUndermine                        @160
+
+; zlib1 v1.2.6 added:
+        gzgetc_                                 @161
+        inflateResetKeep                        @163
+        deflateResetKeep                        @164
+
+; zlib1 v1.2.7 added:
+        gzopen_w                                @165

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/zlibvc.sln Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/zlibvc.vcxproj Added

@@ -0,0 +1,681 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Itanium">
+ <Configuration>Debug</Configuration>
+ <Platform>Itanium</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium">
+ <Configuration>ReleaseWithoutAsm</Configuration>
+ <Platform>Itanium</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="ReleaseWithoutAsm|Win32">
+ <Configuration>ReleaseWithoutAsm</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="ReleaseWithoutAsm|x64">
+ <Configuration>ReleaseWithoutAsm</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Itanium">
+ <Configuration>Release</Configuration>
+ <Platform>Itanium</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>false</UseOfMfc>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
+ <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+ <BrowseInformation>
+ </BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+ <GenerateMapFile>true</GenerateMapFile>
+ <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+ </Link>
+ <PreBuildEvent>
+ <Command>cd ..\..\masmx86
+bld_ml32.bat</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+ <BrowseInformation>
+ </BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+ <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+ <GenerateMapFile>true</GenerateMapFile>
+ <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+ <BrowseInformation>
+ </BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+ <GenerateMapFile>true</GenerateMapFile>
+ <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+ </Link>
+ <PreBuildEvent>
+ <Command>cd ..\..\masmx86
+bld_ml32.bat</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>X64</TargetEnvironment>
+ <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+ <BrowseInformation>
+ </BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+ <GenerateMapFile>true</GenerateMapFile>
+ <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+ <SubSystem>Windows</SubSystem>
+ <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ <PreBuildEvent>
+ <Command>cd ..\..\contrib\masmx64
+bld_ml64.bat</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Itanium</TargetEnvironment>
+ <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+ <BrowseInformation>
+ </BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+ <GenerateMapFile>true</GenerateMapFile>
+ <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+ <SubSystem>Windows</SubSystem>
+ <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+ <TargetMachine>MachineIA64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>X64</TargetEnvironment>
+ <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+ <BrowseInformation>
+ </BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+ <GenerateMapFile>true</GenerateMapFile>
+ <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+ <SubSystem>Windows</SubSystem>
+ <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Itanium</TargetEnvironment>
+ <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+ <BrowseInformation>
+ </BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+ <GenerateMapFile>true</GenerateMapFile>
+ <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+ <SubSystem>Windows</SubSystem>
+ <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+ <TargetMachine>MachineIA64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>X64</TargetEnvironment>
+ <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+ <BrowseInformation>
+ </BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+ <GenerateMapFile>true</GenerateMapFile>
+ <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+ <SubSystem>Windows</SubSystem>
+ <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ <PreBuildEvent>
+ <Command>cd ..\..\masmx64
+bld_ml64.bat</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MkTypLibCompatible>true</MkTypLibCompatible>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <TargetEnvironment>Itanium</TargetEnvironment>
+ <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
+ </Midl>
+ <ClCompile>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <StringPooling>true</StringPooling>
+ <ExceptionHandling>
+ </ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <BufferSecurityCheck>false</BufferSecurityCheck>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
+ <AssemblerOutput>All</AssemblerOutput>
+ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+ <ObjectFileName>$(IntDir)</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
+ <BrowseInformation>
+ </BrowseInformation>
+ <WarningLevel>Level3</WarningLevel>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x040c</Culture>
+ </ResourceCompile>
+ <Link>
+ <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
+ <SuppressStartupBanner>true</SuppressStartupBanner>
+ <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+ <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
+ <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
+ <GenerateMapFile>true</GenerateMapFile>
+ <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
+ <SubSystem>Windows</SubSystem>
+ <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
+ <TargetMachine>MachineIA64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\adler32.c" />
+ <ClCompile Include="..\..\..\compress.c" />
+ <ClCompile Include="..\..\..\crc32.c" />
+ <ClCompile Include="..\..\..\deflate.c" />
+ <ClCompile Include="..\..\..\gzclose.c" />
+ <ClCompile Include="..\..\..\gzlib.c" />
+ <ClCompile Include="..\..\..\gzread.c" />
+ <ClCompile Include="..\..\..\gzwrite.c" />
+ <ClCompile Include="..\..\..\infback.c" />
+ <ClCompile Include="..\..\masmx64\inffas8664.c">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\..\..\inffast.c" />
+ <ClCompile Include="..\..\..\inflate.c" />
+ <ClCompile Include="..\..\..\inftrees.c" />
+ <ClCompile Include="..\..\minizip\ioapi.c" />
+ <ClCompile Include="..\..\minizip\iowin32.c" />
+ <ClCompile Include="..\..\..\trees.c" />
+ <ClCompile Include="..\..\..\uncompr.c" />
+ <ClCompile Include="..\..\minizip\unzip.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\minizip\zip.c">
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <ClCompile Include="..\..\..\zutil.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="zlib.rc" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="zlibvc.def" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\..\deflate.h" />
+ <ClInclude Include="..\..\..\infblock.h" />
+ <ClInclude Include="..\..\..\infcodes.h" />
+ <ClInclude Include="..\..\..\inffast.h" />
+ <ClInclude Include="..\..\..\inftrees.h" />
+ <ClInclude Include="..\..\..\infutil.h" />
+ <ClInclude Include="..\..\..\zconf.h" />
+ <ClInclude Include="..\..\..\zlib.h" />
+ <ClInclude Include="..\..\..\zutil.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.filters Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc10/zlibvc.vcxproj.user Added

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc9 Added

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc9/miniunz.vcproj Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc9/minizip.vcproj Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc9/testzlib.vcproj Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc9/testzlibdll.vcproj Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc9/zlib.rc Added

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc9/zlibstat.vcproj Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc9/zlibvc.def Added

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc9/zlibvc.sln Changed

smplayer-0.8.1.tar.bz2/zlib/contrib/vstudio/vc9/zlibvc.vcproj Changed

smplayer-0.8.1.tar.bz2/zlib/crc32.c Added

@@ -0,0 +1,425 @@
+/* crc32.c -- compute the CRC-32 of a data stream
+ * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
+ * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
+ * tables for updating the shift register in one step with three exclusive-ors
+ * instead of four steps with four exclusive-ors. This results in about a
+ * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
+ */
+
+/* @(#) $Id$ */
+
+/*
+ Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
+ protection on the static variables used to control the first-use generation
+ of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should
+ first call get_crc_table() to initialize the tables before allowing more than
+ one thread to use crc32().
+
+ DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
+ */
+
+#ifdef MAKECRCH
+# include <stdio.h>
+# ifndef DYNAMIC_CRC_TABLE
+# define DYNAMIC_CRC_TABLE
+# endif /* !DYNAMIC_CRC_TABLE */
+#endif /* MAKECRCH */
+
+#include "zutil.h" /* for STDC and FAR definitions */
+
+#define local static
+
+/* Definitions for doing the crc four data bytes at a time. */
+#if !defined(NOBYFOUR) && defined(Z_U4)
+# define BYFOUR
+#endif
+#ifdef BYFOUR
+ local unsigned long crc32_little OF((unsigned long,
+ const unsigned char FAR *, unsigned));
+ local unsigned long crc32_big OF((unsigned long,
+ const unsigned char FAR *, unsigned));
+# define TBLS 8
+#else
+# define TBLS 1
+#endif /* BYFOUR */
+
+/* Local functions for crc concatenation */
+local unsigned long gf2_matrix_times OF((unsigned long *mat,
+ unsigned long vec));
+local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
+local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
+
+
+#ifdef DYNAMIC_CRC_TABLE
+
+local volatile int crc_table_empty = 1;
+local z_crc_t FAR crc_tableTBLS256;
+local void make_crc_table OF((void));
+#ifdef MAKECRCH
+ local void write_table OF((FILE *, const z_crc_t FAR *));
+#endif /* MAKECRCH */
+/*
+ Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
+ x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+ Polynomials over GF(2) are represented in binary, one bit per coefficient,
+ with the lowest powers in the most significant bit. Then adding polynomials
+ is just exclusive-or, and multiplying a polynomial by x is a right shift by
+ one. If we call the above polynomial p, and represent a byte as the
+ polynomial q, also with the lowest power in the most significant bit (so the
+ byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
+ where a mod b means the remainder after dividing a by b.
+
+ This calculation is done using the shift-register method of multiplying and
+ taking the remainder. The register is initialized to zero, and for each
+ incoming bit, x^32 is added mod p to the register if the bit is a one (where
+ x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
+ x (which is shifting right by one and adding x^32 mod p if the bit shifted
+ out is a one). We start with the highest power (least significant bit) of
+ q and repeat for all eight bits of q.
+
+ The first table is simply the CRC of all possible eight bit values. This is
+ all the information needed to generate CRCs on data a byte at a time for all
+ combinations of CRC register values and incoming bytes. The remaining tables
+ allow for word-at-a-time CRC calculation for both big-endian and little-
+ endian machines, where a word is four bytes.
+*/
+local void make_crc_table()
+{
+ z_crc_t c;
+ int n, k;
+ z_crc_t poly; /* polynomial exclusive-or pattern */
+ /* terms of polynomial defining this crc (except x^32): */
+ static volatile int first = 1; /* flag to limit concurrent making */
+ static const unsigned char p = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
+
+ /* See if another task is already doing this (not thread-safe, but better
+ than nothing -- significantly reduces duration of vulnerability in
+ case the advice about DYNAMIC_CRC_TABLE is ignored) */
+ if (first) {
+ first = 0;
+
+ /* make exclusive-or pattern from polynomial (0xedb88320UL) */
+ poly = 0;
+ for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
+ poly |= (z_crc_t)1 << (31 - pn);
+
+ /* generate a crc for every 8-bit value */
+ for (n = 0; n < 256; n++) {
+ c = (z_crc_t)n;
+ for (k = 0; k < 8; k++)
+ c = c & 1 ? poly ^ (c >> 1) : c >> 1;
+ crc_table0n = c;
+ }
+
+#ifdef BYFOUR
+ /* generate crc for each value followed by one, two, and three zeros,
+ and then the byte reversal of those as well as the first table */
+ for (n = 0; n < 256; n++) {
+ c = crc_table0n;
+ crc_table4n = ZSWAP32(c);
+ for (k = 1; k < 4; k++) {
+ c = crc_table0c & 0xff ^ (c >> 8);
+ crc_tablekn = c;
+ crc_tablek + 4n = ZSWAP32(c);
+ }
+ }
+#endif /* BYFOUR */
+
+ crc_table_empty = 0;
+ }
+ else { /* not first */
+ /* wait for the other guy to finish (not efficient, but rare) */
+ while (crc_table_empty)
+ ;
+ }
+
+#ifdef MAKECRCH
+ /* write out CRC tables to crc32.h */
+ {
+ FILE *out;
+
+ out = fopen("crc32.h", "w");
+ if (out == NULL) return;
+ fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
+ fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
+ fprintf(out, "local const z_crc_t FAR ");
+ fprintf(out, "crc_tableTBLS256 =\n{\n {\n");
+ write_table(out, crc_table0);
+# ifdef BYFOUR
+ fprintf(out, "#ifdef BYFOUR\n");
+ for (k = 1; k < 8; k++) {
+ fprintf(out, " },\n {\n");
+ write_table(out, crc_tablek);
+ }
+ fprintf(out, "#endif\n");
+# endif /* BYFOUR */
+ fprintf(out, " }\n};\n");
+ fclose(out);
+ }
+#endif /* MAKECRCH */
+}
+
+#ifdef MAKECRCH
+local void write_table(out, table)
+ FILE *out;
+ const z_crc_t FAR *table;
+{
+ int n;
+
+ for (n = 0; n < 256; n++)
+ fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ",
+ (unsigned long)(tablen),
+ n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
+}
+#endif /* MAKECRCH */
+
+#else /* !DYNAMIC_CRC_TABLE */
+/* ========================================================================
+ * Tables of CRC-32s of all single-byte values, made by make_crc_table().
+ */
+#include "crc32.h"
+#endif /* DYNAMIC_CRC_TABLE */
+
+/* =========================================================================
+ * This function can be used by asm versions of crc32()
+ */
+const z_crc_t FAR * ZEXPORT get_crc_table()
+{
+#ifdef DYNAMIC_CRC_TABLE
+ if (crc_table_empty)
+ make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+ return (const z_crc_t FAR *)crc_table;
+}
+
+/* ========================================================================= */
+#define DO1 crc = crc_table0((int)crc ^ (*buf++)) & 0xff ^ (crc >> 8)
+#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+
+/* ========================================================================= */
+unsigned long ZEXPORT crc32(crc, buf, len)
+ unsigned long crc;
+ const unsigned char FAR *buf;
+ uInt len;
+{
+ if (buf == Z_NULL) return 0UL;
+
+#ifdef DYNAMIC_CRC_TABLE
+ if (crc_table_empty)
+ make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+
+#ifdef BYFOUR
+ if (sizeof(void *) == sizeof(ptrdiff_t)) {
+ z_crc_t endian;
+
+ endian = 1;
+ if (*((unsigned char *)(&endian)))
+ return crc32_little(crc, buf, len);
+ else
+ return crc32_big(crc, buf, len);
+ }
+#endif /* BYFOUR */
+ crc = crc ^ 0xffffffffUL;
+ while (len >= 8) {
+ DO8;
+ len -= 8;
+ }
+ if (len) do {
+ DO1;
+ } while (--len);
+ return crc ^ 0xffffffffUL;
+}
+
+#ifdef BYFOUR
+
+/* ========================================================================= */
+#define DOLIT4 c ^= *buf4++; \
+ c = crc_table3c & 0xff ^ crc_table2(c >> 8) & 0xff ^ \
+ crc_table1(c >> 16) & 0xff ^ crc_table0c >> 24
+#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
+
+/* ========================================================================= */
+local unsigned long crc32_little(crc, buf, len)
+ unsigned long crc;
+ const unsigned char FAR *buf;
+ unsigned len;
+{
+ register z_crc_t c;
+ register const z_crc_t FAR *buf4;
+
+ c = (z_crc_t)crc;
+ c = ~c;
+ while (len && ((ptrdiff_t)buf & 3)) {
+ c = crc_table0(c ^ *buf++) & 0xff ^ (c >> 8);
+ len--;
+ }
+
+ buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+ while (len >= 32) {
+ DOLIT32;
+ len -= 32;
+ }
+ while (len >= 4) {
+ DOLIT4;
+ len -= 4;
+ }
+ buf = (const unsigned char FAR *)buf4;
+
+ if (len) do {
+ c = crc_table0(c ^ *buf++) & 0xff ^ (c >> 8);
+ } while (--len);
+ c = ~c;
+ return (unsigned long)c;
+}
+
+/* ========================================================================= */
+#define DOBIG4 c ^= *++buf4; \
+ c = crc_table4c & 0xff ^ crc_table5(c >> 8) & 0xff ^ \
+ crc_table6(c >> 16) & 0xff ^ crc_table7c >> 24
+#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
+
+/* ========================================================================= */
+local unsigned long crc32_big(crc, buf, len)
+ unsigned long crc;
+ const unsigned char FAR *buf;
+ unsigned len;
+{
+ register z_crc_t c;
+ register const z_crc_t FAR *buf4;
+
+ c = ZSWAP32((z_crc_t)crc);
+ c = ~c;
+ while (len && ((ptrdiff_t)buf & 3)) {
+ c = crc_table4(c >> 24) ^ *buf++ ^ (c << 8);
+ len--;
+ }
+
+ buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+ buf4--;
+ while (len >= 32) {
+ DOBIG32;
+ len -= 32;
+ }
+ while (len >= 4) {
+ DOBIG4;
+ len -= 4;
+ }
+ buf4++;
+ buf = (const unsigned char FAR *)buf4;
+
+ if (len) do {
+ c = crc_table4(c >> 24) ^ *buf++ ^ (c << 8);
+ } while (--len);
+ c = ~c;
+ return (unsigned long)(ZSWAP32(c));
+}
+
+#endif /* BYFOUR */
+
+#define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */
+
+/* ========================================================================= */
+local unsigned long gf2_matrix_times(mat, vec)
+ unsigned long *mat;
+ unsigned long vec;
+{
+ unsigned long sum;
+
+ sum = 0;
+ while (vec) {
+ if (vec & 1)
+ sum ^= *mat;
+ vec >>= 1;
+ mat++;
+ }
+ return sum;
+}
+
+/* ========================================================================= */
+local void gf2_matrix_square(square, mat)
+ unsigned long *square;
+ unsigned long *mat;
+{
+ int n;
+
+ for (n = 0; n < GF2_DIM; n++)
+ squaren = gf2_matrix_times(mat, matn);
+}
+
+/* ========================================================================= */
+local uLong crc32_combine_(crc1, crc2, len2)
+ uLong crc1;
+ uLong crc2;
+ z_off64_t len2;
+{
+ int n;
+ unsigned long row;
+ unsigned long evenGF2_DIM; /* even-power-of-two zeros operator */
+ unsigned long oddGF2_DIM; /* odd-power-of-two zeros operator */
+
+ /* degenerate case (also disallow negative lengths) */
+ if (len2 <= 0)
+ return crc1;
+
+ /* put operator for one zero bit in odd */
+ odd0 = 0xedb88320UL; /* CRC-32 polynomial */
+ row = 1;
+ for (n = 1; n < GF2_DIM; n++) {
+ oddn = row;
+ row <<= 1;
+ }
+
+ /* put operator for two zero bits in even */
+ gf2_matrix_square(even, odd);
+
+ /* put operator for four zero bits in odd */
+ gf2_matrix_square(odd, even);
+
+ /* apply len2 zeros to crc1 (first square will put the operator for one
+ zero byte, eight zero bits, in even) */
+ do {
+ /* apply zeros operator for this bit of len2 */
+ gf2_matrix_square(even, odd);
+ if (len2 & 1)
+ crc1 = gf2_matrix_times(even, crc1);
+ len2 >>= 1;
+
+ /* if no more bits set, then done */
+ if (len2 == 0)
+ break;
+
+ /* another iteration of the loop with odd and even swapped */
+ gf2_matrix_square(odd, even);
+ if (len2 & 1)
+ crc1 = gf2_matrix_times(odd, crc1);
+ len2 >>= 1;
+
+ /* if no more bits set, then done */
+ } while (len2 != 0);
+
+ /* return combined crc */
+ crc1 ^= crc2;
+ return crc1;
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine(crc1, crc2, len2)
+ uLong crc1;
+ uLong crc2;
+ z_off_t len2;
+{
+ return crc32_combine_(crc1, crc2, len2);
+}
+
+uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+ uLong crc1;
+ uLong crc2;
+ z_off64_t len2;
+{
+ return crc32_combine_(crc1, crc2, len2);
+}

smplayer-0.8.1.tar.bz2/zlib/crc32.h Added

@@ -0,0 +1,441 @@
+/* crc32.h -- tables for rapid CRC calculation
+ * Generated automatically by crc32.c
+ */
+
+local const z_crc_t FAR crc_tableTBLS256 =
+{
+  {
+    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
+    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
+    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
+    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
+    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
+    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
+    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
+    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
+    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
+    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
+    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
+    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
+    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
+    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
+    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
+    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
+    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
+    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
+    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
+    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
+    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
+    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
+    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
+    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
+    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
+    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
+    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
+    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
+    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
+    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
+    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
+    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
+    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
+    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
+    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
+    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
+    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
+    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
+    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
+    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
+    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
+    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
+    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
+    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
+    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
+    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
+    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
+    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
+    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
+    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
+    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
+    0x2d02ef8dUL
+#ifdef BYFOUR
+  },
+  {
+    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
+    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
+    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
+    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
+    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
+    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
+    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
+    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
+    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
+    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
+    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
+    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
+    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
+    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
+    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
+    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
+    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
+    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
+    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
+    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
+    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
+    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
+    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
+    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
+    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
+    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
+    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
+    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
+    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
+    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
+    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
+    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
+    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
+    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
+    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
+    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
+    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
+    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
+    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
+    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
+    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
+    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
+    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
+    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
+    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
+    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
+    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
+    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
+    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
+    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
+    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
+    0x9324fd72UL
+  },
+  {
+    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
+    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
+    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
+    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
+    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
+    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
+    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
+    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
+    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
+    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
+    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
+    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
+    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
+    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
+    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
+    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
+    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
+    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
+    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
+    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
+    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
+    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
+    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
+    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
+    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
+    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
+    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
+    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
+    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
+    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
+    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
+    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
+    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
+    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
+    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
+    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
+    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
+    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
+    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
+    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
+    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
+    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
+    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
+    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
+    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
+    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
+    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
+    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
+    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
+    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
+    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
+    0xbe9834edUL
+  },
+  {
+    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
+    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
+    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
+    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
+    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
+    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
+    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
+    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
+    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
+    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
+    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
+    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
+    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
+    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
+    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
+    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
+    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
+    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
+    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
+    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
+    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
+    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
+    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
+    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
+    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
+    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
+    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
+    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
+    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
+    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
+    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
+    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
+    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
+    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
+    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
+    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
+    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
+    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
+    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
+    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
+    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
+    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
+    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
+    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
+    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
+    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
+    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
+    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
+    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
+    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
+    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
+    0xde0506f1UL
+  },
+  {
+    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
+    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
+    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
+    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
+    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
+    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
+    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
+    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
+    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
+    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
+    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
+    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
+    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
+    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
+    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
+    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
+    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
+    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
+    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
+    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
+    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
+    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
+    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
+    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
+    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
+    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
+    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
+    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
+    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
+    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
+    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
+    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
+    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
+    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
+    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
+    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
+    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
+    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
+    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
+    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
+    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
+    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
+    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
+    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
+    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
+    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
+    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
+    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
+    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
+    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
+    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
+    0x8def022dUL
+  },
+  {
+    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
+    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
+    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
+    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
+    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
+    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
+    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
+    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
+    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
+    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
+    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
+    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
+    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
+    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
+    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
+    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
+    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
+    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
+    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
+    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
+    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
+    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
+    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
+    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
+    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
+    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
+    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
+    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
+    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
+    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
+    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
+    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
+    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
+    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
+    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
+    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
+    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
+    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
+    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
+    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
+    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
+    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
+    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
+    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
+    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
+    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
+    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
+    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
+    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
+    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
+    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
+    0x72fd2493UL
+  },
+  {
+    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
+    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
+    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
+    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
+    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
+    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
+    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
+    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
+    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
+    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
+    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
+    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
+    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
+    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
+    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
+    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
+    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
+    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
+    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
+    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
+    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
+    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
+    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
+    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
+    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
+    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
+    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
+    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
+    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
+    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
+    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
+    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
+    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
+    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
+    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
+    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
+    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
+    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
+    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
+    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
+    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
+    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
+    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
+    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
+    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
+    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
+    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
+    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
+    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
+    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
+    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
+    0xed3498beUL
+  },
+  {
+    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
+    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
+    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
+    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
+    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
+    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
+    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
+    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
+    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
+    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
+    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
+    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
+    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
+    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
+    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
+    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
+    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
+    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
+    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
+    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
+    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
+    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
+    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
+    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
+    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
+    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
+    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
+    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
+    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
+    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
+    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
+    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
+    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
+    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
+    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
+    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
+    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
+    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
+    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
+    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
+    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
+    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
+    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
+    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
+    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
+    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
+    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
+    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
+    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
+    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
+    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
+    0xf10605deUL
+#endif
+  }
+};

smplayer-0.8.1.tar.bz2/zlib/deflate.c Added

@@ -0,0 +1,1965 @@
+/* deflate.c -- compress data using the deflation algorithm
+ * Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * ALGORITHM
+ *
+ * The "deflation" process depends on being able to identify portions
+ * of the input text which are identical to earlier input (within a
+ * sliding window trailing behind the input currently being processed).
+ *
+ * The most straightforward technique turns out to be the fastest for
+ * most input files: try all possible matches and select the longest.
+ * The key feature of this algorithm is that insertions into the string
+ * dictionary are very simple and thus fast, and deletions are avoided
+ * completely. Insertions are performed at each input character, whereas
+ * string matches are performed only when the previous match ends. So it
+ * is preferable to spend more time in matches to allow very fast string
+ * insertions and avoid deletions. The matching algorithm for small
+ * strings is inspired from that of Rabin & Karp. A brute force approach
+ * is used to find longer strings when a small match has been found.
+ * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
+ * (by Leonid Broukhis).
+ * A previous version of this file used a more sophisticated algorithm
+ * (by Fiala and Greene) which is guaranteed to run in linear amortized
+ * time, but has a larger average cost, uses more memory and is patented.
+ * However the F&G algorithm may be faster for some highly redundant
+ * files if the parameter max_chain_length (described below) is too large.
+ *
+ * ACKNOWLEDGEMENTS
+ *
+ * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
+ * I found it in 'freeze' written by Leonid Broukhis.
+ * Thanks to many people for bug reports and testing.
+ *
+ * REFERENCES
+ *
+ * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
+ * Available in http://tools.ietf.org/html/rfc1951
+ *
+ * A description of the Rabin and Karp algorithm is given in the book
+ * "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
+ *
+ * Fiala,E.R., and Greene,D.H.
+ * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
+ *
+ */
+
+/* @(#) $Id$ */
+
+#include "deflate.h"
+
+const char deflate_copyright =
+ " deflate 1.2.7 Copyright 1995-2012 Jean-loup Gailly and Mark Adler ";
+/*
+ If you use the zlib library in a product, an acknowledgment is welcome
+ in the documentation of your product. If for some reason you cannot
+ include such an acknowledgment, I would appreciate that you keep this
+ copyright string in the executable of your product.
+ */
+
+/* ===========================================================================
+ * Function prototypes.
+ */
+typedef enum {
+ need_more, /* block not completed, need more input or more output */
+ block_done, /* block flush performed */
+ finish_started, /* finish started, need only more output at next deflate */
+ finish_done /* finish done, accept no more input or output */
+} block_state;
+
+typedef block_state (*compress_func) OF((deflate_state *s, int flush));
+/* Compression function. Returns the block state after the call. */
+
+local void fill_window OF((deflate_state *s));
+local block_state deflate_stored OF((deflate_state *s, int flush));
+local block_state deflate_fast OF((deflate_state *s, int flush));
+#ifndef FASTEST
+local block_state deflate_slow OF((deflate_state *s, int flush));
+#endif
+local block_state deflate_rle OF((deflate_state *s, int flush));
+local block_state deflate_huff OF((deflate_state *s, int flush));
+local void lm_init OF((deflate_state *s));
+local void putShortMSB OF((deflate_state *s, uInt b));
+local void flush_pending OF((z_streamp strm));
+local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size));
+#ifdef ASMV
+ void match_init OF((void)); /* asm code initialization */
+ uInt longest_match OF((deflate_state *s, IPos cur_match));
+#else
+local uInt longest_match OF((deflate_state *s, IPos cur_match));
+#endif
+
+#ifdef DEBUG
+local void check_match OF((deflate_state *s, IPos start, IPos match,
+ int length));
+#endif
+
+/* ===========================================================================
+ * Local data
+ */
+
+#define NIL 0
+/* Tail of hash chains */
+
+#ifndef TOO_FAR
+# define TOO_FAR 4096
+#endif
+/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+
+/* Values for max_lazy_match, good_match and max_chain_length, depending on
+ * the desired pack level (0..9). The values given below have been tuned to
+ * exclude worst case performance for pathological files. Better values may be
+ * found for specific files.
+ */
+typedef struct config_s {
+ ush good_length; /* reduce lazy search above this match length */
+ ush max_lazy; /* do not perform lazy search above this match length */
+ ush nice_length; /* quit search above this match length */
+ ush max_chain;
+ compress_func func;
+} config;
+
+#ifdef FASTEST
+local const config configuration_table2 = {
+/* good lazy nice chain */
+/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */
+/* 1 */ {4, 4, 8, 4, deflate_fast}}; /* max speed, no lazy matches */
+#else
+local const config configuration_table10 = {
+/* good lazy nice chain */
+/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */
+/* 1 */ {4, 4, 8, 4, deflate_fast}, /* max speed, no lazy matches */
+/* 2 */ {4, 5, 16, 8, deflate_fast},
+/* 3 */ {4, 6, 32, 32, deflate_fast},
+
+/* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */
+/* 5 */ {8, 16, 32, 32, deflate_slow},
+/* 6 */ {8, 16, 128, 128, deflate_slow},
+/* 7 */ {8, 32, 128, 256, deflate_slow},
+/* 8 */ {32, 128, 258, 1024, deflate_slow},
+/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */
+#endif
+
+/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
+ * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
+ * meaning.
+ */
+
+#define EQUAL 0
+/* result of memcmp for equal strings */
+
+#ifndef NO_DUMMY_DECL
+struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
+#endif
+
+/* rank Z_BLOCK between Z_NO_FLUSH and Z_PARTIAL_FLUSH */
+#define RANK(f) (((f) << 1) - ((f) > 4 ? 9 : 0))
+
+/* ===========================================================================
+ * Update a hash value with the given input byte
+ * IN assertion: all calls to to UPDATE_HASH are made with consecutive
+ * input characters, so that a running hash key can be computed from the
+ * previous key instead of complete recalculation each time.
+ */
+#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
+
+
+/* ===========================================================================
+ * Insert string str in the dictionary and set match_head to the previous head
+ * of the hash chain (the most recent string with same hash key). Return
+ * the previous length of the hash chain.
+ * If this file is compiled with -DFASTEST, the compression level is forced
+ * to 1, and no hash chains are maintained.
+ * IN assertion: all calls to to INSERT_STRING are made with consecutive
+ * input characters and the first MIN_MATCH bytes of str are valid
+ * (except for the last MIN_MATCH-1 bytes of the input file).
+ */
+#ifdef FASTEST
+#define INSERT_STRING(s, str, match_head) \
+ (UPDATE_HASH(s, s->ins_h, s->window(str) + (MIN_MATCH-1)), \
+ match_head = s->heads->ins_h, \
+ s->heads->ins_h = (Pos)(str))
+#else
+#define INSERT_STRING(s, str, match_head) \
+ (UPDATE_HASH(s, s->ins_h, s->window(str) + (MIN_MATCH-1)), \
+ match_head = s->prev(str) & s->w_mask = s->heads->ins_h, \
+ s->heads->ins_h = (Pos)(str))
+#endif
+
+/* ===========================================================================
+ * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
+ * prev will be initialized on the fly.
+ */
+#define CLEAR_HASH(s) \
+ s->heads->hash_size-1 = NIL; \
+ zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+
+/* ========================================================================= */
+int ZEXPORT deflateInit_(strm, level, version, stream_size)
+ z_streamp strm;
+ int level;
+ const char *version;
+ int stream_size;
+{
+ return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
+ Z_DEFAULT_STRATEGY, version, stream_size);
+ /* To do: ignore strm->next_in if we use it as window */
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+ version, stream_size)
+ z_streamp strm;
+ int level;
+ int method;
+ int windowBits;
+ int memLevel;
+ int strategy;
+ const char *version;
+ int stream_size;
+{
+ deflate_state *s;
+ int wrap = 1;
+ static const char my_version = ZLIB_VERSION;
+
+ ushf *overlay;
+ /* We overlay pending_buf and d_buf+l_buf. This works since the average
+ * output size for (length,distance) codes is <= 24 bits.
+ */
+
+ if (version == Z_NULL || version0 != my_version0 ||
+ stream_size != sizeof(z_stream)) {
+ return Z_VERSION_ERROR;
+ }
+ if (strm == Z_NULL) return Z_STREAM_ERROR;
+
+ strm->msg = Z_NULL;
+ if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+ return Z_STREAM_ERROR;
+#else
+ strm->zalloc = zcalloc;
+ strm->opaque = (voidpf)0;
+#endif
+ }
+ if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+ return Z_STREAM_ERROR;
+#else
+ strm->zfree = zcfree;
+#endif
+
+#ifdef FASTEST
+ if (level != 0) level = 1;
+#else
+ if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+
+ if (windowBits < 0) { /* suppress zlib wrapper */
+ wrap = 0;
+ windowBits = -windowBits;
+ }
+#ifdef GZIP
+ else if (windowBits > 15) {
+ wrap = 2; /* write gzip wrapper instead */
+ windowBits -= 16;
+ }
+#endif
+ if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
+ windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
+ strategy < 0 || strategy > Z_FIXED) {
+ return Z_STREAM_ERROR;
+ }
+ if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */
+ s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
+ if (s == Z_NULL) return Z_MEM_ERROR;
+ strm->state = (struct internal_state FAR *)s;
+ s->strm = strm;
+
+ s->wrap = wrap;
+ s->gzhead = Z_NULL;
+ s->w_bits = windowBits;
+ s->w_size = 1 << s->w_bits;
+ s->w_mask = s->w_size - 1;
+
+ s->hash_bits = memLevel + 7;
+ s->hash_size = 1 << s->hash_bits;
+ s->hash_mask = s->hash_size - 1;
+ s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
+
+ s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
+ s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos));
+ s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos));
+
+ s->high_water = 0; /* nothing written to s->window yet */
+
+ s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+
+ overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+ s->pending_buf = (uchf *) overlay;
+ s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
+
+ if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+ s->pending_buf == Z_NULL) {
+ s->status = FINISH_STATE;
+ strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
+ deflateEnd (strm);
+ return Z_MEM_ERROR;
+ }
+ s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+ s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
+
+ s->level = level;
+ s->strategy = strategy;
+ s->method = (Byte)method;
+
+ return deflateReset(strm);
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
+ z_streamp strm;
+ const Bytef *dictionary;
+ uInt dictLength;
+{
+ deflate_state *s;
+ uInt str, n;
+ int wrap;
+ unsigned avail;
+ unsigned char *next;
+
+ if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
+ return Z_STREAM_ERROR;
+ s = strm->state;
+ wrap = s->wrap;
+ if (wrap == 2 || (wrap == 1 && s->status != INIT_STATE) || s->lookahead)
+ return Z_STREAM_ERROR;
+
+ /* when using zlib wrappers, compute Adler-32 for provided dictionary */
+ if (wrap == 1)
+ strm->adler = adler32(strm->adler, dictionary, dictLength);
+ s->wrap = 0; /* avoid computing Adler-32 in read_buf */
+
+ /* if dictionary would fill window, just replace the history */
+ if (dictLength >= s->w_size) {
+ if (wrap == 0) { /* already empty otherwise */
+ CLEAR_HASH(s);
+ s->strstart = 0;
+ s->block_start = 0L;
+ s->insert = 0;
+ }
+ dictionary += dictLength - s->w_size; /* use the tail */
+ dictLength = s->w_size;
+ }
+
+ /* insert dictionary into window and hash */
+ avail = strm->avail_in;
+ next = strm->next_in;
+ strm->avail_in = dictLength;
+ strm->next_in = (Bytef *)dictionary;
+ fill_window(s);
+ while (s->lookahead >= MIN_MATCH) {
+ str = s->strstart;
+ n = s->lookahead - (MIN_MATCH-1);
+ do {
+ UPDATE_HASH(s, s->ins_h, s->windowstr + MIN_MATCH-1);
+#ifndef FASTEST
+ s->prevstr & s->w_mask = s->heads->ins_h;
+#endif
+ s->heads->ins_h = (Pos)str;
+ str++;
+ } while (--n);
+ s->strstart = str;
+ s->lookahead = MIN_MATCH-1;
+ fill_window(s);
+ }
+ s->strstart += s->lookahead;
+ s->block_start = (long)s->strstart;
+ s->insert = s->lookahead;
+ s->lookahead = 0;
+ s->match_length = s->prev_length = MIN_MATCH-1;
+ s->match_available = 0;
+ strm->next_in = next;
+ strm->avail_in = avail;
+ s->wrap = wrap;
+ return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateResetKeep (strm)
+ z_streamp strm;
+{
+ deflate_state *s;
+
+ if (strm == Z_NULL || strm->state == Z_NULL ||
+ strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) {
+ return Z_STREAM_ERROR;
+ }
+
+ strm->total_in = strm->total_out = 0;
+ strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
+ strm->data_type = Z_UNKNOWN;
+
+ s = (deflate_state *)strm->state;
+ s->pending = 0;
+ s->pending_out = s->pending_buf;
+
+ if (s->wrap < 0) {
+ s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */
+ }
+ s->status = s->wrap ? INIT_STATE : BUSY_STATE;
+ strm->adler =
+#ifdef GZIP
+ s->wrap == 2 ? crc32(0L, Z_NULL, 0) :
+#endif
+ adler32(0L, Z_NULL, 0);
+ s->last_flush = Z_NO_FLUSH;
+
+ _tr_init(s);
+
+ return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateReset (strm)
+ z_streamp strm;
+{
+ int ret;
+
+ ret = deflateResetKeep(strm);
+ if (ret == Z_OK)
+ lm_init(strm->state);
+ return ret;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateSetHeader (strm, head)
+ z_streamp strm;
+ gz_headerp head;
+{
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (strm->state->wrap != 2) return Z_STREAM_ERROR;
+ strm->state->gzhead = head;
+ return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePending (strm, pending, bits)
+ unsigned *pending;
+ int *bits;
+ z_streamp strm;
+{
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ if (pending != Z_NULL)
+ *pending = strm->state->pending;
+ if (bits != Z_NULL)
+ *bits = strm->state->bi_valid;
+ return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflatePrime (strm, bits, value)
+ z_streamp strm;
+ int bits;
+ int value;
+{
+ deflate_state *s;
+ int put;
+
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ s = strm->state;
+ if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
+ return Z_BUF_ERROR;
+ do {
+ put = Buf_size - s->bi_valid;
+ if (put > bits)
+ put = bits;
+ s->bi_buf |= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
+ s->bi_valid += put;
+ _tr_flush_bits(s);
+ value >>= put;
+ bits -= put;
+ } while (bits);
+ return Z_OK;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateParams(strm, level, strategy)
+ z_streamp strm;
+ int level;
+ int strategy;
+{
+ deflate_state *s;
+ compress_func func;
+ int err = Z_OK;
+
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ s = strm->state;
+
+#ifdef FASTEST
+ if (level != 0) level = 1;
+#else
+ if (level == Z_DEFAULT_COMPRESSION) level = 6;
+#endif
+ if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) {
+ return Z_STREAM_ERROR;
+ }
+ func = configuration_tables->level.func;
+
+ if ((strategy != s->strategy || func != configuration_tablelevel.func) &&
+ strm->total_in != 0) {
+ /* Flush the last buffer: */
+ err = deflate(strm, Z_BLOCK);
+ }
+ if (s->level != level) {
+ s->level = level;
+ s->max_lazy_match = configuration_tablelevel.max_lazy;
+ s->good_match = configuration_tablelevel.good_length;
+ s->nice_match = configuration_tablelevel.nice_length;
+ s->max_chain_length = configuration_tablelevel.max_chain;
+ }
+ s->strategy = strategy;
+ return err;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain)
+ z_streamp strm;
+ int good_length;
+ int max_lazy;
+ int nice_length;
+ int max_chain;
+{
+ deflate_state *s;
+
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ s = strm->state;
+ s->good_match = good_length;
+ s->max_lazy_match = max_lazy;
+ s->nice_match = nice_length;
+ s->max_chain_length = max_chain;
+ return Z_OK;
+}
+
+/* =========================================================================
+ * For the default windowBits of 15 and memLevel of 8, this function returns
+ * a close to exact, as well as small, upper bound on the compressed size.
+ * They are coded as constants here for a reason--if the #define's are
+ * changed, then this function needs to be changed as well. The return
+ * value for 15 and 8 only works for those exact settings.
+ *
+ * For any setting other than those defaults for windowBits and memLevel,
+ * the value returned is a conservative worst case for the maximum expansion
+ * resulting from using fixed blocks instead of stored blocks, which deflate
+ * can emit on compressed data for some combinations of the parameters.
+ *
+ * This function could be more sophisticated to provide closer upper bounds for
+ * every combination of windowBits and memLevel. But even the conservative
+ * upper bound of about 14% expansion does not seem onerous for output buffer
+ * allocation.
+ */
+uLong ZEXPORT deflateBound(strm, sourceLen)
+ z_streamp strm;
+ uLong sourceLen;
+{
+ deflate_state *s;
+ uLong complen, wraplen;
+ Bytef *str;
+
+ /* conservative upper bound for compressed data */
+ complen = sourceLen +
+ ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5;
+
+ /* if can't get parameters, return conservative bound plus zlib wrapper */
+ if (strm == Z_NULL || strm->state == Z_NULL)
+ return complen + 6;
+
+ /* compute wrapper length */
+ s = strm->state;
+ switch (s->wrap) {
+ case 0: /* raw deflate */
+ wraplen = 0;
+ break;
+ case 1: /* zlib wrapper */
+ wraplen = 6 + (s->strstart ? 4 : 0);
+ break;
+ case 2: /* gzip wrapper */
+ wraplen = 18;
+ if (s->gzhead != Z_NULL) { /* user-supplied gzip header */
+ if (s->gzhead->extra != Z_NULL)
+ wraplen += 2 + s->gzhead->extra_len;
+ str = s->gzhead->name;
+ if (str != Z_NULL)
+ do {
+ wraplen++;
+ } while (*str++);
+ str = s->gzhead->comment;
+ if (str != Z_NULL)
+ do {
+ wraplen++;
+ } while (*str++);
+ if (s->gzhead->hcrc)
+ wraplen += 2;
+ }
+ break;
+ default: /* for compiler happiness */
+ wraplen = 6;
+ }
+
+ /* if not default parameters, return conservative bound */
+ if (s->w_bits != 15 || s->hash_bits != 8 + 7)
+ return complen + wraplen;
+
+ /* default settings: return tight bound for that case */
+ return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+ (sourceLen >> 25) + 13 - 6 + wraplen;
+}
+
+/* =========================================================================
+ * Put a short in the pending buffer. The 16-bit value is put in MSB order.
+ * IN assertion: the stream state is correct and there is enough room in
+ * pending_buf.
+ */
+local void putShortMSB (s, b)
+ deflate_state *s;
+ uInt b;
+{
+ put_byte(s, (Byte)(b >> 8));
+ put_byte(s, (Byte)(b & 0xff));
+}
+
+/* =========================================================================
+ * Flush as much pending output as possible. All deflate() output goes
+ * through this function so some applications may wish to modify it
+ * to avoid allocating a large strm->next_out buffer and copying into it.
+ * (See also read_buf()).
+ */
+local void flush_pending(strm)
+ z_streamp strm;
+{
+ unsigned len;
+ deflate_state *s = strm->state;
+
+ _tr_flush_bits(s);
+ len = s->pending;
+ if (len > strm->avail_out) len = strm->avail_out;
+ if (len == 0) return;
+
+ zmemcpy(strm->next_out, s->pending_out, len);
+ strm->next_out += len;
+ s->pending_out += len;
+ strm->total_out += len;
+ strm->avail_out -= len;
+ s->pending -= len;
+ if (s->pending == 0) {
+ s->pending_out = s->pending_buf;
+ }
+}
+
+/* ========================================================================= */
+int ZEXPORT deflate (strm, flush)
+ z_streamp strm;
+ int flush;
+{
+ int old_flush; /* value of flush param for previous deflate call */
+ deflate_state *s;
+
+ if (strm == Z_NULL || strm->state == Z_NULL ||
+ flush > Z_BLOCK || flush < 0) {
+ return Z_STREAM_ERROR;
+ }
+ s = strm->state;
+
+ if (strm->next_out == Z_NULL ||
+ (strm->next_in == Z_NULL && strm->avail_in != 0) ||
+ (s->status == FINISH_STATE && flush != Z_FINISH)) {
+ ERR_RETURN(strm, Z_STREAM_ERROR);
+ }
+ if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
+
+ s->strm = strm; /* just in case */
+ old_flush = s->last_flush;
+ s->last_flush = flush;
+
+ /* Write the header */
+ if (s->status == INIT_STATE) {
+#ifdef GZIP
+ if (s->wrap == 2) {
+ strm->adler = crc32(0L, Z_NULL, 0);
+ put_byte(s, 31);
+ put_byte(s, 139);
+ put_byte(s, 8);
+ if (s->gzhead == Z_NULL) {
+ put_byte(s, 0);
+ put_byte(s, 0);
+ put_byte(s, 0);
+ put_byte(s, 0);
+ put_byte(s, 0);
+ put_byte(s, s->level == 9 ? 2 :
+ (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+ 4 : 0));
+ put_byte(s, OS_CODE);
+ s->status = BUSY_STATE;
+ }
+ else {
+ put_byte(s, (s->gzhead->text ? 1 : 0) +
+ (s->gzhead->hcrc ? 2 : 0) +
+ (s->gzhead->extra == Z_NULL ? 0 : 4) +
+ (s->gzhead->name == Z_NULL ? 0 : 8) +
+ (s->gzhead->comment == Z_NULL ? 0 : 16)
+ );
+ put_byte(s, (Byte)(s->gzhead->time & 0xff));
+ put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff));
+ put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff));
+ put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff));
+ put_byte(s, s->level == 9 ? 2 :
+ (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ?
+ 4 : 0));
+ put_byte(s, s->gzhead->os & 0xff);
+ if (s->gzhead->extra != Z_NULL) {
+ put_byte(s, s->gzhead->extra_len & 0xff);
+ put_byte(s, (s->gzhead->extra_len >> 8) & 0xff);
+ }
+ if (s->gzhead->hcrc)
+ strm->adler = crc32(strm->adler, s->pending_buf,
+ s->pending);
+ s->gzindex = 0;
+ s->status = EXTRA_STATE;
+ }
+ }
+ else
+#endif
+ {
+ uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
+ uInt level_flags;
+
+ if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2)
+ level_flags = 0;
+ else if (s->level < 6)
+ level_flags = 1;
+ else if (s->level == 6)
+ level_flags = 2;
+ else
+ level_flags = 3;
+ header |= (level_flags << 6);
+ if (s->strstart != 0) header |= PRESET_DICT;
+ header += 31 - (header % 31);
+
+ s->status = BUSY_STATE;
+ putShortMSB(s, header);
+
+ /* Save the adler32 of the preset dictionary: */
+ if (s->strstart != 0) {
+ putShortMSB(s, (uInt)(strm->adler >> 16));
+ putShortMSB(s, (uInt)(strm->adler & 0xffff));
+ }
+ strm->adler = adler32(0L, Z_NULL, 0);
+ }
+ }
+#ifdef GZIP
+ if (s->status == EXTRA_STATE) {
+ if (s->gzhead->extra != Z_NULL) {
+ uInt beg = s->pending; /* start of bytes to update crc */
+
+ while (s->gzindex < (s->gzhead->extra_len & 0xffff)) {
+ if (s->pending == s->pending_buf_size) {
+ if (s->gzhead->hcrc && s->pending > beg)
+ strm->adler = crc32(strm->adler, s->pending_buf + beg,
+ s->pending - beg);
+ flush_pending(strm);
+ beg = s->pending;
+ if (s->pending == s->pending_buf_size)
+ break;
+ }
+ put_byte(s, s->gzhead->extras->gzindex);
+ s->gzindex++;
+ }
+ if (s->gzhead->hcrc && s->pending > beg)
+ strm->adler = crc32(strm->adler, s->pending_buf + beg,
+ s->pending - beg);
+ if (s->gzindex == s->gzhead->extra_len) {
+ s->gzindex = 0;
+ s->status = NAME_STATE;
+ }
+ }
+ else
+ s->status = NAME_STATE;
+ }
+ if (s->status == NAME_STATE) {
+ if (s->gzhead->name != Z_NULL) {
+ uInt beg = s->pending; /* start of bytes to update crc */
+ int val;
+
+ do {
+ if (s->pending == s->pending_buf_size) {
+ if (s->gzhead->hcrc && s->pending > beg)
+ strm->adler = crc32(strm->adler, s->pending_buf + beg,
+ s->pending - beg);
+ flush_pending(strm);
+ beg = s->pending;
+ if (s->pending == s->pending_buf_size) {
+ val = 1;
+ break;
+ }
+ }
+ val = s->gzhead->names->gzindex++;
+ put_byte(s, val);
+ } while (val != 0);
+ if (s->gzhead->hcrc && s->pending > beg)
+ strm->adler = crc32(strm->adler, s->pending_buf + beg,
+ s->pending - beg);
+ if (val == 0) {
+ s->gzindex = 0;
+ s->status = COMMENT_STATE;
+ }
+ }
+ else
+ s->status = COMMENT_STATE;
+ }
+ if (s->status == COMMENT_STATE) {
+ if (s->gzhead->comment != Z_NULL) {
+ uInt beg = s->pending; /* start of bytes to update crc */
+ int val;
+
+ do {
+ if (s->pending == s->pending_buf_size) {
+ if (s->gzhead->hcrc && s->pending > beg)
+ strm->adler = crc32(strm->adler, s->pending_buf + beg,
+ s->pending - beg);
+ flush_pending(strm);
+ beg = s->pending;
+ if (s->pending == s->pending_buf_size) {
+ val = 1;
+ break;
+ }
+ }
+ val = s->gzhead->comments->gzindex++;
+ put_byte(s, val);
+ } while (val != 0);
+ if (s->gzhead->hcrc && s->pending > beg)
+ strm->adler = crc32(strm->adler, s->pending_buf + beg,
+ s->pending - beg);
+ if (val == 0)
+ s->status = HCRC_STATE;
+ }
+ else
+ s->status = HCRC_STATE;
+ }
+ if (s->status == HCRC_STATE) {
+ if (s->gzhead->hcrc) {
+ if (s->pending + 2 > s->pending_buf_size)
+ flush_pending(strm);
+ if (s->pending + 2 <= s->pending_buf_size) {
+ put_byte(s, (Byte)(strm->adler & 0xff));
+ put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+ strm->adler = crc32(0L, Z_NULL, 0);
+ s->status = BUSY_STATE;
+ }
+ }
+ else
+ s->status = BUSY_STATE;
+ }
+#endif
+
+ /* Flush as much pending output as possible */
+ if (s->pending != 0) {
+ flush_pending(strm);
+ if (strm->avail_out == 0) {
+ /* Since avail_out is 0, deflate will be called again with
+ * more output space, but possibly with both pending and
+ * avail_in equal to zero. There won't be anything to do,
+ * but this is not an error situation so make sure we
+ * return OK instead of BUF_ERROR at next call of deflate:
+ */
+ s->last_flush = -1;
+ return Z_OK;
+ }
+
+ /* Make sure there is something to do and avoid duplicate consecutive
+ * flushes. For repeated and useless calls with Z_FINISH, we keep
+ * returning Z_STREAM_END instead of Z_BUF_ERROR.
+ */
+ } else if (strm->avail_in == 0 && RANK(flush) <= RANK(old_flush) &&
+ flush != Z_FINISH) {
+ ERR_RETURN(strm, Z_BUF_ERROR);
+ }
+
+ /* User must not provide more input after the first FINISH: */
+ if (s->status == FINISH_STATE && strm->avail_in != 0) {
+ ERR_RETURN(strm, Z_BUF_ERROR);
+ }
+
+ /* Start a new block or continue the current one.
+ */
+ if (strm->avail_in != 0 || s->lookahead != 0 ||
+ (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
+ block_state bstate;
+
+ bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) :
+ (s->strategy == Z_RLE ? deflate_rle(s, flush) :
+ (*(configuration_tables->level.func))(s, flush));
+
+ if (bstate == finish_started || bstate == finish_done) {
+ s->status = FINISH_STATE;
+ }
+ if (bstate == need_more || bstate == finish_started) {
+ if (strm->avail_out == 0) {
+ s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
+ }
+ return Z_OK;
+ /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
+ * of deflate should use the same flush parameter to make sure
+ * that the flush is complete. So we don't have to output an
+ * empty block here, this will be done at next call. This also
+ * ensures that for a very small output buffer, we emit at most
+ * one empty block.
+ */
+ }
+ if (bstate == block_done) {
+ if (flush == Z_PARTIAL_FLUSH) {
+ _tr_align(s);
+ } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */
+ _tr_stored_block(s, (char*)0, 0L, 0);
+ /* For a full flush, this empty block will be recognized
+ * as a special marker by inflate_sync().
+ */
+ if (flush == Z_FULL_FLUSH) {
+ CLEAR_HASH(s); /* forget history */
+ if (s->lookahead == 0) {
+ s->strstart = 0;
+ s->block_start = 0L;
+ s->insert = 0;
+ }
+ }
+ }
+ flush_pending(strm);
+ if (strm->avail_out == 0) {
+ s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
+ return Z_OK;
+ }
+ }
+ }
+ Assert(strm->avail_out > 0, "bug2");
+
+ if (flush != Z_FINISH) return Z_OK;
+ if (s->wrap <= 0) return Z_STREAM_END;
+
+ /* Write the trailer */
+#ifdef GZIP
+ if (s->wrap == 2) {
+ put_byte(s, (Byte)(strm->adler & 0xff));
+ put_byte(s, (Byte)((strm->adler >> 8) & 0xff));
+ put_byte(s, (Byte)((strm->adler >> 16) & 0xff));
+ put_byte(s, (Byte)((strm->adler >> 24) & 0xff));
+ put_byte(s, (Byte)(strm->total_in & 0xff));
+ put_byte(s, (Byte)((strm->total_in >> 8) & 0xff));
+ put_byte(s, (Byte)((strm->total_in >> 16) & 0xff));
+ put_byte(s, (Byte)((strm->total_in >> 24) & 0xff));
+ }
+ else
+#endif
+ {
+ putShortMSB(s, (uInt)(strm->adler >> 16));
+ putShortMSB(s, (uInt)(strm->adler & 0xffff));
+ }
+ flush_pending(strm);
+ /* If avail_out is zero, the application will call deflate again
+ * to flush the rest.
+ */
+ if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */
+ return s->pending != 0 ? Z_OK : Z_STREAM_END;
+}
+
+/* ========================================================================= */
+int ZEXPORT deflateEnd (strm)
+ z_streamp strm;
+{
+ int status;
+
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+
+ status = strm->state->status;
+ if (status != INIT_STATE &&
+ status != EXTRA_STATE &&
+ status != NAME_STATE &&
+ status != COMMENT_STATE &&
+ status != HCRC_STATE &&
+ status != BUSY_STATE &&
+ status != FINISH_STATE) {
+ return Z_STREAM_ERROR;
+ }
+
+ /* Deallocate in reverse order of allocations: */
+ TRY_FREE(strm, strm->state->pending_buf);
+ TRY_FREE(strm, strm->state->head);
+ TRY_FREE(strm, strm->state->prev);
+ TRY_FREE(strm, strm->state->window);
+
+ ZFREE(strm, strm->state);
+ strm->state = Z_NULL;
+
+ return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
+}
+
+/* =========================================================================
+ * Copy the source state to the destination state.
+ * To simplify the source, this is not supported for 16-bit MSDOS (which
+ * doesn't have enough memory anyway to duplicate compression states).
+ */
+int ZEXPORT deflateCopy (dest, source)
+ z_streamp dest;
+ z_streamp source;
+{
+#ifdef MAXSEG_64K
+ return Z_STREAM_ERROR;
+#else
+ deflate_state *ds;
+ deflate_state *ss;
+ ushf *overlay;
+
+
+ if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
+ return Z_STREAM_ERROR;
+ }
+
+ ss = source->state;
+
+ zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+
+ ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
+ if (ds == Z_NULL) return Z_MEM_ERROR;
+ dest->state = (struct internal_state FAR *) ds;
+ zmemcpy((voidpf)ds, (voidpf)ss, sizeof(deflate_state));
+ ds->strm = dest;
+
+ ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+ ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos));
+ ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos));
+ overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
+ ds->pending_buf = (uchf *) overlay;
+
+ if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+ ds->pending_buf == Z_NULL) {
+ deflateEnd (dest);
+ return Z_MEM_ERROR;
+ }
+ /* following zmemcpy do not work for 16-bit MSDOS */
+ zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
+ zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
+ zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
+ zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+
+ ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+ ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
+ ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
+
+ ds->l_desc.dyn_tree = ds->dyn_ltree;
+ ds->d_desc.dyn_tree = ds->dyn_dtree;
+ ds->bl_desc.dyn_tree = ds->bl_tree;
+
+ return Z_OK;
+#endif /* MAXSEG_64K */
+}
+
+/* ===========================================================================
+ * Read a new buffer from the current input stream, update the adler32
+ * and total number of bytes read. All deflate() input goes through
+ * this function so some applications may wish to modify it to avoid
+ * allocating a large strm->next_in buffer and copying from it.
+ * (See also flush_pending()).
+ */
+local int read_buf(strm, buf, size)
+ z_streamp strm;
+ Bytef *buf;
+ unsigned size;
+{
+ unsigned len = strm->avail_in;
+
+ if (len > size) len = size;
+ if (len == 0) return 0;
+
+ strm->avail_in -= len;
+
+ zmemcpy(buf, strm->next_in, len);
+ if (strm->state->wrap == 1) {
+ strm->adler = adler32(strm->adler, buf, len);
+ }
+#ifdef GZIP
+ else if (strm->state->wrap == 2) {
+ strm->adler = crc32(strm->adler, buf, len);
+ }
+#endif
+ strm->next_in += len;
+ strm->total_in += len;
+
+ return (int)len;
+}
+
+/* ===========================================================================
+ * Initialize the "longest match" routines for a new zlib stream
+ */
+local void lm_init (s)
+ deflate_state *s;
+{
+ s->window_size = (ulg)2L*s->w_size;
+
+ CLEAR_HASH(s);
+
+ /* Set the default configuration parameters:
+ */
+ s->max_lazy_match = configuration_tables->level.max_lazy;
+ s->good_match = configuration_tables->level.good_length;
+ s->nice_match = configuration_tables->level.nice_length;
+ s->max_chain_length = configuration_tables->level.max_chain;
+
+ s->strstart = 0;
+ s->block_start = 0L;
+ s->lookahead = 0;
+ s->insert = 0;
+ s->match_length = s->prev_length = MIN_MATCH-1;
+ s->match_available = 0;
+ s->ins_h = 0;
+#ifndef FASTEST
+#ifdef ASMV
+ match_init(); /* initialize the asm code */
+#endif
+#endif
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Set match_start to the longest match starting at the given string and
+ * return its length. Matches shorter or equal to prev_length are discarded,
+ * in which case the result is equal to prev_length and match_start is
+ * garbage.
+ * IN assertions: cur_match is the head of the hash chain for the current
+ * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
+ * OUT assertion: the match length is not greater than s->lookahead.
+ */
+#ifndef ASMV
+/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
+ * match.S. The code will be functionally equivalent.
+ */
+local uInt longest_match(s, cur_match)
+ deflate_state *s;
+ IPos cur_match; /* current match */
+{
+ unsigned chain_length = s->max_chain_length;/* max hash chain length */
+ register Bytef *scan = s->window + s->strstart; /* current string */
+ register Bytef *match; /* matched string */
+ register int len; /* length of current match */
+ int best_len = s->prev_length; /* best match length so far */
+ int nice_match = s->nice_match; /* stop if match long enough */
+ IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
+ s->strstart - (IPos)MAX_DIST(s) : NIL;
+ /* Stop when cur_match becomes <= limit. To simplify the code,
+ * we prevent matches with the string of window index 0.
+ */
+ Posf *prev = s->prev;
+ uInt wmask = s->w_mask;
+
+#ifdef UNALIGNED_OK
+ /* Compare two bytes at a time. Note: this is not always beneficial.
+ * Try with and without -DUNALIGNED_OK to check.
+ */
+ register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+ register ush scan_start = *(ushf*)scan;
+ register ush scan_end = *(ushf*)(scan+best_len-1);
+#else
+ register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+ register Byte scan_end1 = scanbest_len-1;
+ register Byte scan_end = scanbest_len;
+#endif
+
+ /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+ * It is easy to get rid of this optimization if necessary.
+ */
+ Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+ /* Do not waste too much time if we already have a good match: */
+ if (s->prev_length >= s->good_match) {
+ chain_length >>= 2;
+ }
+ /* Do not look for matches beyond the end of the input. This is necessary
+ * to make deflate deterministic.
+ */
+ if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
+
+ Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+ do {
+ Assert(cur_match < s->strstart, "no future");
+ match = s->window + cur_match;
+
+ /* Skip to next match if the match length cannot increase
+ * or if the match length is less than 2. Note that the checks below
+ * for insufficient lookahead only occur occasionally for performance
+ * reasons. Therefore uninitialized memory will be accessed, and
+ * conditional jumps will be made that depend on those values.
+ * However the length of the match is limited to the lookahead, so
+ * the output of deflate is not affected by the uninitialized values.
+ */
+#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
+ /* This code assumes sizeof(unsigned short) == 2. Do not use
+ * UNALIGNED_OK if your compiler uses a different size.
+ */
+ if (*(ushf*)(match+best_len-1) != scan_end ||
+ *(ushf*)match != scan_start) continue;
+
+ /* It is not necessary to compare scan2 and match2 since they are
+ * always equal when the other bytes match, given that the hash keys
+ * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
+ * strstart+3, +5, ... up to strstart+257. We check for insufficient
+ * lookahead only every 4th comparison; the 128th check will be made
+ * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
+ * necessary to put more guard bytes at the end of the window, or
+ * to check more often for insufficient lookahead.
+ */
+ Assert(scan2 == match2, "scan2?");
+ scan++, match++;
+ do {
+ } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+ *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+ *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+ *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
+ scan < strend);
+ /* The funny "do {}" generates better code on most compilers */
+
+ /* Here, scan <= window+strstart+257 */
+ Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+ if (*scan == *match) scan++;
+
+ len = (MAX_MATCH - 1) - (int)(strend-scan);
+ scan = strend - (MAX_MATCH-1);
+
+#else /* UNALIGNED_OK */
+
+ if (matchbest_len != scan_end ||
+ matchbest_len-1 != scan_end1 ||
+ *match != *scan ||
+ *++match != scan1) continue;
+
+ /* The check at best_len-1 can be removed because it will be made
+ * again later. (This heuristic is not always a win.)
+ * It is not necessary to compare scan2 and match2 since they
+ * are always equal when the other bytes match, given that
+ * the hash keys are equal and that HASH_BITS >= 8.
+ */
+ scan += 2, match++;
+ Assert(*scan == *match, "match2?");
+
+ /* We check for insufficient lookahead only every 8th comparison;
+ * the 256th check will be made at strstart+258.
+ */
+ do {
+ } while (*++scan == *++match && *++scan == *++match &&
+ *++scan == *++match && *++scan == *++match &&
+ *++scan == *++match && *++scan == *++match &&
+ *++scan == *++match && *++scan == *++match &&
+ scan < strend);
+
+ Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+ len = MAX_MATCH - (int)(strend - scan);
+ scan = strend - MAX_MATCH;
+
+#endif /* UNALIGNED_OK */
+
+ if (len > best_len) {
+ s->match_start = cur_match;
+ best_len = len;
+ if (len >= nice_match) break;
+#ifdef UNALIGNED_OK
+ scan_end = *(ushf*)(scan+best_len-1);
+#else
+ scan_end1 = scanbest_len-1;
+ scan_end = scanbest_len;
+#endif
+ }
+ } while ((cur_match = prevcur_match & wmask) > limit
+ && --chain_length != 0);
+
+ if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
+ return s->lookahead;
+}
+#endif /* ASMV */
+
+#else /* FASTEST */
+
+/* ---------------------------------------------------------------------------
+ * Optimized version for FASTEST only
+ */
+local uInt longest_match(s, cur_match)
+ deflate_state *s;
+ IPos cur_match; /* current match */
+{
+ register Bytef *scan = s->window + s->strstart; /* current string */
+ register Bytef *match; /* matched string */
+ register int len; /* length of current match */
+ register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+
+ /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
+ * It is easy to get rid of this optimization if necessary.
+ */
+ Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
+
+ Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
+
+ Assert(cur_match < s->strstart, "no future");
+
+ match = s->window + cur_match;
+
+ /* Return failure if the match length is less than 2:
+ */
+ if (match0 != scan0 || match1 != scan1) return MIN_MATCH-1;
+
+ /* The check at best_len-1 can be removed because it will be made
+ * again later. (This heuristic is not always a win.)
+ * It is not necessary to compare scan2 and match2 since they
+ * are always equal when the other bytes match, given that
+ * the hash keys are equal and that HASH_BITS >= 8.
+ */
+ scan += 2, match += 2;
+ Assert(*scan == *match, "match2?");
+
+ /* We check for insufficient lookahead only every 8th comparison;
+ * the 256th check will be made at strstart+258.
+ */
+ do {
+ } while (*++scan == *++match && *++scan == *++match &&
+ *++scan == *++match && *++scan == *++match &&
+ *++scan == *++match && *++scan == *++match &&
+ *++scan == *++match && *++scan == *++match &&
+ scan < strend);
+
+ Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
+
+ len = MAX_MATCH - (int)(strend - scan);
+
+ if (len < MIN_MATCH) return MIN_MATCH - 1;
+
+ s->match_start = cur_match;
+ return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
+}
+
+#endif /* FASTEST */
+
+#ifdef DEBUG
+/* ===========================================================================
+ * Check that the match at match_start is indeed a match.
+ */
+local void check_match(s, start, match, length)
+ deflate_state *s;
+ IPos start, match;
+ int length;
+{
+ /* check that the match is indeed a match */
+ if (zmemcmp(s->window + match,
+ s->window + start, length) != EQUAL) {
+ fprintf(stderr, " start %u, match %u, length %d\n",
+ start, match, length);
+ do {
+ fprintf(stderr, "%c%c", s->windowmatch++, s->windowstart++);
+ } while (--length != 0);
+ z_error("invalid match");
+ }
+ if (z_verbose > 1) {
+ fprintf(stderr,"\\%d,%d", start-match, length);
+ do { putc(s->windowstart++, stderr); } while (--length != 0);
+ }
+}
+#else
+# define check_match(s, start, match, length)
+#endif /* DEBUG */
+
+/* ===========================================================================
+ * Fill the window when the lookahead becomes insufficient.
+ * Updates strstart and lookahead.
+ *
+ * IN assertion: lookahead < MIN_LOOKAHEAD
+ * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
+ * At least one byte has been read, or avail_in == 0; reads are
+ * performed for at least two bytes (required for the zip translate_eol
+ * option -- not supported here).
+ */
+local void fill_window(s)
+ deflate_state *s;
+{
+ register unsigned n, m;
+ register Posf *p;
+ unsigned more; /* Amount of free space at the end of the window. */
+ uInt wsize = s->w_size;
+
+ Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead");
+
+ do {
+ more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
+
+ /* Deal with !@#$% 64K limit: */
+ if (sizeof(int) <= 2) {
+ if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
+ more = wsize;
+
+ } else if (more == (unsigned)(-1)) {
+ /* Very unlikely, but possible on 16 bit machine if
+ * strstart == 0 && lookahead == 1 (input done a byte at time)
+ */
+ more--;
+ }
+ }
+
+ /* If the window is almost full and there is insufficient lookahead,
+ * move the upper half to the lower one to make room in the upper half.
+ */
+ if (s->strstart >= wsize+MAX_DIST(s)) {
+
+ zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
+ s->match_start -= wsize;
+ s->strstart -= wsize; /* we now have strstart >= MAX_DIST */
+ s->block_start -= (long) wsize;
+
+ /* Slide the hash table (could be avoided with 32 bit values
+ at the expense of memory usage). We slide even when level == 0
+ to keep the hash table consistent if we switch back to level > 0
+ later. (Using level 0 permanently is not an optimal usage of
+ zlib, so we don't care about this pathological case.)
+ */
+ n = s->hash_size;
+ p = &s->headn;
+ do {
+ m = *--p;
+ *p = (Pos)(m >= wsize ? m-wsize : NIL);
+ } while (--n);
+
+ n = wsize;
+#ifndef FASTEST
+ p = &s->prevn;
+ do {
+ m = *--p;
+ *p = (Pos)(m >= wsize ? m-wsize : NIL);
+ /* If n is not on any hash chain, prevn is garbage but
+ * its value will never be used.
+ */
+ } while (--n);
+#endif
+ more += wsize;
+ }
+ if (s->strm->avail_in == 0) break;
+
+ /* If there was no sliding:
+ * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
+ * more == window_size - lookahead - strstart
+ * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
+ * => more >= window_size - 2*WSIZE + 2
+ * In the BIG_MEM or MMAP case (not yet supported),
+ * window_size == input_size + MIN_LOOKAHEAD &&
+ * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
+ * Otherwise, window_size == 2*WSIZE so more >= 2.
+ * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
+ */
+ Assert(more >= 2, "more < 2");
+
+ n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
+ s->lookahead += n;
+
+ /* Initialize the hash value now that we have some input: */
+ if (s->lookahead + s->insert >= MIN_MATCH) {
+ uInt str = s->strstart - s->insert;
+ s->ins_h = s->windowstr;
+ UPDATE_HASH(s, s->ins_h, s->windowstr + 1);
+#if MIN_MATCH != 3
+ Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+ while (s->insert) {
+ UPDATE_HASH(s, s->ins_h, s->windowstr + MIN_MATCH-1);
+#ifndef FASTEST
+ s->prevstr & s->w_mask = s->heads->ins_h;
+#endif
+ s->heads->ins_h = (Pos)str;
+ str++;
+ s->insert--;
+ if (s->lookahead + s->insert < MIN_MATCH)
+ break;
+ }
+ }
+ /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
+ * but this is not important since only literal bytes will be emitted.
+ */
+
+ } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
+
+ /* If the WIN_INIT bytes after the end of the current data have never been
+ * written, then zero those bytes in order to avoid memory check reports of
+ * the use of uninitialized (or uninitialised as Julian writes) bytes by
+ * the longest match routines. Update the high water mark for the next
+ * time through here. WIN_INIT is set to MAX_MATCH since the longest match
+ * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead.
+ */
+ if (s->high_water < s->window_size) {
+ ulg curr = s->strstart + (ulg)(s->lookahead);
+ ulg init;
+
+ if (s->high_water < curr) {
+ /* Previous high water mark below current data -- zero WIN_INIT
+ * bytes or up to end of window, whichever is less.
+ */
+ init = s->window_size - curr;
+ if (init > WIN_INIT)
+ init = WIN_INIT;
+ zmemzero(s->window + curr, (unsigned)init);
+ s->high_water = curr + init;
+ }
+ else if (s->high_water < (ulg)curr + WIN_INIT) {
+ /* High water mark at or above current data, but below current data
+ * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up
+ * to end of window, whichever is less.
+ */
+ init = (ulg)curr + WIN_INIT - s->high_water;
+ if (init > s->window_size - s->high_water)
+ init = s->window_size - s->high_water;
+ zmemzero(s->window + s->high_water, (unsigned)init);
+ s->high_water += init;
+ }
+ }
+
+ Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD,
+ "not enough room for search");
+}
+
+/* ===========================================================================
+ * Flush the current block, with given end-of-file flag.
+ * IN assertion: strstart is set to the end of the current match.
+ */
+#define FLUSH_BLOCK_ONLY(s, last) { \
+ _tr_flush_block(s, (s->block_start >= 0L ? \
+ (charf *)&s->window(unsigned)s->block_start : \
+ (charf *)Z_NULL), \
+ (ulg)((long)s->strstart - s->block_start), \
+ (last)); \
+ s->block_start = s->strstart; \
+ flush_pending(s->strm); \
+ Tracev((stderr,"FLUSH")); \
+}
+
+/* Same but force premature exit if necessary. */
+#define FLUSH_BLOCK(s, last) { \
+ FLUSH_BLOCK_ONLY(s, last); \
+ if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \
+}
+
+/* ===========================================================================
+ * Copy without compression as much as possible from the input stream, return
+ * the current block state.
+ * This function does not insert new strings in the dictionary since
+ * uncompressible data is probably not useful. This function is used
+ * only for the level=0 compression option.
+ * NOTE: this function should be optimized to avoid extra copying from
+ * window to pending_buf.
+ */
+local block_state deflate_stored(s, flush)
+ deflate_state *s;
+ int flush;
+{
+ /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
+ * to pending_buf_size, and each stored block has a 5 byte header:
+ */
+ ulg max_block_size = 0xffff;
+ ulg max_start;
+
+ if (max_block_size > s->pending_buf_size - 5) {
+ max_block_size = s->pending_buf_size - 5;
+ }
+
+ /* Copy as much as possible from input to output: */
+ for (;;) {
+ /* Fill the window as much as possible: */
+ if (s->lookahead <= 1) {
+
+ Assert(s->strstart < s->w_size+MAX_DIST(s) ||
+ s->block_start >= (long)s->w_size, "slide too late");
+
+ fill_window(s);
+ if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
+
+ if (s->lookahead == 0) break; /* flush the current block */
+ }
+ Assert(s->block_start >= 0L, "block gone");
+
+ s->strstart += s->lookahead;
+ s->lookahead = 0;
+
+ /* Emit a stored block if pending_buf will be full: */
+ max_start = s->block_start + max_block_size;
+ if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
+ /* strstart == 0 is possible when wraparound on 16-bit machine */
+ s->lookahead = (uInt)(s->strstart - max_start);
+ s->strstart = (uInt)max_start;
+ FLUSH_BLOCK(s, 0);
+ }
+ /* Flush if we may have to slide, otherwise block_start may become
+ * negative and the data will be gone:
+ */
+ if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
+ FLUSH_BLOCK(s, 0);
+ }
+ }
+ s->insert = 0;
+ if (flush == Z_FINISH) {
+ FLUSH_BLOCK(s, 1);
+ return finish_done;
+ }
+ if ((long)s->strstart > s->block_start)
+ FLUSH_BLOCK(s, 0);
+ return block_done;
+}
+
+/* ===========================================================================
+ * Compress as much as possible from the input stream, return the current
+ * block state.
+ * This function does not perform lazy evaluation of matches and inserts
+ * new strings in the dictionary only for unmatched strings or for short
+ * matches. It is used only for the fast compression options.
+ */
+local block_state deflate_fast(s, flush)
+ deflate_state *s;
+ int flush;
+{
+ IPos hash_head; /* head of the hash chain */
+ int bflush; /* set if current block must be flushed */
+
+ for (;;) {
+ /* Make sure that we always have enough lookahead, except
+ * at the end of the input file. We need MAX_MATCH bytes
+ * for the next match, plus MIN_MATCH bytes to insert the
+ * string following the next match.
+ */
+ if (s->lookahead < MIN_LOOKAHEAD) {
+ fill_window(s);
+ if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+ return need_more;
+ }
+ if (s->lookahead == 0) break; /* flush the current block */
+ }
+
+ /* Insert the string windowstrstart .. strstart+2 in the
+ * dictionary, and set hash_head to the head of the hash chain:
+ */
+ hash_head = NIL;
+ if (s->lookahead >= MIN_MATCH) {
+ INSERT_STRING(s, s->strstart, hash_head);
+ }
+
+ /* Find the longest match, discarding those <= prev_length.
+ * At this point we have always match_length < MIN_MATCH
+ */
+ if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
+ /* To simplify the code, we prevent matches with the string
+ * of window index 0 (in particular we have to avoid a match
+ * of the string with itself at the start of the input file).
+ */
+ s->match_length = longest_match (s, hash_head);
+ /* longest_match() sets match_start */
+ }
+ if (s->match_length >= MIN_MATCH) {
+ check_match(s, s->strstart, s->match_start, s->match_length);
+
+ _tr_tally_dist(s, s->strstart - s->match_start,
+ s->match_length - MIN_MATCH, bflush);
+
+ s->lookahead -= s->match_length;
+
+ /* Insert new strings in the hash table only if the match length
+ * is not too large. This saves time but degrades compression.
+ */
+#ifndef FASTEST
+ if (s->match_length <= s->max_insert_length &&
+ s->lookahead >= MIN_MATCH) {
+ s->match_length--; /* string at strstart already in table */
+ do {
+ s->strstart++;
+ INSERT_STRING(s, s->strstart, hash_head);
+ /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+ * always MIN_MATCH bytes ahead.
+ */
+ } while (--s->match_length != 0);
+ s->strstart++;
+ } else
+#endif
+ {
+ s->strstart += s->match_length;
+ s->match_length = 0;
+ s->ins_h = s->windows->strstart;
+ UPDATE_HASH(s, s->ins_h, s->windows->strstart+1);
+#if MIN_MATCH != 3
+ Call UPDATE_HASH() MIN_MATCH-3 more times
+#endif
+ /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
+ * matter since it will be recomputed at next deflate call.
+ */
+ }
+ } else {
+ /* No match, output a literal byte */
+ Tracevv((stderr,"%c", s->windows->strstart));
+ _tr_tally_lit (s, s->windows->strstart, bflush);
+ s->lookahead--;
+ s->strstart++;
+ }
+ if (bflush) FLUSH_BLOCK(s, 0);
+ }
+ s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+ if (flush == Z_FINISH) {
+ FLUSH_BLOCK(s, 1);
+ return finish_done;
+ }
+ if (s->last_lit)
+ FLUSH_BLOCK(s, 0);
+ return block_done;
+}
+
+#ifndef FASTEST
+/* ===========================================================================
+ * Same as above, but achieves better compression. We use a lazy
+ * evaluation for matches: a match is finally adopted only if there is
+ * no better match at the next window position.
+ */
+local block_state deflate_slow(s, flush)
+ deflate_state *s;
+ int flush;
+{
+ IPos hash_head; /* head of hash chain */
+ int bflush; /* set if current block must be flushed */
+
+ /* Process the input block. */
+ for (;;) {
+ /* Make sure that we always have enough lookahead, except
+ * at the end of the input file. We need MAX_MATCH bytes
+ * for the next match, plus MIN_MATCH bytes to insert the
+ * string following the next match.
+ */
+ if (s->lookahead < MIN_LOOKAHEAD) {
+ fill_window(s);
+ if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
+ return need_more;
+ }
+ if (s->lookahead == 0) break; /* flush the current block */
+ }
+
+ /* Insert the string windowstrstart .. strstart+2 in the
+ * dictionary, and set hash_head to the head of the hash chain:
+ */
+ hash_head = NIL;
+ if (s->lookahead >= MIN_MATCH) {
+ INSERT_STRING(s, s->strstart, hash_head);
+ }
+
+ /* Find the longest match, discarding those <= prev_length.
+ */
+ s->prev_length = s->match_length, s->prev_match = s->match_start;
+ s->match_length = MIN_MATCH-1;
+
+ if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
+ s->strstart - hash_head <= MAX_DIST(s)) {
+ /* To simplify the code, we prevent matches with the string
+ * of window index 0 (in particular we have to avoid a match
+ * of the string with itself at the start of the input file).
+ */
+ s->match_length = longest_match (s, hash_head);
+ /* longest_match() sets match_start */
+
+ if (s->match_length <= 5 && (s->strategy == Z_FILTERED
+#if TOO_FAR <= 32767
+ || (s->match_length == MIN_MATCH &&
+ s->strstart - s->match_start > TOO_FAR)
+#endif
+ )) {
+
+ /* If prev_match is also MIN_MATCH, match_start is garbage
+ * but we will ignore the current match anyway.
+ */
+ s->match_length = MIN_MATCH-1;
+ }
+ }
+ /* If there was a match at the previous step and the current
+ * match is not better, output the previous match:
+ */
+ if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
+ uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
+ /* Do not insert strings in hash table beyond this. */
+
+ check_match(s, s->strstart-1, s->prev_match, s->prev_length);
+
+ _tr_tally_dist(s, s->strstart -1 - s->prev_match,
+ s->prev_length - MIN_MATCH, bflush);
+
+ /* Insert in hash table all strings up to the end of the match.
+ * strstart-1 and strstart are already inserted. If there is not
+ * enough lookahead, the last two strings are not inserted in
+ * the hash table.
+ */
+ s->lookahead -= s->prev_length-1;
+ s->prev_length -= 2;
+ do {
+ if (++s->strstart <= max_insert) {
+ INSERT_STRING(s, s->strstart, hash_head);
+ }
+ } while (--s->prev_length != 0);
+ s->match_available = 0;
+ s->match_length = MIN_MATCH-1;
+ s->strstart++;
+
+ if (bflush) FLUSH_BLOCK(s, 0);
+
+ } else if (s->match_available) {
+ /* If there was no match at the previous position, output a
+ * single literal. If there was a match but the current match
+ * is longer, truncate the previous match to a single literal.
+ */
+ Tracevv((stderr,"%c", s->windows->strstart-1));
+ _tr_tally_lit(s, s->windows->strstart-1, bflush);
+ if (bflush) {
+ FLUSH_BLOCK_ONLY(s, 0);
+ }
+ s->strstart++;
+ s->lookahead--;
+ if (s->strm->avail_out == 0) return need_more;
+ } else {
+ /* There is no previous match to compare with, wait for
+ * the next step to decide.
+ */
+ s->match_available = 1;
+ s->strstart++;
+ s->lookahead--;
+ }
+ }
+ Assert (flush != Z_NO_FLUSH, "no flush?");
+ if (s->match_available) {
+ Tracevv((stderr,"%c", s->windows->strstart-1));
+ _tr_tally_lit(s, s->windows->strstart-1, bflush);
+ s->match_available = 0;
+ }
+ s->insert = s->strstart < MIN_MATCH-1 ? s->strstart : MIN_MATCH-1;
+ if (flush == Z_FINISH) {
+ FLUSH_BLOCK(s, 1);
+ return finish_done;
+ }
+ if (s->last_lit)
+ FLUSH_BLOCK(s, 0);
+ return block_done;
+}
+#endif /* FASTEST */
+
+/* ===========================================================================
+ * For Z_RLE, simply look for runs of bytes, generate matches only of distance
+ * one. Do not maintain a hash table. (It will be regenerated if this run of
+ * deflate switches away from Z_RLE.)
+ */
+local block_state deflate_rle(s, flush)
+ deflate_state *s;
+ int flush;
+{
+ int bflush; /* set if current block must be flushed */
+ uInt prev; /* byte at distance one to match */
+ Bytef *scan, *strend; /* scan goes up to strend for length of run */
+
+ for (;;) {
+ /* Make sure that we always have enough lookahead, except
+ * at the end of the input file. We need MAX_MATCH bytes
+ * for the longest run, plus one for the unrolled loop.
+ */
+ if (s->lookahead <= MAX_MATCH) {
+ fill_window(s);
+ if (s->lookahead <= MAX_MATCH && flush == Z_NO_FLUSH) {
+ return need_more;
+ }
+ if (s->lookahead == 0) break; /* flush the current block */
+ }
+
+ /* See how many times the previous byte repeats */
+ s->match_length = 0;
+ if (s->lookahead >= MIN_MATCH && s->strstart > 0) {
+ scan = s->window + s->strstart - 1;
+ prev = *scan;
+ if (prev == *++scan && prev == *++scan && prev == *++scan) {
+ strend = s->window + s->strstart + MAX_MATCH;
+ do {
+ } while (prev == *++scan && prev == *++scan &&
+ prev == *++scan && prev == *++scan &&
+ prev == *++scan && prev == *++scan &&
+ prev == *++scan && prev == *++scan &&
+ scan < strend);
+ s->match_length = MAX_MATCH - (int)(strend - scan);
+ if (s->match_length > s->lookahead)
+ s->match_length = s->lookahead;
+ }
+ Assert(scan <= s->window+(uInt)(s->window_size-1), "wild scan");
+ }
+
+ /* Emit match if have run of MIN_MATCH or longer, else emit literal */
+ if (s->match_length >= MIN_MATCH) {
+ check_match(s, s->strstart, s->strstart - 1, s->match_length);
+
+ _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush);
+
+ s->lookahead -= s->match_length;
+ s->strstart += s->match_length;
+ s->match_length = 0;
+ } else {
+ /* No match, output a literal byte */
+ Tracevv((stderr,"%c", s->windows->strstart));
+ _tr_tally_lit (s, s->windows->strstart, bflush);
+ s->lookahead--;
+ s->strstart++;
+ }
+ if (bflush) FLUSH_BLOCK(s, 0);
+ }
+ s->insert = 0;
+ if (flush == Z_FINISH) {
+ FLUSH_BLOCK(s, 1);
+ return finish_done;
+ }
+ if (s->last_lit)
+ FLUSH_BLOCK(s, 0);
+ return block_done;
+}
+
+/* ===========================================================================
+ * For Z_HUFFMAN_ONLY, do not look for matches. Do not maintain a hash table.
+ * (It will be regenerated if this run of deflate switches away from Huffman.)
+ */
+local block_state deflate_huff(s, flush)
+ deflate_state *s;
+ int flush;
+{
+ int bflush; /* set if current block must be flushed */
+
+ for (;;) {
+ /* Make sure that we have a literal to write. */
+ if (s->lookahead == 0) {
+ fill_window(s);
+ if (s->lookahead == 0) {
+ if (flush == Z_NO_FLUSH)
+ return need_more;
+ break; /* flush the current block */
+ }
+ }
+
+ /* Output a literal byte */
+ s->match_length = 0;
+ Tracevv((stderr,"%c", s->windows->strstart));
+ _tr_tally_lit (s, s->windows->strstart, bflush);
+ s->lookahead--;
+ s->strstart++;
+ if (bflush) FLUSH_BLOCK(s, 0);
+ }
+ s->insert = 0;
+ if (flush == Z_FINISH) {
+ FLUSH_BLOCK(s, 1);
+ return finish_done;
+ }
+ if (s->last_lit)
+ FLUSH_BLOCK(s, 0);
+ return block_done;
+}

smplayer-0.8.1.tar.bz2/zlib/deflate.h Changed

smplayer-0.8.1.tar.bz2/zlib/doc Added

smplayer-0.8.1.tar.bz2/zlib/doc/algorithm.txt Changed

smplayer-0.8.1.tar.bz2/zlib/doc/rfc1950.txt Changed

smplayer-0.8.1.tar.bz2/zlib/doc/rfc1951.txt Changed

smplayer-0.8.1.tar.bz2/zlib/doc/rfc1952.txt Changed

smplayer-0.8.1.tar.bz2/zlib/doc/txtvsbin.txt Changed

smplayer-0.8.1.tar.bz2/zlib/examples Added

smplayer-0.8.1.tar.bz2/zlib/examples/README.examples Changed

smplayer-0.8.1.tar.bz2/zlib/examples/enough.c Changed

smplayer-0.8.1.tar.bz2/zlib/examples/fitblk.c Changed

smplayer-0.8.1.tar.bz2/zlib/examples/gun.c Changed

smplayer-0.8.1.tar.bz2/zlib/examples/gzappend.c Changed

smplayer-0.8.1.tar.bz2/zlib/examples/gzjoin.c Changed

smplayer-0.8.1.tar.bz2/zlib/examples/gzlog.c Changed

smplayer-0.8.1.tar.bz2/zlib/examples/gzlog.h Changed

smplayer-0.8.1.tar.bz2/zlib/examples/zlib_how.html Changed

smplayer-0.8.1.tar.bz2/zlib/examples/zpipe.c Changed

smplayer-0.8.1.tar.bz2/zlib/examples/zran.c Changed

smplayer-0.8.1.tar.bz2/zlib/gzclose.c Changed

smplayer-0.8.1.tar.bz2/zlib/gzguts.h Added

@@ -0,0 +1,193 @@
+/* gzguts.h -- zlib internal header definitions for gz* operations
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#ifdef _LARGEFILE64_SOURCE
+# ifndef _LARGEFILE_SOURCE
+# define _LARGEFILE_SOURCE 1
+# endif
+# ifdef _FILE_OFFSET_BITS
+# undef _FILE_OFFSET_BITS
+# endif
+#endif
+
+#ifdef HAVE_HIDDEN
+# define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+# define ZLIB_INTERNAL
+#endif
+
+#include <stdio.h>
+#include "zlib.h"
+#ifdef STDC
+# include <string.h>
+# include <stdlib.h>
+# include <limits.h>
+#endif
+#include <fcntl.h>
+
+#ifdef _WIN32
+# include <stddef.h>
+#endif
+
+#if defined(__TURBOC__) || defined(_MSC_VER) || defined(_WIN32)
+# include <io.h>
+#endif
+
+#ifdef NO_DEFLATE /* for compatibility with old definition */
+# define NO_GZCOMPRESS
+#endif
+
+#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
+# ifndef HAVE_VSNPRINTF
+# define HAVE_VSNPRINTF
+# endif
+#endif
+
+#if defined(__CYGWIN__)
+# ifndef HAVE_VSNPRINTF
+# define HAVE_VSNPRINTF
+# endif
+#endif
+
+#if defined(MSDOS) && defined(__BORLANDC__) && (BORLANDC > 0x410)
+# ifndef HAVE_VSNPRINTF
+# define HAVE_VSNPRINTF
+# endif
+#endif
+
+#ifndef HAVE_VSNPRINTF
+# ifdef MSDOS
+/* vsnprintf may exist on some MS-DOS compilers (DJGPP?),
+ but for now we just assume it doesn't. */
+# define NO_vsnprintf
+# endif
+# ifdef __TURBOC__
+# define NO_vsnprintf
+# endif
+# ifdef WIN32
+/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */
+# if !defined(vsnprintf) && !defined(NO_vsnprintf)
+# if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 )
+# define vsnprintf _vsnprintf
+# endif
+# endif
+# endif
+# ifdef __SASC
+# define NO_vsnprintf
+# endif
+# ifdef VMS
+# define NO_vsnprintf
+# endif
+# ifdef __OS400__
+# define NO_vsnprintf
+# endif
+# ifdef __MVS__
+# define NO_vsnprintf
+# endif
+#endif
+
+#ifndef local
+# define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+/* gz* functions always use library allocation functions */
+#ifndef STDC
+ extern voidp malloc OF((uInt size));
+ extern void free OF((voidpf ptr));
+#endif
+
+/* get errno and strerror definition */
+#if defined UNDER_CE
+# include <windows.h>
+# define zstrerror() gz_strwinerror((DWORD)GetLastError())
+#else
+# ifndef NO_STRERROR
+# include <errno.h>
+# define zstrerror() strerror(errno)
+# else
+# define zstrerror() "stdio error (consult errno)"
+# endif
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0
+ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+ ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+ ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+ ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+#endif
+
+/* default memLevel */
+#if MAX_MEM_LEVEL >= 8
+# define DEF_MEM_LEVEL 8
+#else
+# define DEF_MEM_LEVEL MAX_MEM_LEVEL
+#endif
+
+/* default i/o buffer size -- double this for output when reading */
+#define GZBUFSIZE 8192
+
+/* gzip modes, also provide a little integrity check on the passed structure */
+#define GZ_NONE 0
+#define GZ_READ 7247
+#define GZ_WRITE 31153
+#define GZ_APPEND 1 /* mode set to GZ_WRITE after the file is opened */
+
+/* values for gz_state how */
+#define LOOK 0 /* look for a gzip header */
+#define COPY 1 /* copy input directly */
+#define GZIP 2 /* decompress a gzip stream */
+
+/* internal gzip file state data structure */
+typedef struct {
+ /* exposed contents for gzgetc() macro */
+ struct gzFile_s x; /* "x" for exposed */
+ /* x.have: number of bytes available at x.next */
+ /* x.next: next output data to deliver or write */
+ /* x.pos: current position in uncompressed data */
+ /* used for both reading and writing */
+ int mode; /* see gzip modes above */
+ int fd; /* file descriptor */
+ char *path; /* path or fd for error messages */
+ unsigned size; /* buffer size, zero if not allocated yet */
+ unsigned want; /* requested buffer size, default is GZBUFSIZE */
+ unsigned char *in; /* input buffer */
+ unsigned char *out; /* output buffer (double-sized when reading) */
+ int direct; /* 0 if processing gzip, 1 if transparent */
+ /* just for reading */
+ int how; /* 0: get header, 1: copy, 2: decompress */
+ z_off64_t start; /* where the gzip data started, for rewinding */
+ int eof; /* true if end of input file reached */
+ int past; /* true if read requested past end */
+ /* just for writing */
+ int level; /* compression level */
+ int strategy; /* compression strategy */
+ /* seek request */
+ z_off64_t skip; /* amount to skip (already rewound if backwards) */
+ int seek; /* true if seek request pending */
+ /* error information */
+ int err; /* error code */
+ char *msg; /* error message */
+ /* zlib inflate or deflate stream */
+ z_stream strm; /* stream structure in-place (not a pointer) */
+} gz_state;
+typedef gz_state FAR *gz_statep;
+
+/* shared functions */
+void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *));
+#if defined UNDER_CE
+char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error));
+#endif
+
+/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
+ value -- needed when comparing unsigned to z_off64_t, which is signed
+ (possible z_off64_t types off_t, off64_t, and long are all signed) */
+#ifdef INT_MAX
+# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
+#else
+unsigned ZLIB_INTERNAL gz_intmax OF((void));
+# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
+#endif

smplayer-0.8.1.tar.bz2/zlib/gzlib.c Added

@@ -0,0 +1,620 @@
+/* gzlib.c -- zlib functions common to reading and writing gzip files
+ * Copyright (C) 2004, 2010, 2011, 2012 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+#if defined(_WIN32) && !defined(__BORLANDC__)
+# define LSEEK _lseeki64
+#else
+#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0
+# define LSEEK lseek64
+#else
+# define LSEEK lseek
+#endif
+#endif
+
+/* Local functions */
+local void gz_reset OF((gz_statep));
+local gzFile gz_open OF((const void *, int, const char *));
+
+#if defined UNDER_CE
+
+/* Map the Windows error number in ERROR to a locale-dependent error message
+ string and return a pointer to it. Typically, the values for ERROR come
+ from GetLastError.
+
+ The string pointed to shall not be modified by the application, but may be
+ overwritten by a subsequent call to gz_strwinerror
+
+ The gz_strwinerror function does not change the current setting of
+ GetLastError. */
+char ZLIB_INTERNAL *gz_strwinerror (error)
+ DWORD error;
+{
+ static char buf1024;
+
+ wchar_t *msgbuf;
+ DWORD lasterr = GetLastError();
+ DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
+ | FORMAT_MESSAGE_ALLOCATE_BUFFER,
+ NULL,
+ error,
+ 0, /* Default language */
+ (LPVOID)&msgbuf,
+ 0,
+ NULL);
+ if (chars != 0) {
+ /* If there is an \r\n appended, zap it. */
+ if (chars >= 2
+ && msgbufchars - 2 == '\r' && msgbufchars - 1 == '\n') {
+ chars -= 2;
+ msgbufchars = 0;
+ }
+
+ if (chars > sizeof (buf) - 1) {
+ chars = sizeof (buf) - 1;
+ msgbufchars = 0;
+ }
+
+ wcstombs(buf, msgbuf, chars + 1);
+ LocalFree(msgbuf);
+ }
+ else {
+ sprintf(buf, "unknown win32 error (%ld)", error);
+ }
+
+ SetLastError(lasterr);
+ return buf;
+}
+
+#endif /* UNDER_CE */
+
+/* Reset gzip file state */
+local void gz_reset(state)
+ gz_statep state;
+{
+ state->x.have = 0; /* no output data available */
+ if (state->mode == GZ_READ) { /* for reading ... */
+ state->eof = 0; /* not at end of file */
+ state->past = 0; /* have not read past end yet */
+ state->how = LOOK; /* look for gzip header */
+ }
+ state->seek = 0; /* no seek request pending */
+ gz_error(state, Z_OK, NULL); /* clear error */
+ state->x.pos = 0; /* no uncompressed data yet */
+ state->strm.avail_in = 0; /* no input data yet */
+}
+
+/* Open a gzip file either by name or file descriptor. */
+local gzFile gz_open(path, fd, mode)
+ const void *path;
+ int fd;
+ const char *mode;
+{
+ gz_statep state;
+ size_t len;
+ int oflag;
+#ifdef O_CLOEXEC
+ int cloexec = 0;
+#endif
+#ifdef O_EXCL
+ int exclusive = 0;
+#endif
+
+ /* check input */
+ if (path == NULL)
+ return NULL;
+
+ /* allocate gzFile structure to return */
+ state = malloc(sizeof(gz_state));
+ if (state == NULL)
+ return NULL;
+ state->size = 0; /* no buffers allocated yet */
+ state->want = GZBUFSIZE; /* requested buffer size */
+ state->msg = NULL; /* no error message yet */
+
+ /* interpret mode */
+ state->mode = GZ_NONE;
+ state->level = Z_DEFAULT_COMPRESSION;
+ state->strategy = Z_DEFAULT_STRATEGY;
+ state->direct = 0;
+ while (*mode) {
+ if (*mode >= '0' && *mode <= '9')
+ state->level = *mode - '0';
+ else
+ switch (*mode) {
+ case 'r':
+ state->mode = GZ_READ;
+ break;
+#ifndef NO_GZCOMPRESS
+ case 'w':
+ state->mode = GZ_WRITE;
+ break;
+ case 'a':
+ state->mode = GZ_APPEND;
+ break;
+#endif
+ case '+': /* can't read and write at the same time */
+ free(state);
+ return NULL;
+ case 'b': /* ignore -- will request binary anyway */
+ break;
+#ifdef O_CLOEXEC
+ case 'e':
+ cloexec = 1;
+ break;
+#endif
+#ifdef O_EXCL
+ case 'x':
+ exclusive = 1;
+ break;
+#endif
+ case 'f':
+ state->strategy = Z_FILTERED;
+ break;
+ case 'h':
+ state->strategy = Z_HUFFMAN_ONLY;
+ break;
+ case 'R':
+ state->strategy = Z_RLE;
+ break;
+ case 'F':
+ state->strategy = Z_FIXED;
+ case 'T':
+ state->direct = 1;
+ default: /* could consider as an error, but just ignore */
+ ;
+ }
+ mode++;
+ }
+
+ /* must provide an "r", "w", or "a" */
+ if (state->mode == GZ_NONE) {
+ free(state);
+ return NULL;
+ }
+
+ /* can't force transparent read */
+ if (state->mode == GZ_READ) {
+ if (state->direct) {
+ free(state);
+ return NULL;
+ }
+ state->direct = 1; /* for empty file */
+ }
+
+ /* save the path name for error messages */
+#ifdef _WIN32
+ if (fd == -2) {
+ len = wcstombs(NULL, path, 0);
+ if (len == (size_t)-1)
+ len = 0;
+ }
+ else
+#endif
+ len = strlen(path);
+ state->path = malloc(len + 1);
+ if (state->path == NULL) {
+ free(state);
+ return NULL;
+ }
+#ifdef _WIN32
+ if (fd == -2)
+ if (len)
+ wcstombs(state->path, path, len + 1);
+ else
+ *(state->path) = 0;
+ else
+#endif
+ strcpy(state->path, path);
+
+ /* compute the flags for open() */
+ oflag =
+#ifdef O_LARGEFILE
+ O_LARGEFILE |
+#endif
+#ifdef O_BINARY
+ O_BINARY |
+#endif
+#ifdef O_CLOEXEC
+ (cloexec ? O_CLOEXEC : 0) |
+#endif
+ (state->mode == GZ_READ ?
+ O_RDONLY :
+ (O_WRONLY | O_CREAT |
+#ifdef O_EXCL
+ (exclusive ? O_EXCL : 0) |
+#endif
+ (state->mode == GZ_WRITE ?
+ O_TRUNC :
+ O_APPEND)));
+
+ /* open the file with the appropriate flags (or just use fd) */
+ state->fd = fd > -1 ? fd : (
+#ifdef _WIN32
+ fd == -2 ? _wopen(path, oflag, 0666) :
+#endif
+ open(path, oflag, 0666));
+ if (state->fd == -1) {
+ free(state->path);
+ free(state);
+ return NULL;
+ }
+ if (state->mode == GZ_APPEND)
+ state->mode = GZ_WRITE; /* simplify later checks */
+
+ /* save the current position for rewinding (only if reading) */
+ if (state->mode == GZ_READ) {
+ state->start = LSEEK(state->fd, 0, SEEK_CUR);
+ if (state->start == -1) state->start = 0;
+ }
+
+ /* initialize stream */
+ gz_reset(state);
+
+ /* return stream */
+ return (gzFile)state;
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzopen(path, mode)
+ const char *path;
+ const char *mode;
+{
+ return gz_open(path, -1, mode);
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzopen64(path, mode)
+ const char *path;
+ const char *mode;
+{
+ return gz_open(path, -1, mode);
+}
+
+/* -- see zlib.h -- */
+gzFile ZEXPORT gzdopen(fd, mode)
+ int fd;
+ const char *mode;
+{
+ char *path; /* identifier for error messages */
+ gzFile gz;
+
+ if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL)
+ return NULL;
+ sprintf(path, "<fd:%d>", fd); /* for debugging */
+ gz = gz_open(path, fd, mode);
+ free(path);
+ return gz;
+}
+
+/* -- see zlib.h -- */
+#ifdef _WIN32
+gzFile ZEXPORT gzopen_w(path, mode)
+ const wchar_t *path;
+ const char *mode;
+{
+ return gz_open(path, -2, mode);
+}
+#endif
+
+/* -- see zlib.h -- */
+int ZEXPORT gzbuffer(file, size)
+ gzFile file;
+ unsigned size;
+{
+ gz_statep state;
+
+ /* get internal structure and check integrity */
+ if (file == NULL)
+ return -1;
+ state = (gz_statep)file;
+ if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+ return -1;
+
+ /* make sure we haven't already allocated memory */
+ if (state->size != 0)
+ return -1;
+
+ /* check and set requested size */
+ if (size < 2)
+ size = 2; /* need two bytes to check magic header */
+ state->want = size;
+ return 0;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzrewind(file)
+ gzFile file;
+{
+ gz_statep state;
+
+ /* get internal structure */
+ if (file == NULL)
+ return -1;
+ state = (gz_statep)file;
+
+ /* check that we're reading and that there's no error */
+ if (state->mode != GZ_READ ||
+ (state->err != Z_OK && state->err != Z_BUF_ERROR))
+ return -1;
+
+ /* back up and start over */
+ if (LSEEK(state->fd, state->start, SEEK_SET) == -1)
+ return -1;
+ gz_reset(state);
+ return 0;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gzseek64(file, offset, whence)
+ gzFile file;
+ z_off64_t offset;
+ int whence;
+{
+ unsigned n;
+ z_off64_t ret;
+ gz_statep state;
+
+ /* get internal structure and check integrity */
+ if (file == NULL)
+ return -1;
+ state = (gz_statep)file;
+ if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+ return -1;
+
+ /* check that there's no error */
+ if (state->err != Z_OK && state->err != Z_BUF_ERROR)
+ return -1;
+
+ /* can only seek from start or relative to current position */
+ if (whence != SEEK_SET && whence != SEEK_CUR)
+ return -1;
+
+ /* normalize offset to a SEEK_CUR specification */
+ if (whence == SEEK_SET)
+ offset -= state->x.pos;
+ else if (state->seek)
+ offset += state->skip;
+ state->seek = 0;
+
+ /* if within raw area while reading, just go there */
+ if (state->mode == GZ_READ && state->how == COPY &&
+ state->x.pos + offset >= 0) {
+ ret = LSEEK(state->fd, offset - state->x.have, SEEK_CUR);
+ if (ret == -1)
+ return -1;
+ state->x.have = 0;
+ state->eof = 0;
+ state->past = 0;
+ state->seek = 0;
+ gz_error(state, Z_OK, NULL);
+ state->strm.avail_in = 0;
+ state->x.pos += offset;
+ return state->x.pos;
+ }
+
+ /* calculate skip amount, rewinding if needed for back seek when reading */
+ if (offset < 0) {
+ if (state->mode != GZ_READ) /* writing -- can't go backwards */
+ return -1;
+ offset += state->x.pos;
+ if (offset < 0) /* before start of file! */
+ return -1;
+ if (gzrewind(file) == -1) /* rewind, then skip to offset */
+ return -1;
+ }
+
+ /* if reading, skip what's in output buffer (one less gzgetc() check) */
+ if (state->mode == GZ_READ) {
+ n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > offset ?
+ (unsigned)offset : state->x.have;
+ state->x.have -= n;
+ state->x.next += n;
+ state->x.pos += n;
+ offset -= n;
+ }
+
+ /* request skip (if not zero) */
+ if (offset) {
+ state->seek = 1;
+ state->skip = offset;
+ }
+ return state->x.pos + offset;
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gzseek(file, offset, whence)
+ gzFile file;
+ z_off_t offset;
+ int whence;
+{
+ z_off64_t ret;
+
+ ret = gzseek64(file, (z_off64_t)offset, whence);
+ return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gztell64(file)
+ gzFile file;
+{
+ gz_statep state;
+
+ /* get internal structure and check integrity */
+ if (file == NULL)
+ return -1;
+ state = (gz_statep)file;
+ if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+ return -1;
+
+ /* return position */
+ return state->x.pos + (state->seek ? state->skip : 0);
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gztell(file)
+ gzFile file;
+{
+ z_off64_t ret;
+
+ ret = gztell64(file);
+ return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+z_off64_t ZEXPORT gzoffset64(file)
+ gzFile file;
+{
+ z_off64_t offset;
+ gz_statep state;
+
+ /* get internal structure and check integrity */
+ if (file == NULL)
+ return -1;
+ state = (gz_statep)file;
+ if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+ return -1;
+
+ /* compute and return effective offset in file */
+ offset = LSEEK(state->fd, 0, SEEK_CUR);
+ if (offset == -1)
+ return -1;
+ if (state->mode == GZ_READ) /* reading */
+ offset -= state->strm.avail_in; /* don't count buffered input */
+ return offset;
+}
+
+/* -- see zlib.h -- */
+z_off_t ZEXPORT gzoffset(file)
+ gzFile file;
+{
+ z_off64_t ret;
+
+ ret = gzoffset64(file);
+ return ret == (z_off_t)ret ? (z_off_t)ret : -1;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzeof(file)
+ gzFile file;
+{
+ gz_statep state;
+
+ /* get internal structure and check integrity */
+ if (file == NULL)
+ return 0;
+ state = (gz_statep)file;
+ if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+ return 0;
+
+ /* return end-of-file state */
+ return state->mode == GZ_READ ? state->past : 0;
+}
+
+/* -- see zlib.h -- */
+const char * ZEXPORT gzerror(file, errnum)
+ gzFile file;
+ int *errnum;
+{
+ gz_statep state;
+
+ /* get internal structure and check integrity */
+ if (file == NULL)
+ return NULL;
+ state = (gz_statep)file;
+ if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+ return NULL;
+
+ /* return error information */
+ if (errnum != NULL)
+ *errnum = state->err;
+ return state->msg == NULL ? "" : state->msg;
+}
+
+/* -- see zlib.h -- */
+void ZEXPORT gzclearerr(file)
+ gzFile file;
+{
+ gz_statep state;
+
+ /* get internal structure and check integrity */
+ if (file == NULL)
+ return;
+ state = (gz_statep)file;
+ if (state->mode != GZ_READ && state->mode != GZ_WRITE)
+ return;
+
+ /* clear error and end-of-file */
+ if (state->mode == GZ_READ) {
+ state->eof = 0;
+ state->past = 0;
+ }
+ gz_error(state, Z_OK, NULL);
+}
+
+/* Create an error message in allocated memory and set state->err and
+ state->msg accordingly. Free any previous error message already there. Do
+ not try to free or allocate space if the error is Z_MEM_ERROR (out of
+ memory). Simply save the error message as a static string. If there is an
+ allocation failure constructing the error message, then convert the error to
+ out of memory. */
+void ZLIB_INTERNAL gz_error(state, err, msg)
+ gz_statep state;
+ int err;
+ const char *msg;
+{
+ /* free previously allocated message and clear */
+ if (state->msg != NULL) {
+ if (state->err != Z_MEM_ERROR)
+ free(state->msg);
+ state->msg = NULL;
+ }
+
+ /* if fatal, set state->x.have to 0 so that the gzgetc() macro fails */
+ if (err != Z_OK && err != Z_BUF_ERROR)
+ state->x.have = 0;
+
+ /* set error code, and if no message, then done */
+ state->err = err;
+ if (msg == NULL)
+ return;
+
+ /* for an out of memory error, save as static string */
+ if (err == Z_MEM_ERROR) {
+ state->msg = (char *)msg;
+ return;
+ }
+
+ /* construct error message with path */
+ if ((state->msg = malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) {
+ state->err = Z_MEM_ERROR;
+ state->msg = (char *)"out of memory";
+ return;
+ }
+ strcpy(state->msg, state->path);
+ strcat(state->msg, ": ");
+ strcat(state->msg, msg);
+ return;
+}
+
+#ifndef INT_MAX
+/* portably return maximum value for an int (when limits.h presumed not
+ available) -- we need to do this to cover cases where 2's complement not
+ used, since C standard permits 1's complement and sign-bit representations,
+ otherwise we could just use ((unsigned)-1) >> 1 */
+unsigned ZLIB_INTERNAL gz_intmax()
+{
+ unsigned p, q;
+
+ p = 1;
+ do {
+ q = p;
+ p <<= 1;
+ p++;
+ } while (p > q);
+ return q >> 1;
+}
+#endif

smplayer-0.8.1.tar.bz2/zlib/gzread.c Added

@@ -0,0 +1,589 @@
+/* gzread.c -- zlib functions for reading gzip files
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* Local functions */
+local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
+local int gz_avail OF((gz_statep));
+local int gz_look OF((gz_statep));
+local int gz_decomp OF((gz_statep));
+local int gz_fetch OF((gz_statep));
+local int gz_skip OF((gz_statep, z_off64_t));
+
+/* Use read() to load a buffer -- return -1 on error, otherwise 0. Read from
+ state->fd, and update state->eof, state->err, and state->msg as appropriate.
+ This function needs to loop on read(), since read() is not guaranteed to
+ read the number of bytes requested, depending on the type of descriptor. */
+local int gz_load(state, buf, len, have)
+ gz_statep state;
+ unsigned char *buf;
+ unsigned len;
+ unsigned *have;
+{
+ int ret;
+
+ *have = 0;
+ do {
+ ret = read(state->fd, buf + *have, len - *have);
+ if (ret <= 0)
+ break;
+ *have += ret;
+ } while (*have < len);
+ if (ret < 0) {
+ gz_error(state, Z_ERRNO, zstrerror());
+ return -1;
+ }
+ if (ret == 0)
+ state->eof = 1;
+ return 0;
+}
+
+/* Load up input buffer and set eof flag if last data loaded -- return -1 on
+ error, 0 otherwise. Note that the eof flag is set when the end of the input
+ file is reached, even though there may be unused data in the buffer. Once
+ that data has been used, no more attempts will be made to read the file.
+ If strm->avail_in != 0, then the current data is moved to the beginning of
+ the input buffer, and then the remainder of the buffer is loaded with the
+ available data from the input file. */
+local int gz_avail(state)
+ gz_statep state;
+{
+ unsigned got;
+ z_streamp strm = &(state->strm);
+
+ if (state->err != Z_OK && state->err != Z_BUF_ERROR)
+ return -1;
+ if (state->eof == 0) {
+ if (strm->avail_in) { /* copy what's there to the start */
+ unsigned char *p = state->in, *q = strm->next_in;
+ unsigned n = strm->avail_in;
+ do {
+ *p++ = *q++;
+ } while (--n);
+ }
+ if (gz_load(state, state->in + strm->avail_in,
+ state->size - strm->avail_in, &got) == -1)
+ return -1;
+ strm->avail_in += got;
+ strm->next_in = state->in;
+ }
+ return 0;
+}
+
+/* Look for gzip header, set up for inflate or copy. state->x.have must be 0.
+ If this is the first time in, allocate required memory. state->how will be
+ left unchanged if there is no more input data available, will be set to COPY
+ if there is no gzip header and direct copying will be performed, or it will
+ be set to GZIP for decompression. If direct copying, then leftover input
+ data from the input buffer will be copied to the output buffer. In that
+ case, all further file reads will be directly to either the output buffer or
+ a user buffer. If decompressing, the inflate state will be initialized.
+ gz_look() will return 0 on success or -1 on failure. */
+local int gz_look(state)
+ gz_statep state;
+{
+ z_streamp strm = &(state->strm);
+
+ /* allocate read buffers and inflate memory */
+ if (state->size == 0) {
+ /* allocate buffers */
+ state->in = malloc(state->want);
+ state->out = malloc(state->want << 1);
+ if (state->in == NULL || state->out == NULL) {
+ if (state->out != NULL)
+ free(state->out);
+ if (state->in != NULL)
+ free(state->in);
+ gz_error(state, Z_MEM_ERROR, "out of memory");
+ return -1;
+ }
+ state->size = state->want;
+
+ /* allocate inflate memory */
+ state->strm.zalloc = Z_NULL;
+ state->strm.zfree = Z_NULL;
+ state->strm.opaque = Z_NULL;
+ state->strm.avail_in = 0;
+ state->strm.next_in = Z_NULL;
+ if (inflateInit2(&(state->strm), 15 + 16) != Z_OK) { /* gunzip */
+ free(state->out);
+ free(state->in);
+ state->size = 0;
+ gz_error(state, Z_MEM_ERROR, "out of memory");
+ return -1;
+ }
+ }
+
+ /* get at least the magic bytes in the input buffer */
+ if (strm->avail_in < 2) {
+ if (gz_avail(state) == -1)
+ return -1;
+ if (strm->avail_in == 0)
+ return 0;
+ }
+
+ /* look for gzip magic bytes -- if there, do gzip decoding (note: there is
+ a logical dilemma here when considering the case of a partially written
+ gzip file, to wit, if a single 31 byte is written, then we cannot tell
+ whether this is a single-byte file, or just a partially written gzip
+ file -- for here we assume that if a gzip file is being written, then
+ the header will be written in a single operation, so that reading a
+ single byte is sufficient indication that it is not a gzip file) */
+ if (strm->avail_in > 1 &&
+ strm->next_in0 == 31 && strm->next_in1 == 139) {
+ inflateReset(strm);
+ state->how = GZIP;
+ state->direct = 0;
+ return 0;
+ }
+
+ /* no gzip header -- if we were decoding gzip before, then this is trailing
+ garbage. Ignore the trailing garbage and finish. */
+ if (state->direct == 0) {
+ strm->avail_in = 0;
+ state->eof = 1;
+ state->x.have = 0;
+ return 0;
+ }
+
+ /* doing raw i/o, copy any leftover input to output -- this assumes that
+ the output buffer is larger than the input buffer, which also assures
+ space for gzungetc() */
+ state->x.next = state->out;
+ if (strm->avail_in) {
+ memcpy(state->x.next, strm->next_in, strm->avail_in);
+ state->x.have = strm->avail_in;
+ strm->avail_in = 0;
+ }
+ state->how = COPY;
+ state->direct = 1;
+ return 0;
+}
+
+/* Decompress from input to the provided next_out and avail_out in the state.
+ On return, state->x.have and state->x.next point to the just decompressed
+ data. If the gzip stream completes, state->how is reset to LOOK to look for
+ the next gzip stream or raw data, once state->x.have is depleted. Returns 0
+ on success, -1 on failure. */
+local int gz_decomp(state)
+ gz_statep state;
+{
+ int ret = Z_OK;
+ unsigned had;
+ z_streamp strm = &(state->strm);
+
+ /* fill output buffer up to end of deflate stream */
+ had = strm->avail_out;
+ do {
+ /* get more input for inflate() */
+ if (strm->avail_in == 0 && gz_avail(state) == -1)
+ return -1;
+ if (strm->avail_in == 0) {
+ gz_error(state, Z_BUF_ERROR, "unexpected end of file");
+ break;
+ }
+
+ /* decompress and handle errors */
+ ret = inflate(strm, Z_NO_FLUSH);
+ if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) {
+ gz_error(state, Z_STREAM_ERROR,
+ "internal error: inflate stream corrupt");
+ return -1;
+ }
+ if (ret == Z_MEM_ERROR) {
+ gz_error(state, Z_MEM_ERROR, "out of memory");
+ return -1;
+ }
+ if (ret == Z_DATA_ERROR) { /* deflate stream invalid */
+ gz_error(state, Z_DATA_ERROR,
+ strm->msg == NULL ? "compressed data error" : strm->msg);
+ return -1;
+ }
+ } while (strm->avail_out && ret != Z_STREAM_END);
+
+ /* update available output */
+ state->x.have = had - strm->avail_out;
+ state->x.next = strm->next_out - state->x.have;
+
+ /* if the gzip stream completed successfully, look for another */
+ if (ret == Z_STREAM_END)
+ state->how = LOOK;
+
+ /* good decompression */
+ return 0;
+}
+
+/* Fetch data and put it in the output buffer. Assumes state->x.have is 0.
+ Data is either copied from the input file or decompressed from the input
+ file depending on state->how. If state->how is LOOK, then a gzip header is
+ looked for to determine whether to copy or decompress. Returns -1 on error,
+ otherwise 0. gz_fetch() will leave state->how as COPY or GZIP unless the
+ end of the input file has been reached and all data has been processed. */
+local int gz_fetch(state)
+ gz_statep state;
+{
+ z_streamp strm = &(state->strm);
+
+ do {
+ switch(state->how) {
+ case LOOK: /* -> LOOK, COPY (only if never GZIP), or GZIP */
+ if (gz_look(state) == -1)
+ return -1;
+ if (state->how == LOOK)
+ return 0;
+ break;
+ case COPY: /* -> COPY */
+ if (gz_load(state, state->out, state->size << 1, &(state->x.have))
+ == -1)
+ return -1;
+ state->x.next = state->out;
+ return 0;
+ case GZIP: /* -> GZIP or LOOK (if end of gzip stream) */
+ strm->avail_out = state->size << 1;
+ strm->next_out = state->out;
+ if (gz_decomp(state) == -1)
+ return -1;
+ }
+ } while (state->x.have == 0 && (!state->eof || strm->avail_in));
+ return 0;
+}
+
+/* Skip len uncompressed bytes of output. Return -1 on error, 0 on success. */
+local int gz_skip(state, len)
+ gz_statep state;
+ z_off64_t len;
+{
+ unsigned n;
+
+ /* skip over len bytes or reach end-of-file, whichever comes first */
+ while (len)
+ /* skip over whatever is in output buffer */
+ if (state->x.have) {
+ n = GT_OFF(state->x.have) || (z_off64_t)state->x.have > len ?
+ (unsigned)len : state->x.have;
+ state->x.have -= n;
+ state->x.next += n;
+ state->x.pos += n;
+ len -= n;
+ }
+
+ /* output buffer empty -- return if we're at the end of the input */
+ else if (state->eof && state->strm.avail_in == 0)
+ break;
+
+ /* need more data to skip -- load up output buffer */
+ else {
+ /* get more output, looking for header if required */
+ if (gz_fetch(state) == -1)
+ return -1;
+ }
+ return 0;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzread(file, buf, len)
+ gzFile file;
+ voidp buf;
+ unsigned len;
+{
+ unsigned got, n;
+ gz_statep state;
+ z_streamp strm;
+
+ /* get internal structure */
+ if (file == NULL)
+ return -1;
+ state = (gz_statep)file;
+ strm = &(state->strm);
+
+ /* check that we're reading and that there's no (serious) error */
+ if (state->mode != GZ_READ ||
+ (state->err != Z_OK && state->err != Z_BUF_ERROR))
+ return -1;
+
+ /* since an int is returned, make sure len fits in one, otherwise return
+ with an error (this avoids the flaw in the interface) */
+ if ((int)len < 0) {
+ gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
+ return -1;
+ }
+
+ /* if len is zero, avoid unnecessary operations */
+ if (len == 0)
+ return 0;
+
+ /* process a skip request */
+ if (state->seek) {
+ state->seek = 0;
+ if (gz_skip(state, state->skip) == -1)
+ return -1;
+ }
+
+ /* get len bytes to buf, or less than len if at the end */
+ got = 0;
+ do {
+ /* first just try copying data from the output buffer */
+ if (state->x.have) {
+ n = state->x.have > len ? len : state->x.have;
+ memcpy(buf, state->x.next, n);
+ state->x.next += n;
+ state->x.have -= n;
+ }
+
+ /* output buffer empty -- return if we're at the end of the input */
+ else if (state->eof && strm->avail_in == 0) {
+ state->past = 1; /* tried to read past end */
+ break;
+ }
+
+ /* need output data -- for small len or new stream load up our output
+ buffer */
+ else if (state->how == LOOK || len < (state->size << 1)) {
+ /* get more output, looking for header if required */
+ if (gz_fetch(state) == -1)
+ return -1;
+ continue; /* no progress yet -- go back to copy above */
+ /* the copy above assures that we will leave with space in the
+ output buffer, allowing at least one gzungetc() to succeed */
+ }
+
+ /* large len -- read directly into user buffer */
+ else if (state->how == COPY) { /* read directly */
+ if (gz_load(state, buf, len, &n) == -1)
+ return -1;
+ }
+
+ /* large len -- decompress directly into user buffer */
+ else { /* state->how == GZIP */
+ strm->avail_out = len;
+ strm->next_out = buf;
+ if (gz_decomp(state) == -1)
+ return -1;
+ n = state->x.have;
+ state->x.have = 0;
+ }
+
+ /* update progress */
+ len -= n;
+ buf = (char *)buf + n;
+ got += n;
+ state->x.pos += n;
+ } while (len);
+
+ /* return number of bytes read into user buffer (will fit in int) */
+ return (int)got;
+}
+
+/* -- see zlib.h -- */
+#undef gzgetc
+int ZEXPORT gzgetc(file)
+ gzFile file;
+{
+ int ret;
+ unsigned char buf1;
+ gz_statep state;
+
+ /* get internal structure */
+ if (file == NULL)
+ return -1;
+ state = (gz_statep)file;
+
+ /* check that we're reading and that there's no (serious) error */
+ if (state->mode != GZ_READ ||
+ (state->err != Z_OK && state->err != Z_BUF_ERROR))
+ return -1;
+
+ /* try output buffer (no need to check for skip request) */
+ if (state->x.have) {
+ state->x.have--;
+ state->x.pos++;
+ return *(state->x.next)++;
+ }
+
+ /* nothing there -- try gzread() */
+ ret = gzread(file, buf, 1);
+ return ret < 1 ? -1 : buf0;
+}
+
+int ZEXPORT gzgetc_(file)
+gzFile file;
+{
+ return gzgetc(file);
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzungetc(c, file)
+ int c;
+ gzFile file;
+{
+ gz_statep state;
+
+ /* get internal structure */
+ if (file == NULL)
+ return -1;
+ state = (gz_statep)file;
+
+ /* check that we're reading and that there's no (serious) error */
+ if (state->mode != GZ_READ ||
+ (state->err != Z_OK && state->err != Z_BUF_ERROR))
+ return -1;
+
+ /* process a skip request */
+ if (state->seek) {
+ state->seek = 0;
+ if (gz_skip(state, state->skip) == -1)
+ return -1;
+ }
+
+ /* can't push EOF */
+ if (c < 0)
+ return -1;
+
+ /* if output buffer empty, put byte at end (allows more pushing) */
+ if (state->x.have == 0) {
+ state->x.have = 1;
+ state->x.next = state->out + (state->size << 1) - 1;
+ state->x.next0 = c;
+ state->x.pos--;
+ state->past = 0;
+ return c;
+ }
+
+ /* if no room, give up (must have already done a gzungetc()) */
+ if (state->x.have == (state->size << 1)) {
+ gz_error(state, Z_DATA_ERROR, "out of room to push characters");
+ return -1;
+ }
+
+ /* slide output data if needed and insert byte before existing data */
+ if (state->x.next == state->out) {
+ unsigned char *src = state->out + state->x.have;
+ unsigned char *dest = state->out + (state->size << 1);
+ while (src > state->out)
+ *--dest = *--src;
+ state->x.next = dest;
+ }
+ state->x.have++;
+ state->x.next--;
+ state->x.next0 = c;
+ state->x.pos--;
+ state->past = 0;
+ return c;
+}
+
+/* -- see zlib.h -- */
+char * ZEXPORT gzgets(file, buf, len)
+ gzFile file;
+ char *buf;
+ int len;
+{
+ unsigned left, n;
+ char *str;
+ unsigned char *eol;
+ gz_statep state;
+
+ /* check parameters and get internal structure */
+ if (file == NULL || buf == NULL || len < 1)
+ return NULL;
+ state = (gz_statep)file;
+
+ /* check that we're reading and that there's no (serious) error */
+ if (state->mode != GZ_READ ||
+ (state->err != Z_OK && state->err != Z_BUF_ERROR))
+ return NULL;
+
+ /* process a skip request */
+ if (state->seek) {
+ state->seek = 0;
+ if (gz_skip(state, state->skip) == -1)
+ return NULL;
+ }
+
+ /* copy output bytes up to new line or len - 1, whichever comes first --
+ append a terminating zero to the string (we don't check for a zero in
+ the contents, let the user worry about that) */
+ str = buf;
+ left = (unsigned)len - 1;
+ if (left) do {
+ /* assure that something is in the output buffer */
+ if (state->x.have == 0 && gz_fetch(state) == -1)
+ return NULL; /* error */
+ if (state->x.have == 0) { /* end of file */
+ state->past = 1; /* read past end */
+ break; /* return what we have */
+ }
+
+ /* look for end-of-line in current output buffer */
+ n = state->x.have > left ? left : state->x.have;
+ eol = memchr(state->x.next, '\n', n);
+ if (eol != NULL)
+ n = (unsigned)(eol - state->x.next) + 1;
+
+ /* copy through end-of-line, or remainder if not found */
+ memcpy(buf, state->x.next, n);
+ state->x.have -= n;
+ state->x.next += n;
+ state->x.pos += n;
+ left -= n;
+ buf += n;
+ } while (left && eol == NULL);
+
+ /* return terminated string, or if nothing, end of file */
+ if (buf == str)
+ return NULL;
+ buf0 = 0;
+ return str;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzdirect(file)
+ gzFile file;
+{
+ gz_statep state;
+
+ /* get internal structure */
+ if (file == NULL)
+ return 0;
+ state = (gz_statep)file;
+
+ /* if the state is not known, but we can find out, then do so (this is
+ mainly for right after a gzopen() or gzdopen()) */
+ if (state->mode == GZ_READ && state->how == LOOK && state->x.have == 0)
+ (void)gz_look(state);
+
+ /* return 1 if transparent, 0 if processing a gzip stream */
+ return state->direct;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzclose_r(file)
+ gzFile file;
+{
+ int ret, err;
+ gz_statep state;
+
+ /* get internal structure */
+ if (file == NULL)
+ return Z_STREAM_ERROR;
+ state = (gz_statep)file;
+
+ /* check that we're reading */
+ if (state->mode != GZ_READ)
+ return Z_STREAM_ERROR;
+
+ /* free memory and close file */
+ if (state->size) {
+ inflateEnd(&(state->strm));
+ free(state->out);
+ free(state->in);
+ }
+ err = state->err == Z_BUF_ERROR ? Z_BUF_ERROR : Z_OK;
+ gz_error(state, Z_OK, NULL);
+ free(state->path);
+ ret = close(state->fd);
+ free(state);
+ return ret ? Z_ERRNO : err;
+}

smplayer-0.8.1.tar.bz2/zlib/gzwrite.c Added

@@ -0,0 +1,565 @@
+/* gzwrite.c -- zlib functions for writing gzip files
+ * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "gzguts.h"
+
+/* Local functions */
+local int gz_init OF((gz_statep));
+local int gz_comp OF((gz_statep, int));
+local int gz_zero OF((gz_statep, z_off64_t));
+
+/* Initialize state for writing a gzip file. Mark initialization by setting
+ state->size to non-zero. Return -1 on failure or 0 on success. */
+local int gz_init(state)
+ gz_statep state;
+{
+ int ret;
+ z_streamp strm = &(state->strm);
+
+ /* allocate input buffer */
+ state->in = malloc(state->want);
+ if (state->in == NULL) {
+ gz_error(state, Z_MEM_ERROR, "out of memory");
+ return -1;
+ }
+
+ /* only need output buffer and deflate state if compressing */
+ if (!state->direct) {
+ /* allocate output buffer */
+ state->out = malloc(state->want);
+ if (state->out == NULL) {
+ free(state->in);
+ gz_error(state, Z_MEM_ERROR, "out of memory");
+ return -1;
+ }
+
+ /* allocate deflate memory, set up for gzip compression */
+ strm->zalloc = Z_NULL;
+ strm->zfree = Z_NULL;
+ strm->opaque = Z_NULL;
+ ret = deflateInit2(strm, state->level, Z_DEFLATED,
+ MAX_WBITS + 16, DEF_MEM_LEVEL, state->strategy);
+ if (ret != Z_OK) {
+ free(state->out);
+ free(state->in);
+ gz_error(state, Z_MEM_ERROR, "out of memory");
+ return -1;
+ }
+ }
+
+ /* mark state as initialized */
+ state->size = state->want;
+
+ /* initialize write buffer if compressing */
+ if (!state->direct) {
+ strm->avail_out = state->size;
+ strm->next_out = state->out;
+ state->x.next = strm->next_out;
+ }
+ return 0;
+}
+
+/* Compress whatever is at avail_in and next_in and write to the output file.
+ Return -1 if there is an error writing to the output file, otherwise 0.
+ flush is assumed to be a valid deflate() flush value. If flush is Z_FINISH,
+ then the deflate() state is reset to start a new gzip stream. If gz->direct
+ is true, then simply write to the output file without compressing, and
+ ignore flush. */
+local int gz_comp(state, flush)
+ gz_statep state;
+ int flush;
+{
+ int ret, got;
+ unsigned have;
+ z_streamp strm = &(state->strm);
+
+ /* allocate memory if this is the first time through */
+ if (state->size == 0 && gz_init(state) == -1)
+ return -1;
+
+ /* write directly if requested */
+ if (state->direct) {
+ got = write(state->fd, strm->next_in, strm->avail_in);
+ if (got < 0 || (unsigned)got != strm->avail_in) {
+ gz_error(state, Z_ERRNO, zstrerror());
+ return -1;
+ }
+ strm->avail_in = 0;
+ return 0;
+ }
+
+ /* run deflate() on provided input until it produces no more output */
+ ret = Z_OK;
+ do {
+ /* write out current buffer contents if full, or if flushing, but if
+ doing Z_FINISH then don't write until we get to Z_STREAM_END */
+ if (strm->avail_out == 0 || (flush != Z_NO_FLUSH &&
+ (flush != Z_FINISH || ret == Z_STREAM_END))) {
+ have = (unsigned)(strm->next_out - state->x.next);
+ if (have && ((got = write(state->fd, state->x.next, have)) < 0 ||
+ (unsigned)got != have)) {
+ gz_error(state, Z_ERRNO, zstrerror());
+ return -1;
+ }
+ if (strm->avail_out == 0) {
+ strm->avail_out = state->size;
+ strm->next_out = state->out;
+ }
+ state->x.next = strm->next_out;
+ }
+
+ /* compress */
+ have = strm->avail_out;
+ ret = deflate(strm, flush);
+ if (ret == Z_STREAM_ERROR) {
+ gz_error(state, Z_STREAM_ERROR,
+ "internal error: deflate stream corrupt");
+ return -1;
+ }
+ have -= strm->avail_out;
+ } while (have);
+
+ /* if that completed a deflate stream, allow another to start */
+ if (flush == Z_FINISH)
+ deflateReset(strm);
+
+ /* all done, no errors */
+ return 0;
+}
+
+/* Compress len zeros to output. Return -1 on error, 0 on success. */
+local int gz_zero(state, len)
+ gz_statep state;
+ z_off64_t len;
+{
+ int first;
+ unsigned n;
+ z_streamp strm = &(state->strm);
+
+ /* consume whatever's left in the input buffer */
+ if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+ return -1;
+
+ /* compress len zeros (len guaranteed > 0) */
+ first = 1;
+ while (len) {
+ n = GT_OFF(state->size) || (z_off64_t)state->size > len ?
+ (unsigned)len : state->size;
+ if (first) {
+ memset(state->in, 0, n);
+ first = 0;
+ }
+ strm->avail_in = n;
+ strm->next_in = state->in;
+ state->x.pos += n;
+ if (gz_comp(state, Z_NO_FLUSH) == -1)
+ return -1;
+ len -= n;
+ }
+ return 0;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzwrite(file, buf, len)
+ gzFile file;
+ voidpc buf;
+ unsigned len;
+{
+ unsigned put = len;
+ unsigned n;
+ gz_statep state;
+ z_streamp strm;
+
+ /* get internal structure */
+ if (file == NULL)
+ return 0;
+ state = (gz_statep)file;
+ strm = &(state->strm);
+
+ /* check that we're writing and that there's no error */
+ if (state->mode != GZ_WRITE || state->err != Z_OK)
+ return 0;
+
+ /* since an int is returned, make sure len fits in one, otherwise return
+ with an error (this avoids the flaw in the interface) */
+ if ((int)len < 0) {
+ gz_error(state, Z_DATA_ERROR, "requested length does not fit in int");
+ return 0;
+ }
+
+ /* if len is zero, avoid unnecessary operations */
+ if (len == 0)
+ return 0;
+
+ /* allocate memory if this is the first time through */
+ if (state->size == 0 && gz_init(state) == -1)
+ return 0;
+
+ /* check for seek request */
+ if (state->seek) {
+ state->seek = 0;
+ if (gz_zero(state, state->skip) == -1)
+ return 0;
+ }
+
+ /* for small len, copy to input buffer, otherwise compress directly */
+ if (len < state->size) {
+ /* copy to input buffer, compress when full */
+ do {
+ if (strm->avail_in == 0)
+ strm->next_in = state->in;
+ n = state->size - strm->avail_in;
+ if (n > len)
+ n = len;
+ memcpy(strm->next_in + strm->avail_in, buf, n);
+ strm->avail_in += n;
+ state->x.pos += n;
+ buf = (char *)buf + n;
+ len -= n;
+ if (len && gz_comp(state, Z_NO_FLUSH) == -1)
+ return 0;
+ } while (len);
+ }
+ else {
+ /* consume whatever's left in the input buffer */
+ if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+ return 0;
+
+ /* directly compress user buffer to file */
+ strm->avail_in = len;
+ strm->next_in = (voidp)buf;
+ state->x.pos += len;
+ if (gz_comp(state, Z_NO_FLUSH) == -1)
+ return 0;
+ }
+
+ /* input was all buffered or compressed (put will fit in int) */
+ return (int)put;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzputc(file, c)
+ gzFile file;
+ int c;
+{
+ unsigned char buf1;
+ gz_statep state;
+ z_streamp strm;
+
+ /* get internal structure */
+ if (file == NULL)
+ return -1;
+ state = (gz_statep)file;
+ strm = &(state->strm);
+
+ /* check that we're writing and that there's no error */
+ if (state->mode != GZ_WRITE || state->err != Z_OK)
+ return -1;
+
+ /* check for seek request */
+ if (state->seek) {
+ state->seek = 0;
+ if (gz_zero(state, state->skip) == -1)
+ return -1;
+ }
+
+ /* try writing to input buffer for speed (state->size == 0 if buffer not
+ initialized) */
+ if (strm->avail_in < state->size) {
+ if (strm->avail_in == 0)
+ strm->next_in = state->in;
+ strm->next_instrm->avail_in++ = c;
+ state->x.pos++;
+ return c & 0xff;
+ }
+
+ /* no room in buffer or not initialized, use gz_write() */
+ buf0 = c;
+ if (gzwrite(file, buf, 1) != 1)
+ return -1;
+ return c & 0xff;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzputs(file, str)
+ gzFile file;
+ const char *str;
+{
+ int ret;
+ unsigned len;
+
+ /* write string */
+ len = (unsigned)strlen(str);
+ ret = gzwrite(file, str, len);
+ return ret == 0 && len != 0 ? -1 : ret;
+}
+
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+#include <stdarg.h>
+
+/* -- see zlib.h -- */
+int ZEXPORTVA gzprintf (gzFile file, const char *format, ...)
+{
+ int size, len;
+ gz_statep state;
+ z_streamp strm;
+ va_list va;
+
+ /* get internal structure */
+ if (file == NULL)
+ return -1;
+ state = (gz_statep)file;
+ strm = &(state->strm);
+
+ /* check that we're writing and that there's no error */
+ if (state->mode != GZ_WRITE || state->err != Z_OK)
+ return 0;
+
+ /* make sure we have some buffer space */
+ if (state->size == 0 && gz_init(state) == -1)
+ return 0;
+
+ /* check for seek request */
+ if (state->seek) {
+ state->seek = 0;
+ if (gz_zero(state, state->skip) == -1)
+ return 0;
+ }
+
+ /* consume whatever's left in the input buffer */
+ if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+ return 0;
+
+ /* do the printf() into the input buffer, put length in len */
+ size = (int)(state->size);
+ state->insize - 1 = 0;
+ va_start(va, format);
+#ifdef NO_vsnprintf
+# ifdef HAS_vsprintf_void
+ (void)vsprintf((char *)(state->in), format, va);
+ va_end(va);
+ for (len = 0; len < size; len++)
+ if (state->inlen == 0) break;
+# else
+ len = vsprintf((char *)(state->in), format, va);
+ va_end(va);
+# endif
+#else
+# ifdef HAS_vsnprintf_void
+ (void)vsnprintf((char *)(state->in), size, format, va);
+ va_end(va);
+ len = strlen((char *)(state->in));
+# else
+ len = vsnprintf((char *)(state->in), size, format, va);
+ va_end(va);
+# endif
+#endif
+
+ /* check that printf() results fit in buffer */
+ if (len <= 0 || len >= (int)size || state->insize - 1 != 0)
+ return 0;
+
+ /* update buffer and position, defer compression until needed */
+ strm->avail_in = (unsigned)len;
+ strm->next_in = state->in;
+ state->x.pos += len;
+ return len;
+}
+
+#else /* !STDC && !Z_HAVE_STDARG_H */
+
+/* -- see zlib.h -- */
+int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+ a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
+ gzFile file;
+ const char *format;
+ int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+ a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
+{
+ int size, len;
+ gz_statep state;
+ z_streamp strm;
+
+ /* get internal structure */
+ if (file == NULL)
+ return -1;
+ state = (gz_statep)file;
+ strm = &(state->strm);
+
+ /* check that can really pass pointer in ints */
+ if (sizeof(int) != sizeof(void *))
+ return 0;
+
+ /* check that we're writing and that there's no error */
+ if (state->mode != GZ_WRITE || state->err != Z_OK)
+ return 0;
+
+ /* make sure we have some buffer space */
+ if (state->size == 0 && gz_init(state) == -1)
+ return 0;
+
+ /* check for seek request */
+ if (state->seek) {
+ state->seek = 0;
+ if (gz_zero(state, state->skip) == -1)
+ return 0;
+ }
+
+ /* consume whatever's left in the input buffer */
+ if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1)
+ return 0;
+
+ /* do the printf() into the input buffer, put length in len */
+ size = (int)(state->size);
+ state->insize - 1 = 0;
+#ifdef NO_snprintf
+# ifdef HAS_sprintf_void
+ sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
+ a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+ for (len = 0; len < size; len++)
+ if (state->inlen == 0) break;
+# else
+ len = sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8,
+ a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+# endif
+#else
+# ifdef HAS_snprintf_void
+ snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8,
+ a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
+ len = strlen((char *)(state->in));
+# else
+ len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6,
+ a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18,
+ a19, a20);
+# endif
+#endif
+
+ /* check that printf() results fit in buffer */
+ if (len <= 0 || len >= (int)size || state->insize - 1 != 0)
+ return 0;
+
+ /* update buffer and position, defer compression until needed */
+ strm->avail_in = (unsigned)len;
+ strm->next_in = state->in;
+ state->x.pos += len;
+ return len;
+}
+
+#endif
+
+/* -- see zlib.h -- */
+int ZEXPORT gzflush(file, flush)
+ gzFile file;
+ int flush;
+{
+ gz_statep state;
+
+ /* get internal structure */
+ if (file == NULL)
+ return -1;
+ state = (gz_statep)file;
+
+ /* check that we're writing and that there's no error */
+ if (state->mode != GZ_WRITE || state->err != Z_OK)
+ return Z_STREAM_ERROR;
+
+ /* check flush parameter */
+ if (flush < 0 || flush > Z_FINISH)
+ return Z_STREAM_ERROR;
+
+ /* check for seek request */
+ if (state->seek) {
+ state->seek = 0;
+ if (gz_zero(state, state->skip) == -1)
+ return -1;
+ }
+
+ /* compress remaining data with requested flush */
+ gz_comp(state, flush);
+ return state->err;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzsetparams(file, level, strategy)
+ gzFile file;
+ int level;
+ int strategy;
+{
+ gz_statep state;
+ z_streamp strm;
+
+ /* get internal structure */
+ if (file == NULL)
+ return Z_STREAM_ERROR;
+ state = (gz_statep)file;
+ strm = &(state->strm);
+
+ /* check that we're writing and that there's no error */
+ if (state->mode != GZ_WRITE || state->err != Z_OK)
+ return Z_STREAM_ERROR;
+
+ /* if no change is requested, then do nothing */
+ if (level == state->level && strategy == state->strategy)
+ return Z_OK;
+
+ /* check for seek request */
+ if (state->seek) {
+ state->seek = 0;
+ if (gz_zero(state, state->skip) == -1)
+ return -1;
+ }
+
+ /* change compression parameters for subsequent input */
+ if (state->size) {
+ /* flush previous input with previous parameters before changing */
+ if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1)
+ return state->err;
+ deflateParams(strm, level, strategy);
+ }
+ state->level = level;
+ state->strategy = strategy;
+ return Z_OK;
+}
+
+/* -- see zlib.h -- */
+int ZEXPORT gzclose_w(file)
+ gzFile file;
+{
+ int ret = Z_OK;
+ gz_statep state;
+
+ /* get internal structure */
+ if (file == NULL)
+ return Z_STREAM_ERROR;
+ state = (gz_statep)file;
+
+ /* check that we're writing */
+ if (state->mode != GZ_WRITE)
+ return Z_STREAM_ERROR;
+
+ /* check for seek request */
+ if (state->seek) {
+ state->seek = 0;
+ if (gz_zero(state, state->skip) == -1)
+ ret = state->err;
+ }
+
+ /* flush, free memory, and close file */
+ if (state->size) {
+ if (gz_comp(state, Z_FINISH) == -1)
+ ret = state->err;
+ if (!state->direct) {
+ (void)deflateEnd(&(state->strm));
+ free(state->out);
+ }
+ free(state->in);
+ }
+ gz_error(state, Z_OK, NULL);
+ free(state->path);
+ if (close(state->fd) == -1)
+ ret = Z_ERRNO;
+ free(state);
+ return ret;
+}

smplayer-0.8.1.tar.bz2/zlib/infback.c Changed

smplayer-0.8.1.tar.bz2/zlib/inffast.c Changed

smplayer-0.8.1.tar.bz2/zlib/inffast.h Changed

smplayer-0.8.1.tar.bz2/zlib/inffixed.h Changed

smplayer-0.8.1.tar.bz2/zlib/inflate.c Added

@@ -0,0 +1,1496 @@
+/* inflate.c -- zlib decompression
+ * Copyright (C) 1995-2012 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * Change history:
+ *
+ * 1.2.beta0 24 Nov 2002
+ * - First version -- complete rewrite of inflate to simplify code, avoid
+ * creation of window when not needed, minimize use of window when it is
+ * needed, make inffast.c even faster, implement gzip decoding, and to
+ * improve code readability and style over the previous zlib inflate code
+ *
+ * 1.2.beta1 25 Nov 2002
+ * - Use pointers for available input and output checking in inffast.c
+ * - Remove input and output counters in inffast.c
+ * - Change inffast.c entry and loop from avail_in >= 7 to >= 6
+ * - Remove unnecessary second byte pull from length extra in inffast.c
+ * - Unroll direct copy to three copies per loop in inffast.c
+ *
+ * 1.2.beta2 4 Dec 2002
+ * - Change external routine names to reduce potential conflicts
+ * - Correct filename to inffixed.h for fixed tables in inflate.c
+ * - Make hbuf unsigned char to match parameter type in inflate.c
+ * - Change strm->next_out-state->offset to *(strm->next_out - state->offset)
+ * to avoid negation problem on Alphas (64 bit) in inflate.c
+ *
+ * 1.2.beta3 22 Dec 2002
+ * - Add comments on state->bits assertion in inffast.c
+ * - Add comments on op field in inftrees.h
+ * - Fix bug in reuse of allocated window after inflateReset()
+ * - Remove bit fields--back to byte structure for speed
+ * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths
+ * - Change post-increments to pre-increments in inflate_fast(), PPC biased?
+ * - Add compile time option, POSTINC, to use post-increments instead (Intel?)
+ * - Make MATCH copy in inflate() much faster for when inflate_fast() not used
+ * - Use local copies of stream next and avail values, as well as local bit
+ * buffer and bit count in inflate()--for speed when inflate_fast() not used
+ *
+ * 1.2.beta4 1 Jan 2003
+ * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings
+ * - Move a comment on output buffer sizes from inffast.c to inflate.c
+ * - Add comments in inffast.c to introduce the inflate_fast() routine
+ * - Rearrange window copies in inflate_fast() for speed and simplification
+ * - Unroll last copy for window match in inflate_fast()
+ * - Use local copies of window variables in inflate_fast() for speed
+ * - Pull out common wnext == 0 case for speed in inflate_fast()
+ * - Make op and len in inflate_fast() unsigned for consistency
+ * - Add FAR to lcode and dcode declarations in inflate_fast()
+ * - Simplified bad distance check in inflate_fast()
+ * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new
+ * source file infback.c to provide a call-back interface to inflate for
+ * programs like gzip and unzip -- uses window as output buffer to avoid
+ * window copying
+ *
+ * 1.2.beta5 1 Jan 2003
+ * - Improved inflateBack() interface to allow the caller to provide initial
+ * input in strm.
+ * - Fixed stored blocks bug in inflateBack()
+ *
+ * 1.2.beta6 4 Jan 2003
+ * - Added comments in inffast.c on effectiveness of POSTINC
+ * - Typecasting all around to reduce compiler warnings
+ * - Changed loops from while (1) or do {} while (1) to for (;;), again to
+ * make compilers happy
+ * - Changed type of window in inflateBackInit() to unsigned char *
+ *
+ * 1.2.beta7 27 Jan 2003
+ * - Changed many types to unsigned or unsigned short to avoid warnings
+ * - Added inflateCopy() function
+ *
+ * 1.2.0 9 Mar 2003
+ * - Changed inflateBack() interface to provide separate opaque descriptors
+ * for the in() and out() functions
+ * - Changed inflateBack() argument and in_func typedef to swap the length
+ * and buffer address return values for the input function
+ * - Check next_in and next_out for Z_NULL on entry to inflate()
+ *
+ * The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifdef MAKEFIXED
+# ifndef BUILDFIXED
+# define BUILDFIXED
+# endif
+#endif
+
+/* function prototypes */
+local void fixedtables OF((struct inflate_state FAR *state));
+local int updatewindow OF((z_streamp strm, unsigned out));
+#ifdef BUILDFIXED
+ void makefixed OF((void));
+#endif
+local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf,
+ unsigned len));
+
+int ZEXPORT inflateResetKeep(strm)
+z_streamp strm;
+{
+ struct inflate_state FAR *state;
+
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ state = (struct inflate_state FAR *)strm->state;
+ strm->total_in = strm->total_out = state->total = 0;
+ strm->msg = Z_NULL;
+ if (state->wrap) /* to support ill-conceived Java test suite */
+ strm->adler = state->wrap & 1;
+ state->mode = HEAD;
+ state->last = 0;
+ state->havedict = 0;
+ state->dmax = 32768U;
+ state->head = Z_NULL;
+ state->hold = 0;
+ state->bits = 0;
+ state->lencode = state->distcode = state->next = state->codes;
+ state->sane = 1;
+ state->back = -1;
+ Tracev((stderr, "inflate: reset\n"));
+ return Z_OK;
+}
+
+int ZEXPORT inflateReset(strm)
+z_streamp strm;
+{
+ struct inflate_state FAR *state;
+
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ state = (struct inflate_state FAR *)strm->state;
+ state->wsize = 0;
+ state->whave = 0;
+ state->wnext = 0;
+ return inflateResetKeep(strm);
+}
+
+int ZEXPORT inflateReset2(strm, windowBits)
+z_streamp strm;
+int windowBits;
+{
+ int wrap;
+ struct inflate_state FAR *state;
+
+ /* get the state */
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ state = (struct inflate_state FAR *)strm->state;
+
+ /* extract wrap request from windowBits parameter */
+ if (windowBits < 0) {
+ wrap = 0;
+ windowBits = -windowBits;
+ }
+ else {
+ wrap = (windowBits >> 4) + 1;
+#ifdef GUNZIP
+ if (windowBits < 48)
+ windowBits &= 15;
+#endif
+ }
+
+ /* set number of window bits, free window if different */
+ if (windowBits && (windowBits < 8 || windowBits > 15))
+ return Z_STREAM_ERROR;
+ if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) {
+ ZFREE(strm, state->window);
+ state->window = Z_NULL;
+ }
+
+ /* update state and reset the rest of it */
+ state->wrap = wrap;
+ state->wbits = (unsigned)windowBits;
+ return inflateReset(strm);
+}
+
+int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size)
+z_streamp strm;
+int windowBits;
+const char *version;
+int stream_size;
+{
+ int ret;
+ struct inflate_state FAR *state;
+
+ if (version == Z_NULL || version0 != ZLIB_VERSION0 ||
+ stream_size != (int)(sizeof(z_stream)))
+ return Z_VERSION_ERROR;
+ if (strm == Z_NULL) return Z_STREAM_ERROR;
+ strm->msg = Z_NULL; /* in case we return an error */
+ if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+ return Z_STREAM_ERROR;
+#else
+ strm->zalloc = zcalloc;
+ strm->opaque = (voidpf)0;
+#endif
+ }
+ if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+ return Z_STREAM_ERROR;
+#else
+ strm->zfree = zcfree;
+#endif
+ state = (struct inflate_state FAR *)
+ ZALLOC(strm, 1, sizeof(struct inflate_state));
+ if (state == Z_NULL) return Z_MEM_ERROR;
+ Tracev((stderr, "inflate: allocated\n"));
+ strm->state = (struct internal_state FAR *)state;
+ state->window = Z_NULL;
+ ret = inflateReset2(strm, windowBits);
+ if (ret != Z_OK) {
+ ZFREE(strm, state);
+ strm->state = Z_NULL;
+ }
+ return ret;
+}
+
+int ZEXPORT inflateInit_(strm, version, stream_size)
+z_streamp strm;
+const char *version;
+int stream_size;
+{
+ return inflateInit2_(strm, DEF_WBITS, version, stream_size);
+}
+
+int ZEXPORT inflatePrime(strm, bits, value)
+z_streamp strm;
+int bits;
+int value;
+{
+ struct inflate_state FAR *state;
+
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ state = (struct inflate_state FAR *)strm->state;
+ if (bits < 0) {
+ state->hold = 0;
+ state->bits = 0;
+ return Z_OK;
+ }
+ if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR;
+ value &= (1L << bits) - 1;
+ state->hold += value << state->bits;
+ state->bits += bits;
+ return Z_OK;
+}
+
+/*
+ Return state with length and distance decoding tables and index sizes set to
+ fixed code decoding. Normally this returns fixed tables from inffixed.h.
+ If BUILDFIXED is defined, then instead this routine builds the tables the
+ first time it's called, and returns those tables the first time and
+ thereafter. This reduces the size of the code by about 2K bytes, in
+ exchange for a little execution time. However, BUILDFIXED should not be
+ used for threaded applications, since the rewriting of the tables and virgin
+ may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+ static int virgin = 1;
+ static code *lenfix, *distfix;
+ static code fixed544;
+
+ /* build fixed huffman tables if first call (may not be thread safe) */
+ if (virgin) {
+ unsigned sym, bits;
+ static code *next;
+
+ /* literal/length table */
+ sym = 0;
+ while (sym < 144) state->lenssym++ = 8;
+ while (sym < 256) state->lenssym++ = 9;
+ while (sym < 280) state->lenssym++ = 7;
+ while (sym < 288) state->lenssym++ = 8;
+ next = fixed;
+ lenfix = next;
+ bits = 9;
+ inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+ /* distance table */
+ sym = 0;
+ while (sym < 32) state->lenssym++ = 5;
+ distfix = next;
+ bits = 5;
+ inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+ /* do this just once */
+ virgin = 0;
+ }
+#else /* !BUILDFIXED */
+# include "inffixed.h"
+#endif /* BUILDFIXED */
+ state->lencode = lenfix;
+ state->lenbits = 9;
+ state->distcode = distfix;
+ state->distbits = 5;
+}
+
+#ifdef MAKEFIXED
+#include <stdio.h>
+
+/*
+ Write out the inffixed.h that is #include'd above. Defining MAKEFIXED also
+ defines BUILDFIXED, so the tables are built on the fly. makefixed() writes
+ those tables to stdout, which would be piped to inffixed.h. A small program
+ can simply call makefixed to do this:
+
+ void makefixed(void);
+
+ int main(void)
+ {
+ makefixed();
+ return 0;
+ }
+
+ Then that can be linked with zlib built with MAKEFIXED defined and run:
+
+ a.out > inffixed.h
+ */
+void makefixed()
+{
+ unsigned low, size;
+ struct inflate_state state;
+
+ fixedtables(&state);
+ puts(" /* inffixed.h -- table for decoding fixed codes");
+ puts(" * Generated automatically by makefixed().");
+ puts(" */");
+ puts("");
+ puts(" /* WARNING: this file should *not* be used by applications.");
+ puts(" It is part of the implementation of this library and is");
+ puts(" subject to change. Applications should only use zlib.h.");
+ puts(" */");
+ puts("");
+ size = 1U << 9;
+ printf(" static const code lenfix%u = {", size);
+ low = 0;
+ for (;;) {
+ if ((low % 7) == 0) printf("\n ");
+ printf("{%u,%u,%d}", (low & 127) == 99 ? 64 : state.lencodelow.op,
+ state.lencodelow.bits, state.lencodelow.val);
+ if (++low == size) break;
+ putchar(',');
+ }
+ puts("\n };");
+ size = 1U << 5;
+ printf("\n static const code distfix%u = {", size);
+ low = 0;
+ for (;;) {
+ if ((low % 6) == 0) printf("\n ");
+ printf("{%u,%u,%d}", state.distcodelow.op, state.distcodelow.bits,
+ state.distcodelow.val);
+ if (++low == size) break;
+ putchar(',');
+ }
+ puts("\n };");
+}
+#endif /* MAKEFIXED */
+
+/*
+ Update the window with the last wsize (normally 32K) bytes written before
+ returning. If window does not exist yet, create it. This is only called
+ when a window is already in use, or when output has been written during this
+ inflate call, but the end of the deflate stream has not been reached yet.
+ It is also called to create a window for dictionary data when a dictionary
+ is loaded.
+
+ Providing output buffers larger than 32K to inflate() should provide a speed
+ advantage, since only the last 32K of output is copied to the sliding window
+ upon return from inflate(), and since all distances after the first 32K of
+ output will fall in the output data, making match copies simpler and faster.
+ The advantage may be dependent on the size of the processor's data caches.
+ */
+local int updatewindow(strm, out)
+z_streamp strm;
+unsigned out;
+{
+ struct inflate_state FAR *state;
+ unsigned copy, dist;
+
+ state = (struct inflate_state FAR *)strm->state;
+
+ /* if it hasn't been done already, allocate space for the window */
+ if (state->window == Z_NULL) {
+ state->window = (unsigned char FAR *)
+ ZALLOC(strm, 1U << state->wbits,
+ sizeof(unsigned char));
+ if (state->window == Z_NULL) return 1;
+ }
+
+ /* if window not in use yet, initialize */
+ if (state->wsize == 0) {
+ state->wsize = 1U << state->wbits;
+ state->wnext = 0;
+ state->whave = 0;
+ }
+
+ /* copy state->wsize or less output bytes into the circular window */
+ copy = out - strm->avail_out;
+ if (copy >= state->wsize) {
+ zmemcpy(state->window, strm->next_out - state->wsize, state->wsize);
+ state->wnext = 0;
+ state->whave = state->wsize;
+ }
+ else {
+ dist = state->wsize - state->wnext;
+ if (dist > copy) dist = copy;
+ zmemcpy(state->window + state->wnext, strm->next_out - copy, dist);
+ copy -= dist;
+ if (copy) {
+ zmemcpy(state->window, strm->next_out - copy, copy);
+ state->wnext = copy;
+ state->whave = state->wsize;
+ }
+ else {
+ state->wnext += dist;
+ if (state->wnext == state->wsize) state->wnext = 0;
+ if (state->whave < state->wsize) state->whave += dist;
+ }
+ }
+ return 0;
+}
+
+/* Macros for inflate(): */
+
+/* check function to use adler32() for zlib or crc32() for gzip */
+#ifdef GUNZIP
+# define UPDATE(check, buf, len) \
+ (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
+#else
+# define UPDATE(check, buf, len) adler32(check, buf, len)
+#endif
+
+/* check macros for header crc */
+#ifdef GUNZIP
+# define CRC2(check, word) \
+ do { \
+ hbuf0 = (unsigned char)(word); \
+ hbuf1 = (unsigned char)((word) >> 8); \
+ check = crc32(check, hbuf, 2); \
+ } while (0)
+
+# define CRC4(check, word) \
+ do { \
+ hbuf0 = (unsigned char)(word); \
+ hbuf1 = (unsigned char)((word) >> 8); \
+ hbuf2 = (unsigned char)((word) >> 16); \
+ hbuf3 = (unsigned char)((word) >> 24); \
+ check = crc32(check, hbuf, 4); \
+ } while (0)
+#endif
+
+/* Load registers with state in inflate() for speed */
+#define LOAD() \
+ do { \
+ put = strm->next_out; \
+ left = strm->avail_out; \
+ next = strm->next_in; \
+ have = strm->avail_in; \
+ hold = state->hold; \
+ bits = state->bits; \
+ } while (0)
+
+/* Restore state from registers in inflate() */
+#define RESTORE() \
+ do { \
+ strm->next_out = put; \
+ strm->avail_out = left; \
+ strm->next_in = next; \
+ strm->avail_in = have; \
+ state->hold = hold; \
+ state->bits = bits; \
+ } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+ do { \
+ hold = 0; \
+ bits = 0; \
+ } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflate()
+ if there is no input available. */
+#define PULLBYTE() \
+ do { \
+ if (have == 0) goto inf_leave; \
+ have--; \
+ hold += (unsigned long)(*next++) << bits; \
+ bits += 8; \
+ } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator. If there is
+ not enough available input to do that, then return from inflate(). */
+#define NEEDBITS(n) \
+ do { \
+ while (bits < (unsigned)(n)) \
+ PULLBYTE(); \
+ } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+ ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+ do { \
+ hold >>= (n); \
+ bits -= (unsigned)(n); \
+ } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+ do { \
+ hold >>= bits & 7; \
+ bits -= bits & 7; \
+ } while (0)
+
+/*
+ inflate() uses a state machine to process as much input data and generate as
+ much output data as possible before returning. The state machine is
+ structured roughly as follows:
+
+ for (;;) switch (state) {
+ ...
+ case STATEn:
+ if (not enough input data or output space to make progress)
+ return;
+ ... make progress ...
+ state = STATEm;
+ break;
+ ...
+ }
+
+ so when inflate() is called again, the same case is attempted again, and
+ if the appropriate resources are provided, the machine proceeds to the
+ next state. The NEEDBITS() macro is usually the way the state evaluates
+ whether it can proceed or should return. NEEDBITS() does the return if
+ the requested bits are not available. The typical use of the BITS macros
+ is:
+
+ NEEDBITS(n);
+ ... do something with BITS(n) ...
+ DROPBITS(n);
+
+ where NEEDBITS(n) either returns from inflate() if there isn't enough
+ input left to load n bits into the accumulator, or it continues. BITS(n)
+ gives the low n bits in the accumulator. When done, DROPBITS(n) drops
+ the low n bits off the accumulator. INITBITS() clears the accumulator
+ and sets the number of available bits to zero. BYTEBITS() discards just
+ enough bits to put the accumulator on a byte boundary. After BYTEBITS()
+ and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
+
+ NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
+ if there is no input available. The decoding of variable length codes uses
+ PULLBYTE() directly in order to pull just enough bytes to decode the next
+ code, and no more.
+
+ Some states loop until they get enough input, making sure that enough
+ state information is maintained to continue the loop where it left off
+ if NEEDBITS() returns in the loop. For example, want, need, and keep
+ would all have to actually be part of the saved state in case NEEDBITS()
+ returns:
+
+ case STATEw:
+ while (want < need) {
+ NEEDBITS(n);
+ keepwant++ = BITS(n);
+ DROPBITS(n);
+ }
+ state = STATEx;
+ case STATEx:
+
+ As shown above, if the next state is also the next case, then the break
+ is omitted.
+
+ A state may also return if there is not enough output space available to
+ complete that state. Those states are copying stored data, writing a
+ literal byte, and copying a matching string.
+
+ When returning, a "goto inf_leave" is used to update the total counters,
+ update the check value, and determine whether any progress has been made
+ during that inflate() call in order to return the proper return code.
+ Progress is defined as a change in either strm->avail_in or strm->avail_out.
+ When there is a window, goto inf_leave will update the window with the last
+ output written. If a goto inf_leave occurs in the middle of decompression
+ and there is no window currently, goto inf_leave will create one and copy
+ output to the window for the next call of inflate().
+
+ In this implementation, the flush parameter of inflate() only affects the
+ return code (per zlib.h). inflate() always writes as much as possible to
+ strm->next_out, given the space available and the provided input--the effect
+ documented in zlib.h of Z_SYNC_FLUSH. Furthermore, inflate() always defers
+ the allocation of and copying into a sliding window until necessary, which
+ provides the effect documented in zlib.h for Z_FINISH when the entire input
+ stream available. So the only thing the flush parameter actually does is:
+ when flush is set to Z_FINISH, inflate() cannot return Z_OK. Instead it
+ will return Z_BUF_ERROR if it has not reached the end of the stream.
+ */
+
+int ZEXPORT inflate(strm, flush)
+z_streamp strm;
+int flush;
+{
+ struct inflate_state FAR *state;
+ unsigned char FAR *next; /* next input */
+ unsigned char FAR *put; /* next output */
+ unsigned have, left; /* available input and output */
+ unsigned long hold; /* bit buffer */
+ unsigned bits; /* bits in bit buffer */
+ unsigned in, out; /* save starting available input and output */
+ unsigned copy; /* number of stored or match bytes to copy */
+ unsigned char FAR *from; /* where to copy match bytes from */
+ code here; /* current decoding table entry */
+ code last; /* parent table entry */
+ unsigned len; /* length to copy for repeats, bits to drop */
+ int ret; /* return code */
+#ifdef GUNZIP
+ unsigned char hbuf4; /* buffer for gzip header crc calculation */
+#endif
+ static const unsigned short order19 = /* permutation of code lengths */
+ {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+ if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL ||
+ (strm->next_in == Z_NULL && strm->avail_in != 0))
+ return Z_STREAM_ERROR;
+
+ state = (struct inflate_state FAR *)strm->state;
+ if (state->mode == TYPE) state->mode = TYPEDO; /* skip check */
+ LOAD();
+ in = have;
+ out = left;
+ ret = Z_OK;
+ for (;;)
+ switch (state->mode) {
+ case HEAD:
+ if (state->wrap == 0) {
+ state->mode = TYPEDO;
+ break;
+ }
+ NEEDBITS(16);
+#ifdef GUNZIP
+ if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */
+ state->check = crc32(0L, Z_NULL, 0);
+ CRC2(state->check, hold);
+ INITBITS();
+ state->mode = FLAGS;
+ break;
+ }
+ state->flags = 0; /* expect zlib header */
+ if (state->head != Z_NULL)
+ state->head->done = -1;
+ if (!(state->wrap & 1) || /* check if zlib header allowed */
+#else
+ if (
+#endif
+ ((BITS(8) << 8) + (hold >> 8)) % 31) {
+ strm->msg = (char *)"incorrect header check";
+ state->mode = BAD;
+ break;
+ }
+ if (BITS(4) != Z_DEFLATED) {
+ strm->msg = (char *)"unknown compression method";
+ state->mode = BAD;
+ break;
+ }
+ DROPBITS(4);
+ len = BITS(4) + 8;
+ if (state->wbits == 0)
+ state->wbits = len;
+ else if (len > state->wbits) {
+ strm->msg = (char *)"invalid window size";
+ state->mode = BAD;
+ break;
+ }
+ state->dmax = 1U << len;
+ Tracev((stderr, "inflate: zlib header ok\n"));
+ strm->adler = state->check = adler32(0L, Z_NULL, 0);
+ state->mode = hold & 0x200 ? DICTID : TYPE;
+ INITBITS();
+ break;
+#ifdef GUNZIP
+ case FLAGS:
+ NEEDBITS(16);
+ state->flags = (int)(hold);
+ if ((state->flags & 0xff) != Z_DEFLATED) {
+ strm->msg = (char *)"unknown compression method";
+ state->mode = BAD;
+ break;
+ }
+ if (state->flags & 0xe000) {
+ strm->msg = (char *)"unknown header flags set";
+ state->mode = BAD;
+ break;
+ }
+ if (state->head != Z_NULL)
+ state->head->text = (int)((hold >> 8) & 1);
+ if (state->flags & 0x0200) CRC2(state->check, hold);
+ INITBITS();
+ state->mode = TIME;
+ case TIME:
+ NEEDBITS(32);
+ if (state->head != Z_NULL)
+ state->head->time = hold;
+ if (state->flags & 0x0200) CRC4(state->check, hold);
+ INITBITS();
+ state->mode = OS;
+ case OS:
+ NEEDBITS(16);
+ if (state->head != Z_NULL) {
+ state->head->xflags = (int)(hold & 0xff);
+ state->head->os = (int)(hold >> 8);
+ }
+ if (state->flags & 0x0200) CRC2(state->check, hold);
+ INITBITS();
+ state->mode = EXLEN;
+ case EXLEN:
+ if (state->flags & 0x0400) {
+ NEEDBITS(16);
+ state->length = (unsigned)(hold);
+ if (state->head != Z_NULL)
+ state->head->extra_len = (unsigned)hold;
+ if (state->flags & 0x0200) CRC2(state->check, hold);
+ INITBITS();
+ }
+ else if (state->head != Z_NULL)
+ state->head->extra = Z_NULL;
+ state->mode = EXTRA;
+ case EXTRA:
+ if (state->flags & 0x0400) {
+ copy = state->length;
+ if (copy > have) copy = have;
+ if (copy) {
+ if (state->head != Z_NULL &&
+ state->head->extra != Z_NULL) {
+ len = state->head->extra_len - state->length;
+ zmemcpy(state->head->extra + len, next,
+ len + copy > state->head->extra_max ?
+ state->head->extra_max - len : copy);
+ }
+ if (state->flags & 0x0200)
+ state->check = crc32(state->check, next, copy);
+ have -= copy;
+ next += copy;
+ state->length -= copy;
+ }
+ if (state->length) goto inf_leave;
+ }
+ state->length = 0;
+ state->mode = NAME;
+ case NAME:
+ if (state->flags & 0x0800) {
+ if (have == 0) goto inf_leave;
+ copy = 0;
+ do {
+ len = (unsigned)(nextcopy++);
+ if (state->head != Z_NULL &&
+ state->head->name != Z_NULL &&
+ state->length < state->head->name_max)
+ state->head->namestate->length++ = len;
+ } while (len && copy < have);
+ if (state->flags & 0x0200)
+ state->check = crc32(state->check, next, copy);
+ have -= copy;
+ next += copy;
+ if (len) goto inf_leave;
+ }
+ else if (state->head != Z_NULL)
+ state->head->name = Z_NULL;
+ state->length = 0;
+ state->mode = COMMENT;
+ case COMMENT:
+ if (state->flags & 0x1000) {
+ if (have == 0) goto inf_leave;
+ copy = 0;
+ do {
+ len = (unsigned)(nextcopy++);
+ if (state->head != Z_NULL &&
+ state->head->comment != Z_NULL &&
+ state->length < state->head->comm_max)
+ state->head->commentstate->length++ = len;
+ } while (len && copy < have);
+ if (state->flags & 0x0200)
+ state->check = crc32(state->check, next, copy);
+ have -= copy;
+ next += copy;
+ if (len) goto inf_leave;
+ }
+ else if (state->head != Z_NULL)
+ state->head->comment = Z_NULL;
+ state->mode = HCRC;
+ case HCRC:
+ if (state->flags & 0x0200) {
+ NEEDBITS(16);
+ if (hold != (state->check & 0xffff)) {
+ strm->msg = (char *)"header crc mismatch";
+ state->mode = BAD;
+ break;
+ }
+ INITBITS();
+ }
+ if (state->head != Z_NULL) {
+ state->head->hcrc = (int)((state->flags >> 9) & 1);
+ state->head->done = 1;
+ }
+ strm->adler = state->check = crc32(0L, Z_NULL, 0);
+ state->mode = TYPE;
+ break;
+#endif
+ case DICTID:
+ NEEDBITS(32);
+ strm->adler = state->check = ZSWAP32(hold);
+ INITBITS();
+ state->mode = DICT;
+ case DICT:
+ if (state->havedict == 0) {
+ RESTORE();
+ return Z_NEED_DICT;
+ }
+ strm->adler = state->check = adler32(0L, Z_NULL, 0);
+ state->mode = TYPE;
+ case TYPE:
+ if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave;
+ case TYPEDO:
+ if (state->last) {
+ BYTEBITS();
+ state->mode = CHECK;
+ break;
+ }
+ NEEDBITS(3);
+ state->last = BITS(1);
+ DROPBITS(1);
+ switch (BITS(2)) {
+ case 0: /* stored block */
+ Tracev((stderr, "inflate: stored block%s\n",
+ state->last ? " (last)" : ""));
+ state->mode = STORED;
+ break;
+ case 1: /* fixed block */
+ fixedtables(state);
+ Tracev((stderr, "inflate: fixed codes block%s\n",
+ state->last ? " (last)" : ""));
+ state->mode = LEN_; /* decode codes */
+ if (flush == Z_TREES) {
+ DROPBITS(2);
+ goto inf_leave;
+ }
+ break;
+ case 2: /* dynamic block */
+ Tracev((stderr, "inflate: dynamic codes block%s\n",
+ state->last ? " (last)" : ""));
+ state->mode = TABLE;
+ break;
+ case 3:
+ strm->msg = (char *)"invalid block type";
+ state->mode = BAD;
+ }
+ DROPBITS(2);
+ break;
+ case STORED:
+ BYTEBITS(); /* go to byte boundary */
+ NEEDBITS(32);
+ if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+ strm->msg = (char *)"invalid stored block lengths";
+ state->mode = BAD;
+ break;
+ }
+ state->length = (unsigned)hold & 0xffff;
+ Tracev((stderr, "inflate: stored length %u\n",
+ state->length));
+ INITBITS();
+ state->mode = COPY_;
+ if (flush == Z_TREES) goto inf_leave;
+ case COPY_:
+ state->mode = COPY;
+ case COPY:
+ copy = state->length;
+ if (copy) {
+ if (copy > have) copy = have;
+ if (copy > left) copy = left;
+ if (copy == 0) goto inf_leave;
+ zmemcpy(put, next, copy);
+ have -= copy;
+ next += copy;
+ left -= copy;
+ put += copy;
+ state->length -= copy;
+ break;
+ }
+ Tracev((stderr, "inflate: stored end\n"));
+ state->mode = TYPE;
+ break;
+ case TABLE:
+ NEEDBITS(14);
+ state->nlen = BITS(5) + 257;
+ DROPBITS(5);
+ state->ndist = BITS(5) + 1;
+ DROPBITS(5);
+ state->ncode = BITS(4) + 4;
+ DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+ if (state->nlen > 286 || state->ndist > 30) {
+ strm->msg = (char *)"too many length or distance symbols";
+ state->mode = BAD;
+ break;
+ }
+#endif
+ Tracev((stderr, "inflate: table sizes ok\n"));
+ state->have = 0;
+ state->mode = LENLENS;
+ case LENLENS:
+ while (state->have < state->ncode) {
+ NEEDBITS(3);
+ state->lensorderstate->have++ = (unsigned short)BITS(3);
+ DROPBITS(3);
+ }
+ while (state->have < 19)
+ state->lensorderstate->have++ = 0;
+ state->next = state->codes;
+ state->lencode = (code const FAR *)(state->next);
+ state->lenbits = 7;
+ ret = inflate_table(CODES, state->lens, 19, &(state->next),
+ &(state->lenbits), state->work);
+ if (ret) {
+ strm->msg = (char *)"invalid code lengths set";
+ state->mode = BAD;
+ break;
+ }
+ Tracev((stderr, "inflate: code lengths ok\n"));
+ state->have = 0;
+ state->mode = CODELENS;
+ case CODELENS:
+ while (state->have < state->nlen + state->ndist) {
+ for (;;) {
+ here = state->lencodeBITS(state->lenbits);
+ if ((unsigned)(here.bits) <= bits) break;
+ PULLBYTE();
+ }
+ if (here.val < 16) {
+ DROPBITS(here.bits);
+ state->lensstate->have++ = here.val;
+ }
+ else {
+ if (here.val == 16) {
+ NEEDBITS(here.bits + 2);
+ DROPBITS(here.bits);
+ if (state->have == 0) {
+ strm->msg = (char *)"invalid bit length repeat";
+ state->mode = BAD;
+ break;
+ }
+ len = state->lensstate->have - 1;
+ copy = 3 + BITS(2);
+ DROPBITS(2);
+ }
+ else if (here.val == 17) {
+ NEEDBITS(here.bits + 3);
+ DROPBITS(here.bits);
+ len = 0;
+ copy = 3 + BITS(3);
+ DROPBITS(3);
+ }
+ else {
+ NEEDBITS(here.bits + 7);
+ DROPBITS(here.bits);
+ len = 0;
+ copy = 11 + BITS(7);
+ DROPBITS(7);
+ }
+ if (state->have + copy > state->nlen + state->ndist) {
+ strm->msg = (char *)"invalid bit length repeat";
+ state->mode = BAD;
+ break;
+ }
+ while (copy--)
+ state->lensstate->have++ = (unsigned short)len;
+ }
+ }
+
+ /* handle error breaks in while */
+ if (state->mode == BAD) break;
+
+ /* check for end-of-block code (better have one) */
+ if (state->lens256 == 0) {
+ strm->msg = (char *)"invalid code -- missing end-of-block";
+ state->mode = BAD;
+ break;
+ }
+
+ /* build code tables -- note: do not change the lenbits or distbits
+ values here (9 and 6) without reading the comments in inftrees.h
+ concerning the ENOUGH constants, which depend on those values */
+ state->next = state->codes;
+ state->lencode = (code const FAR *)(state->next);
+ state->lenbits = 9;
+ ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+ &(state->lenbits), state->work);
+ if (ret) {
+ strm->msg = (char *)"invalid literal/lengths set";
+ state->mode = BAD;
+ break;
+ }
+ state->distcode = (code const FAR *)(state->next);
+ state->distbits = 6;
+ ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+ &(state->next), &(state->distbits), state->work);
+ if (ret) {
+ strm->msg = (char *)"invalid distances set";
+ state->mode = BAD;
+ break;
+ }
+ Tracev((stderr, "inflate: codes ok\n"));
+ state->mode = LEN_;
+ if (flush == Z_TREES) goto inf_leave;
+ case LEN_:
+ state->mode = LEN;
+ case LEN:
+ if (have >= 6 && left >= 258) {
+ RESTORE();
+ inflate_fast(strm, out);
+ LOAD();
+ if (state->mode == TYPE)
+ state->back = -1;
+ break;
+ }
+ state->back = 0;
+ for (;;) {
+ here = state->lencodeBITS(state->lenbits);
+ if ((unsigned)(here.bits) <= bits) break;
+ PULLBYTE();
+ }
+ if (here.op && (here.op & 0xf0) == 0) {
+ last = here;
+ for (;;) {
+ here = state->lencodelast.val +
+ (BITS(last.bits + last.op) >> last.bits);
+ if ((unsigned)(last.bits + here.bits) <= bits) break;
+ PULLBYTE();
+ }
+ DROPBITS(last.bits);
+ state->back += last.bits;
+ }
+ DROPBITS(here.bits);
+ state->back += here.bits;
+ state->length = (unsigned)here.val;
+ if ((int)(here.op) == 0) {
+ Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+ "inflate: literal '%c'\n" :
+ "inflate: literal 0x%02x\n", here.val));
+ state->mode = LIT;
+ break;
+ }
+ if (here.op & 32) {
+ Tracevv((stderr, "inflate: end of block\n"));
+ state->back = -1;
+ state->mode = TYPE;
+ break;
+ }
+ if (here.op & 64) {
+ strm->msg = (char *)"invalid literal/length code";
+ state->mode = BAD;
+ break;
+ }
+ state->extra = (unsigned)(here.op) & 15;
+ state->mode = LENEXT;
+ case LENEXT:
+ if (state->extra) {
+ NEEDBITS(state->extra);
+ state->length += BITS(state->extra);
+ DROPBITS(state->extra);
+ state->back += state->extra;
+ }
+ Tracevv((stderr, "inflate: length %u\n", state->length));
+ state->was = state->length;
+ state->mode = DIST;
+ case DIST:
+ for (;;) {
+ here = state->distcodeBITS(state->distbits);
+ if ((unsigned)(here.bits) <= bits) break;
+ PULLBYTE();
+ }
+ if ((here.op & 0xf0) == 0) {
+ last = here;
+ for (;;) {
+ here = state->distcodelast.val +
+ (BITS(last.bits + last.op) >> last.bits);
+ if ((unsigned)(last.bits + here.bits) <= bits) break;
+ PULLBYTE();
+ }
+ DROPBITS(last.bits);
+ state->back += last.bits;
+ }
+ DROPBITS(here.bits);
+ state->back += here.bits;
+ if (here.op & 64) {
+ strm->msg = (char *)"invalid distance code";
+ state->mode = BAD;
+ break;
+ }
+ state->offset = (unsigned)here.val;
+ state->extra = (unsigned)(here.op) & 15;
+ state->mode = DISTEXT;
+ case DISTEXT:
+ if (state->extra) {
+ NEEDBITS(state->extra);
+ state->offset += BITS(state->extra);
+ DROPBITS(state->extra);
+ state->back += state->extra;
+ }
+#ifdef INFLATE_STRICT
+ if (state->offset > state->dmax) {
+ strm->msg = (char *)"invalid distance too far back";
+ state->mode = BAD;
+ break;
+ }
+#endif
+ Tracevv((stderr, "inflate: distance %u\n", state->offset));
+ state->mode = MATCH;
+ case MATCH:
+ if (left == 0) goto inf_leave;
+ copy = out - left;
+ if (state->offset > copy) { /* copy from window */
+ copy = state->offset - copy;
+ if (copy > state->whave) {
+ if (state->sane) {
+ strm->msg = (char *)"invalid distance too far back";
+ state->mode = BAD;
+ break;
+ }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+ Trace((stderr, "inflate.c too far\n"));
+ copy -= state->whave;
+ if (copy > state->length) copy = state->length;
+ if (copy > left) copy = left;
+ left -= copy;
+ state->length -= copy;
+ do {
+ *put++ = 0;
+ } while (--copy);
+ if (state->length == 0) state->mode = LEN;
+ break;
+#endif
+ }
+ if (copy > state->wnext) {
+ copy -= state->wnext;
+ from = state->window + (state->wsize - copy);
+ }
+ else
+ from = state->window + (state->wnext - copy);
+ if (copy > state->length) copy = state->length;
+ }
+ else { /* copy from output */
+ from = put - state->offset;
+ copy = state->length;
+ }
+ if (copy > left) copy = left;
+ left -= copy;
+ state->length -= copy;
+ do {
+ *put++ = *from++;
+ } while (--copy);
+ if (state->length == 0) state->mode = LEN;
+ break;
+ case LIT:
+ if (left == 0) goto inf_leave;
+ *put++ = (unsigned char)(state->length);
+ left--;
+ state->mode = LEN;
+ break;
+ case CHECK:
+ if (state->wrap) {
+ NEEDBITS(32);
+ out -= left;
+ strm->total_out += out;
+ state->total += out;
+ if (out)
+ strm->adler = state->check =
+ UPDATE(state->check, put - out, out);
+ out = left;
+ if ((
+#ifdef GUNZIP
+ state->flags ? hold :
+#endif
+ ZSWAP32(hold)) != state->check) {
+ strm->msg = (char *)"incorrect data check";
+ state->mode = BAD;
+ break;
+ }
+ INITBITS();
+ Tracev((stderr, "inflate: check matches trailer\n"));
+ }
+#ifdef GUNZIP
+ state->mode = LENGTH;
+ case LENGTH:
+ if (state->wrap && state->flags) {
+ NEEDBITS(32);
+ if (hold != (state->total & 0xffffffffUL)) {
+ strm->msg = (char *)"incorrect length check";
+ state->mode = BAD;
+ break;
+ }
+ INITBITS();
+ Tracev((stderr, "inflate: length matches trailer\n"));
+ }
+#endif
+ state->mode = DONE;
+ case DONE:
+ ret = Z_STREAM_END;
+ goto inf_leave;
+ case BAD:
+ ret = Z_DATA_ERROR;
+ goto inf_leave;
+ case MEM:
+ return Z_MEM_ERROR;
+ case SYNC:
+ default:
+ return Z_STREAM_ERROR;
+ }
+
+ /*
+ Return from inflate(), updating the total counts and the check value.
+ If there was no progress during the inflate() call, return a buffer
+ error. Call updatewindow() to create and/or update the window state.
+ Note: a memory error from inflate() is non-recoverable.
+ */
+ inf_leave:
+ RESTORE();
+ if (state->wsize || (out != strm->avail_out && state->mode < BAD &&
+ (state->mode < CHECK || flush != Z_FINISH)))
+ if (updatewindow(strm, out)) {
+ state->mode = MEM;
+ return Z_MEM_ERROR;
+ }
+ in -= strm->avail_in;
+ out -= strm->avail_out;
+ strm->total_in += in;
+ strm->total_out += out;
+ state->total += out;
+ if (state->wrap && out)
+ strm->adler = state->check =
+ UPDATE(state->check, strm->next_out - out, out);
+ strm->data_type = state->bits + (state->last ? 64 : 0) +
+ (state->mode == TYPE ? 128 : 0) +
+ (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);
+ if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK)
+ ret = Z_BUF_ERROR;
+ return ret;
+}
+
+int ZEXPORT inflateEnd(strm)
+z_streamp strm;
+{
+ struct inflate_state FAR *state;
+ if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+ return Z_STREAM_ERROR;
+ state = (struct inflate_state FAR *)strm->state;
+ if (state->window != Z_NULL) ZFREE(strm, state->window);
+ ZFREE(strm, strm->state);
+ strm->state = Z_NULL;
+ Tracev((stderr, "inflate: end\n"));
+ return Z_OK;
+}
+
+int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength)
+z_streamp strm;
+const Bytef *dictionary;
+uInt dictLength;
+{
+ struct inflate_state FAR *state;
+ unsigned long dictid;
+ unsigned char *next;
+ unsigned avail;
+ int ret;
+
+ /* check state */
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ state = (struct inflate_state FAR *)strm->state;
+ if (state->wrap != 0 && state->mode != DICT)
+ return Z_STREAM_ERROR;
+
+ /* check for correct dictionary identifier */
+ if (state->mode == DICT) {
+ dictid = adler32(0L, Z_NULL, 0);
+ dictid = adler32(dictid, dictionary, dictLength);
+ if (dictid != state->check)
+ return Z_DATA_ERROR;
+ }
+
+ /* copy dictionary to window using updatewindow(), which will amend the
+ existing dictionary if appropriate */
+ next = strm->next_out;
+ avail = strm->avail_out;
+ strm->next_out = (Bytef *)dictionary + dictLength;
+ strm->avail_out = 0;
+ ret = updatewindow(strm, dictLength);
+ strm->avail_out = avail;
+ strm->next_out = next;
+ if (ret) {
+ state->mode = MEM;
+ return Z_MEM_ERROR;
+ }
+ state->havedict = 1;
+ Tracev((stderr, "inflate: dictionary set\n"));
+ return Z_OK;
+}
+
+int ZEXPORT inflateGetHeader(strm, head)
+z_streamp strm;
+gz_headerp head;
+{
+ struct inflate_state FAR *state;
+
+ /* check state */
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ state = (struct inflate_state FAR *)strm->state;
+ if ((state->wrap & 2) == 0) return Z_STREAM_ERROR;
+
+ /* save header structure */
+ state->head = head;
+ head->done = 0;
+ return Z_OK;
+}
+
+/*
+ Search buf0..len-1 for the pattern: 0, 0, 0xff, 0xff. Return when found
+ or when out of input. When called, *have is the number of pattern bytes
+ found in order so far, in 0..3. On return *have is updated to the new
+ state. If on return *have equals four, then the pattern was found and the
+ return value is how many bytes were read including the last byte of the
+ pattern. If *have is less than four, then the pattern has not been found
+ yet and the return value is len. In the latter case, syncsearch() can be
+ called again with more data and the *have state. *have is initialized to
+ zero for the first call.
+ */
+local unsigned syncsearch(have, buf, len)
+unsigned FAR *have;
+unsigned char FAR *buf;
+unsigned len;
+{
+ unsigned got;
+ unsigned next;
+
+ got = *have;
+ next = 0;
+ while (next < len && got < 4) {
+ if ((int)(bufnext) == (got < 2 ? 0 : 0xff))
+ got++;
+ else if (bufnext)
+ got = 0;
+ else
+ got = 4 - got;
+ next++;
+ }
+ *have = got;
+ return next;
+}
+
+int ZEXPORT inflateSync(strm)
+z_streamp strm;
+{
+ unsigned len; /* number of bytes to look at or looked at */
+ unsigned long in, out; /* temporary to save total_in and total_out */
+ unsigned char buf4; /* to restore bit buffer to byte string */
+ struct inflate_state FAR *state;
+
+ /* check parameters */
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ state = (struct inflate_state FAR *)strm->state;
+ if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
+
+ /* if first time, start search in bit buffer */
+ if (state->mode != SYNC) {
+ state->mode = SYNC;
+ state->hold <<= state->bits & 7;
+ state->bits -= state->bits & 7;
+ len = 0;
+ while (state->bits >= 8) {
+ buflen++ = (unsigned char)(state->hold);
+ state->hold >>= 8;
+ state->bits -= 8;
+ }
+ state->have = 0;
+ syncsearch(&(state->have), buf, len);
+ }
+
+ /* search available input */
+ len = syncsearch(&(state->have), strm->next_in, strm->avail_in);
+ strm->avail_in -= len;
+ strm->next_in += len;
+ strm->total_in += len;
+
+ /* return no joy or set up to restart inflate() on a new block */
+ if (state->have != 4) return Z_DATA_ERROR;
+ in = strm->total_in; out = strm->total_out;
+ inflateReset(strm);
+ strm->total_in = in; strm->total_out = out;
+ state->mode = TYPE;
+ return Z_OK;
+}
+
+/*
+ Returns true if inflate is currently at the end of a block generated by
+ Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
+ implementation to provide an additional safety check. PPP uses
+ Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
+ block. When decompressing, PPP checks that at the end of input packet,
+ inflate is waiting for these length bytes.
+ */
+int ZEXPORT inflateSyncPoint(strm)
+z_streamp strm;
+{
+ struct inflate_state FAR *state;
+
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ state = (struct inflate_state FAR *)strm->state;
+ return state->mode == STORED && state->bits == 0;
+}
+
+int ZEXPORT inflateCopy(dest, source)
+z_streamp dest;
+z_streamp source;
+{
+ struct inflate_state FAR *state;
+ struct inflate_state FAR *copy;
+ unsigned char FAR *window;
+ unsigned wsize;
+
+ /* check input */
+ if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL ||
+ source->zalloc == (alloc_func)0 || source->zfree == (free_func)0)
+ return Z_STREAM_ERROR;
+ state = (struct inflate_state FAR *)source->state;
+
+ /* allocate space */
+ copy = (struct inflate_state FAR *)
+ ZALLOC(source, 1, sizeof(struct inflate_state));
+ if (copy == Z_NULL) return Z_MEM_ERROR;
+ window = Z_NULL;
+ if (state->window != Z_NULL) {
+ window = (unsigned char FAR *)
+ ZALLOC(source, 1U << state->wbits, sizeof(unsigned char));
+ if (window == Z_NULL) {
+ ZFREE(source, copy);
+ return Z_MEM_ERROR;
+ }
+ }
+
+ /* copy state */
+ zmemcpy((voidpf)dest, (voidpf)source, sizeof(z_stream));
+ zmemcpy((voidpf)copy, (voidpf)state, sizeof(struct inflate_state));
+ if (state->lencode >= state->codes &&
+ state->lencode <= state->codes + ENOUGH - 1) {
+ copy->lencode = copy->codes + (state->lencode - state->codes);
+ copy->distcode = copy->codes + (state->distcode - state->codes);
+ }
+ copy->next = copy->codes + (state->next - state->codes);
+ if (window != Z_NULL) {
+ wsize = 1U << state->wbits;
+ zmemcpy(window, state->window, wsize);
+ }
+ copy->window = window;
+ dest->state = (struct internal_state FAR *)copy;
+ return Z_OK;
+}
+
+int ZEXPORT inflateUndermine(strm, subvert)
+z_streamp strm;
+int subvert;
+{
+ struct inflate_state FAR *state;
+
+ if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
+ state = (struct inflate_state FAR *)strm->state;
+ state->sane = !subvert;
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+ return Z_OK;
+#else
+ state->sane = 1;
+ return Z_DATA_ERROR;
+#endif
+}
+
+long ZEXPORT inflateMark(strm)
+z_streamp strm;
+{
+ struct inflate_state FAR *state;
+
+ if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
+ state = (struct inflate_state FAR *)strm->state;
+ return ((long)(state->back) << 16) +
+ (state->mode == COPY ? state->length :
+ (state->mode == MATCH ? state->was - state->length : 0));
+}

smplayer-0.8.1.tar.bz2/zlib/inflate.h Changed

smplayer-0.8.1.tar.bz2/zlib/inftrees.c Added

@@ -0,0 +1,306 @@
+/* inftrees.c -- generate Huffman trees for efficient decoding
+ * Copyright (C) 1995-2012 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+
+#define MAXBITS 15
+
+const char inflate_copyright =
+ " inflate 1.2.7 Copyright 1995-2012 Mark Adler ";
+/*
+ If you use the zlib library in a product, an acknowledgment is welcome
+ in the documentation of your product. If for some reason you cannot
+ include such an acknowledgment, I would appreciate that you keep this
+ copyright string in the executable of your product.
+ */
+
+/*
+ Build a set of tables to decode the provided canonical Huffman code.
+ The code lengths are lens0..codes-1. The result starts at *table,
+ whose indices are 0..2^bits-1. work is a writable array of at least
+ lens shorts, which is used as a work area. type is the type of code
+ to be generated, CODES, LENS, or DISTS. On return, zero is success,
+ -1 is an invalid code, and +1 means that ENOUGH isn't enough. table
+ on return points to the next available entry's address. bits is the
+ requested root table index bits, and on return it is the actual root
+ table index bits. It will differ if the request is greater than the
+ longest code or if it is less than the shortest code.
+ */
+int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
+codetype type;
+unsigned short FAR *lens;
+unsigned codes;
+code FAR * FAR *table;
+unsigned FAR *bits;
+unsigned short FAR *work;
+{
+ unsigned len; /* a code's length in bits */
+ unsigned sym; /* index of code symbols */
+ unsigned min, max; /* minimum and maximum code lengths */
+ unsigned root; /* number of index bits for root table */
+ unsigned curr; /* number of index bits for current table */
+ unsigned drop; /* code bits to drop for sub-table */
+ int left; /* number of prefix codes available */
+ unsigned used; /* code entries in table used */
+ unsigned huff; /* Huffman code */
+ unsigned incr; /* for incrementing code, index */
+ unsigned fill; /* index for replicating entries */
+ unsigned low; /* low bits for current root entry */
+ unsigned mask; /* mask for low root bits */
+ code here; /* table entry for duplication */
+ code FAR *next; /* next available space in table */
+ const unsigned short FAR *base; /* base value table to use */
+ const unsigned short FAR *extra; /* extra bits table to use */
+ int end; /* use base and extra for symbol > end */
+ unsigned short countMAXBITS+1; /* number of codes of each length */
+ unsigned short offsMAXBITS+1; /* offsets in table for each length */
+ static const unsigned short lbase31 = { /* Length codes 257..285 base */
+ 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+ 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+ static const unsigned short lext31 = { /* Length codes 257..285 extra */
+ 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
+ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 78, 68};
+ static const unsigned short dbase32 = { /* Distance codes 0..29 base */
+ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+ 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+ 8193, 12289, 16385, 24577, 0, 0};
+ static const unsigned short dext32 = { /* Distance codes 0..29 extra */
+ 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
+ 23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
+ 28, 28, 29, 29, 64, 64};
+
+ /*
+ Process a set of code lengths to create a canonical Huffman code. The
+ code lengths are lens0..codes-1. Each length corresponds to the
+ symbols 0..codes-1. The Huffman code is generated by first sorting the
+ symbols by length from short to long, and retaining the symbol order
+ for codes with equal lengths. Then the code starts with all zero bits
+ for the first code of the shortest length, and the codes are integer
+ increments for the same length, and zeros are appended as the length
+ increases. For the deflate format, these bits are stored backwards
+ from their more natural integer increment ordering, and so when the
+ decoding tables are built in the large loop below, the integer codes
+ are incremented backwards.
+
+ This routine assumes, but does not check, that all of the entries in
+ lens are in the range 0..MAXBITS. The caller must assure this.
+ 1..MAXBITS is interpreted as that code length. zero means that that
+ symbol does not occur in this code.
+
+ The codes are sorted by computing a count of codes for each length,
+ creating from that a table of starting indices for each length in the
+ sorted table, and then entering the symbols in order in the sorted
+ table. The sorted table is work, with that space being provided by
+ the caller.
+
+ The length counts are used for other purposes as well, i.e. finding
+ the minimum and maximum length codes, determining if there are any
+ codes at all, checking for a valid set of lengths, and looking ahead
+ at length counts to determine sub-table sizes when building the
+ decoding tables.
+ */
+
+ /* accumulate lengths for codes (assumes lens all in 0..MAXBITS) */
+ for (len = 0; len <= MAXBITS; len++)
+ countlen = 0;
+ for (sym = 0; sym < codes; sym++)
+ countlenssym++;
+
+ /* bound code lengths, force root to be within code lengths */
+ root = *bits;
+ for (max = MAXBITS; max >= 1; max--)
+ if (countmax != 0) break;
+ if (root > max) root = max;
+ if (max == 0) { /* no symbols to code at all */
+ here.op = (unsigned char)64; /* invalid code marker */
+ here.bits = (unsigned char)1;
+ here.val = (unsigned short)0;
+ *(*table)++ = here; /* make a table to force an error */
+ *(*table)++ = here;
+ *bits = 1;
+ return 0; /* no symbols, but wait for decoding to report error */
+ }
+ for (min = 1; min < max; min++)
+ if (countmin != 0) break;
+ if (root < min) root = min;
+
+ /* check for an over-subscribed or incomplete set of lengths */
+ left = 1;
+ for (len = 1; len <= MAXBITS; len++) {
+ left <<= 1;
+ left -= countlen;
+ if (left < 0) return -1; /* over-subscribed */
+ }
+ if (left > 0 && (type == CODES || max != 1))
+ return -1; /* incomplete set */
+
+ /* generate offsets into symbol table for each length for sorting */
+ offs1 = 0;
+ for (len = 1; len < MAXBITS; len++)
+ offslen + 1 = offslen + countlen;
+
+ /* sort symbols by length, by symbol order within each length */
+ for (sym = 0; sym < codes; sym++)
+ if (lenssym != 0) workoffslenssym++ = (unsigned short)sym;
+
+ /*
+ Create and fill in decoding tables. In this loop, the table being
+ filled is at next and has curr index bits. The code being used is huff
+ with length len. That code is converted to an index by dropping drop
+ bits off of the bottom. For codes where len is less than drop + curr,
+ those top drop + curr - len bits are incremented through all values to
+ fill the table with replicated entries.
+
+ root is the number of index bits for the root table. When len exceeds
+ root, sub-tables are created pointed to by the root entry with an index
+ of the low root bits of huff. This is saved in low to check for when a
+ new sub-table should be started. drop is zero when the root table is
+ being filled, and drop is root when sub-tables are being filled.
+
+ When a new sub-table is needed, it is necessary to look ahead in the
+ code lengths to determine what size sub-table is needed. The length
+ counts are used for this, and so count is decremented as codes are
+ entered in the tables.
+
+ used keeps track of how many table entries have been allocated from the
+ provided *table space. It is checked for LENS and DIST tables against
+ the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
+ the initial root table size constants. See the comments in inftrees.h
+ for more information.
+
+ sym increments through all symbols, and the loop terminates when
+ all codes of length max, i.e. all codes, have been processed. This
+ routine permits incomplete codes, so another loop after this one fills
+ in the rest of the decoding tables with invalid code markers.
+ */
+
+ /* set up for code type */
+ switch (type) {
+ case CODES:
+ base = extra = work; /* dummy value--not used */
+ end = 19;
+ break;
+ case LENS:
+ base = lbase;
+ base -= 257;
+ extra = lext;
+ extra -= 257;
+ end = 256;
+ break;
+ default: /* DISTS */
+ base = dbase;
+ extra = dext;
+ end = -1;
+ }
+
+ /* initialize state for loop */
+ huff = 0; /* starting code */
+ sym = 0; /* starting code symbol */
+ len = min; /* starting code length */
+ next = *table; /* current table to fill in */
+ curr = root; /* current table index bits */
+ drop = 0; /* current bits to drop from code for index */
+ low = (unsigned)(-1); /* trigger new sub-table when len > root */
+ used = 1U << root; /* use root table entries */
+ mask = used - 1; /* mask for comparing low */
+
+ /* check available table space */
+ if ((type == LENS && used >= ENOUGH_LENS) ||
+ (type == DISTS && used >= ENOUGH_DISTS))
+ return 1;
+
+ /* process all codes and make table entries */
+ for (;;) {
+ /* create table entry */
+ here.bits = (unsigned char)(len - drop);
+ if ((int)(worksym) < end) {
+ here.op = (unsigned char)0;
+ here.val = worksym;
+ }
+ else if ((int)(worksym) > end) {
+ here.op = (unsigned char)(extraworksym);
+ here.val = baseworksym;
+ }
+ else {
+ here.op = (unsigned char)(32 + 64); /* end of block */
+ here.val = 0;
+ }
+
+ /* replicate for those indices with low len bits equal to huff */
+ incr = 1U << (len - drop);
+ fill = 1U << curr;
+ min = fill; /* save offset to next table */
+ do {
+ fill -= incr;
+ next(huff >> drop) + fill = here;
+ } while (fill != 0);
+
+ /* backwards increment the len-bit code huff */
+ incr = 1U << (len - 1);
+ while (huff & incr)
+ incr >>= 1;
+ if (incr != 0) {
+ huff &= incr - 1;
+ huff += incr;
+ }
+ else
+ huff = 0;
+
+ /* go to next symbol, update count, len */
+ sym++;
+ if (--(countlen) == 0) {
+ if (len == max) break;
+ len = lensworksym;
+ }
+
+ /* create new sub-table if needed */
+ if (len > root && (huff & mask) != low) {
+ /* if first time, transition to sub-tables */
+ if (drop == 0)
+ drop = root;
+
+ /* increment past last table */
+ next += min; /* here min is 1 << curr */
+
+ /* determine length of next table */
+ curr = len - drop;
+ left = (int)(1 << curr);
+ while (curr + drop < max) {
+ left -= countcurr + drop;
+ if (left <= 0) break;
+ curr++;
+ left <<= 1;
+ }
+
+ /* check for enough space */
+ used += 1U << curr;
+ if ((type == LENS && used >= ENOUGH_LENS) ||
+ (type == DISTS && used >= ENOUGH_DISTS))
+ return 1;
+
+ /* point entry in root table to sub-table */
+ low = huff & mask;
+ (*table)low.op = (unsigned char)curr;
+ (*table)low.bits = (unsigned char)root;
+ (*table)low.val = (unsigned short)(next - *table);
+ }
+ }
+
+ /* fill in remaining table entry if code is incomplete (guaranteed to have
+ at most one remaining entry, since if the code is incomplete, the
+ maximum code length that was allowed to get this far is one bit) */
+ if (huff != 0) {
+ here.op = (unsigned char)64; /* invalid code marker */
+ here.bits = (unsigned char)(len - drop);
+ here.val = (unsigned short)0;
+ nexthuff = here;
+ }
+
+ /* set return parameters */
+ *table += used;
+ *bits = root;
+ return 0;
+}

smplayer-0.8.1.tar.bz2/zlib/inftrees.h Changed

smplayer-0.8.1.tar.bz2/zlib/make_vms.com Added

@@ -0,0 +1,867 @@
+$! make libz under VMS written by
+$! Martin P.J. Zinser
+$!
+$! In case of problems with the install you might contact me at
+$! zinser@zinser.no-ip.info(preferred) or
+$! martin.zinser@eurexchange.com (work)
+$!
+$! Make procedure history for Zlib
+$!
+$!------------------------------------------------------------------------------
+$! Version history
+$! 0.01 20060120 First version to receive a number
+$! 0.02 20061008 Adapt to new Makefile.in
+$! 0.03 20091224 Add support for large file check
+$! 0.04 20100110 Add new gzclose, gzlib, gzread, gzwrite
+$! 0.05 20100221 Exchange zlibdefs.h by zconf.h.in
+$! 0.06 20120111 Fix missing amiss_err, update zconf_h.in, fix new exmples
+$! subdir path, update module search in makefile.in
+$! 0.07 20120115 Triggered by work done by Alexey Chupahin completly redesigned
+$! shared image creation
+$! 0.08 20120219 Make it work on VAX again, pre-load missing symbols to shared
+$! image
+$! 0.09 20120305 SMS. P1 sets builder ("MMK", "MMS", " " (built-in)).
+$! "" -> automatic, preference: MMK, MMS, built-in.
+$!
+$ on error then goto err_exit
+$!
+$ true = 1
+$ false = 0
+$ tmpnam = "temp_" + f$getjpi("","pid")
+$ tt = tmpnam + ".txt"
+$ tc = tmpnam + ".c"
+$ th = tmpnam + ".h"
+$ define/nolog tconfig 'th'
+$ its_decc = false
+$ its_vaxc = false
+$ its_gnuc = false
+$ s_case = False
+$!
+$! Setup variables holding "config" information
+$!
+$ Make = "''p1'"
+$ name = "Zlib"
+$ version = "?.?.?"
+$ v_string = "ZLIB_VERSION"
+$ v_file = "zlib.h"
+$ ccopt = "/include = "
+$ lopts = ""
+$ dnsrl = ""
+$ aconf_in_file = "zconf.h.in#zconf.h_in#zconf_h.in"
+$ conf_check_string = ""
+$ linkonly = false
+$ optfile = name + ".opt"
+$ mapfile = name + ".map"
+$ libdefs = ""
+$ vax = f$getsyi("HW_MODEL").lt.1024
+$ axp = f$getsyi("HW_MODEL").ge.1024 .and. f$getsyi("HW_MODEL").lt.4096
+$ ia64 = f$getsyi("HW_MODEL").ge.4096
+$!
+$! 2012-03-05 SMS.
+$! Why is this needed? And if it is needed, why not simply ".not. vax"?
+$!
+$!!! if axp .or. ia64 then set proc/parse=extended
+$!
+$ whoami = f$parse(f$environment("Procedure"),,,,"NO_CONCEAL")
+$ mydef = F$parse(whoami,,,"DEVICE")
+$ mydir = f$parse(whoami,,,"DIRECTORY") - ""
+$ myproc = f$parse(whoami,,,"Name") + f$parse(whoami,,,"type")
+$!
+$! Check for MMK/MMS
+$!
+$ if (Make .eqs. "")
+$ then
+$ If F$Search ("Sys$System:MMS.EXE") .nes. "" Then Make = "MMS"
+$ If F$Type (MMK) .eqs. "STRING" Then Make = "MMK"
+$ else
+$ Make = f$edit( Make, "trim")
+$ endif
+$!
+$ gosub find_version
+$!
+$ open/write topt tmp.opt
+$ open/write optf 'optfile'
+$!
+$ gosub check_opts
+$!
+$! Look for the compiler used
+$!
+$ gosub check_compiler
+$ close topt
+$ close optf
+$!
+$ if its_decc
+$ then
+$ ccopt = "/prefix=all" + ccopt
+$ if f$trnlnm("SYS") .eqs. ""
+$ then
+$ if axp
+$ then
+$ define sys sys$library:
+$ else
+$ ccopt = "/decc" + ccopt
+$ define sys decc$library_include:
+$ endif
+$ endif
+$!
+$! 2012-03-05 SMS.
+$! Why /NAMES = AS_IS? Why not simply ".not. vax"? And why not on VAX?
+$!
+$ if axp .or. ia64
+$ then
+$ ccopt = ccopt + "/name=as_is/opt=(inline=speed)"
+$ s_case = true
+$ endif
+$ endif
+$ if its_vaxc .or. its_gnuc
+$ then
+$ if f$trnlnm("SYS").eqs."" then define sys sys$library:
+$ endif
+$!
+$! Build a fake configure input header
+$!
+$ open/write conf_hin config.hin
+$ write conf_hin "#undef _LARGEFILE64_SOURCE"
+$ close conf_hin
+$!
+$!
+$ i = 0
+$FIND_ACONF:
+$ fname = f$element(i,"#",aconf_in_file)
+$ if fname .eqs. "#" then goto AMISS_ERR
+$ if f$search(fname) .eqs. ""
+$ then
+$ i = i + 1
+$ goto find_aconf
+$ endif
+$ open/read/err=aconf_err aconf_in 'fname'
+$ open/write aconf zconf.h
+$ACONF_LOOP:
+$ read/end_of_file=aconf_exit aconf_in line
+$ work = f$edit(line, "compress,trim")
+$ if f$extract(0,6,work) .nes. "#undef"
+$ then
+$ if f$extract(0,12,work) .nes. "#cmakedefine"
+$ then
+$ write aconf line
+$ endif
+$ else
+$ cdef = f$element(1," ",work)
+$ gosub check_config
+$ endif
+$ goto aconf_loop
+$ACONF_EXIT:
+$ write aconf ""
+$ write aconf "/* VMS specifics added by make_vms.com: */"
+$ write aconf "#define VMS 1"
+$ write aconf "#include <unistd.h>"
+$ write aconf "#include <unixio.h>"
+$ write aconf "#ifdef _LARGEFILE"
+$ write aconf "# define off64_t __off64_t"
+$ write aconf "# define fopen64 fopen"
+$ write aconf "# define fseeko64 fseeko"
+$ write aconf "# define lseek64 lseek"
+$ write aconf "# define ftello64 ftell"
+$ write aconf "#endif"
+$ write aconf "#if !defined( __VAX) && (__CRTL_VER >= 70312000)"
+$ write aconf "# define HAVE_VSNPRINTF"
+$ write aconf "#endif"
+$ close aconf_in
+$ close aconf
+$ if f$search("''th'") .nes. "" then delete 'th';*
+$! Build the thing plain or with mms
+$!
+$ write sys$output "Compiling Zlib sources ..."
+$ if make.eqs.""
+$ then
+$ if (f$search( "example.obj;*") .nes. "") then delete example.obj;*
+$ if (f$search( "minigzip.obj;*") .nes. "") then delete minigzip.obj;*
+$ CALL MAKE adler32.OBJ "CC ''CCOPT' adler32" -
+ adler32.c zlib.h zconf.h
+$ CALL MAKE compress.OBJ "CC ''CCOPT' compress" -
+ compress.c zlib.h zconf.h
+$ CALL MAKE crc32.OBJ "CC ''CCOPT' crc32" -
+ crc32.c zlib.h zconf.h
+$ CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" -
+ deflate.c deflate.h zutil.h zlib.h zconf.h
+$ CALL MAKE gzclose.OBJ "CC ''CCOPT' gzclose" -
+ gzclose.c zutil.h zlib.h zconf.h
+$ CALL MAKE gzlib.OBJ "CC ''CCOPT' gzlib" -
+ gzlib.c zutil.h zlib.h zconf.h
+$ CALL MAKE gzread.OBJ "CC ''CCOPT' gzread" -
+ gzread.c zutil.h zlib.h zconf.h
+$ CALL MAKE gzwrite.OBJ "CC ''CCOPT' gzwrite" -
+ gzwrite.c zutil.h zlib.h zconf.h
+$ CALL MAKE infback.OBJ "CC ''CCOPT' infback" -
+ infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
+$ CALL MAKE inffast.OBJ "CC ''CCOPT' inffast" -
+ inffast.c zutil.h zlib.h zconf.h inffast.h
+$ CALL MAKE inflate.OBJ "CC ''CCOPT' inflate" -
+ inflate.c zutil.h zlib.h zconf.h infblock.h
+$ CALL MAKE inftrees.OBJ "CC ''CCOPT' inftrees" -
+ inftrees.c zutil.h zlib.h zconf.h inftrees.h
+$ CALL MAKE trees.OBJ "CC ''CCOPT' trees" -
+ trees.c deflate.h zutil.h zlib.h zconf.h
+$ CALL MAKE uncompr.OBJ "CC ''CCOPT' uncompr" -
+ uncompr.c zlib.h zconf.h
+$ CALL MAKE zutil.OBJ "CC ''CCOPT' zutil" -
+ zutil.c zutil.h zlib.h zconf.h
+$ write sys$output "Building Zlib ..."
+$ CALL MAKE libz.OLB "lib/crea libz.olb *.obj" *.OBJ
+$ write sys$output "Building example..."
+$ CALL MAKE example.OBJ "CC ''CCOPT' .testexample" -
+ .testexample.c zlib.h zconf.h
+$ call make example.exe "LINK example,libz.olb/lib" example.obj libz.olb
+$ write sys$output "Building minigzip..."
+$ CALL MAKE minigzip.OBJ "CC ''CCOPT' .testminigzip" -
+ .testminigzip.c zlib.h zconf.h
+$ call make minigzip.exe -
+ "LINK minigzip,libz.olb/lib" -
+ minigzip.obj libz.olb
+$ else
+$ gosub crea_mms
+$ write sys$output "Make ''name' ''version' with ''Make' "
+$ 'make'
+$ endif
+$!
+$! Create shareable image
+$!
+$ gosub crea_olist
+$ write sys$output "Creating libzshr.exe"
+$ call map_2_shopt 'mapfile' 'optfile'
+$ LINK_'lopts'/SHARE=libzshr.exe modules.opt/opt,'optfile'/opt
+$ write sys$output "Zlib build completed"
+$ delete/nolog tmp.opt;*
+$ exit
+$AMISS_ERR:
+$ write sys$output "No source for config.hin found."
+$ write sys$output "Tried any of ''aconf_in_file'"
+$ goto err_exit
+$CC_ERR:
+$ write sys$output "C compiler required to build ''name'"
+$ goto err_exit
+$ERR_EXIT:
+$ set message/facil/ident/sever/text
+$ close/nolog optf
+$ close/nolog topt
+$ close/nolog aconf_in
+$ close/nolog aconf
+$ close/nolog out
+$ close/nolog min
+$ close/nolog mod
+$ close/nolog h_in
+$ write sys$output "Exiting..."
+$ exit 2
+$!
+$!
+$MAKE: SUBROUTINE !SUBROUTINE TO CHECK DEPENDENCIES
+$ V = 'F$Verify(0)
+$! P1 = What we are trying to make
+$! P2 = Command to make it
+$! P3 - P8 What it depends on
+$
+$ If F$Search(P1) .Eqs. "" Then Goto Makeit
+$ Time = F$CvTime(F$File(P1,"RDT"))
+$arg=3
+$Loop:
+$ Argument = P'arg
+$ If Argument .Eqs. "" Then Goto Exit
+$ El=0
+$Loop2:
+$ File = F$Element(El," ",Argument)
+$ If File .Eqs. " " Then Goto Endl
+$ AFile = ""
+$Loop3:
+$ OFile = AFile
+$ AFile = F$Search(File)
+$ If AFile .Eqs. "" .Or. AFile .Eqs. OFile Then Goto NextEl
+$ If F$CvTime(F$File(AFile,"RDT")) .Ges. Time Then Goto Makeit
+$ Goto Loop3
+$NextEL:
+$ El = El + 1
+$ Goto Loop2
+$EndL:
+$ arg=arg+1
+$ If arg .Le. 8 Then Goto Loop
+$ Goto Exit
+$
+$Makeit:
+$ VV=F$VERIFY(0)
+$ write sys$output P2
+$ 'P2
+$ VV='F$Verify(VV)
+$Exit:
+$ If V Then Set Verify
+$ENDSUBROUTINE
+$!------------------------------------------------------------------------------
+$!
+$! Check command line options and set symbols accordingly
+$!
+$!------------------------------------------------------------------------------
+$! Version history
+$! 0.01 20041206 First version to receive a number
+$! 0.02 20060126 Add new "HELP" target
+$ CHECK_OPTS:
+$ i = 1
+$ OPT_LOOP:
+$ if i .lt. 9
+$ then
+$ cparm = f$edit(p'i',"upcase")
+$!
+$! Check if parameter actually contains something
+$!
+$ if f$edit(cparm,"trim") .nes. ""
+$ then
+$ if cparm .eqs. "DEBUG"
+$ then
+$ ccopt = ccopt + "/noopt/deb"
+$ lopts = lopts + "/deb"
+$ endif
+$ if f$locate("CCOPT=",cparm) .lt. f$length(cparm)
+$ then
+$ start = f$locate("=",cparm) + 1
+$ len = f$length(cparm) - start
+$ ccopt = ccopt + f$extract(start,len,cparm)
+$ if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -
+ then s_case = true
+$ endif
+$ if cparm .eqs. "LINK" then linkonly = true
+$ if f$locate("LOPTS=",cparm) .lt. f$length(cparm)
+$ then
+$ start = f$locate("=",cparm) + 1
+$ len = f$length(cparm) - start
+$ lopts = lopts + f$extract(start,len,cparm)
+$ endif
+$ if f$locate("CC=",cparm) .lt. f$length(cparm)
+$ then
+$ start = f$locate("=",cparm) + 1
+$ len = f$length(cparm) - start
+$ cc_com = f$extract(start,len,cparm)
+ if (cc_com .nes. "DECC") .and. -
+ (cc_com .nes. "VAXC") .and. -
+ (cc_com .nes. "GNUC")
+$ then
+$ write sys$output "Unsupported compiler choice ''cc_com' ignored"
+$ write sys$output "Use DECC, VAXC, or GNUC instead"
+$ else
+$ if cc_com .eqs. "DECC" then its_decc = true
+$ if cc_com .eqs. "VAXC" then its_vaxc = true
+$ if cc_com .eqs. "GNUC" then its_gnuc = true
+$ endif
+$ endif
+$ if f$locate("MAKE=",cparm) .lt. f$length(cparm)
+$ then
+$ start = f$locate("=",cparm) + 1
+$ len = f$length(cparm) - start
+$ mmks = f$extract(start,len,cparm)
+$ if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS")
+$ then
+$ make = mmks
+$ else
+$ write sys$output "Unsupported make choice ''mmks' ignored"
+$ write sys$output "Use MMK or MMS instead"
+$ endif
+$ endif
+$ if cparm .eqs. "HELP" then gosub bhelp
+$ endif
+$ i = i + 1
+$ goto opt_loop
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Look for the compiler used
+$!
+$! Version history
+$! 0.01 20040223 First version to receive a number
+$! 0.02 20040229 Save/set value of decc$no_rooted_search_lists
+$! 0.03 20060202 Extend handling of GNU C
+$! 0.04 20090402 Compaq -> hp
+$CHECK_COMPILER:
+$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
+$ then
+$ its_decc = (f$search("SYS$SYSTEM:DECC$COMPILER.EXE") .nes. "")
+$ its_vaxc = .not. its_decc .and. (F$Search("SYS$System:VAXC.Exe") .nes. "")
+$ its_gnuc = .not. (its_decc .or. its_vaxc) .and. (f$trnlnm("gnu_cc") .nes. "")
+$ endif
+$!
+$! Exit if no compiler available
+$!
+$ if (.not. (its_decc .or. its_vaxc .or. its_gnuc))
+$ then goto CC_ERR
+$ else
+$ if its_decc
+$ then
+$ write sys$output "CC compiler check ... hp C"
+$ if f$trnlnm("decc$no_rooted_search_lists") .nes. ""
+$ then
+$ dnrsl = f$trnlnm("decc$no_rooted_search_lists")
+$ endif
+$ define/nolog decc$no_rooted_search_lists 1
+$ else
+$ if its_vaxc then write sys$output "CC compiler check ... VAX C"
+$ if its_gnuc
+$ then
+$ write sys$output "CC compiler check ... GNU C"
+$ if f$trnlnm(topt) then write topt "gnu_cc:000000gcclib.olb/lib"
+$ if f$trnlnm(optf) then write optf "gnu_cc:000000gcclib.olb/lib"
+$ cc = "gcc"
+$ endif
+$ if f$trnlnm(topt) then write topt "sys$share:vaxcrtl.exe/share"
+$ if f$trnlnm(optf) then write optf "sys$share:vaxcrtl.exe/share"
+$ endif
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! If MMS/MMK are available dump out the descrip.mms if required
+$!
+$CREA_MMS:
+$ write sys$output "Creating descrip.mms..."
+$ create descrip.mms
+$ open/append out descrip.mms
+$ copy sys$input: out
+$ deck
+# descrip.mms: MMS description file for building zlib on VMS
+# written by Martin P.J. Zinser
+# <zinser@zinser.no-ip.info or martin.zinser@eurexchange.com>
+
+OBJS = adler32.obj, compress.obj, crc32.obj, gzclose.obj, gzlib.obj\
+ gzread.obj, gzwrite.obj, uncompr.obj, infback.obj\
+ deflate.obj, trees.obj, zutil.obj, inflate.obj, \
+ inftrees.obj, inffast.obj
+
+$ eod
+$ write out "CFLAGS=", ccopt
+$ write out "LOPTS=", lopts
+$ write out "all : example.exe minigzip.exe libz.olb"
+$ copy sys$input: out
+$ deck
+ @ write sys$output " Example applications available"
+
+libz.olb : libz.olb($(OBJS))
+	@ write sys$output " libz available"
+
+example.exe : example.obj libz.olb
+ link $(LOPTS) example,libz.olb/lib
+
+minigzip.exe : minigzip.obj libz.olb
+ link $(LOPTS) minigzip,libz.olb/lib
+
+clean :
+	delete *.obj;*,libz.olb;*,*.opt;*,*.exe;*
+
+
+# Other dependencies.
+adler32.obj : adler32.c zutil.h zlib.h zconf.h
+compress.obj : compress.c zlib.h zconf.h
+crc32.obj : crc32.c zutil.h zlib.h zconf.h
+deflate.obj : deflate.c deflate.h zutil.h zlib.h zconf.h
+example.obj : .testexample.c zlib.h zconf.h
+gzclose.obj : gzclose.c zutil.h zlib.h zconf.h
+gzlib.obj : gzlib.c zutil.h zlib.h zconf.h
+gzread.obj : gzread.c zutil.h zlib.h zconf.h
+gzwrite.obj : gzwrite.c zutil.h zlib.h zconf.h
+inffast.obj : inffast.c zutil.h zlib.h zconf.h inftrees.h inffast.h
+inflate.obj : inflate.c zutil.h zlib.h zconf.h
+inftrees.obj : inftrees.c zutil.h zlib.h zconf.h inftrees.h
+minigzip.obj : .testminigzip.c zlib.h zconf.h
+trees.obj : trees.c deflate.h zutil.h zlib.h zconf.h
+uncompr.obj : uncompr.c zlib.h zconf.h
+zutil.obj : zutil.c zutil.h zlib.h zconf.h
+infback.obj : infback.c zutil.h inftrees.h inflate.h inffast.h inffixed.h
+$ eod
+$ close out
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Read list of core library sources from makefile.in and create options
+$! needed to build shareable image
+$!
+$CREA_OLIST:
+$ open/read min makefile.in
+$ open/write mod modules.opt
+$ src_check_list = "OBJZ =#OBJG ="
+$MRLOOP:
+$ read/end=mrdone min rec
+$ i = 0
+$SRC_CHECK_LOOP:
+$ src_check = f$element(i, "#", src_check_list)
+$ i = i+1
+$ if src_check .eqs. "#" then goto mrloop
+$ if (f$extract(0,6,rec) .nes. src_check) then goto src_check_loop
+$ rec = rec - src_check
+$ gosub extra_filnam
+$ if (f$element(1,"\",rec) .eqs. "\") then goto mrloop
+$MRSLOOP:
+$ read/end=mrdone min rec
+$ gosub extra_filnam
+$ if (f$element(1,"\",rec) .nes. "\") then goto mrsloop
+$MRDONE:
+$ close min
+$ close mod
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Take record extracted in crea_olist and split it into single filenames
+$!
+$EXTRA_FILNAM:
+$ myrec = f$edit(rec - "\", "trim,compress")
+$ i = 0
+$FELOOP:
+$ srcfil = f$element(i," ", myrec)
+$ if (srcfil .nes. " ")
+$ then
+$ write mod f$parse(srcfil,,,"NAME"), ".obj"
+$ i = i + 1
+$ goto feloop
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Find current Zlib version number
+$!
+$FIND_VERSION:
+$ open/read h_in 'v_file'
+$hloop:
+$ read/end=hdone h_in rec
+$ rec = f$edit(rec,"TRIM")
+$ if (f$extract(0,1,rec) .nes. "#") then goto hloop
+$ rec = f$edit(rec - "#", "TRIM")
+$ if f$element(0," ",rec) .nes. "define" then goto hloop
+$ if f$element(1," ",rec) .eqs. v_string
+$ then
+$ version = 'f$element(2," ",rec)'
+$ goto hdone
+$ endif
+$ goto hloop
+$hdone:
+$ close h_in
+$ return
+$!------------------------------------------------------------------------------
+$!
+$CHECK_CONFIG:
+$!
+$ in_ldef = f$locate(cdef,libdefs)
+$ if (in_ldef .lt. f$length(libdefs))
+$ then
+$ write aconf "#define ''cdef' 1"
+$ libdefs = f$extract(0,in_ldef,libdefs) + -
+ f$extract(in_ldef + f$length(cdef) + 1, -
+ f$length(libdefs) - in_ldef - f$length(cdef) - 1, -
+ libdefs)
+$ else
+$ if (f$type('cdef') .eqs. "INTEGER")
+$ then
+$ write aconf "#define ''cdef' ", 'cdef'
+$ else
+$ if (f$type('cdef') .eqs. "STRING")
+$ then
+$ write aconf "#define ''cdef' ", """", '''cdef'', """"
+$ else
+$ gosub check_cc_def
+$ endif
+$ endif
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Check if this is a define relating to the properties of the C/C++
+$! compiler
+$!
+$ CHECK_CC_DEF:
+$ if (cdef .eqs. "_LARGEFILE64_SOURCE")
+$ then
+$ copy sys$input: 'tc'
+$ deck
+#include "tconfig"
+#define _LARGEFILE
+#include <stdio.h>
+
+int main(){
+FILE *fp;
+ fp = fopen("temp.txt","r");
+ fseeko(fp,1,SEEK_SET);
+ fclose(fp);
+}
+
+$ eod
+$ test_inv = false
+$ comm_h = false
+$ gosub cc_prop_check
+$ return
+$ endif
+$ write aconf "/* ", line, " */"
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Check for properties of C/C++ compiler
+$!
+$! Version history
+$! 0.01 20031020 First version to receive a number
+$! 0.02 20031022 Added logic for defines with value
+$! 0.03 20040309 Make sure local config file gets not deleted
+$! 0.04 20041230 Also write include for configure run
+$! 0.05 20050103 Add processing of "comment defines"
+$CC_PROP_CHECK:
+$ cc_prop = true
+$ is_need = false
+$ is_need = (f$extract(0,4,cdef) .eqs. "NEED") .or. (test_inv .eq. true)
+$ if f$search(th) .eqs. "" then create 'th'
+$ set message/nofac/noident/nosever/notext
+$ on error then continue
+$ cc 'tmpnam'
+$ if .not. ($status) then cc_prop = false
+$ on error then continue
+$! The headers might lie about the capabilities of the RTL
+$ link 'tmpnam',tmp.opt/opt
+$ if .not. ($status) then cc_prop = false
+$ set message/fac/ident/sever/text
+$ on error then goto err_exit
+$ delete/nolog 'tmpnam'.*;*/exclude='th'
+$ if (cc_prop .and. .not. is_need) .or. -
+ (.not. cc_prop .and. is_need)
+$ then
+$ write sys$output "Checking for ''cdef'... yes"
+$ if f$type('cdef_val'_yes) .nes. ""
+$ then
+$ if f$type('cdef_val'_yes) .eqs. "INTEGER" -
+ then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_yes)
+$ if f$type('cdef_val'_yes) .eqs. "STRING" -
+ then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_yes)
+$ else
+$ call write_config f$fao("#define !AS 1",cdef)
+$ endif
+$ if (cdef .eqs. "HAVE_FSEEKO") .or. (cdef .eqs. "_LARGE_FILES") .or. -
+ (cdef .eqs. "_LARGEFILE64_SOURCE") then -
+ call write_config f$string("#define _LARGEFILE 1")
+$ else
+$ write sys$output "Checking for ''cdef'... no"
+$ if (comm_h)
+$ then
+ call write_config f$fao("/* !AS */",line)
+$ else
+$ if f$type('cdef_val'_no) .nes. ""
+$ then
+$ if f$type('cdef_val'_no) .eqs. "INTEGER" -
+ then call write_config f$fao("#define !AS !UL",cdef,'cdef_val'_no)
+$ if f$type('cdef_val'_no) .eqs. "STRING" -
+ then call write_config f$fao("#define !AS !AS",cdef,'cdef_val'_no)
+$ else
+$ call write_config f$fao("#undef !AS",cdef)
+$ endif
+$ endif
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Check for properties of C/C++ compiler with multiple result values
+$!
+$! Version history
+$! 0.01 20040127 First version
+$! 0.02 20050103 Reconcile changes from cc_prop up to version 0.05
+$CC_MPROP_CHECK:
+$ cc_prop = true
+$ i = 1
+$ idel = 1
+$ MT_LOOP:
+$ if f$type(result_'i') .eqs. "STRING"
+$ then
+$ set message/nofac/noident/nosever/notext
+$ on error then continue
+$ cc 'tmpnam'_'i'
+$ if .not. ($status) then cc_prop = false
+$ on error then continue
+$! The headers might lie about the capabilities of the RTL
+$ link 'tmpnam'_'i',tmp.opt/opt
+$ if .not. ($status) then cc_prop = false
+$ set message/fac/ident/sever/text
+$ on error then goto err_exit
+$ delete/nolog 'tmpnam'_'i'.*;*
+$ if (cc_prop)
+$ then
+$ write sys$output "Checking for ''cdef'... ", mdef_'i'
+$ if f$type(mdef_'i') .eqs. "INTEGER" -
+ then call write_config f$fao("#define !AS !UL",cdef,mdef_'i')
+$ if f$type('cdef_val'_yes) .eqs. "STRING" -
+ then call write_config f$fao("#define !AS !AS",cdef,mdef_'i')
+$ goto msym_clean
+$ else
+$ i = i + 1
+$ goto mt_loop
+$ endif
+$ endif
+$ write sys$output "Checking for ''cdef'... no"
+$ call write_config f$fao("#undef !AS",cdef)
+$ MSYM_CLEAN:
+$ if (idel .le. msym_max)
+$ then
+$ delete/sym mdef_'idel'
+$ idel = idel + 1
+$ goto msym_clean
+$ endif
+$ return
+$!------------------------------------------------------------------------------
+$!
+$! Write configuration to both permanent and temporary config file
+$!
+$! Version history
+$! 0.01 20031029 First version to receive a number
+$!
+$WRITE_CONFIG: SUBROUTINE
+$ write aconf 'p1'
+$ open/append confh 'th'
+$ write confh 'p1'
+$ close confh
+$ENDSUBROUTINE
+$!------------------------------------------------------------------------------
+$!
+$! Analyze the project map file and create the symbol vector for a shareable
+$! image from it
+$!
+$! Version history
+$! 0.01 20120128 First version
+$! 0.02 20120226 Add pre-load logic
+$!
+$ MAP_2_SHOPT: Subroutine
+$!
+$ SAY := "WRITE_ SYS$OUTPUT"
+$!
+$ IF F$SEARCH("''P1'") .EQS. ""
+$ THEN
+$ SAY "MAP_2_SHOPT-E-NOSUCHFILE: Error, inputfile ''p1' not available"
+$ goto exit_m2s
+$ ENDIF
+$ IF "''P2'" .EQS. ""
+$ THEN
+$ SAY "MAP_2_SHOPT: Error, no output file provided"
+$ goto exit_m2s
+$ ENDIF
+$!
+$ module1 = "deflate#deflateEnd#deflateInit_#deflateParams#deflateSetDictionary"
+$ module2 = "gzclose#gzerror#gzgetc#gzgets#gzopen#gzprintf#gzputc#gzputs#gzread"
+$ module3 = "gzseek#gztell#inflate#inflateEnd#inflateInit_#inflateSetDictionary"
+$ module4 = "inflateSync#uncompress#zlibVersion#compress"
+$ open/read map 'p1
+$ if axp .or. ia64
+$ then
+$ open/write aopt a.opt
+$ open/write bopt b.opt
+$ write aopt " CASE_SENSITIVE=YES"
+$ write bopt "SYMBOL_VECTOR= (-"
+$ mod_sym_num = 1
+$ MOD_SYM_LOOP:
+$ if f$type(module'mod_sym_num') .nes. ""
+$ then
+$ mod_in = 0
+$ MOD_SYM_IN:
+$ shared_proc = f$element(mod_in, "#", module'mod_sym_num')
+$ if shared_proc .nes. "#"
+$ then
+$ write aopt f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)",-
+ 		 f$edit(shared_proc,"upcase"),shared_proc)
+$ write bopt f$fao("!AS=PROCEDURE,-",shared_proc)
+$ mod_in = mod_in + 1
+$ goto mod_sym_in
+$ endif
+$ mod_sym_num = mod_sym_num + 1
+$ goto mod_sym_loop
+$ endif
+$MAP_LOOP:
+$ read/end=map_end map line
+$ if (f$locate("{",line).lt. f$length(line)) .or. -
+ (f$locate("global:", line) .lt. f$length(line))
+$ then
+$ proc = true
+$ goto map_loop
+$ endif
+$ if f$locate("}",line).lt. f$length(line) then proc = false
+$ if f$locate("local:", line) .lt. f$length(line) then proc = false
+$ if proc
+$ then
+$ shared_proc = f$edit(line,"collapse")
+$ chop_semi = f$locate(";", shared_proc)
+$ if chop_semi .lt. f$length(shared_proc) then -
+ shared_proc = f$extract(0, chop_semi, shared_proc)
+$ write aopt f$fao(" symbol_vector=(!AS/!AS=PROCEDURE)",-
+ 			 f$edit(shared_proc,"upcase"),shared_proc)
+$ write bopt f$fao("!AS=PROCEDURE,-",shared_proc)
+$ endif
+$ goto map_loop
+$MAP_END:
+$ close/nolog aopt
+$ close/nolog bopt
+$ open/append libopt 'p2'
+$ open/read aopt a.opt
+$ open/read bopt b.opt
+$ALOOP:
+$ read/end=aloop_end aopt line
+$ write libopt line
+$ goto aloop
+$ALOOP_END:
+$ close/nolog aopt
+$ sv = ""
+$BLOOP:
+$ read/end=bloop_end bopt svn
+$ if (svn.nes."")
+$ then
+$ if (sv.nes."") then write libopt sv
+$ sv = svn
+$ endif
+$ goto bloop
+$BLOOP_END:
+$ write libopt f$extract(0,f$length(sv)-2,sv), "-"
+$ write libopt ")"
+$ close/nolog bopt
+$ delete/nolog/noconf a.opt;*,b.opt;*
+$ else
+$ if vax
+$ then
+$ open/append libopt 'p2'
+$ mod_sym_num = 1
+$ VMOD_SYM_LOOP:
+$ if f$type(module'mod_sym_num') .nes. ""
+$ then
+$ mod_in = 0
+$ VMOD_SYM_IN:
+$ shared_proc = f$element(mod_in, "#", module'mod_sym_num')
+$ if shared_proc .nes. "#"
+$ then
+$ 	 write libopt f$fao("UNIVERSAL=!AS",-
+ 	 			 f$edit(shared_proc,"upcase"))
+$ mod_in = mod_in + 1
+$ goto vmod_sym_in
+$ endif
+$ mod_sym_num = mod_sym_num + 1
+$ goto vmod_sym_loop
+$ endif
+$VMAP_LOOP:
+$ 	 read/end=vmap_end map line
+$ 	 if (f$locate("{",line).lt. f$length(line)) .or. -
+ 	 (f$locate("global:", line) .lt. f$length(line))
+$ 	 then
+$ 	 proc = true
+$ 	 goto vmap_loop
+$ 	 endif
+$ 	 if f$locate("}",line).lt. f$length(line) then proc = false
+$ 	 if f$locate("local:", line) .lt. f$length(line) then proc = false
+$ 	 if proc
+$ 	 then
+$ 	 shared_proc = f$edit(line,"collapse")
+$ 	 chop_semi = f$locate(";", shared_proc)
+$ 	 if chop_semi .lt. f$length(shared_proc) then -
+ 	 	 shared_proc = f$extract(0, chop_semi, shared_proc)
+$ 	 write libopt f$fao("UNIVERSAL=!AS",-
+ 	 			 f$edit(shared_proc,"upcase"))
+$ 	 endif
+$ 	 goto vmap_loop
+$VMAP_END:
+$ else
+$ write sys$output "Unknown Architecture (Not VAX, AXP, or IA64)"
+$ write sys$output "No options file created"
+$ endif
+$ endif
+$ EXIT_M2S:
+$ close/nolog map
+$ close/nolog libopt
+$ endsubroutine

smplayer-0.8.1.tar.bz2/zlib/msdos Added

smplayer-0.8.1.tar.bz2/zlib/msdos/Makefile.bor Changed

smplayer-0.8.1.tar.bz2/zlib/msdos/Makefile.dj2 Changed

smplayer-0.8.1.tar.bz2/zlib/msdos/Makefile.emx Changed

smplayer-0.8.1.tar.bz2/zlib/msdos/Makefile.msc Changed

smplayer-0.8.1.tar.bz2/zlib/msdos/Makefile.tc Changed

smplayer-0.8.1.tar.bz2/zlib/nintendods Added

smplayer-0.8.1.tar.bz2/zlib/nintendods/Makefile Changed

smplayer-0.8.1.tar.bz2/zlib/nintendods/README Changed

smplayer-0.8.1.tar.bz2/zlib/old Added

smplayer-0.8.1.tar.bz2/zlib/old/Makefile.emx Changed

smplayer-0.8.1.tar.bz2/zlib/old/Makefile.riscos Changed

smplayer-0.8.1.tar.bz2/zlib/old/README Changed

smplayer-0.8.1.tar.bz2/zlib/old/descrip.mms Changed

smplayer-0.8.1.tar.bz2/zlib/old/os2 Added

smplayer-0.8.1.tar.bz2/zlib/old/os2/Makefile.os2 Changed

smplayer-0.8.1.tar.bz2/zlib/old/os2/zlib.def Changed

smplayer-0.8.1.tar.bz2/zlib/old/visual-basic.txt Changed

smplayer-0.8.1.tar.bz2/zlib/qnx Added

smplayer-0.8.1.tar.bz2/zlib/qnx/package.qpg Added

@@ -0,0 +1,141 @@
+<QPG:Generation>
+ <QPG:Options>
+ <QPG:User unattended="no" verbosity="2" listfiles="yes"/>
+ <QPG:Defaults type="qnx_package"/>
+ <QPG:Source></QPG:Source>
+ <QPG:Release number="+"/>
+ <QPG:Build></QPG:Build>
+ <QPG:FileSorting strip="yes"/>
+ <QPG:Package targets="combine"/>
+ <QPG:Repository generate="yes"/>
+ <QPG:FinalDir></QPG:FinalDir>
+ <QPG:Cleanup></QPG:Cleanup>
+ </QPG:Options>
+
+ <QPG:Responsible>
+ <QPG:Company></QPG:Company>
+ <QPG:Department></QPG:Department>
+ <QPG:Group></QPG:Group>
+ <QPG:Team></QPG:Team>
+ <QPG:Employee></QPG:Employee>
+ <QPG:EmailAddress></QPG:EmailAddress>
+ </QPG:Responsible>
+
+ <QPG:Values>
+ <QPG:Files>
+ <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
+ <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
+ <QPG:Add file="../libz.so.1.2.7" install="/opt/lib/" user="root:bin" permission="644"/>
+ <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.7"/>
+ <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.7"/>
+ <QPG:Add file="../libz.so.1.2.7" install="/opt/lib/" component="slib"/>
+ </QPG:Files>
+
+ <QPG:PackageFilter>
+ <QPM:PackageManifest>
+ <QPM:PackageDescription>
+ <QPM:PackageType>Library</QPM:PackageType>
+ <QPM:PackageReleaseNotes></QPM:PackageReleaseNotes>
+ <QPM:PackageReleaseUrgency>Medium</QPM:PackageReleaseUrgency>
+ <QPM:PackageRepository></QPM:PackageRepository>
+ <QPM:FileVersion>2.0</QPM:FileVersion>
+ </QPM:PackageDescription>
+
+ <QPM:ProductDescription>
+ <QPM:ProductName>zlib</QPM:ProductName>
+ <QPM:ProductIdentifier>zlib</QPM:ProductIdentifier>
+ <QPM:ProductEmail>alain.bonnefoy@icbt.com</QPM:ProductEmail>
+ <QPM:VendorName>Public</QPM:VendorName>
+ <QPM:VendorInstallName>public</QPM:VendorInstallName>
+ <QPM:VendorURL>www.gzip.org/zlib</QPM:VendorURL>
+ <QPM:VendorEmbedURL></QPM:VendorEmbedURL>
+ <QPM:VendorEmail></QPM:VendorEmail>
+ <QPM:AuthorName>Jean-Loup Gailly,Mark Adler</QPM:AuthorName>
+ <QPM:AuthorURL>www.gzip.org/zlib</QPM:AuthorURL>
+ <QPM:AuthorEmbedURL></QPM:AuthorEmbedURL>
+ <QPM:AuthorEmail>zlib@gzip.org</QPM:AuthorEmail>
+ <QPM:ProductIconSmall></QPM:ProductIconSmall>
+ <QPM:ProductIconLarge></QPM:ProductIconLarge>
+ <QPM:ProductDescriptionShort>A massively spiffy yet delicately unobtrusive compression library.</QPM:ProductDescriptionShort>
+ <QPM:ProductDescriptionLong>zlib is designed to be a free, general-purpose, legally unencumbered, lossless data compression library for use on virtually any computer hardware and operating system.</QPM:ProductDescriptionLong>
+ <QPM:ProductDescriptionURL>http://www.gzip.org/zlib</QPM:ProductDescriptionURL>
+ <QPM:ProductDescriptionEmbedURL></QPM:ProductDescriptionEmbedURL>
+ </QPM:ProductDescription>
+
+ <QPM:ReleaseDescription>
+ <QPM:ReleaseVersion>1.2.7</QPM:ReleaseVersion>
+ <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
+ <QPM:ReleaseStability>Stable</QPM:ReleaseStability>
+ <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
+ <QPM:ReleaseNoteMajor></QPM:ReleaseNoteMajor>
+ <QPM:ExcludeCountries>
+ <QPM:Country></QPM:Country>
+ </QPM:ExcludeCountries>
+
+ <QPM:ReleaseCopyright>No License</QPM:ReleaseCopyright>
+ </QPM:ReleaseDescription>
+
+ <QPM:ContentDescription>
+ <QPM:ContentTopic xmlmultiple="true">Software Development/Libraries and Extensions/C Libraries</QPM:ContentTopic>
+ <QPM:ContentKeyword>zlib,compression</QPM:ContentKeyword>
+ <QPM:TargetOS>qnx6</QPM:TargetOS>
+ <QPM:HostOS>qnx6</QPM:HostOS>
+ <QPM:DisplayEnvironment xmlmultiple="true">None</QPM:DisplayEnvironment>
+ <QPM:TargetAudience xmlmultiple="true">Developer</QPM:TargetAudience>
+ </QPM:ContentDescription>
+ </QPM:PackageManifest>
+ </QPG:PackageFilter>
+
+ <QPG:PackageFilter proc="none" target="none">
+ <QPM:PackageManifest>
+ <QPM:ProductInstallationDependencies>
+ <QPM:ProductRequirements></QPM:ProductRequirements>
+ </QPM:ProductInstallationDependencies>
+
+ <QPM:ProductInstallationProcedure>
+ <QPM:Script xmlmultiple="true">
+ <QPM:ScriptName></QPM:ScriptName>
+ <QPM:ScriptType>Install</QPM:ScriptType>
+ <QPM:ScriptTiming>Post</QPM:ScriptTiming>
+ <QPM:ScriptBlocking>No</QPM:ScriptBlocking>
+ <QPM:ScriptResult>Ignore</QPM:ScriptResult>
+ <QPM:ShortDescription></QPM:ShortDescription>
+ <QPM:UseBinaries>No</QPM:UseBinaries>
+ <QPM:Priority>Optional</QPM:Priority>
+ </QPM:Script>
+ </QPM:ProductInstallationProcedure>
+ </QPM:PackageManifest>
+
+ <QPM:Launch>
+ </QPM:Launch>
+ </QPG:PackageFilter>
+
+ <QPG:PackageFilter type="core" component="none">
+ <QPM:PackageManifest>
+ <QPM:ProductInstallationProcedure>
+	 <QPM:OrderDependency xmlmultiple="true">
+	 <QPM:Order>InstallOver</QPM:Order>
+	 <QPM:Product>zlib</QPM:Product>
+	 </QPM:OrderDependency>
+ </QPM:ProductInstallationProcedure>
+ </QPM:PackageManifest>
+
+ <QPM:Launch>
+ </QPM:Launch>
+ </QPG:PackageFilter>
+
+ <QPG:PackageFilter type="core" component="dev">
+ <QPM:PackageManifest>
+ <QPM:ProductInstallationProcedure>
+	 <QPM:OrderDependency xmlmultiple="true">
+	 <QPM:Order>InstallOver</QPM:Order>
+	 <QPM:Product>zlib-dev</QPM:Product>
+	 </QPM:OrderDependency>
+ </QPM:ProductInstallationProcedure>
+ </QPM:PackageManifest>
+
+ <QPM:Launch>
+ </QPM:Launch>
+ </QPG:PackageFilter>
+ </QPG:Values>
+</QPG:Generation>

smplayer-0.8.1.tar.bz2/zlib/test Added

smplayer-0.8.1.tar.bz2/zlib/test/example.c Changed

smplayer-0.8.1.tar.bz2/zlib/test/infcover.c Changed

smplayer-0.8.1.tar.bz2/zlib/test/minigzip.c Added

@@ -0,0 +1,631 @@
+/* minigzip.c -- simulate gzip using the zlib compression library
+ * Copyright (C) 1995-2006, 2010, 2011 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+ * minigzip is a minimal implementation of the gzip utility. This is
+ * only an example of using zlib and isn't meant to replace the
+ * full-featured gzip. No attempt is made to deal with file systems
+ * limiting names to 14 or 8+3 characters, etc... Error checking is
+ * very limited. So use minigzip only for testing; use gzip for the
+ * real thing. On MSDOS, use only on file names without extension
+ * or in pipe mode.
+ */
+
+/* @(#) $Id$ */
+
+#include "zlib.h"
+#include <stdio.h>
+
+#ifdef STDC
+# include <string.h>
+# include <stdlib.h>
+#endif
+
+#ifdef USE_MMAP
+# include <sys/types.h>
+# include <sys/mman.h>
+# include <sys/stat.h>
+#endif
+
+#if defined(MSDOS) || defined(OS2) || defined(WIN32) || defined(__CYGWIN__)
+# include <fcntl.h>
+# include <io.h>
+# ifdef UNDER_CE
+# include <stdlib.h>
+# endif
+# define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
+#else
+# define SET_BINARY_MODE(file)
+#endif
+
+#ifdef VMS
+# define unlink delete
+# define GZ_SUFFIX "-gz"
+#endif
+#ifdef RISCOS
+# define unlink remove
+# define GZ_SUFFIX "-gz"
+# define fileno(file) file->__file
+#endif
+#if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+# include <unix.h> /* for fileno */
+#endif
+
+#if !defined(Z_HAVE_UNISTD_H) && !defined(_LARGEFILE64_SOURCE)
+#ifndef WIN32 /* unlink already in stdio.h for WIN32 */
+ extern int unlink OF((const char *));
+#endif
+#endif
+
+#if defined(UNDER_CE)
+# include <windows.h>
+# define perror(s) pwinerror(s)
+
+/* Map the Windows error number in ERROR to a locale-dependent error
+ message string and return a pointer to it. Typically, the values
+ for ERROR come from GetLastError.
+
+ The string pointed to shall not be modified by the application,
+ but may be overwritten by a subsequent call to strwinerror
+
+ The strwinerror function does not change the current setting
+ of GetLastError. */
+
+static char *strwinerror (error)
+ DWORD error;
+{
+ static char buf1024;
+
+ wchar_t *msgbuf;
+ DWORD lasterr = GetLastError();
+ DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM
+ | FORMAT_MESSAGE_ALLOCATE_BUFFER,
+ NULL,
+ error,
+ 0, /* Default language */
+ (LPVOID)&msgbuf,
+ 0,
+ NULL);
+ if (chars != 0) {
+ /* If there is an \r\n appended, zap it. */
+ if (chars >= 2
+ && msgbufchars - 2 == '\r' && msgbufchars - 1 == '\n') {
+ chars -= 2;
+ msgbufchars = 0;
+ }
+
+ if (chars > sizeof (buf) - 1) {
+ chars = sizeof (buf) - 1;
+ msgbufchars = 0;
+ }
+
+ wcstombs(buf, msgbuf, chars + 1);
+ LocalFree(msgbuf);
+ }
+ else {
+ sprintf(buf, "unknown win32 error (%ld)", error);
+ }
+
+ SetLastError(lasterr);
+ return buf;
+}
+
+static void pwinerror (s)
+ const char *s;
+{
+ if (s && *s)
+ fprintf(stderr, "%s: %s\n", s, strwinerror(GetLastError ()));
+ else
+ fprintf(stderr, "%s\n", strwinerror(GetLastError ()));
+}
+
+#endif /* UNDER_CE */
+
+#ifndef GZ_SUFFIX
+# define GZ_SUFFIX ".gz"
+#endif
+#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
+
+#define BUFLEN 16384
+#define MAX_NAME_LEN 1024
+
+#ifdef MAXSEG_64K
+# define local static
+ /* Needed for systems with limitation on stack size. */
+#else
+# define local
+#endif
+
+#ifdef Z_SOLO
+/* for Z_SOLO, create simplified gz* functions using deflate and inflate */
+
+#if defined(Z_HAVE_UNISTD_H) || defined(Z_LARGE)
+# include <unistd.h> /* for unlink() */
+#endif
+
+void *myalloc OF((void *, unsigned, unsigned));
+void myfree OF((void *, void *));
+
+void *myalloc(q, n, m)
+ void *q;
+ unsigned n, m;
+{
+ q = Z_NULL;
+ return calloc(n, m);
+}
+
+void myfree(q, p)
+ void *q, *p;
+{
+ q = Z_NULL;
+ free(p);
+}
+
+typedef struct gzFile_s {
+ FILE *file;
+ int write;
+ int err;
+ char *msg;
+ z_stream strm;
+} *gzFile;
+
+gzFile gzopen OF((const char *, const char *));
+gzFile gzdopen OF((int, const char *));
+gzFile gz_open OF((const char *, int, const char *));
+
+gzFile gzopen(path, mode)
+const char *path;
+const char *mode;
+{
+ return gz_open(path, -1, mode);
+}
+
+gzFile gzdopen(fd, mode)
+int fd;
+const char *mode;
+{
+ return gz_open(NULL, fd, mode);
+}
+
+gzFile gz_open(path, fd, mode)
+ const char *path;
+ int fd;
+ const char *mode;
+{
+ gzFile gz;
+ int ret;
+
+ gz = malloc(sizeof(struct gzFile_s));
+ if (gz == NULL)
+ return NULL;
+ gz->write = strchr(mode, 'w') != NULL;
+ gz->strm.zalloc = myalloc;
+ gz->strm.zfree = myfree;
+ gz->strm.opaque = Z_NULL;
+ if (gz->write)
+ ret = deflateInit2(&(gz->strm), -1, 8, 15 + 16, 8, 0);
+ else {
+ gz->strm.next_in = 0;
+ gz->strm.avail_in = Z_NULL;
+ ret = inflateInit2(&(gz->strm), 15 + 16);
+ }
+ if (ret != Z_OK) {
+ free(gz);
+ return NULL;
+ }
+ gz->file = path == NULL ? fdopen(fd, gz->write ? "wb" : "rb") :
+ fopen(path, gz->write ? "wb" : "rb");
+ if (gz->file == NULL) {
+ gz->write ? deflateEnd(&(gz->strm)) : inflateEnd(&(gz->strm));
+ free(gz);
+ return NULL;
+ }
+ gz->err = 0;
+ gz->msg = "";
+ return gz;
+}
+
+int gzwrite OF((gzFile, const void *, unsigned));
+
+int gzwrite(gz, buf, len)
+ gzFile gz;
+ const void *buf;
+ unsigned len;
+{
+ z_stream *strm;
+ unsigned char outBUFLEN;
+
+ if (gz == NULL || !gz->write)
+ return 0;
+ strm = &(gz->strm);
+ strm->next_in = (void *)buf;
+ strm->avail_in = len;
+ do {
+ strm->next_out = out;
+ strm->avail_out = BUFLEN;
+ (void)deflate(strm, Z_NO_FLUSH);
+ fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
+ } while (strm->avail_out == 0);
+ return len;
+}
+
+int gzread OF((gzFile, void *, unsigned));
+
+int gzread(gz, buf, len)
+ gzFile gz;
+ void *buf;
+ unsigned len;
+{
+ int ret;
+ unsigned got;
+ unsigned char in1;
+ z_stream *strm;
+
+ if (gz == NULL || gz->write)
+ return 0;
+ if (gz->err)
+ return 0;
+ strm = &(gz->strm);
+ strm->next_out = (void *)buf;
+ strm->avail_out = len;
+ do {
+ got = fread(in, 1, 1, gz->file);
+ if (got == 0)
+ break;
+ strm->next_in = in;
+ strm->avail_in = 1;
+ ret = inflate(strm, Z_NO_FLUSH);
+ if (ret == Z_DATA_ERROR) {
+ gz->err = Z_DATA_ERROR;
+ gz->msg = strm->msg;
+ return 0;
+ }
+ if (ret == Z_STREAM_END)
+ inflateReset(strm);
+ } while (strm->avail_out);
+ return len - strm->avail_out;
+}
+
+int gzclose OF((gzFile));
+
+int gzclose(gz)
+ gzFile gz;
+{
+ z_stream *strm;
+ unsigned char outBUFLEN;
+
+ if (gz == NULL)
+ return Z_STREAM_ERROR;
+ strm = &(gz->strm);
+ if (gz->write) {
+ strm->next_in = Z_NULL;
+ strm->avail_in = 0;
+ do {
+ strm->next_out = out;
+ strm->avail_out = BUFLEN;
+ (void)deflate(strm, Z_FINISH);
+ fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
+ } while (strm->avail_out == 0);
+ deflateEnd(strm);
+ }
+ else
+ inflateEnd(strm);
+ fclose(gz->file);
+ free(gz);
+ return Z_OK;
+}
+
+const char *gzerror OF((gzFile, int *));
+
+const char *gzerror(gz, err)
+ gzFile gz;
+ int *err;
+{
+ *err = gz->err;
+ return gz->msg;
+}
+
+#endif
+
+char *prog;
+
+void error OF((const char *msg));
+void gz_compress OF((FILE *in, gzFile out));
+#ifdef USE_MMAP
+int gz_compress_mmap OF((FILE *in, gzFile out));
+#endif
+void gz_uncompress OF((gzFile in, FILE *out));
+void file_compress OF((char *file, char *mode));
+void file_uncompress OF((char *file));
+int main OF((int argc, char *argv));
+
+/* ===========================================================================
+ * Display error message and exit
+ */
+void error(msg)
+ const char *msg;
+{
+ fprintf(stderr, "%s: %s\n", prog, msg);
+ exit(1);
+}
+
+/* ===========================================================================
+ * Compress input to output then close both files.
+ */
+
+void gz_compress(in, out)
+ FILE *in;
+ gzFile out;
+{
+ local char bufBUFLEN;
+ int len;
+ int err;
+
+#ifdef USE_MMAP
+ /* Try first compressing with mmap. If mmap fails (minigzip used in a
+ * pipe), use the normal fread loop.
+ */
+ if (gz_compress_mmap(in, out) == Z_OK) return;
+#endif
+ for (;;) {
+ len = (int)fread(buf, 1, sizeof(buf), in);
+ if (ferror(in)) {
+ perror("fread");
+ exit(1);
+ }
+ if (len == 0) break;
+
+ if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));
+ }
+ fclose(in);
+ if (gzclose(out) != Z_OK) error("failed gzclose");
+}
+
+#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
+
+/* Try compressing the input file at once using mmap. Return Z_OK if
+ * if success, Z_ERRNO otherwise.
+ */
+int gz_compress_mmap(in, out)
+ FILE *in;
+ gzFile out;
+{
+ int len;
+ int err;
+ int ifd = fileno(in);
+ caddr_t buf; /* mmap'ed buffer for the entire input file */
+ off_t buf_len; /* length of the input file */
+ struct stat sb;
+
+ /* Determine the size of the file, needed for mmap: */
+ if (fstat(ifd, &sb) < 0) return Z_ERRNO;
+ buf_len = sb.st_size;
+ if (buf_len <= 0) return Z_ERRNO;
+
+ /* Now do the actual mmap: */
+ buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0);
+ if (buf == (caddr_t)(-1)) return Z_ERRNO;
+
+ /* Compress the whole file at once: */
+ len = gzwrite(out, (char *)buf, (unsigned)buf_len);
+
+ if (len != (int)buf_len) error(gzerror(out, &err));
+
+ munmap(buf, buf_len);
+ fclose(in);
+ if (gzclose(out) != Z_OK) error("failed gzclose");
+ return Z_OK;
+}
+#endif /* USE_MMAP */
+
+/* ===========================================================================
+ * Uncompress input to output then close both files.
+ */
+void gz_uncompress(in, out)
+ gzFile in;
+ FILE *out;
+{
+ local char bufBUFLEN;
+ int len;
+ int err;
+
+ for (;;) {
+ len = gzread(in, buf, sizeof(buf));
+ if (len < 0) error (gzerror(in, &err));
+ if (len == 0) break;
+
+ if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
+ error("failed fwrite");
+ }
+ }
+ if (fclose(out)) error("failed fclose");
+
+ if (gzclose(in) != Z_OK) error("failed gzclose");
+}
+
+
+/* ===========================================================================
+ * Compress the given file: create a corresponding .gz file and remove the
+ * original.
+ */
+void file_compress(file, mode)
+ char *file;
+ char *mode;
+{
+ local char outfileMAX_NAME_LEN;
+ FILE *in;
+ gzFile out;
+
+ if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile)) {
+ fprintf(stderr, "%s: filename too long\n", prog);
+ exit(1);
+ }
+
+ strcpy(outfile, file);
+ strcat(outfile, GZ_SUFFIX);
+
+ in = fopen(file, "rb");
+ if (in == NULL) {
+ perror(file);
+ exit(1);
+ }
+ out = gzopen(outfile, mode);
+ if (out == NULL) {
+ fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
+ exit(1);
+ }
+ gz_compress(in, out);
+
+ unlink(file);
+}
+
+
+/* ===========================================================================
+ * Uncompress the given file and remove the original.
+ */
+void file_uncompress(file)
+ char *file;
+{
+ local char bufMAX_NAME_LEN;
+ char *infile, *outfile;
+ FILE *out;
+ gzFile in;
+ size_t len = strlen(file);
+
+ if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) {
+ fprintf(stderr, "%s: filename too long\n", prog);
+ exit(1);
+ }
+
+ strcpy(buf, file);
+
+ if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
+ infile = file;
+ outfile = buf;
+ outfilelen-3 = '\0';
+ } else {
+ outfile = file;
+ infile = buf;
+ strcat(infile, GZ_SUFFIX);
+ }
+ in = gzopen(infile, "rb");
+ if (in == NULL) {
+ fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
+ exit(1);
+ }
+ out = fopen(outfile, "wb");
+ if (out == NULL) {
+ perror(file);
+ exit(1);
+ }
+
+ gz_uncompress(in, out);
+
+ unlink(infile);
+}
+
+
+/* ===========================================================================
+ * Usage: minigzip -c -d -f -h -r -1 to -9 files...
+ * -c : write to standard output
+ * -d : decompress
+ * -f : compress with Z_FILTERED
+ * -h : compress with Z_HUFFMAN_ONLY
+ * -r : compress with Z_RLE
+ * -1 to -9 : compression level
+ */
+
+int main(argc, argv)
+ int argc;
+ char *argv;
+{
+ int copyout = 0;
+ int uncompr = 0;
+ gzFile file;
+ char *bname, outmode20;
+
+ strcpy(outmode, "wb6 ");
+
+ prog = argv0;
+ bname = strrchr(argv0, '/');
+ if (bname)
+ bname++;
+ else
+ bname = argv0;
+ argc--, argv++;
+
+ if (!strcmp(bname, "gunzip"))
+ uncompr = 1;
+ else if (!strcmp(bname, "zcat"))
+ copyout = uncompr = 1;
+
+ while (argc > 0) {
+ if (strcmp(*argv, "-c") == 0)
+ copyout = 1;
+ else if (strcmp(*argv, "-d") == 0)
+ uncompr = 1;
+ else if (strcmp(*argv, "-f") == 0)
+ outmode3 = 'f';
+ else if (strcmp(*argv, "-h") == 0)
+ outmode3 = 'h';
+ else if (strcmp(*argv, "-r") == 0)
+ outmode3 = 'R';
+ else if ((*argv)0 == '-' && (*argv)1 >= '1' && (*argv)1 <= '9' &&
+ (*argv)2 == 0)
+ outmode2 = (*argv)1;
+ else
+ break;
+ argc--, argv++;
+ }
+ if (outmode3 == ' ')
+ outmode3 = 0;
+ if (argc == 0) {
+ SET_BINARY_MODE(stdin);
+ SET_BINARY_MODE(stdout);
+ if (uncompr) {
+ file = gzdopen(fileno(stdin), "rb");
+ if (file == NULL) error("can't gzdopen stdin");
+ gz_uncompress(file, stdout);
+ } else {
+ file = gzdopen(fileno(stdout), outmode);
+ if (file == NULL) error("can't gzdopen stdout");
+ gz_compress(stdin, file);
+ }
+ } else {
+ if (copyout) {
+ SET_BINARY_MODE(stdout);
+ }
+ do {
+ if (uncompr) {
+ if (copyout) {
+ file = gzopen(*argv, "rb");
+ if (file == NULL)
+ fprintf(stderr, "%s: can't gzopen %s\n", prog, *argv);
+ else
+ gz_uncompress(file, stdout);
+ } else {
+ file_uncompress(*argv);
+ }
+ } else {
+ if (copyout) {
+ FILE * in = fopen(*argv, "rb");
+
+ if (in == NULL) {
+ perror(*argv);
+ } else {
+ file = gzdopen(fileno(stdout), outmode);
+ if (file == NULL) error("can't gzdopen stdout");
+
+ gz_compress(in, file);
+ }
+
+ } else {
+ file_compress(*argv, outmode);
+ }
+ }
+ } while (argv++, --argc);
+ }
+ return 0;
+}

smplayer-0.8.1.tar.bz2/zlib/treebuild.xml Added

@@ -0,0 +1,116 @@
+<?xml version="1.0" ?>
+<package name="zlib" version="1.2.7">
+ <library name="zlib" dlversion="1.2.7" dlname="z">
+	<property name="description"> zip compression library </property>
+	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
+
+	
+	<property name="compiler/c/inline" value="yes" />
+
+	<include-file name="zlib.h" scope="public" mode="644" />
+	<include-file name="zconf.h" scope="public" mode="644" />
+
+	<source name="adler32.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	</source>
+	<source name="compress.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	</source>
+	<source name="crc32.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	 <depend name="crc32.h" />
+	</source>
+	<source name="gzclose.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	 <depend name="gzguts.h" />
+	</source>
+	<source name="gzlib.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	 <depend name="gzguts.h" />
+	</source>
+	<source name="gzread.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	 <depend name="gzguts.h" />
+	</source>
+	<source name="gzwrite.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	 <depend name="gzguts.h" />
+	</source>
+	<source name="uncompr.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	</source>
+	<source name="deflate.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	 <depend name="zutil.h" />
+	 <depend name="deflate.h" />
+	</source>
+	<source name="trees.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	 <depend name="zutil.h" />
+	 <depend name="deflate.h" />
+	 <depend name="trees.h" />
+	</source>
+	<source name="zutil.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	 <depend name="zutil.h" />
+	</source>
+	<source name="inflate.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	 <depend name="zutil.h" />
+	 <depend name="inftrees.h" />
+	 <depend name="inflate.h" />
+	 <depend name="inffast.h" />
+	</source>
+	<source name="infback.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	 <depend name="zutil.h" />
+	 <depend name="inftrees.h" />
+	 <depend name="inflate.h" />
+	 <depend name="inffast.h" />
+	</source>
+	<source name="inftrees.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	 <depend name="zutil.h" />
+	 <depend name="inftrees.h" />
+	</source>
+	<source name="inffast.c">
+	 <depend name="zlib.h" />
+	 <depend name="zconf.h" />
+	 <depend name="zutil.h" />
+	 <depend name="inftrees.h" />
+	 <depend name="inflate.h" />
+	 <depend name="inffast.h" />
+	</source>
+ </library>
+</package>
+
+

smplayer-0.8.1.tar.bz2/zlib/trees.c Changed

smplayer-0.8.1.tar.bz2/zlib/trees.h Changed

smplayer-0.8.1.tar.bz2/zlib/uncompr.c Changed

smplayer-0.8.1.tar.bz2/zlib/watcom Added

smplayer-0.8.1.tar.bz2/zlib/watcom/watcom_f.mak Changed

smplayer-0.8.1.tar.bz2/zlib/watcom/watcom_l.mak Changed

smplayer-0.8.1.tar.bz2/zlib/win32 Added

smplayer-0.8.1.tar.bz2/zlib/win32/DLL_FAQ.txt Changed

smplayer-0.8.1.tar.bz2/zlib/win32/Makefile.bor Changed

smplayer-0.8.1.tar.bz2/zlib/win32/Makefile.gcc Added

@@ -0,0 +1,183 @@
+# Makefile for zlib, derived from Makefile.dj2.
+# Modified for mingw32 by C. Spieler, 6/16/98.
+# Updated for zlib 1.2.x by Christian Spieler and Cosmin Truta, Mar-2003.
+# Last updated: Mar 2012.
+# Tested under Cygwin and MinGW.
+
+# Copyright (C) 1995-2003 Jean-loup Gailly.
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+# To compile, or to compile and test, type from the top level zlib directory:
+#
+# make -fwin32/Makefile.gcc; make test testdll -fwin32/Makefile.gcc
+#
+# To use the asm code, type:
+# cp contrib/asm?86/match.S ./match.S
+# make LOC=-DASMV OBJA=match.o -fwin32/Makefile.gcc
+#
+# To install libz.a, zconf.h and zlib.h in the system directories, type:
+#
+# make install -fwin32/Makefile.gcc
+#
+# BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set.
+#
+# To install the shared lib, append SHARED_MODE=1 to the make command :
+#
+# make install -fwin32/Makefile.gcc SHARED_MODE=1
+
+# Note:
+# If the platform is *not* MinGW (e.g. it is Cygwin or UWIN),
+# the DLL name should be changed from "zlib1.dll".
+
+STATICLIB = libz.a
+SHAREDLIB = zlib1.dll
+IMPLIB = libz.dll.a
+
+#
+# Set to 1 if shared object needs to be installed
+#
+SHARED_MODE=0
+
+#LOC = -DASMV
+#LOC = -DDEBUG -g
+
+PREFIX =
+CC = $(PREFIX)gcc
+CFLAGS = $(LOC) -O3 -Wall
+
+AS = $(CC)
+ASFLAGS = $(LOC) -Wall
+
+LD = $(CC)
+LDFLAGS = $(LOC)
+
+AR = $(PREFIX)ar
+ARFLAGS = rcs
+
+RC = $(PREFIX)windres
+RCFLAGS = --define GCC_WINDRES
+
+STRIP = $(PREFIX)strip
+
+CP = cp -fp
+# If GNU install is available, replace $(CP) with install.
+INSTALL = $(CP)
+# RM = rm -f
+RM = del
+
+prefix ?= /usr/local
+exec_prefix = $(prefix)
+
+OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
+ gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
+OBJA =
+
+all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example.exe minigzip.exe example_d.exe minigzip_d.exe
+
+test: example.exe minigzip.exe
+	./example
+	echo hello world | ./minigzip | ./minigzip -d
+
+testdll: example_d.exe minigzip_d.exe
+	./example_d
+	echo hello world | ./minigzip_d | ./minigzip_d -d
+
+.c.o:
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+.S.o:
+	$(AS) $(ASFLAGS) -c -o $@ $<
+
+$(STATICLIB): $(OBJS) $(OBJA)
+	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
+
+$(IMPLIB): $(SHAREDLIB)
+
+$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
+	$(CC) -shared -Wl,--out-implib,$(IMPLIB) $(LDFLAGS) \
+	-o $@ win32/zlib.def $(OBJS) $(OBJA) zlibrc.o
+	$(STRIP) $@
+
+example.exe: example.o $(STATICLIB)
+	$(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB)
+	$(STRIP) $@
+
+minigzip.exe: minigzip.o $(STATICLIB)
+	$(LD) $(LDFLAGS) -o $@ minigzip.o $(STATICLIB)
+	$(STRIP) $@
+
+example_d.exe: example.o $(IMPLIB)
+	$(LD) $(LDFLAGS) -o $@ example.o $(IMPLIB)
+	$(STRIP) $@
+
+minigzip_d.exe: minigzip.o $(IMPLIB)
+	$(LD) $(LDFLAGS) -o $@ minigzip.o $(IMPLIB)
+	$(STRIP) $@
+
+example.o: test/example.c zlib.h zconf.h
+	$(CC) $(CFLAGS) -I. -c -o $@ test/example.c
+
+minigzip.o: test/minigzip.c zlib.h zconf.h
+	$(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c
+
+zlibrc.o: win32/zlib1.rc
+	$(RC) $(RCFLAGS) -o $@ win32/zlib1.rc
+
+.PHONY: install uninstall clean
+
+install: zlib.h zconf.h $(STATICLIB) $(IMPLIB)
+	@if test -z "$(DESTDIR)$(INCLUDE_PATH)" -o -z "$(DESTDIR)$(LIBRARY_PATH)" -o -z "$(DESTDIR)$(BINARY_PATH)"; then \
+		echo INCLUDE_PATH, LIBRARY_PATH, and BINARY_PATH must be specified; \
+		exit 1; \
+	fi
+	-@mkdir -p '$(DESTDIR)$(INCLUDE_PATH)'
+	-@mkdir -p '$(DESTDIR)$(LIBRARY_PATH)' '$(DESTDIR)$(LIBRARY_PATH)'/pkgconfig
+	-if "$(SHARED_MODE)" = "1" ; then \
+		mkdir -p '$(DESTDIR)$(BINARY_PATH)'; \
+		$(INSTALL) $(SHAREDLIB) '$(DESTDIR)$(BINARY_PATH)'; \
+		$(INSTALL) $(IMPLIB) '$(DESTDIR)$(LIBRARY_PATH)'; \
+	fi
+	-$(INSTALL) zlib.h '$(DESTDIR)$(INCLUDE_PATH)'
+	-$(INSTALL) zconf.h '$(DESTDIR)$(INCLUDE_PATH)'
+	-$(INSTALL) $(STATICLIB) '$(DESTDIR)$(LIBRARY_PATH)'
+	sed \
+		-e 's|@prefix@|${prefix}|g' \
+		-e 's|@exec_prefix@|${exec_prefix}|g' \
+		-e 's|@libdir@|$(LIBRARY_PATH)|g' \
+		-e 's|@sharedlibdir@|$(LIBRARY_PATH)|g' \
+		-e 's|@includedir@|$(INCLUDE_PATH)|g' \
+		-e 's|@VERSION@|'`sed -n -e '/VERSION "/s/.*"$.*$".*/\1/p' zlib.h`'|g' \
+		zlib.pc.in > '$(DESTDIR)$(LIBRARY_PATH)'/pkgconfig/zlib.pc
+
+uninstall:
+	-if "$(SHARED_MODE)" = "1" ; then \
+		$(RM) '$(DESTDIR)$(BINARY_PATH)'/$(SHAREDLIB); \
+		$(RM) '$(DESTDIR)$(LIBRARY_PATH)'/$(IMPLIB); \
+	fi
+	-$(RM) '$(DESTDIR)$(INCLUDE_PATH)'/zlib.h
+	-$(RM) '$(DESTDIR)$(INCLUDE_PATH)'/zconf.h
+	-$(RM) '$(DESTDIR)$(LIBRARY_PATH)'/$(STATICLIB)
+
+clean:
+	-$(RM) $(STATICLIB)
+	-$(RM) $(SHAREDLIB)
+	-$(RM) $(IMPLIB)
+	-$(RM) *.o
+	-$(RM) *.exe
+	-$(RM) foo.gz
+
+adler32.o: zlib.h zconf.h
+compress.o: zlib.h zconf.h
+crc32.o: crc32.h zlib.h zconf.h
+deflate.o: deflate.h zutil.h zlib.h zconf.h
+gzclose.o: zlib.h zconf.h gzguts.h
+gzlib.o: zlib.h zconf.h gzguts.h
+gzread.o: zlib.h zconf.h gzguts.h
+gzwrite.o: zlib.h zconf.h gzguts.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
+inftrees.o: zutil.h zlib.h zconf.h inftrees.h
+trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
+uncompr.o: zlib.h zconf.h
+zutil.o: zutil.h zlib.h zconf.h

smplayer-0.8.1.tar.bz2/zlib/win32/Makefile.msc Changed

smplayer-0.8.1.tar.bz2/zlib/win32/README-WIN32.txt Added

@@ -0,0 +1,103 @@
+ZLIB DATA COMPRESSION LIBRARY
+
+zlib 1.2.7 is a general purpose data compression library. All the code is
+thread safe. The data format used by the zlib library is described by RFCs
+(Request for Comments) 1950 to 1952 in the files
+http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
+and rfc1952.txt (gzip format).
+
+All functions of the compression library are documented in the file zlib.h
+(volunteer to write man pages welcome, contact zlib@gzip.org). Two compiled
+examples are distributed in this package, example and minigzip. The example_d
+and minigzip_d flavors validate that the zlib1.dll file is working correctly.
+
+Questions about zlib should be sent to <zlib@gzip.org>. The zlib home page
+is http://zlib.net/ . Before reporting a problem, please check this site to
+verify that you have the latest version of zlib; otherwise get the latest
+version and check whether the problem still exists or not.
+
+PLEASE read DLL_FAQ.txt, and the the zlib FAQ http://zlib.net/zlib_faq.html
+before asking for help.
+
+
+Manifest:
+
+The package zlib-1.2.7-win32-x86.zip will contain the following files:
+
+ README-WIN32.txt This document
+ ChangeLog Changes since previous zlib packages
+ DLL_FAQ.txt Frequently asked questions about zlib1.dll
+ zlib.3.pdf Documentation of this library in Adobe Acrobat format
+
+ example.exe A statically-bound example (using zlib.lib, not the dll)
+ example.pdb Symbolic information for debugging example.exe
+
+ example_d.exe A zlib1.dll bound example (using zdll.lib)
+ example_d.pdb Symbolic information for debugging example_d.exe
+
+ minigzip.exe A statically-bound test program (using zlib.lib, not the dll)
+ minigzip.pdb Symbolic information for debugging minigzip.exe
+
+ minigzip_d.exe A zlib1.dll bound test program (using zdll.lib)
+ minigzip_d.pdb Symbolic information for debugging minigzip_d.exe
+
+ zlib.h Install these files into the compilers' INCLUDE path to
+ zconf.h compile programs which use zlib.lib or zdll.lib
+
+ zdll.lib Install these files into the compilers' LIB path if linking
+ zdll.exp a compiled program to the zlib1.dll binary
+
+ zlib.lib Install these files into the compilers' LIB path to link zlib
+ zlib.pdb into compiled programs, without zlib1.dll runtime dependency
+ (zlib.pdb provides debugging info to the compile time linker)
+
+ zlib1.dll Install this binary shared library into the system PATH, or
+ the program's runtime directory (where the .exe resides)
+ zlib1.pdb Install in the same directory as zlib1.dll, in order to debug
+ an application crash using WinDbg or similar tools.
+
+All .pdb files above are entirely optional, but are very useful to a developer
+attempting to diagnose program misbehavior or a crash. Many additional
+important files for developers can be found in the zlib127.zip source package
+available from http://zlib.net/ - review that package's README file for details.
+
+
+Acknowledgments:
+
+The deflate format used by zlib was defined by Phil Katz. The deflate and
+zlib specifications were written by L. Peter Deutsch. Thanks to all the
+people who reported problems and suggested various improvements in zlib; they
+are too numerous to cite here.
+
+
+Copyright notice:
+
+ (C) 1995-2012 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly Mark Adler
+ jloup@gzip.org madler@alumni.caltech.edu
+
+If you use the zlib library in a product, we would appreciate *not* receiving
+lengthy legal documents to sign. The sources are provided for free but without
+warranty of any kind. The library has been entirely written by Jean-loup
+Gailly and Mark Adler; it does not include third-party code.
+
+If you redistribute modified sources, we would appreciate that you include in
+the file ChangeLog history information documenting your changes. Please read
+the FAQ for more information on the distribution of modified source versions.

smplayer-0.8.1.tar.bz2/zlib/win32/VisualC.txt Changed

smplayer-0.8.1.tar.bz2/zlib/win32/zlib.def Added

@@ -0,0 +1,84 @@
+; zlib data compression library
+EXPORTS
+; basic functions
+    zlibVersion
+    deflate
+    deflateEnd
+    inflate
+    inflateEnd
+; advanced functions
+    deflateSetDictionary
+    deflateCopy
+    deflateReset
+    deflateParams
+    deflateTune
+    deflateBound
+    deflatePending
+    deflatePrime
+    deflateSetHeader
+    inflateSetDictionary
+    inflateSync
+    inflateCopy
+    inflateReset
+    inflateReset2
+    inflatePrime
+    inflateMark
+    inflateGetHeader
+    inflateBack
+    inflateBackEnd
+    zlibCompileFlags
+; utility functions
+    compress
+    compress2
+    compressBound
+    uncompress
+    gzopen
+    gzdopen
+    gzbuffer
+    gzsetparams
+    gzread
+    gzwrite
+    gzprintf
+    gzputs
+    gzgets
+    gzputc
+    gzgetc
+    gzungetc
+    gzflush
+    gzseek
+    gzrewind
+    gztell
+    gzoffset
+    gzeof
+    gzdirect
+    gzclose
+    gzclose_r
+    gzclose_w
+    gzerror
+    gzclearerr
+; large file functions
+    gzopen64
+    gzseek64
+    gztell64
+    gzoffset64
+    adler32_combine64
+    crc32_combine64
+; checksum functions
+    adler32
+    crc32
+    adler32_combine
+    crc32_combine
+; various hacks, don't look :)
+    deflateInit_
+    deflateInit2_
+    inflateInit_
+    inflateInit2_
+    inflateBackInit_
+    gzgetc_
+    zError
+    inflateSyncPoint
+    get_crc_table
+    inflateUndermine
+    inflateResetKeep
+    deflateResetKeep
+    gzopen_w

smplayer-0.8.1.tar.bz2/zlib/win32/zlib1.rc Changed

smplayer-0.8.1.tar.bz2/zlib/zconf.h Added

@@ -0,0 +1,506 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2012 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
+# define Z_PREFIX_SET
+
+/* all linked symbols */
+# define _dist_code z__dist_code
+# define _length_code z__length_code
+# define _tr_align z__tr_align
+# define _tr_flush_block z__tr_flush_block
+# define _tr_init z__tr_init
+# define _tr_stored_block z__tr_stored_block
+# define _tr_tally z__tr_tally
+# define adler32 z_adler32
+# define adler32_combine z_adler32_combine
+# define adler32_combine64 z_adler32_combine64
+# ifndef Z_SOLO
+# define compress z_compress
+# define compress2 z_compress2
+# define compressBound z_compressBound
+# endif
+# define crc32 z_crc32
+# define crc32_combine z_crc32_combine
+# define crc32_combine64 z_crc32_combine64
+# define deflate z_deflate
+# define deflateBound z_deflateBound
+# define deflateCopy z_deflateCopy
+# define deflateEnd z_deflateEnd
+# define deflateInit2_ z_deflateInit2_
+# define deflateInit_ z_deflateInit_
+# define deflateParams z_deflateParams
+# define deflatePending z_deflatePending
+# define deflatePrime z_deflatePrime
+# define deflateReset z_deflateReset
+# define deflateResetKeep z_deflateResetKeep
+# define deflateSetDictionary z_deflateSetDictionary
+# define deflateSetHeader z_deflateSetHeader
+# define deflateTune z_deflateTune
+# define deflate_copyright z_deflate_copyright
+# define get_crc_table z_get_crc_table
+# ifndef Z_SOLO
+# define gz_error z_gz_error
+# define gz_intmax z_gz_intmax
+# define gz_strwinerror z_gz_strwinerror
+# define gzbuffer z_gzbuffer
+# define gzclearerr z_gzclearerr
+# define gzclose z_gzclose
+# define gzclose_r z_gzclose_r
+# define gzclose_w z_gzclose_w
+# define gzdirect z_gzdirect
+# define gzdopen z_gzdopen
+# define gzeof z_gzeof
+# define gzerror z_gzerror
+# define gzflush z_gzflush
+# define gzgetc z_gzgetc
+# define gzgetc_ z_gzgetc_
+# define gzgets z_gzgets
+# define gzoffset z_gzoffset
+# define gzoffset64 z_gzoffset64
+# define gzopen z_gzopen
+# define gzopen64 z_gzopen64
+# ifdef _WIN32
+# define gzopen_w z_gzopen_w
+# endif
+# define gzprintf z_gzprintf
+# define gzputc z_gzputc
+# define gzputs z_gzputs
+# define gzread z_gzread
+# define gzrewind z_gzrewind
+# define gzseek z_gzseek
+# define gzseek64 z_gzseek64
+# define gzsetparams z_gzsetparams
+# define gztell z_gztell
+# define gztell64 z_gztell64
+# define gzungetc z_gzungetc
+# define gzwrite z_gzwrite
+# endif
+# define inflate z_inflate
+# define inflateBack z_inflateBack
+# define inflateBackEnd z_inflateBackEnd
+# define inflateBackInit_ z_inflateBackInit_
+# define inflateCopy z_inflateCopy
+# define inflateEnd z_inflateEnd
+# define inflateGetHeader z_inflateGetHeader
+# define inflateInit2_ z_inflateInit2_
+# define inflateInit_ z_inflateInit_
+# define inflateMark z_inflateMark
+# define inflatePrime z_inflatePrime
+# define inflateReset z_inflateReset
+# define inflateReset2 z_inflateReset2
+# define inflateSetDictionary z_inflateSetDictionary
+# define inflateSync z_inflateSync
+# define inflateSyncPoint z_inflateSyncPoint
+# define inflateUndermine z_inflateUndermine
+# define inflateResetKeep z_inflateResetKeep
+# define inflate_copyright z_inflate_copyright
+# define inflate_fast z_inflate_fast
+# define inflate_table z_inflate_table
+# ifndef Z_SOLO
+# define uncompress z_uncompress
+# endif
+# define zError z_zError
+# ifndef Z_SOLO
+# define zcalloc z_zcalloc
+# define zcfree z_zcfree
+# endif
+# define zlibCompileFlags z_zlibCompileFlags
+# define zlibVersion z_zlibVersion
+
+/* all zlib typedefs in zlib.h and zconf.h */
+# define Byte z_Byte
+# define Bytef z_Bytef
+# define alloc_func z_alloc_func
+# define charf z_charf
+# define free_func z_free_func
+# ifndef Z_SOLO
+# define gzFile z_gzFile
+# endif
+# define gz_header z_gz_header
+# define gz_headerp z_gz_headerp
+# define in_func z_in_func
+# define intf z_intf
+# define out_func z_out_func
+# define uInt z_uInt
+# define uIntf z_uIntf
+# define uLong z_uLong
+# define uLongf z_uLongf
+# define voidp z_voidp
+# define voidpc z_voidpc
+# define voidpf z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+# define gz_header_s z_gz_header_s
+# define internal_state z_internal_state
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+# define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+# define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+# define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+# ifndef WIN32
+# define WIN32
+# endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+# ifndef SYS16BIT
+# define SYS16BIT
+# endif
+# endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+# define MAXSEG_64K
+#endif
+#ifdef MSDOS
+# define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+# ifndef STDC
+# define STDC
+# endif
+# if __STDC_VERSION__ >= 199901L
+# ifndef STDC99
+# define STDC99
+# endif
+# endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+# define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+# define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+# define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+# define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
+# define STDC
+#endif
+
+#ifndef STDC
+# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+# define const /* note: need a more gentle solution here */
+# endif
+#endif
+
+#if defined(ZLIB_CONST) && !defined(z_const)
+# define z_const const
+#else
+# define z_const
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+# define NO_DUMMY_DECL
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+# ifdef MAXSEG_64K
+# define MAX_MEM_LEVEL 8
+# else
+# define MAX_MEM_LEVEL 9
+# endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+# define MAX_WBITS 15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+ (1 << (windowBits+2)) + (1 << (memLevel+9))
+ that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+ make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+ The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+ /* Type declarations */
+
+#ifndef OF /* function prototypes */
+# ifdef STDC
+# define OF(args) args
+# else
+# define OF(args) ()
+# endif
+#endif
+
+#ifndef Z_ARG /* function prototypes for stdarg */
+# if defined(STDC) || defined(Z_HAVE_STDARG_H)
+# define Z_ARG(args) args
+# else
+# define Z_ARG(args) ()
+# endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+# if defined(M_I86SM) || defined(M_I86MM)
+ /* MSC small or medium model */
+# define SMALL_MEDIUM
+# ifdef _MSC_VER
+# define FAR _far
+# else
+# define FAR far
+# endif
+# endif
+# if (defined(__SMALL__) || defined(__MEDIUM__))
+ /* Turbo C small or medium model */
+# define SMALL_MEDIUM
+# ifdef __BORLANDC__
+# define FAR _far
+# else
+# define FAR far
+# endif
+# endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+ /* If building or using zlib as a DLL, define ZLIB_DLL.
+ * This is not mandatory, but it offers a little performance increase.
+ */
+# ifdef ZLIB_DLL
+# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+# ifdef ZLIB_INTERNAL
+# define ZEXTERN extern __declspec(dllexport)
+# else
+# define ZEXTERN extern __declspec(dllimport)
+# endif
+# endif
+# endif /* ZLIB_DLL */
+ /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+ * define ZLIB_WINAPI.
+ * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+ */
+# ifdef ZLIB_WINAPI
+# ifdef FAR
+# undef FAR
+# endif
+# include <windows.h>
+ /* No need for _export, use ZLIB.DEF instead. */
+ /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+# define ZEXPORT WINAPI
+# ifdef WIN32
+# define ZEXPORTVA WINAPIV
+# else
+# define ZEXPORTVA FAR CDECL
+# endif
+# endif
+#endif
+
+#if defined (__BEOS__)
+# ifdef ZLIB_DLL
+# ifdef ZLIB_INTERNAL
+# define ZEXPORT __declspec(dllexport)
+# define ZEXPORTVA __declspec(dllexport)
+# else
+# define ZEXPORT __declspec(dllimport)
+# define ZEXPORTVA __declspec(dllimport)
+# endif
+# endif
+#endif
+
+#ifndef ZEXTERN
+# define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+# define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+# define ZEXPORTVA
+#endif
+
+#ifndef FAR
+# define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char Byte; /* 8 bits */
+#endif
+typedef unsigned int uInt; /* 16 bits or more */
+typedef unsigned long uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+ /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+# define Bytef Byte FAR
+#else
+ typedef Byte FAR Bytef;
+#endif
+typedef char FAR charf;
+typedef int FAR intf;
+typedef uInt FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+ typedef void const *voidpc;
+ typedef void FAR *voidpf;
+ typedef void *voidp;
+#else
+ typedef Byte const *voidpc;
+ typedef Byte FAR *voidpf;
+ typedef Byte *voidp;
+#endif
+
+/* ./configure may #define Z_U4 here */
+
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+# include <limits.h>
+# if (UINT_MAX == 0xffffffffUL)
+# define Z_U4 unsigned
+# else
+# if (ULONG_MAX == 0xffffffffUL)
+# define Z_U4 unsigned long
+# else
+# if (USHRT_MAX == 0xffffffffUL)
+# define Z_U4 unsigned short
+# endif
+# endif
+# endif
+#endif
+
+#ifdef Z_U4
+ typedef Z_U4 z_crc_t;
+#else
+ typedef unsigned long z_crc_t;
+#endif
+
+#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
+# define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
+# define Z_HAVE_STDARG_H
+#endif
+
+#ifdef STDC
+# ifndef Z_SOLO
+# include <sys/types.h> /* for off_t */
+# endif
+#endif
+
+#ifdef _WIN32
+# include <stddef.h> /* for wchar_t */
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+# undef _LARGEFILE64_SOURCE
+#endif
+
+#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
+# define Z_HAVE_UNISTD_H
+#endif
+#ifndef Z_SOLO
+# if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
+# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+# ifdef VMS
+# include <unixio.h> /* for off_t */
+# endif
+# ifndef z_off_t
+# define z_off_t off_t
+# endif
+# endif
+#endif
+
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+# define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+# define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+# define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
+# define SEEK_SET 0 /* Seek from beginning of file. */
+# define SEEK_CUR 1 /* Seek from current position. */
+# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+# define z_off_t long
+#endif
+
+#if !defined(_WIN32) && defined(Z_LARGE64)
+# define z_off64_t off64_t
+#else
+# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+# define z_off64_t __int64
+# else
+# define z_off64_t z_off_t
+# endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+ #pragma map(deflateInit_,"DEIN")
+ #pragma map(deflateInit2_,"DEIN2")
+ #pragma map(deflateEnd,"DEEND")
+ #pragma map(deflateBound,"DEBND")
+ #pragma map(inflateInit_,"ININ")
+ #pragma map(inflateInit2_,"ININ2")
+ #pragma map(inflateEnd,"INEND")
+ #pragma map(inflateSync,"INSY")
+ #pragma map(inflateSetDictionary,"INSEDI")
+ #pragma map(compressBound,"CMBND")
+ #pragma map(inflate_table,"INTABL")
+ #pragma map(inflate_fast,"INFA")
+ #pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */

smplayer-0.8.1.tar.bz2/zlib/zconf.h.cmakein Added

@@ -0,0 +1,508 @@
+/* zconf.h -- configuration of the zlib compression library
+ * Copyright (C) 1995-2012 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZCONF_H
+#define ZCONF_H
+#cmakedefine Z_PREFIX
+#cmakedefine Z_HAVE_UNISTD_H
+
+/*
+ * If you *really* need a unique prefix for all types and library functions,
+ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
+ * Even better than compiling with -DZ_PREFIX would be to use configure to set
+ * this permanently in zconf.h using "./configure --zprefix".
+ */
+#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */
+# define Z_PREFIX_SET
+
+/* all linked symbols */
+# define _dist_code z__dist_code
+# define _length_code z__length_code
+# define _tr_align z__tr_align
+# define _tr_flush_block z__tr_flush_block
+# define _tr_init z__tr_init
+# define _tr_stored_block z__tr_stored_block
+# define _tr_tally z__tr_tally
+# define adler32 z_adler32
+# define adler32_combine z_adler32_combine
+# define adler32_combine64 z_adler32_combine64
+# ifndef Z_SOLO
+# define compress z_compress
+# define compress2 z_compress2
+# define compressBound z_compressBound
+# endif
+# define crc32 z_crc32
+# define crc32_combine z_crc32_combine
+# define crc32_combine64 z_crc32_combine64
+# define deflate z_deflate
+# define deflateBound z_deflateBound
+# define deflateCopy z_deflateCopy
+# define deflateEnd z_deflateEnd
+# define deflateInit2_ z_deflateInit2_
+# define deflateInit_ z_deflateInit_
+# define deflateParams z_deflateParams
+# define deflatePending z_deflatePending
+# define deflatePrime z_deflatePrime
+# define deflateReset z_deflateReset
+# define deflateResetKeep z_deflateResetKeep
+# define deflateSetDictionary z_deflateSetDictionary
+# define deflateSetHeader z_deflateSetHeader
+# define deflateTune z_deflateTune
+# define deflate_copyright z_deflate_copyright
+# define get_crc_table z_get_crc_table
+# ifndef Z_SOLO
+# define gz_error z_gz_error
+# define gz_intmax z_gz_intmax
+# define gz_strwinerror z_gz_strwinerror
+# define gzbuffer z_gzbuffer
+# define gzclearerr z_gzclearerr
+# define gzclose z_gzclose
+# define gzclose_r z_gzclose_r
+# define gzclose_w z_gzclose_w
+# define gzdirect z_gzdirect
+# define gzdopen z_gzdopen
+# define gzeof z_gzeof
+# define gzerror z_gzerror
+# define gzflush z_gzflush
+# define gzgetc z_gzgetc
+# define gzgetc_ z_gzgetc_
+# define gzgets z_gzgets
+# define gzoffset z_gzoffset
+# define gzoffset64 z_gzoffset64
+# define gzopen z_gzopen
+# define gzopen64 z_gzopen64
+# ifdef _WIN32
+# define gzopen_w z_gzopen_w
+# endif
+# define gzprintf z_gzprintf
+# define gzputc z_gzputc
+# define gzputs z_gzputs
+# define gzread z_gzread
+# define gzrewind z_gzrewind
+# define gzseek z_gzseek
+# define gzseek64 z_gzseek64
+# define gzsetparams z_gzsetparams
+# define gztell z_gztell
+# define gztell64 z_gztell64
+# define gzungetc z_gzungetc
+# define gzwrite z_gzwrite
+# endif
+# define inflate z_inflate
+# define inflateBack z_inflateBack
+# define inflateBackEnd z_inflateBackEnd
+# define inflateBackInit_ z_inflateBackInit_
+# define inflateCopy z_inflateCopy
+# define inflateEnd z_inflateEnd
+# define inflateGetHeader z_inflateGetHeader
+# define inflateInit2_ z_inflateInit2_
+# define inflateInit_ z_inflateInit_
+# define inflateMark z_inflateMark
+# define inflatePrime z_inflatePrime
+# define inflateReset z_inflateReset
+# define inflateReset2 z_inflateReset2
+# define inflateSetDictionary z_inflateSetDictionary
+# define inflateSync z_inflateSync
+# define inflateSyncPoint z_inflateSyncPoint
+# define inflateUndermine z_inflateUndermine
+# define inflateResetKeep z_inflateResetKeep
+# define inflate_copyright z_inflate_copyright
+# define inflate_fast z_inflate_fast
+# define inflate_table z_inflate_table
+# ifndef Z_SOLO
+# define uncompress z_uncompress
+# endif
+# define zError z_zError
+# ifndef Z_SOLO
+# define zcalloc z_zcalloc
+# define zcfree z_zcfree
+# endif
+# define zlibCompileFlags z_zlibCompileFlags
+# define zlibVersion z_zlibVersion
+
+/* all zlib typedefs in zlib.h and zconf.h */
+# define Byte z_Byte
+# define Bytef z_Bytef
+# define alloc_func z_alloc_func
+# define charf z_charf
+# define free_func z_free_func
+# ifndef Z_SOLO
+# define gzFile z_gzFile
+# endif
+# define gz_header z_gz_header
+# define gz_headerp z_gz_headerp
+# define in_func z_in_func
+# define intf z_intf
+# define out_func z_out_func
+# define uInt z_uInt
+# define uIntf z_uIntf
+# define uLong z_uLong
+# define uLongf z_uLongf
+# define voidp z_voidp
+# define voidpc z_voidpc
+# define voidpf z_voidpf
+
+/* all zlib structs in zlib.h and zconf.h */
+# define gz_header_s z_gz_header_s
+# define internal_state z_internal_state
+
+#endif
+
+#if defined(__MSDOS__) && !defined(MSDOS)
+# define MSDOS
+#endif
+#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
+# define OS2
+#endif
+#if defined(_WINDOWS) && !defined(WINDOWS)
+# define WINDOWS
+#endif
+#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
+# ifndef WIN32
+# define WIN32
+# endif
+#endif
+#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
+# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
+# ifndef SYS16BIT
+# define SYS16BIT
+# endif
+# endif
+#endif
+
+/*
+ * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
+ * than 64k bytes at a time (needed on systems with 16-bit int).
+ */
+#ifdef SYS16BIT
+# define MAXSEG_64K
+#endif
+#ifdef MSDOS
+# define UNALIGNED_OK
+#endif
+
+#ifdef __STDC_VERSION__
+# ifndef STDC
+# define STDC
+# endif
+# if __STDC_VERSION__ >= 199901L
+# ifndef STDC99
+# define STDC99
+# endif
+# endif
+#endif
+#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
+# define STDC
+#endif
+#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
+# define STDC
+#endif
+#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
+# define STDC
+#endif
+#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
+# define STDC
+#endif
+
+#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */
+# define STDC
+#endif
+
+#ifndef STDC
+# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
+# define const /* note: need a more gentle solution here */
+# endif
+#endif
+
+#if defined(ZLIB_CONST) && !defined(z_const)
+# define z_const const
+#else
+# define z_const
+#endif
+
+/* Some Mac compilers merge all .h files incorrectly: */
+#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
+# define NO_DUMMY_DECL
+#endif
+
+/* Maximum value for memLevel in deflateInit2 */
+#ifndef MAX_MEM_LEVEL
+# ifdef MAXSEG_64K
+# define MAX_MEM_LEVEL 8
+# else
+# define MAX_MEM_LEVEL 9
+# endif
+#endif
+
+/* Maximum value for windowBits in deflateInit2 and inflateInit2.
+ * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
+ * created by gzip. (Files created by minigzip can still be extracted by
+ * gzip.)
+ */
+#ifndef MAX_WBITS
+# define MAX_WBITS 15 /* 32K LZ77 window */
+#endif
+
+/* The memory requirements for deflate are (in bytes):
+ (1 << (windowBits+2)) + (1 << (memLevel+9))
+ that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
+ plus a few kilobytes for small objects. For example, if you want to reduce
+ the default memory requirements from 256K to 128K, compile with
+ make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
+ Of course this will generally degrade compression (there's no free lunch).
+
+ The memory requirements for inflate are (in bytes) 1 << windowBits
+ that is, 32K for windowBits=15 (default value) plus a few kilobytes
+ for small objects.
+*/
+
+ /* Type declarations */
+
+#ifndef OF /* function prototypes */
+# ifdef STDC
+# define OF(args) args
+# else
+# define OF(args) ()
+# endif
+#endif
+
+#ifndef Z_ARG /* function prototypes for stdarg */
+# if defined(STDC) || defined(Z_HAVE_STDARG_H)
+# define Z_ARG(args) args
+# else
+# define Z_ARG(args) ()
+# endif
+#endif
+
+/* The following definitions for FAR are needed only for MSDOS mixed
+ * model programming (small or medium model with some far allocations).
+ * This was tested only with MSC; for other MSDOS compilers you may have
+ * to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
+ * just define FAR to be empty.
+ */
+#ifdef SYS16BIT
+# if defined(M_I86SM) || defined(M_I86MM)
+ /* MSC small or medium model */
+# define SMALL_MEDIUM
+# ifdef _MSC_VER
+# define FAR _far
+# else
+# define FAR far
+# endif
+# endif
+# if (defined(__SMALL__) || defined(__MEDIUM__))
+ /* Turbo C small or medium model */
+# define SMALL_MEDIUM
+# ifdef __BORLANDC__
+# define FAR _far
+# else
+# define FAR far
+# endif
+# endif
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+ /* If building or using zlib as a DLL, define ZLIB_DLL.
+ * This is not mandatory, but it offers a little performance increase.
+ */
+# ifdef ZLIB_DLL
+# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
+# ifdef ZLIB_INTERNAL
+# define ZEXTERN extern __declspec(dllexport)
+# else
+# define ZEXTERN extern __declspec(dllimport)
+# endif
+# endif
+# endif /* ZLIB_DLL */
+ /* If building or using zlib with the WINAPI/WINAPIV calling convention,
+ * define ZLIB_WINAPI.
+ * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
+ */
+# ifdef ZLIB_WINAPI
+# ifdef FAR
+# undef FAR
+# endif
+# include <windows.h>
+ /* No need for _export, use ZLIB.DEF instead. */
+ /* For complete Windows compatibility, use WINAPI, not __stdcall. */
+# define ZEXPORT WINAPI
+# ifdef WIN32
+# define ZEXPORTVA WINAPIV
+# else
+# define ZEXPORTVA FAR CDECL
+# endif
+# endif
+#endif
+
+#if defined (__BEOS__)
+# ifdef ZLIB_DLL
+# ifdef ZLIB_INTERNAL
+# define ZEXPORT __declspec(dllexport)
+# define ZEXPORTVA __declspec(dllexport)
+# else
+# define ZEXPORT __declspec(dllimport)
+# define ZEXPORTVA __declspec(dllimport)
+# endif
+# endif
+#endif
+
+#ifndef ZEXTERN
+# define ZEXTERN extern
+#endif
+#ifndef ZEXPORT
+# define ZEXPORT
+#endif
+#ifndef ZEXPORTVA
+# define ZEXPORTVA
+#endif
+
+#ifndef FAR
+# define FAR
+#endif
+
+#if !defined(__MACTYPES__)
+typedef unsigned char Byte; /* 8 bits */
+#endif
+typedef unsigned int uInt; /* 16 bits or more */
+typedef unsigned long uLong; /* 32 bits or more */
+
+#ifdef SMALL_MEDIUM
+ /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
+# define Bytef Byte FAR
+#else
+ typedef Byte FAR Bytef;
+#endif
+typedef char FAR charf;
+typedef int FAR intf;
+typedef uInt FAR uIntf;
+typedef uLong FAR uLongf;
+
+#ifdef STDC
+ typedef void const *voidpc;
+ typedef void FAR *voidpf;
+ typedef void *voidp;
+#else
+ typedef Byte const *voidpc;
+ typedef Byte FAR *voidpf;
+ typedef Byte *voidp;
+#endif
+
+/* ./configure may #define Z_U4 here */
+
+#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
+# include <limits.h>
+# if (UINT_MAX == 0xffffffffUL)
+# define Z_U4 unsigned
+# else
+# if (ULONG_MAX == 0xffffffffUL)
+# define Z_U4 unsigned long
+# else
+# if (USHRT_MAX == 0xffffffffUL)
+# define Z_U4 unsigned short
+# endif
+# endif
+# endif
+#endif
+
+#ifdef Z_U4
+ typedef Z_U4 z_crc_t;
+#else
+ typedef unsigned long z_crc_t;
+#endif
+
+#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */
+# define Z_HAVE_UNISTD_H
+#endif
+
+#ifdef HAVE_STDARG_H /* may be set to #if 1 by ./configure */
+# define Z_HAVE_STDARG_H
+#endif
+
+#ifdef STDC
+# ifndef Z_SOLO
+# include <sys/types.h> /* for off_t */
+# endif
+#endif
+
+#ifdef _WIN32
+# include <stddef.h> /* for wchar_t */
+#endif
+
+/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
+ * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
+ * though the former does not conform to the LFS document), but considering
+ * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
+ * equivalently requesting no 64-bit operations
+ */
+#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
+# undef _LARGEFILE64_SOURCE
+#endif
+
+#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
+# define Z_HAVE_UNISTD_H
+#endif
+#ifndef Z_SOLO
+# if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE)
+# include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
+# ifdef VMS
+# include <unixio.h> /* for off_t */
+# endif
+# ifndef z_off_t
+# define z_off_t off_t
+# endif
+# endif
+#endif
+
+#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
+# define Z_LFS64
+#endif
+
+#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
+# define Z_LARGE64
+#endif
+
+#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
+# define Z_WANT64
+#endif
+
+#if !defined(SEEK_SET) && !defined(Z_SOLO)
+# define SEEK_SET 0 /* Seek from beginning of file. */
+# define SEEK_CUR 1 /* Seek from current position. */
+# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */
+#endif
+
+#ifndef z_off_t
+# define z_off_t long
+#endif
+
+#if !defined(_WIN32) && defined(Z_LARGE64)
+# define z_off64_t off64_t
+#else
+# if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
+# define z_off64_t __int64
+# else
+# define z_off64_t z_off_t
+# endif
+#endif
+
+/* MVS linker does not support external names larger than 8 bytes */
+#if defined(__MVS__)
+ #pragma map(deflateInit_,"DEIN")
+ #pragma map(deflateInit2_,"DEIN2")
+ #pragma map(deflateEnd,"DEEND")
+ #pragma map(deflateBound,"DEBND")
+ #pragma map(inflateInit_,"ININ")
+ #pragma map(inflateInit2_,"ININ2")
+ #pragma map(inflateEnd,"INEND")
+ #pragma map(inflateSync,"INSY")
+ #pragma map(inflateSetDictionary,"INSEDI")
+ #pragma map(compressBound,"CMBND")
+ #pragma map(inflate_table,"INTABL")
+ #pragma map(inflate_fast,"INFA")
+ #pragma map(inflate_copyright,"INCOPY")
+#endif
+
+#endif /* ZCONF_H */

smplayer-0.8.1.tar.bz2/zlib/zconf.h.in Added

smplayer-0.8.1.tar.bz2/zlib/zlib.3 Added

@@ -0,0 +1,151 @@
+.TH ZLIB 3 "2 May 2012"
+.SH NAME
+zlib \- compression/decompression library
+.SH SYNOPSIS
+see
+.I zlib.h
+for full description
+.SH DESCRIPTION
+The
+.I zlib
+library is a general purpose data compression library.
+The code is thread safe, assuming that the standard library functions
+used are thread safe, such as memory allocation routines.
+It provides in-memory compression and decompression functions,
+including integrity checks of the uncompressed data.
+This version of the library supports only one compression method (deflation)
+but other algorithms may be added later
+with the same stream interface.
+.LP
+Compression can be done in a single step if the buffers are large enough
+or can be done by repeated calls of the compression function.
+In the latter case,
+the application must provide more input and/or consume the output
+(providing more output space) before each call.
+.LP
+The library also supports reading and writing files in
+.IR gzip (1)
+(.gz) format
+with an interface similar to that of stdio.
+.LP
+The library does not install any signal handler.
+The decoder checks the consistency of the compressed data,
+so the library should never crash even in the case of corrupted input.
+.LP
+All functions of the compression library are documented in the file
+.IR zlib.h .
+The distribution source includes examples of use of the library
+in the files
+.I test/example.c
+and
+.IR test/minigzip.c,
+as well as other examples in the
+.IR examples/
+directory.
+.LP
+Changes to this version are documented in the file
+.I ChangeLog
+that accompanies the source.
+.LP
+.I zlib
+is available in Java using the java.util.zip package:
+.IP
+http://java.sun.com/developer/technicalArticles/Programming/compression/
+.LP
+A Perl interface to
+.IR zlib ,
+written by Paul Marquess (pmqs@cpan.org),
+is available at CPAN (Comprehensive Perl Archive Network) sites,
+including:
+.IP
+http://search.cpan.org/~pmqs/IO-Compress-Zlib/
+.LP
+A Python interface to
+.IR zlib ,
+written by A.M. Kuchling (amk@magnet.com),
+is available in Python 1.5 and later versions:
+.IP
+http://docs.python.org/library/zlib.html
+.LP
+.I zlib
+is built into
+.IR tcl:
+.IP
+http://wiki.tcl.tk/4610
+.LP
+An experimental package to read and write files in .zip format,
+written on top of
+.I zlib
+by Gilles Vollant (info@winimage.com),
+is available at:
+.IP
+http://www.winimage.com/zLibDll/minizip.html
+and also in the
+.I contrib/minizip
+directory of the main
+.I zlib
+source distribution.
+.SH "SEE ALSO"
+The
+.I zlib
+web site can be found at:
+.IP
+http://zlib.net/
+.LP
+The data format used by the zlib library is described by RFC
+(Request for Comments) 1950 to 1952 in the files:
+.IP
+http://tools.ietf.org/html/rfc1950 (for the zlib header and trailer format)
+.br
+http://tools.ietf.org/html/rfc1951 (for the deflate compressed data format)
+.br
+http://tools.ietf.org/html/rfc1952 (for the gzip header and trailer format)
+.LP
+Mark Nelson wrote an article about
+.I zlib
+for the Jan. 1997 issue of  Dr. Dobb's Journal;
+a copy of the article is available at:
+.IP
+http://marknelson.us/1997/01/01/zlib-engine/
+.SH "REPORTING PROBLEMS"
+Before reporting a problem,
+please check the
+.I zlib
+web site to verify that you have the latest version of
+.IR zlib ;
+otherwise,
+obtain the latest version and see if the problem still exists.
+Please read the
+.I zlib
+FAQ at:
+.IP
+http://zlib.net/zlib_faq.html
+.LP
+before asking for help.
+Send questions and/or comments to zlib@gzip.org,
+or (for the Windows DLL version) to Gilles Vollant (info@winimage.com).
+.SH AUTHORS
+Version 1.2.7
+Copyright (C) 1995-2012 Jean-loup Gailly (jloup@gzip.org)
+and Mark Adler (madler@alumni.caltech.edu).
+.LP
+This software is provided "as-is,"
+without any express or implied warranty.
+In no event will the authors be held liable for any damages
+arising from the use of this software.
+See the distribution directory with respect to requirements
+governing redistribution.
+The deflate format used by
+.I zlib
+was defined by Phil Katz.
+The deflate and
+.I zlib
+specifications were written by L. Peter Deutsch.
+Thanks to all the people who reported problems and suggested various
+improvements in
+.IR zlib ;
+who are too numerous to cite here.
+.LP
+UNIX manual page by R. P. C. Rodgers,
+U.S. National Library of Medicine (rodgers@nlm.nih.gov).
+.\" end of man page

smplayer-0.8.1.tar.bz2/zlib/zlib.3.pdf Added

smplayer-0.8.1.tar.bz2/zlib/zlib.h Added

@@ -0,0 +1,1744 @@
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+ version 1.2.7, May 2nd, 2012
+
+ Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly Mark Adler
+ jloup@gzip.org madler@alumni.caltech.edu
+
+
+ The data format used by the zlib library is described by RFCs (Request for
+ Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+ (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
+*/
+
+#ifndef ZLIB_H
+#define ZLIB_H
+
+#include "zconf.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ZLIB_VERSION "1.2.7"
+#define ZLIB_VERNUM 0x1270
+#define ZLIB_VER_MAJOR 1
+#define ZLIB_VER_MINOR 2
+#define ZLIB_VER_REVISION 7
+#define ZLIB_VER_SUBREVISION 0
+
+/*
+ The 'zlib' compression library provides in-memory compression and
+ decompression functions, including integrity checks of the uncompressed data.
+ This version of the library supports only one compression method (deflation)
+ but other algorithms will be added later and will have the same stream
+ interface.
+
+ Compression can be done in a single step if the buffers are large enough,
+ or can be done by repeated calls of the compression function. In the latter
+ case, the application must provide more input and/or consume the output
+ (providing more output space) before each call.
+
+ The compressed data format used by default by the in-memory functions is
+ the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+ around a deflate stream, which is itself documented in RFC 1951.
+
+ The library also supports reading and writing files in gzip (.gz) format
+ with an interface similar to that of stdio using the functions that start
+ with "gz". The gzip format is different from the zlib format. gzip is a
+ gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
+
+ This library can optionally read and write gzip streams in memory as well.
+
+ The zlib format was designed to be compact and fast for use in memory
+ and on communications channels. The gzip format was designed for single-
+ file compression on file systems, has a larger header than zlib to maintain
+ directory information, and uses a different, slower check method than zlib.
+
+ The library does not install any signal handler. The decoder checks
+ the consistency of the compressed data, so the library should never crash
+ even in case of corrupted input.
+*/
+
+typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
+typedef void (*free_func) OF((voidpf opaque, voidpf address));
+
+struct internal_state;
+
+typedef struct z_stream_s {
+ z_const Bytef *next_in; /* next input byte */
+ uInt avail_in; /* number of bytes available at next_in */
+ uLong total_in; /* total number of input bytes read so far */
+
+ Bytef *next_out; /* next output byte should be put there */
+ uInt avail_out; /* remaining free space at next_out */
+ uLong total_out; /* total number of bytes output so far */
+
+ z_const char *msg; /* last error message, NULL if no error */
+ struct internal_state FAR *state; /* not visible by applications */
+
+ alloc_func zalloc; /* used to allocate the internal state */
+ free_func zfree; /* used to free the internal state */
+ voidpf opaque; /* private data object passed to zalloc and zfree */
+
+ int data_type; /* best guess about the data type: binary or text */
+ uLong adler; /* adler32 value of the uncompressed data */
+ uLong reserved; /* reserved for future use */
+} z_stream;
+
+typedef z_stream FAR *z_streamp;
+
+/*
+ gzip header information passed to and from zlib routines. See RFC 1952
+ for more details on the meanings of these fields.
+*/
+typedef struct gz_header_s {
+ int text; /* true if compressed data believed to be text */
+ uLong time; /* modification time */
+ int xflags; /* extra flags (not used when writing a gzip file) */
+ int os; /* operating system */
+ Bytef *extra; /* pointer to extra field or Z_NULL if none */
+ uInt extra_len; /* extra field length (valid if extra != Z_NULL) */
+ uInt extra_max; /* space at extra (only when reading header) */
+ Bytef *name; /* pointer to zero-terminated file name or Z_NULL */
+ uInt name_max; /* space at name (only when reading header) */
+ Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */
+ uInt comm_max; /* space at comment (only when reading header) */
+ int hcrc; /* true if there was or will be a header crc */
+ int done; /* true when done reading gzip header (not used
+ when writing a gzip file) */
+} gz_header;
+
+typedef gz_header FAR *gz_headerp;
+
+/*
+ The application must update next_in and avail_in when avail_in has dropped
+ to zero. It must update next_out and avail_out when avail_out has dropped
+ to zero. The application must initialize zalloc, zfree and opaque before
+ calling the init function. All other fields are set by the compression
+ library and must not be updated by the application.
+
+ The opaque value provided by the application will be passed as the first
+ parameter for calls of zalloc and zfree. This can be useful for custom
+ memory management. The compression library attaches no meaning to the
+ opaque value.
+
+ zalloc must return Z_NULL if there is not enough memory for the object.
+ If zlib is used in a multi-threaded application, zalloc and zfree must be
+ thread safe.
+
+ On 16-bit systems, the functions zalloc and zfree must be able to allocate
+ exactly 65536 bytes, but will not be required to allocate more than this if
+ the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, pointers
+ returned by zalloc for objects of exactly 65536 bytes *must* have their
+ offset normalized to zero. The default allocation function provided by this
+ library ensures this (see zutil.c). To reduce memory requirements and avoid
+ any allocation of 64K objects, at the expense of compression ratio, compile
+ the library with -DMAX_WBITS=14 (see zconf.h).
+
+ The fields total_in and total_out can be used for statistics or progress
+ reports. After compression, total_in holds the total size of the
+ uncompressed data and may be saved for use in the decompressor (particularly
+ if the decompressor wants to decompress everything in a single step).
+*/
+
+ /* constants */
+
+#define Z_NO_FLUSH 0
+#define Z_PARTIAL_FLUSH 1
+#define Z_SYNC_FLUSH 2
+#define Z_FULL_FLUSH 3
+#define Z_FINISH 4
+#define Z_BLOCK 5
+#define Z_TREES 6
+/* Allowed flush values; see deflate() and inflate() below for details */
+
+#define Z_OK 0
+#define Z_STREAM_END 1
+#define Z_NEED_DICT 2
+#define Z_ERRNO (-1)
+#define Z_STREAM_ERROR (-2)
+#define Z_DATA_ERROR (-3)
+#define Z_MEM_ERROR (-4)
+#define Z_BUF_ERROR (-5)
+#define Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative values
+ * are errors, positive values are used for special but normal events.
+ */
+
+#define Z_NO_COMPRESSION 0
+#define Z_BEST_SPEED 1
+#define Z_BEST_COMPRESSION 9
+#define Z_DEFAULT_COMPRESSION (-1)
+/* compression levels */
+
+#define Z_FILTERED 1
+#define Z_HUFFMAN_ONLY 2
+#define Z_RLE 3
+#define Z_FIXED 4
+#define Z_DEFAULT_STRATEGY 0
+/* compression strategy; see deflateInit2() below for details */
+
+#define Z_BINARY 0
+#define Z_TEXT 1
+#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */
+#define Z_UNKNOWN 2
+/* Possible values of the data_type field (though see inflate()) */
+
+#define Z_DEFLATED 8
+/* The deflate compression method (the only one supported in this version) */
+
+#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */
+
+#define zlib_version zlibVersion()
+/* for compatibility with versions < 1.0.2 */
+
+
+ /* basic functions */
+
+ZEXTERN const char * ZEXPORT zlibVersion OF((void));
+/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
+ If the first character differs, the library code actually used is not
+ compatible with the zlib.h header file used by the application. This check
+ is automatically made by deflateInit and inflateInit.
+ */
+
+/*
+ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
+
+ Initializes the internal stream state for compression. The fields
+ zalloc, zfree and opaque must be initialized before by the caller. If
+ zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
+ allocation functions.
+
+ The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
+ 1 gives best speed, 9 gives best compression, 0 gives no compression at all
+ (the input data is simply copied a block at a time). Z_DEFAULT_COMPRESSION
+ requests a default compromise between speed and compression (currently
+ equivalent to level 6).
+
+ deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_STREAM_ERROR if level is not a valid compression level, or
+ Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
+ with the version assumed by the caller (ZLIB_VERSION). msg is set to null
+ if there is no error message. deflateInit does not perform any compression:
+ this will be done by deflate().
+*/
+
+
+ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
+/*
+ deflate compresses as much data as possible, and stops when the input
+ buffer becomes empty or the output buffer becomes full. It may introduce
+ some output latency (reading input without producing any output) except when
+ forced to flush.
+
+ The detailed semantics are as follows. deflate performs one or both of the
+ following actions:
+
+ - Compress more input starting at next_in and update next_in and avail_in
+ accordingly. If not all input can be processed (because there is not
+ enough room in the output buffer), next_in and avail_in are updated and
+ processing will resume at this point for the next call of deflate().
+
+ - Provide more output starting at next_out and update next_out and avail_out
+ accordingly. This action is forced if the parameter flush is non zero.
+ Forcing flush frequently degrades the compression ratio, so this parameter
+ should be set only when necessary (in interactive applications). Some
+ output may be provided even if flush is not set.
+
+ Before the call of deflate(), the application should ensure that at least
+ one of the actions is possible, by providing more input and/or consuming more
+ output, and updating avail_in or avail_out accordingly; avail_out should
+ never be zero before the call. The application can consume the compressed
+ output when it wants, for example when the output buffer is full (avail_out
+ == 0), or after each call of deflate(). If deflate returns Z_OK and with
+ zero avail_out, it must be called again after making room in the output
+ buffer because there might be more output pending.
+
+ Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
+ decide how much data to accumulate before producing output, in order to
+ maximize compression.
+
+ If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
+ flushed to the output buffer and the output is aligned on a byte boundary, so
+ that the decompressor can get all input data available so far. (In
+ particular avail_in is zero after the call if enough output space has been
+ provided before the call.) Flushing may degrade compression for some
+ compression algorithms and so it should be used only when necessary. This
+ completes the current deflate block and follows it with an empty stored block
+ that is three bits plus filler bits to the next byte, followed by four bytes
+ (00 00 ff ff).
+
+ If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
+ output buffer, but the output is not aligned to a byte boundary. All of the
+ input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
+ This completes the current deflate block and follows it with an empty fixed
+ codes block that is 10 bits long. This assures that enough bytes are output
+ in order for the decompressor to finish the block before the empty fixed code
+ block.
+
+ If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
+ for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
+ seven bits of the current block are held to be written as the next byte after
+ the next deflate block is completed. In this case, the decompressor may not
+ be provided enough bits at this point in order to complete decompression of
+ the data provided so far to the compressor. It may need to wait for the next
+ block to be emitted. This is for advanced applications that need to control
+ the emission of deflate blocks.
+
+ If flush is set to Z_FULL_FLUSH, all output is flushed as with
+ Z_SYNC_FLUSH, and the compression state is reset so that decompression can
+ restart from this point if previous compressed data has been damaged or if
+ random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
+ compression.
+
+ If deflate returns with avail_out == 0, this function must be called again
+ with the same value of the flush parameter and more output space (updated
+ avail_out), until the flush is complete (deflate returns with non-zero
+ avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
+ avail_out is greater than six to avoid repeated flush markers due to
+ avail_out == 0 on return.
+
+ If the parameter flush is set to Z_FINISH, pending input is processed,
+ pending output is flushed and deflate returns with Z_STREAM_END if there was
+ enough output space; if deflate returns with Z_OK, this function must be
+ called again with Z_FINISH and more output space (updated avail_out) but no
+ more input data, until it returns with Z_STREAM_END or an error. After
+ deflate has returned Z_STREAM_END, the only possible operations on the stream
+ are deflateReset or deflateEnd.
+
+ Z_FINISH can be used immediately after deflateInit if all the compression
+ is to be done in a single step. In this case, avail_out must be at least the
+ value returned by deflateBound (see below). Then deflate is guaranteed to
+ return Z_STREAM_END. If not enough output space is provided, deflate will
+ not return Z_STREAM_END, and it must be called again as described above.
+
+ deflate() sets strm->adler to the adler32 checksum of all input read
+ so far (that is, total_in bytes).
+
+ deflate() may update strm->data_type if it can make a good guess about
+ the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered
+ binary. This field is only for information purposes and does not affect the
+ compression algorithm in any manner.
+
+ deflate() returns Z_OK if some progress has been made (more input
+ processed or more output produced), Z_STREAM_END if all input has been
+ consumed and all output has been produced (only when flush is set to
+ Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
+ if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
+ (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not
+ fatal, and deflate() can be called again with more input and more output
+ space to continue compressing.
+*/
+
+
+ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
+/*
+ All dynamically allocated data structures for this stream are freed.
+ This function discards any unprocessed input and does not flush any pending
+ output.
+
+ deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
+ stream state was inconsistent, Z_DATA_ERROR if the stream was freed
+ prematurely (some input or output was discarded). In the error case, msg
+ may be set but then points to a static string (which must not be
+ deallocated).
+*/
+
+
+/*
+ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
+
+ Initializes the internal stream state for decompression. The fields
+ next_in, avail_in, zalloc, zfree and opaque must be initialized before by
+ the caller. If next_in is not Z_NULL and avail_in is large enough (the
+ exact value depends on the compression method), inflateInit determines the
+ compression method from the zlib header and allocates all data structures
+ accordingly; otherwise the allocation will be deferred to the first call of
+ inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to
+ use default allocation functions.
+
+ inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+ version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+ invalid, such as a null pointer to the structure. msg is set to null if
+ there is no error message. inflateInit does not perform any decompression
+ apart from possibly reading the zlib header if present: actual decompression
+ will be done by inflate(). (So next_in and avail_in may be modified, but
+ next_out and avail_out are unused and unchanged.) The current implementation
+ of inflateInit() does not process any header information -- that is deferred
+ until inflate() is called.
+*/
+
+
+ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
+/*
+ inflate decompresses as much data as possible, and stops when the input
+ buffer becomes empty or the output buffer becomes full. It may introduce
+ some output latency (reading input without producing any output) except when
+ forced to flush.
+
+ The detailed semantics are as follows. inflate performs one or both of the
+ following actions:
+
+ - Decompress more input starting at next_in and update next_in and avail_in
+ accordingly. If not all input can be processed (because there is not
+ enough room in the output buffer), next_in is updated and processing will
+ resume at this point for the next call of inflate().
+
+ - Provide more output starting at next_out and update next_out and avail_out
+ accordingly. inflate() provides as much output as possible, until there is
+ no more input data or no more space in the output buffer (see below about
+ the flush parameter).
+
+ Before the call of inflate(), the application should ensure that at least
+ one of the actions is possible, by providing more input and/or consuming more
+ output, and updating the next_* and avail_* values accordingly. The
+ application can consume the uncompressed output when it wants, for example
+ when the output buffer is full (avail_out == 0), or after each call of
+ inflate(). If inflate returns Z_OK and with zero avail_out, it must be
+ called again after making room in the output buffer because there might be
+ more output pending.
+
+ The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
+ Z_BLOCK, or Z_TREES. Z_SYNC_FLUSH requests that inflate() flush as much
+ output as possible to the output buffer. Z_BLOCK requests that inflate()
+ stop if and when it gets to the next deflate block boundary. When decoding
+ the zlib or gzip format, this will cause inflate() to return immediately
+ after the header and before the first block. When doing a raw inflate,
+ inflate() will go ahead and process the first block, and will return when it
+ gets to the end of that block, or when it runs out of data.
+
+ The Z_BLOCK option assists in appending to or combining deflate streams.
+ Also to assist in this, on return inflate() will set strm->data_type to the
+ number of unused bits in the last byte taken from strm->next_in, plus 64 if
+ inflate() is currently decoding the last block in the deflate stream, plus
+ 128 if inflate() returned immediately after decoding an end-of-block code or
+ decoding the complete header up to just before the first byte of the deflate
+ stream. The end-of-block will not be indicated until all of the uncompressed
+ data from that block has been written to strm->next_out. The number of
+ unused bits may in general be greater than seven, except when bit 7 of
+ data_type is set, in which case the number of unused bits will be less than
+ eight. data_type is set as noted here every time inflate() returns for all
+ flush options, and so can be used to determine the amount of currently
+ consumed input in bits.
+
+ The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
+ end of each deflate block header is reached, before any actual data in that
+ block is decoded. This allows the caller to determine the length of the
+ deflate block header for later use in random access within a deflate block.
+ 256 is added to the value of strm->data_type when inflate() returns
+ immediately after reaching the end of the deflate block header.
+
+ inflate() should normally be called until it returns Z_STREAM_END or an
+ error. However if all decompression is to be performed in a single step (a
+ single call of inflate), the parameter flush should be set to Z_FINISH. In
+ this case all pending input is processed and all pending output is flushed;
+ avail_out must be large enough to hold all of the uncompressed data for the
+ operation to complete. (The size of the uncompressed data may have been
+ saved by the compressor for this purpose.) The use of Z_FINISH is not
+ required to perform an inflation in one step. However it may be used to
+ inform inflate that a faster approach can be used for the single inflate()
+ call. Z_FINISH also informs inflate to not maintain a sliding window if the
+ stream completes, which reduces inflate's memory footprint. If the stream
+ does not complete, either because not all of the stream is provided or not
+ enough output space is provided, then a sliding window will be allocated and
+ inflate() can be called again to continue the operation as if Z_NO_FLUSH had
+ been used.
+
+ In this implementation, inflate() always flushes as much output as
+ possible to the output buffer, and always uses the faster approach on the
+ first call. So the effects of the flush parameter in this implementation are
+ on the return value of inflate() as noted below, when inflate() returns early
+ when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
+ memory for a sliding window when Z_FINISH is used.
+
+ If a preset dictionary is needed after this call (see inflateSetDictionary
+ below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
+ chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+ strm->adler to the Adler-32 checksum of all output produced so far (that is,
+ total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
+ below. At the end of the stream, inflate() checks that its computed adler32
+ checksum is equal to that saved by the compressor and returns Z_STREAM_END
+ only if the checksum is correct.
+
+ inflate() can decompress and check either zlib-wrapped or gzip-wrapped
+ deflate data. The header type is detected automatically, if requested when
+ initializing with inflateInit2(). Any information contained in the gzip
+ header is not retained, so applications that need that information should
+ instead use raw inflate, see inflateInit2() below, or inflateBack() and
+ perform their own processing of the gzip header and trailer. When processing
+ gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
+ producted so far. The CRC-32 is checked against the gzip trailer.
+
+ inflate() returns Z_OK if some progress has been made (more input processed
+ or more output produced), Z_STREAM_END if the end of the compressed data has
+ been reached and all uncompressed output has been produced, Z_NEED_DICT if a
+ preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
+ corrupted (input stream not conforming to the zlib format or incorrect check
+ value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
+ next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
+ Z_BUF_ERROR if no progress is possible or if there was not enough room in the
+ output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
+ inflate() can be called again with more input and more output space to
+ continue decompressing. If Z_DATA_ERROR is returned, the application may
+ then call inflateSync() to look for a good compression block if a partial
+ recovery of the data is desired.
+*/
+
+
+ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
+/*
+ All dynamically allocated data structures for this stream are freed.
+ This function discards any unprocessed input and does not flush any pending
+ output.
+
+ inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
+ was inconsistent. In the error case, msg may be set but then points to a
+ static string (which must not be deallocated).
+*/
+
+
+ /* Advanced functions */
+
+/*
+ The following functions are needed only in some special applications.
+*/
+
+/*
+ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
+ int level,
+ int method,
+ int windowBits,
+ int memLevel,
+ int strategy));
+
+ This is another version of deflateInit with more compression options. The
+ fields next_in, zalloc, zfree and opaque must be initialized before by the
+ caller.
+
+ The method parameter is the compression method. It must be Z_DEFLATED in
+ this version of the library.
+
+ The windowBits parameter is the base two logarithm of the window size
+ (the size of the history buffer). It should be in the range 8..15 for this
+ version of the library. Larger values of this parameter result in better
+ compression at the expense of memory usage. The default value is 15 if
+ deflateInit is used instead.
+
+ windowBits can also be -8..-15 for raw deflate. In this case, -windowBits
+ determines the window size. deflate() will then generate raw deflate data
+ with no zlib header or trailer, and will not compute an adler32 check value.
+
+ windowBits can also be greater than 15 for optional gzip encoding. Add
+ 16 to windowBits to write a simple gzip header and trailer around the
+ compressed data instead of a zlib wrapper. The gzip header will have no
+ file name, no extra data, no comment, no modification time (set to zero), no
+ header crc, and the operating system will be set to 255 (unknown). If a
+ gzip stream is being written, strm->adler is a crc32 instead of an adler32.
+
+ The memLevel parameter specifies how much memory should be allocated
+ for the internal compression state. memLevel=1 uses minimum memory but is
+ slow and reduces compression ratio; memLevel=9 uses maximum memory for
+ optimal speed. The default value is 8. See zconf.h for total memory usage
+ as a function of windowBits and memLevel.
+
+ The strategy parameter is used to tune the compression algorithm. Use the
+ value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
+ filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
+ string match), or Z_RLE to limit match distances to one (run-length
+ encoding). Filtered data consists mostly of small values with a somewhat
+ random distribution. In this case, the compression algorithm is tuned to
+ compress them better. The effect of Z_FILTERED is to force more Huffman
+ coding and less string matching; it is somewhat intermediate between
+ Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as
+ fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data. The
+ strategy parameter only affects the compression ratio but not the
+ correctness of the compressed output even if it is not set appropriately.
+ Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
+ decoder for special applications.
+
+ deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
+ method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
+ incompatible with the version assumed by the caller (ZLIB_VERSION). msg is
+ set to null if there is no error message. deflateInit2 does not perform any
+ compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
+ const Bytef *dictionary,
+ uInt dictLength));
+/*
+ Initializes the compression dictionary from the given byte sequence
+ without producing any compressed output. When using the zlib format, this
+ function must be called immediately after deflateInit, deflateInit2 or
+ deflateReset, and before any call of deflate. When doing raw deflate, this
+ function must be called either before any call of deflate, or immediately
+ after the completion of a deflate block, i.e. after all input has been
+ consumed and all output has been delivered when using any of the flush
+ options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH. The
+ compressor and decompressor must use exactly the same dictionary (see
+ inflateSetDictionary).
+
+ The dictionary should consist of strings (byte sequences) that are likely
+ to be encountered later in the data to be compressed, with the most commonly
+ used strings preferably put towards the end of the dictionary. Using a
+ dictionary is most useful when the data to be compressed is short and can be
+ predicted with good accuracy; the data can then be compressed better than
+ with the default empty dictionary.
+
+ Depending on the size of the compression data structures selected by
+ deflateInit or deflateInit2, a part of the dictionary may in effect be
+ discarded, for example if the dictionary is larger than the window size
+ provided in deflateInit or deflateInit2. Thus the strings most likely to be
+ useful should be put at the end of the dictionary, not at the front. In
+ addition, the current implementation of deflate will use at most the window
+ size minus 262 bytes of the provided dictionary.
+
+ Upon return of this function, strm->adler is set to the adler32 value
+ of the dictionary; the decompressor may later use this value to determine
+ which dictionary has been used by the compressor. (The adler32 value
+ applies to the whole dictionary even if only a subset of the dictionary is
+ actually used by the compressor.) If a raw deflate was requested, then the
+ adler32 value is not computed and strm->adler is not set.
+
+ deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
+ parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is
+ inconsistent (for example if deflate has already been called for this stream
+ or if not at a block boundary for raw deflate). deflateSetDictionary does
+ not perform any compression: this will be done by deflate().
+*/
+
+ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
+ z_streamp source));
+/*
+ Sets the destination stream as a complete copy of the source stream.
+
+ This function can be useful when several compression strategies will be
+ tried, for example when there are several ways of pre-processing the input
+ data with a filter. The streams that will be discarded should then be freed
+ by calling deflateEnd. Note that deflateCopy duplicates the internal
+ compression state which can be quite large, so this strategy is slow and can
+ consume lots of memory.
+
+ deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+ (such as zalloc being Z_NULL). msg is left unchanged in both source and
+ destination.
+*/
+
+ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
+/*
+ This function is equivalent to deflateEnd followed by deflateInit,
+ but does not free and reallocate all the internal compression state. The
+ stream will keep the same compression level and any other attributes that
+ may have been set by deflateInit2.
+
+ deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
+ int level,
+ int strategy));
+/*
+ Dynamically update the compression level and compression strategy. The
+ interpretation of level and strategy is as in deflateInit2. This can be
+ used to switch between compression and straight copy of the input data, or
+ to switch to a different kind of input data requiring a different strategy.
+ If the compression level is changed, the input available so far is
+ compressed with the old level (and may be flushed); the new level will take
+ effect only at the next call of deflate().
+
+ Before the call of deflateParams, the stream state must be set as for
+ a call of deflate(), since the currently available input may have to be
+ compressed and flushed. In particular, strm->avail_out must be non-zero.
+
+ deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
+ stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
+ strm->avail_out was zero.
+*/
+
+ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
+ int good_length,
+ int max_lazy,
+ int nice_length,
+ int max_chain));
+/*
+ Fine tune deflate's internal compression parameters. This should only be
+ used by someone who understands the algorithm used by zlib's deflate for
+ searching for the best matching string, and even then only by the most
+ fanatic optimizer trying to squeeze out the last compressed bit for their
+ specific input data. Read the deflate.c source code for the meaning of the
+ max_lazy, good_length, nice_length, and max_chain parameters.
+
+ deflateTune() can be called after deflateInit() or deflateInit2(), and
+ returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
+ */
+
+ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
+ uLong sourceLen));
+/*
+ deflateBound() returns an upper bound on the compressed size after
+ deflation of sourceLen bytes. It must be called after deflateInit() or
+ deflateInit2(), and after deflateSetHeader(), if used. This would be used
+ to allocate an output buffer for deflation in a single pass, and so would be
+ called before deflate(). If that first deflate() call is provided the
+ sourceLen input bytes, an output buffer allocated to the size returned by
+ deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
+ to return Z_STREAM_END. Note that it is possible for the compressed size to
+ be larger than the value returned by deflateBound() if flush options other
+ than Z_FINISH or Z_NO_FLUSH are used.
+*/
+
+ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
+ unsigned *pending,
+ int *bits));
+/*
+ deflatePending() returns the number of bytes and bits of output that have
+ been generated, but not yet provided in the available output. The bytes not
+ provided would be due to the available output space having being consumed.
+ The number of bits of output not provided are between 0 and 7, where they
+ await more bits to join them in order to fill out a full byte. If pending
+ or bits are Z_NULL, then those values are not set.
+
+ deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent.
+ */
+
+ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
+ int bits,
+ int value));
+/*
+ deflatePrime() inserts bits in the deflate output stream. The intent
+ is that this function is used to start off the deflate output with the bits
+ leftover from a previous deflate stream when appending to it. As such, this
+ function can only be used for raw deflate, and must be used before the first
+ deflate() call after a deflateInit2() or deflateReset(). bits must be less
+ than or equal to 16, and that many of the least significant bits of value
+ will be inserted in the output.
+
+ deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
+ room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
+ source stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
+ gz_headerp head));
+/*
+ deflateSetHeader() provides gzip header information for when a gzip
+ stream is requested by deflateInit2(). deflateSetHeader() may be called
+ after deflateInit2() or deflateReset() and before the first call of
+ deflate(). The text, time, os, extra field, name, and comment information
+ in the provided gz_header structure are written to the gzip header (xflag is
+ ignored -- the extra flags are set according to the compression level). The
+ caller must assure that, if not Z_NULL, name and comment are terminated with
+ a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
+ available there. If hcrc is true, a gzip header crc is included. Note that
+ the current versions of the command-line version of gzip (up through version
+ 1.3.x) do not support header crc's, and will report that it is a "multi-part
+ gzip file" and give up.
+
+ If deflateSetHeader is not used, the default gzip header has text false,
+ the time set to zero, and os set to 255, with no extra, name, or comment
+ fields. The gzip header is returned to the default state by deflateReset().
+
+ deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
+ int windowBits));
+
+ This is another version of inflateInit with an extra parameter. The
+ fields next_in, avail_in, zalloc, zfree and opaque must be initialized
+ before by the caller.
+
+ The windowBits parameter is the base two logarithm of the maximum window
+ size (the size of the history buffer). It should be in the range 8..15 for
+ this version of the library. The default value is 15 if inflateInit is used
+ instead. windowBits must be greater than or equal to the windowBits value
+ provided to deflateInit2() while compressing, or it must be equal to 15 if
+ deflateInit2() was not used. If a compressed stream with a larger window
+ size is given as input, inflate() will return with the error code
+ Z_DATA_ERROR instead of trying to allocate a larger window.
+
+ windowBits can also be zero to request that inflate use the window size in
+ the zlib header of the compressed stream.
+
+ windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
+ determines the window size. inflate() will then process raw deflate data,
+ not looking for a zlib or gzip header, not generating a check value, and not
+ looking for any check values for comparison at the end of the stream. This
+ is for use with other formats that use the deflate compressed data format
+ such as zip. Those formats provide their own check values. If a custom
+ format is developed using the raw deflate format for compressed data, it is
+ recommended that a check value such as an adler32 or a crc32 be applied to
+ the uncompressed data as is done in the zlib, gzip, and zip formats. For
+ most applications, the zlib format should be used as is. Note that comments
+ above on the use in deflateInit2() applies to the magnitude of windowBits.
+
+ windowBits can also be greater than 15 for optional gzip decoding. Add
+ 32 to windowBits to enable zlib and gzip decoding with automatic header
+ detection, or add 16 to decode only the gzip format (the zlib format will
+ return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a
+ crc32 instead of an adler32.
+
+ inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
+ version assumed by the caller, or Z_STREAM_ERROR if the parameters are
+ invalid, such as a null pointer to the structure. msg is set to null if
+ there is no error message. inflateInit2 does not perform any decompression
+ apart from possibly reading the zlib header if present: actual decompression
+ will be done by inflate(). (So next_in and avail_in may be modified, but
+ next_out and avail_out are unused and unchanged.) The current implementation
+ of inflateInit2() does not process any header information -- that is
+ deferred until inflate() is called.
+*/
+
+ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
+ const Bytef *dictionary,
+ uInt dictLength));
+/*
+ Initializes the decompression dictionary from the given uncompressed byte
+ sequence. This function must be called immediately after a call of inflate,
+ if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
+ can be determined from the adler32 value returned by that call of inflate.
+ The compressor and decompressor must use exactly the same dictionary (see
+ deflateSetDictionary). For raw inflate, this function can be called at any
+ time to set the dictionary. If the provided dictionary is smaller than the
+ window and there is already data in the window, then the provided dictionary
+ will amend what's there. The application must insure that the dictionary
+ that was used for compression is provided.
+
+ inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
+ parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is
+ inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
+ expected one (incorrect adler32 value). inflateSetDictionary does not
+ perform any decompression: this will be done by subsequent calls of
+ inflate().
+*/
+
+ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
+/*
+ Skips invalid compressed data until a possible full flush point (see above
+ for the description of deflate with Z_FULL_FLUSH) can be found, or until all
+ available input is skipped. No output is provided.
+
+ inflateSync searches for a 00 00 FF FF pattern in the compressed data.
+ All full flush points have this pattern, but not all occurences of this
+ pattern are full flush points.
+
+ inflateSync returns Z_OK if a possible full flush point has been found,
+ Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
+ has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
+ In the success case, the application may save the current current value of
+ total_in which indicates where valid compressed data was found. In the
+ error case, the application may repeatedly call inflateSync, providing more
+ input each time, until success or end of the input data.
+*/
+
+ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
+ z_streamp source));
+/*
+ Sets the destination stream as a complete copy of the source stream.
+
+ This function can be useful when randomly accessing a large stream. The
+ first pass through the stream can periodically record the inflate state,
+ allowing restarting inflate at those points when randomly accessing the
+ stream.
+
+ inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
+ (such as zalloc being Z_NULL). msg is left unchanged in both source and
+ destination.
+*/
+
+ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
+/*
+ This function is equivalent to inflateEnd followed by inflateInit,
+ but does not free and reallocate all the internal decompression state. The
+ stream will keep attributes that may have been set by inflateInit2.
+
+ inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent (such as zalloc or state being Z_NULL).
+*/
+
+ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
+ int windowBits));
+/*
+ This function is the same as inflateReset, but it also permits changing
+ the wrap and window size requests. The windowBits parameter is interpreted
+ the same as it is for inflateInit2.
+
+ inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent (such as zalloc or state being Z_NULL), or if
+ the windowBits parameter is invalid.
+*/
+
+ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
+ int bits,
+ int value));
+/*
+ This function inserts bits in the inflate input stream. The intent is
+ that this function is used to start inflating at a bit position in the
+ middle of a byte. The provided bits will be used before any bytes are used
+ from next_in. This function should only be used with raw inflate, and
+ should be used before the first inflate() call after inflateInit2() or
+ inflateReset(). bits must be less than or equal to 16, and that many of the
+ least significant bits of value will be inserted in the input.
+
+ If bits is negative, then the input stream bit buffer is emptied. Then
+ inflatePrime() can be called again to put bits in the buffer. This is used
+ to clear out bits leftover after feeding inflate a block description prior
+ to feeding inflate codes.
+
+ inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent.
+*/
+
+ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
+/*
+ This function returns two values, one in the lower 16 bits of the return
+ value, and the other in the remaining upper bits, obtained by shifting the
+ return value down 16 bits. If the upper value is -1 and the lower value is
+ zero, then inflate() is currently decoding information outside of a block.
+ If the upper value is -1 and the lower value is non-zero, then inflate is in
+ the middle of a stored block, with the lower value equaling the number of
+ bytes from the input remaining to copy. If the upper value is not -1, then
+ it is the number of bits back from the current bit position in the input of
+ the code (literal or length/distance pair) currently being processed. In
+ that case the lower value is the number of bytes already emitted for that
+ code.
+
+ A code is being processed if inflate is waiting for more input to complete
+ decoding of the code, or if it has completed decoding but is waiting for
+ more output space to write the literal or match data.
+
+ inflateMark() is used to mark locations in the input data for random
+ access, which may be at bit positions, and to note those cases where the
+ output of a code may span boundaries of random access blocks. The current
+ location in the input stream can be determined from avail_in and data_type
+ as noted in the description for the Z_BLOCK flush parameter for inflate.
+
+ inflateMark returns the value noted above or -1 << 16 if the provided
+ source stream state was inconsistent.
+*/
+
+ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
+ gz_headerp head));
+/*
+ inflateGetHeader() requests that gzip header information be stored in the
+ provided gz_header structure. inflateGetHeader() may be called after
+ inflateInit2() or inflateReset(), and before the first call of inflate().
+ As inflate() processes the gzip stream, head->done is zero until the header
+ is completed, at which time head->done is set to one. If a zlib stream is
+ being decoded, then head->done is set to -1 to indicate that there will be
+ no gzip header information forthcoming. Note that Z_BLOCK or Z_TREES can be
+ used to force inflate() to return immediately after header processing is
+ complete and before any actual data is decompressed.
+
+ The text, time, xflags, and os fields are filled in with the gzip header
+ contents. hcrc is set to true if there is a header CRC. (The header CRC
+ was valid if done is set to one.) If extra is not Z_NULL, then extra_max
+ contains the maximum number of bytes to write to extra. Once done is true,
+ extra_len contains the actual extra field length, and extra contains the
+ extra field, or that field truncated if extra_max is less than extra_len.
+ If name is not Z_NULL, then up to name_max characters are written there,
+ terminated with a zero unless the length is greater than name_max. If
+ comment is not Z_NULL, then up to comm_max characters are written there,
+ terminated with a zero unless the length is greater than comm_max. When any
+ of extra, name, or comment are not Z_NULL and the respective field is not
+ present in the header, then that field is set to Z_NULL to signal its
+ absence. This allows the use of deflateSetHeader() with the returned
+ structure to duplicate the header. However if those fields are set to
+ allocated memory, then the application will need to save those pointers
+ elsewhere so that they can be eventually freed.
+
+ If inflateGetHeader is not used, then the header information is simply
+ discarded. The header is always checked for validity, including the header
+ CRC if present. inflateReset() will reset the process to discard the header
+ information. The application would need to call inflateGetHeader() again to
+ retrieve the header from the next gzip stream.
+
+ inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
+ stream state was inconsistent.
+*/
+
+/*
+ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
+ unsigned char FAR *window));
+
+ Initialize the internal stream state for decompression using inflateBack()
+ calls. The fields zalloc, zfree and opaque in strm must be initialized
+ before the call. If zalloc and zfree are Z_NULL, then the default library-
+ derived memory allocation routines are used. windowBits is the base two
+ logarithm of the window size, in the range 8..15. window is a caller
+ supplied buffer of that size. Except for special applications where it is
+ assured that deflate was used with small window sizes, windowBits must be 15
+ and a 32K byte window must be supplied to be able to decompress general
+ deflate streams.
+
+ See inflateBack() for the usage of these routines.
+
+ inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
+ the parameters are invalid, Z_MEM_ERROR if the internal state could not be
+ allocated, or Z_VERSION_ERROR if the version of the library does not match
+ the version of the header file.
+*/
+
+typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *));
+typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
+
+ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
+ in_func in, void FAR *in_desc,
+ out_func out, void FAR *out_desc));
+/*
+ inflateBack() does a raw inflate with a single call using a call-back
+ interface for input and output. This is more efficient than inflate() for
+ file i/o applications in that it avoids copying between the output and the
+ sliding window by simply making the window itself the output buffer. This
+ function trusts the application to not change the output buffer passed by
+ the output function, at least until inflateBack() returns.
+
+ inflateBackInit() must be called first to allocate the internal state
+ and to initialize the state with the user-provided window buffer.
+ inflateBack() may then be used multiple times to inflate a complete, raw
+ deflate stream with each call. inflateBackEnd() is then called to free the
+ allocated state.
+
+ A raw deflate stream is one with no zlib or gzip header or trailer.
+ This routine would normally be used in a utility that reads zip or gzip
+ files and writes out uncompressed files. The utility would decode the
+ header and process the trailer on its own, hence this routine expects only
+ the raw deflate stream to decompress. This is different from the normal
+ behavior of inflate(), which expects either a zlib or gzip header and
+ trailer around the deflate stream.
+
+ inflateBack() uses two subroutines supplied by the caller that are then
+ called by inflateBack() for input and output. inflateBack() calls those
+ routines until it reads a complete deflate stream and writes out all of the
+ uncompressed data, or until it encounters an error. The function's
+ parameters and return types are defined above in the in_func and out_func
+ typedefs. inflateBack() will call in(in_desc, &buf) which should return the
+ number of bytes of provided input, and a pointer to that input in buf. If
+ there is no input available, in() must return zero--buf is ignored in that
+ case--and inflateBack() will return a buffer error. inflateBack() will call
+ out(out_desc, buf, len) to write the uncompressed data buf0..len-1. out()
+ should return zero on success, or non-zero on failure. If out() returns
+ non-zero, inflateBack() will return with an error. Neither in() nor out()
+ are permitted to change the contents of the window provided to
+ inflateBackInit(), which is also the buffer that out() uses to write from.
+ The length written by out() will be at most the window size. Any non-zero
+ amount of input may be provided by in().
+
+ For convenience, inflateBack() can be provided input on the first call by
+ setting strm->next_in and strm->avail_in. If that input is exhausted, then
+ in() will be called. Therefore strm->next_in must be initialized before
+ calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called
+ immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in
+ must also be initialized, and then if strm->avail_in is not zero, input will
+ initially be taken from strm->next_in0 .. strm->avail_in - 1.
+
+ The in_desc and out_desc parameters of inflateBack() is passed as the
+ first parameter of in() and out() respectively when they are called. These
+ descriptors can be optionally used to pass any information that the caller-
+ supplied in() and out() functions need to do their job.
+
+ On return, inflateBack() will set strm->next_in and strm->avail_in to
+ pass back any unused input that was provided by the last in() call. The
+ return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
+ if in() or out() returned an error, Z_DATA_ERROR if there was a format error
+ in the deflate stream (in which case strm->msg is set to indicate the nature
+ of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
+ In the case of Z_BUF_ERROR, an input or output error can be distinguished
+ using strm->next_in which will be Z_NULL only if in() returned an error. If
+ strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
+ non-zero. (in() will always be called before out(), so strm->next_in is
+ assured to be defined if out() returns non-zero.) Note that inflateBack()
+ cannot return Z_OK.
+*/
+
+ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
+/*
+ All memory allocated by inflateBackInit() is freed.
+
+ inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
+ state was inconsistent.
+*/
+
+ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
+/* Return flags indicating compile-time options.
+
+ Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
+ 1.0: size of uInt
+ 3.2: size of uLong
+ 5.4: size of voidpf (pointer)
+ 7.6: size of z_off_t
+
+ Compiler, assembler, and debug options:
+ 8: DEBUG
+ 9: ASMV or ASMINF -- use ASM code
+ 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
+ 11: 0 (reserved)
+
+ One-time table building (smaller code, but not thread-safe if true):
+ 12: BUILDFIXED -- build static block decoding tables when needed
+ 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
+ 14,15: 0 (reserved)
+
+ Library content (indicates missing functionality):
+ 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
+ deflate code when not needed)
+ 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
+ and decode gzip streams (to avoid linking crc code)
+ 18-19: 0 (reserved)
+
+ Operation variations (changes in library functionality):
+ 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
+ 21: FASTEST -- deflate algorithm with only one, lowest compression level
+ 22,23: 0 (reserved)
+
+ The sprintf variant used by gzprintf (zero is best):
+ 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
+ 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
+ 26: 0 = returns value, 1 = void -- 1 means inferred string length returned
+
+ Remainder:
+ 27-31: 0 (reserved)
+ */
+
+#ifndef Z_SOLO
+
+ /* utility functions */
+
+/*
+ The following utility functions are implemented on top of the basic
+ stream-oriented functions. To simplify the interface, some default options
+ are assumed (compression level and memory usage, standard memory allocation
+ functions). The source code of these utility functions can be modified if
+ you need special options.
+*/
+
+ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen));
+/*
+ Compresses the source buffer into the destination buffer. sourceLen is
+ the byte length of the source buffer. Upon entry, destLen is the total size
+ of the destination buffer, which must be at least the value returned by
+ compressBound(sourceLen). Upon exit, destLen is the actual size of the
+ compressed buffer.
+
+ compress returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_BUF_ERROR if there was not enough room in the output
+ buffer.
+*/
+
+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen,
+ int level));
+/*
+ Compresses the source buffer into the destination buffer. The level
+ parameter has the same meaning as in deflateInit. sourceLen is the byte
+ length of the source buffer. Upon entry, destLen is the total size of the
+ destination buffer, which must be at least the value returned by
+ compressBound(sourceLen). Upon exit, destLen is the actual size of the
+ compressed buffer.
+
+ compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+ Z_STREAM_ERROR if the level parameter is invalid.
+*/
+
+ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
+/*
+ compressBound() returns an upper bound on the compressed size after
+ compress() or compress2() on sourceLen bytes. It would be used before a
+ compress() or compress2() call to allocate the destination buffer.
+*/
+
+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen,
+ const Bytef *source, uLong sourceLen));
+/*
+ Decompresses the source buffer into the destination buffer. sourceLen is
+ the byte length of the source buffer. Upon entry, destLen is the total size
+ of the destination buffer, which must be large enough to hold the entire
+ uncompressed data. (The size of the uncompressed data must have been saved
+ previously by the compressor and transmitted to the decompressor by some
+ mechanism outside the scope of this compression library.) Upon exit, destLen
+ is the actual size of the uncompressed buffer.
+
+ uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+ enough memory, Z_BUF_ERROR if there was not enough room in the output
+ buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. In
+ the case where there is not enough room, uncompress() will fill the output
+ buffer with the uncompressed data up to that point.
+*/
+
+ /* gzip file access functions */
+
+/*
+ This library supports reading and writing files in gzip (.gz) format with
+ an interface similar to that of stdio, using the functions that start with
+ "gz". The gzip format is different from the zlib format. gzip is a gzip
+ wrapper, documented in RFC 1952, wrapped around a deflate stream.
+*/
+
+typedef struct gzFile_s *gzFile; /* semi-opaque gzip file descriptor */
+
+/*
+ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
+
+ Opens a gzip (.gz) file for reading or writing. The mode parameter is as
+ in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
+ a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
+ compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
+ for fixed code compression as in "wb9F". (See the description of
+ deflateInit2 for more information about the strategy parameter.) 'T' will
+ request transparent writing or appending with no compression and not using
+ the gzip format.
+
+ "a" can be used instead of "w" to request that the gzip stream that will
+ be written be appended to the file. "+" will result in an error, since
+ reading and writing to the same gzip file is not supported. The addition of
+ "x" when writing will create the file exclusively, which fails if the file
+ already exists. On systems that support it, the addition of "e" when
+ reading or writing will set the flag to close the file on an execve() call.
+
+ These functions, as well as gzip, will read and decode a sequence of gzip
+ streams in a file. The append function of gzopen() can be used to create
+ such a file. (Also see gzflush() for another way to do this.) When
+ appending, gzopen does not test whether the file begins with a gzip stream,
+ nor does it look for the end of the gzip streams to begin appending. gzopen
+ will simply append a gzip stream to the existing file.
+
+ gzopen can be used to read a file which is not in gzip format; in this
+ case gzread will directly read from the file without decompression. When
+ reading, this will be detected automatically by looking for the magic two-
+ byte gzip header.
+
+ gzopen returns NULL if the file could not be opened, if there was
+ insufficient memory to allocate the gzFile state, or if an invalid mode was
+ specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
+ errno can be checked to determine if the reason gzopen failed was that the
+ file could not be opened.
+*/
+
+ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
+/*
+ gzdopen associates a gzFile with the file descriptor fd. File descriptors
+ are obtained from calls like open, dup, creat, pipe or fileno (if the file
+ has been previously opened with fopen). The mode parameter is as in gzopen.
+
+ The next call of gzclose on the returned gzFile will also close the file
+ descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
+ fd. If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
+ mode);. The duplicated descriptor should be saved to avoid a leak, since
+ gzdopen does not close fd if it fails. If you are using fileno() to get the
+ file descriptor from a FILE *, then you will have to use dup() to avoid
+ double-close()ing the file descriptor. Both gzclose() and fclose() will
+ close the associated file descriptor, so they need to have different file
+ descriptors.
+
+ gzdopen returns NULL if there was insufficient memory to allocate the
+ gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
+ provided, or '+' was provided), or if fd is -1. The file descriptor is not
+ used until the next gz* read, write, seek, or close operation, so gzdopen
+ will not detect if fd is invalid (unless fd is -1).
+*/
+
+ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
+/*
+ Set the internal buffer size used by this library's functions. The
+ default buffer size is 8192 bytes. This function must be called after
+ gzopen() or gzdopen(), and before any other calls that read or write the
+ file. The buffer memory allocation is always deferred to the first read or
+ write. Two buffers are allocated, either both of the specified size when
+ writing, or one of the specified size and the other twice that size when
+ reading. A larger buffer size of, for example, 64K or 128K bytes will
+ noticeably increase the speed of decompression (reading).
+
+ The new buffer size also affects the maximum length for gzprintf().
+
+ gzbuffer() returns 0 on success, or -1 on failure, such as being called
+ too late.
+*/
+
+ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
+/*
+ Dynamically update the compression level or strategy. See the description
+ of deflateInit2 for the meaning of these parameters.
+
+ gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
+ opened for writing.
+*/
+
+ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
+/*
+ Reads the given number of uncompressed bytes from the compressed file. If
+ the input file is not in gzip format, gzread copies the given number of
+ bytes into the buffer directly from the file.
+
+ After reaching the end of a gzip stream in the input, gzread will continue
+ to read, looking for another gzip stream. Any number of gzip streams may be
+ concatenated in the input file, and will all be decompressed by gzread().
+ If something other than a gzip stream is encountered after a gzip stream,
+ that remaining trailing garbage is ignored (and no error is returned).
+
+ gzread can be used to read a gzip file that is being concurrently written.
+ Upon reaching the end of the input, gzread will return with the available
+ data. If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
+ gzclearerr can be used to clear the end of file indicator in order to permit
+ gzread to be tried again. Z_OK indicates that a gzip stream was completed
+ on the last gzread. Z_BUF_ERROR indicates that the input file ended in the
+ middle of a gzip stream. Note that gzread does not return -1 in the event
+ of an incomplete gzip stream. This error is deferred until gzclose(), which
+ will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
+ stream. Alternatively, gzerror can be used before gzclose to detect this
+ case.
+
+ gzread returns the number of uncompressed bytes actually read, less than
+ len for end of file, or -1 for error.
+*/
+
+ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
+ voidpc buf, unsigned len));
+/*
+ Writes the given number of uncompressed bytes into the compressed file.
+ gzwrite returns the number of uncompressed bytes written or 0 in case of
+ error.
+*/
+
+ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
+/*
+ Converts, formats, and writes the arguments to the compressed file under
+ control of the format string, as in fprintf. gzprintf returns the number of
+ uncompressed bytes actually written, or 0 in case of error. The number of
+ uncompressed bytes written is limited to 8191, or one less than the buffer
+ size given to gzbuffer(). The caller should assure that this limit is not
+ exceeded. If it is exceeded, then gzprintf() will return an error (0) with
+ nothing written. In this case, there may also be a buffer overflow with
+ unpredictable consequences, which is possible only if zlib was compiled with
+ the insecure functions sprintf() or vsprintf() because the secure snprintf()
+ or vsnprintf() functions were not available. This can be determined using
+ zlibCompileFlags().
+*/
+
+ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
+/*
+ Writes the given null-terminated string to the compressed file, excluding
+ the terminating null character.
+
+ gzputs returns the number of characters written, or -1 in case of error.
+*/
+
+ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
+/*
+ Reads bytes from the compressed file until len-1 characters are read, or a
+ newline character is read and transferred to buf, or an end-of-file
+ condition is encountered. If any characters are read or if len == 1, the
+ string is terminated with a null character. If no characters are read due
+ to an end-of-file or len < 1, then the buffer is left untouched.
+
+ gzgets returns buf which is a null-terminated string, or it returns NULL
+ for end-of-file or in case of error. If there was an error, the contents at
+ buf are indeterminate.
+*/
+
+ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
+/*
+ Writes c, converted to an unsigned char, into the compressed file. gzputc
+ returns the value that was written, or -1 in case of error.
+*/
+
+ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+/*
+ Reads one byte from the compressed file. gzgetc returns this byte or -1
+ in case of end of file or error. This is implemented as a macro for speed.
+ As such, it does not do all of the checking the other functions do. I.e.
+ it does not check to see if file is NULL, nor whether the structure file
+ points to has been clobbered or not.
+*/
+
+ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
+/*
+ Push one character back onto the stream to be read as the first character
+ on the next read. At least one character of push-back is allowed.
+ gzungetc() returns the character pushed, or -1 on failure. gzungetc() will
+ fail if c is -1, and may fail if a character has been pushed but not read
+ yet. If gzungetc is used immediately after gzopen or gzdopen, at least the
+ output buffer size of pushed characters is allowed. (See gzbuffer above.)
+ The pushed character will be discarded if the stream is repositioned with
+ gzseek() or gzrewind().
+*/
+
+ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
+/*
+ Flushes all pending output into the compressed file. The parameter flush
+ is as in the deflate() function. The return value is the zlib error number
+ (see function gzerror below). gzflush is only permitted when writing.
+
+ If the flush parameter is Z_FINISH, the remaining data is written and the
+ gzip stream is completed in the output. If gzwrite() is called again, a new
+ gzip stream will be started in the output. gzread() is able to read such
+ concatented gzip streams.
+
+ gzflush should be called only when strictly necessary because it will
+ degrade compression if called too often.
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
+ z_off_t offset, int whence));
+
+ Sets the starting position for the next gzread or gzwrite on the given
+ compressed file. The offset represents a number of bytes in the
+ uncompressed data stream. The whence parameter is defined as in lseek(2);
+ the value SEEK_END is not supported.
+
+ If the file is opened for reading, this function is emulated but can be
+ extremely slow. If the file is opened for writing, only forward seeks are
+ supported; gzseek then compresses a sequence of zeroes up to the new
+ starting position.
+
+ gzseek returns the resulting offset location as measured in bytes from
+ the beginning of the uncompressed stream, or -1 in case of error, in
+ particular if the file is opened for writing and the new starting position
+ would be before the current position.
+*/
+
+ZEXTERN int ZEXPORT gzrewind OF((gzFile file));
+/*
+ Rewinds the given file. This function is supported only for reading.
+
+ gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file));
+
+ Returns the starting position for the next gzread or gzwrite on the given
+ compressed file. This position represents a number of bytes in the
+ uncompressed data stream, and is zero when starting, even if appending or
+ reading a gzip stream from the middle of a file using gzdopen().
+
+ gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
+*/
+
+/*
+ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
+
+ Returns the current offset in the file being read or written. This offset
+ includes the count of bytes that precede the gzip stream, for example when
+ appending or when using gzdopen() for reading. When reading, the offset
+ does not include as yet unused buffered input. This information can be used
+ for a progress indicator. On error, gzoffset() returns -1.
+*/
+
+ZEXTERN int ZEXPORT gzeof OF((gzFile file));
+/*
+ Returns true (1) if the end-of-file indicator has been set while reading,
+ false (0) otherwise. Note that the end-of-file indicator is set only if the
+ read tried to go past the end of the input, but came up short. Therefore,
+ just like feof(), gzeof() may return false even if there is no more data to
+ read, in the event that the last read request was for the exact number of
+ bytes remaining in the input file. This will happen if the input file size
+ is an exact multiple of the buffer size.
+
+ If gzeof() returns true, then the read functions will return no more data,
+ unless the end-of-file indicator is reset by gzclearerr() and the input file
+ has grown since the previous end of file was detected.
+*/
+
+ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
+/*
+ Returns true (1) if file is being copied directly while reading, or false
+ (0) if file is a gzip stream being decompressed.
+
+ If the input file is empty, gzdirect() will return true, since the input
+ does not contain a gzip stream.
+
+ If gzdirect() is used immediately after gzopen() or gzdopen() it will
+ cause buffers to be allocated to allow reading the file to determine if it
+ is a gzip file. Therefore if gzbuffer() is used, it should be called before
+ gzdirect().
+
+ When writing, gzdirect() returns true (1) if transparent writing was
+ requested ("wT" for the gzopen() mode), or false (0) otherwise. (Note:
+ gzdirect() is not needed when writing. Transparent writing must be
+ explicitly requested, so the application already knows the answer. When
+ linking statically, using gzdirect() will include all of the zlib code for
+ gzip file reading and decompression, which may not be desired.)
+*/
+
+ZEXTERN int ZEXPORT gzclose OF((gzFile file));
+/*
+ Flushes all pending output if necessary, closes the compressed file and
+ deallocates the (de)compression state. Note that once file is closed, you
+ cannot call gzerror with file, since its structures have been deallocated.
+ gzclose must not be called more than once on the same file, just as free
+ must not be called more than once on the same allocation.
+
+ gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
+ file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
+ last read ended in the middle of a gzip stream, or Z_OK on success.
+*/
+
+ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
+ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
+/*
+ Same as gzclose(), but gzclose_r() is only for use when reading, and
+ gzclose_w() is only for use when writing or appending. The advantage to
+ using these instead of gzclose() is that they avoid linking in zlib
+ compression or decompression code that is not used when only reading or only
+ writing respectively. If gzclose() is used, then both compression and
+ decompression code will be included the application when linking to a static
+ zlib library.
+*/
+
+ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
+/*
+ Returns the error message for the last error which occurred on the given
+ compressed file. errnum is set to zlib error number. If an error occurred
+ in the file system and not in the compression library, errnum is set to
+ Z_ERRNO and the application may consult errno to get the exact error code.
+
+ The application must not modify the returned string. Future calls to
+ this function may invalidate the previously returned string. If file is
+ closed, then the string previously returned by gzerror will no longer be
+ available.
+
+ gzerror() should be used to distinguish errors from end-of-file for those
+ functions above that do not distinguish those cases in their return values.
+*/
+
+ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
+/*
+ Clears the error and end-of-file flags for file. This is analogous to the
+ clearerr() function in stdio. This is useful for continuing to read a gzip
+ file that is being written concurrently.
+*/
+
+#endif /* !Z_SOLO */
+
+ /* checksum functions */
+
+/*
+ These functions are not related to compression but are exported
+ anyway because they might be useful in applications using the compression
+ library.
+*/
+
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+/*
+ Update a running Adler-32 checksum with the bytes buf0..len-1 and
+ return the updated checksum. If buf is Z_NULL, this function returns the
+ required initial value for the checksum.
+
+ An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
+ much faster.
+
+ Usage example:
+
+ uLong adler = adler32(0L, Z_NULL, 0);
+
+ while (read_buffer(buffer, length) != EOF) {
+ adler = adler32(adler, buffer, length);
+ }
+ if (adler != original_adler) error();
+*/
+
+/*
+ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
+ z_off_t len2));
+
+ Combine two Adler-32 checksums into one. For two sequences of bytes, seq1
+ and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
+ each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of
+ seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. Note
+ that the z_off_t type (like off_t) is a signed integer. If len2 is
+ negative, the result has no meaning or utility.
+*/
+
+ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
+/*
+ Update a running CRC-32 with the bytes buf0..len-1 and return the
+ updated CRC-32. If buf is Z_NULL, this function returns the required
+ initial value for the crc. Pre- and post-conditioning (one's complement) is
+ performed within this function so it shouldn't be done by the application.
+
+ Usage example:
+
+ uLong crc = crc32(0L, Z_NULL, 0);
+
+ while (read_buffer(buffer, length) != EOF) {
+ crc = crc32(crc, buffer, length);
+ }
+ if (crc != original_crc) error();
+*/
+
+/*
+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
+
+ Combine two CRC-32 check values into one. For two sequences of bytes,
+ seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
+ calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32
+ check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
+ len2.
+*/
+
+
+ /* various hacks, don't look :) */
+
+/* deflateInit and inflateInit are macros to allow checking the zlib version
+ * and the compiler's view of z_stream:
+ */
+ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
+ const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
+ const char *version, int stream_size));
+ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method,
+ int windowBits, int memLevel,
+ int strategy, const char *version,
+ int stream_size));
+ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits,
+ const char *version, int stream_size));
+ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
+ unsigned char FAR *window,
+ const char *version,
+ int stream_size));
+#define deflateInit(strm, level) \
+ deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
+#define inflateInit(strm) \
+ inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
+#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
+ deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
+ (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
+#define inflateInit2(strm, windowBits) \
+ inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
+ (int)sizeof(z_stream))
+#define inflateBackInit(strm, windowBits, window) \
+ inflateBackInit_((strm), (windowBits), (window), \
+ ZLIB_VERSION, (int)sizeof(z_stream))
+
+#ifndef Z_SOLO
+
+/* gzgetc() macro and its supporting function and exposed data structure. Note
+ * that the real internal state is much larger than the exposed structure.
+ * This abbreviated structure exposes just enough for the gzgetc() macro. The
+ * user should not mess with these exposed elements, since their names or
+ * behavior could change in the future, perhaps even capriciously. They can
+ * only be used by the gzgetc() macro. You have been warned.
+ */
+struct gzFile_s {
+ unsigned have;
+ unsigned char *next;
+ z_off64_t pos;
+};
+ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */
+#ifdef Z_PREFIX_SET
+# undef z_gzgetc
+# define z_gzgetc(g) \
+ ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#else
+# define gzgetc(g) \
+ ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
+#endif
+
+/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
+ * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
+ * both are true, the application gets the *64 functions, and the regular
+ * functions are changed to 64 bits) -- in case these are set on systems
+ * without large file support, _LFS64_LARGEFILE must also be true
+ */
+#ifdef Z_LARGE64
+ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+ ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
+ ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
+ ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
+ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
+ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
+#endif
+
+#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
+# ifdef Z_PREFIX_SET
+# define z_gzopen z_gzopen64
+# define z_gzseek z_gzseek64
+# define z_gztell z_gztell64
+# define z_gzoffset z_gzoffset64
+# define z_adler32_combine z_adler32_combine64
+# define z_crc32_combine z_crc32_combine64
+# else
+# define gzopen gzopen64
+# define gzseek gzseek64
+# define gztell gztell64
+# define gzoffset gzoffset64
+# define adler32_combine adler32_combine64
+# define crc32_combine crc32_combine64
+# endif
+# ifndef Z_LARGE64
+ ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
+ ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
+ ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
+ ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
+ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+# endif
+#else
+ ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
+ ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
+ ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
+ ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
+ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+ ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+#endif
+
+#else /* Z_SOLO */
+
+ ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
+ ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
+
+#endif /* !Z_SOLO */
+
+/* hack for buggy compilers */
+#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
+ struct internal_state {int dummy;};
+#endif
+
+/* undocumented functions */
+ZEXTERN const char * ZEXPORT zError OF((int));
+ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp));
+ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table OF((void));
+ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int));
+ZEXTERN int ZEXPORT inflateResetKeep OF((z_streamp));
+ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp));
+#if defined(_WIN32) && !defined(Z_SOLO)
+ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path,
+ const char *mode));
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ZLIB_H */

smplayer-0.8.1.tar.bz2/zlib/zlib.map Added

@@ -0,0 +1,78 @@
+ZLIB_1.2.0 {
+  global:
+    compressBound;
+    deflateBound;
+    inflateBack;
+    inflateBackEnd;
+    inflateBackInit_;
+    inflateCopy;
+  local:
+    deflate_copyright;
+    inflate_copyright;
+    inflate_fast;
+    inflate_table;
+    zcalloc;
+    zcfree;
+    z_errmsg;
+    gz_error;
+    gz_intmax;
+    _*;
+};
+
+ZLIB_1.2.0.2 {
+    gzclearerr;
+    gzungetc;
+    zlibCompileFlags;
+} ZLIB_1.2.0;
+
+ZLIB_1.2.0.8 {
+    deflatePrime;
+} ZLIB_1.2.0.2;
+
+ZLIB_1.2.2 {
+    adler32_combine;
+    crc32_combine;
+    deflateSetHeader;
+    inflateGetHeader;
+} ZLIB_1.2.0.8;
+
+ZLIB_1.2.2.3 {
+    deflateTune;
+    gzdirect;
+} ZLIB_1.2.2;
+
+ZLIB_1.2.2.4 {
+    inflatePrime;
+} ZLIB_1.2.2.3;
+
+ZLIB_1.2.3.3 {
+    adler32_combine64;
+    crc32_combine64;
+    gzopen64;
+    gzseek64;
+    gztell64;
+    inflateUndermine;
+} ZLIB_1.2.2.4;
+
+ZLIB_1.2.3.4 {
+    inflateReset2;
+    inflateMark;
+} ZLIB_1.2.3.3;
+
+ZLIB_1.2.3.5 {
+    gzbuffer;
+    gzoffset;
+    gzoffset64;
+    gzclose_r;
+    gzclose_w;
+} ZLIB_1.2.3.4;
+
+ZLIB_1.2.5.1 {
+    deflatePending;
+} ZLIB_1.2.3.5;
+
+ZLIB_1.2.5.2 {
+    deflateResetKeep;
+    gzgetc_;
+    inflateResetKeep;
+} ZLIB_1.2.5.1;

smplayer-0.8.1.tar.bz2/zlib/zlib.pc.cmakein Added

smplayer-0.8.1.tar.bz2/zlib/zlib.pc.in Changed

smplayer-0.8.1.tar.bz2/zlib/zlib2ansi Changed

smplayer-0.8.1.tar.bz2/zlib/zutil.c Added

@@ -0,0 +1,324 @@
+/* zutil.c -- target dependent utility functions for the compression library
+ * Copyright (C) 1995-2005, 2010, 2011, 2012 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zutil.h"
+#ifndef Z_SOLO
+# include "gzguts.h"
+#endif
+
+#ifndef NO_DUMMY_DECL
+struct internal_state {int dummy;}; /* for buggy compilers */
+#endif
+
+const char * const z_errmsg10 = {
+"need dictionary", /* Z_NEED_DICT 2 */
+"stream end", /* Z_STREAM_END 1 */
+"", /* Z_OK 0 */
+"file error", /* Z_ERRNO (-1) */
+"stream error", /* Z_STREAM_ERROR (-2) */
+"data error", /* Z_DATA_ERROR (-3) */
+"insufficient memory", /* Z_MEM_ERROR (-4) */
+"buffer error", /* Z_BUF_ERROR (-5) */
+"incompatible version",/* Z_VERSION_ERROR (-6) */
+""};
+
+
+const char * ZEXPORT zlibVersion()
+{
+ return ZLIB_VERSION;
+}
+
+uLong ZEXPORT zlibCompileFlags()
+{
+ uLong flags;
+
+ flags = 0;
+ switch ((int)(sizeof(uInt))) {
+ case 2: break;
+ case 4: flags += 1; break;
+ case 8: flags += 2; break;
+ default: flags += 3;
+ }
+ switch ((int)(sizeof(uLong))) {
+ case 2: break;
+ case 4: flags += 1 << 2; break;
+ case 8: flags += 2 << 2; break;
+ default: flags += 3 << 2;
+ }
+ switch ((int)(sizeof(voidpf))) {
+ case 2: break;
+ case 4: flags += 1 << 4; break;
+ case 8: flags += 2 << 4; break;
+ default: flags += 3 << 4;
+ }
+ switch ((int)(sizeof(z_off_t))) {
+ case 2: break;
+ case 4: flags += 1 << 6; break;
+ case 8: flags += 2 << 6; break;
+ default: flags += 3 << 6;
+ }
+#ifdef DEBUG
+ flags += 1 << 8;
+#endif
+#if defined(ASMV) || defined(ASMINF)
+ flags += 1 << 9;
+#endif
+#ifdef ZLIB_WINAPI
+ flags += 1 << 10;
+#endif
+#ifdef BUILDFIXED
+ flags += 1 << 12;
+#endif
+#ifdef DYNAMIC_CRC_TABLE
+ flags += 1 << 13;
+#endif
+#ifdef NO_GZCOMPRESS
+ flags += 1L << 16;
+#endif
+#ifdef NO_GZIP
+ flags += 1L << 17;
+#endif
+#ifdef PKZIP_BUG_WORKAROUND
+ flags += 1L << 20;
+#endif
+#ifdef FASTEST
+ flags += 1L << 21;
+#endif
+#if defined(STDC) || defined(Z_HAVE_STDARG_H)
+# ifdef NO_vsnprintf
+ flags += 1L << 25;
+# ifdef HAS_vsprintf_void
+ flags += 1L << 26;
+# endif
+# else
+# ifdef HAS_vsnprintf_void
+ flags += 1L << 26;
+# endif
+# endif
+#else
+ flags += 1L << 24;
+# ifdef NO_snprintf
+ flags += 1L << 25;
+# ifdef HAS_sprintf_void
+ flags += 1L << 26;
+# endif
+# else
+# ifdef HAS_snprintf_void
+ flags += 1L << 26;
+# endif
+# endif
+#endif
+ return flags;
+}
+
+#ifdef DEBUG
+
+# ifndef verbose
+# define verbose 0
+# endif
+int ZLIB_INTERNAL z_verbose = verbose;
+
+void ZLIB_INTERNAL z_error (m)
+ char *m;
+{
+ fprintf(stderr, "%s\n", m);
+ exit(1);
+}
+#endif
+
+/* exported to allow conversion of error code to string for compress() and
+ * uncompress()
+ */
+const char * ZEXPORT zError(err)
+ int err;
+{
+ return ERR_MSG(err);
+}
+
+#if defined(_WIN32_WCE)
+ /* The Microsoft C Run-Time Library for Windows CE doesn't have
+ * errno. We define it as a global variable to simplify porting.
+ * Its value is always 0 and should not be used.
+ */
+ int errno = 0;
+#endif
+
+#ifndef HAVE_MEMCPY
+
+void ZLIB_INTERNAL zmemcpy(dest, source, len)
+ Bytef* dest;
+ const Bytef* source;
+ uInt len;
+{
+ if (len == 0) return;
+ do {
+ *dest++ = *source++; /* ??? to be unrolled */
+ } while (--len != 0);
+}
+
+int ZLIB_INTERNAL zmemcmp(s1, s2, len)
+ const Bytef* s1;
+ const Bytef* s2;
+ uInt len;
+{
+ uInt j;
+
+ for (j = 0; j < len; j++) {
+ if (s1j != s2j) return 2*(s1j > s2j)-1;
+ }
+ return 0;
+}
+
+void ZLIB_INTERNAL zmemzero(dest, len)
+ Bytef* dest;
+ uInt len;
+{
+ if (len == 0) return;
+ do {
+ *dest++ = 0; /* ??? to be unrolled */
+ } while (--len != 0);
+}
+#endif
+
+#ifndef Z_SOLO
+
+#ifdef SYS16BIT
+
+#ifdef __TURBOC__
+/* Turbo C in 16-bit mode */
+
+# define MY_ZCALLOC
+
+/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
+ * and farmalloc(64K) returns a pointer with an offset of 8, so we
+ * must fix the pointer. Warning: the pointer must be put back to its
+ * original form in order to free it, use zcfree().
+ */
+
+#define MAX_PTR 10
+/* 10*64K = 640K */
+
+local int next_ptr = 0;
+
+typedef struct ptr_table_s {
+ voidpf org_ptr;
+ voidpf new_ptr;
+} ptr_table;
+
+local ptr_table tableMAX_PTR;
+/* This table is used to remember the original form of pointers
+ * to large buffers (64K). Such pointers are normalized with a zero offset.
+ * Since MSDOS is not a preemptive multitasking OS, this table is not
+ * protected from concurrent access. This hack doesn't work anyway on
+ * a protected system like OS/2. Use Microsoft C instead.
+ */
+
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size)
+{
+ voidpf buf = opaque; /* just to make some compilers happy */
+ ulg bsize = (ulg)items*size;
+
+ /* If we allocate less than 65520 bytes, we assume that farmalloc
+ * will return a usable pointer which doesn't have to be normalized.
+ */
+ if (bsize < 65520L) {
+ buf = farmalloc(bsize);
+ if (*(ush*)&buf != 0) return buf;
+ } else {
+ buf = farmalloc(bsize + 16L);
+ }
+ if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
+ tablenext_ptr.org_ptr = buf;
+
+ /* Normalize the pointer to seg:0 */
+ *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
+ *(ush*)&buf = 0;
+ tablenext_ptr++.new_ptr = buf;
+ return buf;
+}
+
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+{
+ int n;
+ if (*(ush*)&ptr != 0) { /* object < 64K */
+ farfree(ptr);
+ return;
+ }
+ /* Find the original pointer */
+ for (n = 0; n < next_ptr; n++) {
+ if (ptr != tablen.new_ptr) continue;
+
+ farfree(tablen.org_ptr);
+ while (++n < next_ptr) {
+ tablen-1 = tablen;
+ }
+ next_ptr--;
+ return;
+ }
+ ptr = opaque; /* just to make some compilers happy */
+ Assert(0, "zcfree: ptr not found");
+}
+
+#endif /* __TURBOC__ */
+
+
+#ifdef M_I86
+/* Microsoft C in 16-bit mode */
+
+# define MY_ZCALLOC
+
+#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
+# define _halloc halloc
+# define _hfree hfree
+#endif
+
+voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size)
+{
+ if (opaque) opaque = 0; /* to make compiler happy */
+ return _halloc((long)items, size);
+}
+
+void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr)
+{
+ if (opaque) opaque = 0; /* to make compiler happy */
+ _hfree(ptr);
+}
+
+#endif /* M_I86 */
+
+#endif /* SYS16BIT */
+
+
+#ifndef MY_ZCALLOC /* Any system without a special alloc function */
+
+#ifndef STDC
+extern voidp malloc OF((uInt size));
+extern voidp calloc OF((uInt items, uInt size));
+extern void free OF((voidpf ptr));
+#endif
+
+voidpf ZLIB_INTERNAL zcalloc (opaque, items, size)
+ voidpf opaque;
+ unsigned items;
+ unsigned size;
+{
+ if (opaque) items += size - size; /* make compiler happy */
+ return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) :
+ (voidpf)calloc(items, size);
+}
+
+void ZLIB_INTERNAL zcfree (opaque, ptr)
+ voidpf opaque;
+ voidpf ptr;
+{
+ free(ptr);
+ if (opaque) return; /* make compiler happy */
+}
+
+#endif /* MY_ZCALLOC */
+
+#endif /* !Z_SOLO */

smplayer-0.8.1.tar.bz2/zlib/zutil.h Added

@@ -0,0 +1,252 @@
+/* zutil.h -- internal interface and configuration of the compression library
+ * Copyright (C) 1995-2012 Jean-loup Gailly.
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+ part of the implementation of the compression library and is
+ subject to change. Applications should only use zlib.h.
+ */
+
+/* @(#) $Id$ */
+
+#ifndef ZUTIL_H
+#define ZUTIL_H
+
+#ifdef HAVE_HIDDEN
+# define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
+#else
+# define ZLIB_INTERNAL
+#endif
+
+#include "zlib.h"
+
+#if defined(STDC) && !defined(Z_SOLO)
+# if !(defined(_WIN32_WCE) && defined(_MSC_VER))
+# include <stddef.h>
+# endif
+# include <string.h>
+# include <stdlib.h>
+#endif
+
+#ifdef Z_SOLO
+ typedef long ptrdiff_t; /* guess -- will be caught if guess is wrong */
+#endif
+
+#ifndef local
+# define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+typedef unsigned char uch;
+typedef uch FAR uchf;
+typedef unsigned short ush;
+typedef ush FAR ushf;
+typedef unsigned long ulg;
+
+extern const char * const z_errmsg10; /* indexed by 2-zlib_error */
+/* (size given to avoid silly warnings with Visual C++) */
+
+#define ERR_MSG(err) z_errmsgZ_NEED_DICT-(err)
+
+#define ERR_RETURN(strm,err) \
+ return (strm->msg = (char*)ERR_MSG(err), (err))
+/* To be used only when the state is known to be valid */
+
+ /* common constants */
+
+#ifndef DEF_WBITS
+# define DEF_WBITS MAX_WBITS
+#endif
+/* default windowBits for decompression. MAX_WBITS is for compression only */
+
+#if MAX_MEM_LEVEL >= 8
+# define DEF_MEM_LEVEL 8
+#else
+# define DEF_MEM_LEVEL MAX_MEM_LEVEL
+#endif
+/* default memLevel */
+
+#define STORED_BLOCK 0
+#define STATIC_TREES 1
+#define DYN_TREES 2
+/* The three kinds of block type */
+
+#define MIN_MATCH 3
+#define MAX_MATCH 258
+/* The minimum and maximum match lengths */
+
+#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
+
+ /* target dependencies */
+
+#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32))
+# define OS_CODE 0x00
+# ifndef Z_SOLO
+# if defined(__TURBOC__) || defined(__BORLANDC__)
+# if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
+ /* Allow compilation with ANSI keywords only enabled */
+ void _Cdecl farfree( void *block );
+ void *_Cdecl farmalloc( unsigned long nbytes );
+# else
+# include <alloc.h>
+# endif
+# else /* MSC or DJGPP */
+# include <malloc.h>
+# endif
+# endif
+#endif
+
+#ifdef AMIGA
+# define OS_CODE 0x01
+#endif
+
+#if defined(VAXC) || defined(VMS)
+# define OS_CODE 0x02
+# define F_OPEN(name, mode) \
+ fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
+#endif
+
+#if defined(ATARI) || defined(atarist)
+# define OS_CODE 0x05
+#endif
+
+#ifdef OS2
+# define OS_CODE 0x06
+# if defined(M_I86) && !defined(Z_SOLO)
+# include <malloc.h>
+# endif
+#endif
+
+#if defined(MACOS) || defined(TARGET_OS_MAC)
+# define OS_CODE 0x07
+# ifndef Z_SOLO
+# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+# include <unix.h> /* for fdopen */
+# else
+# ifndef fdopen
+# define fdopen(fd,mode) NULL /* No fdopen() */
+# endif
+# endif
+# endif
+#endif
+
+#ifdef TOPS20
+# define OS_CODE 0x0a
+#endif
+
+#ifdef WIN32
+# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */
+# define OS_CODE 0x0b
+# endif
+#endif
+
+#ifdef __50SERIES /* Prime/PRIMOS */
+# define OS_CODE 0x0f
+#endif
+
+#if defined(_BEOS_) || defined(RISCOS)
+# define fdopen(fd,mode) NULL /* No fdopen() */
+#endif
+
+#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
+# if defined(_WIN32_WCE)
+# define fdopen(fd,mode) NULL /* No fdopen() */
+# ifndef _PTRDIFF_T_DEFINED
+ typedef int ptrdiff_t;
+# define _PTRDIFF_T_DEFINED
+# endif
+# else
+# define fdopen(fd,type) _fdopen(fd,type)
+# endif
+#endif
+
+#if defined(__BORLANDC__) && !defined(MSDOS)
+ #pragma warn -8004
+ #pragma warn -8008
+ #pragma warn -8066
+#endif
+
+/* provide prototypes for these when building zlib without LFS */
+#if !defined(_WIN32) && (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0)
+ ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
+ ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
+#endif
+
+ /* common defaults */
+
+#ifndef OS_CODE
+# define OS_CODE 0x03 /* assume Unix */
+#endif
+
+#ifndef F_OPEN
+# define F_OPEN(name, mode) fopen((name), (mode))
+#endif
+
+ /* functions */
+
+#if defined(pyr) || defined(Z_SOLO)
+# define NO_MEMCPY
+#endif
+#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
+ /* Use our own functions for small and medium model with MSC <= 5.0.
+ * You may have to use the same strategy for Borland C (untested).
+ * The __SC__ check is for Symantec.
+ */
+# define NO_MEMCPY
+#endif
+#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
+# define HAVE_MEMCPY
+#endif
+#ifdef HAVE_MEMCPY
+# ifdef SMALL_MEDIUM /* MSDOS small or medium model */
+# define zmemcpy _fmemcpy
+# define zmemcmp _fmemcmp
+# define zmemzero(dest, len) _fmemset(dest, 0, len)
+# else
+# define zmemcpy memcpy
+# define zmemcmp memcmp
+# define zmemzero(dest, len) memset(dest, 0, len)
+# endif
+#else
+ void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len));
+ int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len));
+ void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len));
+#endif
+
+/* Diagnostic functions */
+#ifdef DEBUG
+# include <stdio.h>
+ extern int ZLIB_INTERNAL z_verbose;
+ extern void ZLIB_INTERNAL z_error OF((char *m));
+# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
+# define Trace(x) {if (z_verbose>=0) fprintf x ;}
+# define Tracev(x) {if (z_verbose>0) fprintf x ;}
+# define Tracevv(x) {if (z_verbose>1) fprintf x ;}
+# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
+# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
+#else
+# define Assert(cond,msg)
+# define Trace(x)
+# define Tracev(x)
+# define Tracevv(x)
+# define Tracec(c,x)
+# define Tracecv(c,x)
+#endif
+
+#ifndef Z_SOLO
+ voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items,
+ unsigned size));
+ void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr));
+#endif
+
+#define ZALLOC(strm, items, size) \
+ (*((strm)->zalloc))((strm)->opaque, (items), (size))
+#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
+#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
+
+/* Reverse the bytes in a 32-bit value */
+#define ZSWAP32(q) ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
+ (((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
+
+#endif /* ZUTIL_H */

Build Results
RPM Lint

Refresh

Comments for request 293 0

Request History

marguerite created request over 11 years ago

update version 0.8.1 (fix youtube playback) and fix the bug that it goes into audio player section in kickoff menu.

pbleser accepted request about 12 years ago

not reviewed