* samtools-0.1.3-10 (r257)

 * allow hex with "pileup -m"

diff --git a/Makefile.lite b/Makefile.lite
index a539d1eb4e21cc635f25a8d693b8a6c78e3f8e54..90b52e59d7ad9ef47c96822361e2d11e9897d4e1 100644 (file)
--- 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 b1ffdf900cfa7212937b54ead357bbd3bb8579a0..46a2b9957997f89645bd2cae1c80298ee9ef8b28 100644 (file)
--- 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 ff82825c29abc4f578561a1e0032a60f23e00f65..598763546261b7b8aeb53acb208fee2dd0956a00 100644 (file)
--- 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[]);