Merge 954748f452 into a31e83d43c

Merge pull request #2096 from srcejon/freq_scanner
Two bug fixes
2024-04-30 19:53:31 +02:00 · 2024-04-30 15:28:52 +02:00 · 2024-04-30 09:33:54 +01:00 · 2024-04-30 09:32:22 +01:00 · 2024-04-26 23:04:12 +02:00 · 2024-04-26 22:57:41 +02:00
3 changed files with 5 additions and 5 deletions
--- a/.github/workflows/sdrangel.yml
+++ b/.github/workflows/sdrangel.yml
@ -121,11 +121,11 @@ jobs:
          rm -f /usr/local/bin/2to3
          brew install opencv
      - name: Install brew packages
-        run: brew install nasm boost hidapi libusb fftw ffmpeg faad2 zlib airspy airspyhf hackrf rtl-sdr libbladerf soapysdr qt
+        run: brew install nasm boost hidapi libusb fftw faad2 zlib airspy airspyhf hackrf rtl-sdr libbladerf soapysdr qt
      - name: Configure SDRangel
        run: |
          mkdir build && cd build
-          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
+          cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON -DENABLE_CHANNELRX_DEMODDATV=OFF -DENABLE_CHANNELTX_MODDATV=OFF -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=AUTO -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE
      - name: Get filename
        id: get_filename
        run: echo "filename=$(grep CPACK_PACKAGE_FILE_NAME build/CMakeCache.txt | cut -d "=" -f2)" >> $GITHUB_OUTPUT
--- a/sdrbase/util/ais.cpp
+++ b/sdrbase/util/ais.cpp
@ -502,7 +502,7 @@ AISSafetyMessage::AISSafetyMessage(QByteArray ba) :
    m_sequenceNumber = ba[4] & 0x3;
    m_destinationId = ((ba[5] & 0xff) << 22) | ((ba[6] & 0xff) << 14) | ((ba[7] & 0xff) << 6) | ((ba[8] >> 2) & 0x3f);
    m_retransmitFlag = (ba[8] >> 1) & 0x1;
-    m_safetyRelatedText = AISMessage::getString(ba, 9, 0, (ba.size() - 9) * 8 / 6);
+    m_safetyRelatedText = AISMessage::getString(ba, 9, 8, (ba.size() - 9) * 8 / 6);
 }

 QString AISSafetyMessage::toString()
@ -518,7 +518,7 @@ AISSafetyAck::AISSafetyAck(QByteArray ba) :
 AISSafetyBroadcast::AISSafetyBroadcast(QByteArray ba) :
    AISMessage(ba)
 {
-    m_safetyRelatedText = AISMessage::getString(ba, 5, 0, (ba.size() - 6) * 8 / 6);
+    m_safetyRelatedText = AISMessage::getString(ba, 5, 8, (ba.size() - 5) * 8 / 6);
 }

 QString AISSafetyBroadcast::toString()
--- a/sdrgui/gui/valuedial.cpp
+++ b/sdrgui/gui/valuedial.cpp
@ -601,7 +601,7 @@ void ValueDial::keyPressEvent(QKeyEvent *value)
        emit changed(m_valueNew);
        m_cursor++;

-        if (m_text[m_cursor] == m_groupSeparator) {
+        if ((m_cursor >= 0) && (m_cursor < m_text.size()) && (m_text[m_cursor] == m_groupSeparator)) {
            m_cursor++;
        }
Author	SHA1	Message	Date
dforsi	5552f13ab4	Merge `954748f452` into `a31e83d43c`	2024-04-30 19:53:31 +02:00
Edouard Griffiths	a31e83d43c	Merge pull request #2096 from srcejon/freq_scanner Two bug fixes	2024-04-30 15:28:52 +02:00
srcejon	39760146d4	ValueDial: Fix array being accessed out of range.	2024-04-30 09:33:54 +01:00
srcejon	4f2b03646f	AIS: Fix string decoding in safetey messages. #2094	2024-04-30 09:32:22 +01:00
Daniele Forsi	954748f452	Temporarily disable building DATV plugins for MacOS CI This is a temporary workaround to make CI succeed until the plugins code is modified to be compatible with a newer version of ffmpeg.	2024-04-26 23:04:12 +02:00
Daniele Forsi	6f107cd915	Fix CI for Mac OS Build ffmpeg as external project to work around missing includes: /Users/runner/work/sdrangel/sdrangel/plugins/channelrx/demoddatv/datvideorender.cpp:282:46: error: no member named 'channels' in 'AVCodecContext' (and similar)	2024-04-26 22:57:41 +02:00