Fix constructor initializer order.

diff --git a/src/AS_02_PHDR.cpp b/src/AS_02_PHDR.cpp
index 4dbbb21c223137a1f312b1b2641d91a731d7426d..09cea222307e93c01c3f383ba3bc48487801dfdf 100644 (file)
--- a/src/AS_02_PHDR.cpp
+++ b/src/AS_02_PHDR.cpp
@@ -24,7 +24,7 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/ 
+*/
 /*! \file    AS_02_PHDR.cpp
   \version $Id: AS_02_PHDR.cpp,v 1.7 2015/10/09 23:41:11 jhurst Exp $
   \brief   AS-02 library, JPEG 2000 P-HDR essence reader and writer implementation
@@ -146,7 +146,7 @@ AS_02::PHDR::MXFReader::h__Reader::OpenRead(const std::string& filename, std::st
     {
       RIP::const_pair_iterator pi;
       RIP::PartitionPair TmpPair;
-      
+
       // Look up the partition start in the RIP using the SID.
       for ( pi = m_RIP.PairArray.begin(); pi != m_RIP.PairArray.end(); ++pi )
        {
@@ -356,7 +356,7 @@ public:
   byte_t            m_EssenceUL[SMPTE_UL_LENGTH];
   byte_t            m_MetadataUL[SMPTE_UL_LENGTH];
 
-  h__Writer(const Dictionary& d) : h__AS02WriterFrame(d), m_EssenceSubDescriptor(0), m_MetadataTrackSubDescriptor(0) {
+  h__Writer(const Dictionary& d) : h__AS02WriterFrame(d), m_MetadataTrackSubDescriptor(0), m_EssenceSubDescriptor(0) {
     memset(m_EssenceUL, 0, SMPTE_UL_LENGTH);
     memset(m_MetadataUL, 0, SMPTE_UL_LENGTH);
   }
@@ -444,9 +444,9 @@ AS_02::PHDR::MXFWriter::h__Writer::WritePHDRHeader(const std::string& PackageLab
       DefaultLogSink().Error("Non-zero edit-rate reqired.\n");
       return RESULT_PARAM;
     }
-  
+
   InitHeader();
-  
+
   AddSourceClip(EditRate, EditRate/*TODO: for a moment*/, TCFrameRate, TrackName, EssenceUL, DataDefinition, PackageLabel);
 
   // add metadata track
@@ -469,7 +469,7 @@ AS_02::PHDR::MXFWriter::h__Writer::WritePHDRHeader(const std::string& PackageLab
   // for now we do not allow setting this value, so all files will be 'original'
   metdata_track.Clip->SourceTrackID = 0;
   metdata_track.Clip->SourcePackageID = NilUMID;
-  
+
   metdata_track.Clip->Duration.set_has_value();
   m_DurationUpdateList.push_back(&(metdata_track.Clip->Duration.get()));
 
@@ -571,20 +571,20 @@ AS_02::PHDR::MXFWriter::h__Writer::WriteFrame(const AS_02::PHDR::FrameBuffer& Fr
 
       result = Write_EKLV_Packet(m_File, *m_Dict, m_HeaderPart, m_Info, m_CtFrameBuf, m_FramesWritten,
                                 m_StreamOffset, FrameBuf, m_EssenceUL, Ctx, HMAC);
-      
+
       if ( KM_SUCCESS(result) )
        {
          ASDCP::FrameBuffer metadata_buffer_wrapper;
          metadata_buffer_wrapper.SetData((byte_t*)(FrameBuf.OpaqueMetadata.c_str()), FrameBuf.OpaqueMetadata.size());
          metadata_buffer_wrapper.Size(FrameBuf.OpaqueMetadata.size());
-         
-         
+
+
          result = Write_EKLV_Packet(m_File, *m_Dict, m_HeaderPart, m_Info, m_CtFrameBuf, m_FramesWritten,
                                     m_StreamOffset, metadata_buffer_wrapper, m_MetadataUL, Ctx, HMAC);
        }
-      
+
       if ( KM_SUCCESS(result) )
-       {  
+       {
          IndexTableSegment::IndexEntry Entry;
          Entry.StreamOffset = this_stream_offset;
          m_IndexWriter.PushIndexEntry(Entry);
@@ -751,7 +751,7 @@ AS_02::PHDR::MXFWriter::OpenWrite(const std::string& filename, const ASDCP::Writ
 // argument is present, the essence is encrypted prior to writing.
 // Fails if the file is not open, is finalized, or an operating system
 // error occurs.
-Result_t 
+Result_t
 AS_02::PHDR::MXFWriter::WriteFrame(const AS_02::PHDR::FrameBuffer& FrameBuf, AESEncContext* Ctx, HMACContext* HMAC)
 {
   if ( m_Writer.empty() )

diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h
index a52bd75b125897a9e23c741d378db1fc7aa0b684..3f60b601d876b19b9b3eb739fb9ae7b7848c4529 100755 (executable)
--- a/src/AS_DCP_internal.h
+++ b/src/AS_DCP_internal.h
@@ -200,7 +200,7 @@ namespace ASDCP
        Kumu::fpos_t       m_LastPosition;
 
       TrackFileReader(const Dictionary& d) :
-       m_HeaderPart(m_Dict), m_IndexAccess(m_Dict), m_RIP(m_Dict), m_Dict(&d)
+       m_Dict(&d), m_HeaderPart(m_Dict), m_IndexAccess(m_Dict), m_RIP(m_Dict)
          {
            default_md_object_init();
          }

diff --git a/src/KM_util.cpp b/src/KM_util.cpp
index f738814fd96c50cf47688f0250be71ae7906998b..e6d04a74ebc60f80b28633c5052e1bfcbdec3256 100755 (executable)
--- a/src/KM_util.cpp
+++ b/src/KM_util.cpp
@@ -129,7 +129,7 @@ Kumu::Result_t::Get(unsigned int i)
 }
 
 //
-Kumu::Result_t::Result_t(int v, const std::string& s, const std::string& l) : value(v), symbol(s), label(l)
+Kumu::Result_t::Result_t(int v, const std::string& s, const std::string& l) : value(v), label(l), symbol(s)
 {
   assert(!l.empty());
   assert(!s.empty());

diff --git a/src/MXF.cpp b/src/MXF.cpp
index cc84797f1a5ec7d1622937df24a028473cd1a378..ca3ee520af5ba0b07065b904f7c52864782dc597 100755 (executable)
--- a/src/MXF.cpp
+++ b/src/MXF.cpp
@@ -983,8 +983,8 @@ ASDCP::MXF::OP1aHeader::Dump(FILE* stream)
 //
 
 ASDCP::MXF::OPAtomIndexFooter::OPAtomIndexFooter(const Dictionary*& d) :
-  Partition(d), m_Dict(d),
-  m_CurrentSegment(0), m_BytesPerEditUnit(0), m_BodySID(0),
+  Partition(d),
+  m_CurrentSegment(0), m_BytesPerEditUnit(0), m_BodySID(0), m_Dict(d),
   m_ECOffset(0), m_Lookup(0)
 {
   BodySID = 0;
@@ -1648,7 +1648,7 @@ ASDCP::MXF::decode_mca_string(const std::string& s, const mca_label_map_t& label
 }
 
 //
-ASDCP::MXF::ASDCP_MCAConfigParser::ASDCP_MCAConfigParser(const Dictionary*& d) : m_Dict(d), m_ChannelCount(0)
+ASDCP::MXF::ASDCP_MCAConfigParser::ASDCP_MCAConfigParser(const Dictionary*& d) : m_ChannelCount(0), m_Dict(d)
 {
   typedef mca_label_map_t::value_type pair;
   m_LabelMap.insert(pair("L",     label_traits("Left"                              , true,  m_Dict->ul(MDD_DCAudioChannel_L))));

diff --git a/src/PCMDataProviders.cpp b/src/PCMDataProviders.cpp
index 2ba7836392fd0bec47a427010ea8874d960e7694..d883718728d147b0dee78b3bfabb64a95f69ba8c 100644 (file)
--- a/src/PCMDataProviders.cpp
+++ b/src/PCMDataProviders.cpp
@@ -40,7 +40,7 @@ ASDCP::PCMDataProviderInterface::~PCMDataProviderInterface() {}
 
 //
 ASDCP::WAVDataProvider::WAVDataProvider()
-    : m_Parser(), m_FB(), m_ADesc(), m_SampleSize(0), m_ptr(NULL)
+    : m_Parser(), m_FB(), m_ADesc(), m_ptr(NULL), m_SampleSize(0)
 {}
 
 ASDCP::WAVDataProvider::~WAVDataProvider()

diff --git a/src/asdcp-wrap.cpp b/src/asdcp-wrap.cpp
index 8e683e18d35f495c6326d6778bc4d30c7755bf09..0e6a97665bed68416c1a0f794ee94bb0e408b3e1 100755 (executable)
--- a/src/asdcp-wrap.cpp
+++ b/src/asdcp-wrap.cpp
@@ -291,19 +291,20 @@ public:
 
   //
   CommandOptions(int argc, const char** argv) :
-    error_flag(true), key_flag(false), key_id_flag(false), asset_id_flag(false),
+    error_flag(true), key_flag(false), asset_id_flag(false),
     encrypt_header_flag(true), write_hmac(true),
     verbose_flag(false), fb_dump_size(0),
     no_write_flag(false), version_flag(false), help_flag(false), stereo_image_flag(false),
     write_partial_pcm_flag(false), start_frame(0),
     duration(0xffffffff), use_smpte_labels(false), j2c_pedantic(true),
     fb_size(FRAME_BUFFER_SIZE),
+    key_id_flag(false),
     channel_fmt(PCM::CF_NONE),
-    ffoa(0), max_channel_count(10), max_object_count(118), // hard-coded sample atmos properties
-    dolby_atmos_sync_flag(false),
     show_ul_values_flag(false),
-    mca_config(g_dict),
-    use_interop_sound_wtf(false)
+    dolby_atmos_sync_flag(false),
+    ffoa(0), max_channel_count(10), max_object_count(118), // hard-coded sample atmos properties
+    use_interop_sound_wtf(false),
+    mca_config(g_dict)
   {
     memset(key_value, 0, KeyLen);
     memset(key_id_value, 0, UUIDlen);

diff --git a/src/h__02_Reader.cpp b/src/h__02_Reader.cpp
index b83fdffc930443c151a2a3f6ce450512b9eb32e3..5a0f73192d05286af56f67debea9dbb393272526 100644 (file)
--- a/src/h__02_Reader.cpp
+++ b/src/h__02_Reader.cpp
@@ -25,7 +25,7 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/ 
+*/
 /*! \file    h__02_Reader.cpp
   \version $Id: h__02_Reader.cpp,v 1.15 2015/10/12 15:30:46 jhurst Exp $
   \brief   MXF file reader base class
@@ -62,14 +62,14 @@ AS_02::default_md_object_init()
 //---------------------------------------------------------------------------------
 //
 
-    
+
 AS_02::MXF::AS02IndexReader::AS02IndexReader(const ASDCP::Dictionary*& d) :
-  m_Duration(0), m_BytesPerEditUnit(0),
-  ASDCP::MXF::Partition(d), m_Dict(d) {}
+  ASDCP::MXF::Partition(d),
+  m_Duration(0), m_BytesPerEditUnit(0), m_Dict(d) {}
 
 AS_02::MXF::AS02IndexReader::~AS02IndexReader() {}
 
-//    
+//
 Result_t
 AS_02::MXF::AS02IndexReader::InitFromFile(const Kumu::FileReader& reader, const ASDCP::MXF::RIP& rip, const bool has_header_essence)
 {
@@ -198,7 +198,7 @@ AS_02::MXF::AS02IndexReader::InitFromFile(const Kumu::FileReader& reader, const
   if ( KM_SUCCESS(result) )
     {
       std::list<InterchangeObject*>::const_iterator ii;
-  
+
       for ( ii = m_PacketList->m_List.begin(); ii != m_PacketList->m_List.end(); ++ii )
        {
          IndexTableSegment *segment = dynamic_cast<IndexTableSegment*>(*ii);