[med-svn] [SCM] aghermann branch, master, updated. 551e213a23b59b71cba6a9c3a282d1b60e21b854

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 2dc27c2b4ed8fd550de475b4b0da047ef0c162a3
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Thu Apr 18 23:54:21 2013 +0300

    simplify, make consistent some expressions after those annotations commits

diff --git a/src/libsigfile/source-base.cc b/src/libsigfile/source-base.cc
index 6c25a72..dd280d1 100644
--- a/src/libsigfile/source-base.cc
+++ b/src/libsigfile/source-base.cc
@@ -16,7 +16,7 @@ using namespace std;
 
 void
 sigfile::SArtifacts::
-mark_artifact( size_t aa, size_t az)
+mark_artifact( double aa, double az)
 {
 	if ( aa >= az )
 		return;
@@ -37,7 +37,7 @@ mark_artifact( size_t aa, size_t az)
 
 void
 sigfile::SArtifacts::
-clear_artifact( size_t aa, size_t az)
+clear_artifact( double aa, double az)
 {
 	auto A = obj.begin();
 	while ( A != obj.end() ) {
@@ -65,7 +65,7 @@ clear_artifact( size_t aa, size_t az)
 float
 __attribute__ ((pure))
 sigfile::SArtifacts::
-region_dirty_fraction( size_t ra, size_t rz) const
+region_dirty_fraction( double ra, double rz) const
 {
 	size_t	dirty = 0;
 	for ( auto& A : obj ) {
@@ -88,7 +88,7 @@ region_dirty_fraction( size_t ra, size_t rz) const
 			break;
 		}
 	}
-	return (float)dirty / (rz - ra);
+	return dirty / (rz - ra);
 }
 
 
diff --git a/src/libsigfile/source-base.hh b/src/libsigfile/source-base.hh
index 072ace8..de990fa 100644
--- a/src/libsigfile/source-base.hh
+++ b/src/libsigfile/source-base.hh
@@ -97,14 +97,14 @@ struct SArtifacts {
 			return q;
 		}
 
-	void mark_artifact( size_t aa, size_t az);
-	void clear_artifact( size_t aa, size_t az);
+	void mark_artifact( double aa, double az);
+	void clear_artifact( double aa, double az);
 	void clear_all()
 		{
 			obj.clear();
 		}
 
-	float region_dirty_fraction( size_t a, size_t z) const;
+	float region_dirty_fraction( double a, double z) const;
 
 	unsigned long dirty_signature() const;
 };
diff --git a/src/ui/sf/montage.cc b/src/ui/sf/montage.cc
index aafd596..5f334ea 100644
--- a/src/ui/sf/montage.cc
+++ b/src/ui/sf/montage.cc
@@ -441,8 +441,8 @@ draw_page( cairo_t *cr,
 
 	double	half_pad = _p.pagesize() * _p.skirting_run_per1;
 
-	double	cvpa = _p.cur_vpage_start() - half_pad,
-		cvpe = _p.cur_vpage_end()   + half_pad,
+	double	cvpa = _p.cur_xvpage_start(),
+		cvpe = _p.cur_xvpage_end(),
 		evpz = cvpe - cvpa;
       // artifacts (changed bg)
 	{

-- 
Sleep experiment manager