From 880e38059939f3259b42f4ed3cd9c6142d73437f Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Thu, 24 Jan 2019 15:32:19 +0000 Subject: CPack: Replace corrupted background png with original The `Modules/CPack.background.png.in` file was originally added by commit f2c0dbd164 (ENH: More work on the packaging. Add Applicaitons, add icons, etc, 2007-02-13, v2.6.0~2217). Then it was removed accidentally by commit 5308afa3f7 (ENH: remove unused file, 2009-03-03, v2.8.0~963) and restored by commit f9dd6a38c5 (ENH: add file back bug use cmake image, 2009-03-04, v2.8.0~958) but with corruption. Restore the original image file and add a Git attribute to prevent newline conversion as we do for other `.png` files. --- .gitattributes | 1 + Modules/CPack.background.png.in | Bin 47076 -> 50482 bytes 2 files changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index d6fd5d6..24fd9c2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,6 +21,7 @@ configure eol=lf *.pfx -text *.png -text +*.png.in -text *.c our-c-style *.cc our-c-style diff --git a/Modules/CPack.background.png.in b/Modules/CPack.background.png.in index 9339e7c..3fa92b5 100644 Binary files a/Modules/CPack.background.png.in and b/Modules/CPack.background.png.in differ -- cgit v0.12 From b9e6d04558bdafab67aa392052d7136cdc4a7be2 Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Thu, 24 Jan 2019 15:32:19 +0000 Subject: Reduce size of PNG images Use FileOptimizer 13.50.2431 (x86) and ZopfliPNG 1.0.2. Update expected file hashes in tests. --- Modules/CPack.background.png.in | Bin 50482 -> 44108 bytes Source/QtDialog/CMakeSetup128.png | Bin 10944 -> 7981 bytes Source/QtDialog/CMakeSetup32.png | Bin 2097 -> 1632 bytes Source/QtDialog/CMakeSetup64.png | Bin 4676 -> 3566 bytes Source/QtDialog/Delete16.png | Bin 731 -> 538 bytes Source/QtDialog/Plus16.png | Bin 358 -> 207 bytes Templates/Windows/ApplicationIcon.png | Bin 3392 -> 2335 bytes Templates/Windows/Logo.png | Bin 801 -> 488 bytes Templates/Windows/SmallLogo.png | Bin 329 -> 167 bytes Templates/Windows/SmallLogo44x44.png | Bin 554 -> 265 bytes Templates/Windows/SplashScreen.png | Bin 2146 -> 909 bytes Templates/Windows/StoreLogo.png | Bin 429 -> 227 bytes Tests/CMakeTests/FileDownloadInput.png | Bin 358 -> 194 bytes Tests/CMakeTests/FileDownloadTest.cmake.in | 16 ++++++++-------- Tests/CMakeTests/FileUploadTest.cmake.in | 4 ++-- .../Direct3DApp1/Assets/ApplicationIcon.png | Bin 3392 -> 2335 bytes Tests/VSWinStorePhone/Direct3DApp1/Assets/Logo.png | Bin 801 -> 488 bytes .../Direct3DApp1/Assets/SmallLogo.png | Bin 329 -> 167 bytes .../Direct3DApp1/Assets/SmallLogo44x44.png | Bin 554 -> 265 bytes .../Direct3DApp1/Assets/SplashScreen.png | Bin 2146 -> 909 bytes .../Direct3DApp1/Assets/StoreLogo.png | Bin 429 -> 227 bytes .../Assets/Tiles/FlipCycleTileLarge.png | Bin 9930 -> 2953 bytes .../Assets/Tiles/FlipCycleTileMedium.png | Bin 9070 -> 2767 bytes .../Assets/Tiles/FlipCycleTileSmall.png | Bin 3674 -> 1397 bytes .../Assets/Tiles/IconicTileMediumLarge.png | Bin 4937 -> 893 bytes .../Direct3DApp1/Assets/Tiles/IconicTileSmall.png | Bin 3724 -> 516 bytes Tests/VSXaml/Assets/Logo.scale-100.png | Bin 801 -> 488 bytes Tests/VSXaml/Assets/SmallLogo.scale-100.png | Bin 329 -> 167 bytes Tests/VSXaml/Assets/SplashScreen.scale-100.png | Bin 2146 -> 909 bytes Tests/VSXaml/Assets/StoreLogo.scale-100.png | Bin 429 -> 227 bytes Utilities/Sphinx/static/cmake-logo-16.png | Bin 893 -> 692 bytes 31 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Modules/CPack.background.png.in b/Modules/CPack.background.png.in index 3fa92b5..a32ab37 100644 Binary files a/Modules/CPack.background.png.in and b/Modules/CPack.background.png.in differ diff --git a/Source/QtDialog/CMakeSetup128.png b/Source/QtDialog/CMakeSetup128.png index 728ef02..32984e1 100644 Binary files a/Source/QtDialog/CMakeSetup128.png and b/Source/QtDialog/CMakeSetup128.png differ diff --git a/Source/QtDialog/CMakeSetup32.png b/Source/QtDialog/CMakeSetup32.png index 1c36b31..78df82f 100644 Binary files a/Source/QtDialog/CMakeSetup32.png and b/Source/QtDialog/CMakeSetup32.png differ diff --git a/Source/QtDialog/CMakeSetup64.png b/Source/QtDialog/CMakeSetup64.png index 44eb171..5c2dbf5 100644 Binary files a/Source/QtDialog/CMakeSetup64.png and b/Source/QtDialog/CMakeSetup64.png differ diff --git a/Source/QtDialog/Delete16.png b/Source/QtDialog/Delete16.png index 16989fee..9d2f2b7 100644 Binary files a/Source/QtDialog/Delete16.png and b/Source/QtDialog/Delete16.png differ diff --git a/Source/QtDialog/Plus16.png b/Source/QtDialog/Plus16.png index 552f6f0..1c33bc7 100644 Binary files a/Source/QtDialog/Plus16.png and b/Source/QtDialog/Plus16.png differ diff --git a/Templates/Windows/ApplicationIcon.png b/Templates/Windows/ApplicationIcon.png index 7d95d4e..c715e1b 100644 Binary files a/Templates/Windows/ApplicationIcon.png and b/Templates/Windows/ApplicationIcon.png differ diff --git a/Templates/Windows/Logo.png b/Templates/Windows/Logo.png index e26771c..65f91ac 100644 Binary files a/Templates/Windows/Logo.png and b/Templates/Windows/Logo.png differ diff --git a/Templates/Windows/SmallLogo.png b/Templates/Windows/SmallLogo.png index 1eb0d9d..460c022 100644 Binary files a/Templates/Windows/SmallLogo.png and b/Templates/Windows/SmallLogo.png differ diff --git a/Templates/Windows/SmallLogo44x44.png b/Templates/Windows/SmallLogo44x44.png index 28810b7..c237458 100644 Binary files a/Templates/Windows/SmallLogo44x44.png and b/Templates/Windows/SmallLogo44x44.png differ diff --git a/Templates/Windows/SplashScreen.png b/Templates/Windows/SplashScreen.png index c951e03..8342565 100644 Binary files a/Templates/Windows/SplashScreen.png and b/Templates/Windows/SplashScreen.png differ diff --git a/Templates/Windows/StoreLogo.png b/Templates/Windows/StoreLogo.png index dcb6727..508c8a8 100644 Binary files a/Templates/Windows/StoreLogo.png and b/Templates/Windows/StoreLogo.png differ diff --git a/Tests/CMakeTests/FileDownloadInput.png b/Tests/CMakeTests/FileDownloadInput.png index 7bbcee4..9ab565a 100644 Binary files a/Tests/CMakeTests/FileDownloadInput.png and b/Tests/CMakeTests/FileDownloadInput.png differ diff --git a/Tests/CMakeTests/FileDownloadTest.cmake.in b/Tests/CMakeTests/FileDownloadTest.cmake.in index f6d9ad9..3935449 100644 --- a/Tests/CMakeTests/FileDownloadTest.cmake.in +++ b/Tests/CMakeTests/FileDownloadTest.cmake.in @@ -32,7 +32,7 @@ file(DOWNLOAD ${url} ${dir}/file3.png TIMEOUT 2 - EXPECTED_MD5 d16778650db435bda3a8c3435c3ff5d1 + EXPECTED_MD5 dbd330d52f4dbd60115d4191904ded92 ) message(STATUS "FileDownload:4") @@ -41,7 +41,7 @@ file(DOWNLOAD ${dir}/file3.png TIMEOUT 2 STATUS status - EXPECTED_HASH SHA1=50c614fc28b39c1281d0517bb6d5858b4359c9b7 + EXPECTED_HASH SHA1=67eee17f79d9ac557284fc0b8ad19f25723fb578 ) message(STATUS "FileDownload:5") @@ -50,7 +50,7 @@ file(DOWNLOAD ${dir}/file3.png TIMEOUT 2 STATUS status - EXPECTED_HASH SHA224=73cd5f442b04e8320e4f907f8e1b21d4befff98b5bd77bc32526ea68 + EXPECTED_HASH SHA224=ba283726bbb602776818b463943189afd91836cb7ee5dd6e2c7b5ae4 ) message(STATUS "FileDownload:6") @@ -59,7 +59,7 @@ file(DOWNLOAD ${dir}/file3.png TIMEOUT 2 STATUS status - EXPECTED_HASH SHA256=2e067f6c09cbc7cd619c8fbcc44eb64cd6b45a95e4cddb3a585eee1f731c4da9 + EXPECTED_HASH SHA256=cf3334b1275071e1da6e8c396ccb72cf1b2388d8c937526f3af26230affb9423 ) message(STATUS "FileDownload:7") @@ -68,7 +68,7 @@ file(DOWNLOAD ${dir}/file3.png TIMEOUT 2 STATUS status - EXPECTED_HASH SHA384=398bf41902a7251c30e522b307e3e41e3fb617c765b3feaa99b2f7d063894708ad399267ccc25d877437a10e5e890d35 + EXPECTED_HASH SHA384=43a5d13978d97c660db44481aee0604cb4ff6ca0775cd5c2cd68cd8000e107e507c4caf6c228941231041e282ffb8950 ) message(STATUS "FileDownload:8") @@ -77,7 +77,7 @@ file(DOWNLOAD ${dir}/file3.png TIMEOUT 2 STATUS status - EXPECTED_HASH SHA512=c51854d21052713968b849c2b4263cf54be03bc3a7e9847a6c71c6c8d1d13cd805fe1b9fa95f9ba1d0a5631513974f6fae21e34ab5b171d94bad48df5f073e48 + EXPECTED_HASH SHA512=6984e0909a1018030ccaa418e3be1654223cdccff0fe6adc745f9aea7e377f178be53b9fc7d54a6f81c2b62ef9ddcd38ba1978fedf4c5e7139baaf355eefad5b ) message(STATUS "FileDownload:9") file(DOWNLOAD @@ -85,7 +85,7 @@ file(DOWNLOAD ${dir}/file3.png TIMEOUT 2 STATUS status - EXPECTED_HASH MD5=d16778650db435bda3a8c3435c3ff5d1 + EXPECTED_HASH MD5=dbd330d52f4dbd60115d4191904ded92 ) message(STATUS "FileDownload:10") @@ -94,7 +94,7 @@ file(DOWNLOAD ${dir}/file3.png TIMEOUT 2 STATUS status - EXPECTED_MD5 d16778650db435bda3a8c3435c3ff5d1 + EXPECTED_MD5 dbd330d52f4dbd60115d4191904ded92 ) message(STATUS "${status}") diff --git a/Tests/CMakeTests/FileUploadTest.cmake.in b/Tests/CMakeTests/FileUploadTest.cmake.in index 9e22909..0e6f080 100644 --- a/Tests/CMakeTests/FileUploadTest.cmake.in +++ b/Tests/CMakeTests/FileUploadTest.cmake.in @@ -35,7 +35,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E md5sum "@CMAKE_CURRENT_BINARY_DIR@/uploads/file1.png" OUTPUT_VARIABLE sum1 OUTPUT_STRIP_TRAILING_WHITESPACE) -if(NOT sum1 MATCHES "^d16778650db435bda3a8c3435c3ff5d1 .*/uploads/file1.png$") +if(NOT sum1 MATCHES "^dbd330d52f4dbd60115d4191904ded92 .*/uploads/file1.png$") message(FATAL_ERROR "file1.png did not upload correctly (sum1='${sum1}')") endif() @@ -43,7 +43,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E md5sum "@CMAKE_CURRENT_BINARY_DIR@/uploads/file2.png" OUTPUT_VARIABLE sum2 OUTPUT_STRIP_TRAILING_WHITESPACE) -if(NOT sum2 MATCHES "^d16778650db435bda3a8c3435c3ff5d1 .*/uploads/file2.png$") +if(NOT sum2 MATCHES "^dbd330d52f4dbd60115d4191904ded92 .*/uploads/file2.png$") message(FATAL_ERROR "file2.png did not upload correctly (sum2='${sum2}')") endif() diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/ApplicationIcon.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/ApplicationIcon.png index 7d95d4e..c715e1b 100644 Binary files a/Tests/VSWinStorePhone/Direct3DApp1/Assets/ApplicationIcon.png and b/Tests/VSWinStorePhone/Direct3DApp1/Assets/ApplicationIcon.png differ diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/Logo.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/Logo.png index e26771c..65f91ac 100644 Binary files a/Tests/VSWinStorePhone/Direct3DApp1/Assets/Logo.png and b/Tests/VSWinStorePhone/Direct3DApp1/Assets/Logo.png differ diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo.png index 1eb0d9d..460c022 100644 Binary files a/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo.png and b/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo.png differ diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png index 28810b7..c237458 100644 Binary files a/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png and b/Tests/VSWinStorePhone/Direct3DApp1/Assets/SmallLogo44x44.png differ diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/SplashScreen.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/SplashScreen.png index c951e03..8342565 100644 Binary files a/Tests/VSWinStorePhone/Direct3DApp1/Assets/SplashScreen.png and b/Tests/VSWinStorePhone/Direct3DApp1/Assets/SplashScreen.png differ diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/StoreLogo.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/StoreLogo.png index dcb6727..508c8a8 100644 Binary files a/Tests/VSWinStorePhone/Direct3DApp1/Assets/StoreLogo.png and b/Tests/VSWinStorePhone/Direct3DApp1/Assets/StoreLogo.png differ diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileLarge.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileLarge.png index e0c59ac..fcdbaf4 100644 Binary files a/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileLarge.png and b/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileLarge.png differ diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileMedium.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileMedium.png index e93b89d..06425c4 100644 Binary files a/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileMedium.png and b/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileMedium.png differ diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileSmall.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileSmall.png index 550b1b5..4cef0eb 100644 Binary files a/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileSmall.png and b/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/FlipCycleTileSmall.png differ diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/IconicTileMediumLarge.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/IconicTileMediumLarge.png index 686e6b5..253503f 100644 Binary files a/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/IconicTileMediumLarge.png and b/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/IconicTileMediumLarge.png differ diff --git a/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/IconicTileSmall.png b/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/IconicTileSmall.png index d4b5ede..2ef050f 100644 Binary files a/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/IconicTileSmall.png and b/Tests/VSWinStorePhone/Direct3DApp1/Assets/Tiles/IconicTileSmall.png differ diff --git a/Tests/VSXaml/Assets/Logo.scale-100.png b/Tests/VSXaml/Assets/Logo.scale-100.png index e26771c..65f91ac 100644 Binary files a/Tests/VSXaml/Assets/Logo.scale-100.png and b/Tests/VSXaml/Assets/Logo.scale-100.png differ diff --git a/Tests/VSXaml/Assets/SmallLogo.scale-100.png b/Tests/VSXaml/Assets/SmallLogo.scale-100.png index 1eb0d9d..460c022 100644 Binary files a/Tests/VSXaml/Assets/SmallLogo.scale-100.png and b/Tests/VSXaml/Assets/SmallLogo.scale-100.png differ diff --git a/Tests/VSXaml/Assets/SplashScreen.scale-100.png b/Tests/VSXaml/Assets/SplashScreen.scale-100.png index c951e03..8342565 100644 Binary files a/Tests/VSXaml/Assets/SplashScreen.scale-100.png and b/Tests/VSXaml/Assets/SplashScreen.scale-100.png differ diff --git a/Tests/VSXaml/Assets/StoreLogo.scale-100.png b/Tests/VSXaml/Assets/StoreLogo.scale-100.png index dcb6727..508c8a8 100644 Binary files a/Tests/VSXaml/Assets/StoreLogo.scale-100.png and b/Tests/VSXaml/Assets/StoreLogo.scale-100.png differ diff --git a/Utilities/Sphinx/static/cmake-logo-16.png b/Utilities/Sphinx/static/cmake-logo-16.png index 9c95b75..db9458d 100644 Binary files a/Utilities/Sphinx/static/cmake-logo-16.png and b/Utilities/Sphinx/static/cmake-logo-16.png differ -- cgit v0.12