Skip to content

Commit ebedd98

Browse files
fixed offset index bug on Windows
1 parent cdeae10 commit ebedd98

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

Writer/MzMlSpectrumWriter.cs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,11 @@ public override void Write(IRawDataPlus rawFile, int firstScanNumber, int lastSc
271271
Writer.Flush();
272272
if (spectrumOffSets.Count != 0)
273273
{
274-
spectrumOffSets.Add(spectrum.id, Writer.BaseStream.Position + 6);
274+
spectrumOffSets.Add(spectrum.id, Writer.BaseStream.Position + 6 + GetOsOffset());
275275
}
276276
else
277277
{
278-
spectrumOffSets.Add(spectrum.id, Writer.BaseStream.Position + 7);
278+
spectrumOffSets.Add(spectrum.id, Writer.BaseStream.Position + 7 + GetOsOffset());
279279
}
280280
}
281281

@@ -308,11 +308,11 @@ public override void Write(IRawDataPlus rawFile, int firstScanNumber, int lastSc
308308
Writer.Flush();
309309
if (chromatogramOffSets.Count != 0)
310310
{
311-
chromatogramOffSets.Add(chromatogram.id, Writer.BaseStream.Position + 6);
311+
chromatogramOffSets.Add(chromatogram.id, Writer.BaseStream.Position + 6 + GetOsOffset());
312312
}
313313
else
314314
{
315-
chromatogramOffSets.Add(chromatogram.id, Writer.BaseStream.Position + 7);
315+
chromatogramOffSets.Add(chromatogram.id, Writer.BaseStream.Position + 7 + GetOsOffset());
316316
}
317317
}
318318

@@ -332,8 +332,7 @@ public override void Write(IRawDataPlus rawFile, int firstScanNumber, int lastSc
332332
_writer.Flush();
333333
Writer.Flush();
334334

335-
var indexListPosition = Writer.BaseStream.Position;
336-
//var indexListPosition = memoryStream.Position;
335+
var indexListPosition = Writer.BaseStream.Position + GetOsOffset();
337336

338337
// indexList
339338
_writer.WriteStartElement("indexList");
@@ -442,6 +441,11 @@ public override void Write(IRawDataPlus rawFile, int firstScanNumber, int lastSc
442441
}
443442
}
444443

444+
private int GetOsOffset()
445+
{
446+
return System.Environment.NewLine == "\n" ? 0 : 1;
447+
}
448+
445449
/// <summary>
446450
/// Populate the instrument configuration list
447451
/// </summary>

0 commit comments

Comments
 (0)