From 3174aed685c170e1bebec81c342f0b67fe5e3120 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 12 Apr 2021 21:47:14 +0300 Subject: [PATCH 06/47] convert_png: Make to work with Inkscape 1.0.2 See osdn #41884 Signed-off-by: Marko Lindqvist --- data/flags/Makefile.am | 3 +- data/flags/convert_png | 16 ++--- data/flags/convert_png_legacy | 132 ++++++++++++++++++++++++++++++++++ doc/README.nations | 5 ++ 4 files changed, 147 insertions(+), 9 deletions(-) create mode 100755 data/flags/convert_png_legacy diff --git a/data/flags/Makefile.am b/data/flags/Makefile.am index 07e7216146..46d1a148fb 100644 --- a/data/flags/Makefile.am +++ b/data/flags/Makefile.am @@ -2851,4 +2851,5 @@ svg_files = \ pkgdata_DATA = $(flag_files) $(shield_files) -EXTRA_DIST = $(pkgdata_DATA) $(svg_files) credits convert_png mask.png +EXTRA_DIST = $(pkgdata_DATA) $(svg_files) \ + credits convert_png conver_png_legacy mask.png diff --git a/data/flags/convert_png b/data/flags/convert_png index 4cf2caaa12..8c4fa3831b 100755 --- a/data/flags/convert_png +++ b/data/flags/convert_png @@ -40,7 +40,7 @@ for file0 in $files; do # This is actually necessary for rendering rm -f $file1 $file2 $file3 $file4 - $RENDERER -f "$file0" -w $(($TARGET_WIDTH - 2)) -e "$file1" >/dev/null + $RENDERER "$file0" -w $(($TARGET_WIDTH - 2)) -o "$file1" >/dev/null # Ugly way to determine width and height. There must be a better way! SIZE=`identify "$file1" | sed "s/^.*PNG //" | sed "s/ .*\$//"` @@ -63,15 +63,15 @@ for file0 in $files; do HEIGHT=$(($SHIELD_HEIGHT-2)) # The following assumes that the drawing has the same dimensions as the page - DRAWING_WIDTH=$($RENDERER -f $file0 -W) - DRAWING_HEIGHT=$($RENDERER -f $file0 -H) + DRAWING_WIDTH=$($RENDERER $file0 -W) + DRAWING_HEIGHT=$($RENDERER $file0 -H) X0=$(awk -v drawing_width=${DRAWING_WIDTH} 'BEGIN { print int((drawing_width / 6) + 0.5) }') X1=$(awk -v x0=${X0} 'BEGIN{ print int((x0 * 5) + 0.5) }') Y0=0 Y1=$(awk -v drawing_height=${DRAWING_HEIGHT} 'BEGIN { print int(drawing_height + 0.5) }') AREA=$X0":"$Y0":"$X1":"$Y1 - $RENDERER -f $file0 -w $WIDTH -h $HEIGHT -e $file1 -a=$AREA > /dev/null + $RENDERER $file0 -w $WIDTH -h $HEIGHT -o $file1 --export-area=$AREA > /dev/null composite -gravity center -compose src-over $file1 mask.png $file2 composite -gravity center -compose src-over mask.png $file2 $file3 @@ -91,7 +91,7 @@ for file0 in $files; do # This is actually necessary for rendering rm -f $file1 $file2 $file3 $file4 - $RENDERER -f "$file0" -w $(($TARGET_WIDTH_LARGE - 2)) -e "$file1" >/dev/null + $RENDERER "$file0" -w $(($TARGET_WIDTH_LARGE - 2)) -o "$file1" >/dev/null # Ugly way to determine width and height. There must be a better way! SIZE=`identify "$file1" | sed "s/^.*PNG //" | sed "s/ .*\$//"` @@ -114,15 +114,15 @@ for file0 in $files; do HEIGHT=$(($SHIELD_HEIGHT_LARGE-2)) # The following assumes that the drawing has the same dimensions as the page - DRAWING_WIDTH=$($RENDERER -f $file0 -W) - DRAWING_HEIGHT=$($RENDERER -f $file0 -H) + DRAWING_WIDTH=$($RENDERER $file0 -W) + DRAWING_HEIGHT=$($RENDERER $file0 -H) X0=$(awk -v drawing_width=${DRAWING_WIDTH} 'BEGIN { print int((drawing_width / 6) + 0.5) }') X1=$(awk -v x0=${X0} 'BEGIN{ print int((x0 * 5) + 0.5) }') Y0=0 Y1=$(awk -v drawing_height=${DRAWING_HEIGHT} 'BEGIN { print int(drawing_height + 0.5) }') AREA=$X0":"$Y0":"$X1":"$Y1 - $RENDERER -f $file0 -w $WIDTH -h $HEIGHT -e $file1 -a=$AREA > /dev/null + $RENDERER $file0 -w $WIDTH -h $HEIGHT -o $file1 --export-area=$AREA > /dev/null composite -gravity center -compose src-over $file1 mask-large.png $file2 composite -gravity center -compose src-over mask-large.png $file2 $file3 diff --git a/data/flags/convert_png_legacy b/data/flags/convert_png_legacy new file mode 100755 index 0000000000..4cf2caaa12 --- /dev/null +++ b/data/flags/convert_png_legacy @@ -0,0 +1,132 @@ +#!/bin/bash + +# Using absolute paths due to bug in Inkscape on macOS +files="$(pwd)/$@" + +if test "x$1" = "x-h" || test "x$1" = "x--help" ; then + echo "Usage: $(basename $0) [list of svg-files]" + exit 0 +fi + +# Renderer: inkscape or sodipodi. Inkscape seems slightly better. +#SODIPODI="sodipodi" +RENDERER="inkscape" + +# Target width: 29px is regular, 44px is large (height is then calculated +# automatically). +TARGET_WIDTH=29 +TARGET_WIDTH_LARGE=44 + +SHIELD_WIDTH=14 +SHIELD_HEIGHT=14 +SHIELD_WIDTH_LARGE=19 +SHIELD_HEIGHT_LARGE=19 + +which $RENDERER >/dev/null \ + || (echo "You need $RENDERER to render the SVG files.") +(which convert >/dev/null && which composite >/dev/null) \ + || (echo "You need ImageMagick to manipulate the images."; err=yes) + +for file0 in $files; do + # Generate the regular images + filebase=`echo $file0 | sed 's/.[Ss][Vv][Gg]$//'` + + file1="$filebase-1.png" + file2="$filebase-2.png" + file3="$filebase-3.png" + file4="$filebase.png" + echo "Converting $file0 to $file4" + + # This is actually necessary for rendering + rm -f $file1 $file2 $file3 $file4 + + $RENDERER -f "$file0" -w $(($TARGET_WIDTH - 2)) -e "$file1" >/dev/null + + # Ugly way to determine width and height. There must be a better way! + SIZE=`identify "$file1" | sed "s/^.*PNG //" | sed "s/ .*\$//"` + WIDTH=`echo $SIZE | sed "s/x.*\$//"` + HEIGHT=`echo $SIZE | sed "s/^.*x//"` + + # This complicated code puts a 1-pixel black border around the image. + convert -resize $((2*$WIDTH))x$((2*$HEIGHT)) -fill black -draw "rectangle 0,0 $((2*$WIDTH)),$((2*$HEIGHT))" $file1 $file2 + convert -crop $((2+$WIDTH))x$((2+$HEIGHT))+0x0 $file2 $file3 + composite -gravity center -compose src-over $file1 $file3 $file4 + + rm -f $file1 $file2 $file3 "$filebase-4-fs8.png" + + file1="$filebase-1.png" + file2="$filebase-2.png" + file3="$filebase-3.png" + file4="$filebase-shield.png" + + WIDTH=$(($SHIELD_WIDTH-2)) + HEIGHT=$(($SHIELD_HEIGHT-2)) + + # The following assumes that the drawing has the same dimensions as the page + DRAWING_WIDTH=$($RENDERER -f $file0 -W) + DRAWING_HEIGHT=$($RENDERER -f $file0 -H) + X0=$(awk -v drawing_width=${DRAWING_WIDTH} 'BEGIN { print int((drawing_width / 6) + 0.5) }') + X1=$(awk -v x0=${X0} 'BEGIN{ print int((x0 * 5) + 0.5) }') + Y0=0 + Y1=$(awk -v drawing_height=${DRAWING_HEIGHT} 'BEGIN { print int(drawing_height + 0.5) }') + AREA=$X0":"$Y0":"$X1":"$Y1 + + $RENDERER -f $file0 -w $WIDTH -h $HEIGHT -e $file1 -a=$AREA > /dev/null + + composite -gravity center -compose src-over $file1 mask.png $file2 + composite -gravity center -compose src-over mask.png $file2 $file3 + convert -transparent magenta $file3 $file4 + + rm -f $file1 $file2 $file3 "$filebase-4-fs8.png" + + # Generate the large images + filebase=`echo $file0 | sed 's/.[Ss][Vv][Gg]$//'` + + file1="$filebase-1.png" + file2="$filebase-2.png" + file3="$filebase-3.png" + file4="$filebase-large.png" + echo "Converting $file0 to $file4" + + # This is actually necessary for rendering + rm -f $file1 $file2 $file3 $file4 + + $RENDERER -f "$file0" -w $(($TARGET_WIDTH_LARGE - 2)) -e "$file1" >/dev/null + + # Ugly way to determine width and height. There must be a better way! + SIZE=`identify "$file1" | sed "s/^.*PNG //" | sed "s/ .*\$//"` + WIDTH=`echo $SIZE | sed "s/x.*\$//"` + HEIGHT=`echo $SIZE | sed "s/^.*x//"` + + # This complicated code puts a 1-pixel black border around the image. + convert -resize $((2*$WIDTH))x$((2*$HEIGHT)) -fill black -draw "rectangle 0,0 $((2*$WIDTH)),$((2*$HEIGHT))" $file1 $file2 + convert -crop $((2+$WIDTH))x$((2+$HEIGHT))+0x0 $file2 $file3 + composite -gravity center -compose src-over $file1 $file3 $file4 + + rm -f $file1 $file2 $file3 "$filebase-4-fs8.png" + + file1="$filebase-1.png" + file2="$filebase-2.png" + file3="$filebase-3.png" + file4="$filebase-shield-large.png" + + WIDTH=$(($SHIELD_WIDTH_LARGE-2)) + HEIGHT=$(($SHIELD_HEIGHT_LARGE-2)) + + # The following assumes that the drawing has the same dimensions as the page + DRAWING_WIDTH=$($RENDERER -f $file0 -W) + DRAWING_HEIGHT=$($RENDERER -f $file0 -H) + X0=$(awk -v drawing_width=${DRAWING_WIDTH} 'BEGIN { print int((drawing_width / 6) + 0.5) }') + X1=$(awk -v x0=${X0} 'BEGIN{ print int((x0 * 5) + 0.5) }') + Y0=0 + Y1=$(awk -v drawing_height=${DRAWING_HEIGHT} 'BEGIN { print int(drawing_height + 0.5) }') + AREA=$X0":"$Y0":"$X1":"$Y1 + + $RENDERER -f $file0 -w $WIDTH -h $HEIGHT -e $file1 -a=$AREA > /dev/null + + composite -gravity center -compose src-over $file1 mask-large.png $file2 + composite -gravity center -compose src-over mask-large.png $file2 $file3 + convert -transparent magenta $file3 $file4 + + rm -f $file1 $file2 $file3 "$filebase-4-fs8.png" +done diff --git a/doc/README.nations b/doc/README.nations index 997584acab..c47ddc0975 100644 --- a/doc/README.nations +++ b/doc/README.nations @@ -165,6 +165,11 @@ data/flags/-shield.png will need to install Inkscape, ImageMagick, and (optionally) pngquant. Once these are installed change to the data/flags directory and run ./convert_png .svg. + There is two versions of the conversion script. ./convert_png is a + new version that is compatible with modern versions of inkscape. + The old version ./convert_png_legacy is the version that has + been used to make any flag conversions before April 2021; at the time + of writing all png-files in data/flags are still ones created with it. data/misc/flags.spec -- 2.30.2