Skip to content

Commit 1d4e515

Browse files
authored
Merge pull request #91 from jeroenbeijer/jeroen/arincparse
Jeroen/arincparse
2 parents 85ea2bb + e084d78 commit 1d4e515

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

JAERO/arincparse.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,20 @@ void ArincParse::try_acars_apps(ACARSItem &acarsitem, la_msg_dir msg_dir)
6565
}
6666
else
6767
{
68+
// look for a sublabel and if found strip the sublabel(s) from the message before decoding
6869
ba = acarsitem.message.toLatin1();
70+
char sublabel[3];
71+
char mfi[3];
72+
int offset = la_acars_extract_sublabel_and_mfi(acarsitem.LABEL.data(), msg_dir, ba.data(),strlen( ba.data()), sublabel, mfi);
73+
74+
if(offset > 0)
75+
{
76+
ba = "/" + acarsitem.message.right(acarsitem.message.length()-offset).replace("- #" + QString(sublabel),"").trimmed().toLatin1();
77+
}
78+
else
79+
{
80+
ba = acarsitem.message.toLatin1();
81+
}
6982
}
7083
if(ba.isEmpty())return;
7184

ci-windows-build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ cp /mingw64/bin/zlib1.dll $PWD
162162
cp /mingw64/bin/qcustomplot2.dll $PWD
163163
cp /mingw64/bin/Qt5PrintSupport.dll $PWD
164164
cp /mingw64/bin/libdouble-conversion.dll $PWD
165-
cp /mingw64/bin/libicuin72.dll $PWD
166-
cp /mingw64/bin/libicuuc72.dll $PWD
165+
cp /mingw64/bin/libicuin74.dll $PWD
166+
cp /mingw64/bin/libicuuc74.dll $PWD
167167
cp /mingw64/bin/libpcre2-16-0.dll $PWD
168168
cp /mingw64/bin/libpcre2-8-0.dll $PWD
169169
cp /mingw64/bin/libzstd.dll $PWD
@@ -172,15 +172,15 @@ cp /mingw64/bin/libpng16-16.dll $PWD
172172
cp /mingw64/bin/libfreetype-6.dll $PWD
173173
cp /mingw64/bin/libgraphite2.dll $PWD
174174
cp /mingw64/bin/libglib-2.0-0.dll $PWD
175-
cp /mingw64/bin/libicudt72.dll $PWD
175+
cp /mingw64/bin/libicudt74.dll $PWD
176176
cp /mingw64/bin/libbz2-1.dll $PWD
177177
cp /mingw64/bin/libbrotlidec.dll $PWD
178178
cp /mingw64/bin/libintl-8.dll $PWD
179179
cp /mingw64/bin/libpcre-1.dll $PWD
180180
cp /mingw64/bin/libbrotlicommon.dll $PWD
181181
cp /mingw64/bin/libiconv-2.dll $PWD
182182
cp /mingw64/bin/libzmq.dll $PWD
183-
cp /mingw64/bin/libsodium-23.dll $PWD
183+
cp /mingw64/bin/libsodium-26.dll $PWD
184184
cp /mingw64/bin/libmd4c.dll $PWD
185185
cp /mingw64/bin/libjpeg-8.dll $PWD
186186
#7za.exe not needed anymore

0 commit comments

Comments
 (0)