From a4c0e786a1b9389471b05824cc31369491b2e47c Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 11 Oct 2010 21:03:50 -0400 Subject: [PATCH] tabs -> 4 spaces --- optimizeimages.py | 18 +++++++++--------- quadtree.py | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/optimizeimages.py b/optimizeimages.py index 8e34a91..120b60b 100644 --- a/optimizeimages.py +++ b/optimizeimages.py @@ -19,18 +19,18 @@ import shlex def optimize_image(imgpath, imgformat, optimizeimg): if imgformat == 'png': - if optimizeimg == "1" or optimizeimg == "2": + if optimizeimg == "1" or optimizeimg == "2": # we can't do an atomic replace here because windows is terrible # so instead, we make temp files, delete the old ones, and rename # the temp files. go windows! - subprocess.Popen(shlex.split("pngcrush " + imgpath + " " + imgpath + ".tmp"), - stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0] - os.remove(imgpath) + subprocess.Popen(shlex.split("pngcrush " + imgpath + " " + imgpath + ".tmp"), + stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0] + os.remove(imgpath) os.rename(imgpath+".tmp", imgpath) - if optimizeimg == "2": - subprocess.Popen(shlex.split("optipng " + imgpath), stderr=subprocess.STDOUT, - stdout=subprocess.PIPE).communicate()[0] - subprocess.Popen(shlex.split("advdef -z4 " + imgpath), stderr=subprocess.STDOUT, - stdout=subprocess.PIPE).communicate()[0] + if optimizeimg == "2": + subprocess.Popen(shlex.split("optipng " + imgpath), stderr=subprocess.STDOUT, + stdout=subprocess.PIPE).communicate()[0] + subprocess.Popen(shlex.split("advdef -z4 " + imgpath), stderr=subprocess.STDOUT, + stdout=subprocess.PIPE).communicate()[0] diff --git a/quadtree.py b/quadtree.py index d97f3cb..8bd84ee 100644 --- a/quadtree.py +++ b/quadtree.py @@ -27,6 +27,7 @@ import logging import util from PIL import Image + from optimizeimages import optimize_image @@ -603,7 +604,7 @@ def render_worldtile(chunks, colstart, colend, rowstart, rowend, path, imgformat tileimg.save(imgpath) if optimizeimg: - optimize_image(imgpath, imgformat, optimizeimg) + optimize_image(imgpath, imgformat, optimizeimg) with open(hashpath, "wb") as hashout: hashout.write(digest)