From 9016c3fe3ee4049fad30d0e0a0d2a7564abdeeb8 Mon Sep 17 00:00:00 2001
From: Tristan Walter <twalter@orn.mpg.de>
Date: Sun, 15 Nov 2020 18:05:23 +0100
Subject: [PATCH] sign_casts
---
Application/src/commons/common/commons.pc.h | 18 ---------------
Application/src/commons/common/gui/GLImpl.cpp | 2 +-
.../src/commons/common/gui/IMGUIBase.cpp | 4 ++--
.../src/commons/common/gui/MetalImpl.mm | 5 ++--
.../src/commons/common/misc/checked_casts.h | 3 +--
Application/src/commons/common/misc/math.h | 23 +++++++++++++++++++
.../src/tracker/gui/IdentityHeatmap.cpp | 2 +-
.../src/tracker/tracking/Accumulation.cpp | 2 +-
8 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/Application/src/commons/common/commons.pc.h b/Application/src/commons/common/commons.pc.h
index 38bcb34..fa3e178 100644
--- a/Application/src/commons/common/commons.pc.h
+++ b/Application/src/commons/common/commons.pc.h
@@ -58,24 +58,6 @@
#ifdef WIN32
#define _USE_MATH_DEFINES
#include <cmath>
-
-#if (_MSC_VER <= 1916)
- // visual studio 2017 does not have __builtin_clzl
- #include <intrin.h>
-
- static inline int __builtin_clz(unsigned x) {
- return (int)__lzcnt(x);
- }
-
- static inline int __builtin_clzll(unsigned long long x) {
- return (int)__lzcnt64(x);
- }
-
- static inline int __builtin_clzl(unsigned long x) {
- return sizeof(x) == 8 ? __builtin_clzll(x) : __builtin_clz((uint32_t)x);
- }
-#endif
-
#endif
typedef int32_t long_t;
diff --git a/Application/src/commons/common/gui/GLImpl.cpp b/Application/src/commons/common/gui/GLImpl.cpp
index 903df07..7781ee1 100644
--- a/Application/src/commons/common/gui/GLImpl.cpp
+++ b/Application/src/commons/common/gui/GLImpl.cpp
@@ -398,7 +398,7 @@ TexturePtr GLImpl::texture(const Image * ptr) {
}
}
- auto width = next_pow2(ptr->cols), height = next_pow2(ptr->rows);
+ auto width = next_pow2(sign_cast<uint64_t>(ptr->cols)), height = next_pow2(sign_cast<uint64_t>(ptr->rows));
auto capacity = size_t(ptr->dims) * size_t(width) * size_t(height);
if (empty.size() < capacity)
empty.resize(capacity, 0);
diff --git a/Application/src/commons/common/gui/IMGUIBase.cpp b/Application/src/commons/common/gui/IMGUIBase.cpp
index dd11715..fb3fc2a 100644
--- a/Application/src/commons/common/gui/IMGUIBase.cpp
+++ b/Application/src/commons/common/gui/IMGUIBase.cpp
@@ -152,8 +152,8 @@ void clear_cache() {
static Size2 gpu_size_of(const ExternalImage* image) {
if(!image || !image->source())
return Size2();
- return Size2(next_pow2((uint64_t)image->source()->bounds().width),
- next_pow2((uint64_t)image->source()->bounds().height));
+ return Size2(next_pow2(sign_cast<uint64_t>(image->source()->bounds().width)),
+ next_pow2(sign_cast<uint64_t>(image->source()->bounds().height)));
}
void update_with(const ExternalImage* image) {
diff --git a/Application/src/commons/common/gui/MetalImpl.mm b/Application/src/commons/common/gui/MetalImpl.mm
index e24bd46..a8f2c78 100644
--- a/Application/src/commons/common/gui/MetalImpl.mm
+++ b/Application/src/commons/common/gui/MetalImpl.mm
@@ -2,6 +2,7 @@
#include <types.h>
#include <misc/metastring.h>
+#include <misc/checked_casts.h>
#include "MetalImpl.h"
#include <imgui/imgui.h>
@@ -354,8 +355,8 @@ bool MetalImpl::open_files(const std::vector<file::Path> &paths) {
TexturePtr MetalImpl::texture(const Image * ptr) {
GLIMPL_CHECK_THREAD_ID();
- uint width = next_pow2(ptr->cols);
- uint height = next_pow2(ptr->rows);
+ uint width = next_pow2(sign_cast<uint64_t>(ptr->cols));
+ uint height = next_pow2(sign_cast<uint64_t>(ptr->rows));
auto input_format = MTLPixelFormatRGBA8Unorm;
if(ptr->dims == 1) {
diff --git a/Application/src/commons/common/misc/checked_casts.h b/Application/src/commons/common/misc/checked_casts.h
index b81197a..b6dfcfb 100644
--- a/Application/src/commons/common/misc/checked_casts.h
+++ b/Application/src/commons/common/misc/checked_casts.h
@@ -54,8 +54,7 @@ constexpr To sign_cast(From&& value) {
using FromType = typename remove_cvref<From>::type;
using ToType = typename remove_cvref<To>::type;
- if constexpr(!std::is_floating_point<ToType>::value
- && std::is_integral<ToType>::value)
+ if constexpr(std::is_integral<ToType>::value)
{
if constexpr(std::is_signed<ToType>::value) {
if (value > std::numeric_limits<ToType>::max())
diff --git a/Application/src/commons/common/misc/math.h b/Application/src/commons/common/misc/math.h
index fda8c98..f6cba88 100644
--- a/Application/src/commons/common/misc/math.h
+++ b/Application/src/commons/common/misc/math.h
@@ -1,5 +1,28 @@
#pragma once
+#ifdef WIN32
+#define _USE_MATH_DEFINES
+#include <cmath>
+
+#if (_MSC_VER <= 1916)
+ // visual studio 2017 does not have __builtin_clzl
+ #include <intrin.h>
+
+ static inline int __builtin_clz(unsigned x) {
+ return (int)__lzcnt(x);
+ }
+
+ static inline int __builtin_clzll(unsigned long long x) {
+ return (int)__lzcnt64(x);
+ }
+
+ static inline int __builtin_clzl(unsigned long x) {
+ return sizeof(x) == 8 ? __builtin_clzll(x) : __builtin_clz((uint32_t)x);
+ }
+#endif
+
+#endif
+
namespace cmn {
template<typename T = double>
inline T cos(const T& s) {
diff --git a/Application/src/tracker/gui/IdentityHeatmap.cpp b/Application/src/tracker/gui/IdentityHeatmap.cpp
index cee90ed..5f20a7d 100644
--- a/Application/src/tracker/gui/IdentityHeatmap.cpp
+++ b/Application/src/tracker/gui/IdentityHeatmap.cpp
@@ -804,7 +804,7 @@ void Leaf::clear() {
}
void Grid::create(const Size2 &image_dimensions) {
- uint32_t dim = (uint32_t)image_dimensions.max();
+ auto dim = sign_cast<uint32_t>(image_dimensions.max());
dim = (uint32_t)next_pow2(dim); // ensure that it is always divisible by two
Debug("Creating a grid of size %ux%u (for image of size %.0fx%.0f)", dim, dim, image_dimensions.width, image_dimensions.height);
diff --git a/Application/src/tracker/tracking/Accumulation.cpp b/Application/src/tracker/tracking/Accumulation.cpp
index 5365840..a578cdd 100644
--- a/Application/src/tracker/tracking/Accumulation.cpp
+++ b/Application/src/tracker/tracking/Accumulation.cpp
@@ -906,7 +906,7 @@ bool Accumulation::start() {
if(distance < min_distance) min_distance = distance;
//distance = roundf((1 - SQR(average)) * 10) * 10;
- range_distance = narrow_cast<int64_t>(next_pow2(range_distance));
+ range_distance = narrow_cast<int64_t>(next_pow2(sign_cast<uint64_t>(range_distance)));
copied_sorted.insert({distance, range_distance, q, cached, range, extended_range, samples});
} else {
--
GitLab