summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2012-08-14 11:12:35 -0700
committerDuncan Laurie <dlaurie@chromium.org>2012-08-14 11:13:06 -0700
commitd4c5d5654665c564cd2c7a6d8988f9813de8a5ab (patch)
tree63acd837d30c41971da273a156cef9c3c0214603
parent9cb84ef3c9a2bfd8edf7de4a58f1e66d8270f147 (diff)
downloadvboot-d4c5d5654665c564cd2c7a6d8988f9813de8a5ab.tar.gz
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. Old-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> (cherry picked from commit 9a6e6e7785988dc9a0434d5b734d282460a9ce6b) Change-Id: Ic805a73cb4c53b4ff53ab12df59a7749e88f5d58 Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/30254
-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 6f61983c..375bd2cc 100755
--- a/scripts/newbitmaps/images/build_images
+++ b/scripts/newbitmaps/images/build_images
@@ -93,7 +93,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