OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile warning in RiaImageTools

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-01-23 09:32:57 +01:00
parent bfdf55ec7b
commit 2d0df3a990
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/Application/Tools/RiaImageTools.cpp
View File

@@ -1,6 +1,9 @@
#include "RiaImageTools.h" #include "RiaImageTools.h"
#include "cvfAssert.h"
#include <algorithm> #include <algorithm>
#include <limits>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Meijster, Roerdink, Hesselink /// Meijster, Roerdink, Hesselink
@@ -21,15 +24,16 @@ void RiaImageTools::distanceTransform2d(std::vector<std::vector<unsigned int>>&
const int64_t M = (int64_t)image.size(); const int64_t M = (int64_t)image.size();
const int64_t N = (int64_t)image.front().size(); const int64_t N = (int64_t)image.front().size();
unsigned int uinf = M + N; int64_t infVal = M + N;
CVF_ASSERT(infVal <= std::numeric_limits<unsigned int>::max());
// First phase // First phase
std::vector<std::vector<unsigned int>> g(M); std::vector<std::vector<int64_t>> g(M);
#pragma omp parallel for #pragma omp parallel for
for (int64_t x = 0; x < M; ++x) for (int64_t x = 0; x < M; ++x)
{ {
g[x].resize(N, uinf); g[x].resize(N, infVal);
if (image[x][0]) if (image[x][0])
{ {
g[x][0] = 0; g[x][0] = 0;
@@ -54,11 +58,11 @@ void RiaImageTools::distanceTransform2d(std::vector<std::vector<unsigned int>>&
} }
} }
auto f = [](int64_t x, int64_t i, const std::vector<std::vector<unsigned int>>& g, int64_t y) { auto f = [](int64_t x, int64_t i, const std::vector<std::vector<int64_t>>& g, int64_t y) {
return (x - i) * (x - i) + g[i][y] * g[i][y]; return (x - i) * (x - i) + g[i][y] * g[i][y];
}; };
auto sep = [](int64_t i, int64_t u, const std::vector<std::vector<unsigned int>>& g, int64_t y) { auto sep = [](int64_t i, int64_t u, const std::vector<std::vector<int64_t>>& g, int64_t y) {
if (i == u) return (int64_t)0; if (i == u) return (int64_t)0;
int64_t numerator = u * u - i * i + g[u][y] * g[u][y] - g[i][y] * g[i][y]; int64_t numerator = u * u - i * i + g[u][y] * g[u][y] - g[i][y] * g[i][y];
@@ -71,8 +75,8 @@ void RiaImageTools::distanceTransform2d(std::vector<std::vector<unsigned int>>&
for (int64_t y = 0; y < N; ++y) for (int64_t y = 0; y < N; ++y)
{ {
int64_t q = 0; int64_t q = 0;
std::vector<unsigned int> s(std::max(N, M), 0u); std::vector<int64_t> s(std::max(N, M), (int64_t) 0);
std::vector<unsigned int> t(std::max(N, M), 0u); std::vector<int64_t> t(std::max(N, M), (int64_t) 0);
for (int64_t u = 1; u < M - 1; ++u) for (int64_t u = 1; u < M - 1; ++u)
{ {
@@ -98,7 +102,9 @@ void RiaImageTools::distanceTransform2d(std::vector<std::vector<unsigned int>>&
} }
for (int64_t u = M - 1; u > 0; --u) for (int64_t u = M - 1; u > 0; --u)
{ {
image[u][y] = f(u, s[q], g, y); int64_t fVal = f(u, s[q], g, y);
CVF_ASSERT(fVal= < std::numeric_limits<double>::max());
image[u][y] = static_cast<unsigned int>(fVal);
if (u == t[q]) if (u == t[q])
{ {
q = q - 1; q = q - 1;