Fix:build/cmake:Fix converting some SVGs to PNG with ksvgtopng

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4739 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/xpm/CMakeLists.txt b/navit/navit/xpm/CMakeLists.txt
index 000c317..d30ad29 100644 (file)
--- a/navit/navit/xpm/CMakeLists.txt
+++ b/navit/navit/xpm/CMakeLists.txt
@@ -19,8 +19,8 @@ macro(convert_to_png IMAGE_INPUT IMAGE_OUTPUT SCALE)
    elseif(${IMAGE_CONVERTER_${FILE_TYPE}} MATCHES "ksvgtopng")
       set (NEW_SCALE ${SCALE})
       if (${SCALE} EQUAL 0)
-         file(STRINGS  ${IMAGE_INPUT} NEW_SCALE_LINE REGEX "width=\"[0-9pxt.]*\"")
-         string(REGEX REPLACE ".*width=\"([0-9]*).*\"" "\\1" NEW_SCALE ${NEW_SCALE_LINE})
+         file(STRINGS  ${IMAGE_INPUT} NEW_SCALE_LINE REGEX "[^-]width=\"[0-9pxt.]*\"")
+         string(REGEX REPLACE ".*width=\"([0-9]*).*" "\\1" NEW_SCALE ${NEW_SCALE_LINE})
        endif()
       set(COMMAND_ARGS ${NEW_SCALE} ${NEW_SCALE}  ${IMAGE_INPUT} --output ${IMAGE_OUTPUT})
    else()