mhu/gds-render
1
0
Fork 0
Code Issues 4 Pull Requests Releases 8 Wiki Activity

Merge branch 'master' into translations

Browse Source
This commit is contained in:
Mario Hüttel 2019-10-29 00:03:30 +01:00
commit 70ea6a8901
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
geometric/bounding-box.c
View File

@ -33,8 +33,8 @@
#include <gds-render/geometric/bounding-box.h> #include <gds-render/geometric/bounding-box.h>
#define MIN(a,b) (((a) < (b)) ? (a) : (b)) /**< @brief Return smaller 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 MAX(a, b) (((a) > (b)) ? (a) : (b)) /**< @brief Return bigger number */
#define ABS_DBL(a) ((a) < 0 ? -(a) : (a)) #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) 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; GList *vertex_iterator;
struct vector_2d pt; 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) if (!vertices || !box)
return; return;

14
geometric/vector-operations.c
View File

@ -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) void vector_2d_normalize(struct vector_2d *vec)
{ {
double len; double len;
if (!vec) if (!vec)
return; 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->x = vec->x/len;
vec->y = vec->y/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) void vector_2d_free(struct vector_2d *vec)
{ {
if (vec) { if (vec)
free(vec); free(vec);
}
} }
void vector_2d_scale(struct vector_2d *vec, double scale) 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 vector_2d_abs(struct vector_2d *vec)
{ {
double len = 0.0; 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; 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) void vector_2d_add(struct vector_2d *res, struct vector_2d *a, struct vector_2d *b)
{ {
if (res && a && b) { if (res && a && b) {
res->x = a->x +b->x; res->x = a->x + b->x;
res->y = a->y + b->y; res->y = a->y + b->y;
} }
} }