subsurface.git/core, branch v4.6.3

Add subsurface_stat for Mac

2017-02-24T09:14:39Z

Which is also used on iOS. Signed-off-by: Dirk Hohndel

Fix "Load/Save to cloudstorage" for non-ASCII user names

2017-02-24T09:10:22Z

On Windows that would fail because stat() doesn't deal well with our utf8 strings. Added new subsurface_stat() portability function to replace stat(). Added Windows implementation of subsurface_stat() using wstat(), with conversion to ut16 of the inputed path. Other platform implementations (linux, android) make use of the normal stat(). Added non ASCII test case in TestGitStorage::testGitStorageLocal() Signed-off-by: Jeremie Guichard

Dive merge: don't pick an empty dive site

2017-02-22T02:22:56Z

When merging, we should treat an empty dive site (which will be deleted on save) the same as not having a dive site. Signed-off-by: Dirk Hohndel

Many filenames are const strings

2017-02-21T21:14:56Z

So we can use string constants for those Signed-off-by: Robert C. Helling

Translate names of additional dive events and nicer format info box text

2017-02-21T21:11:19Z

Enable translation for a few additional internal dive events. Ensure that all event names in datatrak.c are collected for translation. Ensure that for gaschange in profile info box the "cyl." string is also translated. Signed-off-by: Stefan Fuchs

Unknow > Unknown

2017-02-21T15:03:10Z

Fix dive site string merging

2017-02-20T01:38:34Z

If the second dive site doesn't have a particular string, but the first one does, we did the wrong thing and created a result string like (first dive site string) or ((null)) which is not useful. We should just use the first dive site string as-is. Signed-off-by: Linus Torvalds

Fix typo in saturation/desatureation rates

2017-02-19T23:29:40Z

This patch eliminates the difference between the saturation and desaturation rates. This was probably once meant as a conservative measure but the desaturation rate was increased rather than the saturation rate (which is probably a typo, as reported by Stefan). Since there is no good basis for this anyway, this patch sets both factors to 1.0 (and if accepted the whole factor business should be removed). This makes our deco times slightly longer. But in the past, we had introduced a 1.2% fudge factor in the critical radius calculation to add conservatism and match the benchmark better. Removing this fudge factor brings us close to the benchmarks. Expected test values updated. Reported-by: Stefan Signed-off-by: Robert C. Helling

Update exif.cpp from upstream

2017-02-19T23:29:40Z

Signed-off-by: Robert C. Helling

Properly handle dive sites loaded from XML

2017-02-19T23:23:46Z

We used to always create a new dive site structure when loading dive site data from XML. That is completely bogus, because it can (and does) create duplicate dive sites with the same UUID. Which makes the whole UUID pointless. So instead, look up the existing dive site associated with the UUID loaded from the XML, and try to merge the data properly if we already had dive site information for that UUID. Reported-by: Alessandro Volpi Signed-off-by: Linus Torvalds