summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Parker <dparker@chromium.org>2012-08-13 18:50:21 -0700
committerDave Parker <dparker@chromium.org>2012-08-16 19:01:47 -0700
commit23c178e67146a6148be22665545b554d41dc9989 (patch)
treec84afa66a4dced7792d237dc4c333f16eb1ad39b
parent3097b046bcf8e4a3796657a463229fdbddcf9ca1 (diff)
downloadvboot-23c178e67146a6148be22665545b554d41dc9989.tar.gz
Cherry-Pick: Scale bmp files correctly for x86 when generating bmpblocks.
BUG=None TEST=Run 'make' in newbitmaps directory but remove the "clean" step in the Makefile. Use the bmp_viewer utility to verify all graphic elements are scaled. Change-Id: Iee79ce15e32e7e7771569a1b9ca81851df5303aa Original-Change-Id: Ifd62c2ba3a6c354c4de7d9fd052d76de36842fb6 Reviewed-on: https://gerrit.chromium.org/gerrit/30126 Reviewed-by: Hung-Te Lin <hungte@chromium.org> Commit-Ready: Dave Parker <dparker@chromium.org> Tested-by: Dave Parker <dparker@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/30625
-rwxr-xr-xscripts/newbitmaps/images/build_images2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/newbitmaps/images/build_images b/scripts/newbitmaps/images/build_images
index 9245d0f0..7cf256b1 100755
--- a/scripts/newbitmaps/images/build_images
+++ b/scripts/newbitmaps/images/build_images
@@ -73,7 +73,7 @@ main() {
if [ "$X" = "$BACKGROUND_IMAGE" ]; then
convert_to_bmp3 "$X" "$output" "$background_scale_param"
else
- convert_to_bmp3 "$X" "$output" "$convert_param"
+ convert_to_bmp3 "$X" "$output" "$scale_param"
fi
done