Browse code

merge conflicts

From: Laurent <lg390@cam.ac.uk>

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzR@121284 bc3139a8-67e5-0310-9ffc-ced21a209358

Laurent Gatto authored on 23/09/2016 08:43:32
Showing 5 changed files

1 1
new file mode 100644
... ...
@@ -0,0 +1,4 @@
1
+language: r
2
+r: bioc-devel
3
+sudo: true
4
+apt_packages: libnetcdf-dev
... ...
@@ -2,7 +2,7 @@ Package: mzR
2 2
 Type: Package
3 3
 Title: parser for netCDF, mzXML, mzData and mzML and mzIdentML files
4 4
        (mass spectrometry data)
5
-Version: 2.7.4
5
+Version: 2.7.5
6 6
 Author: Bernd Fischer, Steffen Neumann, Laurent Gatto, Qiang Kou
7 7
 Maintainer: Bernd Fischer <b.fischer@dkfz.de>,
8 8
 	    Steffen Neumann <sneumann@ipb-halle.de>,
... ...
@@ -1,3 +1,8 @@
1
+CHANGES IN VERSION 2.7.5
2
+------------------------
3
+ o Apply Martin's free/delete patch - see
4
+   https://github.com/sneumann/mzR/issues/52 <2016-09-22 Thu>
5
+ 
1 6
 CHANGES IN VERSION 2.7.4
2 7
 ------------------------
3 8
  o upgrade pwiz
4 9
old mode 100644
5 10
new mode 100755
... ...
@@ -95,7 +95,7 @@ cRamp::cRamp( const char* fileName,bool declaredScansOnly ) :
95 95
         //      if (m_runInfo->m_data.scanCount < 0) { // undeclared scan count
96 96
         // this will provoke reading of index, which sets scan count
97 97
         rampScanInfo* tmp = getScanHeaderInfo ( 1 );
98
-        free(tmp);
98
+        delete(tmp); // was free - but see https://github.com/sneumann/mzR/issues/52
99 99
         // }
100 100
         // END HENRY
101 101
     }