Fix for FreeBSD and a typo

Fix provided by Ganael LAPLANCHE, thanks!

diff --git a/3rdparty/hts_engine_API/lib/HTS_misc.c b/3rdparty/hts_engine_API/lib/HTS_misc.c
index 72306cb66f75875d1bc6a0a1aff596ffb5d8f031..b0d112d32f6e65eefb52f00b8618e97c06d07a66 100644 (file)
--- a/3rdparty/hts_engine_API/lib/HTS_misc.c
+++ b/3rdparty/hts_engine_API/lib/HTS_misc.c
@@ -245,7 +245,7 @@ size_t HTS_ftell(HTS_File * fp)
    } else if (fp->type == HTS_FILE) {
       fpos_t pos;
       fgetpos((FILE *) fp->pointer, &pos);
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__)
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__ANDROID__)
       return (size_t) pos;
 #else
       return (size_t) pos.__pos;

diff --git a/src/GUI/ndb-small-icon .png b/src/GUI/ndb-small-icon .png
deleted file mode 100644 (file)
index d50bc58..0000000
Binary files a/src/GUI/ndb-small-icon .png and /dev/null differ

diff --git a/src/GUI/ndb-small-icon.png b/src/GUI/ndb-small-icon.png
new file mode 100644 (file)
index 0000000..d50bc58
Binary files /dev/null and b/src/GUI/ndb-small-icon.png differ

diff --git a/src/GUI/resources.qrc b/src/GUI/resources.qrc
index bc76f27b382ac9938586c27ea16ca652a611ad83..7dc2ebd036f3990cdc785318dd02f16ab3fe4c5c 100644 (file)
--- a/src/GUI/resources.qrc
+++ b/src/GUI/resources.qrc
@@ -15,7 +15,7 @@
         <file alias="airport-tower-icon">airport-tower-icon.png</file>
         <file alias="vor-dme-icon">vor-dme-icon.png</file>
         <file alias="seaport-tower-icon">seaport-tower-icon.png</file>
-        <file alias="ndb-small-icon">ndb-small-icon .png</file>
+        <file alias="ndb-small-icon">ndb-small-icon.png</file>
         <file alias="ndb-large-icon">ndb-large-icon.png</file>
         <file alias="airplane-icon">airplane-icon.png</file>
         <file alias="airport-closed-icon">airport-closed-icon.png</file>