[xiph-commits] r10182 - trunk/oggdsf/src/lib/core/ogg/libOOOgg

[davidb at svn.xiph.org]

Author: davidb
Date: 2005-10-17 18:07:12 -0700 (Mon, 17 Oct 2005)
New Revision: 10182

Modified:
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
Log:
fix warnings

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp	2005-10-18 01:06:36 UTC (rev 10181)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp	2005-10-18 01:07:12 UTC (rev 10182)
@@ -344,7 +344,7 @@
 	//***** WARNING 4018!!!!!! ::: TODO::: What happens when mSegmentTableSize is 255 ?
 
 	//Take 1 so when it adds the packet it doesn't try to consume one extra segment which doesn't exist.
-    unsigned long locSpaceLeft =	MIN(((255 - mSegmentTableSize) * 255) - 1, mSettings->mMaxPageSize - mCurrentPageSize);
+    long locSpaceLeft = MIN((long)((255 - mSegmentTableSize) * 255) - 1, (long)(mSettings->mMaxPageSize - mCurrentPageSize));
 
 	//debugLog<<"addAsMuchPacketAsPossible : Space left = "<<locSpaceLeft<<endl;
 	//debugLog<<"Space left = "<<locSpaceLeft<<endl;
@@ -366,7 +366,7 @@
 
 	//**** WARING 4018 !!!! TODO::: Are we sure inRemaining can never be < 0
 	//If (a) is the minimum then we know that the how much we are adding is a multiple of 255.
-	unsigned long locHowMuchToAdd = MIN(locSpaceLeft, inRemaining);
+	long locHowMuchToAdd = MIN(locSpaceLeft, inRemaining);
 
 	//debugLog<<"addAsMuchPacketAsPossible : How much to add = "<<locHowMuchToAdd<<endl;