X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_bezier.h;h=fe6b17017f1e89b13a62f40efbc9f3ed67322d58;hb=e0dedc46e8ab6b258be81887689b0c0fd60def0c;hp=67adc32d66cff15a8892c3961ec7acbda85dbf5e;hpb=37600b4b217caa5e316984ec0b035c5e8f9698af;p=synfig.git diff --git a/ETL/trunk/ETL/_bezier.h b/ETL/trunk/ETL/_bezier.h index 67adc32..fe6b170 100644 --- a/ETL/trunk/ETL/_bezier.h +++ b/ETL/trunk/ETL/_bezier.h @@ -25,13 +25,14 @@ /* === S T A R T =========================================================== */ -#ifndef __ETL_BEZIER_H -#define __ETL_BEZIER_H +#ifndef __ETL__BEZIER_H +#define __ETL__BEZIER_H /* === H E A D E R S ======================================================= */ #include "_curve_func.h" -#include +#include // for ldexp +// #include // not used /* === M A C R O S ========================================================= */ @@ -552,8 +553,7 @@ public: bezier::operator[](1), bezier::operator[](2), bezier::operator[](3)}; - float t = NearestPointOnCurve(x, array); - return t > 0.999999 ? 0.999999 : t < 0.000001 ? 0.000001 : t; + return NearestPointOnCurve(x, array); } else { @@ -577,6 +577,7 @@ public: distance_type find_distance(time_type r, time_type s, int steps=7)const { const time_type inc((s-r)/steps); + if (!inc) return 0; distance_type ret(0); value_type last(operator()(r));