diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-03-14 17:15:26 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-03-14 17:15:26 +0000 |
| commit | 55aa942c51c728a9bb749a9732c9b99935be0a55 (patch) | |
| tree | 5fc5d12073f5d36bcb94bc3f412d1555e7ad0876 /vigra | |
| parent | 275debd86977764dea1fb07055ba49449b8c15a5 (diff) | |
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
Diffstat (limited to 'vigra')
| -rw-r--r-- | vigra/vigra1.4.0.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/vigra/vigra1.4.0.patch b/vigra/vigra1.4.0.patch index cb754cdfbc35..431b021099a7 100644 --- a/vigra/vigra1.4.0.patch +++ b/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 |