Skip to content

Commit 003a717

Browse files
author
Haydelj
committed
removed weird code
1 parent 27e4c0c commit 003a717

File tree

2 files changed

+32
-10
lines changed

2 files changed

+32
-10
lines changed

src/Core/Application/Version.cc

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
For more information, please see: http://software.sci.utah.edu
3+
4+
The MIT License
5+
6+
Copyright (c) 2015 Scientific Computing and Imaging Institute,
7+
University of Utah.
8+
9+
License for the specific language governing rights and limitations under
10+
Permission is hereby granted, free of charge, to any person obtaining a
11+
copy of this software and associated documentation files (the "Software"),
12+
to deal in the Software without restriction, including without limitation
13+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
14+
and/or sell copies of the Software, and to permit persons to whom the
15+
Software is furnished to do so, subject to the following conditions:
16+
17+
The above copyright notice and this permission notice shall be included
18+
in all copies or substantial portions of the Software.
19+
20+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
21+
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
22+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
23+
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
24+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
25+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
26+
DEALINGS IN THE SOFTWARE.
27+
*/
28+
29+
#include <Core/Application/Version.h>
30+
31+
const std::string VersionInfo::GIT_VERSION_TAG = "v5.0-beta.CinC2019-21-g3e000f386";
32+
const std::string VersionInfo::GIT_COMMIT_SHA = "3e000f38689e2bf931e46ad355390acd52d9539f";

src/Core/Datatypes/ColorMap.cc

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,16 +149,6 @@ StandardColorMapFactory::NameList StandardColorMapFactory::getList()
149149
*/
150150
double ColorMap::getTransformedValue(double f) const
151151
{
152-
/////////////////////////////////////////////////
153-
//TODO: this seemingly useless code fixes a nasty crash bug on Windows. Don't delete it until a proper fix is implemented!
154-
static bool x = true;
155-
if (x)
156-
{
157-
std::cout << "";
158-
x = false;
159-
}
160-
/////////////////////////////////////////////////
161-
162152
const double rescaled01 = static_cast<double>((f + rescale_shift_) * rescale_scale_);
163153

164154
double v = std::min(std::max(0., rescaled01), 1.);

0 commit comments

Comments
 (0)