[Navit-cvs-commit] SF.net SVN: navit:[4739] trunk/navit/navit/xpm/CMakeLists.txt

[<ri...@us...>]

Revision: 4739
          http://navit.svn.sourceforge.net/navit/?rev=4739&view=rev
Author:   rikky
Date:     2011-08-31 21:44:08 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
Fix:build/cmake:Fix converting some SVGs to PNG with ksvgtopng

Modified Paths:
--------------
    trunk/navit/navit/xpm/CMakeLists.txt

Modified: trunk/navit/navit/xpm/CMakeLists.txt
===================================================================
--- trunk/navit/navit/xpm/CMakeLists.txt	2011-08-31 21:43:46 UTC (rev 4738)
+++ trunk/navit/navit/xpm/CMakeLists.txt	2011-08-31 21:44:08 UTC (rev 4739)
@@ -19,8 +19,8 @@
    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()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.