Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package vtk6 During the last upload of the version 6.3.0+dfsg1-4 some line endings in autopkgtests were accidentally broken and it causes test failures [1]. This upload is trivial and just replaces broken line endings. [1] https://ci.debian.net/packages/v/vtk6/unstable/amd64/ unblock vtk6/6.3.0+dfsg1-5 Thanks, Anton
diff -Nru vtk6-6.3.0+dfsg1/debian/changelog vtk6-6.3.0+dfsg1/debian/changelog --- vtk6-6.3.0+dfsg1/debian/changelog 2017-03-14 21:34:10.000000000 +0100 +++ vtk6-6.3.0+dfsg1/debian/changelog 2017-05-09 22:38:56.000000000 +0200 @@ -1,3 +1,9 @@ +vtk6 (6.3.0+dfsg1-5) unstable; urgency=medium + + * Fix line endings in autopkgtests to let them run. + + -- Anton Gladky <gl...@debian.org> Tue, 09 May 2017 22:38:56 +0200 + vtk6 (6.3.0+dfsg1-4) unstable; urgency=medium * [9a28dbe] Fix symlink onto vtk. (Closes: #857533). diff -Nru vtk6-6.3.0+dfsg1/debian/patches/100_javac-heap.patch vtk6-6.3.0+dfsg1/debian/patches/100_javac-heap.patch --- vtk6-6.3.0+dfsg1/debian/patches/100_javac-heap.patch 2016-04-14 14:36:27.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/patches/100_javac-heap.patch 2017-05-09 22:38:24.000000000 +0200 @@ -1,8 +1,8 @@ -Description: set JVM max memory to 1024m. -Author: Matthias Klose <d...@ubuntu.com> -Acked-By: Anton Gladky <gl...@debian.org> -Last-Update: 2016-02-12 - +Description: set JVM max memory to 1024m. +Author: Matthias Klose <d...@ubuntu.com> +Acked-By: Anton Gladky <gl...@debian.org> +Last-Update: 2016-02-12 + Index: VTK-6.3.0/Wrapping/Java/CMakeLists.txt =================================================================== --- VTK-6.3.0.orig/Wrapping/Java/CMakeLists.txt diff -Nru vtk6-6.3.0+dfsg1/debian/patches/101_java_install_path.patch vtk6-6.3.0+dfsg1/debian/patches/101_java_install_path.patch --- vtk6-6.3.0+dfsg1/debian/patches/101_java_install_path.patch 2016-04-14 14:36:38.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/patches/101_java_install_path.patch 2017-05-09 22:38:24.000000000 +0200 @@ -1,11 +1,11 @@ -Description: Install Java modules in the correct path - This patch corrects the installation of the native Java modules - to go to the path given by the Debian Java Policy. This helps - to later use the simple install file to get them to the right - location in the package. -Author: Gert Wollny <gw.foss...@gmail.com -Last-Update: 2016-03-26 - +Description: Install Java modules in the correct path + This patch corrects the installation of the native Java modules + to go to the path given by the Debian Java Policy. This helps + to later use the simple install file to get them to the right + location in the package. +Author: Gert Wollny <gw.foss...@gmail.com +Last-Update: 2016-03-26 + Index: VTK-6.3.0/CMake/vtkJavaWrapping.cmake =================================================================== --- VTK-6.3.0.orig/CMake/vtkJavaWrapping.cmake diff -Nru vtk6-6.3.0+dfsg1/debian/patches/102_enable_system_proj4_lib.patch vtk6-6.3.0+dfsg1/debian/patches/102_enable_system_proj4_lib.patch --- vtk6-6.3.0+dfsg1/debian/patches/102_enable_system_proj4_lib.patch 2016-04-14 14:36:45.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/patches/102_enable_system_proj4_lib.patch 2017-05-09 22:38:24.000000000 +0200 @@ -1,8 +1,8 @@ -Description: Correct code to enable use of system proj4 -Author: Matthew Woehlke <matthew.woeh...@kitware.com> -Bug: https://bugs.debian.org/750184 -Upstream-Bug: http://www.vtk.org/Bug/view.php?id=14126 - +Description: Correct code to enable use of system proj4 +Author: Matthew Woehlke <matthew.woeh...@kitware.com> +Bug: https://bugs.debian.org/750184 +Upstream-Bug: http://www.vtk.org/Bug/view.php?id=14126 + Index: VTK-6.3.0/CMake/FindLIBPROJ4.cmake =================================================================== --- VTK-6.3.0.orig/CMake/FindLIBPROJ4.cmake diff -Nru vtk6-6.3.0+dfsg1/debian/patches/104_fix_gcc_version_6.patch vtk6-6.3.0+dfsg1/debian/patches/104_fix_gcc_version_6.patch --- vtk6-6.3.0+dfsg1/debian/patches/104_fix_gcc_version_6.patch 2016-04-14 14:36:53.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/patches/104_fix_gcc_version_6.patch 2017-05-09 22:38:24.000000000 +0200 @@ -1,7 +1,7 @@ -Description: Fix to be able to compile with gcc-6 -Author: Gerardo Malazdrewicz <gera...@malazdrewicz.com.ar> -Bug: https://bugs.debian.org/812296 - +Description: Fix to be able to compile with gcc-6 +Author: Gerardo Malazdrewicz <gera...@malazdrewicz.com.ar> +Bug: https://bugs.debian.org/812296 + Index: VTK-6.3.0/CMake/GenerateExportHeader.cmake =================================================================== --- VTK-6.3.0.orig/CMake/GenerateExportHeader.cmake diff -Nru vtk6-6.3.0+dfsg1/debian/patches/105_unforce_embedded_glew.patch vtk6-6.3.0+dfsg1/debian/patches/105_unforce_embedded_glew.patch --- vtk6-6.3.0+dfsg1/debian/patches/105_unforce_embedded_glew.patch 2016-04-14 14:36:59.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/patches/105_unforce_embedded_glew.patch 2017-05-09 22:38:24.000000000 +0200 @@ -1,8 +1,8 @@ -Description: Remove the FORCE from the use_system_glew=off option - The embedded version of GLEW seems to be older than the version - provided by Debian, so I assume that the fixes have been applied. -Author: Gert Wollny <gw.foss...@gmail.com> - +Description: Remove the FORCE from the use_system_glew=off option + The embedded version of GLEW seems to be older than the version + provided by Debian, so I assume that the fixes have been applied. +Author: Gert Wollny <gw.foss...@gmail.com> + Index: VTK-6.3.0/CMakeLists.txt =================================================================== --- VTK-6.3.0.orig/CMakeLists.txt diff -Nru vtk6-6.3.0+dfsg1/debian/patches/10_allpatches.patch vtk6-6.3.0+dfsg1/debian/patches/10_allpatches.patch --- vtk6-6.3.0+dfsg1/debian/patches/10_allpatches.patch 2016-04-14 14:18:02.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/patches/10_allpatches.patch 2017-05-09 22:38:24.000000000 +0200 @@ -1,45 +1,45 @@ -Description: <short summary of the patch> - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - vtk (5.8.0-13) unstable; urgency=low - . - * Make sure to include VTK/QT cmake file. Closes: #656115 - * Revert back to libtiff4-dev and use libtiff-dev in d/control. Closes: #674998 - * Fix tkInt.h installation, using proper cmake magic. Closes: #674169 - * Make sure to discover init.tcl properly. Closes: #673245 -Author: Mathieu Malaterre <ma...@debian.org> -Bug-Debian: http://bugs.debian.org/656115 -Bug-Debian: http://bugs.debian.org/673245 -Bug-Debian: http://bugs.debian.org/674169 -Bug-Debian: http://bugs.debian.org/674998 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - -Index: VTK-6.2.0/Wrapping/Tcl/vtkTkAppInit.cxx -=================================================================== ---- VTK-6.2.0.orig/Wrapping/Tcl/vtkTkAppInit.cxx -+++ VTK-6.2.0/Wrapping/Tcl/vtkTkAppInit.cxx -@@ -165,6 +165,8 @@ int Tcl_AppInit(Tcl_Interp *interp) - // Help Tcl find the Tcl/Tk helper files. - const char* relative_dirs[] = - { -+ "../share/tcltk", -+ "../../share/tcltk", - "TclTk/lib", - ".." VTK_INSTALL_TCL_DIR, - 0 +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + vtk (5.8.0-13) unstable; urgency=low + . + * Make sure to include VTK/QT cmake file. Closes: #656115 + * Revert back to libtiff4-dev and use libtiff-dev in d/control. Closes: #674998 + * Fix tkInt.h installation, using proper cmake magic. Closes: #674169 + * Make sure to discover init.tcl properly. Closes: #673245 +Author: Mathieu Malaterre <ma...@debian.org> +Bug-Debian: http://bugs.debian.org/656115 +Bug-Debian: http://bugs.debian.org/673245 +Bug-Debian: http://bugs.debian.org/674169 +Bug-Debian: http://bugs.debian.org/674998 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +Index: VTK-6.2.0/Wrapping/Tcl/vtkTkAppInit.cxx +=================================================================== +--- VTK-6.2.0.orig/Wrapping/Tcl/vtkTkAppInit.cxx ++++ VTK-6.2.0/Wrapping/Tcl/vtkTkAppInit.cxx +@@ -165,6 +165,8 @@ int Tcl_AppInit(Tcl_Interp *interp) + // Help Tcl find the Tcl/Tk helper files. + const char* relative_dirs[] = + { ++ "../share/tcltk", ++ "../../share/tcltk", + "TclTk/lib", + ".." VTK_INSTALL_TCL_DIR, + 0 diff -Nru vtk6-6.3.0+dfsg1/debian/patches/40_use_system_sqlite.patch vtk6-6.3.0+dfsg1/debian/patches/40_use_system_sqlite.patch --- vtk6-6.3.0+dfsg1/debian/patches/40_use_system_sqlite.patch 2016-04-14 14:35:18.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/patches/40_use_system_sqlite.patch 2017-05-09 22:38:24.000000000 +0200 @@ -1,8 +1,8 @@ -Description: Use system sqlite -Author: Anton Gladky <gl...@debian.org> -Bug-Debian: http://bugs.debian.org/750183 -Last-Update: 2014-06-03 - +Description: Use system sqlite +Author: Anton Gladky <gl...@debian.org> +Bug-Debian: http://bugs.debian.org/750183 +Last-Update: 2014-06-03 + Index: VTK-6.3.0/IO/SQL/vtkSQLiteDatabase.cxx =================================================================== --- VTK-6.3.0.orig/IO/SQL/vtkSQLiteDatabase.cxx diff -Nru vtk6-6.3.0+dfsg1/debian/patches/50_use_system_utf8.patch vtk6-6.3.0+dfsg1/debian/patches/50_use_system_utf8.patch --- vtk6-6.3.0+dfsg1/debian/patches/50_use_system_utf8.patch 2016-04-14 14:35:25.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/patches/50_use_system_utf8.patch 2017-05-09 22:38:24.000000000 +0200 @@ -1,30 +1,30 @@ -Description: <short summary of the patch> - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - vtk6 (6.2.0-1) unstable; urgency=medium - . - [ James Cowgill ] - * [0b9b309] Fix FTBFS due to new freetype. (Closes: #779802) -Author: Anton Gladky <gl...@debian.org> -Bug-Debian: https://bugs.debian.org/779802 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: https://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - +Description: <short summary of the patch> + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + vtk6 (6.2.0-1) unstable; urgency=medium + . + [ James Cowgill ] + * [0b9b309] Fix FTBFS due to new freetype. (Closes: #779802) +Author: Anton Gladky <gl...@debian.org> +Bug-Debian: https://bugs.debian.org/779802 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: https://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + Index: VTK-6.3.0/Common/Core/vtkUnicodeString.cxx =================================================================== --- VTK-6.3.0.orig/Common/Core/vtkUnicodeString.cxx diff -Nru vtk6-6.3.0+dfsg1/debian/patches/60_use_system_mpi4py.patch vtk6-6.3.0+dfsg1/debian/patches/60_use_system_mpi4py.patch --- vtk6-6.3.0+dfsg1/debian/patches/60_use_system_mpi4py.patch 2016-04-14 14:35:30.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/patches/60_use_system_mpi4py.patch 2017-05-09 22:38:24.000000000 +0200 @@ -1,7 +1,7 @@ -Description: use system mpi4py -Author: Anton Gladky <gl...@debian.org> -Last-Update: 2015-03-24 - +Description: use system mpi4py +Author: Anton Gladky <gl...@debian.org> +Last-Update: 2015-03-24 + Index: VTK-6.3.0/Parallel/MPI4Py/CMakeLists.txt =================================================================== --- VTK-6.3.0.orig/Parallel/MPI4Py/CMakeLists.txt diff -Nru vtk6-6.3.0+dfsg1/debian/patches/70_fix_ftbfs_gcc49.patch vtk6-6.3.0+dfsg1/debian/patches/70_fix_ftbfs_gcc49.patch --- vtk6-6.3.0+dfsg1/debian/patches/70_fix_ftbfs_gcc49.patch 2016-04-14 14:36:09.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/patches/70_fix_ftbfs_gcc49.patch 2017-05-09 22:38:24.000000000 +0200 @@ -1,9 +1,9 @@ -Description: fix compilation with gcc-4.9 -Author: Anton Gladky <gl...@debian.org> -Bug-Debian: http://bugs.debian.org/746923 -Forwarded: https://github.com/Kitware/VTK/pull/7 -Last-Update: 2014-05-30 - +Description: fix compilation with gcc-4.9 +Author: Anton Gladky <gl...@debian.org> +Bug-Debian: http://bugs.debian.org/746923 +Forwarded: https://github.com/Kitware/VTK/pull/7 +Last-Update: 2014-05-30 + Index: VTK-6.3.0/Filters/ParallelMPI/vtkDistributedDataFilter.cxx =================================================================== --- VTK-6.3.0.orig/Filters/ParallelMPI/vtkDistributedDataFilter.cxx diff -Nru vtk6-6.3.0+dfsg1/debian/patches/80_fix_arm_compilation.patch vtk6-6.3.0+dfsg1/debian/patches/80_fix_arm_compilation.patch --- vtk6-6.3.0+dfsg1/debian/patches/80_fix_arm_compilation.patch 2016-04-14 14:36:17.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/patches/80_fix_arm_compilation.patch 2017-05-09 22:38:24.000000000 +0200 @@ -1,10 +1,10 @@ -Description: Drop some examples, which require Qt - It is neccessary for the fixing of arm-compilation - where Qt is not available -Author: Anton Gladky <gl...@debian.org> -Bug-Debian: https://bugs.debian.org/793304 -Last-Update: 2015-07-29 - +Description: Drop some examples, which require Qt + It is neccessary for the fixing of arm-compilation + where Qt is not available +Author: Anton Gladky <gl...@debian.org> +Bug-Debian: https://bugs.debian.org/793304 +Last-Update: 2015-07-29 + Index: VTK-6.3.0/Examples/Infovis/Cxx/CMakeLists.txt =================================================================== --- VTK-6.3.0.orig/Examples/Infovis/Cxx/CMakeLists.txt diff -Nru vtk6-6.3.0+dfsg1/debian/patches/90_gdal-2.0.patch vtk6-6.3.0+dfsg1/debian/patches/90_gdal-2.0.patch --- vtk6-6.3.0+dfsg1/debian/patches/90_gdal-2.0.patch 2016-04-14 14:36:22.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/patches/90_gdal-2.0.patch 2017-05-09 22:38:24.000000000 +0200 @@ -1,8 +1,8 @@ -Description: Fix GDAL 2.0 compatibility. - Based on gdal2.patch from ArchLinux, improved to support both GDAL 1.x & 2.x. -Origin: https://projects.archlinux.org/svntogit/community.git/tree/trunk/gdal2.patch?h=packages/vtk -Bug: http://www.vtk.org/Bug/view.php?id=15692 - +Description: Fix GDAL 2.0 compatibility. + Based on gdal2.patch from ArchLinux, improved to support both GDAL 1.x & 2.x. +Origin: https://projects.archlinux.org/svntogit/community.git/tree/trunk/gdal2.patch?h=packages/vtk +Bug: http://www.vtk.org/Bug/view.php?id=15692 + Index: VTK-6.3.0/IO/GDAL/vtkGDALVectorReader.cxx =================================================================== --- VTK-6.3.0.orig/IO/GDAL/vtkGDALVectorReader.cxx diff -Nru vtk6-6.3.0+dfsg1/debian/patches/95_ffmpeg_2.9.patch vtk6-6.3.0+dfsg1/debian/patches/95_ffmpeg_2.9.patch --- vtk6-6.3.0+dfsg1/debian/patches/95_ffmpeg_2.9.patch 2016-04-14 14:18:02.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/patches/95_ffmpeg_2.9.patch 2017-05-09 22:38:24.000000000 +0200 @@ -1,94 +1,94 @@ -Description: Replace deprecated FFmpeg API -Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> -Last-Update: <2015-11-02> - ---- a/CMake/vtkTestFFMPEG.cmake -+++ b/CMake/vtkTestFFMPEG.cmake -@@ -32,8 +32,8 @@ - #include <${FFMEG_CODEC_HEADER_PATH}/avcodec.h> - int main() - { -- img_convert(0, PIX_FMT_RGB24, -- 0, PIX_FMT_RGB24, -+ img_convert(0, AV_PIX_FMT_RGB24, -+ 0, AV_PIX_FMT_RGB24, - 0, 0); - return 0; - }\n") ---- a/IO/FFMPEG/vtkFFMPEGWriter.cxx -+++ b/IO/FFMPEG/vtkFFMPEGWriter.cxx -@@ -191,11 +191,11 @@ - c->height = this->Dim[1]; - if (this->Writer->GetCompression()) - { -- c->pix_fmt = PIX_FMT_YUVJ422P; -+ c->pix_fmt = AV_PIX_FMT_YUVJ422P; - } - else - { -- c->pix_fmt = PIX_FMT_BGR24; -+ c->pix_fmt = AV_PIX_FMT_BGR24; - } - - //to do playback at actual recorded rate, this will need more work see also below -@@ -274,13 +274,13 @@ - #endif - - //for the output of the writer's input... -- this->rgbInput = avcodec_alloc_frame(); -+ this->rgbInput = av_frame_alloc(); - if (!this->rgbInput) - { - vtkGenericWarningMacro (<< "Could not make rgbInput avframe." ); - return 0; - } -- int RGBsize = avpicture_get_size(PIX_FMT_RGB24, c->width, c->height); -+ int RGBsize = avpicture_get_size(AV_PIX_FMT_RGB24, c->width, c->height); - unsigned char *rgb = (unsigned char *)av_malloc(sizeof(unsigned char) * RGBsize); - if (!rgb) - { -@@ -288,10 +288,10 @@ - return 0; - } - //The rgb buffer should get deleted when this->rgbInput is. -- avpicture_fill((AVPicture *)this->rgbInput, rgb, PIX_FMT_RGB24, c->width, c->height); -+ avpicture_fill((AVPicture *)this->rgbInput, rgb, AV_PIX_FMT_RGB24, c->width, c->height); - - //and for the output to the codec's input. -- this->yuvOutput = avcodec_alloc_frame(); -+ this->yuvOutput = av_frame_alloc(); - if (!this->yuvOutput) - { - vtkGenericWarningMacro (<< "Could not make yuvOutput avframe." ); -@@ -349,12 +349,12 @@ - //convert that to YUV for input to the codec - #ifdef VTK_FFMPEG_HAS_IMG_CONVERT - img_convert((AVPicture *)this->yuvOutput, cc->pix_fmt, -- (AVPicture *)this->rgbInput, PIX_FMT_RGB24, -+ (AVPicture *)this->rgbInput, AV_PIX_FMT_RGB24, - cc->width, cc->height); - #else - //convert that to YUV for input to the codec - SwsContext* convert_ctx = sws_getContext( -- cc->width, cc->height, PIX_FMT_RGB24, -+ cc->width, cc->height, AV_PIX_FMT_RGB24, - cc->width, cc->height, cc->pix_fmt, - SWS_BICUBIC, NULL, NULL, NULL); - -@@ -447,14 +447,14 @@ - if (this->yuvOutput) - { - av_free(this->yuvOutput->data[0]); -- av_free(this->yuvOutput); -+ av_frame_free(&this->yuvOutput); - this->yuvOutput = NULL; - } - - if (this->rgbInput) - { - av_free(this->rgbInput->data[0]); -- av_free(this->rgbInput); -+ av_frame_free(&this->rgbInput); - this->rgbInput = NULL; - } - +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> +Last-Update: <2015-11-02> + +--- a/CMake/vtkTestFFMPEG.cmake ++++ b/CMake/vtkTestFFMPEG.cmake +@@ -32,8 +32,8 @@ + #include <${FFMEG_CODEC_HEADER_PATH}/avcodec.h> + int main() + { +- img_convert(0, PIX_FMT_RGB24, +- 0, PIX_FMT_RGB24, ++ img_convert(0, AV_PIX_FMT_RGB24, ++ 0, AV_PIX_FMT_RGB24, + 0, 0); + return 0; + }\n") +--- a/IO/FFMPEG/vtkFFMPEGWriter.cxx ++++ b/IO/FFMPEG/vtkFFMPEGWriter.cxx +@@ -191,11 +191,11 @@ + c->height = this->Dim[1]; + if (this->Writer->GetCompression()) + { +- c->pix_fmt = PIX_FMT_YUVJ422P; ++ c->pix_fmt = AV_PIX_FMT_YUVJ422P; + } + else + { +- c->pix_fmt = PIX_FMT_BGR24; ++ c->pix_fmt = AV_PIX_FMT_BGR24; + } + + //to do playback at actual recorded rate, this will need more work see also below +@@ -274,13 +274,13 @@ + #endif + + //for the output of the writer's input... +- this->rgbInput = avcodec_alloc_frame(); ++ this->rgbInput = av_frame_alloc(); + if (!this->rgbInput) + { + vtkGenericWarningMacro (<< "Could not make rgbInput avframe." ); + return 0; + } +- int RGBsize = avpicture_get_size(PIX_FMT_RGB24, c->width, c->height); ++ int RGBsize = avpicture_get_size(AV_PIX_FMT_RGB24, c->width, c->height); + unsigned char *rgb = (unsigned char *)av_malloc(sizeof(unsigned char) * RGBsize); + if (!rgb) + { +@@ -288,10 +288,10 @@ + return 0; + } + //The rgb buffer should get deleted when this->rgbInput is. +- avpicture_fill((AVPicture *)this->rgbInput, rgb, PIX_FMT_RGB24, c->width, c->height); ++ avpicture_fill((AVPicture *)this->rgbInput, rgb, AV_PIX_FMT_RGB24, c->width, c->height); + + //and for the output to the codec's input. +- this->yuvOutput = avcodec_alloc_frame(); ++ this->yuvOutput = av_frame_alloc(); + if (!this->yuvOutput) + { + vtkGenericWarningMacro (<< "Could not make yuvOutput avframe." ); +@@ -349,12 +349,12 @@ + //convert that to YUV for input to the codec + #ifdef VTK_FFMPEG_HAS_IMG_CONVERT + img_convert((AVPicture *)this->yuvOutput, cc->pix_fmt, +- (AVPicture *)this->rgbInput, PIX_FMT_RGB24, ++ (AVPicture *)this->rgbInput, AV_PIX_FMT_RGB24, + cc->width, cc->height); + #else + //convert that to YUV for input to the codec + SwsContext* convert_ctx = sws_getContext( +- cc->width, cc->height, PIX_FMT_RGB24, ++ cc->width, cc->height, AV_PIX_FMT_RGB24, + cc->width, cc->height, cc->pix_fmt, + SWS_BICUBIC, NULL, NULL, NULL); + +@@ -447,14 +447,14 @@ + if (this->yuvOutput) + { + av_free(this->yuvOutput->data[0]); +- av_free(this->yuvOutput); ++ av_frame_free(&this->yuvOutput); + this->yuvOutput = NULL; + } + + if (this->rgbInput) + { + av_free(this->rgbInput->data[0]); +- av_free(this->rgbInput); ++ av_frame_free(&this->rgbInput); + this->rgbInput = NULL; + } + diff -Nru vtk6-6.3.0+dfsg1/debian/patches/97_fix_latex_doxygen.patch vtk6-6.3.0+dfsg1/debian/patches/97_fix_latex_doxygen.patch --- vtk6-6.3.0+dfsg1/debian/patches/97_fix_latex_doxygen.patch 2016-04-14 14:18:02.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/patches/97_fix_latex_doxygen.patch 2017-05-09 22:38:24.000000000 +0200 @@ -1,35 +1,35 @@ -Description: Fix Latex code that made Dokygen halt the build -Author: Gert Wollny <gw.foss...@gmail.com> -Last-Update: 2016-02-02 -Forwardedd: no ---- a/Common/Core/vtkAbstractArray.h -+++ b/Common/Core/vtkAbstractArray.h -@@ -384,7 +384,7 @@ - // prominence P, we sample N values, with N = f(T; P, U). - // We want f to be sublinear in T in order to interactively handle large - // arrays; in practice, we can make f independent of T: -- // \f$ N >= \frac{5}{P}\mathrm{ln}\left(\frac{1}{PU}) \f$, -+ // \f$ N >= \frac{5}{P}\mathrm{ln}\left(\frac{1}{PU}\right) \f$, - // but note that small values of P are costly to achieve. - // The default parameters will locate prominent values that occur at least - // 1 out of every 1000 samples with a confidence of 0.999999 (= 1 - 1e6). ---- a/Common/Core/vtkMath.h -+++ b/Common/Core/vtkMath.h -@@ -661,14 +661,14 @@ - // The output is provided by overwriting the input A with a matrix of the same size as - // A containing all of the information about L and U. If the output matrix is - // \f$ A* = \left( \begin{array}{cc} -- // a & b \\ % -+ // a & b \\ - // c & d \end{array} \right)\f$ - // then L and U can be obtained as: - // \f$ L = \left( \begin{array}{cc} -- // 1 & 0 \\ % -+ // 1 & 0 \\ - // c & 1 \end{array} \right)\f$ - // \f$ U = \left( \begin{array}{cc} -- // a & b \\ % -+ // a & b \\ - // 0 & d \end{array} \right)\f$ - // - // That is, the diagonal of the resulting A* is the diagonal of U. The upper right +Description: Fix Latex code that made Dokygen halt the build +Author: Gert Wollny <gw.foss...@gmail.com> +Last-Update: 2016-02-02 +Forwardedd: no +--- a/Common/Core/vtkAbstractArray.h ++++ b/Common/Core/vtkAbstractArray.h +@@ -384,7 +384,7 @@ + // prominence P, we sample N values, with N = f(T; P, U). + // We want f to be sublinear in T in order to interactively handle large + // arrays; in practice, we can make f independent of T: +- // \f$ N >= \frac{5}{P}\mathrm{ln}\left(\frac{1}{PU}) \f$, ++ // \f$ N >= \frac{5}{P}\mathrm{ln}\left(\frac{1}{PU}\right) \f$, + // but note that small values of P are costly to achieve. + // The default parameters will locate prominent values that occur at least + // 1 out of every 1000 samples with a confidence of 0.999999 (= 1 - 1e6). +--- a/Common/Core/vtkMath.h ++++ b/Common/Core/vtkMath.h +@@ -661,14 +661,14 @@ + // The output is provided by overwriting the input A with a matrix of the same size as + // A containing all of the information about L and U. If the output matrix is + // \f$ A* = \left( \begin{array}{cc} +- // a & b \\ % ++ // a & b \\ + // c & d \end{array} \right)\f$ + // then L and U can be obtained as: + // \f$ L = \left( \begin{array}{cc} +- // 1 & 0 \\ % ++ // 1 & 0 \\ + // c & 1 \end{array} \right)\f$ + // \f$ U = \left( \begin{array}{cc} +- // a & b \\ % ++ // a & b \\ + // 0 & d \end{array} \right)\f$ + // + // That is, the diagonal of the resulting A* is the diagonal of U. The upper right diff -Nru vtk6-6.3.0+dfsg1/debian/tests/buildBoolean vtk6-6.3.0+dfsg1/debian/tests/buildBoolean --- vtk6-6.3.0+dfsg1/debian/tests/buildBoolean 2016-04-14 14:18:02.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/tests/buildBoolean 2017-05-09 22:38:24.000000000 +0200 @@ -1,176 +1,176 @@ -#!/bin/sh -# autopkgtest check -# (C) 2014 Anton Gladky - -set -e - -export OMPI_MCA_orte_rsh_agent=/bin/false - -WORKDIR=$(mktemp -d) -trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM -cd $WORKDIR -mkdir src -cd src - -cat <<EOF > CMakeLists.txt -cmake_minimum_required(VERSION 2.6) -project(demo) -find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) -include(\${VTK_USE_FILE}) - -add_executable(demo demo.cpp) -target_link_libraries(demo \${VTK_LIBRARIES}) -install(TARGETS demo DESTINATION bin) - -EOF - -cat <<EOF > demo.cpp -#include <vtkVersion.h> -#include <vtkBooleanOperationPolyDataFilter.h> - -#include <vtkActor.h> -#include <vtkPolyDataReader.h> -#include <vtkPolyDataMapper.h> -#include <vtkProperty.h> -#include <vtkRenderer.h> -#include <vtkRenderWindow.h> -#include <vtkRenderWindowInteractor.h> -#include <vtkSmartPointer.h> -#include <vtkSphereSource.h> - -int main(int argc, char *argv[]) -{ - vtkSmartPointer<vtkPolyData> input1; - vtkSmartPointer<vtkPolyData> input2; - - std::string operation("intersection"); - - if (argc == 4) - { - vtkSmartPointer<vtkPolyDataReader> reader1 = - vtkSmartPointer<vtkPolyDataReader>::New(); - reader1->SetFileName(argv[1]); - reader1->Update(); - input1 = reader1->GetOutput(); - - vtkSmartPointer<vtkPolyDataReader> reader2 = - vtkSmartPointer<vtkPolyDataReader>::New(); - reader2->SetFileName(argv[3]); - reader2->Update(); - input2 = reader2->GetOutput(); - - operation = argv[2]; - } - else - { - vtkSmartPointer<vtkSphereSource> sphereSource1 = - vtkSmartPointer<vtkSphereSource>::New(); - sphereSource1->SetCenter(.25, 0, 0); - sphereSource1->Update(); - input1 = sphereSource1->GetOutput(); - - vtkSmartPointer<vtkSphereSource> sphereSource2 = - vtkSmartPointer<vtkSphereSource>::New(); - sphereSource2->Update(); - input2 = sphereSource2->GetOutput(); - - if (argc == 2) - { - operation = argv[1]; - } - } - - vtkSmartPointer<vtkPolyDataMapper> input1Mapper = - vtkSmartPointer<vtkPolyDataMapper>::New(); -#if VTK_MAJOR_VERSION <= 5 - input1Mapper->SetInputConnection( input1->GetProducerPort() ); -#else - input1Mapper->SetInputData( input1 ); -#endif - input1Mapper->ScalarVisibilityOff(); - vtkSmartPointer<vtkActor> input1Actor = - vtkSmartPointer<vtkActor>::New(); - input1Actor->SetMapper( input1Mapper ); - input1Actor->GetProperty()->SetColor(1,0,0); - input1Actor->SetPosition( - input1->GetBounds()[1]-input1->GetBounds()[0], - 0, 0); - vtkSmartPointer<vtkPolyDataMapper> input2Mapper = - vtkSmartPointer<vtkPolyDataMapper>::New(); -#if VTK_MAJOR_VERSION <= 5 - input2Mapper->SetInputConnection( input2->GetProducerPort() ); -#else - input2Mapper->SetInputData( input2 ); -#endif - input2Mapper->ScalarVisibilityOff(); - vtkSmartPointer<vtkActor> input2Actor = - vtkSmartPointer<vtkActor>::New(); - input2Actor->SetMapper( input2Mapper ); - input2Actor->GetProperty()->SetColor(0,1,0); - input2Actor->SetPosition( - -(input2->GetBounds()[1]-input2->GetBounds()[0]), - 0, 0); - vtkSmartPointer<vtkBooleanOperationPolyDataFilter> booleanOperation = - vtkSmartPointer<vtkBooleanOperationPolyDataFilter>::New(); - if (operation == "union") - { - booleanOperation->SetOperationToUnion(); - } - else if (operation == "intersection") - { - booleanOperation->SetOperationToIntersection(); - } - else if (operation == "difference") - { - booleanOperation->SetOperationToDifference(); - } - else - { - std::cout << "Unknown operation: " << operation << std::endl; - return EXIT_FAILURE; - } -#if VTK_MAJOR_VERSION <= 5 - booleanOperation->SetInputConnection( 0, input1->GetProducerPort() ); - booleanOperation->SetInputConnection( 1, input2->GetProducerPort() ); -#else - booleanOperation->SetInputData( 0, input1 ); - booleanOperation->SetInputData( 1, input2 ); -#endif - vtkSmartPointer<vtkPolyDataMapper> booleanOperationMapper = - vtkSmartPointer<vtkPolyDataMapper>::New(); - booleanOperationMapper->SetInputConnection( booleanOperation->GetOutputPort() ); - booleanOperationMapper->ScalarVisibilityOff(); - - vtkSmartPointer<vtkActor> booleanOperationActor = - vtkSmartPointer<vtkActor>::New(); - booleanOperationActor->SetMapper( booleanOperationMapper ); - - vtkSmartPointer<vtkRenderer> renderer = - vtkSmartPointer<vtkRenderer>::New(); - renderer->AddViewProp(input1Actor); - renderer->AddViewProp(input2Actor); - renderer->AddViewProp(booleanOperationActor); - renderer->SetBackground(.1, .2, .3); - vtkSmartPointer<vtkRenderWindow> renderWindow = - vtkSmartPointer<vtkRenderWindow>::New(); - renderWindow->AddRenderer( renderer ); - - vtkSmartPointer<vtkRenderWindowInteractor> renWinInteractor = - vtkSmartPointer<vtkRenderWindowInteractor>::New(); - renWinInteractor->SetRenderWindow( renderWindow ); - - return EXIT_SUCCESS; -} - -EOF - -cd .. -mkdir build -cd build -cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src -make -make install -echo "build: OK" -[ -x demo ] -./demo -echo "run: OK" +#!/bin/sh +# autopkgtest check +# (C) 2014 Anton Gladky + +set -e + +export OMPI_MCA_orte_rsh_agent=/bin/false + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR +mkdir src +cd src + +cat <<EOF > CMakeLists.txt +cmake_minimum_required(VERSION 2.6) +project(demo) +find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) +include(\${VTK_USE_FILE}) + +add_executable(demo demo.cpp) +target_link_libraries(demo \${VTK_LIBRARIES}) +install(TARGETS demo DESTINATION bin) + +EOF + +cat <<EOF > demo.cpp +#include <vtkVersion.h> +#include <vtkBooleanOperationPolyDataFilter.h> + +#include <vtkActor.h> +#include <vtkPolyDataReader.h> +#include <vtkPolyDataMapper.h> +#include <vtkProperty.h> +#include <vtkRenderer.h> +#include <vtkRenderWindow.h> +#include <vtkRenderWindowInteractor.h> +#include <vtkSmartPointer.h> +#include <vtkSphereSource.h> + +int main(int argc, char *argv[]) +{ + vtkSmartPointer<vtkPolyData> input1; + vtkSmartPointer<vtkPolyData> input2; + + std::string operation("intersection"); + + if (argc == 4) + { + vtkSmartPointer<vtkPolyDataReader> reader1 = + vtkSmartPointer<vtkPolyDataReader>::New(); + reader1->SetFileName(argv[1]); + reader1->Update(); + input1 = reader1->GetOutput(); + + vtkSmartPointer<vtkPolyDataReader> reader2 = + vtkSmartPointer<vtkPolyDataReader>::New(); + reader2->SetFileName(argv[3]); + reader2->Update(); + input2 = reader2->GetOutput(); + + operation = argv[2]; + } + else + { + vtkSmartPointer<vtkSphereSource> sphereSource1 = + vtkSmartPointer<vtkSphereSource>::New(); + sphereSource1->SetCenter(.25, 0, 0); + sphereSource1->Update(); + input1 = sphereSource1->GetOutput(); + + vtkSmartPointer<vtkSphereSource> sphereSource2 = + vtkSmartPointer<vtkSphereSource>::New(); + sphereSource2->Update(); + input2 = sphereSource2->GetOutput(); + + if (argc == 2) + { + operation = argv[1]; + } + } + + vtkSmartPointer<vtkPolyDataMapper> input1Mapper = + vtkSmartPointer<vtkPolyDataMapper>::New(); +#if VTK_MAJOR_VERSION <= 5 + input1Mapper->SetInputConnection( input1->GetProducerPort() ); +#else + input1Mapper->SetInputData( input1 ); +#endif + input1Mapper->ScalarVisibilityOff(); + vtkSmartPointer<vtkActor> input1Actor = + vtkSmartPointer<vtkActor>::New(); + input1Actor->SetMapper( input1Mapper ); + input1Actor->GetProperty()->SetColor(1,0,0); + input1Actor->SetPosition( + input1->GetBounds()[1]-input1->GetBounds()[0], + 0, 0); + vtkSmartPointer<vtkPolyDataMapper> input2Mapper = + vtkSmartPointer<vtkPolyDataMapper>::New(); +#if VTK_MAJOR_VERSION <= 5 + input2Mapper->SetInputConnection( input2->GetProducerPort() ); +#else + input2Mapper->SetInputData( input2 ); +#endif + input2Mapper->ScalarVisibilityOff(); + vtkSmartPointer<vtkActor> input2Actor = + vtkSmartPointer<vtkActor>::New(); + input2Actor->SetMapper( input2Mapper ); + input2Actor->GetProperty()->SetColor(0,1,0); + input2Actor->SetPosition( + -(input2->GetBounds()[1]-input2->GetBounds()[0]), + 0, 0); + vtkSmartPointer<vtkBooleanOperationPolyDataFilter> booleanOperation = + vtkSmartPointer<vtkBooleanOperationPolyDataFilter>::New(); + if (operation == "union") + { + booleanOperation->SetOperationToUnion(); + } + else if (operation == "intersection") + { + booleanOperation->SetOperationToIntersection(); + } + else if (operation == "difference") + { + booleanOperation->SetOperationToDifference(); + } + else + { + std::cout << "Unknown operation: " << operation << std::endl; + return EXIT_FAILURE; + } +#if VTK_MAJOR_VERSION <= 5 + booleanOperation->SetInputConnection( 0, input1->GetProducerPort() ); + booleanOperation->SetInputConnection( 1, input2->GetProducerPort() ); +#else + booleanOperation->SetInputData( 0, input1 ); + booleanOperation->SetInputData( 1, input2 ); +#endif + vtkSmartPointer<vtkPolyDataMapper> booleanOperationMapper = + vtkSmartPointer<vtkPolyDataMapper>::New(); + booleanOperationMapper->SetInputConnection( booleanOperation->GetOutputPort() ); + booleanOperationMapper->ScalarVisibilityOff(); + + vtkSmartPointer<vtkActor> booleanOperationActor = + vtkSmartPointer<vtkActor>::New(); + booleanOperationActor->SetMapper( booleanOperationMapper ); + + vtkSmartPointer<vtkRenderer> renderer = + vtkSmartPointer<vtkRenderer>::New(); + renderer->AddViewProp(input1Actor); + renderer->AddViewProp(input2Actor); + renderer->AddViewProp(booleanOperationActor); + renderer->SetBackground(.1, .2, .3); + vtkSmartPointer<vtkRenderWindow> renderWindow = + vtkSmartPointer<vtkRenderWindow>::New(); + renderWindow->AddRenderer( renderer ); + + vtkSmartPointer<vtkRenderWindowInteractor> renWinInteractor = + vtkSmartPointer<vtkRenderWindowInteractor>::New(); + renWinInteractor->SetRenderWindow( renderWindow ); + + return EXIT_SUCCESS; +} + +EOF + +cd .. +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src +make +make install +echo "build: OK" +[ -x demo ] +./demo +echo "run: OK" diff -Nru vtk6-6.3.0+dfsg1/debian/tests/buildDistance vtk6-6.3.0+dfsg1/debian/tests/buildDistance --- vtk6-6.3.0+dfsg1/debian/tests/buildDistance 2016-04-14 14:18:02.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/tests/buildDistance 2017-05-09 22:38:24.000000000 +0200 @@ -1,59 +1,59 @@ -#!/bin/sh -# autopkgtest check -# (C) 2014 Anton Gladky - -set -e - -export OMPI_MCA_orte_rsh_agent=/bin/false - -WORKDIR=$(mktemp -d) -trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM -cd $WORKDIR -mkdir src -cd src - -cat <<EOF > CMakeLists.txt -cmake_minimum_required(VERSION 2.6) -project(demo) -find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) -include(\${VTK_USE_FILE}) - -add_executable(demo demo.cpp) -target_link_libraries(demo \${VTK_LIBRARIES}) -install(TARGETS demo DESTINATION bin) -EOF - -cat <<EOF > demo.cpp -#include <vtkMath.h> - -int main(int, char *[]) -{ - // Create two points. - double p0[3] = {0.0, 0.0, 0.0}; - double p1[3] = {1.0, 1.0, 1.0}; - - // Find the squared distance between the points. - double squaredDistance = vtkMath::Distance2BetweenPoints(p0, p1); - - // Take the square root to get the Euclidean distance between the points. - double distance = sqrt(squaredDistance); - - // Output the results. - std::cout << "SquaredDistance = " << squaredDistance << std::endl; - std::cout << "Distance = " << distance << std::endl; - - return EXIT_SUCCESS; -} - -EOF - -cd .. -mkdir build -cd build -cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src -make -make install -echo "build: OK" -[ -x demo ] -./demo -echo "run: OK" +#!/bin/sh +# autopkgtest check +# (C) 2014 Anton Gladky + +set -e + +export OMPI_MCA_orte_rsh_agent=/bin/false + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR +mkdir src +cd src + +cat <<EOF > CMakeLists.txt +cmake_minimum_required(VERSION 2.6) +project(demo) +find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) +include(\${VTK_USE_FILE}) + +add_executable(demo demo.cpp) +target_link_libraries(demo \${VTK_LIBRARIES}) +install(TARGETS demo DESTINATION bin) +EOF + +cat <<EOF > demo.cpp +#include <vtkMath.h> + +int main(int, char *[]) +{ + // Create two points. + double p0[3] = {0.0, 0.0, 0.0}; + double p1[3] = {1.0, 1.0, 1.0}; + + // Find the squared distance between the points. + double squaredDistance = vtkMath::Distance2BetweenPoints(p0, p1); + + // Take the square root to get the Euclidean distance between the points. + double distance = sqrt(squaredDistance); + + // Output the results. + std::cout << "SquaredDistance = " << squaredDistance << std::endl; + std::cout << "Distance = " << distance << std::endl; + + return EXIT_SUCCESS; +} + +EOF + +cd .. +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src +make +make install +echo "build: OK" +[ -x demo ] +./demo +echo "run: OK" diff -Nru vtk6-6.3.0+dfsg1/debian/tests/buildGenericClip vtk6-6.3.0+dfsg1/debian/tests/buildGenericClip --- vtk6-6.3.0+dfsg1/debian/tests/buildGenericClip 2016-04-14 14:18:02.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/tests/buildGenericClip 2017-05-09 22:38:24.000000000 +0200 @@ -1,156 +1,156 @@ -#!/bin/sh -# autopkgtest check -# (C) 2014 Anton Gladky - -set -e - -export OMPI_MCA_orte_rsh_agent=/bin/false - -WORKDIR=$(mktemp -d) -trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM -cd $WORKDIR -mkdir src -cd src - -cat <<EOF > CMakeLists.txt -cmake_minimum_required(VERSION 2.6) -project(demo) -find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) -include(\${VTK_USE_FILE}) - -add_executable(demo demo.cpp) -target_link_libraries(demo \${VTK_LIBRARIES}) -install(TARGETS demo DESTINATION bin) - -EOF - -cat <<EOF > demo.cpp -#include <vtkActor.h> -#include <vtkBridgeDataSet.h> -#include <vtkCellData.h> -#include <vtkContourFilter.h> -#include <vtkDataSetMapper.h> -#include <vtkDelaunay3D.h> -#include <vtkElevationFilter.h> -#include <vtkGenericClip.h> -#include <vtkImageData.h> -#include <vtkImplicitDataSet.h> -#include <vtkIdFilter.h> -#include <vtkIdTypeArray.h> -#include <vtkSphereSource.h> -#include <vtkPolyDataMapper.h> -#include <vtkProperty.h> -#include <vtkRenderWindow.h> -#include <vtkRenderer.h> -#include <vtkRenderWindowInteractor.h> -#include <vtkSampleFunction.h> -#include <vtkSmartPointer.h> -#include <vtkPlane.h> -#include <vtkUnstructuredGrid.h> - -int main(int, char**) -{ - - vtkSmartPointer<vtkSphereSource> sphereSource = - vtkSmartPointer<vtkSphereSource>::New(); - sphereSource->SetRadius(5); - sphereSource->SetThetaResolution(10); - sphereSource->SetPhiResolution(10); - sphereSource->Update(); - - // Add ids to the points and cells of the sphere - vtkSmartPointer<vtkIdFilter> idFilter = - vtkSmartPointer<vtkIdFilter>::New(); - idFilter->SetInputConnection(sphereSource->GetOutputPort()); - idFilter->Update(); - - // Create a plane to clip with - vtkSmartPointer<vtkPlane> plane = vtkSmartPointer<vtkPlane>::New(); - plane->SetOrigin(0, 0, 0); - plane->SetNormal(1, 1, 1); - - // Convert the DataSet to a GenericDataSet - vtkSmartPointer<vtkBridgeDataSet> bridgeDataSet = vtkSmartPointer<vtkBridgeDataSet>::New(); - bridgeDataSet->SetDataSet(idFilter->GetOutput()); - - vtkSmartPointer<vtkGenericClip> clipper = - vtkSmartPointer<vtkGenericClip>::New(); - clipper->SetClipFunction(plane); - clipper->SetInputData(bridgeDataSet); - clipper->Update(); - - // Get the clipped cell ids - vtkUnstructuredGrid* clipped = clipper->GetOutput(); - vtkIdTypeArray* originalIds = vtkIdTypeArray::SafeDownCast(clipped->GetCellData()->GetArray("vtkIdFilter_Ids")); - for(vtkIdType i = 0; i < originalIds->GetNumberOfTuples(); i++) - { - std::cout << "new id " << i << ", original id " << originalIds->GetValue(i) << std::endl; - } - - // Create a mapper and actor for clipped points - vtkSmartPointer<vtkDataSetMapper> mapper = - vtkSmartPointer<vtkDataSetMapper>::New(); - mapper->SetInputConnection(clipper->GetOutputPort()); - vtkSmartPointer<vtkActor> actor = - vtkSmartPointer<vtkActor>::New(); - actor->SetMapper(mapper); - - // Create a mapper and actor for clipping function - vtkSmartPointer<vtkSampleFunction> sample = - vtkSmartPointer<vtkSampleFunction>::New(); - sample->SetSampleDimensions(20,20,20); - sample->SetImplicitFunction(plane); - double value = 10.0; - double xmin = -value, xmax = value, ymin = -value, ymax = value, zmin = -value, zmax = value; - sample->SetModelBounds(xmin, xmax, ymin, ymax, zmin, zmax); - - // Create the 0 isosurface - vtkSmartPointer<vtkContourFilter> contours = - vtkSmartPointer<vtkContourFilter>::New(); - contours->SetInputConnection(sample->GetOutputPort()); - contours->GenerateValues(1, 1, 1); - - // Map the contours to graphical primitives - vtkSmartPointer<vtkPolyDataMapper> contourMapper = - vtkSmartPointer<vtkPolyDataMapper>::New(); - contourMapper->SetInputConnection(contours->GetOutputPort()); - contourMapper->SetScalarRange(0.0, 1.2); - - // Create an actor for the sphere - vtkSmartPointer<vtkActor> sphereActor = - vtkSmartPointer<vtkActor>::New(); - sphereActor->SetMapper(contourMapper); - - // Create a renderer, render window, and interactor - vtkSmartPointer<vtkRenderer> renderer = - vtkSmartPointer<vtkRenderer>::New(); - vtkSmartPointer<vtkRenderWindow> renderWindow = - vtkSmartPointer<vtkRenderWindow>::New(); - renderWindow->AddRenderer(renderer); - vtkSmartPointer<vtkRenderWindowInteractor> renderWindowInteractor = - vtkSmartPointer<vtkRenderWindowInteractor>::New(); - renderWindowInteractor->SetRenderWindow(renderWindow); - - // Add the actor to the scene - renderer->AddActor(actor); - renderer->AddActor(sphereActor); - renderer->SetBackground(1,1,1); // Background color white - - // Render and interact - // renderWindow->Render(); - // renderWindowInteractor->Start(); - - return 0; -} -EOF - -cd .. -mkdir build -cd build -cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src -make -make install -echo "build: OK" -[ -x demo ] -./demo -echo "run: OK" +#!/bin/sh +# autopkgtest check +# (C) 2014 Anton Gladky + +set -e + +export OMPI_MCA_orte_rsh_agent=/bin/false + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR +mkdir src +cd src + +cat <<EOF > CMakeLists.txt +cmake_minimum_required(VERSION 2.6) +project(demo) +find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) +include(\${VTK_USE_FILE}) + +add_executable(demo demo.cpp) +target_link_libraries(demo \${VTK_LIBRARIES}) +install(TARGETS demo DESTINATION bin) + +EOF + +cat <<EOF > demo.cpp +#include <vtkActor.h> +#include <vtkBridgeDataSet.h> +#include <vtkCellData.h> +#include <vtkContourFilter.h> +#include <vtkDataSetMapper.h> +#include <vtkDelaunay3D.h> +#include <vtkElevationFilter.h> +#include <vtkGenericClip.h> +#include <vtkImageData.h> +#include <vtkImplicitDataSet.h> +#include <vtkIdFilter.h> +#include <vtkIdTypeArray.h> +#include <vtkSphereSource.h> +#include <vtkPolyDataMapper.h> +#include <vtkProperty.h> +#include <vtkRenderWindow.h> +#include <vtkRenderer.h> +#include <vtkRenderWindowInteractor.h> +#include <vtkSampleFunction.h> +#include <vtkSmartPointer.h> +#include <vtkPlane.h> +#include <vtkUnstructuredGrid.h> + +int main(int, char**) +{ + + vtkSmartPointer<vtkSphereSource> sphereSource = + vtkSmartPointer<vtkSphereSource>::New(); + sphereSource->SetRadius(5); + sphereSource->SetThetaResolution(10); + sphereSource->SetPhiResolution(10); + sphereSource->Update(); + + // Add ids to the points and cells of the sphere + vtkSmartPointer<vtkIdFilter> idFilter = + vtkSmartPointer<vtkIdFilter>::New(); + idFilter->SetInputConnection(sphereSource->GetOutputPort()); + idFilter->Update(); + + // Create a plane to clip with + vtkSmartPointer<vtkPlane> plane = vtkSmartPointer<vtkPlane>::New(); + plane->SetOrigin(0, 0, 0); + plane->SetNormal(1, 1, 1); + + // Convert the DataSet to a GenericDataSet + vtkSmartPointer<vtkBridgeDataSet> bridgeDataSet = vtkSmartPointer<vtkBridgeDataSet>::New(); + bridgeDataSet->SetDataSet(idFilter->GetOutput()); + + vtkSmartPointer<vtkGenericClip> clipper = + vtkSmartPointer<vtkGenericClip>::New(); + clipper->SetClipFunction(plane); + clipper->SetInputData(bridgeDataSet); + clipper->Update(); + + // Get the clipped cell ids + vtkUnstructuredGrid* clipped = clipper->GetOutput(); + vtkIdTypeArray* originalIds = vtkIdTypeArray::SafeDownCast(clipped->GetCellData()->GetArray("vtkIdFilter_Ids")); + for(vtkIdType i = 0; i < originalIds->GetNumberOfTuples(); i++) + { + std::cout << "new id " << i << ", original id " << originalIds->GetValue(i) << std::endl; + } + + // Create a mapper and actor for clipped points + vtkSmartPointer<vtkDataSetMapper> mapper = + vtkSmartPointer<vtkDataSetMapper>::New(); + mapper->SetInputConnection(clipper->GetOutputPort()); + vtkSmartPointer<vtkActor> actor = + vtkSmartPointer<vtkActor>::New(); + actor->SetMapper(mapper); + + // Create a mapper and actor for clipping function + vtkSmartPointer<vtkSampleFunction> sample = + vtkSmartPointer<vtkSampleFunction>::New(); + sample->SetSampleDimensions(20,20,20); + sample->SetImplicitFunction(plane); + double value = 10.0; + double xmin = -value, xmax = value, ymin = -value, ymax = value, zmin = -value, zmax = value; + sample->SetModelBounds(xmin, xmax, ymin, ymax, zmin, zmax); + + // Create the 0 isosurface + vtkSmartPointer<vtkContourFilter> contours = + vtkSmartPointer<vtkContourFilter>::New(); + contours->SetInputConnection(sample->GetOutputPort()); + contours->GenerateValues(1, 1, 1); + + // Map the contours to graphical primitives + vtkSmartPointer<vtkPolyDataMapper> contourMapper = + vtkSmartPointer<vtkPolyDataMapper>::New(); + contourMapper->SetInputConnection(contours->GetOutputPort()); + contourMapper->SetScalarRange(0.0, 1.2); + + // Create an actor for the sphere + vtkSmartPointer<vtkActor> sphereActor = + vtkSmartPointer<vtkActor>::New(); + sphereActor->SetMapper(contourMapper); + + // Create a renderer, render window, and interactor + vtkSmartPointer<vtkRenderer> renderer = + vtkSmartPointer<vtkRenderer>::New(); + vtkSmartPointer<vtkRenderWindow> renderWindow = + vtkSmartPointer<vtkRenderWindow>::New(); + renderWindow->AddRenderer(renderer); + vtkSmartPointer<vtkRenderWindowInteractor> renderWindowInteractor = + vtkSmartPointer<vtkRenderWindowInteractor>::New(); + renderWindowInteractor->SetRenderWindow(renderWindow); + + // Add the actor to the scene + renderer->AddActor(actor); + renderer->AddActor(sphereActor); + renderer->SetBackground(1,1,1); // Background color white + + // Render and interact + // renderWindow->Render(); + // renderWindowInteractor->Start(); + + return 0; +} +EOF + +cd .. +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src +make +make install +echo "build: OK" +[ -x demo ] +./demo +echo "run: OK" diff -Nru vtk6-6.3.0+dfsg1/debian/tests/buildPNG vtk6-6.3.0+dfsg1/debian/tests/buildPNG --- vtk6-6.3.0+dfsg1/debian/tests/buildPNG 2016-04-14 14:18:02.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/tests/buildPNG 2017-05-09 22:38:24.000000000 +0200 @@ -1,84 +1,84 @@ -#!/bin/sh -# autopkgtest check -# (C) 2014 Anton Gladky - -set -e - -export OMPI_MCA_orte_rsh_agent=/bin/false - -WORKDIR=$(mktemp -d) -trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM -cd $WORKDIR -mkdir src -cd src - -cat <<EOF > CMakeLists.txt -cmake_minimum_required(VERSION 2.6) -project(demo) -find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy vtkImagingGeneral) -include(\${VTK_USE_FILE}) - -add_executable(demo demo.cpp) -target_link_libraries(demo \${VTK_LIBRARIES}) -install(TARGETS demo DESTINATION bin) -EOF - -cat <<EOF > demo.cpp -#include <vtkImageData.h> -#include <vtkPNGWriter.h> -#include <vtkSmartPointer.h> -#include <vtkImageCanvasSource2D.h> -#include <vtkImageCast.h> - -int main(int argc, char *argv[]) -{ - std::string outputFilename; - if( argc > 1) - { - outputFilename = argv[1]; - } - else - { - outputFilename = "output.png"; - } - - int extent[6] = {0, 99, 0, 99, 0, 0}; - vtkSmartPointer<vtkImageCanvasSource2D> imageSource = - vtkSmartPointer<vtkImageCanvasSource2D>::New(); - imageSource->SetExtent(extent); - imageSource->SetScalarTypeToUnsignedChar(); - imageSource->SetNumberOfScalarComponents(3); - imageSource->SetDrawColor(127, 45, 255); - imageSource->FillBox(0, 99, 0, 99); - imageSource->SetDrawColor(255,255,255); - imageSource->FillBox(40, 70, 20, 50); - imageSource->Update(); - - vtkSmartPointer<vtkImageCast> castFilter = - vtkSmartPointer<vtkImageCast>::New(); - castFilter->SetOutputScalarTypeToUnsignedChar (); - castFilter->SetInputConnection(imageSource->GetOutputPort()); - castFilter->Update(); - - vtkSmartPointer<vtkPNGWriter> writer = - vtkSmartPointer<vtkPNGWriter>::New(); - writer->SetFileName(outputFilename.c_str()); - writer->SetInputConnection(castFilter->GetOutputPort()); - writer->Write(); - - return EXIT_SUCCESS; -} - - -EOF - -cd .. -mkdir build -cd build -cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src -make -make install -echo "build: OK" -[ -x demo ] -./demo -echo "run: OK" +#!/bin/sh +# autopkgtest check +# (C) 2014 Anton Gladky + +set -e + +export OMPI_MCA_orte_rsh_agent=/bin/false + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR +mkdir src +cd src + +cat <<EOF > CMakeLists.txt +cmake_minimum_required(VERSION 2.6) +project(demo) +find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy vtkImagingGeneral) +include(\${VTK_USE_FILE}) + +add_executable(demo demo.cpp) +target_link_libraries(demo \${VTK_LIBRARIES}) +install(TARGETS demo DESTINATION bin) +EOF + +cat <<EOF > demo.cpp +#include <vtkImageData.h> +#include <vtkPNGWriter.h> +#include <vtkSmartPointer.h> +#include <vtkImageCanvasSource2D.h> +#include <vtkImageCast.h> + +int main(int argc, char *argv[]) +{ + std::string outputFilename; + if( argc > 1) + { + outputFilename = argv[1]; + } + else + { + outputFilename = "output.png"; + } + + int extent[6] = {0, 99, 0, 99, 0, 0}; + vtkSmartPointer<vtkImageCanvasSource2D> imageSource = + vtkSmartPointer<vtkImageCanvasSource2D>::New(); + imageSource->SetExtent(extent); + imageSource->SetScalarTypeToUnsignedChar(); + imageSource->SetNumberOfScalarComponents(3); + imageSource->SetDrawColor(127, 45, 255); + imageSource->FillBox(0, 99, 0, 99); + imageSource->SetDrawColor(255,255,255); + imageSource->FillBox(40, 70, 20, 50); + imageSource->Update(); + + vtkSmartPointer<vtkImageCast> castFilter = + vtkSmartPointer<vtkImageCast>::New(); + castFilter->SetOutputScalarTypeToUnsignedChar (); + castFilter->SetInputConnection(imageSource->GetOutputPort()); + castFilter->Update(); + + vtkSmartPointer<vtkPNGWriter> writer = + vtkSmartPointer<vtkPNGWriter>::New(); + writer->SetFileName(outputFilename.c_str()); + writer->SetInputConnection(castFilter->GetOutputPort()); + writer->Write(); + + return EXIT_SUCCESS; +} + + +EOF + +cd .. +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src +make +make install +echo "build: OK" +[ -x demo ] +./demo +echo "run: OK" diff -Nru vtk6-6.3.0+dfsg1/debian/tests/buildPoint vtk6-6.3.0+dfsg1/debian/tests/buildPoint --- vtk6-6.3.0+dfsg1/debian/tests/buildPoint 2016-04-14 14:18:02.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/tests/buildPoint 2017-05-09 22:38:24.000000000 +0200 @@ -1,59 +1,59 @@ -#!/bin/sh -# autopkgtest check -# (C) 2014 Anton Gladky - -set -e - -export OMPI_MCA_orte_rsh_agent=/bin/false - -WORKDIR=$(mktemp -d) -trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM -cd $WORKDIR -mkdir src -cd src - -cat <<EOF > CMakeLists.txt -cmake_minimum_required(VERSION 2.6) -project(demo) -find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) -include(\${VTK_USE_FILE}) - -add_executable(demo demo.cpp) -target_link_libraries(demo \${VTK_LIBRARIES}) -install(TARGETS demo DESTINATION bin) -EOF - -cat <<EOF > demo.cpp -#include <vtkPolyData.h> -#include <vtkSimplePointsWriter.h> -#include <vtkSphereSource.h> -#include <vtkSmartPointer.h> - -int main(int argc, char *argv[]) -{ - vtkSmartPointer<vtkSphereSource> sphereSource = - vtkSmartPointer<vtkSphereSource>::New(); - sphereSource->Update(); - - vtkSmartPointer<vtkSimplePointsWriter> writer = - vtkSmartPointer<vtkSimplePointsWriter>::New(); - writer->SetFileName("test.xyz"); - writer->SetInputConnection(sphereSource->GetOutputPort()); - writer->Write(); - - return EXIT_SUCCESS; -} - -EOF - -cd .. -mkdir build -cd build -cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src -make -make install -echo "build: OK" -[ -x demo ] -./demo -cat test.xyz -echo "run: OK" +#!/bin/sh +# autopkgtest check +# (C) 2014 Anton Gladky + +set -e + +export OMPI_MCA_orte_rsh_agent=/bin/false + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR +mkdir src +cd src + +cat <<EOF > CMakeLists.txt +cmake_minimum_required(VERSION 2.6) +project(demo) +find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) +include(\${VTK_USE_FILE}) + +add_executable(demo demo.cpp) +target_link_libraries(demo \${VTK_LIBRARIES}) +install(TARGETS demo DESTINATION bin) +EOF + +cat <<EOF > demo.cpp +#include <vtkPolyData.h> +#include <vtkSimplePointsWriter.h> +#include <vtkSphereSource.h> +#include <vtkSmartPointer.h> + +int main(int argc, char *argv[]) +{ + vtkSmartPointer<vtkSphereSource> sphereSource = + vtkSmartPointer<vtkSphereSource>::New(); + sphereSource->Update(); + + vtkSmartPointer<vtkSimplePointsWriter> writer = + vtkSmartPointer<vtkSimplePointsWriter>::New(); + writer->SetFileName("test.xyz"); + writer->SetInputConnection(sphereSource->GetOutputPort()); + writer->Write(); + + return EXIT_SUCCESS; +} + +EOF + +cd .. +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src +make +make install +echo "build: OK" +[ -x demo ] +./demo +cat test.xyz +echo "run: OK" diff -Nru vtk6-6.3.0+dfsg1/debian/tests/buildVTP vtk6-6.3.0+dfsg1/debian/tests/buildVTP --- vtk6-6.3.0+dfsg1/debian/tests/buildVTP 2016-04-14 14:18:02.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/tests/buildVTP 2017-05-09 22:38:24.000000000 +0200 @@ -1,73 +1,73 @@ -#!/bin/sh -# autopkgtest check -# (C) 2014 Anton Gladky - -set -e - -export OMPI_MCA_orte_rsh_agent=/bin/false - -WORKDIR=$(mktemp -d) -trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM -cd $WORKDIR -mkdir src -cd src - -cat <<EOF > CMakeLists.txt -cmake_minimum_required(VERSION 2.6) -project(demo) -find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) -include(\${VTK_USE_FILE}) - -add_executable(demo demo.cpp) -target_link_libraries(demo \${VTK_LIBRARIES}) -install(TARGETS demo DESTINATION bin) -EOF - -cat <<EOF > demo.cpp -#include <vtkVersion.h> -#include <vtkCellArray.h> -#include <vtkPoints.h> -#include <vtkXMLPolyDataWriter.h> -#include <vtkPolyData.h> -#include <vtkSmartPointer.h> - -int main ( int, char *[] ) -{ - vtkSmartPointer<vtkPoints> points = - vtkSmartPointer<vtkPoints>::New(); - - for ( unsigned int i = 0; i < 10; ++i ) - { - points->InsertNextPoint ( i, i, i ); - } - - vtkSmartPointer<vtkPolyData> polydata = - vtkSmartPointer<vtkPolyData>::New(); - polydata->SetPoints(points); - - vtkSmartPointer<vtkXMLPolyDataWriter> writer = - vtkSmartPointer<vtkXMLPolyDataWriter>::New(); - writer->SetFileName("test.vtp"); -#if VTK_MAJOR_VERSION <= 5 - writer->SetInput(polydata); -#else - writer->SetInputData(polydata); -#endif - writer->Write(); - - return EXIT_SUCCESS; -} - -EOF - -cd .. -mkdir build -cd build -cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src -make -make install -echo "build: OK" -[ -x demo ] -./demo -cat test.vtp -echo "run: OK" +#!/bin/sh +# autopkgtest check +# (C) 2014 Anton Gladky + +set -e + +export OMPI_MCA_orte_rsh_agent=/bin/false + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR +mkdir src +cd src + +cat <<EOF > CMakeLists.txt +cmake_minimum_required(VERSION 2.6) +project(demo) +find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) +include(\${VTK_USE_FILE}) + +add_executable(demo demo.cpp) +target_link_libraries(demo \${VTK_LIBRARIES}) +install(TARGETS demo DESTINATION bin) +EOF + +cat <<EOF > demo.cpp +#include <vtkVersion.h> +#include <vtkCellArray.h> +#include <vtkPoints.h> +#include <vtkXMLPolyDataWriter.h> +#include <vtkPolyData.h> +#include <vtkSmartPointer.h> + +int main ( int, char *[] ) +{ + vtkSmartPointer<vtkPoints> points = + vtkSmartPointer<vtkPoints>::New(); + + for ( unsigned int i = 0; i < 10; ++i ) + { + points->InsertNextPoint ( i, i, i ); + } + + vtkSmartPointer<vtkPolyData> polydata = + vtkSmartPointer<vtkPolyData>::New(); + polydata->SetPoints(points); + + vtkSmartPointer<vtkXMLPolyDataWriter> writer = + vtkSmartPointer<vtkXMLPolyDataWriter>::New(); + writer->SetFileName("test.vtp"); +#if VTK_MAJOR_VERSION <= 5 + writer->SetInput(polydata); +#else + writer->SetInputData(polydata); +#endif + writer->Write(); + + return EXIT_SUCCESS; +} + +EOF + +cd .. +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src +make +make install +echo "build: OK" +[ -x demo ] +./demo +cat test.vtp +echo "run: OK" diff -Nru vtk6-6.3.0+dfsg1/debian/tests/buildVTU vtk6-6.3.0+dfsg1/debian/tests/buildVTU --- vtk6-6.3.0+dfsg1/debian/tests/buildVTU 2016-04-14 14:18:02.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/tests/buildVTU 2017-05-09 22:38:24.000000000 +0200 @@ -1,129 +1,129 @@ -#!/bin/sh -# autopkgtest check -# (C) 2014 Anton Gladky - -set -e - -export OMPI_MCA_orte_rsh_agent=/bin/false - -WORKDIR=$(mktemp -d) -trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM -cd $WORKDIR -mkdir src -cd src - -cat <<EOF > CMakeLists.txt -cmake_minimum_required(VERSION 2.6) -project(demo) -find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) -include(\${VTK_USE_FILE}) - -add_executable(demo demo.cpp) -target_link_libraries(demo \${VTK_LIBRARIES}) -install(TARGETS demo DESTINATION bin) -EOF - -cat <<EOF > demo.cpp -#include <vtkVersion.h> -#include <vtkSmartPointer.h> -#include <vtkTetra.h> -#include <vtkCellArray.h> -#include <vtkXMLUnstructuredGridReader.h> -#include <vtkDataSetMapper.h> -#include <vtkActor.h> -#include <vtkRenderer.h> -#include <vtkRenderWindow.h> -#include <vtkRenderWindowInteractor.h> -#include <vtkXMLUnstructuredGridWriter.h> -#include <vtkUnstructuredGrid.h> -#include <vtkPointData.h> -#include <vtkVertexGlyphFilter.h> - -int main(int argc, char *argv[]) -{ - if(argc != 2) - { - std::cout << "Required arguments: OutputFilename" << std::endl; - return EXIT_FAILURE; - } - - std::string filename = argv[1]; - - vtkSmartPointer<vtkPoints> points = - vtkSmartPointer<vtkPoints>::New(); - points->InsertNextPoint(0, 0, 0); - points->InsertNextPoint(1, 0, 0); - points->InsertNextPoint(1, 1, 0); - points->InsertNextPoint(0, 1, 1); - - vtkSmartPointer<vtkTetra> tetra = - vtkSmartPointer<vtkTetra>::New(); - - tetra->GetPointIds()->SetId(0, 0); - tetra->GetPointIds()->SetId(1, 1); - tetra->GetPointIds()->SetId(2, 2); - tetra->GetPointIds()->SetId(3, 3); - - vtkSmartPointer<vtkCellArray> cellArray = - vtkSmartPointer<vtkCellArray>::New(); - cellArray->InsertNextCell(tetra); - - - vtkSmartPointer<vtkUnstructuredGrid> unstructuredGrid = - vtkSmartPointer<vtkUnstructuredGrid>::New(); - unstructuredGrid->SetPoints(points); - unstructuredGrid->SetCells(VTK_TETRA, cellArray); - - // Write file - vtkSmartPointer<vtkXMLUnstructuredGridWriter> writer = - vtkSmartPointer<vtkXMLUnstructuredGridWriter>::New(); - writer->SetFileName(filename.c_str()); -#if VTK_MAJOR_VERSION <= 5 - writer->SetInput(unstructuredGrid); -#else - writer->SetInputData(unstructuredGrid); -#endif - writer->Write(); - - vtkSmartPointer<vtkXMLUnstructuredGridReader> reader = - vtkSmartPointer<vtkXMLUnstructuredGridReader>::New(); - reader->SetFileName(filename.c_str()); - reader->Update(); - - vtkSmartPointer<vtkDataSetMapper> mapper = - vtkSmartPointer<vtkDataSetMapper>::New(); - mapper->SetInputConnection(reader->GetOutputPort()); - - vtkSmartPointer<vtkActor> actor = - vtkSmartPointer<vtkActor>::New(); - actor->SetMapper(mapper); - - vtkSmartPointer<vtkRenderer> renderer = - vtkSmartPointer<vtkRenderer>::New(); - vtkSmartPointer<vtkRenderWindow> renderWindow = - vtkSmartPointer<vtkRenderWindow>::New(); - renderWindow->AddRenderer(renderer); - vtkSmartPointer<vtkRenderWindowInteractor> renderWindowInteractor = - vtkSmartPointer<vtkRenderWindowInteractor>::New(); - renderWindowInteractor->SetRenderWindow(renderWindow); - - renderer->AddActor(actor); - renderer->SetBackground(.3, .6, .3); - - return EXIT_SUCCESS; -} - - -EOF - -cd .. -mkdir build -cd build -cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src -make -make install -echo "build: OK" -[ -x demo ] -./demo a.vtu -cat a.vtu -echo "run: OK" +#!/bin/sh +# autopkgtest check +# (C) 2014 Anton Gladky + +set -e + +export OMPI_MCA_orte_rsh_agent=/bin/false + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR +mkdir src +cd src + +cat <<EOF > CMakeLists.txt +cmake_minimum_required(VERSION 2.6) +project(demo) +find_package(VTK REQUIRED vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy) +include(\${VTK_USE_FILE}) + +add_executable(demo demo.cpp) +target_link_libraries(demo \${VTK_LIBRARIES}) +install(TARGETS demo DESTINATION bin) +EOF + +cat <<EOF > demo.cpp +#include <vtkVersion.h> +#include <vtkSmartPointer.h> +#include <vtkTetra.h> +#include <vtkCellArray.h> +#include <vtkXMLUnstructuredGridReader.h> +#include <vtkDataSetMapper.h> +#include <vtkActor.h> +#include <vtkRenderer.h> +#include <vtkRenderWindow.h> +#include <vtkRenderWindowInteractor.h> +#include <vtkXMLUnstructuredGridWriter.h> +#include <vtkUnstructuredGrid.h> +#include <vtkPointData.h> +#include <vtkVertexGlyphFilter.h> + +int main(int argc, char *argv[]) +{ + if(argc != 2) + { + std::cout << "Required arguments: OutputFilename" << std::endl; + return EXIT_FAILURE; + } + + std::string filename = argv[1]; + + vtkSmartPointer<vtkPoints> points = + vtkSmartPointer<vtkPoints>::New(); + points->InsertNextPoint(0, 0, 0); + points->InsertNextPoint(1, 0, 0); + points->InsertNextPoint(1, 1, 0); + points->InsertNextPoint(0, 1, 1); + + vtkSmartPointer<vtkTetra> tetra = + vtkSmartPointer<vtkTetra>::New(); + + tetra->GetPointIds()->SetId(0, 0); + tetra->GetPointIds()->SetId(1, 1); + tetra->GetPointIds()->SetId(2, 2); + tetra->GetPointIds()->SetId(3, 3); + + vtkSmartPointer<vtkCellArray> cellArray = + vtkSmartPointer<vtkCellArray>::New(); + cellArray->InsertNextCell(tetra); + + + vtkSmartPointer<vtkUnstructuredGrid> unstructuredGrid = + vtkSmartPointer<vtkUnstructuredGrid>::New(); + unstructuredGrid->SetPoints(points); + unstructuredGrid->SetCells(VTK_TETRA, cellArray); + + // Write file + vtkSmartPointer<vtkXMLUnstructuredGridWriter> writer = + vtkSmartPointer<vtkXMLUnstructuredGridWriter>::New(); + writer->SetFileName(filename.c_str()); +#if VTK_MAJOR_VERSION <= 5 + writer->SetInput(unstructuredGrid); +#else + writer->SetInputData(unstructuredGrid); +#endif + writer->Write(); + + vtkSmartPointer<vtkXMLUnstructuredGridReader> reader = + vtkSmartPointer<vtkXMLUnstructuredGridReader>::New(); + reader->SetFileName(filename.c_str()); + reader->Update(); + + vtkSmartPointer<vtkDataSetMapper> mapper = + vtkSmartPointer<vtkDataSetMapper>::New(); + mapper->SetInputConnection(reader->GetOutputPort()); + + vtkSmartPointer<vtkActor> actor = + vtkSmartPointer<vtkActor>::New(); + actor->SetMapper(mapper); + + vtkSmartPointer<vtkRenderer> renderer = + vtkSmartPointer<vtkRenderer>::New(); + vtkSmartPointer<vtkRenderWindow> renderWindow = + vtkSmartPointer<vtkRenderWindow>::New(); + renderWindow->AddRenderer(renderer); + vtkSmartPointer<vtkRenderWindowInteractor> renderWindowInteractor = + vtkSmartPointer<vtkRenderWindowInteractor>::New(); + renderWindowInteractor->SetRenderWindow(renderWindow); + + renderer->AddActor(actor); + renderer->SetBackground(.3, .6, .3); + + return EXIT_SUCCESS; +} + + +EOF + +cd .. +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=./../inst ./../src +make +make install +echo "build: OK" +[ -x demo ] +./demo a.vtu +cat a.vtu +echo "run: OK" diff -Nru vtk6-6.3.0+dfsg1/debian/tests/control vtk6-6.3.0+dfsg1/debian/tests/control --- vtk6-6.3.0+dfsg1/debian/tests/control 2016-04-14 14:18:02.000000000 +0200 +++ vtk6-6.3.0+dfsg1/debian/tests/control 2017-05-09 22:38:24.000000000 +0200 @@ -1,3 +1,3 @@ -Tests: buildBoolean buildPoint buildVTU buildDistance buildPNG buildVTP -Depends: libvtk6-dev, build-essential, cmake -Restrictions: allow-stderr +Tests: buildBoolean buildPoint buildVTU buildDistance buildPNG buildVTP +Depends: libvtk6-dev, build-essential, cmake +Restrictions: allow-stderr
