From 917a15eeb9a380f2755a44a4ca2ffbca3653183d Mon Sep 17 00:00:00 2001
From: Nicholas Hastings <nshastings@gmail.com>
Date: Thu, 30 Oct 2014 17:23:34 -0400
Subject: [PATCH] Add back some fixes that got clobbered in sync.

---
 public/bitmap/imageformat.h |  2 +-
 public/studio.h             |  5 +++--
 public/tier1/bitbuf.h       | 16 ++++++++--------
 tier1/bitbuf.cpp            |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/public/bitmap/imageformat.h b/public/bitmap/imageformat.h
index 34d268e8..1a749c27 100644
--- a/public/bitmap/imageformat.h
+++ b/public/bitmap/imageformat.h
@@ -376,7 +376,7 @@ namespace ImageLoader
 	struct ResampleInfo_t
 	{
 
-		ResampleInfo_t() : m_nFlags(0), m_flAlphaThreshhold(0.4f), m_flAlphaHiFreqThreshhold(0.4f), m_nSrcDepth(1), m_nDestDepth(1)
+		ResampleInfo_t() : m_nSrcDepth(1), m_nDestDepth(1), m_flAlphaThreshhold(0.4f), m_flAlphaHiFreqThreshhold(0.4f), m_nFlags(0)
 		{
 			m_flColorScale[0] = 1.0f, m_flColorScale[1] = 1.0f, m_flColorScale[2] = 1.0f, m_flColorScale[3] = 1.0f;
 			m_flColorGoal[0] = 0.0f, m_flColorGoal[1] = 0.0f, m_flColorGoal[2] = 0.0f, m_flColorGoal[3] = 0.0f;
diff --git a/public/studio.h b/public/studio.h
index e5118adf..b6b9ae1e 100644
--- a/public/studio.h
+++ b/public/studio.h
@@ -2571,10 +2571,11 @@ public:
 
 		// ctor
 		CActivityToSequenceMapping( void ) 
-			: m_pSequenceTuples(NULL), m_iSequenceTuplesCount(0), m_ActToSeqHash(8,0,0), m_expectedPStudioHdr(NULL), m_expectedVModel(NULL) 
+			: m_pSequenceTuples(NULL), m_iSequenceTuplesCount(0),
 #if STUDIO_SEQUENCE_ACTIVITY_LAZY_INITIALIZE
-			, m_bIsInitialized(false) 
+			m_bIsInitialized(false),
 #endif
+			m_ActToSeqHash(8,0,0), m_expectedPStudioHdr(NULL), m_expectedVModel(NULL)
 		{};
 
 		// dtor -- not virtual because this class has no inheritors
diff --git a/public/tier1/bitbuf.h b/public/tier1/bitbuf.h
index b47d80d5..04d77a03 100644
--- a/public/tier1/bitbuf.h
+++ b/public/tier1/bitbuf.h
@@ -181,7 +181,7 @@ public:
 	void			WriteOneBitAt( int iBit, int nValue );
 	
 	// Write signed or unsigned. Range is only checked in debug.
-	void			WriteUBitLong( unsigned int data, int numbits, bool bCheckRange=true );
+	void			WriteUBitLong( unsigned int data, int numbits, bool bCheckRange=true ) RESTRICT;
 	void			WriteSBitLong( int data, int numbits );
 	
 	// Tell it whether or not the data is unsigned. If it's signed,
@@ -241,7 +241,7 @@ public:
 	int				GetNumBytesWritten() const;
 	int				GetNumBitsWritten() const;
 	int				GetMaxNumBits();
-	int				GetNumBitsLeft();
+	int				GetNumBitsLeft() RESTRICT;
 	int				GetNumBytesLeft();
 	unsigned char*	GetData();
 	const unsigned char*	GetData() const;
@@ -250,7 +250,7 @@ public:
 	bool			CheckForOverflow(int nBits);
 	inline bool		IsOverflowed() const {return m_bOverflow;}
 
-	void			SetOverflowFlag();
+	void			SetOverflowFlag() RESTRICT;
 
 
 public:
@@ -292,7 +292,7 @@ inline int bf_write::GetMaxNumBits()
 	return m_nDataBits;
 }
 
-inline int bf_write::GetNumBitsLeft()	
+inline int bf_write::GetNumBitsLeft() RESTRICT
 {
 	return m_nDataBits - m_iCurBit;
 }
@@ -323,7 +323,7 @@ BITBUF_INLINE bool bf_write::CheckForOverflow(int nBits)
 	return m_bOverflow;
 }
 
-BITBUF_INLINE void bf_write::SetOverflowFlag()
+BITBUF_INLINE void bf_write::SetOverflowFlag() RESTRICT
 {
 #ifdef DBGFLAG_ASSERT
 	if ( m_bAssertOnOverflow )
@@ -635,7 +635,7 @@ public:
 public:
 	int				GetNumBytesLeft();
 	int				GetNumBytesRead();
-	int				GetNumBitsLeft();
+	int				GetNumBitsLeft() RESTRICT;
 	int				GetNumBitsRead() const;
 
 	// Has the buffer overflowed?
@@ -645,7 +645,7 @@ public:
 	inline bool		SeekRelative(int iBitDelta);	// Seek to an offset from the current position.
 
 	// Called when the buffer is overflowed.
-	void			SetOverflowFlag();
+	void			SetOverflowFlag() RESTRICT;
 
 
 public:
@@ -678,7 +678,7 @@ inline int bf_read::GetNumBytesRead()
 	return BitByte(m_iCurBit);
 }
 
-inline int bf_read::GetNumBitsLeft()	
+inline int bf_read::GetNumBitsLeft() RESTRICT
 {
 	return m_nDataBits - m_iCurBit;
 }
diff --git a/tier1/bitbuf.cpp b/tier1/bitbuf.cpp
index 4c457aa4..5a37d24f 100644
--- a/tier1/bitbuf.cpp
+++ b/tier1/bitbuf.cpp
@@ -849,7 +849,7 @@ void bf_read::SetDebugName( const char *pName )
 	m_pDebugName = pName;
 }
 
-void bf_read::SetOverflowFlag()
+void bf_read::SetOverflowFlag() RESTRICT
 {
 	if ( m_bAssertOnOverflow )
 	{