# HG changeset patch # User Sebastien Jodogne # Date 1612006209 -3600 # Node ID 911cd9a11ad3279c5619c8b2fe3ed4b30e4cc45f # Parent 62377949e739ea8d25e9971c333afebccaec7af4 removed "using namespace Orthanc" diff -r 62377949e739 -r 911cd9a11ad3 OrthancStone/Sources/Scene2DViewport/LayerHolder.cpp --- a/OrthancStone/Sources/Scene2DViewport/LayerHolder.cpp Tue Jan 19 16:12:43 2021 +0100 +++ b/OrthancStone/Sources/Scene2DViewport/LayerHolder.cpp Sat Jan 30 12:30:09 2021 +0100 @@ -115,7 +115,6 @@ std::unique_ptr lock(GetViewportLock()); const Scene2D& scene = lock->GetController().GetScene(); - using namespace Orthanc; ORTHANC_ASSERT(baseLayerIndex_ != -1); ORTHANC_ASSERT(scene.HasLayer(GetPolylineLayerIndex(index))); ISceneLayer* layer = &(scene.GetLayer(GetPolylineLayerIndex(index))); @@ -132,7 +131,6 @@ std::unique_ptr lock(GetViewportLock()); const Scene2D& scene = lock->GetController().GetScene(); - using namespace Orthanc; ORTHANC_ASSERT(baseLayerIndex_ != -1); ORTHANC_ASSERT(scene.HasLayer(GetTextLayerIndex(index))); ISceneLayer* layer = &(scene.GetLayer(GetTextLayerIndex(index))); @@ -146,14 +144,12 @@ int LayerHolder::GetPolylineLayerIndex(int index /*= 0*/) { - using namespace Orthanc; ORTHANC_ASSERT(index < polylineLayerCount_); return baseLayerIndex_ + index; } int LayerHolder::GetTextLayerIndex(int index /*= 0*/) { - using namespace Orthanc; ORTHANC_ASSERT(index < textLayerCount_); // the text layers are placed right after the polyline layers diff -r 62377949e739 -r 911cd9a11ad3 OrthancStone/Sources/Toolbox/ImageToolbox.cpp --- a/OrthancStone/Sources/Toolbox/ImageToolbox.cpp Tue Jan 19 16:12:43 2021 +0100 +++ b/OrthancStone/Sources/Toolbox/ImageToolbox.cpp Sat Jan 30 12:30:09 2021 +0100 @@ -220,30 +220,28 @@ void ComputeHistogram(const Orthanc::ImageAccessor& img, HistogramData& hd, double binSize) { - using namespace Orthanc; - hd.binSize = binSize; // dynamic/static bridge switch (img.GetFormat()) { - case PixelFormat_Grayscale8: - ComputeHistogram_ (img, hd); + case Orthanc::PixelFormat_Grayscale8: + ComputeHistogram_ (img, hd); break; - case PixelFormat_Grayscale16: - ComputeHistogram_ (img, hd); + case Orthanc::PixelFormat_Grayscale16: + ComputeHistogram_ (img, hd); break; - case PixelFormat_SignedGrayscale16: - ComputeHistogram_(img, hd); + case Orthanc::PixelFormat_SignedGrayscale16: + ComputeHistogram_(img, hd); break; - case PixelFormat_Float32: - ComputeHistogram_ (img, hd); + case Orthanc::PixelFormat_Float32: + ComputeHistogram_ (img, hd); break; - case PixelFormat_Grayscale32: - ComputeHistogram_ (img, hd); + case Orthanc::PixelFormat_Grayscale32: + ComputeHistogram_ (img, hd); break; - case PixelFormat_Grayscale64: - ComputeHistogram_ (img, hd); + case Orthanc::PixelFormat_Grayscale64: + ComputeHistogram_ (img, hd); break; default: throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat); @@ -253,28 +251,26 @@ void ComputeMinMax(const Orthanc::ImageAccessor& img, double& minValue, double& maxValue) { - using namespace Orthanc; - // dynamic/static bridge switch (img.GetFormat()) { - case PixelFormat_Grayscale8: - ComputeMinMax_ (img, minValue, maxValue); + case Orthanc::PixelFormat_Grayscale8: + ComputeMinMax_ (img, minValue, maxValue); break; - case PixelFormat_Grayscale16: - ComputeMinMax_ (img, minValue, maxValue); + case Orthanc::PixelFormat_Grayscale16: + ComputeMinMax_ (img, minValue, maxValue); break; - case PixelFormat_SignedGrayscale16: - ComputeMinMax_(img, minValue, maxValue); + case Orthanc::PixelFormat_SignedGrayscale16: + ComputeMinMax_(img, minValue, maxValue); break; - case PixelFormat_Float32: - ComputeMinMax_ (img, minValue, maxValue); + case Orthanc::PixelFormat_Float32: + ComputeMinMax_ (img, minValue, maxValue); break; - case PixelFormat_Grayscale32: - ComputeMinMax_ (img, minValue, maxValue); + case Orthanc::PixelFormat_Grayscale32: + ComputeMinMax_ (img, minValue, maxValue); break; - case PixelFormat_Grayscale64: - ComputeMinMax_ (img, minValue, maxValue); + case Orthanc::PixelFormat_Grayscale64: + ComputeMinMax_ (img, minValue, maxValue); break; default: throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat); diff -r 62377949e739 -r 911cd9a11ad3 UnitTestsSources/TestStructureSet.cpp --- a/UnitTestsSources/TestStructureSet.cpp Tue Jan 19 16:12:43 2021 +0100 +++ b/UnitTestsSources/TestStructureSet.cpp Sat Jan 30 12:30:09 2021 +0100 @@ -40,7 +40,6 @@ #include #include -using namespace Orthanc; using namespace OrthancStone; /*