Andreas Tille pushed to branch master at Debian Med / libxdf
Commits: 7fedceff by Andreas Tille at 2019-08-01T12:10:26Z New upstream version 0.99+dfsg - - - - - f83d2b9d by Andreas Tille at 2019-08-01T12:10:27Z Update upstream source from tag 'upstream/0.99+dfsg' Update to upstream version '0.99+dfsg' with Debian dir 77b2902488a0c6db1caa96b709f736adfdf1b0bb - - - - - 076c3aee by Andreas Tille at 2019-08-01T12:10:27Z New upstream version - - - - - 39329429 by Andreas Tille at 2019-08-01T12:10:27Z debhelper-compat 12 - - - - - 4c45b63b by Andreas Tille at 2019-08-01T12:10:31Z Standards-Version: 4.4.0 - - - - - d9e21947 by Andreas Tille at 2019-08-01T12:11:32Z Upload to unstable - - - - - 5 changed files: - README.md - debian/changelog - − debian/compat - debian/control - xdf.cpp Changes: ===================================== README.md ===================================== @@ -84,4 +84,4 @@ SigViewer Online Repository is [here](repository/Updates.xml). ## <a name="support"></a>Support -[Email author](mailto:[email protected]) or report a new [issue](https://github.com/Yida-Lin/libxdf/issues). +[Email author](mailto:[email protected]) or report a new [issue](https://github.com/Yida-Lin/libxdf/issues). ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +libxdf (0.99+dfsg-1) unstable; urgency=medium + + * New upstream version + * debhelper-compat 12 + * Standards-Version: 4.4.0 + + -- Andreas Tille <[email protected]> Thu, 01 Aug 2019 14:10:31 +0200 + libxdf (0.98+dfsg-1) unstable; urgency=medium * Initial release (Closes: #919474) ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -12 ===================================== debian/control ===================================== @@ -3,11 +3,11 @@ Maintainer: Debian Med Packaging Team <[email protected]. Uploaders: Andreas Tille <[email protected]> Section: science Priority: optional -Build-Depends: debhelper (>= 12~), +Build-Depends: debhelper-compat (= 12), cmake, d-shlibs, libpugixml-dev -Standards-Version: 4.3.0 +Standards-Version: 4.4.0 Vcs-Browser: https://salsa.debian.org/med-team/libxdf Vcs-Git: https://salsa.debian.org/med-team/libxdf.git Homepage: https://github.com/Yida-Lin/libxdf @@ -35,4 +35,4 @@ Description: C++ library for loading XDF files (headers and static lib) viewing application SigViewer. It can also be integrated into other C++ applications. . - This package contains the header files and the static library \ No newline at end of file + This package contains the header files and the static library ===================================== xdf.cpp ===================================== @@ -612,10 +612,7 @@ void Xdf::syncTimeStamps() } } - if (this->streams[elem.second].clock_times[k] < elem.first.second) - { - elem.first.second += this->streams[elem.second].clock_values[k]; - } + elem.first.second += this->streams[elem.second].clock_values[k]; // apply the last offset value to the timestamp; if there hasn't yet been an offset value take the first recorded one } } @@ -832,14 +829,18 @@ void Xdf::findMajSR() } } - //search the srateMap to see which sample rate has the most channels - int index (std::distance(srateMap.begin(), - std::max_element(srateMap.begin(),srateMap.end(), - [] (const std::pair<sampRate, numChannel> &largest, - const std::pair<sampRate, numChannel> &first) - { return largest.second < first.second; }))); - - majSR = srateMap[index].first; //the sample rate that has the most channels + if(srateMap.size() > 0){ + //search the srateMap to see which sample rate has the most channels + int index (std::distance(srateMap.begin(), + std::max_element(srateMap.begin(),srateMap.end(), + [] (const std::pair<sampRate, numChannel> &largest, + const std::pair<sampRate, numChannel> &first) + { return largest.second < first.second; }))); + + majSR = srateMap[index].first; //the sample rate that has the most channels + } else { + majSR = 0; //if there are no streams with a fixed sample reate + } } void Xdf::calcTotalChannel() View it on GitLab: https://salsa.debian.org/med-team/libxdf/compare/7022f25f90a8a0a9c4f254d8f3b500402054eda7...d9e21947c9050b1377a0ff7acdc55cc1fa401e63 -- View it on GitLab: https://salsa.debian.org/med-team/libxdf/compare/7022f25f90a8a0a9c4f254d8f3b500402054eda7...d9e21947c9050b1377a0ff7acdc55cc1fa401e63 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
