Skip to content

Commit

Permalink
Merge pull request #5489
Browse files Browse the repository at this point in the history
905711f contrib: improve optimize-pngs.py (Wladimir J. van der Laan)
42f6a0c [Qt] optimize PNG files (Jonas Schnelli)
  • Loading branch information
laanwj committed Jan 14, 2015
2 parents eec81cb + 905711f commit d1aa3c6
Show file tree
Hide file tree
Showing 82 changed files with 73 additions and 0 deletions.
73 changes: 73 additions & 0 deletions contrib/devtools/optimize-pngs.py
@@ -0,0 +1,73 @@
#!/usr/bin/env python

import os
import sys
import subprocess
import hashlib
from PIL import Image

def file_hash(filename):
'''Return hash of raw file contents'''
with open(filename, 'rb') as f:
return hashlib.sha256(f.read()).hexdigest()

def content_hash(filename):
'''Return hash of RGBA contents of image'''
i = Image.open(filename)
i = i.convert('RGBA')
data = i.tostring()
return hashlib.sha256(data).hexdigest()

#optimize png, remove various color profiles, remove ancillary chunks (alla) and text chunks (text)
#pngcrush -brute -ow -rem gAMA -rem cHRM -rem iCCP -rem sRGB -rem alla -rem text

pngcrush = 'pngcrush'
git = 'git'
folders = ["src/qt/res/movies", "src/qt/res/icons", "src/qt/res/images"]
basePath = subprocess.check_output([git, 'rev-parse', '--show-toplevel']).rstrip('\n')
totalSaveBytes = 0

outputArray = []
for folder in folders:
absFolder=os.path.join(basePath, folder)
for file in os.listdir(absFolder):
extension = os.path.splitext(file)[1]
if extension.lower() == '.png':
print("optimizing "+file+"..."),
file_path = os.path.join(absFolder, file)
fileMetaMap = {'file' : file, 'osize': os.path.getsize(file_path), 'sha256Old' : file_hash(file_path)};
fileMetaMap['contentHashPre'] = content_hash(file_path)

pngCrushOutput = ""
try:
pngCrushOutput = subprocess.check_output(
[pngcrush, "-brute", "-ow", "-rem", "gAMA", "-rem", "cHRM", "-rem", "iCCP", "-rem", "sRGB", "-rem", "alla", "-rem", "text", file_path],
stderr=subprocess.STDOUT).rstrip('\n')
except:
print "pngcrush is not installed, aborting..."
sys.exit(0)

#verify
if "Not a PNG file" in subprocess.check_output([pngcrush, "-n", "-v", file_path], stderr=subprocess.STDOUT):
print "PNG file "+file+" is corrupted after crushing, check out pngcursh version"
sys.exit(1)

fileMetaMap['sha256New'] = file_hash(file_path)
fileMetaMap['contentHashPost'] = content_hash(file_path)

if fileMetaMap['contentHashPre'] != fileMetaMap['contentHashPost']:
print "Image contents of PNG file "+file+" before and after crushing don't match"
sys.exit(1)

fileMetaMap['psize'] = os.path.getsize(file_path)
outputArray.append(fileMetaMap)
print("done\n"),

print "summary:\n+++++++++++++++++"
for fileDict in outputArray:
oldHash = fileDict['sha256Old']
newHash = fileDict['sha256New']
totalSaveBytes += fileDict['osize'] - fileDict['psize']
print fileDict['file']+"\n size diff from: "+str(fileDict['osize'])+" to: "+str(fileDict['psize'])+"\n old sha256: "+oldHash+"\n new sha256: "+newHash+"\n"

print "completed. Total reduction: "+str(totalSaveBytes)+" bytes"
Binary file modified src/qt/res/icons/about.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/about_qt.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/add.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/address-book.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/bitcoin.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/clock1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/clock2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/clock3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/clock4.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/clock5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/configure.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/connect0.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/connect1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/connect2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/connect3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/connect4.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/debugwindow.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/edit.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/editcopy.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/editpaste.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/export.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/eye.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/eye_minus.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/eye_plus.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/filesave.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/history.png
Binary file modified src/qt/res/icons/info.png
Binary file modified src/qt/res/icons/key.png
Binary file modified src/qt/res/icons/lock_closed.png
Binary file modified src/qt/res/icons/lock_open.png
Binary file modified src/qt/res/icons/open.png
Binary file modified src/qt/res/icons/overview.png
Binary file modified src/qt/res/icons/quit.png
Binary file modified src/qt/res/icons/receive.png
Binary file modified src/qt/res/icons/remove.png
Binary file modified src/qt/res/icons/send.png
Binary file modified src/qt/res/icons/synced.png
Binary file modified src/qt/res/icons/transaction0.png
Binary file modified src/qt/res/icons/transaction2.png
Binary file modified src/qt/res/icons/transaction_conflicted.png
Binary file modified src/qt/res/icons/tx_inout.png
Binary file modified src/qt/res/icons/tx_input.png
Binary file modified src/qt/res/icons/tx_mined.png
Binary file modified src/qt/res/icons/tx_output.png
Binary file modified src/qt/res/icons/verify.png
Binary file modified src/qt/res/movies/spinner-000.png
Binary file modified src/qt/res/movies/spinner-001.png
Binary file modified src/qt/res/movies/spinner-002.png
Binary file modified src/qt/res/movies/spinner-003.png
Binary file modified src/qt/res/movies/spinner-004.png
Binary file modified src/qt/res/movies/spinner-005.png
Binary file modified src/qt/res/movies/spinner-006.png
Binary file modified src/qt/res/movies/spinner-007.png
Binary file modified src/qt/res/movies/spinner-008.png
Binary file modified src/qt/res/movies/spinner-009.png
Binary file modified src/qt/res/movies/spinner-010.png
Binary file modified src/qt/res/movies/spinner-011.png
Binary file modified src/qt/res/movies/spinner-012.png
Binary file modified src/qt/res/movies/spinner-013.png
Binary file modified src/qt/res/movies/spinner-014.png
Binary file modified src/qt/res/movies/spinner-015.png
Binary file modified src/qt/res/movies/spinner-016.png
Binary file modified src/qt/res/movies/spinner-017.png
Binary file modified src/qt/res/movies/spinner-018.png
Binary file modified src/qt/res/movies/spinner-019.png
Binary file modified src/qt/res/movies/spinner-020.png
Binary file modified src/qt/res/movies/spinner-021.png
Binary file modified src/qt/res/movies/spinner-022.png
Binary file modified src/qt/res/movies/spinner-023.png
Binary file modified src/qt/res/movies/spinner-024.png
Binary file modified src/qt/res/movies/spinner-025.png
Binary file modified src/qt/res/movies/spinner-026.png
Binary file modified src/qt/res/movies/spinner-027.png
Binary file modified src/qt/res/movies/spinner-028.png
Binary file modified src/qt/res/movies/spinner-029.png
Binary file modified src/qt/res/movies/spinner-030.png
Binary file modified src/qt/res/movies/spinner-031.png
Binary file modified src/qt/res/movies/spinner-032.png
Binary file modified src/qt/res/movies/spinner-033.png
Binary file modified src/qt/res/movies/spinner-034.png
Binary file modified src/qt/res/movies/spinner-035.png

0 comments on commit d1aa3c6

Please sign in to comment.