From bbf05c1d5f53f61ec5b033c5c305a497d8389d46 Mon Sep 17 00:00:00 2001 From: dooglus Date: Thu, 12 Apr 2007 15:10:11 +0000 Subject: [PATCH] Typos. git-svn-id: http://svn.voria.com/code@465 1f10aa63-cdf2-0310-b900-c93c546f37ac --- ETL/trunk/ETL/_smach.h | 2 +- synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp | 2 +- synfig-core/trunk/src/synfig/curve_helper.cpp | 2 +- synfig-core/trunk/src/synfig/curve_helper.h | 2 +- synfig-core/trunk/src/synfig/layer_shape.cpp | 2 +- synfig-core/trunk/src/synfig/polynomial_root.cpp | 10 +++++----- synfig-core/trunk/src/synfig/savecanvas.cpp | 8 +++++++- synfig-core/trunk/src/synfig/target.h | 2 +- synfig-studio/trunk/src/gtkmm/canvasview.cpp | 2 +- synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp | 4 ++-- synfig-studio/trunk/src/synfigapp/blineconvert.cpp | 2 +- 11 files changed, 22 insertions(+), 16 deletions(-) diff --git a/ETL/trunk/ETL/_smach.h b/ETL/trunk/ETL/_smach.h index 546b64d..876b6d4 100644 --- a/ETL/trunk/ETL/_smach.h +++ b/ETL/trunk/ETL/_smach.h @@ -391,7 +391,7 @@ public: const state_base* old_state=curr_state; void *old_context=state_context; - // Clear out the current state and it's state_context + // Clear out the current state and its state_context curr_state=0;state_context=0; // Leave the state diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp b/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp index e58b567..93f0d08 100644 --- a/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp +++ b/synfig-core/trunk/src/modules/mod_libavcodec/trgt_av.cpp @@ -378,7 +378,7 @@ public: /* If pict is invalid (NULL), then we are done compressing frames and we are trying to get - the buffer cleared out (or if it's already in the right format) so no transofrm necessary + the buffer cleared out (or if it's already in the right format) so no transform necessary */ if ( pict ) { diff --git a/synfig-core/trunk/src/synfig/curve_helper.cpp b/synfig-core/trunk/src/synfig/curve_helper.cpp index 24d388d..b066d9d 100644 --- a/synfig-core/trunk/src/synfig/curve_helper.cpp +++ b/synfig-core/trunk/src/synfig/curve_helper.cpp @@ -108,7 +108,7 @@ void BezHull::Bound(const etl::bezier &b) { #if 1 - //with a starting vertex, find the only vertex that has all other vertices on it's right + //with a starting vertex, find the only vertex that has all other vertices on its right int i,j; int first,cur,last; diff --git a/synfig-core/trunk/src/synfig/curve_helper.h b/synfig-core/trunk/src/synfig/curve_helper.h index 232bf87..620387f 100644 --- a/synfig-core/trunk/src/synfig/curve_helper.h +++ b/synfig-core/trunk/src/synfig/curve_helper.h @@ -106,7 +106,7 @@ inline bool intersect_line_segments(const Point &a, const Point &b, float &tout, return false; } -//Find the closest point on the curve to a point (and return it's distance, and time value) +//Find the closest point on the curve to a point (and return its distance, and time value) Real find_closest(const etl::bezier &curve, const Point &point, float step, Real *closest, float *t); //----------- Rectangle helper functions --------------- diff --git a/synfig-core/trunk/src/synfig/layer_shape.cpp b/synfig-core/trunk/src/synfig/layer_shape.cpp index 2c2d71d..2dd949e 100644 --- a/synfig-core/trunk/src/synfig/layer_shape.cpp +++ b/synfig-core/trunk/src/synfig/layer_shape.cpp @@ -440,7 +440,7 @@ struct CurveArray const Real cn[4] = {a,b,c,d}; Real p,dp,newt,oldpmag=FLT_MAX; - //eval cubic eqn and it's derivative + //eval cubic eqn and its derivative for(;;) { p = cn[0]*t + cn[1]; diff --git a/synfig-core/trunk/src/synfig/polynomial_root.cpp b/synfig-core/trunk/src/synfig/polynomial_root.cpp index 97e507e..ab792f8 100644 --- a/synfig-core/trunk/src/synfig/polynomial_root.cpp +++ b/synfig-core/trunk/src/synfig/polynomial_root.cpp @@ -101,8 +101,8 @@ cycles with MR different fractional values, once every MT steps, for MAXIT total /* Given the degree m and the m+1 complex coefficients a[0..m] of the polynomial sum(i=0,m){a[i]x^i}, and given a complex value x, this routine improves x by laguerre's method until it converges, -within the acheivable roundoff limit, to a root of teh given polynomial. The number of iterations taken -is returned as its. +within the achievable roundoff limit, to a root of the given polynomial. The number of iterations taken +is returned as `its'. */ void laguer(Complex a[], int m, Complex *x, int *its) { @@ -123,7 +123,7 @@ void laguer(Complex a[], int m, Complex *x, int *its) d = f = Complex(0,0); //clear variables for use abx = abs(*x); //the magnitude of the current root - //Efficent computation of the polynomial and it's first 2 derivatives + //Efficent computation of the polynomial and its first 2 derivatives for(j = m-1; j >= 0; --j) { f = (*x)*f + d; @@ -195,10 +195,10 @@ void laguer(Complex a[], int m, Complex *x, int *its) #define EPS 2.0e-6 #define MAXM 100 //a small number, and maximum anticipated value of m.. -/* Given the degree m ad the m+1 complex coefficients a[0..m] of the polynomial a0 + a1*x +...+ an*x^n +/* Given the degree m and the m+1 complex coefficients a[0..m] of the polynomial a0 + a1*x +...+ an*x^n the routine successively calls laguer and finds all m complex roots in roots[1..m]. The boolean variable polish should be input as true (1) if polishing (also by Laguerre's Method) - is desired, false (0) if teh roots will be subsequently polished by other means. + is desired, false (0) if the roots will be subsequently polished by other means. */ void RootFinder::find_all_roots(bool polish) { diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp index 3fbed5f..91f5dfa 100644 --- a/synfig-core/trunk/src/synfig/savecanvas.cpp +++ b/synfig-core/trunk/src/synfig/savecanvas.cpp @@ -430,13 +430,19 @@ xmlpp::Element* encode_dynamic_list(xmlpp::Element* root,ValueNode_DynamicList:: if(entry_iter->state==true) { if(entry_iter->priority) + { + printf("begin priority is %d\n", entry_iter->priority); begin_sequence+=strprintf("p%d ",entry_iter->priority); + } begin_sequence+=entry_iter->time.get_string(fps)+", "; } else { if(entry_iter->priority) + { + printf("end priority is %d\n", entry_iter->priority); end_sequence+=strprintf("p%d ",entry_iter->priority); + } end_sequence+=entry_iter->time.get_string(fps)+", "; } @@ -573,7 +579,7 @@ xmlpp::Element* encode_layer(xmlpp::Element* root,Layer::ConstHandle layer) ValueBase value=layer->get_param(iter->get_name()); if(!value.is_valid()) { - error("Layer doesn't know it's own vocabulary -- "+iter->get_name()); + error("Layer doesn't know its own vocabulary -- "+iter->get_name()); continue; } diff --git a/synfig-core/trunk/src/synfig/target.h b/synfig-core/trunk/src/synfig/target.h index 6eb6a4e..8d58cf6 100644 --- a/synfig-core/trunk/src/synfig/target.h +++ b/synfig-core/trunk/src/synfig/target.h @@ -146,7 +146,7 @@ public: //! Sets the RendDesc for the Target to \a desc. /*! If there are any parts of \a desc that the render target ** is not capable of doing, the render target will adjust - ** \a desc to fit it's needs. + ** \a desc to fit its needs. */ virtual bool set_rend_desc(RendDesc *d) { desc=*d; return true; } diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index 36e9f71..4b1d351 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -790,7 +790,7 @@ CanvasView::CanvasView(etl::loose_handle instance,etl::handlerend_desc().get_w()+70; int h=get_canvas()->rend_desc().get_h()+70; diff --git a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp index d350d4a..67c298a 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp @@ -494,7 +494,7 @@ bool Widget_Timeslider::redraw(bool doublebuffer) //search around this area to get the right one - //get first valid line and it's position in pixel space + //get first valid line and its position in pixel space double time = 0; double pixel = 0; @@ -502,7 +502,7 @@ bool Widget_Timeslider::redraw(bool doublebuffer) double subr = scale / subdiv; - //get it's position inside... + //get its position inside... time = ceil(start/subr)*subr - start; pixel = time*dpdt; diff --git a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp index 1b3b85c..eb5e9dc 100644 --- a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp +++ b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp @@ -341,7 +341,7 @@ int tesselate_curves(const std::vector &inds, const std::vector j2 = j++; for(; j != end; j2 = j++) { - //if this curve has invalid error (in j) then retesselate it's work points (requires reparametrization, etc.) + //if this curve has invalid error (in j) then retesselate its work points (requires reparametrization, etc.) if(j->error < 0) { //get the stepsize etc. for the number of points in here -- 2.7.4