X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=fgen.sh;h=99bc69d308fb65632294a8fd33bb1150ba08311c;hb=80e1e559dc73992906a74cc854122211f8706f19;hp=417e222f19856854a2f44253a56ab1f18e00014d;hpb=7e9d87ae98e71052f4bda4ac3988238c7052800e;p=fgen.git diff --git a/fgen.sh b/fgen.sh index 417e222..99bc69d 100755 --- a/fgen.sh +++ b/fgen.sh @@ -3,13 +3,16 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2023 Hugo Villeneuve +# Abort on all errors +set -e + PROG_NAME=$(basename $0) # Set default values main_layer="Layer 558" # Pour conversion vidéo: -fps=3 +fps=8 debug=0 @@ -62,10 +65,9 @@ function get_frame_id() frame=$(echo "${1}" | grep -e "label:[0-9]" | ${SED} "s/label:\([0-9]\+\),.*/\1/g") if [ x"${frame}" = x"" ]; then - return 1 + echo "" else echo "${frame}" - return 0 fi } @@ -159,8 +161,6 @@ size=$(get_size "${main_layer}") log_dbg "CANVAS SIZE=${size}" -rm -f ${dest}/frame*.png - # Create background frame: convert -size ${size} xc:none ${dest}/background.png @@ -192,7 +192,7 @@ while read l; do if [ x"${nf}" != x"" ]; then log_dbg "New frame ID: ${nf}" - convert -page +0+0 ${dest}/background.png ${files} -background none -layers merge ${dest}/f${nf}.png + convert -colorspace sRGB -page +0+0 ${dest}/background.png ${files} -background none -layers merge ${dest}/f${nf}.png files="" fi