[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1480] trunk/lvzip

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1480
          http://opengtoolkit.svn.sourceforge.net/opengtoolkit/?rev=1480&view=rev
Author:   labviewer
Date:     2012-07-16 09:10:35 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
Update to zlib 1.2.7

Modified Paths:
--------------
    trunk/lvzip/c_source/Makefile
    trunk/lvzip/c_source/gzread.c
    trunk/lvzip/c_source/zalias.h
    trunk/lvzip/c_source/zlib.h
    trunk/lvzip/c_source/zlibvc.suo
    trunk/lvzip/c_source/zlibvc.vcproj
    trunk/lvzip/source/Win64/lvzlib.dll
    trunk/lvzip/source/lvzlib.dll
    trunk/lvzip/source/lvzlib.so

Modified: trunk/lvzip/c_source/Makefile
===================================================================

--- trunk/lvzip/c_source/Makefile	2012-07-06 16:38:20 UTC (rev 1479)
+++ trunk/lvzip/c_source/Makefile	2012-07-16 09:10:35 UTC (rev 1480)
@@ -32,7 +32,7 @@
 CPP=gcc -E
 
 STATICLIB=lvzlib.a
-SHAREDLIB=lvzlib.so.2
+SHAREDLIB=lvzlib.so.1
 SHAREDLIBV=lvzlib.so
 SHAREDLIBM=
 LIBS=$(STATICLIB) $(SHAREDLIBV)
@@ -41,7 +41,7 @@
 ARFLAGS=rc
 RANLIB=ranlib
 LDCONFIG=ldconfig
-LDSHAREDLIBC=-lc -llv
+LDSHAREDLIBC=-lc
 TAR=tar
 SHELL=/bin/sh
 EXE=
@@ -57,12 +57,12 @@
 
 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
-OBJL = lvutil.o ioapi.o iomem.o mztools.o
+OBJL = unzip.o zip.o lvutil.o ioapi.o iomem.o mztools.o
 OBJC = $(OBJZ) $(OBJL) $(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_OBJL = lvutil.lo ioapi.lo iomem.lo mztools.lo
+PIC_OBJL = unzip.lo zip.lo lvutil.lo ioapi.lo iomem.lo mztools.lo
 PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJL) $(PIC_OBJG)
 
 # to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo

Modified: trunk/lvzip/c_source/gzread.c
===================================================================
--- trunk/lvzip/c_source/gzread.c	2012-07-06 16:38:20 UTC (rev 1479)
+++ trunk/lvzip/c_source/gzread.c	2012-07-16 09:10:35 UTC (rev 1480)
@@ -378,7 +378,7 @@
 }
 
 /* -- see zlib.h -- */
-#undef gzgetc
+//#undef gzgetc
 int ZEXPORT gzgetc(file)
     gzFile file;
 {
@@ -408,11 +408,13 @@
     return ret < 1 ? -1 : buf[0];
 }
 
+#if 0
 int ZEXPORT gzgetc_(file)
 gzFile file;
 {
     return gzgetc(file);
 }
+#endif 
 
 /* -- see zlib.h -- */
 int ZEXPORT gzungetc(c, file)

Modified: trunk/lvzip/c_source/zalias.h
===================================================================
--- trunk/lvzip/c_source/zalias.h	2012-07-06 16:38:20 UTC (rev 1479)
+++ trunk/lvzip/c_source/zalias.h	2012-07-16 09:10:35 UTC (rev 1480)
@@ -110,11 +110,35 @@
 #define zipOpenNewFileInZip3_64     lvzip_zipOpenNewFileInZip3_64
 #define zipOpenNewFileInZip4        lvzip_zipOpenNewFileInZip4
 #define zipOpenNewFileInZip4_64     lvzip_zipOpenNewFileInZip4_64
-#define zipRemoveExtraInfoBlock     lvzip_RemoveExtraInfoBlock
+#define zipRemoveExtraInfoBlock     lvzip_zipRemoveExtraInfoBlock
 #define zipWriteInFileInZip         lvzip_zipWriteInFileInZip
-#define gzopen						lvzip_gzopen
-#define gzseek						lvzip_gzseek
-#define gztell						lvzip_gztell
-#define gzoffset					lvzip_gzoffset
-#define adler32_combine				lvzip_adler32_combine
-#define gcrc32_combine				lvzip_crc32_combine
+#define gzopen						lvzlib_gzopen
+#define gzopen64					lvzlib_gzopen64
+#define gzdopen						lvzlib_gzdopen
+#define gzbuffer					lvzlib_gzbuffer
+#define gzseek						lvzlib_gzseek
+#define gzseek64					lvzlib_gzseek64
+#define gzsetparams					lvzlib_gzsetparams
+#define gzread						lvzlib_gzread
+#define gzwrite						lvzlib_gzwrite
+#define gzprintf					lvzlib_gzprintf
+#define gzputc						lvzlib_gzputc
+#define gzputs						lvzlib_gzputs
+#define gzgetc						lvzlib_gzgetc
+#define gzgets						lvzlib_gzgets
+#define gzungetc					lvzlib_gzungetc
+#define gzrewind					lvzlib_gzrewind
+#define gzeof						lvzlib_gzeof
+#define gzclearerr					lvzlib_gzclearerr
+#define gzflush						lvzlib_gzflush
+#define gzdirect					lvzlib_gzdirect
+#define gzerror						lvzlib_gzerror
+#define gzclose						lvzlib_gzclose
+#define gzclose_r					lvzlib_gzclose_r
+#define gzclose_w					lvzlib_gzclose_w
+#define gztell						lvzlib_gztell
+#define gztell64					lvzlib_gztell64
+#define gzoffset					lvzlib_gzoffset
+#define gzoffset64					lvzlib_gzoffset64
+#define gcrc32_combine				lvzlib_crc32_combine
+#define gcrc32_combine64			lvzlib_crc32_combine64

Modified: trunk/lvzip/c_source/zlib.h
===================================================================
--- trunk/lvzip/c_source/zlib.h	2012-07-06 16:38:20 UTC (rev 1479)
+++ trunk/lvzip/c_source/zlib.h	2012-07-16 09:10:35 UTC (rev 1480)
@@ -1656,6 +1656,7 @@
     unsigned char *next;
     z_off64_t pos;
 };
+#if 0
 ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
 #ifdef Z_PREFIX_SET
 #  undef z_gzgetc
@@ -1665,6 +1666,7 @@
 #  define gzgetc(g) \
           ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
 #endif
+#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

Modified: trunk/lvzip/c_source/zlibvc.suo
===================================================================
(Binary files differ)

Modified: trunk/lvzip/c_source/zlibvc.vcproj
===================================================================
--- trunk/lvzip/c_source/zlibvc.vcproj	2012-07-06 16:38:20 UTC (rev 1479)
+++ trunk/lvzip/c_source/zlibvc.vcproj	2012-07-16 09:10:35 UTC (rev 1480)
@@ -351,8 +351,8 @@
 		</Configuration>
 		<Configuration
 			Name="DLL Debug|Win32"
-			OutputDirectory=".\zlibvc___Win32_DLL_Debug"
-			IntermediateDirectory=".\zlibvc___Win32_DLL_Debug"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
@@ -382,12 +382,12 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;NO_vsnprintf;ZLIB_DLL"
+				PreprocessorDefinitions="WIN32;_DEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\zlibvc___Win32_DLL_Debug/zlibvc.pch"
-				AssemblerListingLocation=".\zlibvc___Win32_DLL_Debug/"
-				ObjectFile=".\zlibvc___Win32_DLL_Debug/"
-				ProgramDataBaseFileName=".\zlibvc___Win32_DLL_Debug/"
+				PrecompiledHeaderFile="$(IntDir)\zlibvc.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -400,7 +400,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="WIN32,_DEBUG"
 				Culture="1033"
-				ResourceOutputFileName="zlibvc___Win32_DLL_Debug\lvzlib.res"
+				ResourceOutputFileName="$(IntDir)\lvzlib.res"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -409,16 +409,16 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="labviewv.lib"
-				OutputFile="zlibvc___Win32_DLL_Debug\lvzlib.dll"
+				OutputFile="$(IntDir)\\lvzlib.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../cintools"
 				IgnoreDefaultLibraryNames="msvcrt"
-				ModuleDefinitionFile=".\lvzlib.def"
+				ModuleDefinitionFile=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\zlibvc___Win32_DLL_Debug/lvzlib.pdb"
+				ProgramDatabaseFile="$(IntDir)\lvzlib.pdb"
 				SubSystem="2"
-				ImportLibrary=".\zlibvc___Win32_DLL_Debug/lvzlib.lib"
+				ImportLibrary="$(IntDir)\lvzlib.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -433,7 +433,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\zlibvc___Win32_DLL_Debug/zlibvc.bsc"
+				OutputFile="$(IntDir)\zlibvc.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -481,12 +481,12 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;NO_vsnprintf;ZLIB_DLL"
+				PreprocessorDefinitions="WIN32;_DEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="3"
-				PrecompiledHeaderFile=".\zlibvc___Win32_DLL_Debug/zlibvc.pch"
-				AssemblerListingLocation=".\zlibvc___Win32_DLL_Debug/"
-				ObjectFile=".\zlibvc___Win32_DLL_Debug/"
-				ProgramDataBaseFileName=".\zlibvc___Win32_DLL_Debug/"
+				PrecompiledHeaderFile="$(IntDir)\zlibvc.pch"
+				AssemblerListingLocation="$(IntDir)\"
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\"
 				BrowseInformation="1"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
@@ -499,7 +499,7 @@
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="WIN32,_DEBUG"
 				Culture="1033"
-				ResourceOutputFileName="zlibvc___Win32_DLL_Debug\lvzlib.res"
+				ResourceOutputFileName="$(IntDir)\lvzlib.res"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
@@ -508,16 +508,16 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="labview64.lib"
-				OutputFile="zlibvc___Win32_DLL_Debug\lvzlib.dll"
+				OutputFile="$(IntDir)\\lvzlib.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../cintools"
 				IgnoreDefaultLibraryNames="msvcrt"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\zlibvc___Win32_DLL_Debug/lvzlib.pdb"
+				ProgramDatabaseFile="$(IntDir)\lvzlib.pdb"
 				SubSystem="2"
-				ImportLibrary=".\zlibvc___Win32_DLL_Debug/lvzlib.lib"
+				ImportLibrary="$(IntDir)\lvzlib.lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -532,7 +532,7 @@
 			<Tool
 				Name="VCBscMakeTool"
 				SuppressStartupBanner="true"
-				OutputFile=".\zlibvc___Win32_DLL_Debug/zlibvc.bsc"
+				OutputFile="$(IntDir)\zlibvc.bsc"
 			/>
 			<Tool
 				Name="VCFxCopTool"
@@ -1110,9 +1110,9 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;ZLIB_DLL"
+				PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(IntDir)\"
@@ -1141,7 +1141,7 @@
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="../../cintools"
-				ModuleDefinitionFile=".\lvzlib.def"
+				ModuleDefinitionFile=""
 				SubSystem="2"
 				ImportLibrary="$(OutDir)/lvzlib.lib"
 				TargetMachine="1"
@@ -1207,9 +1207,9 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;ZLIB_DLL"
+				PreprocessorDefinitions="WIN32;NDEBUG;NO_vsnprintf;ZLIB_DLL;_CRT_SECURE_NO_WARNINGS"
 				StringPooling="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(IntDir)\"

Modified: trunk/lvzip/source/Win64/lvzlib.dll
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzlib.dll
===================================================================
(Binary files differ)

Modified: trunk/lvzip/source/lvzlib.so
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



