diff -Nru odin-2.0.2/debian/changelog odin-2.0.2/debian/changelog --- odin-2.0.2/debian/changelog 2016-07-04 18:47:57.000000000 +0200 +++ odin-2.0.2/debian/changelog 2016-07-16 09:33:28.000000000 +0200 @@ -1,3 +1,14 @@ +odin (2.0.2-0.2) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches/gcc-6-fix.patch: + - upstream fix [r8688] for gcc-6 build failure: + * debian/patches/gcc-6-fix2.patch: + - fix for some other gcc-6 build failures: + (Closes: #831181) + + -- Gianfranco Costamagna Fri, 15 Jul 2016 19:34:55 +0200 + odin (2.0.2-0.1) unstable; urgency=medium * New upstream release, patch refresh diff -Nru odin-2.0.2/debian/patches/gcc-6-fix2.patch odin-2.0.2/debian/patches/gcc-6-fix2.patch --- odin-2.0.2/debian/patches/gcc-6-fix2.patch 1970-01-01 01:00:00.000000000 +0100 +++ odin-2.0.2/debian/patches/gcc-6-fix2.patch 2016-07-16 09:52:15.000000000 +0200 @@ -0,0 +1,51 @@ +Description: Fix some std::max(double,float) call mismatch and some "ifstream not comparable with NULL" + +Author: Gianfranco Costamagna + +--- odin-2.0.2.orig/odinseq/seqgradspiral.cpp ++++ odin-2.0.2/odinseq/seqgradspiral.cpp +@@ -27,12 +27,12 @@ float SeqGradSpiral::readout_npts() cons + const kspace_coord& tds=traj_cache->calculate(s); + if(i) { + deltaKtangential=STD_max(double(deltaKtangential),norm(tds.kx-last_kx,tds.ky-last_ky)); +- max_grad_diff=STD_max(double(max_grad_diff),fabs(tds.Gx-last_Gx)); +- max_grad_diff=STD_max(double(max_grad_diff),fabs(tds.Gy-last_Gy)); ++ max_grad_diff=STD_max(max_grad_diff,fabs(tds.Gx-last_Gx)); ++ max_grad_diff=STD_max(max_grad_diff,fabs(tds.Gy-last_Gy)); + } + +- max_grad_magn=STD_max(double(max_grad_magn),fabs(tds.Gx)); +- max_grad_magn=STD_max(double(max_grad_magn),fabs(tds.Gy)); ++ max_grad_magn=STD_max(max_grad_magn,fabs(tds.Gx)); ++ max_grad_magn=STD_max(max_grad_magn,fabs(tds.Gy)); + + last_kx=tds.kx; + last_ky=tds.ky; +--- odin-2.0.2.orig/cmdline-utils/swab.cpp ++++ odin-2.0.2/cmdline-utils/swab.cpp +@@ -28,7 +28,7 @@ int main(int argc, char* argv[]) { + } + + std::ifstream in_data(argv[2],std::ios::in|std::ios::binary); +- if(in_data == NULL) { ++ if(in_data.fail()) { + std::cerr << "swab: ERROR: can't open file " << argv[2] << std::endl; + return -1; + } +@@ -56,14 +56,14 @@ int main(int argc, char* argv[]) { + for(k=0;kfield_of_excitation; // Assume single point as the excitation shape, so that, in contrast to a shape that fills the whole FOX, aliases would appear at (+/- FOX). Therefore, we can effectively use half the FOX without aliasing. +- max_spatial_extension*=sqrt(mode); // extend to diagonal direction square-shaped alias-free FOX ++ max_spatial_extension*=sqrt(float(int(mode))); // extend to diagonal direction square-shaped alias-free FOX + max_spatial_extension+=data->shape.get_shape_info().spatial_extent; // If shape is not single point, add the total extent of the shape. Otherwise it aliases into the FOX. + if(mode==oneDeeMode) { + dkmax=max_kspace_step(data->Gs, gamma, data->Tp_1pulse, data->G0); +--- a/odinseq/seqplot.h ++++ b/odinseq/seqplot.h +@@ -33,10 +33,10 @@ + static const char* markLabel[]={"none", "exttrigger", "halttrigger", "snapshot", "reset", "acquisition", "endacq", "excitation", "refocusing", "storeMagn", "recallMagn", "inversion", "saturation" }; + AVOID_CC_WARNING(markLabel) + +-enum timecourseMode {tcmode_curves=0, tcmode_plain, tcmode_slew_rate, tcmode_kspace, tcmode_M1, tcmode_M2, tcmode_b_trace, tcmode_backgr_kspace, tcmode_backgr_crossterm, tcmode_eddy_currents, numof_tcmodes}; +-static const char* timecourseLabel[]= {"Curves", "Plain", "Slew Rate", "k-Space", "1st Grad. Moment", "2nd Grad. Moment", "b-Value Trace", "Backgr. k-Space", "Backgr. Crossterm", "Eddy Currents"}; +-static const char* timecoursePrefix[]={"G", "G", "dG", "k", "M1", "M2", "b", "k", "c", "G"}; +-static const char* timecourseUnit[]= {ODIN_GRAD_UNIT, ODIN_GRAD_UNIT, ODIN_GRAD_UNIT"/"ODIN_TIME_UNIT, "rad/"ODIN_SPAT_UNIT, "rad*"ODIN_TIME_UNIT"/"ODIN_SPAT_UNIT, "rad*"ODIN_TIME_UNIT"^2/"ODIN_SPAT_UNIT, ODIN_TIME_UNIT"/"ODIN_SPAT_UNIT"^2", "rad/"ODIN_SPAT_UNIT, ODIN_TIME_UNIT"/"ODIN_SPAT_UNIT"^2", ODIN_GRAD_UNIT}; ++enum timecourseMode {tcmode_curves=0, tcmode_plain, tcmode_slew_rate, tcmode_kspace, tcmode_M1, tcmode_M2, tcmode_b_trace, tcmode_backgr_kspace, tcmode_backgr_crossterm, tcmode_eddy_currents, numof_tcmodes}; ++static const char* timecourseLabel[]= {"Curves", "Plain", "Slew Rate", "k-Space", "1st Grad. Moment", "2nd Grad. Moment", "b-Value Trace", "Backgr. k-Space", "Backgr. Crossterm", "Eddy Currents"}; ++static const char* timecoursePrefix[]={"G", "G", "dG", "k", "M1", "M2", "b", "k", "c", "G"}; ++static const char* timecourseUnit[]= {ODIN_GRAD_UNIT, ODIN_GRAD_UNIT, ODIN_GRAD_UNIT"/"ODIN_TIME_UNIT, "rad/" ODIN_SPAT_UNIT, "rad*" ODIN_TIME_UNIT "/" ODIN_SPAT_UNIT, "rad*" ODIN_TIME_UNIT "^2/" ODIN_SPAT_UNIT, ODIN_TIME_UNIT "/" ODIN_SPAT_UNIT "^2", "rad/" ODIN_SPAT_UNIT, ODIN_TIME_UNIT "/" ODIN_SPAT_UNIT "^2", ODIN_GRAD_UNIT}; + AVOID_CC_WARNING(timecourseLabel) + AVOID_CC_WARNING(timecoursePrefix) + AVOID_CC_WARNING(timecourseUnit) diff -Nru odin-2.0.2/debian/patches/series odin-2.0.2/debian/patches/series --- odin-2.0.2/debian/patches/series 2016-07-04 17:37:00.000000000 +0200 +++ odin-2.0.2/debian/patches/series 2016-07-16 09:31:14.000000000 +0200 @@ -1 +1,3 @@ ld-as-needed.diff +gcc-6-fix.patch +gcc-6-fix2.patch