CWS-TOOLING: integrate CWS cmcfixes55

2009-03-03 10:04:14 +0100 cmc  r268711 : #i99765# silence warning
2009-03-02 12:18:48 +0100 cmc  r268647 : #i99772# silence warnings under >= python 2.6 and gcc 4.4
2009-03-02 10:51:12 +0100 cmc  r268641 : #i99767# fix up trivial && ||
2009-03-02 10:32:02 +0100 cmc  r268640 : #i99766 remove && || warning
2009-03-02 10:01:05 +0100 cmc  r268638 : #i99764# easy && || warnings
2009-02-27 13:03:08 +0100 cmc  r268583 : #i96059# fix dodgy code
2009-02-27 12:57:38 +0100 cmc  r268582 : #i99718# don't leave unused methods on non-win platform

vigra/vigra1.4.0.patch

@@ -1699,3 +1699,15 @@ diff -uprN misc/vigra1.4.0/include/vigra/transformimage.hxx misc/build/vigra1.4.
          return result_type(0.5 * diff_ * (contrasted + one_) + min_);
      }
  
+diff -uprN misc/vigra1.4.0/include/vigra/diff2d.hxx misc/build/vigra1.4.0/include/vigra/diff2d.hxx
+--- misc/vigra1.4.0/include/vigra/diff2d.hxx	2009-03-02 09:27:34.000000000 +0000
++++ misc/build/vigra1.4.0/include/vigra/diff2d.hxx	2009-03-02 09:27:57.000000000 +0000
+@@ -1117,7 +1117,7 @@
+     bool contains(Rect2D const &r) const
+     {
+         return r.isEmpty() ||
+-            contains(r.upperLeft()) && contains(r.lowerRight()-Diff2D(1,1));
++            (contains(r.upperLeft()) && contains(r.lowerRight()-Diff2D(1,1)));
+     }
+ 
+         /** Return whether this rectangle overlaps with the given