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

[illiminable at motherfish-iii.xiph.org]

Author: illiminable
Date: 2005-01-05 00:47:14 -0800 (Wed, 05 Jan 2005)
New Revision: 8616

Modified:
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
   trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.cpp
Log:
* Warnings reduced in libOOOgg (2 that are left, are left intentionally since they may need attention)

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp	2005-01-05 08:13:44 UTC (rev 8615)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp	2005-01-05 08:47:14 UTC (rev 8616)
@@ -58,7 +58,7 @@
 	return mConvDenominator;
 }
 unsigned long OggMuxStream::numAvail() {
-	return mPageQueue.size();
+	return (unsigned long)mPageQueue.size();
 }
 bool OggMuxStream::acceptOggPage(OggPage* inOggPage) {		//Holds page for later... still needs deleting in destructor
 //	mIsEOS = false;
@@ -122,7 +122,7 @@
 			//Timestamp hacks start here...
 			unsigned long locMod = (unsigned long)pow((double) 2, (double) mConvTheoraLogKeyFrameInterval);
 			
-			unsigned long locInterFrameNo = (inGranulePos) % locMod;
+			unsigned long locInterFrameNo = (unsigned long)((inGranulePos) % locMod);
 	
 			LOOG_INT64 locAbsFramePos = (inGranulePos >> mConvTheoraLogKeyFrameInterval) + locInterFrameNo;
 	

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp	2005-01-05 08:13:44 UTC (rev 8615)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPageInterleaver.cpp	2005-01-05 08:47:14 UTC (rev 8616)
@@ -137,8 +137,8 @@
 					LOOG_INT64 locTestLowTimeUNS = mInputStreams[i]->frontTime();
 					//debugging end
 
-					debugLog<<"writeLowest : Scaled : Curr = "<<locCurrLowTime<<" -- Test["<<i<<"] = "<<locTestLowTime<<endl;
-					debugLog<<"writeLowest : UNSCAL : Curr = "<<locCurrLowTimeUNS<<" -- Test["<<i<<"] = "<<locTestLowTimeUNS<<endl;
+					debugLog<<"writeLowest : Scaled : Curr = "<<locCurrLowTime<<" -- Test["<<(unsigned long)i<<"] = "<<locTestLowTime<<endl;
+					debugLog<<"writeLowest : UNSCAL : Curr = "<<locCurrLowTimeUNS<<" -- Test["<<(unsigned long)i<<"] = "<<locTestLowTimeUNS<<endl;
 
 					
 					//ASSERT (all header packets have granule pos 0)
@@ -191,7 +191,7 @@
 						}
 						//END BEBUGGING BLOCK
 						locLowestStream = mInputStreams[i];
-						debugLog<<"writeLowest : Selecting stream "<<i<<" @ Gran = "<<locLowestStream->frontTime()<<" & Time = "<<locLowestStream->scaledFrontTime()<<endl;
+						debugLog<<"writeLowest : Selecting stream "<<(unsigned long)i<<" @ Gran = "<<locLowestStream->frontTime()<<" & Time = "<<locLowestStream->scaledFrontTime()<<endl;
 					}
 				}
 			}
@@ -241,9 +241,9 @@
 	//ASSERT(mInputStreams.size() >= 1)
 	for (size_t i = 0; i < mInputStreams.size(); i++) {
 		if (mInputStreams[i]->isEOS()) {
-			debugLog<<"isAllEOS : *****                  Stream "<<i<<" is EOS"<<endl;
+			debugLog<<"isAllEOS : *****                  Stream "<<(unsigned long)i<<" is EOS"<<endl;
 		} else {
-			debugLog<<"isAllEOS : *****                  Stream "<<i<<" not EOS"<<endl;
+			debugLog<<"isAllEOS : *****                  Stream "<<(unsigned long)i<<" not EOS"<<endl;
 		}
 		retVal = retVal && (mInputStreams[i]->isEOS() || !mInputStreams[i]->isActive());
 	}

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp	2005-01-05 08:13:44 UTC (rev 8615)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggPaginator.cpp	2005-01-05 08:47:14 UTC (rev 8616)
@@ -342,6 +342,7 @@
 	// a) How much space is left
 	// b) The amount of packet remaining.
 
+	//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);
 
@@ -350,7 +351,7 @@
 	//mPending page has data is useless, it was set before this function is called... need to fix that. maybe move into add part of pack into apge
 	if ((!mPendingPageHasData) && (inStartAt != 0)) {
 		debugLog<<"addAsMuchPacketAsPossible : Setting continuation flag"<<endl;
-		mPendingPage->header()->setHeaderFlags(mPendingPage->header()->HeaderFlags() | (unsigned char)OggPageHeader::CONTINUATION);	
+		mPendingPage->header()->setHeaderFlags((unsigned char)(mPendingPage->header()->HeaderFlags() | OggPageHeader::CONTINUATION));	
 		
 	}
 

Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.cpp	2005-01-05 08:13:44 UTC (rev 8615)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.cpp	2005-01-05 08:47:14 UTC (rev 8616)
@@ -33,7 +33,13 @@
 //
 
 #include "stdafx.h"
+
+//These ignore unreferenced formal parameter (lpReserved and hModule since they are unused)
+#pragma warning( push )
+#pragma warning( disable : 4100 )
 #include <libOOOgg/libOOOgg.h>
+
+
 BOOL APIENTRY DllMain( HANDLE hModule, 
                        DWORD  ul_reason_for_call, 
                        LPVOID lpReserved
@@ -50,3 +56,6 @@
     return TRUE;
 }
 
+//Stop ignoring
+#pragma warning( pop )
+