[OMPT-svn-commit] SF.net SVN: modplug:[1456] trunk/OpenMPT

[<sag...@us...>]

Revision: 1456
          http://sourceforge.net/p/modplug/code/1456
Author:   saga-games
Date:     2012-12-12 01:10:23 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
[Ref] Adjustments to project files
[Ref] assert.h seems to add some weight to executables for whatever reason... anyway, it's not needed here.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/FileReader.h
    trunk/OpenMPT/ungzip/ungzip_10.vcxproj
    trunk/OpenMPT/unzip/unzip.cpp
    trunk/OpenMPT/unzip/unzip_10.vcxproj

Modified: trunk/OpenMPT/soundlib/FileReader.h
===================================================================
--- trunk/OpenMPT/soundlib/FileReader.h	2012-12-12 00:50:08 UTC (rev 1455)
+++ trunk/OpenMPT/soundlib/FileReader.h	2012-12-12 01:10:23 UTC (rev 1456)
@@ -15,7 +15,6 @@
 #include "Endianness.h"
 #include <vector>
 #include <algorithm>
-#include <assert.h>
 
 
 //==============
@@ -109,7 +108,6 @@
 	// Return byte count between cursor position and end of file, i.e. how many bytes can still be read.
 	off_t BytesLeft() const
 	{
-		assert(streamPos <= streamLength);
 		return streamLength - streamPos;
 	}
 

Modified: trunk/OpenMPT/ungzip/ungzip_10.vcxproj
===================================================================
--- trunk/OpenMPT/ungzip/ungzip_10.vcxproj	2012-12-12 00:50:08 UTC (rev 1455)
+++ trunk/OpenMPT/ungzip/ungzip_10.vcxproj	2012-12-12 01:10:23 UTC (rev 1456)
@@ -45,7 +45,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;WIN32;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -59,7 +59,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>

Modified: trunk/OpenMPT/unzip/unzip.cpp
===================================================================
--- trunk/OpenMPT/unzip/unzip.cpp	2012-12-12 00:50:08 UTC (rev 1455)
+++ trunk/OpenMPT/unzip/unzip.cpp	2012-12-12 01:10:23 UTC (rev 1456)
@@ -11,7 +11,6 @@
 #include "../soundlib/FileReader.h"
 #include "unzip.h"
 #include "../common/misc_util.h"
-#include <assert.h>
 
 #ifndef ZLIB_WINAPI
 #define ZLIB_WINAPI
@@ -224,9 +223,14 @@
 			info.size_comment++;
 		}
 		char *comment = new char[info.size_comment];
-		assert(unzGetGlobalComment(zipFile, comment, info.size_comment) >= 0);
-		comment[info.size_comment - 1] = '\0';
-		return comment;
+		if(unzGetGlobalComment(zipFile, comment, info.size_comment) >= 0)
+		{
+			comment[info.size_comment - 1] = '\0';
+			return comment;
+		} else
+		{
+			delete[] comment;
+		}
 	}
 	return nullptr;
 }

Modified: trunk/OpenMPT/unzip/unzip_10.vcxproj
===================================================================
--- trunk/OpenMPT/unzip/unzip_10.vcxproj	2012-12-12 00:50:08 UTC (rev 1455)
+++ trunk/OpenMPT/unzip/unzip_10.vcxproj	2012-12-12 01:10:23 UTC (rev 1456)
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;WIN32;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -65,7 +65,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;WIN32;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <WarningLevel>Level3</WarningLevel>

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