update makefile for version roll

[asdcplib.git] / src / h__Reader.cpp

diff --git a/src/h__Reader.cpp b/src/h__Reader.cpp
index b1c055591aaf0c478a8c4f54111f399d82ca4625..d0c5168929f0889aad076b5f66e36599cee11187 100755 (executable)
--- a/src/h__Reader.cpp
+++ b/src/h__Reader.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2004-2013, John Hurst
+Copyright (c) 2004-2015, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@ using namespace ASDCP::MXF;
 
 static Kumu::Mutex sg_DefaultMDInitLock;
 static bool        sg_DefaultMDTypesInit = false;
-static const ASDCP::Dictionary *sg_dict;
+static const ASDCP::Dictionary *sg_dict = 0;
 
 //
 void
@@ -70,7 +70,7 @@ ASDCP::h__ASDCPReader::~h__ASDCPReader() {}
 
 // AS-DCP method of opening an MXF file for read
 Result_t
-ASDCP::h__ASDCPReader::OpenMXFRead(const char* filename)
+ASDCP::h__ASDCPReader::OpenMXFRead(const std::string& filename)
 {
   Result_t result = ASDCP::MXF::TrackFileReader<OP1aHeader, OPAtomIndexFooter>::OpenMXFRead(filename);
 
@@ -126,7 +126,7 @@ ASDCP::h__ASDCPReader::OpenMXFRead(const char* filename)
         {
          // if this is a three partition file, go to the body
          // partition and read the partition pack
-         Array<RIP::Pair>::iterator r_i = m_RIP.PairArray.begin();
+         RIP::const_pair_iterator r_i = m_RIP.PairArray.begin();
          r_i++;
          m_File.Seek((*r_i).ByteOffset);
          result = m_BodyPart.InitFromFile(m_File);