Created
January 30, 2017 14:47
Star
You must be signed in to star a gist
slicer-qt5 mac build work in progress
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diffs: | |
#6 Slicer (support-qt5 *$>)$ git diff | |
diff --git a/Base/QTGUI/qSlicerWebWidget.h b/Base/QTGUI/qSlicerWebWidget.h | |
index 4eb852681..362115fd8 100644 | |
--- a/Base/QTGUI/qSlicerWebWidget.h | |
+++ b/Base/QTGUI/qSlicerWebWidget.h | |
@@ -40,7 +40,8 @@ class QWebEngineView; | |
#endif | |
#ifdef QT_NO_OPENSSL | |
-struct QSslError{}; | |
+// TODO | |
+//struct QSslError{}; | |
#endif | |
class Q_SLICER_BASE_QTGUI_EXPORT qSlicerWebWidget | |
diff --git a/Libs/MRML/Widgets/qMRMLSceneModel.cxx b/Libs/MRML/Widgets/qMRMLSceneModel.cxx | |
index 44bae0432..89a450f81 100644 | |
--- a/Libs/MRML/Widgets/qMRMLSceneModel.cxx | |
+++ b/Libs/MRML/Widgets/qMRMLSceneModel.cxx | |
@@ -760,7 +760,7 @@ void qMRMLSceneModel::updateScene() | |
this->mrmlSceneItem()->rowCount() - preNodesItemCount - postNodesItemCount); | |
// Populate scene with nodes | |
- this->populateScene(); | |
+ //this->populateScene(); | |
} | |
//------------------------------------------------------------------------------ | |
diff --git a/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.cxx b/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.cxx | |
index 208f11250..d4826a2d4 100644 | |
--- a/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.cxx | |
+++ b/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.cxx | |
@@ -356,7 +356,7 @@ vtkOrientedImageData* vtkPolyDataToFractionalLabelmapFilter::AllocateOutputData( | |
if (!fractionalLabelMapVoxelsPointer) | |
{ | |
vtkErrorMacro("Convert: Failed to allocate memory for output labelmap image!"); | |
- return false; | |
+ return NULL; | |
} | |
else | |
{ | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment