Merge branch 'dev'

AUR/PKGBUILD

@@ -1,4 +1,4 @@
-	# Maintainer: Mario Hüttel <mario (dot) huettel (!) gmx (dot) net>
+# Maintainer: Mario Hüttel <mario (dot) huettel (!) gmx (dot) net>
 
 pkgname=gds-render
 pkgver=20180725.001

gds-utils/gds-tree-checker.c

@@ -90,7 +90,8 @@ int gds_tree_check_cell_references(struct gds_library *lib)
  * @param cell Cell to check for
  * @return 0 if cell is not in list. 1 if cell is in list
  */
-static int gds_tree_check_list_contains_cell(GList *list, struct gds_cell *cell) {
+static int gds_tree_check_list_contains_cell(GList *list, struct gds_cell *cell)
+{
 	GList *iter;
 
 	for (iter = list; iter != NULL; iter = g_list_next(iter)) {
@@ -177,12 +178,14 @@ int gds_tree_check_reference_loops(struct gds_library *lib)
 		res = gds_tree_check_iterate_ref_and_check(cell_to_check, &visited_cells);
 
 		if (visited_cells) {
-			/* If  cell contains no loop, print error when list not empty.
+			/*
+			 * If  cell contains no loop, print error when list not empty.
 			 * In case of a loop, it is completely normal that the list is not empty,
 			 * due to the instant return from gds_tree_check_iterate_ref_and_check()
 			 */
 			if (res == 0)
-				fprintf(stderr, "Visited cell list should be empty. This is a bug. Please report this.\n");
+				fprintf(stderr,
+					"Visited cell list should be empty. This is a bug. Please report this.\n");
 			g_list_free(visited_cells);
 			visited_cells = NULL;
 		}

geometric/bounding-box.c

@@ -33,8 +33,8 @@
 
 #include <gds-render/geometric/bounding-box.h>
 
-#define MIN(a,b) (((a) < (b)) ? (a) : (b)) /**< @brief Return smaller number */
-#define MAX(a,b) (((a) > (b)) ? (a) : (b)) /**< @brief Return bigger number */
+#define MIN(a, b) (((a) < (b)) ? (a) : (b)) /**< @brief Return smaller number */
+#define MAX(a, b) (((a) > (b)) ? (a) : (b)) /**< @brief Return bigger number */
 #define ABS_DBL(a) ((a) < 0 ? -(a) : (a))
 
 void bounding_box_calculate_polygon(GList *vertices, conv_generic_to_vector_2d_t conv_func, union bounding_box *box)
@@ -151,7 +151,7 @@ void bounding_box_calculate_path_box(GList *vertices, double thickness,
 	GList *vertex_iterator;
 	struct vector_2d pt;
 
-	//printf("Warning! Function bounding_box_calculate_path_box not yet implemented correctly!\n");
+	/* printf("Warning! Function %s not yet implemented correctly!\n", __func__); */
 
 	if (!vertices || !box)
 		return;

geometric/vector-operations.c

@@ -46,9 +46,10 @@ double vector_2d_scalar_multipy(struct vector_2d *a, struct vector_2d *b)
 void vector_2d_normalize(struct vector_2d *vec)
 {
 	double len;
+
 	if (!vec)
 		return;
-	len = sqrt(pow(vec->x,2)+pow(vec->y,2));
+	len = sqrt(pow(vec->x, 2) + pow(vec->y, 2));
 	vec->x = vec->x/len;
 	vec->y = vec->y/len;
 }
@@ -97,9 +98,8 @@ struct vector_2d *vector_2d_alloc(void)
 
 void vector_2d_free(struct vector_2d *vec)
 {
-	if (vec) {
+	if (vec)
 		free(vec);
-	}
 }
 
 void vector_2d_scale(struct vector_2d *vec, double scale)
@@ -114,9 +114,9 @@ void vector_2d_scale(struct vector_2d *vec, double scale)
 double vector_2d_abs(struct vector_2d *vec)
 {
 	double len = 0.0;
-	if (vec) {
-		len = sqrt(pow(vec->x,2)+pow(vec->y,2));
-	}
+
+	if (vec)
+		len = sqrt(pow(vec->x, 2) + pow(vec->y, 2));
 	return len;
 }
 
@@ -142,7 +142,7 @@ void vector_2d_subtract(struct vector_2d *res, struct vector_2d *a, struct vecto
 void vector_2d_add(struct vector_2d *res, struct vector_2d *a, struct vector_2d *b)
 {
 	if (res && a && b) {
-		res->x = a->x +b->x;
+		res->x = a->x + b->x;
 		res->y = a->y + b->y;
 	}
 }