Merge commit 'ef2c915' into foss2

Author: glegrain

Inc/stm32ipl.h

@@ -413,7 +413,6 @@ stm32ipl_err_t STM32Ipl_BlackHat(image_t *img, uint8_t kSize, uint8_t threshold,
  *  @{
  */
 #ifdef STM32IPL_ENABLE_OBJECT_DETECTION
-stm32ipl_err_t STM32Ipl_LoadCascadeFromMemory(cascade_t *cascade, const uint8_t *memory);
 #ifdef STM32IPL_ENABLE_FRONTAL_FACE_CASCADE
 stm32ipl_err_t STM32Ipl_LoadFaceCascade(cascade_t *cascade);
 #endif /* STM32IPL_ENABLE_FRONTAL_FACE_CASCADE */

Inc/stm32ipl_draw.h

@@ -57,7 +57,7 @@ stm32ipl_err_t STM32Ipl_Dilate(image_t *img, uint8_t kSize, uint8_t threshold, c
  * @brief Removes pixels from the edges of segmented areas.
  * Convolving a kernel pixels across the image and zeroing the center pixel of the kernel
  * if the sum of the neighbour pixels set is not greater than threshold.
- * The supported formats are (Binary, Grayscale, RGB565).
+ * The supported formats are Binary, Grayscale, RGB565, RGB888.
  * @param img			Image; if it is not valid, an error is returned.
  * @param kSize			Kernel size; use 1 (3x3 kernel), 2 (5x5 kernel), ..., n (((n*2)+1)x((n*2)+1) kernel).
  * @param threshold 	Minimum value of the sum of neighbour pixel in the kernel.
@@ -85,7 +85,7 @@ stm32ipl_err_t STM32Ipl_Erode(image_t *img, uint8_t kSize, uint8_t threshold, co
 
 /**
  * @brief Performs erosion and dilation on an image.
- * The supported formats are Binary, Grayscale, RGB565.
+ * The supported formats are Binary, Grayscale, RGB565, RGB888.
  * @param img			Image; if it is not valid, an error is returned.
  * @param kSize	is 		Kernel size; use 1 (3x3 kernel), 2 (5x5 kernel), ..., n (((n*2)+1)x((n*2)+1) kernel).
  * @param threshold 	Threshold parameter used by dilate and erode.
@@ -113,7 +113,7 @@ stm32ipl_err_t STM32Ipl_Open(image_t *img, uint8_t kSize, uint8_t threshold, con
 
 /**
  * @brief Performs dilation and erosion on an image in order.
- * The supported formats are Binary, Grayscale, RGB565.
+ * The supported formats are Binary, Grayscale, RGB565, RGB888.
  * @param img			Image; if it is not valid, an error is returned.
  * @param kSize			Kernel size; use 1 (3x3 kernel), 2 (5x5 kernel), ..., n (((n*2)+1)x((n*2)+1) kernel).
  * @param threshold 	Threshold parameter used by dilate and erode.

Inc/stm32ipl_image_io.h

@@ -28,85 +28,6 @@
 extern "C" {
 #endif
 
-/**
- * @brief Loads a cascade from memory.
- * @param cascade 	Pointer to the cascade; if it is not valid, an error is returned.
- * @param memory  	Pointer to the memory containing the cascade; if it is not valid, an error is returned.
- * @return			stm32ipl_err_Ok on success, error otherwise.
- */
-stm32ipl_err_t STM32Ipl_LoadCascadeFromMemory(cascade_t *cascade, const uint8_t *memory)
-{
-	int i;
-	uint8_t *mem = (uint8_t*)memory;
-
-	/* Check arguments. */
-	if (!cascade || !memory)
-		return stm32ipl_err_InvalidParameter;
-
-	memset(cascade, 0, sizeof(cascade_t));
-
-	/* read detection window size */
-	// read_data(&fp, &cascade->window, sizeof(cascade->window));
-	memcpy(&cascade->window, mem, sizeof(cascade->window));
-	mem += sizeof(cascade->window);
-
-	/* read num stages */
-	// read_data(&fp, &cascade->n_stages, sizeof(cascade->n_stages));
-	memcpy(&cascade->n_stages, mem, sizeof(cascade->n_stages));
-	mem += sizeof(cascade->n_stages);
-
-	/* read num features in each stages */
-	// read_data(&fp, cascade->stages_array, sizeof(uint8_t) * cascade->n_stages);
-	cascade->stages_array = mem;
-	mem += (sizeof(uint8_t) * cascade->n_stages);
-
-	/* sum num of features in each stages*/
-	for (i = 0, cascade->n_features = 0; i < cascade->n_stages; i++) {
-		cascade->n_features += cascade->stages_array[i];
-	}
-
-	/* read stages thresholds */
-	// read_data(&fp, cascade->stages_thresh_array, sizeof(int16_t)*cascade->n_stages);
-	cascade->stages_thresh_array = (int16_t*)mem;
-	mem += (sizeof(int16_t) * cascade->n_stages);
-
-	/* read features thresholds */
-	// read_data(&fp, cascade->tree_thresh_array, sizeof(*cascade->tree_thresh_array)*cascade->n_features);
-	cascade->tree_thresh_array = (int16_t*)mem;
-	mem += (sizeof(*cascade->tree_thresh_array) * cascade->n_features);
-
-	/* read alpha 1 */
-	// read_data(&fp, cascade->alpha1_array, sizeof(*cascade->alpha1_array)*cascade->n_features);
-	cascade->alpha1_array = (int16_t*)mem;
-	mem += (sizeof(*cascade->alpha1_array) * cascade->n_features);
-
-	/* read alpha 2 */
-	// read_data(&fp, cascade->alpha2_array, sizeof(*cascade->alpha2_array)*cascade->n_features);
-	cascade->alpha2_array = (int16_t*)mem;
-	mem += (sizeof(*cascade->alpha2_array) * cascade->n_features);
-
-	/* read num rectangles per feature*/
-	// read_data(&fp, cascade->num_rectangles_array, sizeof(*cascade->num_rectangles_array)*cascade->n_features);
-	cascade->num_rectangles_array = (int8_t*)mem;
-	mem += (sizeof(*cascade->num_rectangles_array) * cascade->n_features);
-
-	/* sum num of recatngles per feature*/
-	for (i = 0, cascade->n_rectangles = 0; i < cascade->n_features; i++) {
-		cascade->n_rectangles += cascade->num_rectangles_array[i];
-	}
-
-	/* read rectangles weights */
-	// read_data(&fp, cascade->weights_array, sizeof(*cascade->weights_array)*cascade->n_rectangles);
-	cascade->weights_array = (int8_t*)mem;
-	mem += (sizeof(*cascade->weights_array) * cascade->n_rectangles);
-
-	/* read rectangles num rectangles * 4 points */
-	//read_data(&fp, cascade->rectangles_array, sizeof(*cascade->rectangles_array)*cascade->n_rectangles *4);
-	cascade->rectangles_array = (int8_t*)mem;
-
-	return stm32ipl_err_Ok;
-}
-
 #ifdef STM32IPL_ENABLE_FRONTAL_FACE_CASCADE
 /**
  * @brief Loads the frontal face cascade.