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

[Andrei Zavada]

The following commit has been merged in the master branch:
commit a010d93338c171a3e8673aae4e890f7474e29a28
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Tue Apr 30 14:36:05 2013 +0300

    more relaxed treatment of max<min conditions

diff --git a/src/libsigfile/edf.cc b/src/libsigfile/edf.cc
index 2edd205..d1f7f5d 100644
--- a/src/libsigfile/edf.cc
+++ b/src/libsigfile/edf.cc
@@ -785,14 +785,11 @@ _parse_header()
 	for ( auto &H : channels )
 		if ( H.ucd.type() != sigfile::SChannel::TType::embedded_annotation ) {
 			if ( H.physical_max <= H.physical_min ||
-			     H.digital_max  <= H.digital_min  ) {
+			     H.digital_max  <= H.digital_min  )
 				_status |= nogain;
-				if ( not (flags() & no_field_consistency_check) )
-					return -2;
-			} else
-				H.scale =
-					(H.physical_max - H.physical_min) /
-					(H.digital_max  - H.digital_min );
+			H.scale =
+				(H.physical_max - H.physical_min) /
+				(H.digital_max  - H.digital_min );
 		}
 
 

-- 
Sleep experiment manager