Merge pull request #47 from philres/develop

v2.0.8
philres · Aug 2, 2018 · 2d91b8e · 2d91b8e
2 parents 1f36b23 + 3bf6aab
commit 2d91b8e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+  cmake_minimum_required(VERSION 2.8)
 project(ngmlr)
 
 include(CheckCXXCompilerFlag)
@@ -9,9 +9,9 @@ set( NGM_VERSION_MAJOR 0 )
 set( NGM_VERSION_MINOR 2 )
 IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
     message(STATUS "Building in debug mode!")
-    set( NGM_VERSION_BUILD 7-debug )
+    set( NGM_VERSION_BUILD 8-debug )
 else()
-  set( NGM_VERSION_BUILD 7 )
+  set( NGM_VERSION_BUILD 8 )
 ENDIF()
 
 find_package( ZLIB REQUIRED )

diff --git a/src/AlignmentBuffer.cpp b/src/AlignmentBuffer.cpp
@@ -2372,10 +2372,7 @@ void AlignmentBuffer::verbose(int const tabs, bool const newLine, char const * c
 		va_list args;
 
 		va_start(args, s);
-		if (args != 0)
-			vfprintf(stderr, s, args);
-		else
-			fprintf(stderr, "%s", s);
+		vfprintf(stderr, s, args);
 		va_end(args);
 
 		if(newLine) {

diff --git a/src/MappedRead.cpp b/src/MappedRead.cpp
@@ -1,5 +1,5 @@
 /**
- /**
+ *
  * Contact: [email protected]
  */
 

diff --git a/src/SAMWriter.cpp b/src/SAMWriter.cpp
@@ -36,7 +36,6 @@ void SAMWriter::DoWriteProlog() {
 	version << VERSION_MAJOR << "." << VERSION_MINOR << "." << VERSION_BUILD;
 	Print("@PG\tID:ngmlr\tPN:nextgenmap-lr\tVN:%s\tCL:%s\n", version.str().c_str(), Config.getFullCommandLineCall());
 
-	rgId = Config.getRgId();
 	if (rgId != 0) {
 		Print("@RG\tID:%s", rgId);
 

diff --git a/src/SAMWriter.h b/src/SAMWriter.h
@@ -13,11 +13,7 @@ class SAMWriter: public GenericReadWriter {
 	SAMWriter(FileWriter * writer) :
 			GenericReadWriter() {
 
-//		if(Config.Exists(RG_ID)) {
-//			RG = Config.GetString(RG_ID);
-//		} else {
-			rgId = 0;
-//		}
+		rgId = Config.getRgId();
 		m_Writer = writer;
 	}
 

diff --git a/src/Version.h b/src/Version.h
@@ -3,7 +3,7 @@
 
 #define VERSION_MAJOR "0"
 #define VERSION_MINOR "2"
-#define VERSION_BUILD "7"
+#define VERSION_BUILD "8"
 
 #endif // VERSION_H
-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     /**
-     /**
+     *
      * Contact: [email protected]
      */
@@ Expand Down @@