aboutsummaryrefslogtreecommitdiff
path: root/src/rtodms.c
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@mines-paris.org>2017-02-27 15:46:04 +0100
committerGitHub <noreply@github.com>2017-02-27 15:46:04 +0100
commitb36451fff0bd69b4a14241a8007a0d40caaf8896 (patch)
treecbbef143301fda599c33d139c3fbbfa913754fb1 /src/rtodms.c
parentd64a5508c1efbc1ca6e126d959e19cf879462863 (diff)
parent0cbb3c200d467a520783b07c0774bf3c62cac9b9 (diff)
downloadPROJ-b36451fff0bd69b4a14241a8007a0d40caaf8896.tar.gz
PROJ-b36451fff0bd69b4a14241a8007a0d40caaf8896.zip
Merge pull request #495 from rouault/misc_warning_fixes
Fix warnings related to -Wshadow -Wnull-dereference -Wfloat-conversion -Wmissing-prototypes -Wmissing-declarations
Diffstat (limited to 'src/rtodms.c')
-rw-r--r--src/rtodms.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rtodms.c b/src/rtodms.c
index fa5c3cd1..b6ad9721 100644
--- a/src/rtodms.c
+++ b/src/rtodms.c
@@ -49,13 +49,13 @@ rtodms(char *s, double r, int pos, int neg) {
r = floor(r * CONV + .5);
sec = fmod(r / RES, 60.);
r = floor(r / RES60);
- min = fmod(r, 60.);
- r = floor(r / 60.);
- deg = r;
+ min = (int)fmod(r, 60.);
+ r = floor(r / 60.);
+ deg = (int)r;
if (dolong)
(void)sprintf(ss,format,deg,min,sec,sign);
- else if (sec) {
+ else if (sec != 0.0) {
char *p, *q;
/* double prime + pos/neg suffix (if included) + NUL */
size_t suffix_len = sign ? 3 : 2;