@@ -42,7 +42,7 @@ use crate::spectrum::bindata::vec_as_bytes;
42
42
use numpress:: numpress_decompress;
43
43
44
44
use crate :: spectrum:: spectrum_types:: MultiLayerSpectrum ;
45
- use crate :: spectrum:: { Chromatogram , HasIonMobility , IsolationWindow , ScanWindow , SelectedIon } ;
45
+ use crate :: spectrum:: { Chromatogram , HasIonMobility , IsolationWindow , ScanWindow , SelectedIon , Precursor } ;
46
46
47
47
#[ derive( Debug , Error ) ]
48
48
pub enum MzMLbError {
@@ -266,9 +266,6 @@ impl ExternalDataRegistry {
266
266
fn handle_encoding ( data : & mut DataArray ) -> Result < ( ) , ArrayRetrievalError > {
267
267
match data. compression {
268
268
BinaryCompressionType :: NoCompression => Ok ( ( ) ) ,
269
- BinaryCompressionType :: Zlib => Err ( ArrayRetrievalError :: DecompressionError (
270
- data. compression . unsupported_msg ( None ) ,
271
- ) ) ,
272
269
#[ cfg( feature = "numpress" ) ]
273
270
BinaryCompressionType :: NumpressLinear => {
274
271
match data. dtype {
@@ -290,25 +287,6 @@ impl ExternalDataRegistry {
290
287
data. compression . unsupported_msg ( None ) ,
291
288
) )
292
289
}
293
- #[ cfg( not( feature = "numpress" ) ) ]
294
- BinaryCompressionType :: NumpressLinear => Err ( ArrayRetrievalError :: DecompressionError (
295
- data. compression . unsupported_msg ( None ) ,
296
- ) ) ,
297
- BinaryCompressionType :: NumpressSLOF => Err ( ArrayRetrievalError :: DecompressionError (
298
- data. compression . unsupported_msg ( None ) ,
299
- ) ) ,
300
- BinaryCompressionType :: NumpressPIC => Err ( ArrayRetrievalError :: DecompressionError (
301
- data. compression . unsupported_msg ( None ) ,
302
- ) ) ,
303
- BinaryCompressionType :: NumpressLinearZlib => Err (
304
- ArrayRetrievalError :: DecompressionError ( data. compression . unsupported_msg ( None ) ) ,
305
- ) ,
306
- BinaryCompressionType :: NumpressSLOFZlib => Err (
307
- ArrayRetrievalError :: DecompressionError ( data. compression . unsupported_msg ( None ) ) ,
308
- ) ,
309
- BinaryCompressionType :: NumpressPICZlib => Err ( ArrayRetrievalError :: DecompressionError (
310
- data. compression . unsupported_msg ( None ) ,
311
- ) ) ,
312
290
BinaryCompressionType :: LinearPrediction => {
313
291
match data. dtype {
314
292
BinaryDataArrayType :: Float64 => {
@@ -354,6 +332,9 @@ impl ExternalDataRegistry {
354
332
Ok ( ( ) )
355
333
}
356
334
BinaryCompressionType :: Decoded => Ok ( ( ) ) ,
335
+ _ => Err ( ArrayRetrievalError :: DecompressionError (
336
+ data. compression . unsupported_msg ( None ) ,
337
+ ) )
357
338
}
358
339
}
359
340
0 commit comments