1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
--- configure.ac
+++ configure.ac
@@ -69,7 +69,7 @@ if test "x$enable_framing" = "xyes"; then
fi
fi
-# Check for rsvg or ksvgtopng for creating large scale bitmaps from svg
+# Check for imagemagick for creating large scale bitmaps from svg
AC_ARG_ENABLE(png-creation,
AC_HELP_STRING([--enable-png-creation],
[enable creating png images from svg [default=disabled]]),
@@ -79,17 +79,13 @@ AC_ARG_ENABLE(png-creation,
SVGCONVERT=""
AC_MSG_CHECKING([SVG to PNG conversion method])
if test "x$enable_large_bitmaps" = "xyes"; then
- PKG_CHECK_EXISTS([librsvg-2.0 >= 2.12.3],
+ PKG_CHECK_EXISTS([imagemagick],
[enable_large_bitmaps=yes], [enable_large_bitmaps=no])
- if test "x$enable_large_bitmaps" = "xyes"; then
- svgconvert_prog="rsvg"
- else
- svgconvert_prog="ksvgtopng"
- fi
+ svgconvert_prog="magick"
AC_MSG_RESULT([$svgconvert_prog])
AC_PATH_PROG(SVGCONVERT, $svgconvert_prog)
if test -z "$SVGCONVERT"; then
- AC_MSG_ERROR([You need librsvg >= 2.12.3 or ksvgtopng installed to create large scale bitmaps])
+ AC_MSG_ERROR([You need imagemagick installed to create large scale bitmaps])
else
enable_large_bitmaps=yes
fi
--- svg2png.sh.in
+++ svg2png.sh.in
@@ -9,11 +9,7 @@ fi
ICONFILE=`basename ${3}`
ICONNAME=`echo ${ICONFILE} | sed -e "s/.svg//"`
-if test `basename $SVGCONVERT` = "rsvg"; then
- OPTIONS="-w ${1} -h ${1}"
-else
- OPTIONS="${1} ${1}"
-fi
+OPTIONS="-background none -density "%[fx:96*${1}/48]""
echo "${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png"
${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png
|