[med-svn] r7671 - trunk/packages/volview/trunk/debian/patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Mon Sep 5 15:44:33 UTC 2011
Author: malat-guest
Date: 2011-09-05 15:44:33 +0000 (Mon, 05 Sep 2011)
New Revision: 7671
Added:
trunk/packages/volview/trunk/debian/patches/removemarkov.patch
Modified:
trunk/packages/volview/trunk/debian/patches/fixcompissues.patch
trunk/packages/volview/trunk/debian/patches/fixmath.patch
trunk/packages/volview/trunk/debian/patches/fixupvtkedge.patch
trunk/packages/volview/trunk/debian/patches/series
Log:
more cleanup of patches
Modified: trunk/packages/volview/trunk/debian/patches/fixcompissues.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixcompissues.patch 2011-09-05 15:29:34 UTC (rev 7670)
+++ trunk/packages/volview/trunk/debian/patches/fixcompissues.patch 2011-09-05 15:44:33 UTC (rev 7671)
@@ -1,173 +1,29 @@
Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 11:31:25.000000000 +0200
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 11:44:51.000000000 +0200
-@@ -13,6 +13,7 @@
-
- #include "vtk3DCursorAnnotation.h"
- #include "vtkActor.h"
-+#include "vtkVolumeMapper.h"
- #include "vtkBoundingBoxAnnotation.h"
- #include "vtkCamera.h"
- #include "vtkCellArray.h"
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 15:34:03.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 15:34:27.000000000 +0000
@@ -52,7 +53,7 @@
#include "vtkKW3DSplineSurfacesWidget.h"
#include "vtkKWApplication.h"
#include "vtkKWApplicationPro.h"
--//#include "vtkKWEVolumeMapper.h"
+-#include "vtkKWEVolumeMapper.h"
+#include "vtkSmartVolumeMapper.h"
#include "vtkKWEvent.h"
#include "vtkKWEventMap.h"
#include "vtkKWFrame.h"
-@@ -119,7 +120,7 @@
-
- this->VolumeMapper = NULL; //vtkKWEVolumeMapper::New();
-
-- this->Volume->SetMapper(this->VolumeMapper);
-+ //this->Volume->SetMapper(this->VolumeMapper);
- this->Volume->SetProperty(this->VolumeProperty);
-
- this->InteractiveUpdateRate = 8.0;
-@@ -245,7 +246,7 @@
+@@ -117,7 +118,7 @@
- if ( this->VolumeMapper )
- {
-- this->VolumeMapper->Delete();
-+ //this->VolumeMapper->Delete();
- this->VolumeMapper = NULL;
- }
-
-@@ -473,12 +474,14 @@
- int i;
- for (i = 0; i < mappers->GetNumberOfItems(); i++)
- {
-+#if 0
- vtkVolumeMapper *vmapper = vtkVolumeMapper::SafeDownCast(
- mappers->GetItemAsObject(i));
- if (vmapper)
- {
- vmapper->SetInput(this->Input);
- }
-+#endif
- }
- mappers->Delete();
- mappers = NULL;
-@@ -490,7 +493,7 @@
- }
-
- this->Input->Update();
-- this->VolumeMapper->Modified();
-+ //this->VolumeMapper->Modified();
+ this->Volume = vtkVolume::New();
- this->GetRenderer()->AddViewProp(this->Volume);
+- this->VolumeMapper = vtkKWEVolumeMapper::New();
++ this->VolumeMapper = vtkSmartVolumeMapper::New();
-@@ -574,6 +577,7 @@
-
- for (i = 0; i < mappers->GetNumberOfItems(); i++)
- {
-+#if 0
- vtkVolumeMapper *vmapper = vtkVolumeMapper::SafeDownCast(
- mappers->GetItemAsObject(i));
- if (vmapper)
-@@ -583,12 +587,14 @@
- vmapper->GetInput()->GetWholeExtent());
- vmapper->GetInput()->Update();
- }
-+#endif
- }
-
- // Set the cropping planes to the bounds
-
- for (i = 0; i < mappers->GetNumberOfItems(); i++)
- {
-+#if 0
- vtkVolumeMapper *vmapper = vtkVolumeMapper::SafeDownCast(
- mappers->GetItemAsObject(i));
- if (vmapper)
-@@ -596,6 +602,7 @@
- vmapper->SetCroppingRegionPlanes(
- bounds[0], bounds[1], bounds[2], bounds[3], bounds[4], bounds[5]);
- }
-+#endif
- }
-
- mappers->Delete();
-@@ -737,7 +744,7 @@
-
- if (this->VolumeMapper)
- {
-- mappers->AddItem(this->VolumeMapper);
-+ //mappers->AddItem(this->VolumeMapper);
- }
- }
-
-@@ -804,10 +811,12 @@
- vtkKWApplicationPro::SafeDownCast(this->GetApplication());
- if (app_pro)
- {
-+#if 0
- this->VolumeMapper->SetRequestedRenderMode(
- app_pro->GetUseGPURendering() ? vtkKWEVolumeMapper::DefaultRenderMode
- : vtkKWEVolumeMapper::RayCastAndTextureRenderMode);
- // : vtkKWEVolumeMapper::RayCastRenderMode);
-+#endif
- }
-
- this->ScaleBarWidget->SetApplication(this->GetApplication());
-@@ -962,9 +971,9 @@
- void vtkKWVolumeWidget::LevelOfDetailRender()
- {
- if ( !this->VolumeMapper ||
-- !this->VolumeMapper->GetInput() ||
-- !this->Volume ||
-- !this->Volume->GetVisibility() )
-+ /*!this->VolumeMapper->GetInput() || */
-+ !this->Volume // ||
-+ /* !this->Volume->GetVisibility() */ )
- {
- if (this->RenderWindow)
- {
-@@ -1208,13 +1217,15 @@
- renwin->CheckAbortStatus() || // we should abort anyway
- renwin->GetEventPending() || // some events are pending
- (this->RenderMode ==
-- vtkKWRenderWidget::InteractiveRender) ||// we are interactive rendering
-+ vtkKWRenderWidget::InteractiveRender) //||// we are interactive rendering
-+#if 0
- (this->VolumeMapper->GetRequestedRenderMode() ==
-- vtkKWEVolumeMapper::RayCastAndTextureRenderMode &&
-+ vtkKWEVolumeMapper::RayCastAndTextureRenderMode &&
- !this->IsCreated()) || // we are not created but use raycast
- (this->VolumeMapper->GetRequestedRenderMode() ==
- vtkKWEVolumeMapper::DefaultRenderMode &&
- !this->IsMapped()) // we are not mapped and use GPU rendering
-+#endif
- )
- {
- return 0;
-@@ -1229,15 +1240,17 @@
- double up[3] = {0,0,1};
- vtkVolume *vol = vtkVolume::New();
- vol->SetProperty(prop);
-- vol->SetMapper(this->VolumeMapper);
-+ //vol->SetMapper(this->VolumeMapper);
- int vmapper_blend_mode = vtkVolumeMapper::COMPOSITE_BLEND;
- if (blend_mode == vtkKWVolumeWidget::BLEND_MODE_MIP)
- {
- vmapper_blend_mode = vtkVolumeMapper::MAXIMUM_INTENSITY_BLEND;
- }
-+#if 0
- this->VolumeMapper->CreateCanonicalView( this->GetRenderer(),
- this->Volume, vol, image,
- vmapper_blend_mode, direction, up);
-+#endif
- vol->SetProperty(NULL);
- vol->SetMapper(NULL);
- vol->Delete();
+ this->Volume->SetMapper(this->VolumeMapper);
+ this->Volume->SetProperty(this->VolumeProperty);
Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h 2011-09-05 11:44:26.000000000 +0200
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h 2011-09-05 11:45:27.000000000 +0200
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h 2011-09-05 15:34:03.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.h 2011-09-05 15:34:27.000000000 +0000
@@ -30,7 +30,7 @@
class vtkKWInteractorStyleVolumeView;
class vtkKWScalarBarWidget;
Modified: trunk/packages/volview/trunk/debian/patches/fixmath.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixmath.patch 2011-09-05 15:29:34 UTC (rev 7670)
+++ trunk/packages/volview/trunk/debian/patches/fixmath.patch 2011-09-05 15:44:33 UTC (rev 7671)
@@ -25,9 +25,9 @@
Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 12:43:57.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 12:43:57.000000000 +0000
-@@ -3657,7 +3657,7 @@
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 15:43:57.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 15:43:58.000000000 +0000
+@@ -3644,7 +3644,7 @@
if (this->VolumeMapper)
{
this->AddVolumeMapperProgress(
@@ -36,23 +36,21 @@
ks_("Progress|Generating Image"));
this->AddVolumeMapperGradientProgress(
-Index: volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt 2011-09-05 13:02:19.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt 2011-09-05 13:04:13.000000000 +0000
-@@ -69,7 +69,7 @@
- #vvITKMultimodalityRegistrationRigidJointHistogramPlotter
- #vvITKLandmarkPreparation
- #vvITKScalarImageKMeansClassifier
-- vvITKScalarKmeansMarkovRandomField
-+ #vvITKScalarKmeansMarkovRandomField
- vvITKSigmoid
- #vvITKShapeDetectionModule
- #vvITKSurfaceSpline
+@@ -3727,8 +3727,8 @@
+ if (this->VolumeMapper)
+ {
+ this->VolumeMapper->SetRequestedRenderMode(
+- *iarg ? vtkKWEVolumeMapper::DefaultRenderMode
+- : vtkKWEVolumeMapper::RayCastAndTextureRenderMode);
++ *iarg ? vtkSmartVolumeMapper::DefaultRenderMode
++ : vtkSmartVolumeMapper::RayCastAndTextureRenderMode);
+ }
+
+ case vtkCommand::VolumeMapperRenderStartEvent:
Index: volview-3.4/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx 2011-09-05 13:15:01.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx 2011-09-05 13:15:08.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWCommonPro/vtkSplineSurfaceWidget.cxx 2011-09-05 15:43:58.000000000 +0000
@@ -1070,7 +1070,7 @@
{
return;
@@ -64,23 +62,23 @@
this->Transform->Identity();
Index: volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2011-09-05 13:29:24.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2011-09-05 13:29:45.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2011-09-05 15:43:53.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2011-09-05 15:43:58.000000000 +0000
@@ -15,7 +15,9 @@
ENDIF(COMMAND CMAKE_POLICY)
PROJECT(KWWidgetsPro)
-
+include_directories(
-+ /usr/include/tcl8.5
++ ${TCL_INCLUDE_PATH}
+)
# --------------------------------------------------------------------------
# To use this library in a larger project you will need to SUBDIR into this
# directory so that it gets built and then you will use the following variables
Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx 2011-09-05 13:31:10.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx 2011-09-05 13:31:33.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWInteractorStyleImageView.cxx 2011-09-05 15:43:58.000000000 +0000
@@ -59,8 +59,8 @@
atan2((double)rwi->GetLastEventPosition()[1] - (double)center[1],
(double)rwi->GetLastEventPosition()[0] - (double)center[0]);
@@ -105,15 +103,15 @@
this->InvokeEvent(vtkKWEvent::ResliceChangingEvent, NULL);
Index: volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/CMakeLists.txt 2011-09-05 13:53:41.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt 2011-09-05 15:04:04.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWVolView/CMakeLists.txt 2011-09-05 15:43:53.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt 2011-09-05 15:43:58.000000000 +0000
@@ -16,7 +16,10 @@
PROJECT(KWVolView)
-
+include_directories(
-+ /usr/include/tcl8.5
++ ${TCL_INCLUDE_PATH}
+ /usr/include/VTKEdge
+ )
INCLUDE_REGULAR_EXPRESSION("^.*$")
@@ -134,8 +132,8 @@
IF(KWVolView_USE_GDCM)
Index: volview-3.4/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx 2011-09-05 14:10:55.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx 2011-09-05 14:11:17.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/Core/vtkVVSelectionFrameLayoutManager.cxx 2011-09-05 15:43:58.000000000 +0000
@@ -196,6 +196,7 @@
{
quiet = appPro->GetTestingMode();
@@ -147,8 +145,8 @@
Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx 2011-09-05 13:31:58.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx 2011-09-05 13:32:05.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWProbeImageWidget.cxx 2011-09-05 15:43:58.000000000 +0000
@@ -584,7 +584,7 @@
return;
}
@@ -158,25 +156,10 @@
this->Transform->Identity();
this->Transform->Translate(origin[0],origin[1],origin[2]);
this->Transform->RotateWXYZ(theta,axis);
-Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 13:32:49.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-05 13:33:02.000000000 +0000
-@@ -3740,8 +3740,8 @@
- if (this->VolumeMapper)
- {
- this->VolumeMapper->SetRequestedRenderMode(
-- *iarg ? vtkKWEVolumeMapper::DefaultRenderMode
-- : vtkKWEVolumeMapper::RayCastAndTextureRenderMode);
-+ *iarg ? vtkSmartVolumeMapper::DefaultRenderMode
-+ : vtkSmartVolumeMapper::RayCastAndTextureRenderMode);
- }
-
- case vtkCommand::VolumeMapperRenderStartEvent:
Index: volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h 2011-09-05 14:41:00.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h 2011-09-05 14:41:14.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVDataItemVolumeContourInternals.h 2011-09-05 15:43:58.000000000 +0000
@@ -43,7 +43,7 @@
VolumeMapper = vtkSmartPointer< vtkPolyDataMapper >::New();
ObliqueMapper = vtkSmartPointer< vtkPolyDataMapper >::New();
@@ -188,8 +171,8 @@
ObliqueMapper->SetResolveCoincidentTopologyToPolygonOffset();
Index: volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx 2011-09-05 14:41:37.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx 2011-09-05 14:42:02.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/DataItems/vtkVVLODDataItemVolumeHelper.cxx 2011-09-05 15:43:58.000000000 +0000
@@ -364,9 +364,9 @@
this->SupportsCompression( strategy ))
{
@@ -214,8 +197,8 @@
Index: volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx 2011-09-05 14:44:27.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx 2011-09-05 14:44:39.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVDisplayInterface.cxx 2011-09-05 15:43:58.000000000 +0000
@@ -532,7 +532,7 @@
this->VolumePropertyPresetSelector->FilterButtonVisibilityOn();
this->VolumePropertyPresetSelector->LocateButtonVisibilityOn();
@@ -236,8 +219,8 @@
this->WindowLevelPresetSelector->SetPresetUpdateCommand(
Index: volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx 2011-09-05 14:45:03.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx 2011-09-05 14:45:18.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/Features/vtkVVInformationInterface.cxx 2011-09-05 15:43:58.000000000 +0000
@@ -682,10 +682,10 @@
list->FindAndDeleteRow(0, labels->GetDirectionCosineLabel());
}
@@ -254,8 +237,8 @@
{
Index: volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx 2011-09-05 14:43:44.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx 2011-09-05 14:43:56.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVPaintbrushWidgetToolbar.cxx 2011-09-05 15:43:58.000000000 +0000
@@ -196,8 +196,8 @@
this->UndoStrokeButton->SetText("Undo stroke");
this->UndoStrokeButton->SetBalloonHelpString(
@@ -287,8 +270,8 @@
+}
Index: volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx 2011-09-05 14:42:44.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx 2011-09-05 14:42:52.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/MeasurementTools/vtkVVWidgetInterface.cxx 2011-09-05 15:43:58.000000000 +0000
@@ -598,8 +598,8 @@
this->PopulateInteractorWidgets();
this->InteractorWidgetSelector->Update();
@@ -302,8 +285,8 @@
Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx 2011-09-05 14:46:33.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx 2011-09-05 14:46:37.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.cxx 2011-09-05 15:43:58.000000000 +0000
@@ -12,7 +12,7 @@
#include "vtkHTTPHandler.h"
#include "vtkKWRemoteIOUtilities.h"
@@ -315,8 +298,8 @@
vtkCxxRevisionMacro ( vtkHTTPHandler, "$Revision: 1.10 $" );
Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h 2011-09-05 14:46:08.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h 2011-09-05 14:46:12.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkHTTPHandler.h 2011-09-05 15:43:58.000000000 +0000
@@ -16,7 +16,7 @@
#pragma warning ( disable : 4786 )
#endif
@@ -328,8 +311,8 @@
#include <vtksys/Process.h>
Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx 2011-09-05 14:46:21.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx 2011-09-05 14:46:25.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkURIHandler.cxx 2011-09-05 15:43:58.000000000 +0000
@@ -13,7 +13,7 @@
#include "vtkURIHandler.h"
#include "vtkKWRemoteIOManager.h"
@@ -341,8 +324,8 @@
// The point of this function would be to return a string of the input data,
Index: volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx
===================================================================
---- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx 2011-09-05 14:47:58.000000000 +0000
-+++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx 2011-09-05 14:54:17.000000000 +0000
+--- volview-3.4.orig/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/RemoteIO/vtkKWRemoteIOUtilities.cxx 2011-09-05 15:43:58.000000000 +0000
@@ -21,8 +21,8 @@
#endif
@@ -398,8 +381,8 @@
Index: volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt
===================================================================
---- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt 2011-09-05 14:56:52.000000000 +0000
-+++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt 2011-09-05 14:58:55.000000000 +0000
+--- volview-3.4.orig/VolViewApplications/Kitware/VolView/CMakeLists.txt 2011-09-05 15:43:10.000000000 +0000
++++ volview-3.4/VolViewApplications/Kitware/VolView/CMakeLists.txt 2011-09-05 15:43:58.000000000 +0000
@@ -15,7 +15,9 @@
ENDIF(COMMAND CMAKE_POLICY)
Modified: trunk/packages/volview/trunk/debian/patches/fixupvtkedge.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/fixupvtkedge.patch 2011-09-05 15:29:34 UTC (rev 7670)
+++ trunk/packages/volview/trunk/debian/patches/fixupvtkedge.patch 2011-09-05 15:44:33 UTC (rev 7671)
@@ -32,25 +32,3 @@
os << k_("Use GPU Rendering") << ": "
<< (this->UseGPURendering ? k_("Yes") : k_("No")) << endl;
-Index: volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx
-===================================================================
---- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-04 13:56:17.000000000 +0200
-+++ volview-3.4/VolViewLibraries/KWWidgetsPro/vtkKWVolumeWidget.cxx 2011-09-04 14:07:01.000000000 +0200
-@@ -52,7 +52,7 @@
- #include "vtkKW3DSplineSurfacesWidget.h"
- #include "vtkKWApplication.h"
- #include "vtkKWApplicationPro.h"
--#include "vtkKWEVolumeMapper.h"
-+#include "vtkSmartVolumeMapper.h"
- #include "vtkKWEvent.h"
- #include "vtkKWEventMap.h"
- #include "vtkKWFrame.h"
-@@ -117,7 +117,7 @@
-
- this->Volume = vtkVolume::New();
-
-- this->VolumeMapper = vtkKWEVolumeMapper::New();
-+ this->VolumeMapper = vtkSmartVolumeMapper::New();
-
- this->Volume->SetMapper(this->VolumeMapper);
- this->Volume->SetProperty(this->VolumeProperty);
Added: trunk/packages/volview/trunk/debian/patches/removemarkov.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/removemarkov.patch (rev 0)
+++ trunk/packages/volview/trunk/debian/patches/removemarkov.patch 2011-09-05 15:44:33 UTC (rev 7671)
@@ -0,0 +1,31 @@
+VolViewLibraries/KWVolView/Plugins/ITK/vvITKScalarKmeansMarkovRandomFieldToPaintbrush.h:441:7: error: no matching function for call to 'itk::Statistics::DistanceToCentroidMembershipFunction<itk::Vector<long int, 1u> >::SetCentroid(vnl_vector<double>&)'
+VolViewLibraries/KWVolView/Plugins/ITK/vvITKScalarKmeansMarkovRandomFieldToPaintbrush.h:441:7: note: candidate is:
+/usr/include/InsightToolkit/Review/Statistics/itkDistanceToCentroidMembershipFunction.txx:37:1: note: void itk::Statistics::DistanceToCentroidMembershipFunction<TVector>::SetCentroid(const CentroidType&) [with TVector = itk::Vector<long int, 1u>, itk::Statistics::DistanceToCentroidMembershipFunction<TVector>::CentroidType = itk::Array<double>]
+/usr/include/InsightToolkit/Review/Statistics/itkDistanceToCentroidMembershipFunction.txx:37:1: note: no known conversion for argument 1 from 'vnl_vector<double>' to 'const CentroidType& {aka const itk::Array<double>&}'
+
+Index: volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt 2011-09-05 13:02:19.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt 2011-09-05 13:04:13.000000000 +0000
+@@ -69,7 +69,7 @@
+ #vvITKMultimodalityRegistrationRigidJointHistogramPlotter
+ #vvITKLandmarkPreparation
+ #vvITKScalarImageKMeansClassifier
+- vvITKScalarKmeansMarkovRandomField
++ #vvITKScalarKmeansMarkovRandomField
+ vvITKSigmoid
+ #vvITKShapeDetectionModule
+ #vvITKSurfaceSpline
+Index: volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt 2011-09-05 15:38:53.000000000 +0000
++++ volview-3.4/VolViewLibraries/KWVolView/Plugins/ITK/CMakeLists.txt 2011-09-05 15:39:29.000000000 +0000
+@@ -83,7 +83,7 @@
+ vvITKWatershedRGBModule
+ #vvITKRigidMIMetricPlotter
+ vvITKThresholdImageToPaintbrush
+- vvITKScalarKmeansMarkovRandomFieldToPaintbrush
++ #vvITKScalarKmeansMarkovRandomFieldToPaintbrush
+ vvITKPaintbrushCrop
+ vvITKMergePaintbrushLabelImages
+ )
Modified: trunk/packages/volview/trunk/debian/patches/series
===================================================================
--- trunk/packages/volview/trunk/debian/patches/series 2011-09-05 15:29:34 UTC (rev 7670)
+++ trunk/packages/volview/trunk/debian/patches/series 2011-09-05 15:44:33 UTC (rev 7671)
@@ -4,3 +4,4 @@
fixslcreader.patch
fixcompissues.patch
fixmath.patch
+removemarkov.patch
More information about the debian-med-commit
mailing list