Author: smr Date: 2011-08-13 01:09:17 +0000 (Sat, 13 Aug 2011) New Revision: 7434
Added: trunk/packages/insighttoolkit/trunk/debian/patches/wrap-iifilter-split.patch Removed: trunk/packages/insighttoolkit/trunk/debian/patches/itkImageToImageFilterC.patch Modified: trunk/packages/insighttoolkit/trunk/debian/changelog trunk/packages/insighttoolkit/trunk/debian/patches/series Log: Replace patch with new version that splits filter wrapping further. Modified: trunk/packages/insighttoolkit/trunk/debian/changelog =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/changelog 2011-08-12 14:51:19 UTC (rev 7433) +++ trunk/packages/insighttoolkit/trunk/debian/changelog 2011-08-13 01:09:17 UTC (rev 7434) @@ -1,3 +1,11 @@ +insighttoolkit (3.20.0-12) unstable; urgency=low + + * patches/itkImageToImageFilterC.patch: Remove. + * patches/wrap-iifilter-split.patch: New; replaces above patch. Split + itkImageToImageFilterB into 3 files, introducing FilterC and FilterD. + + -- Steve M. Robbins <[email protected]> Fri, 12 Aug 2011 20:08:27 -0500 + insighttoolkit (3.20.0-11) unstable; urgency=low * control: Build-depend on newer gccxml that removes "inline namespace" Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/itkImageToImageFilterC.patch =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/itkImageToImageFilterC.patch 2011-08-12 14:51:19 UTC (rev 7433) +++ trunk/packages/insighttoolkit/trunk/debian/patches/itkImageToImageFilterC.patch 2011-08-13 01:09:17 UTC (rev 7434) @@ -1,76 +0,0 @@ -Description: Split ImageToImageFilterB into 2 smaller modules - to avoid compiler table overflow on certain architectures. - Without this patch, the powerpc build daemon fails with - "Error: operand out of range (0x0000000000008008 is not between 0xffffffffffff8000 and 0x0000000000007fff)" - See details and links in http://lists.debian.org/debian-devel/2011/02/msg00179.html -Author: Ga�tan Lehmann <[email protected]> -Origin: http://lists.debian.org/debian-devel/2011/02/msg00188.html - - ---- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/Modules/Base/CMakeLists.txt -+++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/Base/CMakeLists.txt -@@ -24,6 +24,7 @@ - itkImageSource - itkImageToImageFilterA - itkImageToImageFilterB -+ itkImageToImageFilterC - itkInPlaceImageFilterA - itkInPlaceImageFilterB - itkFiniteDifferenceImageFilter ---- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/Modules/Base/wrap_itkImageToImageFilterB.cmake -+++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/Base/wrap_itkImageToImageFilterB.cmake -@@ -27,27 +27,4 @@ - WRAP_IMAGE_FILTER_COMBINATIONS("${WRAP_ITK_VECTOR}" "${WRAP_ITK_SCALAR}") - WRAP_IMAGE_FILTER_COMBINATIONS("${WRAP_ITK_SCALAR}" "${WRAP_ITK_VECTOR}") - -- # complex <-> scalar -- IF(WRAP_complex_float AND WRAP_float) -- WRAP_IMAGE_FILTER_TYPES(CF F) -- WRAP_IMAGE_FILTER_TYPES(F CF) -- ENDIF(WRAP_complex_float AND WRAP_float) -- -- IF(WRAP_complex_double AND WRAP_double) -- WRAP_IMAGE_FILTER_TYPES(CD D) -- WRAP_IMAGE_FILTER_TYPES(D CD) -- ENDIF(WRAP_complex_double AND WRAP_double) -- -- # Wrap dim=3 -> dim=2, dim=3 -> dim=2, etc. -- FOREACH(d ${WRAP_ITK_DIMS}) -- FOREACH(d2 ${WRAP_ITK_DIMS}) -- IF (NOT "${d}" EQUAL "${d2}") # this was already taken care of elsewhere -- FOREACH(t ${WRAP_ITK_SCALAR}) -- WRAP_TEMPLATE("${ITKM_I${t}${d}}${ITKM_I${t}${d2}}" -- "${ITKT_I${t}${d}},${ITKT_I${t}${d2}}") -- ENDFOREACH(t) -- ENDIF(NOT "${d}" EQUAL "${d2}") -- ENDFOREACH(d2) -- ENDFOREACH(d) -- - END_WRAP_CLASS() ---- /dev/null -+++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/Base/wrap_itkImageToImageFilterC.cmake -@@ -0,0 +1,24 @@ -+WRAP_CLASS("itk::ImageToImageFilter" POINTER) -+ # complex <-> scalar -+ IF(WRAP_complex_float AND WRAP_float) -+ WRAP_IMAGE_FILTER_TYPES(CF F) -+ WRAP_IMAGE_FILTER_TYPES(F CF) -+ ENDIF(WRAP_complex_float AND WRAP_float) -+ -+ IF(WRAP_complex_double AND WRAP_double) -+ WRAP_IMAGE_FILTER_TYPES(CD D) -+ WRAP_IMAGE_FILTER_TYPES(D CD) -+ ENDIF(WRAP_complex_double AND WRAP_double) -+ -+ # Wrap dim=3 -> dim=2, dim=3 -> dim=2, etc. -+ FOREACH(d ${WRAP_ITK_DIMS}) -+ FOREACH(d2 ${WRAP_ITK_DIMS}) -+ IF (NOT "${d}" EQUAL "${d2}") # this was already taken care of elsewhere -+ FOREACH(t ${WRAP_ITK_SCALAR}) -+ WRAP_TEMPLATE("${ITKM_I${t}${d}}${ITKM_I${t}${d2}}" -+ "${ITKT_I${t}${d}},${ITKT_I${t}${d2}}") -+ ENDFOREACH(t) -+ ENDIF(NOT "${d}" EQUAL "${d2}") -+ ENDFOREACH(d2) -+ ENDFOREACH(d) -+END_WRAP_CLASS() Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/series 2011-08-12 14:51:19 UTC (rev 7433) +++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2011-08-13 01:09:17 UTC (rev 7434) @@ -7,5 +7,5 @@ wrapitk.patch wrapitk-externalprojects.patch add-registration-optimizers.patch -itkImageToImageFilterC.patch +wrap-iifilter-split.patch ptrdiff.patch Added: trunk/packages/insighttoolkit/trunk/debian/patches/wrap-iifilter-split.patch =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/wrap-iifilter-split.patch (rev 0) +++ trunk/packages/insighttoolkit/trunk/debian/patches/wrap-iifilter-split.patch 2011-08-13 01:09:17 UTC (rev 7434) @@ -0,0 +1,116 @@ +Description: Split ImageToImageFilterB into smaller modules + to avoid compile problems. The first version of this patch + was written by Ga�tan Lehmann to avoid compiler table overflow on + certain architectures, solving build failure on the powerpc build daemon + "Error: operand out of range (0x0000000000008008 is not between 0xffffffffffff8000 and 0x0000000000007fff)" + See details and links in http://lists.debian.org/debian-devel/2011/02/msg00179.html + The filterB source file was further split in August 2011, introducing filterD. +Author: Ga�tan Lehmann <[email protected]> +Origin: http://lists.debian.org/debian-devel/2011/02/msg00188.html + +--- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/Modules/Base/wrap_itkImageToImageFilterB.cmake ++++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/Base/wrap_itkImageToImageFilterB.cmake +@@ -12,42 +12,4 @@ + WRAP_IMAGE_FILTER_COMBINATIONS("${stypes}" "${WRAP_ITK_RGBA}") + WRAP_IMAGE_FILTER_COMBINATIONS("${WRAP_ITK_RGBA}" "${stypes}") + +- # VectorImage <-> scalar +- UNIQUE(to_types "UC;${WRAP_ITK_SCALAR}") +- FOREACH(d ${WRAP_ITK_DIMS}) +- FOREACH(t ${to_types}) +- FOREACH(t2 ${to_types}) +- WRAP_TEMPLATE("${ITKM_VI${t}${d}}${ITKM_I${t2}${d}}" "${ITKT_VI${t}${d}},${ITKT_I${t2}${d}}") +- WRAP_TEMPLATE("${ITKM_I${t2}${d}}${ITKM_VI${t}${d}}" "${ITKT_I${t2}${d}},${ITKT_VI${t}${d}}") +- ENDFOREACH(t2) +- ENDFOREACH(t) +- ENDFOREACH(d) +- +- # *Vector <-> scalar +- WRAP_IMAGE_FILTER_COMBINATIONS("${WRAP_ITK_VECTOR}" "${WRAP_ITK_SCALAR}") +- WRAP_IMAGE_FILTER_COMBINATIONS("${WRAP_ITK_SCALAR}" "${WRAP_ITK_VECTOR}") +- +- # complex <-> scalar +- IF(WRAP_complex_float AND WRAP_float) +- WRAP_IMAGE_FILTER_TYPES(CF F) +- WRAP_IMAGE_FILTER_TYPES(F CF) +- ENDIF(WRAP_complex_float AND WRAP_float) +- +- IF(WRAP_complex_double AND WRAP_double) +- WRAP_IMAGE_FILTER_TYPES(CD D) +- WRAP_IMAGE_FILTER_TYPES(D CD) +- ENDIF(WRAP_complex_double AND WRAP_double) +- +- # Wrap dim=3 -> dim=2, dim=3 -> dim=2, etc. +- FOREACH(d ${WRAP_ITK_DIMS}) +- FOREACH(d2 ${WRAP_ITK_DIMS}) +- IF (NOT "${d}" EQUAL "${d2}") # this was already taken care of elsewhere +- FOREACH(t ${WRAP_ITK_SCALAR}) +- WRAP_TEMPLATE("${ITKM_I${t}${d}}${ITKM_I${t}${d2}}" +- "${ITKT_I${t}${d}},${ITKT_I${t}${d2}}") +- ENDFOREACH(t) +- ENDIF(NOT "${d}" EQUAL "${d2}") +- ENDFOREACH(d2) +- ENDFOREACH(d) +- + END_WRAP_CLASS() +--- /dev/null ++++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/Base/wrap_itkImageToImageFilterC.cmake +@@ -0,0 +1,18 @@ ++WRAP_CLASS("itk::ImageToImageFilter" POINTER) ++ ++ # VectorImage <-> scalar ++ UNIQUE(to_types "UC;${WRAP_ITK_SCALAR}") ++ FOREACH(d ${WRAP_ITK_DIMS}) ++ FOREACH(t ${to_types}) ++ FOREACH(t2 ${to_types}) ++ WRAP_TEMPLATE("${ITKM_VI${t}${d}}${ITKM_I${t2}${d}}" "${ITKT_VI${t}${d}},${ITKT_I${t2}${d}}") ++ WRAP_TEMPLATE("${ITKM_I${t2}${d}}${ITKM_VI${t}${d}}" "${ITKT_I${t2}${d}},${ITKT_VI${t}${d}}") ++ ENDFOREACH(t2) ++ ENDFOREACH(t) ++ ENDFOREACH(d) ++ ++ # *Vector <-> scalar ++ WRAP_IMAGE_FILTER_COMBINATIONS("${WRAP_ITK_VECTOR}" "${WRAP_ITK_SCALAR}") ++ WRAP_IMAGE_FILTER_COMBINATIONS("${WRAP_ITK_SCALAR}" "${WRAP_ITK_VECTOR}") ++ ++END_WRAP_CLASS() +--- /dev/null ++++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/Base/wrap_itkImageToImageFilterD.cmake +@@ -0,0 +1,26 @@ ++WRAP_CLASS("itk::ImageToImageFilter" POINTER) ++ ++ # complex <-> scalar ++ IF(WRAP_complex_float AND WRAP_float) ++ WRAP_IMAGE_FILTER_TYPES(CF F) ++ WRAP_IMAGE_FILTER_TYPES(F CF) ++ ENDIF(WRAP_complex_float AND WRAP_float) ++ ++ IF(WRAP_complex_double AND WRAP_double) ++ WRAP_IMAGE_FILTER_TYPES(CD D) ++ WRAP_IMAGE_FILTER_TYPES(D CD) ++ ENDIF(WRAP_complex_double AND WRAP_double) ++ ++ # Wrap dim=3 -> dim=2, dim=3 -> dim=2, etc. ++ FOREACH(d ${WRAP_ITK_DIMS}) ++ FOREACH(d2 ${WRAP_ITK_DIMS}) ++ IF (NOT "${d}" EQUAL "${d2}") # this was already taken care of elsewhere ++ FOREACH(t ${WRAP_ITK_SCALAR}) ++ WRAP_TEMPLATE("${ITKM_I${t}${d}}${ITKM_I${t}${d2}}" ++ "${ITKT_I${t}${d}},${ITKT_I${t}${d2}}") ++ ENDFOREACH(t) ++ ENDIF(NOT "${d}" EQUAL "${d2}") ++ ENDFOREACH(d2) ++ ENDFOREACH(d) ++ ++END_WRAP_CLASS() +--- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/Modules/Base/CMakeLists.txt ++++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/Base/CMakeLists.txt +@@ -24,6 +24,8 @@ + itkImageSource + itkImageToImageFilterA + itkImageToImageFilterB ++ itkImageToImageFilterC ++ itkImageToImageFilterD + itkInPlaceImageFilterA + itkInPlaceImageFilterB + itkFiniteDifferenceImageFilter
_______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
