rlottie: Fix typo

meter -> miter

diff --git a/inc/rlottiecommon.h b/inc/rlottiecommon.h
index 1b8968d..07e751a 100644 (file)
--- a/inc/rlottiecommon.h
+++ b/inc/rlottiecommon.h
@@ -141,7 +141,7 @@ typedef struct LOTNode {
         float       width;
         LOTCapStyle  cap;
         LOTJoinStyle join;
-        float       meterLimit;
+        float       miterLimit;
         float    *dashArray;
         int       dashArraySize;
     } mStroke;

diff --git a/src/lottie/lottieitem.cpp b/src/lottie/lottieitem.cpp
index f1e7960..95e8d36 100644 (file)
--- a/src/lottie/lottieitem.cpp
+++ b/src/lottie/lottieitem.cpp
@@ -1393,7 +1393,7 @@ void LOTStrokeItem::updateRenderNode()
     float scale =
         getScale(static_cast<LOTContentGroupItem *>(parent())->matrix());
     mDrawable.setStrokeInfo(mModel.capStyle(), mModel.joinStyle(),
-                            mModel.meterLimit(), mWidth * scale);
+                            mModel.miterLimit(), mWidth * scale);
 
     if (!mDashInfo.empty()) {
         for (auto &elm : mDashInfo) elm *= scale;
@@ -1411,7 +1411,7 @@ void LOTGStrokeItem::updateContent(int frameNo)
     mGradient->mMatrix = static_cast<LOTContentGroupItem *>(parent())->matrix();
     mCap = mData->capStyle();
     mJoin = mData->joinStyle();
-    mMiterLimit = mData->meterLimit();
+    mMiterLimit = mData->miterLimit();
     mWidth = mData->width(frameNo);
 
     if (mData->hasDashInfo()) mData->getDashInfo(frameNo, mDashInfo);
@@ -1634,7 +1634,7 @@ void LOTDrawable::sync()
 
     if (mStroke.enable) {
         mCNode->mStroke.width = mStroke.width;
-        mCNode->mStroke.meterLimit = mStroke.meterLimit;
+        mCNode->mStroke.miterLimit = mStroke.miterLimit;
         mCNode->mStroke.enable = 1;
 
         switch (mStroke.cap) {

diff --git a/src/lottie/lottiemodel.h b/src/lottie/lottiemodel.h
index db66ebb..4a5473d 100644 (file)
--- a/src/lottie/lottiemodel.h
+++ b/src/lottie/lottiemodel.h
@@ -673,7 +673,7 @@ public:
     float strokeWidth(int frameNo) const {return mWidth.value(frameNo);}
     CapStyle capStyle() const {return mCapStyle;}
     JoinStyle joinStyle() const {return mJoinStyle;}
-    float meterLimit() const{return mMeterLimit;}
+    float miterLimit() const{return mMiterLimit;}
     bool  hasDashInfo() const {return !mDash.empty();}
     void getDashInfo(int frameNo, std::vector<float>& result) const
     {
@@ -685,7 +685,7 @@ public:
     LOTAnimatable<float>              mWidth{0};      /* "w" */
     CapStyle                          mCapStyle{CapStyle::Flat};   /* "lc" */
     JoinStyle                         mJoinStyle{JoinStyle::Miter};  /* "lj" */
-    float                             mMeterLimit{0}; /* "ml" */
+    float                             mMiterLimit{0}; /* "ml" */
     LOTDashProperty                   mDash;
     bool                              mEnabled{true}; /* "fillEnabled" */
 };
@@ -783,7 +783,7 @@ public:
     float width(int frameNo) const {return mWidth.value(frameNo);}
     CapStyle capStyle() const {return mCapStyle;}
     JoinStyle joinStyle() const {return mJoinStyle;}
-    float meterLimit() const{return mMeterLimit;}
+    float miterLimit() const{return mMiterLimit;}
     bool  hasDashInfo() const {return !mDash.empty();}
     void getDashInfo(int frameNo, std::vector<float>& result) const
     {
@@ -793,7 +793,7 @@ public:
     LOTAnimatable<float>           mWidth;       /* "w" */
     CapStyle                       mCapStyle{CapStyle::Flat};    /* "lc" */
     JoinStyle                      mJoinStyle{JoinStyle::Miter};   /* "lj" */
-    float                          mMeterLimit{0};  /* "ml" */
+    float                          mMiterLimit{0};  /* "ml" */
     LOTDashProperty                mDash;
 };
 

diff --git a/src/lottie/lottieparser.cpp b/src/lottie/lottieparser.cpp
index 7212e03..db7aeb3 100644 (file)
--- a/src/lottie/lottieparser.cpp
+++ b/src/lottie/lottieparser.cpp
@@ -1563,7 +1563,7 @@ std::shared_ptr<LOTData> LottieParserImpl::parseStrokeObject()
             obj->mJoinStyle = getLineJoin();
         } else if (0 == strcmp(key, "ml")) {
             RAPIDJSON_ASSERT(PeekType() == kNumberType);
-            obj->mMeterLimit = GetDouble();
+            obj->mMiterLimit = GetDouble();
         } else if (0 == strcmp(key, "d")) {
             parseDashProperty(obj->mDash);
         } else if (0 == strcmp(key, "hd")) {
@@ -1679,7 +1679,7 @@ std::shared_ptr<LOTData> LottieParserImpl::parseGStrokeObject()
             obj->mJoinStyle = getLineJoin();
         } else if (0 == strcmp(key, "ml")) {
             RAPIDJSON_ASSERT(PeekType() == kNumberType);
-            obj->mMeterLimit = GetDouble();
+            obj->mMiterLimit = GetDouble();
         } else if (0 == strcmp(key, "d")) {
             parseDashProperty(obj->mDash);
         } else {

diff --git a/src/lottie/lottieproxymodel.h b/src/lottie/lottieproxymodel.h
index 82be2ed..1debf7a 100644 (file)
--- a/src/lottie/lottieproxymodel.h
+++ b/src/lottie/lottieproxymodel.h
@@ -294,7 +294,7 @@ public:
         }
         return _modelData->strokeWidth(frame);
     }
-    float meterLimit() const {return _modelData->meterLimit();}
+    float miterLimit() const {return _modelData->miterLimit();}
     CapStyle capStyle() const {return _modelData->capStyle();}
     JoinStyle joinStyle() const {return _modelData->joinStyle();}
     bool hasDashInfo() const { return _modelData->hasDashInfo();}

diff --git a/src/vector/vdrawable.cpp b/src/vector/vdrawable.cpp
index 4ffecfe..cba3288 100644 (file)
--- a/src/vector/vdrawable.cpp
+++ b/src/vector/vdrawable.cpp
@@ -29,7 +29,7 @@ void VDrawable::preprocess(const VRect &clip)
                 mPath.clone(dasher.dashed(mPath));
             }
             mRasterizer.rasterize(std::move(mPath), mStroke.cap, mStroke.join,
-                                  mStroke.width, mStroke.meterLimit, clip);
+                                  mStroke.width, mStroke.miterLimit, clip);
         } else {
             mRasterizer.rasterize(std::move(mPath), mFillRule, clip);
         }
@@ -43,18 +43,18 @@ VRle VDrawable::rle()
     return mRasterizer.rle();
 }
 
-void VDrawable::setStrokeInfo(CapStyle cap, JoinStyle join, float meterLimit,
+void VDrawable::setStrokeInfo(CapStyle cap, JoinStyle join, float miterLimit,
                               float strokeWidth)
 {
     if ((mStroke.cap == cap) && (mStroke.join == join) &&
-        vCompare(mStroke.meterLimit, meterLimit) &&
+        vCompare(mStroke.miterLimit, miterLimit) &&
         vCompare(mStroke.width, strokeWidth))
         return;
 
     mStroke.enable = true;
     mStroke.cap = cap;
     mStroke.join = join;
-    mStroke.meterLimit = meterLimit;
+    mStroke.miterLimit = miterLimit;
     mStroke.width = strokeWidth;
     mFlag |= DirtyState::Path;
 }

diff --git a/src/vector/vdrawable.h b/src/vector/vdrawable.h
index 4ff7869..749865d 100644 (file)
--- a/src/vector/vdrawable.h
+++ b/src/vector/vdrawable.h
@@ -41,7 +41,7 @@ public:
     void setPath(const VPath &path);
     void setFillRule(FillRule rule) { mFillRule = rule; }
     void setBrush(const VBrush &brush) { mBrush = brush; }
-    void setStrokeInfo(CapStyle cap, JoinStyle join, float meterLimit,
+    void setStrokeInfo(CapStyle cap, JoinStyle join, float miterLimit,
                        float strokeWidth);
     void setDashInfo(std::vector<float> &dashInfo);
     void preprocess(const VRect &clip);
@@ -51,7 +51,7 @@ public:
     struct StrokeInfo {
         std::vector<float> mDash;
         float              width{0.0};
-        float              meterLimit{10};
+        float              miterLimit{10};
         bool               enable{false};
         CapStyle           cap{CapStyle::Flat};
         JoinStyle          join{JoinStyle::Bevel};

diff --git a/src/vector/vraster.cpp b/src/vector/vraster.cpp
index 59b4d7d..80e7537 100644 (file)
--- a/src/vector/vraster.cpp
+++ b/src/vector/vraster.cpp
@@ -72,7 +72,7 @@ public:
     SW_FT_Stroker_LineCap   ftCap;
     SW_FT_Stroker_LineJoin  ftJoin;
     SW_FT_Fixed             ftWidth;
-    SW_FT_Fixed             ftMeterLimit;
+    SW_FT_Fixed             ftMiterLimit;
     dyn_array<SW_FT_Vector> mPointMemory{100};
     dyn_array<char>         mTagMemory{100};
     dyn_array<short>        mContourMemory{10};
@@ -130,7 +130,7 @@ void FTOutline::convert(const VPath &path)
 }
 
 void FTOutline::convert(CapStyle cap, JoinStyle join, float width,
-                        float meterLimit)
+                        float miterLimit)
 {
     // map strokeWidth to freetype. It uses as the radius of the pen not the
     // diameter
@@ -139,7 +139,7 @@ void FTOutline::convert(CapStyle cap, JoinStyle join, float width,
     // IMP: stroker takes radius in 26.6 co-ordinate
     ftWidth = SW_FT_Fixed(width * (1 << 6));
     // IMP: stroker takes meterlimit in 16.16 co-ordinate
-    ftMeterLimit = SW_FT_Fixed(meterLimit * (1 << 16));
+    ftMiterLimit = SW_FT_Fixed(miterLimit * (1 << 16));
 
     // map to freetype capstyle
     switch (cap) {
@@ -303,7 +303,7 @@ struct VRleTask {
     SharedRle mRle;
     VPath     mPath;
     float     mStrokeWidth;
-    float     mMeterLimit;
+    float     mMiterLimit;
     VRect     mClip;
     FillRule  mFillRule;
     CapStyle  mCap;
@@ -322,14 +322,14 @@ struct VRleTask {
     }
 
     void update(VPath path, CapStyle cap, JoinStyle join, float width,
-                float meterLimit, const VRect &clip)
+                float miterLimit, const VRect &clip)
     {
         mRle.reset();
         mPath = std::move(path);
         mCap = cap;
         mJoin = join;
         mStrokeWidth = width;
-        mMeterLimit = meterLimit;
+        mMiterLimit = miterLimit;
         mClip = clip;
         mGenerateStroke = true;
     }
@@ -366,12 +366,12 @@ struct VRleTask {
 
         if (mGenerateStroke) {  // Stroke Task
             outRef.convert(mPath);
-            outRef.convert(mCap, mJoin, mStrokeWidth, mMeterLimit);
+            outRef.convert(mCap, mJoin, mStrokeWidth, mMiterLimit);
 
             uint points, contors;
 
             SW_FT_Stroker_Set(stroker, outRef.ftWidth, outRef.ftCap,
-                              outRef.ftJoin, outRef.ftMeterLimit);
+                              outRef.ftJoin, outRef.ftMiterLimit);
             SW_FT_Stroker_ParseOutline(stroker, &outRef.ft);
             SW_FT_Stroker_GetCounts(stroker, &points, &contors);
 
@@ -537,14 +537,14 @@ void VRasterizer::rasterize(VPath path, FillRule fillRule, const VRect &clip)
 }
 
 void VRasterizer::rasterize(VPath path, CapStyle cap, JoinStyle join,
-                            float width, float meterLimit, const VRect &clip)
+                            float width, float miterLimit, const VRect &clip)
 {
     init();
     if (path.empty() || vIsZero(width)) {
         d->rle().reset();
         return;
     }
-    d->task().update(std::move(path), cap, join, width, meterLimit, clip);
+    d->task().update(std::move(path), cap, join, width, miterLimit, clip);
     updateRequest();
 }
 

diff --git a/src/vector/vraster.h b/src/vector/vraster.h
index 987f9ad..4f7d2ed 100644 (file)
--- a/src/vector/vraster.h
+++ b/src/vector/vraster.h
@@ -32,7 +32,7 @@ class VRasterizer
 public:
     void rasterize(VPath path, FillRule fillRule = FillRule::Winding, const VRect &clip = VRect());
     void rasterize(VPath path, CapStyle cap, JoinStyle join, float width,
-                   float meterLimit, const VRect &clip = VRect());
+                   float miterLimit, const VRect &clip = VRect());
     VRle rle();
 private:
     struct VRasterizerImpl;