X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2Fsvgtiny_gradient.c;h=b282f45cb35d61738fd63cc9e4ace784c986d03a;hb=d5060009e934f2715a35601f7e4192702a473216;hp=06e63c49810c456d2a0bab143aada04ec63af11d;hpb=eb5d8ebefd4714b3f20ddd7551450f9e7604a9d1;p=libsvgtiny.git diff --git a/src/svgtiny_gradient.c b/src/svgtiny_gradient.c index 06e63c4..b282f45 100644 --- a/src/svgtiny_gradient.c +++ b/src/svgtiny_gradient.c @@ -17,6 +17,7 @@ #undef GRADIENT_DEBUG static svgtiny_code svgtiny_parse_linear_gradient(dom_element *linear, + struct svgtiny_parse_state_gradient *grad, struct svgtiny_parse_state *state); static float svgtiny_parse_gradient_offset(const char *s); static void svgtiny_path_bbox(float *p, unsigned int n, @@ -28,62 +29,70 @@ static void svgtiny_invert_matrix(float *m, float *inv); * Find a gradient by id and parse it. */ -void svgtiny_find_gradient(const char *id, struct svgtiny_parse_state *state) +void svgtiny_find_gradient(const char *id, + struct svgtiny_parse_state_gradient *grad, + struct svgtiny_parse_state *state) { dom_element *gradient; - dom_string *id_str; + dom_string *id_str, *name; dom_exception exc; + #ifdef GRADIENT_DEBUG fprintf(stderr, "svgtiny_find_gradient: id \"%s\"\n", id); + #endif - state->linear_gradient_stop_count = 0; - if (state->gradient_x1 != NULL) - dom_string_unref(state->gradient_x1); - if (state->gradient_y1 != NULL) - dom_string_unref(state->gradient_y1); - if (state->gradient_x2 != NULL) - dom_string_unref(state->gradient_x2); - if (state->gradient_y2 != NULL) - dom_string_unref(state->gradient_y2); - state->gradient_x1 = dom_string_ref(state->interned_zero_percent); - state->gradient_y1 = dom_string_ref(state->interned_zero_percent); - state->gradient_x2 = dom_string_ref(state->interned_hundred_percent); - state->gradient_y2 = dom_string_ref(state->interned_zero_percent); - state->gradient_user_space_on_use = false; - state->gradient_transform.a = 1; - state->gradient_transform.b = 0; - state->gradient_transform.c = 0; - state->gradient_transform.d = 1; - state->gradient_transform.e = 0; - state->gradient_transform.f = 0; + grad->linear_gradient_stop_count = 0; + if (grad->gradient_x1 != NULL) + dom_string_unref(grad->gradient_x1); + if (grad->gradient_y1 != NULL) + dom_string_unref(grad->gradient_y1); + if (grad->gradient_x2 != NULL) + dom_string_unref(grad->gradient_x2); + if (grad->gradient_y2 != NULL) + dom_string_unref(grad->gradient_y2); + grad->gradient_x1 = dom_string_ref(state->interned_zero_percent); + grad->gradient_y1 = dom_string_ref(state->interned_zero_percent); + grad->gradient_x2 = dom_string_ref(state->interned_hundred_percent); + grad->gradient_y2 = dom_string_ref(state->interned_zero_percent); + grad->gradient_user_space_on_use = false; + grad->gradient_transform.a = 1; + grad->gradient_transform.b = 0; + grad->gradient_transform.c = 0; + grad->gradient_transform.d = 1; + grad->gradient_transform.e = 0; + grad->gradient_transform.f = 0; - exc = dom_string_create_interned((const uint8_t *) id, strlen(id), - &id_str); + exc = dom_string_create_interned((const uint8_t *) id, + strlen(id), &id_str); if (exc != DOM_NO_ERR) return; exc = dom_document_get_element_by_id(state->document, id_str, &gradient); dom_string_unref(id_str); - if (exc != DOM_NO_ERR) - return; - - if (gradient == NULL) { + if (exc != DOM_NO_ERR || gradient == NULL) { + #ifdef GRADIENT_DEBUG fprintf(stderr, "gradient \"%s\" not found\n", id); + #endif return; } - exc = dom_node_get_node_name(gradient, &id_str); + exc = dom_node_get_node_name(gradient, &name); if (exc != DOM_NO_ERR) { dom_node_unref(gradient); return; } - if (dom_string_isequal(id_str, state->interned_linearGradient)) - svgtiny_parse_linear_gradient(gradient, state); + if (dom_string_isequal(name, state->interned_linearGradient)) + svgtiny_parse_linear_gradient(gradient, grad, state); - dom_string_unref(id_str); dom_node_unref(gradient); + dom_string_unref(name); + + #ifdef GRADIENT_DEBUG + fprintf(stderr, "linear_gradient_stop_count %i\n", + grad->linear_gradient_stop_count); + #endif } @@ -94,6 +103,7 @@ void svgtiny_find_gradient(const char *id, struct svgtiny_parse_state *state) */ svgtiny_code svgtiny_parse_linear_gradient(dom_element *linear, + struct svgtiny_parse_state_gradient *grad, struct svgtiny_parse_state *state) { unsigned int i = 0; @@ -105,8 +115,8 @@ svgtiny_code svgtiny_parse_linear_gradient(dom_element *linear, if (exc == DOM_NO_ERR && attr != NULL) { if (dom_string_data(attr)[0] == (uint8_t) '#') { char *s = strndup(dom_string_data(attr) + 1, - dom_string_length(attr) - 1); - svgtiny_find_gradient(s, state); + dom_string_byte_length(attr) - 1); + svgtiny_find_gradient(s, grad, state); free(s); } dom_string_unref(attr); @@ -114,36 +124,36 @@ svgtiny_code svgtiny_parse_linear_gradient(dom_element *linear, exc = dom_element_get_attribute(linear, state->interned_x1, &attr); if (exc == DOM_NO_ERR && attr != NULL) { - dom_string_unref(state->gradient_x1); - state->gradient_x1 = attr; + dom_string_unref(grad->gradient_x1); + grad->gradient_x1 = attr; attr = NULL; } exc = dom_element_get_attribute(linear, state->interned_y1, &attr); if (exc == DOM_NO_ERR && attr != NULL) { - dom_string_unref(state->gradient_y1); - state->gradient_y1 = attr; + dom_string_unref(grad->gradient_y1); + grad->gradient_y1 = attr; attr = NULL; } exc = dom_element_get_attribute(linear, state->interned_x2, &attr); if (exc == DOM_NO_ERR && attr != NULL) { - dom_string_unref(state->gradient_x2); - state->gradient_x2 = attr; + dom_string_unref(grad->gradient_x2); + grad->gradient_x2 = attr; attr = NULL; } exc = dom_element_get_attribute(linear, state->interned_y2, &attr); if (exc == DOM_NO_ERR && attr != NULL) { - dom_string_unref(state->gradient_y2); - state->gradient_y2 = attr; + dom_string_unref(grad->gradient_y2); + grad->gradient_y2 = attr; attr = NULL; } exc = dom_element_get_attribute(linear, state->interned_gradientUnits, &attr); if (exc == DOM_NO_ERR && attr != NULL) { - state->gradient_user_space_on_use = + grad->gradient_user_space_on_use = dom_string_isequal(attr, state->interned_userSpaceOnUse); dom_string_unref(attr); @@ -155,21 +165,23 @@ svgtiny_code svgtiny_parse_linear_gradient(dom_element *linear, if (exc == DOM_NO_ERR && attr != NULL) { float a = 1, b = 0, c = 0, d = 1, e = 0, f = 0; char *s = strndup(dom_string_data(attr), - dom_string_length(attr)); + dom_string_byte_length(attr)); if (s == NULL) { dom_string_unref(attr); return svgtiny_OUT_OF_MEMORY; } svgtiny_parse_transform(s, &a, &b, &c, &d, &e, &f); free(s); + #ifdef GRADIENT_DEBUG fprintf(stderr, "transform %g %g %g %g %g %g\n", a, b, c, d, e, f); - state->gradient_transform.a = a; - state->gradient_transform.b = b; - state->gradient_transform.c = c; - state->gradient_transform.d = d; - state->gradient_transform.e = e; - state->gradient_transform.f = f; + #endif + grad->gradient_transform.a = a; + grad->gradient_transform.b = b; + grad->gradient_transform.c = c; + grad->gradient_transform.d = d; + grad->gradient_transform.e = e; + grad->gradient_transform.f = f; dom_string_unref(attr); } @@ -197,7 +209,7 @@ svgtiny_code svgtiny_parse_linear_gradient(dom_element *linear, &attr); if (exc == DOM_NO_ERR && attr != NULL) { char *s = strndup(dom_string_data(attr), - dom_string_length(attr)); + dom_string_byte_length(attr)); offset = svgtiny_parse_gradient_offset(s); free(s); dom_string_unref(attr); @@ -206,7 +218,7 @@ svgtiny_code svgtiny_parse_linear_gradient(dom_element *linear, state->interned_stop_color, &attr); if (exc == DOM_NO_ERR && attr != NULL) { - svgtiny_parse_color(attr, &color, state); + svgtiny_parse_color(attr, &color, NULL, state); dom_string_unref(attr); } exc = dom_element_get_attribute(stop, @@ -214,7 +226,7 @@ svgtiny_code svgtiny_parse_linear_gradient(dom_element *linear, &attr); if (exc == DOM_NO_ERR && attr != NULL) { char *content = strndup(dom_string_data(attr), - dom_string_length(attr)); + dom_string_byte_length(attr)); const char *s; dom_string *value; if ((s = strstr(content, "stop-color:"))) { @@ -229,6 +241,7 @@ svgtiny_code svgtiny_parse_linear_gradient(dom_element *linear, value != NULL) { svgtiny_parse_color(value, &color, + NULL, state); dom_string_unref(value); } @@ -237,9 +250,11 @@ svgtiny_code svgtiny_parse_linear_gradient(dom_element *linear, dom_string_unref(attr); } if (offset != -1 && color != svgtiny_TRANSPARENT) { + #ifdef GRADIENT_DEBUG fprintf(stderr, "stop %g %x\n", offset, color); - state->gradient_stop[i].offset = offset; - state->gradient_stop[i].color = color; + #endif + grad->gradient_stop[i].offset = offset; + grad->gradient_stop[i].color = color; i++; } dom_node_unref(stop); @@ -249,9 +264,9 @@ svgtiny_code svgtiny_parse_linear_gradient(dom_element *linear, dom_nodelist_unref(stops); } -no_more_stops: +no_more_stops: if (i > 0) - state->linear_gradient_stop_count = i; + grad->linear_gradient_stop_count = i; return svgtiny_OK; } @@ -308,6 +323,10 @@ svgtiny_code svgtiny_add_path_linear_gradient(float *p, unsigned int n, float current_stop_r; int red0, green0, blue0, red1, green1, blue1; unsigned int t, a, b; + struct svgtiny_parse_state_gradient *grad; + + assert(state->fill == svgtiny_LINEAR_GRADIENT); + grad = &state->fill_grad; /* determine object bounding box */ svgtiny_path_bbox(p, n, &object_x0, &object_y0, &object_x1, &object_y1); @@ -316,38 +335,27 @@ svgtiny_code svgtiny_add_path_linear_gradient(float *p, unsigned int n, object_x0, object_y0, object_x1, object_y1); #endif - /* compute gradient vector */ - fprintf(stderr, "x1 %*s, y1 %*s, x2 %*s, y2 %*s\n", - dom_string_length(state->gradient_x1), - dom_string_data(state->gradient_x1), - dom_string_length(state->gradient_y1), - dom_string_data(state->gradient_y1), - dom_string_length(state->gradient_x2), - dom_string_data(state->gradient_x2), - dom_string_length(state->gradient_y2), - dom_string_data(state->gradient_y2)); - - if (!state->gradient_user_space_on_use) { + if (!grad->gradient_user_space_on_use) { gradient_x0 = object_x0 + - svgtiny_parse_length(state->gradient_x1, + svgtiny_parse_length(grad->gradient_x1, object_x1 - object_x0, *state); gradient_y0 = object_y0 + - svgtiny_parse_length(state->gradient_y1, + svgtiny_parse_length(grad->gradient_y1, object_y1 - object_y0, *state); gradient_x1 = object_x0 + - svgtiny_parse_length(state->gradient_x2, + svgtiny_parse_length(grad->gradient_x2, object_x1 - object_x0, *state); gradient_y1 = object_y0 + - svgtiny_parse_length(state->gradient_y2, + svgtiny_parse_length(grad->gradient_y2, object_y1 - object_y0, *state); } else { - gradient_x0 = svgtiny_parse_length(state->gradient_x1, + gradient_x0 = svgtiny_parse_length(grad->gradient_x1, state->viewport_width, *state); - gradient_y0 = svgtiny_parse_length(state->gradient_y1, + gradient_y0 = svgtiny_parse_length(grad->gradient_y1, state->viewport_height, *state); - gradient_x1 = svgtiny_parse_length(state->gradient_x2, + gradient_x1 = svgtiny_parse_length(grad->gradient_x2, state->viewport_width, *state); - gradient_y1 = svgtiny_parse_length(state->gradient_y2, + gradient_y1 = svgtiny_parse_length(grad->gradient_y2, state->viewport_height, *state); } gradient_dx = gradient_x1 - gradient_x0; @@ -400,17 +408,18 @@ svgtiny_code svgtiny_add_path_linear_gradient(float *p, unsigned int n, }*/ /* invert gradient transform for applying to vertices */ - svgtiny_invert_matrix(&state->gradient_transform.a, trans); + svgtiny_invert_matrix(&grad->gradient_transform.a, trans); + #ifdef GRADIENT_DEBUG fprintf(stderr, "inverse transform %g %g %g %g %g %g\n", trans[0], trans[1], trans[2], trans[3], trans[4], trans[5]); + #endif /* compute points on the path for triangle vertices */ /* r, r0, r1 are distance along gradient vector */ gradient_norm_squared = gradient_dx * gradient_dx + gradient_dy * gradient_dy; - pts = svgtiny_list_create( - sizeof (struct grad_point)); + pts = svgtiny_list_create(sizeof (struct grad_point)); if (!pts) return svgtiny_OUT_OF_MEMORY; for (j = 0; j != n; ) { @@ -473,11 +482,19 @@ svgtiny_code svgtiny_add_path_linear_gradient(float *p, unsigned int n, gradient_norm_squared; /* determine steps from change in r */ - steps = ceilf(fabsf(r1 - r0) / 0.05); + + if(isnan(r0) || isnan(r1)) { + steps = 1; + } else { + steps = ceilf(fabsf(r1 - r0) / 0.05); + } + if (steps == 0) steps = 1; + #ifdef GRADIENT_DEBUG fprintf(stderr, "r0 %g, r1 %g, steps %i\n", r0, r1, steps); + #endif /* loop through intermediate points */ for (z = 1; z != steps; z++) { @@ -502,7 +519,9 @@ svgtiny_code svgtiny_add_path_linear_gradient(float *p, unsigned int n, r = ((x_trans - gradient_x0) * gradient_dx + (y_trans - gradient_y0) * gradient_dy) / gradient_norm_squared; + #ifdef GRADIENT_DEBUG fprintf(stderr, "(%g %g [%g]) ", x, y, r); + #endif point = svgtiny_list_push(pts); if (!point) { svgtiny_list_free(pts); @@ -516,24 +535,35 @@ svgtiny_code svgtiny_add_path_linear_gradient(float *p, unsigned int n, min_pt = svgtiny_list_size(pts) - 1; } } + #ifdef GRADIENT_DEBUG fprintf(stderr, "\n"); + #endif /* next segment start point is this segment end point */ x0 = x1; y0 = y1; } + #ifdef GRADIENT_DEBUG fprintf(stderr, "pts size %i, min_pt %i, min_r %.3f\n", svgtiny_list_size(pts), min_pt, min_r); + #endif + + /* There must be at least a single point for the gradient */ + if (svgtiny_list_size(pts) == 0) { + svgtiny_list_free(pts); + return svgtiny_OK; + } + /* render triangles */ - stop_count = state->linear_gradient_stop_count; + stop_count = grad->linear_gradient_stop_count; assert(2 <= stop_count); current_stop = 0; last_stop_r = 0; - current_stop_r = state->gradient_stop[0].offset; - red0 = red1 = svgtiny_RED(state->gradient_stop[0].color); - green0 = green1 = svgtiny_GREEN(state->gradient_stop[0].color); - blue0 = blue1 = svgtiny_BLUE(state->gradient_stop[0].color); + current_stop_r = grad->gradient_stop[0].offset; + red0 = red1 = svgtiny_RED(grad->gradient_stop[0].color); + green0 = green1 = svgtiny_GREEN(grad->gradient_stop[0].color); + blue0 = blue1 = svgtiny_BLUE(grad->gradient_stop[0].color); t = min_pt; a = (min_pt + 1) % svgtiny_list_size(pts); b = min_pt == 0 ? svgtiny_list_size(pts) - 1 : min_pt - 1; @@ -555,14 +585,14 @@ svgtiny_code svgtiny_add_path_linear_gradient(float *p, unsigned int n, red0 = red1; green0 = green1; blue0 = blue1; - red1 = svgtiny_RED(state-> + red1 = svgtiny_RED(grad-> gradient_stop[current_stop].color); - green1 = svgtiny_GREEN(state-> + green1 = svgtiny_GREEN(grad-> gradient_stop[current_stop].color); - blue1 = svgtiny_BLUE(state-> + blue1 = svgtiny_BLUE(grad-> gradient_stop[current_stop].color); last_stop_r = current_stop_r; - current_stop_r = state-> + current_stop_r = grad-> gradient_stop[current_stop].offset; } p = malloc(10 * sizeof p[0]); @@ -588,10 +618,9 @@ svgtiny_code svgtiny_add_path_linear_gradient(float *p, unsigned int n, shape->path_length = 10; /*shape->fill = svgtiny_TRANSPARENT;*/ if (current_stop == 0) - shape->fill = state->gradient_stop[0].color; + shape->fill = grad->gradient_stop[0].color; else if (current_stop == stop_count) - shape->fill = state-> - gradient_stop[stop_count - 1].color; + shape->fill = grad->gradient_stop[stop_count - 1].color; else { float stop_r = (mean_r - last_stop_r) / (current_stop_r - last_stop_r); @@ -643,7 +672,7 @@ svgtiny_code svgtiny_add_path_linear_gradient(float *p, unsigned int n, /* render triangle vertices with r values for debugging */ #ifdef GRADIENT_DEBUG - for (unsigned int i = 0; i != pts->size; i++) { + for (unsigned int i = 0; i != svgtiny_list_size(pts); i++) { struct grad_point *point = svgtiny_list_get(pts, i); struct svgtiny_shape *shape = svgtiny_add_shape(state); if (!shape)