Modern versions of ImageMagick properly respects the SVG default

DPI of 90, which causes unwanted scaling under ImageMagick's default
72. Force a 72 DPI to get pixel perfect matching.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5044 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt
index 0e70ab622afc3c0c9ecaac9a30aa67e1e9f3108f..2e4833a59a76abf460b0fade71f2311c377447fc 100644 (file)
--- a/media/CMakeLists.txt
+++ b/media/CMakeLists.txt
@@ -29,28 +29,32 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_16.png
   COMMENT "Generating icons/tigervnc_16.png")
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_22.png
-  COMMAND ${CONVERT_EXECUTABLE} -size 22x22 xc:none -gravity center -background transparent
+  COMMAND ${CONVERT_EXECUTABLE} -density 72
+    -size 22x22 xc:none -gravity center -background transparent
     ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg -composite
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_22.png
   DEPENDS icons ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg
   COMMENT "Generating icons/tigervnc_22.png")
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_24.png
-  COMMAND ${CONVERT_EXECUTABLE} -size 24x24 xc:none -gravity center -background transparent
+  COMMAND ${CONVERT_EXECUTABLE} -density 72
+    -size 24x24 xc:none -gravity center -background transparent
     ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg -composite
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_24.png
   DEPENDS icons ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_20.svg
   COMMENT "Generating icons/tigervnc_24.png")
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_32.png
-  COMMAND ${CONVERT_EXECUTABLE} -size 32x32 xc:none -gravity center -background transparent
+  COMMAND ${CONVERT_EXECUTABLE} -density 72
+    -size 32x32 xc:none -gravity center -background transparent
     ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_28.svg -composite
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_32.png
   DEPENDS icons ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_28.svg
   COMMENT "Generating icons/tigervnc_32.png")
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_48.png
-  COMMAND ${CONVERT_EXECUTABLE} -size 48x48 xc:none -gravity center -background transparent
+  COMMAND ${CONVERT_EXECUTABLE} -density 72
+    -size 48x48 xc:none -gravity center -background transparent
     ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_42.svg -composite
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_48.png
   DEPENDS icons ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_42.svg