Mercurial > hg > orthanc-stone
comparison OrthancStone/Sources/Scene2D/GrayscaleWindowingSceneTracker.cpp @ 1639:5cdc5b98f14d
cppcheck
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 10 Nov 2020 16:41:11 +0100 |
parents | 874e178f34e9 |
children | d4a8e2b19a65 |
comparison
equal
deleted
inserted
replaced
1638:754ef576d945 | 1639:5cdc5b98f14d |
---|---|
115 active_ = false; | 115 active_ = false; |
116 | 116 |
117 if (canvasWidth > 3 && | 117 if (canvasWidth > 3 && |
118 canvasHeight > 3) | 118 canvasHeight > 3) |
119 { | 119 { |
120 boost::weak_ptr<IViewport> viewport = viewport_.lock(); | 120 boost::shared_ptr<IViewport> locked = viewport_.lock(); |
121 GrayscaleLayerAccessor accessor(viewport, layerIndex_); | 121 |
122 if (locked) | |
123 { | |
124 GrayscaleLayerAccessor accessor(locked, layerIndex_); | |
122 | 125 |
123 if (accessor.IsValid()) | 126 if (accessor.IsValid()) |
124 { | 127 { |
125 FloatTextureSceneLayer& layer = accessor.GetLayer(); | 128 FloatTextureSceneLayer& layer = accessor.GetLayer(); |
126 | 129 |
127 layer.GetWindowing(originalCenter_, originalWidth_); | 130 layer.GetWindowing(originalCenter_, originalWidth_); |
128 | 131 |
129 float minValue, maxValue; | 132 float minValue, maxValue; |
130 layer.GetRange(minValue, maxValue); | 133 layer.GetRange(minValue, maxValue); |
131 | 134 |
132 normalization_ = (maxValue - minValue) / static_cast<double>(std::min(canvasWidth, canvasHeight) - 1); | 135 normalization_ = (maxValue - minValue) / static_cast<double>(std::min(canvasWidth, canvasHeight) - 1); |
133 active_ = true; | 136 active_ = true; |
134 } | 137 } |
135 else | 138 else |
136 { | 139 { |
137 LOG(INFO) << "Cannot create GrayscaleWindowingSceneTracker on a non-float texture"; | 140 LOG(INFO) << "Cannot create GrayscaleWindowingSceneTracker on a non-float texture"; |
141 } | |
138 } | 142 } |
139 } | 143 } |
140 } | 144 } |
141 | 145 |
142 void GrayscaleWindowingSceneTracker::PointerMove(const PointerEvent& event) | 146 void GrayscaleWindowingSceneTracker::PointerMove(const PointerEvent& event) |