win32 compiler fixes

6 files changed, 22 insertions, 13 deletions

diff --git a/src/AS_DCP_JP2K.cpp b/src/AS_DCP_JP2K.cpp
index 6a41fe8..a1bc499 100755
--- a/src/AS_DCP_JP2K.cpp
+++ b/src/AS_DCP_JP2K.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2004-2013, John Hurst
+Copyright (c) 2004-2014, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -296,7 +296,7 @@ ASDCP::MD_to_JP2K_PDesc(const ASDCP::MXF::GenericPictureEssenceDescriptor&  Esse
     }
   else
     {
-      DefaultLogSink().Error("Unexpected PictureComponentSizing size: %u, should be 17\n", tmp_size);
+      DefaultLogSink().Warn("Unexpected PictureComponentSizing size: %u, should be 17\n", tmp_size);
     }
 
   // CodingStyleDefault
diff --git a/src/AtmosSyncChannel_Mixer.cpp b/src/AtmosSyncChannel_Mixer.cpp
index a58b3cd..b035341 100644
--- a/src/AtmosSyncChannel_Mixer.cpp
+++ b/src/AtmosSyncChannel_Mixer.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2013-2013, John Hurst
+Copyright (c) 2013-2014, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -64,11 +64,14 @@ ASDCP::AtmosSyncChannelMixer::clear()
 Result_t
 ASDCP::AtmosSyncChannelMixer::OpenRead(ui32_t argc, const char** argv, const Rational& PictureRate)
 {
-  ASDCP_TEST_NULL_STR(argv);
+  ASDCP_TEST_NULL(argv);
   PathList_t TmpFileList;
 
   for ( ui32_t i = 0; i < argc; ++i )
-    TmpFileList.push_back(argv[i]);
+    {
+      ASDCP_TEST_NULL_STR(argv[i]);
+      TmpFileList.push_back(argv[i]);
+    }
 
   return OpenRead(TmpFileList, PictureRate);
 }
diff --git a/src/KM_fileio.cpp b/src/KM_fileio.cpp
index 2b95d63..a7de3c2 100644
--- a/src/KM_fileio.cpp
+++ b/src/KM_fileio.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2004-2012, John Hurst
+Copyright (c) 2004-2014, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -691,7 +691,7 @@ Kumu::FileReader::OpenRead(const std::string& filename) const
   // suppress popup window on error
   UINT prev = ::SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);
 
-  const_cast<FileReader*>(this)->m_Handle = ::CreateFileA(filename,
+  const_cast<FileReader*>(this)->m_Handle = ::CreateFileA(filename.c_str(),
 			  (GENERIC_READ),                // open for reading
 			  FILE_SHARE_READ,               // share for reading
 			  NULL,                          // no security
diff --git a/src/MXFTypes.h b/src/MXFTypes.h
index e98a2e9..fbf3038 100755
--- a/src/MXFTypes.h
+++ b/src/MXFTypes.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2005-2012, John Hurst
+Copyright (c) 2005-2014, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -354,7 +354,7 @@ namespace ASDCP
 	  void Dump(FILE* = 0);
 
 	  const char* EncodeString(char* str_buf, ui32_t buf_len) const {
-	    snprintf(str_buf, buf_len, "%hu.%hu.%hu.%hur%hu", Major, Minor, Patch, Build, Release);
+	    snprintf(str_buf, buf_len, "%hu.%hu.%hu.%hur%hu", Major, Minor, Patch, Build, ui16_t(Release));
 	    return str_buf;
 	  }
 
diff --git a/src/PCMParserList.cpp b/src/PCMParserList.cpp
index 8b81619..4f43c4e 100755
--- a/src/PCMParserList.cpp
+++ b/src/PCMParserList.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2004-2013, John Hurst
+Copyright (c) 2004-2014, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -110,11 +110,14 @@ ASDCP::PCMParserList::~PCMParserList()
 Result_t
 ASDCP::PCMParserList::OpenRead(ui32_t argc, const char** argv, const Rational& PictureRate)
 {
-  ASDCP_TEST_NULL_STR(argv);
+  ASDCP_TEST_NULL(argv);
   PathList_t TmpFileList;
 
   for ( ui32_t i = 0; i < argc; ++i )
-    TmpFileList.push_back(argv[i]);
+    {
+      ASDCP_TEST_NULL(argv[i]);
+      TmpFileList.push_back(argv[i]);
+    }
 
   return OpenRead(TmpFileList, PictureRate);
 }
diff --git a/src/TimedText_Parser.cpp b/src/TimedText_Parser.cpp
index 3312b58..ea5f0a9 100644
--- a/src/TimedText_Parser.cpp
+++ b/src/TimedText_Parser.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2007-2013, John Hurst
+Copyright (c) 2007-2014, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -70,7 +70,10 @@ ASDCP::TimedText::LocalFilenameResolver::ResolveRID(const byte_t* uuid, TimedTex
   UUID RID(uuid);
   PathList_t found_list;
 
+#ifndef KM_WIN32
+  // TODO, fix this for win32 (needs regex)
   FindInPath(PathMatchRegex(RID.EncodeHex(buf, 64)), m_Dirname, found_list);
+#endif
 
   if ( found_list.size() == 1 )
     {