From: Alexander Shiyan <eagle.alexander923@gmail.com>
To: barebox@lists.infradead.org
Cc: Alexander Shiyan <eagle.alexander923@gmail.com>
Subject: [PATCH 3/8] gui: image_renderer: Fix empty prototype for image_renderer_image()
Date: Fri, 10 Jun 2022 08:40:45 +0300 [thread overview]
Message-ID: <20220610054051.4911-4-eagle.alexander923@gmail.com> (raw)
In-Reply-To: <20220610054051.4911-1-eagle.alexander923@gmail.com>
In file included from lib/gui/png.c:9:
include/gui/image_renderer.h: In function 'image_renderer_file':
include/gui/image_renderer.h:67:29: warning: passing argument 1 of 'image_renderer_image' from incompatible pointer type [-Wincompatible-pointer-types]
ret = image_renderer_image(sc, s, img);
include/gui/image_renderer.h:56:42: note: expected 'struct surface *' but argument is of type 'struct screen *'
int image_renderer_image(struct surface *s, struct image *img);
include/gui/image_renderer.h:67:33: warning: passing argument 2 of 'image_renderer_image' from incompatible pointer type [-Wincompatible-pointer-types]
ret = image_renderer_image(sc, s, img);
include/gui/image_renderer.h:56:59: note: expected 'struct image *' but argumentis of type 'struct surface *'
int image_renderer_image(struct surface *s, struct image *img);
include/gui/image_renderer.h:67:8: error: too many arguments to function 'image_renderer_image'
ret = image_renderer_image(sc, s, img);
include/gui/image_renderer.h:56:5: note: declared here
int image_renderer_image(struct surface *s, struct image *img);
Fixes: 3fa8d74abea3 ("gui: introduce screen and surface to factorize and simplify code")
Signed-off-by: Alexander Shiyan <eagle.alexander923@gmail.com>
---
include/gui/image_renderer.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/gui/image_renderer.h b/include/gui/image_renderer.h
index bfdea1b14e..323ad741b3 100644
--- a/include/gui/image_renderer.h
+++ b/include/gui/image_renderer.h
@@ -53,7 +53,10 @@ static inline struct image *image_renderer_open(const char* file)
static inline void image_renderer_close(struct image *img) {}
-int image_renderer_image(struct surface *s, struct image *img);
+static inline int image_renderer_image(struct screen *sc, struct surface *s, struct image *img)
+{
+ return -EINVAL;
+}
#endif
static inline int image_renderer_file(struct screen *sc, struct surface *s, const char* file)
--
2.32.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2022-06-10 5:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-10 5:40 [PATCH 0/8] Misc fixes part II Alexander Shiyan
2022-06-10 5:40 ` [PATCH 1/8] ARM: optee-early: Fix 'memcpy' implicit declaration Alexander Shiyan
2022-06-10 5:40 ` [PATCH 2/8] ata: ahci: Fix format string Alexander Shiyan
2022-06-10 5:40 ` Alexander Shiyan [this message]
2022-06-10 5:40 ` [PATCH 4/8] ARM: vexpress: Add missing "noreturn" attribute to restart function Alexander Shiyan
2022-06-10 5:40 ` [PATCH 5/8] ARM: versatile: " Alexander Shiyan
2022-06-10 5:40 ` [PATCH 6/8] lib: logo: Ignore more generated files Alexander Shiyan
2022-06-10 5:40 ` [PATCH 7/8] mtd: nand: orion: Disallow driver compile for ARMv4T Alexander Shiyan
2022-06-10 5:40 ` [PATCH 8/8] commands: Add CONSOLE dependency for EDIT command Alexander Shiyan
2022-06-10 7:54 ` [PATCH 0/8] Misc fixes part II Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220610054051.4911-4-eagle.alexander923@gmail.com \
--to=eagle.alexander923@gmail.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox