From 25123570c76f2055d3ae05d79741038c0e23c536 Mon Sep 17 00:00:00 2001 From: Karl Kurbjun Date: Fri, 4 Sep 2009 00:46:24 +0000 Subject: Fix STRIDE macro for multiscreen and add stride support for picture lib. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22615 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/clock/clock_bitmaps.c | 55 +++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 25 deletions(-) (limited to 'apps/plugins/clock') diff --git a/apps/plugins/clock/clock_bitmaps.c b/apps/plugins/clock/clock_bitmaps.c index 4ab6bf4f9a..50c31806bc 100644 --- a/apps/plugins/clock/clock_bitmaps.c +++ b/apps/plugins/clock/clock_bitmaps.c @@ -46,62 +46,67 @@ const struct picture logos[]={ - {clock_logo, BMPWIDTH_clock_logo, BMPHEIGHT_clock_logo}, + {clock_logo, BMPWIDTH_clock_logo, BMPHEIGHT_clock_logo, + BMPHEIGHT_clock_logo}, #if NB_SCREENS==2 - {clock_logo_remote,BMPWIDTH_clock_logo_remote,BMPHEIGHT_clock_logo_remote} + {clock_logo_remote,BMPWIDTH_clock_logo_remote, + BMPHEIGHT_clock_logo_remote, BMPHEIGHT_clock_logo_remote} #endif }; const struct picture messages[]={ - {clock_messages,BMPWIDTH_clock_messages, - BMPHEIGHT_clock_messages/6}, + {clock_messages,BMPWIDTH_clock_messages, BMPHEIGHT_clock_messages, + BMPHEIGHT_clock_messages/6}, #if NB_SCREENS==2 - {clock_messages_remote,BMPWIDTH_clock_messages_remote, - BMPHEIGHT_clock_messages_remote/6} + {clock_messages_remote,BMPWIDTH_clock_messages_remote, + BMPHEIGHT_clock_messages_remote, BMPHEIGHT_clock_messages_remote/6} #endif }; const struct picture binary[]={ - {clock_binary, - BMPWIDTH_clock_binary, BMPHEIGHT_clock_binary/2 }, + {clock_binary, BMPWIDTH_clock_binary, BMPHEIGHT_clock_binary, + BMPHEIGHT_clock_binary/2 }, #if NB_SCREENS==2 - {clock_binary_remote, - BMPWIDTH_clock_binary_remote,BMPHEIGHT_clock_binary_remote/2} + {clock_binary_remote, BMPWIDTH_clock_binary_remote, + BMPHEIGHT_clock_binary_remote, BMPHEIGHT_clock_binary_remote/2} #endif }; const struct picture digits[]={ - {clock_digits, - BMPWIDTH_clock_digits, BMPHEIGHT_clock_digits/13 }, + {clock_digits, BMPWIDTH_clock_digits, BMPHEIGHT_clock_digits, + BMPHEIGHT_clock_digits/13 }, #if NB_SCREENS==2 {clock_digits_remote, - BMPWIDTH_clock_digits_remote,BMPHEIGHT_clock_digits_remote/13} + BMPWIDTH_clock_digits_remote, BMPHEIGHT_clock_digits_remote, + BMPHEIGHT_clock_digits_remote/13} #endif }; const struct picture smalldigits[]={ - {clock_smalldigits, - BMPWIDTH_clock_smalldigits, BMPHEIGHT_clock_smalldigits/13 }, + {clock_smalldigits, BMPWIDTH_clock_smalldigits, BMPHEIGHT_clock_smalldigits, + BMPHEIGHT_clock_smalldigits/13 }, #if NB_SCREENS==2 - {clock_smalldigits_remote, - BMPWIDTH_clock_smalldigits_remote,BMPHEIGHT_clock_smalldigits_remote/13} + {clock_smalldigits_remote, BMPWIDTH_clock_smalldigits_remote, + BMPHEIGHT_clock_smalldigits_remote, + BMPHEIGHT_clock_smalldigits_remote/13} #endif }; const struct picture segments[]={ - {clock_segments, - BMPWIDTH_clock_segments, BMPHEIGHT_clock_segments/13 }, + {clock_segments, BMPWIDTH_clock_segments, BMPHEIGHT_clock_segments, + BMPHEIGHT_clock_segments/13 }, #if NB_SCREENS==2 - {clock_segments_remote, - BMPWIDTH_clock_segments_remote,BMPHEIGHT_clock_segments_remote/13} + {clock_segments_remote, BMPWIDTH_clock_segments_remote, + BMPHEIGHT_clock_segments_remote, BMPHEIGHT_clock_segments_remote/13} #endif }; const struct picture smallsegments[]={ - {clock_smallsegments, - BMPWIDTH_clock_smallsegments, BMPHEIGHT_clock_smallsegments/13 }, + {clock_smallsegments, BMPWIDTH_clock_smallsegments, + BMPHEIGHT_clock_smallsegments, BMPHEIGHT_clock_smallsegments/13 }, #if NB_SCREENS==2 - {clock_smallsegments_remote, - BMPWIDTH_clock_smallsegments_remote,BMPHEIGHT_clock_smallsegments_remote/13} + {clock_smallsegments_remote, BMPWIDTH_clock_smallsegments_remote, + BMPHEIGHT_clock_smallsegments_remote, + BMPHEIGHT_clock_smallsegments_remote/13} #endif }; -- cgit v1.2.3