Merge pull request #22 from exaexa/mk-ubsan

fix clang ubsan issues

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: scattermore
 Title: Scatterplots with More Points
-Version: 1.1
+Version: 1.2
 Authors@R:
     c(person(given = "Tereza",
            family = "Kulichova",

src/histogram_to_rgbwt.cpp

@@ -20,7 +20,7 @@
 
 #include "scatters.h"
 
-#include <stddef.h>
+#include <cstddef>
 
 // colorize histogram with given color palette
 void
@@ -36,7 +36,8 @@ histogram_to_rgbwt(const unsigned *dim,
 
   for (size_t i = 0; i < size_out; ++i) {
     size_t histogram_value = histogram[i] < 0 ? 0 : histogram[i];
-    if(histogram_value >= size_palette) histogram_value = size_palette - 1;
+    if (histogram_value >= size_palette)
+      histogram_value = size_palette - 1;
 
     const float R = palette[4 * histogram_value + 0];
     const float G = palette[4 * histogram_value + 1];

src/kernel_histogram.cpp

@@ -21,7 +21,7 @@
 #include "kernels.h"
 #include "thread_blocks.h"
 
-#include <stddef.h>
+#include <cstddef>
 
 using namespace std;
 

src/kernel_rgbwt.cpp

@@ -22,7 +22,7 @@
 #include "thread_blocks.h"
 
 #include <cmath>
-#include <stddef.h>
+#include <cstddef>
 #include <thread>
 #include <vector>
 

src/macros.h

@@ -1,7 +1,7 @@
 /*
  * This file is part of scattermore.
  *
- * Copyright (C) 2022 Mirek Kratochvil <[email protected]>
+ * Copyright (C) 2022-2023 Mirek Kratochvil <[email protected]>
  *               2022-2023 Tereza Kulichova <[email protected]>
  *
  * scattermore is free software: you can redistribute it and/or modify it under
@@ -21,7 +21,15 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-#define max(x, y) (((x) >= (y)) ? (x) : (y))
-#define min(x, y) (((x) <= (y)) ? (x) : (y))
+#include <cstddef>
+#include <limits>
+
+inline size_t
+f2i(float x)
+{
+  if (x < 0 || x > float(std::numeric_limits<size_t>::max()))
+    return std::numeric_limits<size_t>::max();
+  return size_t(x);
+}
 
 #endif

src/scatter_histogram.cpp

@@ -1,7 +1,7 @@
 /*
  * This file is part of scattermore.
  *
- * Copyright (C) 2022 Mirek Kratochvil <[email protected]>
+ * Copyright (C) 2022-2023 Mirek Kratochvil <[email protected]>
  *               2022-2023 Tereza Kulichova <[email protected]>
  *
  * scattermore is free software: you can redistribute it and/or modify it under
@@ -18,9 +18,10 @@
  * scattermore. If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "macros.h"
 #include "scatters.h"
 
-#include <stddef.h>
+#include <cstddef>
 
 void
 scatter_histogram(const unsigned *pn,
@@ -42,11 +43,9 @@ scatter_histogram(const unsigned *pn,
   const float y_end = ylim[0];
   const float y_bin = (size_out_y - 1) / (y_end - y_begin);
 
-  size_t i;
-  for (i = 0; i < size_data; ++i) {
-    size_t x =
-      (xy[i] - x_begin) * x_bin; // get new point coordinates for histogram
-    size_t y = (xy[i + size_data] - y_begin) * y_bin;
+  for (size_t i = 0; i < size_data; ++i) {
+    size_t x = f2i((xy[i] - x_begin) * x_bin);
+    size_t y = f2i((xy[i + size_data] - y_begin) * y_bin);
 
     if (x >= size_out_x || y >= size_out_y)
       continue;

src/scatter_indexed_rgbwt.cpp

@@ -1,7 +1,7 @@
 /*
  * This file is part of scattermore.
  *
- * Copyright (C) 2022 Mirek Kratochvil <[email protected]>
+ * Copyright (C) 2022-2023 Mirek Kratochvil <[email protected]>
  *               2022-2023 Tereza Kulichova <[email protected]>
  *
  * scattermore is free software: you can redistribute it and/or modify it under
@@ -18,9 +18,10 @@
  * scattermore. If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "macros.h"
 #include "scatters.h"
 
-#include <stddef.h>
+#include <cstddef>
 
 // calculate RGBWT matrix with given color palette and mapping
 void
@@ -54,9 +55,8 @@ scatter_indexed_rgbwt(const unsigned *dim,
 
   size_t i;
   for (i = 0; i < size_data; ++i) {
-    size_t x =
-      (xy[i] - x_begin) * x_bin; // get new point coordinates for result raster
-    size_t y = (xy[i + size_data] - y_begin) * y_bin;
+    size_t x = f2i((xy[i] - x_begin) * x_bin);
+    size_t y = f2i((xy[i + size_data] - y_begin) * y_bin);
 
     if (x >= size_out_x || y >= size_out_y)
       continue;

src/scatter_lines_impl.h

@@ -21,8 +21,8 @@
 #ifndef SCATTERS_LINES_IMPL_H
 #define SCATTERS_LINES_IMPL_H
 
+#include <cstddef>
 #include <cstdlib>
-#include <stddef.h>
 
 template<typename PF>
 inline void

src/scatter_multicolor_rgbwt.cpp

@@ -1,7 +1,7 @@
 /*
  * This file is part of scattermore.
  *
- * Copyright (C) 2022 Mirek Kratochvil <[email protected]>
+ * Copyright (C) 2022-2023 Mirek Kratochvil <[email protected]>
  *               2022-2023 Tereza Kulichova <[email protected]>
  *
  * scattermore is free software: you can redistribute it and/or modify it under
@@ -18,9 +18,10 @@
  * scattermore. If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "macros.h"
 #include "scatters.h"
 
-#include <stddef.h>
+#include <cstddef>
 
 // calculate RGBWT matrix with given color for each point
 void
@@ -53,9 +54,8 @@ scatter_multicolor_rgbwt(const unsigned *dim,
 
   size_t i;
   for (i = 0; i < size_data; ++i) {
-    size_t x =
-      (xy[i] - x_begin) * x_bin; // get new point coordinates for result raster
-    size_t y = (xy[i + size_data] - y_begin) * y_bin;
+    size_t x = f2i((xy[i] - x_begin) * x_bin);
+    size_t y = f2i((xy[i + size_data] - y_begin) * y_bin);
 
     if (x >= size_out_x || y >= size_out_y)
       continue;

src/scatter_singlecolor_rgbwt.cpp

@@ -1,7 +1,7 @@
 /*
  * This file is part of scattermore.
  *
- * Copyright (C) 2022 Mirek Kratochvil <[email protected]>
+ * Copyright (C) 2022-2023 Mirek Kratochvil <[email protected]>
  *               2022-2023 Tereza Kulichova <[email protected]>
  *
  * scattermore is free software: you can redistribute it and/or modify it under
@@ -18,9 +18,10 @@
  * scattermore. If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "macros.h"
 #include "scatters.h"
 
-#include <stddef.h>
+#include <cstddef>
 
 // calculate RGBWT matrix with one given color
 void
@@ -57,9 +58,8 @@ scatter_singlecolor_rgbwt(const unsigned *dim,
 
   size_t i;
   for (i = 0; i < size_data; ++i) {
-    size_t x =
-      (xy[i] - x_begin) * x_bin; // get new point coordinates for result raster
-    size_t y = (xy[i + size_data] - y_begin) * y_bin;
+    size_t x = f2i((xy[i] - x_begin) * x_bin);
+    size_t y = f2i((xy[i + size_data] - y_begin) * y_bin);
 
     if (x >= size_out_x || y >= size_out_y)
       continue;