Toggle navigation
Toggle navigation
This project
Loading...
Sign in
尹诚
/
Mapbox-iOS-SDK
·
Commits
Go to a project
GitLab
Go to dashboard
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
Thomas Rasch
13 years ago
Commit
3bc6224b3ff3bf910a66fd29effa02acfd06a7f4
1 parent
478b736e
o Fixed some compiler warnings
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
Proj4/geod_for.c
Proj4/mk_cheby.c
Proj4/geod_for.c
View file @
3bc6224
...
...
@@ -91,13 +91,14 @@ geod_for(void) {
(
ellipse
?
onef
*
M
:
M
));
de
=
atan2
(
sinds
*
sina12
,
(
costh1
*
cosds
-
sinth1
*
sinds
*
cosa12
));
if
(
ellipse
)
if
(
ellipse
)
{
if
(
signS
)
de
+=
c1
*
((
1
.
-
c2
)
*
ds
+
c2
*
sinds
*
cos
(
ss
));
else
de
-=
c1
*
((
1
.
-
c2
)
*
ds
-
c2
*
sinds
*
cos
(
ss
));
}
}
lam2
=
adjlon
(
lam1
+
de
);
}
...
...
Proj4/mk_cheby.c
View file @
3bc6224
...
...
@@ -98,21 +98,23 @@ mk_cheby(projUV a, projUV b, double res, projUV *resid, projUV (*func)(projUV),
T
->
mv
=
nrv
-
1
;
T
->
power
=
1
;
for
(
i
=
0
;
i
<
nru
;
++
i
)
/* store coefficient rows for u */
if
((
T
->
cu
[
i
].
m
=
ncu
[
i
]))
if
((
T
->
cu
[
i
].
m
=
ncu
[
i
]))
{
if
((
p
=
T
->
cu
[
i
].
c
=
(
double
*
)
pj_malloc
(
sizeof
(
double
)
*
ncu
[
i
])))
for
(
j
=
0
;
j
<
ncu
[
i
];
++
j
)
*
p
++
=
(
w
[
i
]
+
j
)
->
u
;
else
goto
error
;
}
for
(
i
=
0
;
i
<
nrv
;
++
i
)
/* same for v */
if
((
T
->
cv
[
i
].
m
=
ncv
[
i
]))
if
((
T
->
cv
[
i
].
m
=
ncv
[
i
]))
{
if
((
p
=
T
->
cv
[
i
].
c
=
(
double
*
)
pj_malloc
(
sizeof
(
double
)
*
ncv
[
i
])))
for
(
j
=
0
;
j
<
ncv
[
i
];
++
j
)
*
p
++
=
(
w
[
i
]
+
j
)
->
v
;
else
goto
error
;
}
}
}
else
if
((
T
=
makeT
(
nru
,
nrv
)))
{
/* else make returned Chebyshev coefficient structure */
...
...
@@ -124,21 +126,23 @@ mk_cheby(projUV a, projUV b, double res, projUV *resid, projUV (*func)(projUV),
T
->
b
.
v
=
1
.
/
(
b
.
v
-
a
.
v
);
T
->
power
=
0
;
for
(
i
=
0
;
i
<
nru
;
++
i
)
/* store coefficient rows for u */
if
((
T
->
cu
[
i
].
m
=
ncu
[
i
]))
if
((
T
->
cu
[
i
].
m
=
ncu
[
i
]))
{
if
((
p
=
T
->
cu
[
i
].
c
=
(
double
*
)
pj_malloc
(
sizeof
(
double
)
*
ncu
[
i
])))
for
(
j
=
0
;
j
<
ncu
[
i
];
++
j
)
*
p
++
=
(
w
[
i
]
+
j
)
->
u
;
else
goto
error
;
}
for
(
i
=
0
;
i
<
nrv
;
++
i
)
/* same for v */
if
((
T
->
cv
[
i
].
m
=
ncv
[
i
]))
if
((
T
->
cv
[
i
].
m
=
ncv
[
i
]))
{
if
((
p
=
T
->
cv
[
i
].
c
=
(
double
*
)
pj_malloc
(
sizeof
(
double
)
*
ncv
[
i
])))
for
(
j
=
0
;
j
<
ncv
[
i
];
++
j
)
*
p
++
=
(
w
[
i
]
+
j
)
->
v
;
else
goto
error
;
}
}
else
goto
error
;
}
...
...
Please
register
or
login
to post a comment