Skip to content

Commit b7af040

Browse files
Merge pull request #136 from blachlylab/htslib-1.16
Update htslib bindings to Htslib 1.16
2 parents 15ba6bf + 8352fdb commit b7af040

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1133
-359
lines changed

dstep/d_changes/cram.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,21 @@
2929
83,84d108
3030
< struct hFILE;
3131
<
32-
447c471
32+
485c509
3333
< alias SAM_hdr = sam_hdr_t_;
3434
---
3535
> alias SAM_hdr = sam_hdr_t;
36-
457c481,482
36+
495c519,520
3737
< SAM_hdr* sam_hdr_parse_(const(char)* hdr, size_t len);
3838
---
3939
> pragma(inline, true)
4040
> SAM_hdr* sam_hdr_parse_(const (char)* hdr, size_t len) { return sam_hdr_parse(len, hdr); }
41-
465c490,491
41+
503c528,529
4242
< void sam_hdr_free(SAM_hdr* hdr);
4343
---
4444
> pragma(inline, true)
4545
> void sam_hdr_free(SAM_hdr* hdr) { sam_hdr_destroy(hdr); }
46-
485c511
46+
523c549
4747
< enum sam_hdr_add_PG = sam_hdr_add_pg;
4848
---
4949
> alias sam_hdr_add_PG = sam_hdr_add_pg;

dstep/d_changes/hfile.diff

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
4c4
2-
< Copyright (C) 2013-2021 Genome Research Ltd.
3-
---
4-
> Copyright (C) 2013-2020 Genome Research Ltd.
51
25d24
62
<
73
28a28,34

dstep/d_changes/hts.diff

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
4c4
2-
< Copyright (C) 2012-2021 Genome Research Ltd.
3-
---
4-
> Copyright (C) 2012-2020 Genome Research Ltd.
51
27d26
62
<
73
34a34,44

dstep/d_changes/hts_endian.diff

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
> alias uint32_u = align(1) uint;
3636
> alias uint64_u = align(1) c_ulong;
3737
> }else{
38-
77a99,144
38+
77a99,142
3939
> }
4040
>
4141
>
@@ -80,9 +80,12 @@
8080
> }
8181
>
8282
>
83-
>
84-
>
85-
78a146,186
83+
80,83d144
84+
< /* @param buf Pointer to source byte, may be unaligned
85+
< * @return An 8-bit unsigned integer
86+
< */
87+
< ubyte le_to_u8(const(ubyte)* buf);
88+
84a146,186
8689
> private struct int16_t
8790
> {
8891
> short _val;
@@ -124,7 +127,7 @@
124127
> @nogc:
125128
> @system:
126129
> nothrow:
127-
84c192,198
130+
90c192,198
128131
< ushort le_to_u16(const(ubyte)* buf);
129132
---
130133
> ushort le_to_u16(const(ubyte)* buf)
@@ -134,7 +137,7 @@
134137
> else
135138
> return cast(ushort) buf[0] | (cast(ushort) buf[1] << 8);
136139
> }
137-
91c205,214
140+
97c205,214
138141
< uint le_to_u32(const(ubyte)* buf);
139142
---
140143
> uint le_to_u32(const(ubyte)* buf)
@@ -147,7 +150,7 @@
147150
> (cast(uint) buf[2] << 16) |
148151
> (cast(uint) buf[3] << 24));
149152
> }
150-
98c221,234
153+
104c221,234
151154
< ulong le_to_u64(const(ubyte)* buf);
152155
---
153156
> ulong le_to_u64(const(ubyte)* buf)
@@ -164,7 +167,7 @@
164167
> (cast(ulong) buf[6] << 48) |
165168
> (cast(ulong) buf[7] << 56));
166169
> }
167-
104c240,248
170+
110c240,248
168171
< void u16_to_le(ushort val, ubyte* buf);
169172
---
170173
> void u16_to_le(ushort val, ubyte* buf)
@@ -176,7 +179,7 @@
176179
> buf[1] = (val >> 8) & 0xff;
177180
> }
178181
> }
179-
110c254,264
182+
116c254,264
180183
< void u32_to_le(uint val, ubyte* buf);
181184
---
182185
> void u32_to_le(uint val, ubyte* buf)
@@ -190,7 +193,7 @@
190193
> buf[3] = (val >> 24) & 0xff;
191194
> }
192195
> }
193-
116c270,284
196+
122c270,284
194197
< void u64_to_le(ulong val, ubyte* buf);
195198
---
196199
> void u64_to_le(ulong val, ubyte* buf)
@@ -208,30 +211,30 @@
208211
> buf[7] = (val >> 56) & 0xff;
209212
> }
210213
> }
211-
128c296,299
214+
134c296,299
212215
< byte le_to_i8(const(ubyte)* buf);
213216
---
214217
> byte le_to_i8(const(ubyte)* buf)
215218
> {
216219
> return *buf < 0x80 ? cast(int8_t) *buf : -((int8_t(cast(byte)0xff) - cast(int8_t)*buf)) - int8_t(1);
217220
> }
218-
136c307,311
221+
142c307,311
219222
< short le_to_i16(const(ubyte)* buf);
220223
---
221224
> short le_to_i16(const(ubyte)* buf)
222225
> {
223226
> ushort v = le_to_u16(buf);
224227
> return v < 0x8000 ? cast(int16_t) v : -((int16_t(cast(short)0xffff) - v)) - cast(int16_t)1;
225228
> }
226-
144c319,323
229+
150c319,323
227230
< int le_to_i32(const(ubyte)* buf);
228231
---
229232
> int le_to_i32(const(ubyte)* buf)
230233
> {
231234
> uint v = le_to_u32(buf);
232235
> return v < 0x80000000U ? cast(int) v : -(cast(int) (0xffffffffU - v)) - 1;
233236
> }
234-
152c331,336
237+
158c331,336
235238
< long le_to_i64(const(ubyte)* buf);
236239
---
237240
> long le_to_i64(const(ubyte)* buf)
@@ -240,34 +243,34 @@
240243
> return (v < 0x8000000000000000UL
241244
> ? cast(long) v : -(cast(long) (0xffffffffffffffffUL - v)) - 1);
242245
> }
243-
160c344,347
246+
166c344,347
244247
< void i16_to_le(short val, ubyte* buf);
245248
---
246249
> void i16_to_le(short val, ubyte* buf)
247250
> {
248251
> u16_to_le(val, buf);
249252
> }
250-
166c353,356
253+
172c353,356
251254
< void i32_to_le(int val, ubyte* buf);
252255
---
253256
> void i32_to_le(int val, ubyte* buf)
254257
> {
255258
> u32_to_le(val, buf);
256259
> }
257-
172c362,365
260+
178c362,365
258261
< void i64_to_le(long val, ubyte* buf);
259262
---
260263
> void i64_to_le(long val, ubyte* buf)
261264
> {
262265
> u64_to_le(val, buf);
263266
> }
264-
176,177c369,370
267+
182,183c369,370
265268
< * sizeof(float) == sizeof(uint32_t)
266269
< * sizeof(double) == sizeof(uint64_t)
267270
---
268271
> * sizeof(float) == sizeof(uint)
269272
> * sizeof(double) == sizeof(ulong)
270-
188c381,392
273+
194c381,392
271274
< float le_to_float(const(ubyte)* buf);
272275
---
273276
> float le_to_float(const(ubyte)* buf)
@@ -282,7 +285,7 @@
282285
> convert.u = le_to_u32(buf);
283286
> return convert.f;
284287
> }
285-
196c400,410
288+
202c400,410
286289
< double le_to_double(const(ubyte)* buf);
287290
---
288291
> double le_to_double(const(ubyte)* buf)
@@ -296,7 +299,7 @@
296299
> convert.u = le_to_u64(buf);
297300
> return convert.f;
298301
> }
299-
202c416,426
302+
208c416,426
300303
< void float_to_le(float val, ubyte* buf);
301304
---
302305
> void float_to_le(float val, ubyte* buf)
@@ -310,7 +313,7 @@
310313
> convert.f = val;
311314
> u32_to_le(convert.u, buf);
312315
> }
313-
208c432,442
316+
214c432,442
314317
< void double_to_le(double val, ubyte* buf);
315318
---
316319
> void double_to_le(double val, ubyte* buf)

dstep/d_changes/hts_expr.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
24d23
22
<
3-
25a25,30
4-
>
3+
26a26,31
54
> import htslib.kstring: kstring_t;
65
>
76
> @system:
87
> nothrow:
98
> @nogc:
9+
>

dstep/d_changes/sam.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,5 +320,5 @@
320320
< {
321321
---
322322
> enum htsRealnFlags {
323-
2209d2409
323+
2249d2449
324324
<

0 commit comments

Comments
 (0)