Merge pull request #630 from IENT/feature/RGB565

Add support for RGB565

Author: ChristianFeldmann

.clang-format

@@ -2,7 +2,7 @@ IndentWidth: 2
 ContinuationIndentWidth: 2
 ---
 Language: Cpp
-Standard: c++17
+Standard: c++20
 ColumnLimit: 100
 AlignAfterOpenBracket: Align
 BreakBeforeBraces: Allman

.github/workflows/Build.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         os: [ubuntu-22.04, ubuntu-24.04, ubuntu-22.04-arm, ubuntu-24.04-arm]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         submodules: true
     - run: git fetch --prune --unshallow
@@ -30,13 +30,15 @@ jobs:
         make -j$(nproc)
     - name: Run Unittests
       run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest
+      env:
+        QT_QPA_PLATFORM: 'offscreen'
   build-mac-native:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [macos-15, macos-15-intel]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         submodules: true
     - run: git fetch --prune --unshallow
@@ -51,13 +53,15 @@ jobs:
         make -j $(sysctl -n hw.logicalcpu)
     - name: Run Unittests
       run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest
+      env:
+        QT_QPA_PLATFORM: 'offscreen'
   build-linux-mac:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-22.04, macos-15]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         submodules: true
     - run: git fetch --prune --unshallow
@@ -105,6 +109,8 @@ jobs:
         make -j 4
     - name: Run Unittests
       run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest
+      env:
+        QT_QPA_PLATFORM: 'offscreen'
     - name: Build App (Mac)
       if: runner.os	== 'macOS'
       run: |
@@ -125,7 +131,7 @@ jobs:
         mkdir $GITHUB_WORKSPACE/artifacts
         cp YUView.AppImage $GITHUB_WORKSPACE/artifacts/
     - name: Upload Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: ${{steps.artifacts.outputs.outputZip}}
         path: artifacts
@@ -140,7 +146,7 @@ jobs:
       matrix:
         autoUpdate: [true, false]
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         submodules: true
     - uses: ilammy/msvc-dev-cmd@v1
@@ -153,6 +159,8 @@ jobs:
         curl -L https://github.com/ChristianFeldmann/YUViewQt/releases/download/QtBase-6.9.0/qtBase-6-9-0-windows-2022.zip -o Qt.zip
         7z x  Qt.zip
         echo "${{ github.workspace }}\..\..\YUViewQt\YUViewQt\Qt\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+    - name: Test qmake
+      run : qmake --version
     - name: Install libde265
       run: |
         curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.dll -o libde265.dll
@@ -176,20 +184,20 @@ jobs:
         echo "Creating Build dir and entering it"
         mkdir build
         cd build
-        echo "Qmake Version:"
-        d:\a\YUViewQt\YUViewQt\Qt\bin\qmake --version
         echo "Executing qmake..."
-        d:\a\YUViewQt\YUViewQt\Qt\bin\qmake CONFIG+=UNITTESTS ..
+        qmake CONFIG+=UNITTESTS ..
         echo "Executing jom:"
         jom
     - name: Run Unittests
-      run: D:\a\YUView\YUView\build\YUViewUnitTest\YUViewUnitTest
+      run: ${{ github.workspace }}\build\YUViewUnitTest\YUViewUnitTest
+      env:
+        QT_QPA_PLATFORM: 'offscreen'
     - name: WindeployQT
       run: |
         mkdir deploy
         cd deploy
         cp ../build/YUViewApp/YUView.exe .
-        d:\a\YUViewQt\YUViewQt\Qt\bin\windeployqt.exe --release --no-compiler-runtime YUView.exe
+        windeployqt --release --no-compiler-runtime YUView.exe
         cp ../openSSL/*.dll .
         mkdir decoder
         cp ..\libde265.dll decoder
@@ -212,19 +220,19 @@ jobs:
         cp deployment/wix/bin/Release/YUViewSetup.msi ./
     - name: Upload Artifact (Autoupdate)
       if: matrix.autoUpdate == true
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: YUView-windows-2022-autoupdate.zip
         path: artifacts
     - name: Upload Artifact (Autoupdate disabled)
       if: matrix.autoUpdate == false
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: YUView-windows-2022.zip
         path: artifacts
     - name: Upload Windows installer Artifact
       if: matrix.autoUpdate == true
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: YYUView-windows-2022.msi
         path: ./YUViewSetup.msi

.github/workflows/flatpak.yml

@@ -25,7 +25,7 @@ jobs:
       image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
       options: --privileged
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
       with:
         bundle: "YUView.flatpak"

HACKING.md

@@ -1,7 +1,7 @@
 # Compiler Requirements
 
 MSVC: Visual Studio 2013 Update 5 or newer.
-gcc/llvm: C++17 support is required.
+gcc/llvm: C++20 support is required.
 
 # Coding Conventions
 

YUViewApp/YUViewApp.pro

@@ -2,7 +2,7 @@ QT += core gui widgets opengl xml concurrent network
 
 TARGET = YUView
 TEMPLATE = app
-CONFIG += c++17
+CONFIG += c++20
 CONFIG -= debug_and_release
 
 SOURCES += $$files(src/*.cpp, false)

YUViewLib/YUViewLib.pro

@@ -2,7 +2,7 @@ QT += core gui widgets opengl xml concurrent network
 
 TEMPLATE = lib
 CONFIG += staticlib
-CONFIG += c++17
+CONFIG += c++20
 CONFIG -= debug_and_release
 CONFIG += object_parallel_to_source
 

YUViewLib/src/common/Functions.cpp

@@ -198,6 +198,32 @@ std::string toLower(const std::string_view str)
   return lowercaseStr;
 }
 
+std::vector<std::string_view> splitString(const std::string_view str, const char delimiter)
+{
+  std::vector<std::string_view> result;
+  size_t                        start = 0;
+  size_t                        end   = str.find(delimiter);
+  while (end != std::string_view::npos)
+  {
+    result.emplace_back(str.substr(start, end - start));
+    start = end + 1;
+    end   = str.find(delimiter, start);
+  }
+  if (start != str.size())
+    result.emplace_back(str.substr(start));
+  return result;
+}
+
+std::string_view stripWhitespace(std::string_view str)
+{
+  str.remove_prefix(std::min(str.find_first_not_of(" "), str.size()));
+
+  const auto lastNonWhitespace = str.find_last_not_of(" ");
+  if (lastNonWhitespace != std::string_view::npos)
+    str.remove_suffix(str.size() - lastNonWhitespace - 1);
+  return str;
+}
+
 ByteVector readData(std::istream &istream, const size_t nrBytes)
 {
   ByteVector data;
@@ -211,11 +237,12 @@ ByteVector readData(std::istream &istream, const size_t nrBytes)
 std::optional<unsigned> toUnsigned(const std::string_view text)
 {
   unsigned   value{};
-  const auto result = std::from_chars(text.data(), text.data() + text.size(), value);
+  const auto endPointer = text.data() + text.size();
+  const auto result     = std::from_chars(text.data(), endPointer, value);
 
   if (result.ec != std::errc())
     return {};
-  const auto allCharactersParsed = (result.ptr == &(*text.end()));
+  const auto allCharactersParsed = (result.ptr == endPointer);
   if (!allCharactersParsed)
     return {};
 
@@ -225,11 +252,12 @@ std::optional<unsigned> toUnsigned(const std::string_view text)
 std::optional<int> toInt(const std::string_view text)
 {
   int        value{};
-  const auto result = std::from_chars(text.data(), text.data() + text.size(), value);
+  const auto endPointer = text.data() + text.size();
+  const auto result     = std::from_chars(text.data(), endPointer, value);
 
   if (result.ec != std::errc())
     return {};
-  const auto allCharactersParsed = (result.ptr == &(*text.end()));
+  const auto allCharactersParsed = (result.ptr == endPointer);
   if (!allCharactersParsed)
     return {};
 

YUViewLib/src/common/Functions.h

@@ -36,6 +36,8 @@
 
 #include <istream>
 #include <optional>
+#include <string_view>
+#include <vector>
 
 namespace functions
 {
@@ -77,8 +79,12 @@ template <size_t N> QStringList toQStringList(const std::array<std::string_view,
   return list;
 }
 
-std::string toLower(const std::string_view str);
-ByteVector  readData(std::istream &istream, const size_t nrBytes);
+std::string                   toLower(const std::string_view str);
+std::optional<int>            toInt(const std::string_view str);
+std::vector<std::string_view> splitString(const std::string_view str, const char delimiter);
+std::string_view              stripWhitespace(std::string_view str);
+
+ByteVector readData(std::istream &istream, const size_t nrBytes);
 
 template <typename T> unsigned clipToUnsigned(T val)
 {

YUViewLib/src/common/FunctionsGui.cpp

@@ -108,40 +108,6 @@ QIcon functionsGui::convertIcon(QString iconPath)
   return outIcon;
 }
 
-QPixmap functionsGui::convertPixmap(QString pixmapPath)
-{
-  QSettings settings;
-  QString   themeName = settings.value("Theme", "Default").toString();
-
-  // Get the active and inactive colors
-  QStringList colors = functions::getThemeColors(themeName);
-  QRgb        activeColor;
-  if (colors.size() == 4)
-  {
-    QColor active(colors[1]);
-    activeColor = active.rgb();
-  }
-  else
-    activeColor = qRgb(0, 0, 0);
-
-  QImage input(pixmapPath);
-
-  QImage active(input.size(), input.format());
-  for (int y = 0; y < input.height(); y++)
-  {
-    for (int x = 0; x < input.width(); x++)
-    {
-      QRgb in = input.pixel(x, y);
-      if (qAlpha(in) != 0)
-        active.setPixel(x, y, activeColor);
-      else
-        active.setPixel(x, y, in);
-    }
-  }
-
-  return QPixmap::fromImage(active);
-}
-
 QString functionsGui::pixelFormatToString(QImage::Format f)
 {
   if (f == QImage::Format_Invalid)

YUViewLib/src/common/FunctionsGui.h

@@ -108,6 +108,5 @@ void setupUi(void *ui, void (*setupUi)(void *ui, QWidget *widget));
 
 // Return the icon/pixmap from the given file path (inverted if necessary)
 QIcon   convertIcon(QString iconPath);
-QPixmap convertPixmap(QString pixmapPath);
 
 } // namespace functionsGui