Merge pull request #9 from daviesrob/ref_fix

Use HTSlib API to set the CRAM reference

Makefile

@@ -1,6 +1,6 @@
 # use g++ compiler
 CXX=g++
-CXXFLAGS?=-std=c++11 -fpermissive
+CXXFLAGS?=-Wall -pedantic -std=c++11
 
 # flag specifications for release and debug
 RELEASEFLAGS?=$(CXXFLAGS) -O3

count.cpp

@@ -67,6 +67,11 @@ counts_t compute_counts(const char* const in_reads_fn, std::string const & ref,
         std::cerr << "Not a CRAM/BAM/SAM file: " << in_reads_fn << std::endl; exit(1);
     }
 
+    // if CRAM file, load reference in htslib
+    if(reads->format.format == cram) {
+        hts_set_opt(reads, CRAM_OPT_REFERENCE, user_args.in_ref_fn);
+    }
+
     // set up htsFile for parsing
     bam_hdr_t* header = sam_hdr_read(reads);
     if(!header) {
@@ -75,11 +80,6 @@ counts_t compute_counts(const char* const in_reads_fn, std::string const & ref,
         std::cerr << "CRAM/BAM/SAM has " << header->n_targets << " references, but it should have exactly 1: " << in_reads_fn << std::endl; exit(1);
     }
 
-    // if CRAM file, load reference in htslib
-    if(reads->format.format == cram) {
-        cram_load_reference((reads->fp).cram, user_args.in_ref_fn);
-    }
-
     // prepare helper variables for computing counts
     counts_t counts;                             // counts_t object to store the counts themselves
     bam1_t* src = bam_init1();                   // holds the current alignment record, which is read by sam_read1()

count.h

@@ -1,6 +1,5 @@
 #ifndef COUNT_H
 #define COUNT_H
-#include "htslib/cram/cram.h"
 #include "common.h"
 #include "argparse.h"