Fix segfault: replace QUANTIZE macro with static inline function

The QUANTIZE macro introduced in the rainflow.c code review expanded its
second argument three times. Passing `*dh_istream++` as the argument caused
the pointer to advance by 3 on every loop iteration instead of 1, quickly
running past the end of the input array and producing a segfault inside
spread_damage() (both RFC_SD_TRANSIENT_23 and RFC_SD_TRANSIENT_23c cases).

Fix: convert QUANTIZE to a `static inline` function so the value argument
is evaluated exactly once. The safety logic (bounds check for v < class_offset
and overflow guard against UINT_MAX) is preserved.

Applied to both src/lib/rainflow.c and src/python/lib/rainflow.c.

Additional changes in this session:

- CMakeLists.txt: extend debug-flag condition to cover RelWithDebInfo builds
  in addition to Debug, so -DDEBUG/-D_DEBUG are set for both.

- src/python/cmake/rfcnt_target_functions.cmake: add per-config output
  directory properties (RUNTIME_OUTPUT_DIRECTORY_<CONFIG>) so that Visual
  Studio's multi-config generator does not append a config subfolder
  (e.g. Debug/, RelWithDebInfo/) to the output path. The .pyd now always
  lands in src/python/ regardless of configuration, making it importable
  without changing PYTHONPATH.

- src/python/tests/test_rfcnt_npz.py: added test script loading
  rfcnt_example.npz, for debugging issues.

Author: a-ma72

.gitignore

@@ -8,8 +8,7 @@ src/python/venv/
 src/python/dist/
 src/python/numpy/
 src/python/MANIFEST
-cmake-build-debug/
-cmake-build-release/
+cmake-build*
 rfcnt.egg-info
 .idea/
 .vscode/

CMakeLists.txt

@@ -29,8 +29,8 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type" FORCE)
 endif ()
 
-if (CMAKE_BUILD_TYPE MATCHES Debug)
-    message(STATUS "Rainflow: Debug build")
+if (CMAKE_BUILD_TYPE MATCHES "Debug|RelWithDebInfo")
+    message(STATUS "Rainflow: Adding debug flags for build type ${CMAKE_BUILD_TYPE}")
     add_definitions(-DDEBUG -D_DEBUG)
 endif ()
 

src/lib/rainflow.c

@@ -207,9 +207,13 @@ static bool                 error_raise                     (       rfc_ctx_s *,
 static rfc_value_t          value_delta                     (       rfc_ctx_s *, const rfc_value_tuple_s* pt_from, const rfc_value_tuple_s* pt_to, int *sign_ptr );
 
 
-#define QUANTIZE( r, v )    ( (r)->class_count && (v) >= (r)->class_offset ? \
-                              ( ((v) - (r)->class_offset) / (r)->class_width >= (double)UINT_MAX ? UINT_MAX : \
-                                (unsigned)( ((v) - (r)->class_offset) / (r)->class_width ) ) : 0 )
+static inline unsigned QUANTIZE( const rfc_ctx_s *r, rfc_value_t v )
+{
+    double q;
+    if( !r->class_count || v < r->class_offset ) return 0;
+    q = ( v - r->class_offset ) / r->class_width;
+    return ( q >= (double)UINT_MAX ) ? UINT_MAX : (unsigned)q;
+}
 #define AMPLITUDE( r, i )   ( (r)->class_count ? ( (double)(r)->class_width * (i) / 2 ) : 0.0 )
 #define CLASS_MEAN( r, c )  ( (r)->class_count ? ( (double)(r)->class_width * (0.5 + (c)) + (r)->class_offset ) : 0.0 )
 #define CLASS_UPPER( r, c ) ( (r)->class_count ? ( (double)(r)->class_width * (1.0 + (c)) + (r)->class_offset ) : 0.0 )

src/python/cmake/rfcnt_target_functions.cmake

@@ -89,11 +89,23 @@ function (rfcnt_library  OUTPUT_NAME  OUTPUT_DIRECTORY  rfcnt_target)
         # Windows python modules have suffix ".pyd"
 
         if (OUTPUT_DIRECTORY)
+            # Set per-config output dirs so multi-config generators (VS, Xcode) don't
+            # append a config subfolder (Debug/, Release/, …). Without these, the .pyd
+            # lands in e.g. src/python/Debug/ and Python can't find it.
+            set(_out_dir "${CMAKE_CURRENT_SOURCE_DIR}/${OUTPUT_DIRECTORY}")
             set_target_properties(
                     ${rfcnt_target}
                     PROPERTIES
-                    RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${OUTPUT_DIRECTORY}  # Output directory
-                    LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${OUTPUT_DIRECTORY}  # Output directory
+                    RUNTIME_OUTPUT_DIRECTORY                 "${_out_dir}"
+                    RUNTIME_OUTPUT_DIRECTORY_DEBUG           "${_out_dir}"
+                    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO  "${_out_dir}"
+                    RUNTIME_OUTPUT_DIRECTORY_RELEASE         "${_out_dir}"
+                    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL      "${_out_dir}"
+                    LIBRARY_OUTPUT_DIRECTORY                 "${_out_dir}"
+                    LIBRARY_OUTPUT_DIRECTORY_DEBUG           "${_out_dir}"
+                    LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO  "${_out_dir}"
+                    LIBRARY_OUTPUT_DIRECTORY_RELEASE         "${_out_dir}"
+                    LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL      "${_out_dir}"
             )
             install(
                     TARGETS ${rfcnt_target}

src/python/lib/rainflow.c

@@ -207,9 +207,13 @@ static bool                 error_raise                     (       rfc_ctx_s *,
 static rfc_value_t          value_delta                     (       rfc_ctx_s *, const rfc_value_tuple_s* pt_from, const rfc_value_tuple_s* pt_to, int *sign_ptr );
 
 
-#define QUANTIZE( r, v )    ( (r)->class_count && (v) >= (r)->class_offset ? \
-                              ( ((v) - (r)->class_offset) / (r)->class_width >= (double)UINT_MAX ? UINT_MAX : \
-                                (unsigned)( ((v) - (r)->class_offset) / (r)->class_width ) ) : 0 )
+static inline unsigned QUANTIZE( const rfc_ctx_s *r, rfc_value_t v )
+{
+    double q;
+    if( !r->class_count || v < r->class_offset ) return 0;
+    q = ( v - r->class_offset ) / r->class_width;
+    return ( q >= (double)UINT_MAX ) ? UINT_MAX : (unsigned)q;
+}
 #define AMPLITUDE( r, i )   ( (r)->class_count ? ( (double)(r)->class_width * (i) / 2 ) : 0.0 )
 #define CLASS_MEAN( r, c )  ( (r)->class_count ? ( (double)(r)->class_width * (0.5 + (c)) + (r)->class_offset ) : 0.0 )
 #define CLASS_UPPER( r, c ) ( (r)->class_count ? ( (double)(r)->class_width * (1.0 + (c)) + (r)->class_offset ) : 0.0 )

src/python/tests/rfcnt_example.npz

@@ -0,0 +1,14 @@
+import numpy as np
+import rfcnt
+
+print(f"Using rfcnt from {rfcnt.__file__}")
+
+file = "rfcnt_example.npz"
+print(f"Loading data from {file}...")
+arr = np.load(file)["arr"]
+
+# input("Press Enter")
+
+cw = np.ptp(arr) / 99
+result = rfcnt.rfc(arr, class_width=cw, class_offset=arr.min() - cw/2)
+print(result)

src/python/tests/test_rfcnt_npz.py

@@ -1,3 +1,3 @@
-_version = (0, 5, 2, "")
+_version = (0, 5, 2, ".post2")
 __version__ = "%d.%d.%d%s" % _version
-__author__ = "Andreas Martin"
+__author__ = "Andreas Martin"