1 |
maekke 09/04/23 20:30:23 |
2 |
|
3 |
Added: k3d-0.7.11.0-cuda.patch |
4 |
Log: |
5 |
revision bump to fix cuda USE-flag, bug #263811 |
6 |
(Portage version: 2.2_rc31/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 media-gfx/k3d/files/k3d-0.7.11.0-cuda.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-cuda.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-cuda.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: k3d-0.7.11.0-cuda.patch |
15 |
=================================================================== |
16 |
http://k3d.svn.sourceforge.net/viewvc/k3d/trunk/modules/cuda/cuda_mesh_subdivide_edges.cpp?view=patch&r1=1782&r2=1820 |
17 |
|
18 |
--- trunk/modules/cuda/cuda_mesh_subdivide_edges.cpp 2009/03/14 19:27:16 1782 |
19 |
+++ trunk/modules/cuda/cuda_mesh_subdivide_edges.cpp 2009/03/22 22:32:10 1820 |
20 |
@@ -23,6 +23,7 @@ |
21 |
\author Evan Lezar (evanlezar@×××××.com) |
22 |
*/ |
23 |
|
24 |
+#include <k3dsdk/attribute_array_copier.h> |
25 |
#include <k3dsdk/basic_math.h> |
26 |
#include <k3dsdk/document_plugin_factory.h> |
27 |
#include <k3dsdk/imaterial.h> |
28 |
@@ -30,8 +31,8 @@ |
29 |
#include <k3dsdk/measurement.h> |
30 |
#include <k3dsdk/mesh_modifier.h> |
31 |
#include <k3dsdk/mesh_selection_sink.h> |
32 |
-#include <k3dsdk/attribute_array_copier.h> |
33 |
#include <k3dsdk/node.h> |
34 |
+#include <k3dsdk/polyhedron.h> |
35 |
#include <k3dsdk/selection.h> |
36 |
#include <k3dsdk/utility.h> |
37 |
#include <k3dsdk/vectors.h> |
38 |
@@ -41,6 +42,8 @@ |
39 |
#include "cuda_device_mesh.h" |
40 |
#include "cuda_mesh_topology_data.h" |
41 |
|
42 |
+#include <boost/scoped_ptr.hpp> |
43 |
+ |
44 |
namespace module |
45 |
{ |
46 |
|
47 |
@@ -159,7 +162,8 @@ |
48 |
|
49 |
// If there are no valid polyhedra, we give up |
50 |
document().pipeline_profiler().start_execution(*this, "Create:Validate input"); |
51 |
- if(!k3d::validate_polyhedra(Input)) |
52 |
+ boost::scoped_ptr<k3d::polyhedron::const_primitive> polyhedron(k3d::polyhedron::validate(Input)); |
53 |
+ if(!polyhedron) |
54 |
{ |
55 |
document().pipeline_profiler().finish_execution(*this, "Create:Validate input"); |
56 |
return; |
57 |
@@ -297,7 +301,8 @@ |
58 |
{ |
59 |
document().pipeline_profiler().start_execution(*this, "Update:Validate input"); |
60 |
|
61 |
- if(!k3d::validate_polyhedra(Input)) |
62 |
+ boost::scoped_ptr<k3d::polyhedron::const_primitive> polyhedron(k3d::polyhedron::validate(Input)); |
63 |
+ if(!polyhedron) |
64 |
{ |
65 |
document().pipeline_profiler().finish_execution(*this, "Update:Validate input"); |
66 |
return; |