The following commit has been merged in the master branch:
commit aa414811cf8d74ec705baf56c077cdab029e069d
Author: Andrei Zavada <[email protected]>
Date: Sun Oct 14 21:59:55 2012 +0300
ChangeLog update, ICM
diff --git a/ChangeLog b/ChangeLog
index ea80eec..7b9ace7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,12 @@
v. 0.7.2 (2012-..-..)
- * Enable SMP for mass profile constructions & other heavy
+ * Enable SMP for mass profile constructions and most other heavy
operations.
* SF: Transient, reversible detected artifacts in preview.
- * Tolerate size_t division arith off-by-ones when contructing
- profiles (just don't crash on this).
* MF: preserve tunables when reopening a previous model run.
* Correctly do status bar updates on tree rescan.
+ * Ensure get_signal_filtered.size() == get_signal_original.size(): else
+ ICA crashes seemingly at random.
+ * Run ICA on original signal (not filtered).
* configure: don't require gcc >= 4.7.1.
v. 0.7.1 (2012-09-23)
diff --git a/src/libsigfile/source.cc b/src/libsigfile/source.cc
index c2cc556..2877c2e 100644
--- a/src/libsigfile/source.cc
+++ b/src/libsigfile/source.cc
@@ -39,7 +39,7 @@ CSource (const char* fname,
if ( flags | ~no_ancillary_files ) {
// CHypnogram::
CHypnogram::load( sigfile::make_fname_hypnogram(fname,
pagesize));
- size_t scorable_pages = ceil( (double)_obj->recording_time() /
pagesize); // implicit floor
+ size_t scorable_pages = ceil( (double)_obj->recording_time() /
pagesize);
if ( CHypnogram::pages() != scorable_pages ) {
if ( CHypnogram::pages() > 0 )
fprintf( stderr, "CSource(\"%s\"): number of
scorable pages @pagesize=%zu (%lu / %zu = %zu) "
diff --git a/src/ui/scoring-facility-montage.cc
b/src/ui/scoring-facility-montage.cc
index 56fd910..8bc92f7 100644
--- a/src/ui/scoring-facility-montage.cc
+++ b/src/ui/scoring-facility-montage.cc
@@ -193,7 +193,6 @@ void
aghui::SScoringFacility::SChannel::
draw_for_montage( const char *fname, int width, int height) // to a file
{
-#ifdef CAIRO_HAS_SVG_SURFACE
cairo_surface_t *cs = cairo_svg_surface_create( fname, width, height);
cairo_t *cr = cairo_create( cs);
@@ -202,7 +201,6 @@ draw_for_montage( const char *fname, int width, int height)
// to a file
cairo_destroy( cr);
cairo_surface_destroy( cs);
-#endif
}
void
@@ -972,10 +970,10 @@ draw_montage( cairo_t* cr)
// background, is now common to all channels
using namespace sigfile;
if ( mode == TMode::scoring ) {
- float ppart = (float)pagesize()/vpagesize();
+ double ppart = (double)pagesize()/vpagesize();
int cp = cur_page();
for ( int pp = cp-1; ; ++pp ) {
- float ppoff = ((float)pp * pagesize() -
cur_vpage_start()) / vpagesize();
+ double ppoff = ((double)pp * pagesize() -
cur_vpage_start()) / vpagesize();
if ( ppoff > 1.5 )
break;
--
Sleep experiment manager
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
