From: Antonio Ospite <ospite@studenti.unina.it>
Date: Thu, 10 May 2012 13:57:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/rettichschnidi' into mingw-port
X-Git-Tag: v0.1.3~37^2~12
X-Git-Url: https://git.ao2.it/libam7xxx.git/commitdiff_plain/d25fcc3e360bf67203e185c7bfed7a740fca6641?hp=eebd277e4483ec40903a4f078bf12634078aab6f

Merge remote-tracking branch 'origin/rettichschnidi' into mingw-port
---

diff --git a/doc/man/picoproj.1.txt b/doc/man/picoproj.1.txt
index c60fe16..ce56f0e 100644
--- a/doc/man/picoproj.1.txt
+++ b/doc/man/picoproj.1.txt
@@ -15,7 +15,9 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-picoproj(1) is a minimal example to show how to use libam7xxx to display a static image.
+picoproj(1) is a minimal example to show how to use libam7xxx to display
+a static image; it will not perform any image rescaling or conversion, images
+larger than the device native resolution can be wrongly displayed.
 
 
 OPTIONS
diff --git a/examples/picoproj.c b/examples/picoproj.c
index 105169c..2c1b257 100644
--- a/examples/picoproj.c
+++ b/examples/picoproj.c
@@ -209,6 +209,10 @@ int main(int argc, char *argv[])
 		goto cleanup;
 	}
 
+	if ((unsigned int)width > device_info.native_width ||
+	    (unsigned int)height > device_info.native_height)
+		fprintf(stderr, "WARNING: image not fitting the native resolution, it may be displayed wrongly!\n");
+
 	ret = am7xxx_send_image(dev, format, width, height, image, size);
 	if (ret < 0) {
 		perror("am7xxx_send_image");