On Mon, Mar 08, 2010 at 06:06:17PM +0000, Nuno Lucas wrote:
>Bernhard Reutner-Fischer wrote:
>>On Fri, Mar 05, 2010 at 11:32:07AM +0000, Nuno Lucas wrote:
>>>Is this intentional? It makes sense for me because I don't need to have
>>
>>I was intentional for PPMs that are too big. I aggree that it makes sense
>>to allow smaller images. Patches are welcome (see log below).
>
>Thanks. I will look into submitting a patch then.
please do. You probably want something like (untested):
index 3bf16ab..ed9a8da 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -264,8 +264,8 @@ static void fb_drawimage(void)
if (ENABLE_FEATURE_CLEAN_UP)
free(head);
- if (width != G.scr_var.xres || height != G.scr_var.yres)
- bb_error_msg_and_die("PPM %dx%d does not match screen %dx%d",
+ if (width > G.scr_var.xres || height > G.scr_var.yres)
+ bb_error_msg_and_die("PPM %dx%d does fit on screen %dx%d",
width, height,
G.scr_var.xres, G.scr_var.yres);
line_size = width*3;
if (width > G.scr_var.xres)
>
>
>Regards,
>~Nuno Lucas
>
>>>different images for different frame buffer sizes (and I only want a small
>>>logo
>>>with a progress bar to appear).
>>
>>$ git log
>>7307e06122997f3d5e0108cd1bab4b11a1d5ebdc^..7307e06122997f3d5e0108cd1bab4b11a1d5ebdc
>> miscutils/fbsplash.c
>>commit 7307e06122997f3d5e0108cd1bab4b11a1d5ebdc
>>Author: Bernhard Reutner-Fischer
>>Date: Wed Feb 18 15:28:43 2009 +0000
>>
>> - bail out if screen resolution does not match PPM dimensions.
>> Previously a 640x480 PPM on an e.g. 720x400 console would just segfault
>> when
>> reading the lines. While this bug should perhaps be fixed to handle
>> such cases
>> properly we just exit gracefully until somebody is willing to take care
>> of it
>> properly.
>
>
_______________________________________________
busybox mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/busybox
