From 477e8ae7f4646b4f8f37f7ca39adb14efa8ca4d9 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 26 Sep 2010 13:06:21 +0000
Subject: [PATCH] correct version of: port cairo ARGB/BGRA -> pixbuf RGBA patch
 from recent 2.X commit (restores text on canvas)

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@7843 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/crossfade.cc | 44 ++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc
index 41737b1f93..d2028190c2 100644
--- a/libs/ardour/crossfade.cc
+++ b/libs/ardour/crossfade.cc
@@ -302,6 +302,27 @@ Crossfade::read_at (Sample *buf, Sample *mixdown_buffer,
 		
 	}
 
+
+	/*
+	 * Sometimes a Crossfade is created that doesn't correspont to a real 
+	 * overlap between regions. Obviously this shouldn't happen, but 
+	 * somehow it does, so check here that the crossfade lies within both
+	 * the _in and _out regions to avoid read_at() below going crazy.
+	 */
+
+	if (_out->coverage(start, start+to_write-1) == OverlapNone) {
+		cerr << "out region is outside crossfade: "
+		     << _out->name() << " => " << _in->name()
+		     << endl;
+		return 0;
+	}
+	if (_in->coverage(start, start+to_write-1) == OverlapNone) {
+		cerr << "in region is outside crossfade: "
+		     << _out->name() << " => " << _in->name()
+		     << endl;
+		return 0;
+	}
+
 	offset = start - _position;
 
 	/* Prevent data from piling up inthe crossfade buffers when reading a transparent region */
@@ -711,10 +732,13 @@ Crossfade::set_state (const XMLNode& node)
 	nframes_t val;
 
 	if ((prop = node.property ("position")) != 0) {
-		sscanf (prop->value().c_str(), "%" PRIu32, &val);
-		if (val != _position) {
-			_position = val;
-			what_changed = Change (what_changed | PositionChanged);
+		if (sscanf (prop->value().c_str(), "%" PRIu32, &val) == 1) {
+			if (val != _position) {
+				_position = val;
+				what_changed = Change (what_changed | PositionChanged);
+			}
+		} else {
+			warning << _("can't read value from crossfade position property") << endmsg;
 		}
 	} else {
 		warning << _("old-style crossfade information - no position information") << endmsg;
@@ -751,12 +775,14 @@ Crossfade::set_state (const XMLNode& node)
 
 	if ((prop = node.property ("length")) != 0) {
 
-		sscanf (prop->value().c_str(), "%" PRIu32, &val);
-		if (val != _length) {
-			_length = atol (prop->value().c_str());
-			what_changed = Change (what_changed | LengthChanged);
+		if (sscanf (prop->value().c_str(), "%" PRIu32, &val) == 1) {
+			if (val != _length) {
+				_length = atol (prop->value().c_str());
+				what_changed = Change (what_changed | LengthChanged);
+			}
+		} else {
+			warning << _("can't read value from crossfade length property") << endmsg;		
 		}
-
 	} else {
 		
 		/* XXX this branch is legacy code from before