summaryrefslogtreecommitdiffstats
path: root/src/vtk6-2-mingw-w64.patch
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2013-06-22 14:00:53 (GMT)
committerTony Theodore <tonyt@logyst.com>2013-06-22 14:00:53 (GMT)
commitfeec65f32d7e06f4cf2b2bacebf48bbe41a40767 (patch)
tree43f6f1d0e1ee9450c40aafa8d28c273d9ec001a4 /src/vtk6-2-mingw-w64.patch
parenteb31637d176c55eee6af4de3f20c292a046cfb54 (diff)
downloadmxe-feec65f32d7e06f4cf2b2bacebf48bbe41a40767.zip
mxe-feec65f32d7e06f4cf2b2bacebf48bbe41a40767.tar.gz
mxe-feec65f32d7e06f4cf2b2bacebf48bbe41a40767.tar.bz2
package vtk6: fixes for OSX, whitespace, external hdf5, and mingw-w64
Diffstat (limited to 'src/vtk6-2-mingw-w64.patch')
-rw-r--r--src/vtk6-2-mingw-w64.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/src/vtk6-2-mingw-w64.patch b/src/vtk6-2-mingw-w64.patch
new file mode 100644
index 0000000..864cdd8
--- /dev/null
+++ b/src/vtk6-2-mingw-w64.patch
@@ -0,0 +1,28 @@
+This file is part of MXE.
+See index.html for further information.
+
+This patch has been taken from:
+http://vtk.org/Bug/print_bug_page.php?bug_id=11742
+
+diff -ur VTK6.0.0.rc3/IO/Video/vtkWin32VideoSource.cxx VTK6.0.0.rc3.new/IO/Video/vtkWin32VideoSource.cxx
+--- VTK6.0.0.rc3/IO/Video/vtkWin32VideoSource.cxx 2013-06-13 05:47:10.000000000 +1000
++++ VTK6.0.0.rc3.new/IO/Video/vtkWin32VideoSource.cxx 2013-06-22 16:06:01.000000000 +1000
+@@ -274,7 +274,7 @@
+ }
+
+ // set the user data to 'this'
+- vtkSetWindowLong(this->Internal->ParentWnd,vtkGWL_USERDATA,(vtkLONG)this);
++ vtkSetWindowLong(this->Internal->ParentWnd,vtkGWL_USERDATA,(intptr_t)this);
+
+ // Create the capture window
+ this->Internal->CapWnd = capCreateCaptureWindow("Capture",
+@@ -339,7 +339,7 @@
+ }
+
+ // set user data for callbacks
+- if (!capSetUserData(this->Internal->CapWnd,(long)this))
++ if (!capSetUserData(this->Internal->CapWnd,(intptr_t)this))
+ {
+ vtkErrorMacro(<< "Initialize: couldn't set user data for callback"\
+ << " (" << GetLastError() << ")");
+