Fix indentation

Don't delete pointer manually, use smart pointer instead

4 files changed, 18 insertions, 18 deletions

diff --git a/src/AS_DCP_MXF.cpp b/src/AS_DCP_MXF.cpp
index e63faa5..9f6ca3f 100755
--- a/src/AS_DCP_MXF.cpp
+++ b/src/AS_DCP_MXF.cpp
@@ -169,7 +169,7 @@ ASDCP::EssenceType(const std::string& filename, EssenceType_t& type, const Kumu:
   InterchangeObject* md_object = 0;
 
   assert(m_Dict);
-  Kumu::IFileReader*   Reader = fileReaderFactory.CreateFileReader();
+  ASDCP::mem_ptr<Kumu::IFileReader> Reader(fileReaderFactory.CreateFileReader());
   OP1aHeader TestHeader(m_Dict);
 
   Result_t result = Reader->OpenRead(filename);
@@ -285,11 +285,11 @@ ASDCP::EssenceType(const std::string& filename, EssenceType_t& type, const Kumu:
       else
 	{
 	  DefaultLogSink().Error("Unsupported MXF Operational Pattern.\n");
-	  result = RESULT_FORMAT;
+      return RESULT_FORMAT;
 	}
     }
 
-  delete Reader;
+
   return result;
 }
 
diff --git a/src/as-02-unwrap.cpp b/src/as-02-unwrap.cpp
index 5cc0cae..614a624 100755
--- a/src/as-02-unwrap.cpp
+++ b/src/as-02-unwrap.cpp
@@ -1131,24 +1131,24 @@ main(int argc, const char** argv)
       switch ( EssenceType )
 	{
 	case ESS_AS02_JPEG_2000:
-      result = read_JP2K_file(Options, defaultFactory);
+	  result = read_JP2K_file(Options, defaultFactory);
 	  break;
 	//PB
 	case ESS_AS02_ACES:
-      result = read_ACES_file(Options, defaultFactory);
+	  result = read_ACES_file(Options, defaultFactory);
 	  break;
 	//--
 	case ESS_AS02_PCM_24b_48k:
 	case ESS_AS02_PCM_24b_96k:
-      result = read_PCM_file(Options, defaultFactory);
+	  result = read_PCM_file(Options, defaultFactory);
 	  break;
 
 	case ESS_AS02_TIMED_TEXT:
-      result = read_timed_text_file(Options, defaultFactory);
+	  result = read_timed_text_file(Options, defaultFactory);
 	  break;
 
     case ESS_AS02_IAB:
-      result = read_iab_file(Options, defaultFactory);
+	  result = read_iab_file(Options, defaultFactory);
 	  break;
 
 	case ESS_AS02_ISXD:
diff --git a/src/asdcp-test.cpp b/src/asdcp-test.cpp
index 853c10a..838d259 100755
--- a/src/asdcp-test.cpp
+++ b/src/asdcp-test.cpp
@@ -2018,30 +2018,30 @@ main(int argc, const char** argv)
 	  switch ( EssenceType )
 	    {
 	    case ESS_MPEG2_VES:
-          result = read_MPEG2_file(Options, defaultFactory);
+	      result = read_MPEG2_file(Options, defaultFactory);
 	      break;
 
 	    case ESS_JPEG_2000:
 	      if ( Options.stereo_image_flag )
-        result = read_JP2K_S_file(Options, defaultFactory);
+	      result = read_JP2K_S_file(Options, defaultFactory);
 	      else
-        result = read_JP2K_file(Options, defaultFactory);
+	      result = read_JP2K_file(Options, defaultFactory);
 	      break;
 
 	    case ESS_JPEG_2000_S:
-          result = read_JP2K_S_file(Options, defaultFactory);
+	      result = read_JP2K_S_file(Options, defaultFactory);
 	      break;
 
 	    case ESS_PCM_24b_48k:
 	    case ESS_PCM_24b_96k:
-          result = read_PCM_file(Options, defaultFactory);
+	      result = read_PCM_file(Options, defaultFactory);
 	      break;
 
 	    case ESS_TIMED_TEXT:
-          result = read_timed_text_file(Options, defaultFactory);
+	      result = read_timed_text_file(Options, defaultFactory);
 	      break;
 
-		default:
+	      default:
 	      fprintf(stderr, "%s: Unknown file type, not ASDCP essence.\n", Options.filenames[0]);
 	      return 5;
 	    }
diff --git a/src/klvwalk.cpp b/src/klvwalk.cpp
index 4f4af21..4e5194b 100755
--- a/src/klvwalk.cpp
+++ b/src/klvwalk.cpp
@@ -207,16 +207,16 @@ main(int argc, const char** argv)
 	  
 	  if ( ASDCP_SUCCESS(result) )
 	    {
-          result = MXF::SeekToRIP(*Reader);
+		  result = MXF::SeekToRIP(*Reader);
 	      
 	      if ( ASDCP_SUCCESS(result) )
 		{
-          result = RIP.InitFromFile(*Reader);
+		  result = RIP.InitFromFile(*Reader);
 		  ui32_t test_s = RIP.PairArray.size();
 
 		  if ( ASDCP_FAILURE(result) )
 		    {
-		      DefaultLogSink().Error("File contains no RIP\n");              
+		      DefaultLogSink().Error("File contains no RIP\n");
 		      result = RESULT_OK;
 		    }
 		  else if ( RIP.PairArray.empty() )