Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

duplicate symbol '_distance' with MobileVLCKit #1508

Merged
merged 8 commits into from
Apr 12, 2022
Merged

duplicate symbol '_distance' with MobileVLCKit #1508

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
59e7050
Update RNSVGPathMeasure.m
notjulian Dec 16, 2020
a236382
Update package.json
notjulian Dec 16, 2020
cf09aa9
Update package.json
notjulian Mar 3, 2022
8c09fc4
Update RNSVGPathMeasure.m
notjulian Mar 3, 2022
85a7433
Update RNSVGPathMeasure.m
notjulian Mar 3, 2022
10b2575
Update RNSVGPathMeasure.m
notjulian Mar 3, 2022
739be82
Merge branch 'main' of git://github.com/react-native-svg/react-native…
notjulian Mar 3, 2022
7609f9c
Merge branch 'react-native-svg-main' into develop
notjulian Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apple/Utils/RNSVGPathMeasure.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
/**
* returns the distance between two points
*/
CGFloat distance(CGPoint p1, CGPoint p2)
static CGFloat distance(CGPoint p1, CGPoint p2)
{
CGFloat dx = p2.x - p1.x;
CGFloat dy = p2.y - p1.y;
Expand Down Expand Up @@ -58,7 +58,7 @@ CGFloat distance(CGPoint p1, CGPoint p2)
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
void subdivideBezierAtT(const CGPoint bez[4], CGPoint bez1[4], CGPoint bez2[4], CGFloat t)
static void subdivideBezierAtT(const CGPoint bez[4], CGPoint bez1[4], CGPoint bez2[4], CGFloat t)
{
CGPoint q;
CGFloat mt = 1 - t;
Expand Down