diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2009-09-04 00:46:24 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2009-09-04 00:46:24 +0000 |
commit | 25123570c76f2055d3ae05d79741038c0e23c536 (patch) | |
tree | a2edd8351a611b9cef0aef08c880a994d9e1d75e /apps/plugins/clock | |
parent | f6025186fd1f6d9083c07568bc3d160f3e8774f8 (diff) | |
download | rockbox-25123570c76f2055d3ae05d79741038c0e23c536.tar.gz rockbox-25123570c76f2055d3ae05d79741038c0e23c536.zip |
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
Diffstat (limited to 'apps/plugins/clock')
-rw-r--r-- | apps/plugins/clock/clock_bitmaps.c | 55 |
1 files changed, 30 insertions, 25 deletions
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 @@ | |||
46 | 46 | ||
47 | 47 | ||
48 | const struct picture logos[]={ | 48 | const struct picture logos[]={ |
49 | {clock_logo, BMPWIDTH_clock_logo, BMPHEIGHT_clock_logo}, | 49 | {clock_logo, BMPWIDTH_clock_logo, BMPHEIGHT_clock_logo, |
50 | BMPHEIGHT_clock_logo}, | ||
50 | #if NB_SCREENS==2 | 51 | #if NB_SCREENS==2 |
51 | {clock_logo_remote,BMPWIDTH_clock_logo_remote,BMPHEIGHT_clock_logo_remote} | 52 | {clock_logo_remote,BMPWIDTH_clock_logo_remote, |
53 | BMPHEIGHT_clock_logo_remote, BMPHEIGHT_clock_logo_remote} | ||
52 | #endif | 54 | #endif |
53 | }; | 55 | }; |
54 | 56 | ||
55 | const struct picture messages[]={ | 57 | const struct picture messages[]={ |
56 | {clock_messages,BMPWIDTH_clock_messages, | 58 | {clock_messages,BMPWIDTH_clock_messages, BMPHEIGHT_clock_messages, |
57 | BMPHEIGHT_clock_messages/6}, | 59 | BMPHEIGHT_clock_messages/6}, |
58 | #if NB_SCREENS==2 | 60 | #if NB_SCREENS==2 |
59 | {clock_messages_remote,BMPWIDTH_clock_messages_remote, | 61 | {clock_messages_remote,BMPWIDTH_clock_messages_remote, |
60 | BMPHEIGHT_clock_messages_remote/6} | 62 | BMPHEIGHT_clock_messages_remote, BMPHEIGHT_clock_messages_remote/6} |
61 | #endif | 63 | #endif |
62 | }; | 64 | }; |
63 | 65 | ||
64 | const struct picture binary[]={ | 66 | const struct picture binary[]={ |
65 | {clock_binary, | 67 | {clock_binary, BMPWIDTH_clock_binary, BMPHEIGHT_clock_binary, |
66 | BMPWIDTH_clock_binary, BMPHEIGHT_clock_binary/2 }, | 68 | BMPHEIGHT_clock_binary/2 }, |
67 | #if NB_SCREENS==2 | 69 | #if NB_SCREENS==2 |
68 | {clock_binary_remote, | 70 | {clock_binary_remote, BMPWIDTH_clock_binary_remote, |
69 | BMPWIDTH_clock_binary_remote,BMPHEIGHT_clock_binary_remote/2} | 71 | BMPHEIGHT_clock_binary_remote, BMPHEIGHT_clock_binary_remote/2} |
70 | #endif | 72 | #endif |
71 | }; | 73 | }; |
72 | 74 | ||
73 | const struct picture digits[]={ | 75 | const struct picture digits[]={ |
74 | {clock_digits, | 76 | {clock_digits, BMPWIDTH_clock_digits, BMPHEIGHT_clock_digits, |
75 | BMPWIDTH_clock_digits, BMPHEIGHT_clock_digits/13 }, | 77 | BMPHEIGHT_clock_digits/13 }, |
76 | #if NB_SCREENS==2 | 78 | #if NB_SCREENS==2 |
77 | {clock_digits_remote, | 79 | {clock_digits_remote, |
78 | BMPWIDTH_clock_digits_remote,BMPHEIGHT_clock_digits_remote/13} | 80 | BMPWIDTH_clock_digits_remote, BMPHEIGHT_clock_digits_remote, |
81 | BMPHEIGHT_clock_digits_remote/13} | ||
79 | #endif | 82 | #endif |
80 | }; | 83 | }; |
81 | 84 | ||
82 | const struct picture smalldigits[]={ | 85 | const struct picture smalldigits[]={ |
83 | {clock_smalldigits, | 86 | {clock_smalldigits, BMPWIDTH_clock_smalldigits, BMPHEIGHT_clock_smalldigits, |
84 | BMPWIDTH_clock_smalldigits, BMPHEIGHT_clock_smalldigits/13 }, | 87 | BMPHEIGHT_clock_smalldigits/13 }, |
85 | #if NB_SCREENS==2 | 88 | #if NB_SCREENS==2 |
86 | {clock_smalldigits_remote, | 89 | {clock_smalldigits_remote, BMPWIDTH_clock_smalldigits_remote, |
87 | BMPWIDTH_clock_smalldigits_remote,BMPHEIGHT_clock_smalldigits_remote/13} | 90 | BMPHEIGHT_clock_smalldigits_remote, |
91 | BMPHEIGHT_clock_smalldigits_remote/13} | ||
88 | #endif | 92 | #endif |
89 | }; | 93 | }; |
90 | 94 | ||
91 | const struct picture segments[]={ | 95 | const struct picture segments[]={ |
92 | {clock_segments, | 96 | {clock_segments, BMPWIDTH_clock_segments, BMPHEIGHT_clock_segments, |
93 | BMPWIDTH_clock_segments, BMPHEIGHT_clock_segments/13 }, | 97 | BMPHEIGHT_clock_segments/13 }, |
94 | #if NB_SCREENS==2 | 98 | #if NB_SCREENS==2 |
95 | {clock_segments_remote, | 99 | {clock_segments_remote, BMPWIDTH_clock_segments_remote, |
96 | BMPWIDTH_clock_segments_remote,BMPHEIGHT_clock_segments_remote/13} | 100 | BMPHEIGHT_clock_segments_remote, BMPHEIGHT_clock_segments_remote/13} |
97 | #endif | 101 | #endif |
98 | }; | 102 | }; |
99 | 103 | ||
100 | const struct picture smallsegments[]={ | 104 | const struct picture smallsegments[]={ |
101 | {clock_smallsegments, | 105 | {clock_smallsegments, BMPWIDTH_clock_smallsegments, |
102 | BMPWIDTH_clock_smallsegments, BMPHEIGHT_clock_smallsegments/13 }, | 106 | BMPHEIGHT_clock_smallsegments, BMPHEIGHT_clock_smallsegments/13 }, |
103 | #if NB_SCREENS==2 | 107 | #if NB_SCREENS==2 |
104 | {clock_smallsegments_remote, | 108 | {clock_smallsegments_remote, BMPWIDTH_clock_smallsegments_remote, |
105 | BMPWIDTH_clock_smallsegments_remote,BMPHEIGHT_clock_smallsegments_remote/13} | 109 | BMPHEIGHT_clock_smallsegments_remote, |
110 | BMPHEIGHT_clock_smallsegments_remote/13} | ||
106 | #endif | 111 | #endif |
107 | }; | 112 | }; |