Skip to content

Commit

Permalink
Add support for STB & LunaSVG (better SVG conversion quality than QIm…
Browse files Browse the repository at this point in the history
…age for menus)
  • Loading branch information
awawa-dev committed May 9, 2024
1 parent fa66a82 commit 4d254c4
Show file tree
Hide file tree
Showing 17 changed files with 8,281 additions and 24 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/push-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: HyperHDR CI Build

on:
push:
# pull_request:
pull_request:

env:
USE_CACHE: "1"
Expand All @@ -19,7 +19,6 @@ jobs:
Linux:
name: ${{ matrix.dockerName }}
runs-on: ubuntu-22.04
if: false

strategy:
matrix:
Expand Down Expand Up @@ -137,8 +136,6 @@ jobs:
macOS:
name: ${{ matrix.JOB_NAME }}
runs-on: ${{ matrix.JOB_RUNNER }}
if: false

strategy:
matrix:
include:
Expand Down Expand Up @@ -278,7 +275,7 @@ jobs:
analyze:
name: Analyze (CodeQL)
runs-on: ubuntu-latest
if: ( false )
if: ( true )
permissions:
actions: read
contents: read
Expand Down Expand Up @@ -306,9 +303,8 @@ jobs:

publish:
name: Publish Releases
if: false
#if: startsWith(github.event.ref, 'refs/tags') && github.event_name != 'pull_request'
needs: [windows]
if: startsWith(github.event.ref, 'refs/tags') && github.event_name != 'pull_request'
needs: [Linux, windows, macOS]
runs-on: ubuntu-22.04
permissions:
contents: write
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@
[submodule "external/mdns"]
path = external/mdns
url = https://github.com/mjansson/mdns.git
[submodule "external/lunasvg"]
path = external/lunasvg
url = https://github.com/sammycage/lunasvg.git
26 changes: 25 additions & 1 deletion 3RD_PARTY_LICENSES
Original file line number Diff line number Diff line change
Expand Up @@ -2035,7 +2035,31 @@ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITU
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


==============================
LunaSVG
==============================

MIT License

Copyright (c) 2020 Nwutobo Samuel Ugochukwu <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

==============================
marked
Expand Down
6 changes: 6 additions & 0 deletions external/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ if(ENABLE_WS281XPWM)
${CMAKE_CURRENT_SOURCE_DIR}/rpi_ws281x/rpihw.c)
endif()

#=============================================================================
# LUNASVG
#=============================================================================

add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lunasvg)

#=============================================================================
# FLATBUFFER
#=============================================================================
Expand Down
1 change: 1 addition & 0 deletions external/lunasvg
Submodule lunasvg added at 610b8b
18 changes: 18 additions & 0 deletions include/hyperimage/HyperImage.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#pragma once

#ifndef PCH_ENABLED
#include <QObject>
#include <QString>
#endif

#include <QBuffer>
#include <QColor>

class HyperImage : public QObject
{
Q_OBJECT

public:
static void svg2png(QString filename, int width, int height, QBuffer& buffer);
static QColor QColorfromString(QString colorName);
};
Loading

0 comments on commit 4d254c4

Please sign in to comment.