diff options
author | Pav Lucistnik <pav@FreeBSD.org> | 2004-11-06 16:15:53 +0000 |
---|---|---|
committer | Pav Lucistnik <pav@FreeBSD.org> | 2004-11-06 16:15:53 +0000 |
commit | 81b2f337fd6355cf6acca4fa8d65882d1eb20da6 (patch) | |
tree | c6a42b39eb808a8fa3b36498decd1f1a048bf5e7 /math/vtk | |
parent | Update to 3.11.3. (diff) |
- Fix build on FreeBSD 5.3
PR: ports/73607
Submitted by: TAOKA Fumiyoshi <fmysh@iijmio-mail.jp>
Notes
Notes:
svn path=/head/; revision=120968
Diffstat (limited to 'math/vtk')
-rw-r--r-- | math/vtk/Makefile | 3 | ||||
-rw-r--r-- | math/vtk/files/patch-IO-vtkBMPReader.cxx | 16 | ||||
-rw-r--r-- | math/vtk/files/patch-IO-vtkImageReader.cxx | 30 |
3 files changed, 48 insertions, 1 deletions
diff --git a/math/vtk/Makefile b/math/vtk/Makefile index 662e90885ad4..fa2768748f59 100644 --- a/math/vtk/Makefile +++ b/math/vtk/Makefile @@ -43,6 +43,7 @@ PLIST_SUB+= LIBVER=${LIBVER} PKGNAME=${PKGNAME} .if defined(WRAP) || !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX}=="-headers" +PATCH_WRKSRC= ${WRKDIR}/VTK WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-build BUILD_DEPENDS+= ${CMAKE}:${PORTSDIR}/devel/cmake @@ -131,7 +132,7 @@ pre-everything:: @${ECHO_MSG} "-------------------------------------------------------------" .endif -do-patch: patch-common +post-patch: patch-common do-install: install-cnotice install-binaries install-libs diff --git a/math/vtk/files/patch-IO-vtkBMPReader.cxx b/math/vtk/files/patch-IO-vtkBMPReader.cxx new file mode 100644 index 000000000000..f82deeb825e5 --- /dev/null +++ b/math/vtk/files/patch-IO-vtkBMPReader.cxx @@ -0,0 +1,16 @@ +diff -u -r1.44 -r1.45 +--- IO/vtkBMPReader.cxx 2003/09/10 19:41:56 1.44 ++++ IO/vtkBMPReader.cxx 2003/10/19 14:38:03 1.45 +@@ -504,11 +504,11 @@ + outPtr0 += outIncr[0]; + } + // move to the next row in the file and data +- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg); ++ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip0, ios::beg); + outPtr1 += outIncr[1]; + } + // move to the next image in the file and data +- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1, ios::beg); ++ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip1, ios::beg); + outPtr2 += outIncr[2]; + } diff --git a/math/vtk/files/patch-IO-vtkImageReader.cxx b/math/vtk/files/patch-IO-vtkImageReader.cxx new file mode 100644 index 000000000000..3e302e72af59 --- /dev/null +++ b/math/vtk/files/patch-IO-vtkImageReader.cxx @@ -0,0 +1,30 @@ +diff -u -r1.109 -r1.110 +--- IO/vtkImageReader.cxx 2002/12/26 18:18:50 1.109 ++++ IO/vtkImageReader.cxx 2003/10/19 14:38:03 1.110 +@@ -166,7 +166,7 @@ + streamStart += this->GetHeaderSize(idx); + + // error checking +- this->File->seekg((long)streamStart, ios::beg); ++ this->File->seekg(static_cast<long>(streamStart), ios::beg); + if (this->File->fail()) + { + vtkErrorMacro(<< "File operation failed: " << streamStart << ", ext: " +@@ -366,7 +366,7 @@ + // if that happens, store the value in correction and apply later + if (filePos + streamSkip0 >= 0) + { +- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip0, ios::beg); ++ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip0, ios::beg); + correction = 0; + } + else +@@ -376,7 +376,7 @@ + outPtr1 += outIncr[1]; + } + // move to the next image in the file and data +- self->GetFile()->seekg(self->GetFile()->tellg() + streamSkip1 + correction, ++ self->GetFile()->seekg(static_cast<long>(self->GetFile()->tellg()) + streamSkip1 + correction, + ios::beg); + outPtr2 += outIncr[2]; + } |