Merge branch 'sra' into foss2

Author: glegrain

Inc/matd.h

@@ -93,12 +93,12 @@ static inline float sgn(float v)
 }
 
 // random number between [0, 1)
-static inline float randf()
+static inline float randf(void)
 {
 	return ((float)rand()) / (RAND_MAX + 1.0);
 }
 
-static inline float signed_randf()
+static inline float signed_randf(void)
 {
 	return randf() * 2 - 1;
 }

Inc/stm32ipl_imlib_int.h

@@ -247,6 +247,9 @@ void imlib_find_circles(list_t *out, image_t *ptr, rectangle_t *roi, unsigned in
 bool stm32ipl_get_regression_points(const point_t *points, uint16_t nPoints, find_lines_list_lnk_data_t *out,
 		bool robust); // STM32IPL
 
+// STM32IPL: added prototypes.
+void merge_alot(list_t *out, int threshold, int theta_threshold);
+size_t trace_line(image_t *ptr, line_t *l, int *theta_buffer, uint32_t *mag_buffer, point_t *point_buffer);
 /// @endcond
 
 #endif //__STM32IPL_IMLIB_INT_H__

Src/apriltag.c

@@ -100,6 +100,9 @@ either expressed or implied, of the Regents of The University of Michigan.
 #define fmaxf(a, b) ({ a > b ? a : b; }) // STM32IPL
 #endif // STM32IPL
 
+/* Prototypes. */
+void quat_to_matrix(const float q[4], matd_t *M);
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //////// "zarray.h"
 ////////////////////////////////////////////////////////////////////////////////////////////////////

Src/mathop.c

@@ -154,6 +154,7 @@ void imlib_gamma_corr(image_t *img, float gamma, float contrast, float brightnes
     }
 }
 
+#ifndef STM32IPL
 void imlib_negate(image_t *img)
 {
     switch(img->bpp) {
@@ -207,6 +208,7 @@ void imlib_negate(image_t *img)
         }
     }
 }
+#endif // STM32IPL
 
 typedef struct imlib_replace_line_op_state {
     bool hmirror, vflip, transpose;

Src/stats.c

@@ -12,6 +12,10 @@
 #include "imlib.h"
 
 #ifdef IMLIB_ENABLE_GET_SIMILARITY
+
+/* Prototypes. */
+void imlib_similarity_line_op(image_t *img, int line, void *other, void *data, bool vflipped);  // STM32IPL
+
 typedef struct imlib_similatiry_line_op_state {
     int *sumBucketsOfX, *sumBucketsOfY, *sum2BucketsOfX, *sum2BucketsOfY, *sum2Buckets;
     float similarity_sum, similarity_sum_2, similarity_min, similarity_max;

Src/stm32ipl_mem_alloc.c

@@ -36,6 +36,10 @@ static uint32_t g_fb_alloc_inext = 0;
 static uint32_t g_fb_alloc_imark = 0;
 
 /* Prototypes. */
+void* STM32Ipl_Alloc(uint32_t size);
+void* STM32Ipl_Alloc0(uint32_t size);
+void STM32Ipl_Free(void *mem);
+void* STM32Ipl_Realloc(void *mem, uint32_t size);
 __attribute__((weak)) void STM32Ipl_FaultHandler(const char *error);
 ///@endcond