diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-06-16 15:03:36 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-06-16 15:03:36 +0000 |
| commit | 289d18eabc7f3ce20dfe6891f3ddf32e4a17aeca (patch) | |
| tree | c05aa6e7893b33c005f0c3c8f1711d7f6e159cbf /navit/xpm | |
| parent | b1bb8118a18540a1fa50e6d69a6151422c97c752 (diff) | |
| download | navit-289d18eabc7f3ce20dfe6891f3ddf32e4a17aeca.tar.gz | |
Fix:Core:Fixed some compile bugs
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@1126 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/xpm')
| -rw-r--r-- | navit/xpm/Makefile.am | 2 | ||||
| -rwxr-xr-x | navit/xpm/svg2png (renamed from navit/xpm/png2svg) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/navit/xpm/Makefile.am b/navit/xpm/Makefile.am index 88680f3c1..946a07557 100644 --- a/navit/xpm/Makefile.am +++ b/navit/xpm/Makefile.am @@ -10,7 +10,7 @@ endif if USE_SVG2PNG %.png:*.svg - $(srcdir)/png2svg "$@" + $(srcdir)/svg2png "$@" xpm_DATA += $(addsuffix .png,$(basename $(svgs))) if USE_SVG2PNG_SCALES xpm_DATA += $(foreach scale, @SVG2PNG_SCALES@, $(addsuffix _$(scale)_$(scale).png,$(basename $(svgs)))) diff --git a/navit/xpm/png2svg b/navit/xpm/svg2png index 63ff1eb56..4f5b08e76 100755 --- a/navit/xpm/png2svg +++ b/navit/xpm/svg2png @@ -8,8 +8,8 @@ then h=${h%.png} w=${w##*_} else - w=$(grep 'width=".*px"' gui_actions.svg | head -1 | sed -e 's/px".*//' -e 's/.*"//') - h=$(grep 'height=".*px"' gui_actions.svg | head -1 | sed -e 's/px".*//' -e 's/.*"//') + w=$(grep 'width=".*px"' gui_actions.svg | head -n 1 | sed -e 's/px".*//' -e 's/.*"//') + h=$(grep 'height=".*px"' gui_actions.svg | head -n 1 | sed -e 's/px".*//' -e 's/.*"//') svg=${png%.png} fi ksvgtopng $w $h $svg.svg $png |