From 2dfb4028b4eb4843a3dfcf87fd9608ac04bbf622 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Wed, 12 Sep 2012 15:42:43 +0200 Subject: filetype: add BMP support Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Sascha Hauer --- include/filetype.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/filetype.h') diff --git a/include/filetype.h b/include/filetype.h index 179ec0f5eb..6c97159aa4 100644 --- a/include/filetype.h +++ b/include/filetype.h @@ -19,6 +19,7 @@ enum filetype { filetype_sh, filetype_mips_barebox, filetype_fat, + filetype_bmp, }; const char *file_type_to_string(enum filetype f); -- cgit v1.2.3 From 50239e0195c6c8af99b3fa80bde084e30a33a7cd Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Wed, 12 Sep 2012 15:42:47 +0200 Subject: filetype: add PNG support Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Sascha Hauer --- common/filetype.c | 4 ++++ include/filetype.h | 1 + 2 files changed, 5 insertions(+) (limited to 'include/filetype.h') diff --git a/common/filetype.c b/common/filetype.c index 61fca5aaba..d06eec0099 100644 --- a/common/filetype.c +++ b/common/filetype.c @@ -43,6 +43,7 @@ static const char *filetype_str[] = { [filetype_mips_barebox] = "MIPS barebox image", [filetype_fat] = "FAT filesytem", [filetype_bmp] = "BMP image", + [filetype_png] = "PNG image", }; const char *file_type_to_string(enum filetype f) @@ -72,6 +73,7 @@ static int is_fat(u8 *buf) enum filetype file_detect_type(void *_buf) { u32 *buf = _buf; + u64 *buf64 = _buf; u8 *buf8 = _buf; if (strncmp(buf8, "#!/bin/sh", 9) == 0) @@ -104,6 +106,8 @@ enum filetype file_detect_type(void *_buf) return filetype_fat; if (strncmp(buf8, "BM", 2) == 0) return filetype_bmp; + if (buf64[0] == le64_to_cpu(0x0a1a0a0d474e5089ull)) + return filetype_png; return filetype_unknown; } diff --git a/include/filetype.h b/include/filetype.h index 6c97159aa4..2924032561 100644 --- a/include/filetype.h +++ b/include/filetype.h @@ -20,6 +20,7 @@ enum filetype { filetype_mips_barebox, filetype_fat, filetype_bmp, + filetype_png, }; const char *file_type_to_string(enum filetype f); -- cgit v1.2.3