diff options
| -rw-r--r-- | fitz/fitz.h | 1 | ||||
| -rw-r--r-- | mupdf/pdf_shade.c | 21 |
2 files changed, 8 insertions, 14 deletions
diff --git a/fitz/fitz.h b/fitz/fitz.h index 2d64d63a..517e001e 100644 --- a/fitz/fitz.h +++ b/fitz/fitz.h @@ -36,7 +36,6 @@ int gettimeofday(struct timeval *tv, struct timezone *tz); #define snprintf _snprintf -#define hypotf _hypotf #define strtoll _strtoi64 #else /* Unix or close enough */ diff --git a/mupdf/pdf_shade.c b/mupdf/pdf_shade.c index 6afb114a..b5a8f7b5 100644 --- a/mupdf/pdf_shade.c +++ b/mupdf/pdf_shade.c @@ -467,7 +467,6 @@ pdf_loadaxialshading(fz_shade *shade, pdf_xref *xref, fz_obj *dict, int funcs, p struct vertex ep1, ep2, ep3, ep4; float x0, y0, x1, y1; float theta; - float dist; pdf_logshade("load type2 (axial) shading\n"); @@ -503,10 +502,6 @@ pdf_loadaxialshading(fz_shade *shade, pdf_xref *xref, fz_obj *dict, int funcs, p theta = atan2f(y1 - y0, x1 - x0); theta += (float)M_PI * 0.5f; - dist = hypotf(x1 - x0, y1 - y0); - if (dist < FLT_EPSILON) - return fz_throw("zero-sized axial shading"); - p1.x = x0 + HUGENUM * cosf(theta); p1.y = y0 + HUGENUM * sinf(theta); p1.c[0] = 0; @@ -524,22 +519,22 @@ pdf_loadaxialshading(fz_shade *shade, pdf_xref *xref, fz_obj *dict, int funcs, p if (e0) { - ep1.x = p1.x - (x1 - x0) / dist * HUGENUM; - ep1.y = p1.y - (y1 - y0) / dist * HUGENUM; + ep1.x = p1.x - (x1 - x0) * HUGENUM; + ep1.y = p1.y - (y1 - y0) * HUGENUM; ep1.c[0] = 0; - ep3.x = p3.x - (x1 - x0) / dist * HUGENUM; - ep3.y = p3.y - (y1 - y0) / dist * HUGENUM; + ep3.x = p3.x - (x1 - x0) * HUGENUM; + ep3.y = p3.y - (y1 - y0) * HUGENUM; ep3.c[0] = 0; pdf_addquad(shade, &ep1, &p1, &p3, &ep3); } if (e1) { - ep2.x = p2.x + (x1 - x0) / dist * HUGENUM; - ep2.y = p2.y + (y1 - y0) / dist * HUGENUM; + ep2.x = p2.x + (x1 - x0) * HUGENUM; + ep2.y = p2.y + (y1 - y0) * HUGENUM; ep2.c[0] = 1; - ep4.x = p4.x + (x1 - x0) / dist * HUGENUM; - ep4.y = p4.y + (y1 - y0) / dist * HUGENUM; + ep4.x = p4.x + (x1 - x0) * HUGENUM; + ep4.y = p4.y + (y1 - y0) * HUGENUM; ep4.c[0] = 1; pdf_addquad(shade, &p2, &ep2, &ep4, &p4); } |