X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2FMXFTypes.h;h=c49fed9b6f07b267e1f5de0621865dc7c65a4db2;hb=f4061a21fffad4fdf8dbb2f193f0f0960b25421c;hp=cf3d57c891fdf947d7d4ff3aef0aed9a9e3909ed;hpb=9231719df5d33bc1f398a36a5f070a1de5213908;p=asdcplib.git

diff --git a/src/MXFTypes.h b/src/MXFTypes.h
index cf3d57c..c49fed9 100755
--- a/src/MXFTypes.h
+++ b/src/MXFTypes.h
@@ -112,12 +112,12 @@ namespace ASDCP
 	  bool HasValue() const { return ! this->empty(); }
 
 	  ui32_t ArchiveLength() const {
-	    return ( sizeof(ui32_t) * 2 ) +  ( this->size() * this->ItemSize() );
+	    return ( sizeof(ui32_t) * 2 ) +  ( (ui32_t)this->size() * this->ItemSize() );
 	  }
 
 	  bool Archive(Kumu::MemIOWriter* Writer) const {
-	    if ( ! Writer->WriteUi32BE(this->size()) ) return false;
-	    if ( ! Writer->WriteUi32BE(this->ItemSize()) ) return false;
+	    if ( ! Writer->WriteUi32BE((ui32_t)this->size()) ) return false;
+	    if ( ! Writer->WriteUi32BE((ui32_t)this->ItemSize()) ) return false;
 	    if ( this->empty() ) return true;
 	    
 	    typename ContainerType::const_iterator i;
@@ -277,7 +277,7 @@ namespace ASDCP
 
 	  const char* EncodeString(char* str_buf, ui32_t buf_len) const;
 	  inline virtual bool HasValue() const { return ! empty(); }
-	  inline virtual ui32_t ArchiveLength() const { return sizeof(ui32_t) + size(); }
+	  inline virtual ui32_t ArchiveLength() const { return (ui32_t)(sizeof(ui32_t) + size()); }
 	  virtual bool Unarchive(Kumu::MemIOReader* Reader);
 	  virtual bool Archive(Kumu::MemIOWriter* Writer) const;
 	};
@@ -296,7 +296,7 @@ namespace ASDCP
 
 	  const char* EncodeString(char* str_buf, ui32_t buf_len) const;
 	  inline virtual bool HasValue() const { return ! empty(); }
-	  inline virtual ui32_t ArchiveLength() const { return sizeof(ui32_t) + size(); }
+	  inline virtual ui32_t ArchiveLength() const { return (ui32_t)(sizeof(ui32_t) + size()); }
 	  virtual bool Unarchive(Kumu::MemIOReader* Reader);
 	  virtual bool Archive(Kumu::MemIOWriter* Writer) const;
 	};
@@ -359,7 +359,7 @@ namespace ASDCP
 	  ui32_t First;
 	  ui32_t Second;
 
-	  LineMapPair() {}
+	LineMapPair() : First(0), Second() {}
 	  ~LineMapPair() {}
 
 	LineMapPair(const ui32_t& first, const ui32_t& second) : IArchive() {