diff options
| author | jkoan <jkoan@users.noreply.github.com> | 2020-09-07 10:27:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 10:27:52 +0200 |
| commit | 0470879c91348ae133eda40d89b655efde8ca758 (patch) | |
| tree | bb97beb6f44904cfb1dc80f47dd812af6e54e8a0 | |
| parent | 03806d7af3d39352f1d40348fa8dd91d1bab5f63 (diff) | |
| parent | 427fd1b0d2a02bca8f3966d896bc9ab0e3f64f5e (diff) | |
| download | navit-issue_984.tar.gz | |
Merge branch 'trunk' into issue_984issue_984
| -rw-r--r-- | navit/icons/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | navit/icons/navit_svg2png | 2 | ||||
| -rw-r--r-- | navit/textures/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/navit/icons/CMakeLists.txt b/navit/icons/CMakeLists.txt index 9817aa25e..548bef441 100644 --- a/navit/icons/CMakeLists.txt +++ b/navit/icons/CMakeLists.txt @@ -30,7 +30,7 @@ macro(convert_to_png IMAGE_INPUT IMAGE_OUTPUT SCALE) else() set(SCALE_ARGS) endif() - set(COMMAND_ARGS --without-gui --export-background-opacity=0 --export-png ${IMAGE_OUTPUT} ${SCALE_ARGS} ${IMAGE_INPUT}) + set(COMMAND_ARGS --export-type=png --export-background-opacity=0 ${SCALE_ARGS} --export-filename=${IMAGE_OUTPUT} ${IMAGE_INPUT}) else() message(FATAL_ERROR "no svg2png converter defined here.") endif() diff --git a/navit/icons/navit_svg2png b/navit/icons/navit_svg2png index 668613a61..32939c7f6 100755 --- a/navit/icons/navit_svg2png +++ b/navit/icons/navit_svg2png @@ -19,7 +19,7 @@ svgtopng() $svgtopng --width=$1 --height=$2 --output $4 $3 ;; *inkscape) - $svgtopng --without-gui --export-width=$1 --export-height=$2 --export-png=$BUILDDIR/$4 $3 + $svgtopng --export-width=$1 --export-height=$2 --export-type=png --export-filename=$4 $3 ;; *convert) $svgtopng -alpha on -background none $3 -resize $1x$2 $4 diff --git a/navit/textures/CMakeLists.txt b/navit/textures/CMakeLists.txt index 5eb1fcf7e..5cd70205f 100644 --- a/navit/textures/CMakeLists.txt +++ b/navit/textures/CMakeLists.txt @@ -30,7 +30,7 @@ macro(convert_to_png TEXTURE_INPUT TEXTURE_OUTPUT SCALE) else() set(SCALE_ARGS) endif() - set(COMMAND_ARGS --without-gui --export-background-opacity=0 --export-png ${TEXTURE_OUTPUT} ${SCALE_ARGS} ${TEXTURE_INPUT}) + set(COMMAND_ARGS --export-type=png --export-background-opacity=0 ${SCALE_ARGS} --export-filename=${TEXTURE_OUTPUT} ${TEXTURE_INPUT}) else() message(FATAL_ERROR "no svg2png converter defined here.") endif() |