summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Richardson <wfrichar@chromium.org>2011-10-25 12:33:23 -0700
committerBill Richardson <wfrichar@chromium.org>2011-11-02 08:48:35 -0700
commita6d6702c6ef574b35986c8c7375c4ca1a34d742f (patch)
tree32db6ab82f02065975d62e5c48b2f83804411edb
parent82054d957731871a3e40d2aad4522046eff7f849 (diff)
downloadvboot-a6d6702c6ef574b35986c8c7375c4ca1a34d742f.tar.gz
Despeckle background images, improve x86 generation.
BUG=chrome-os-partner:6595 TEST=manual User our new officially finally final localizations for Stumpy. Start by removing some of the subtle speckles from the background images so they'll compress a little better, then modify the Makefile to autogenerate the bitmap blob (for x86, anyway). Note: the size improvment isn't much, but every little bit helps. With all 43 locales, bmpblock.bin was 659798 bytes. Now it's 665142 (5344 bytes saved). And, no, we can't fit all 43 locales in our current BIOS. Yet. Change-Id: I78cf8215f3da41a7ebc0e354cd1964c427a8c651 Reviewed-on: https://gerrit.chromium.org/gerrit/10879 Tested-by: Bill Richardson <wfrichar@chromium.org> Reviewed-by: Hung-Te Lin <hungte@chromium.org>
-rw-r--r--scripts/newbitmaps/images/Devmode.bmpbin39852 -> 39100 bytes
-rw-r--r--scripts/newbitmaps/images/Insert.bmpbin34796 -> 33734 bytes
-rw-r--r--scripts/newbitmaps/images/Makefile31
-rw-r--r--scripts/newbitmaps/images/Remove.bmpbin36208 -> 35842 bytes
-rw-r--r--scripts/newbitmaps/images/Yuck.bmpbin33290 -> 32820 bytes
5 files changed, 19 insertions, 12 deletions
diff --git a/scripts/newbitmaps/images/Devmode.bmp b/scripts/newbitmaps/images/Devmode.bmp
index 749322a5..b8d5ee29 100644
--- a/scripts/newbitmaps/images/Devmode.bmp
+++ b/scripts/newbitmaps/images/Devmode.bmp
Binary files differ
diff --git a/scripts/newbitmaps/images/Insert.bmp b/scripts/newbitmaps/images/Insert.bmp
index b039d95a..11c0dae7 100644
--- a/scripts/newbitmaps/images/Insert.bmp
+++ b/scripts/newbitmaps/images/Insert.bmp
Binary files differ
diff --git a/scripts/newbitmaps/images/Makefile b/scripts/newbitmaps/images/Makefile
index 2c8571af..3bfc8afd 100644
--- a/scripts/newbitmaps/images/Makefile
+++ b/scripts/newbitmaps/images/Makefile
@@ -12,8 +12,9 @@
TARGETS=x86 arm
-DEFAULT_LOCALES=en fr es it de nl
-
+DEFAULT_LOCALES=en es_419 pt_BR en_GB fr es pt_PT ca it de \
+ el nl da no sv fi et lv lt ru pl cs sk hu sl sr hr bg ro \
+ uk tr iw ar fa hi th vi id fil zh_CN zh_TW ko ja
BASE_IMAGES=Devmode.bmp Insert.bmp Remove.bmp Yuck.bmp
OTHER_IMAGES=Url.bmp hwid_unknown.bmp
@@ -38,10 +39,12 @@ ${TARGETS}:: outside_chroot
# the entire screen. With previous devices the physical screen size was either
# 1280x800 (16:10) or 1366x768 (16:9). There's not a lot of difference between
# those, so let's just assume 16:9 for future platforms to make things simpler.
-_x86_max="800x600!"
-_x86_scale="59%x78%"
-_arm_max="800x600!"
-_arm_scale="59%x78%"
+_x86_max=800x600!
+_x86_scale=59%x78%
+_x86_opts=-colors 256 -compress none -alpha off
+_arm_max=800x600!
+_arm_scale=59%x78%
+
x86::
# create output directories
@@ -53,18 +56,22 @@ x86::
cp "${FONTS}" "out_$@"
# scale the background pictures exactly...
@for i in ${BASE_IMAGES}; do \
- echo " out_$@/$$i"; \
- convert $$i -scale "${_x86_max}" "out_$@/$$i"; \
+ echo " out_$@/$$i" && \
+ convert $$i -scale '${_x86_max}' ${_x86_opts} \
+ "BMP3:out_$@/$$i" || \
+ exit 1; \
done
# scale the localized string images using percentages...
@for i in ${OTHER_IMAGES} localized_images/*/*.bmp; do \
- echo " out_$@/$$i"; \
- convert $$i -scale "${_x86_scale}" "out_$@/$$i"; \
+ echo " out_$@/$$i" && \
+ convert $$i -scale '${_x86_scale}' ${_x86_opts} \
+ "BMP3:out_$@/$$i" || \
+ exit 1; \
done
# produce the new yaml
cd "out_$@" && ../make_default_yaml ${DEFAULT_LOCALES}
- # Note: manually use bmpblk_utility to create the binary from out_$@
-
+ cd "out_$@" && bmpblk_utility -c DEFAULT.yaml bmpblock.bin
+ ls -l "out_$@"/bmpblock.bin
arm::
diff --git a/scripts/newbitmaps/images/Remove.bmp b/scripts/newbitmaps/images/Remove.bmp
index 482610b2..4e9d4bc7 100644
--- a/scripts/newbitmaps/images/Remove.bmp
+++ b/scripts/newbitmaps/images/Remove.bmp
Binary files differ
diff --git a/scripts/newbitmaps/images/Yuck.bmp b/scripts/newbitmaps/images/Yuck.bmp
index 3ee1032e..c260d3f7 100644
--- a/scripts/newbitmaps/images/Yuck.bmp
+++ b/scripts/newbitmaps/images/Yuck.bmp
Binary files differ