From: Heng Li <lh3@live.co.uk>
Date: Tue, 5 May 2009 08:53:35 +0000 (+0000)
Subject:  * samtools-0.1.3-10 (r257)
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6bbac7b3489d9aa1154d6acc447072458dfa8c5e;p=samtools.git

 * samtools-0.1.3-10 (r257)
 * allow hex with "pileup -m"
---

diff --git a/Makefile.lite b/Makefile.lite
index a539d1e..90b52e5 100644
--- a/Makefile.lite
+++ b/Makefile.lite
@@ -1,6 +1,6 @@
 CC=			gcc
 CXX=		g++
-CFLAGS=		-g -Wall -O2 -m64 #-arch ppc
+CFLAGS=		-g -Wall -O2 #-arch ppc
 CXXFLAGS=	$(CFLAGS)
 DFLAGS=		-D_IOLIB=2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_NO_CURSES -D_NO_RAZF
 OBJS=		bam.o bam_import.o bam_pileup.o bam_lpileup.o bam_sort.o bam_index.o \
diff --git a/bam_plcmd.c b/bam_plcmd.c
index b1ffdf9..46a2b99 100644
--- a/bam_plcmd.c
+++ b/bam_plcmd.c
@@ -263,7 +263,7 @@ int bam_pileup(int argc, char *argv[])
 		case 'r': d->c->het_rate = atof(optarg); break;
 		case 'c': d->format |= BAM_PLF_CNS; break;
 		case 'i': d->format |= BAM_PLF_INDEL_ONLY; break;
-		case 'm': d->mask = atoi(optarg); break;
+		case 'm': d->mask = strtol(optarg, 0, 0); break;
 		case 'g': d->format |= BAM_PLF_GLF; break;
 		case 'I': d->ido->q_indel = atoi(optarg); break;
 		case 'G': d->ido->r_indel = atof(optarg); break;
diff --git a/bamtk.c b/bamtk.c
index ff82825..5987635 100644
--- a/bamtk.c
+++ b/bamtk.c
@@ -3,7 +3,7 @@
 #include "bam.h"
 
 #ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "0.1.3-9 (r256)"
+#define PACKAGE_VERSION "0.1.3-10 (r257)"
 #endif
 
 int bam_taf2baf(int argc, char *argv[]);