Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/vigra/files: vigra-1.8.0-gcc47.patch
Date: Fri, 24 Aug 2012 22:06:01
Message-Id: 20120824220544.E8D2A20606@flycatcher.gentoo.org
1 dilfridge 12/08/24 22:05:44
2
3 Added: vigra-1.8.0-gcc47.patch
4 Log:
5 Fix build with gcc-4.7, thanks dev-zero
6
7 (Portage version: 2.2.0_alpha122/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-libs/vigra/files/vigra-1.8.0-gcc47.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/files/vigra-1.8.0-gcc47.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/files/vigra-1.8.0-gcc47.patch?rev=1.1&content-type=text/plain
14
15 Index: vigra-1.8.0-gcc47.patch
16 ===================================================================
17 From 11113f8f5ffa868e32259e8d6dcdb543fd58848b Mon Sep 17 00:00:00 2001
18 From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@××××××××.ch>
19 Date: Mon, 11 Jun 2012 08:33:06 +0200
20 Subject: [PATCH] Fix building with gcc-4.7
21
22 ---
23 include/vigra/numpy_array.hxx | 2 +-
24 1 files changed, 1 insertions(+), 1 deletions(-)
25
26 diff --git a/include/vigra/numpy_array.hxx b/include/vigra/numpy_array.hxx
27 index 1d06a79..7806f6b 100644
28 --- a/include/vigra/numpy_array.hxx
29 +++ b/include/vigra/numpy_array.hxx
30 @@ -1074,7 +1074,7 @@ void NumpyArray<N, T, Stride>::setupArrayView()
31
32 this->m_stride /= sizeof(value_type);
33 this->m_ptr = reinterpret_cast<pointer>(pyArray()->data);
34 - vigra_precondition(checkInnerStride(Stride()),
35 + vigra_precondition(this->checkInnerStride(Stride()),
36 "NumpyArray<..., UnstridedArrayTag>::setupArrayView(): First dimension of given array is not unstrided (should never happen).");
37
38 }
39 --
40 1.7.8.6