[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-4-g6f51bfa

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  6f51bfa3d62232aabcb09dbb814c7e77d8535e5b (commit)
       via  da7285009c0091da12836aa1323ff72a5047a4ec (commit)
      from  5bce0b8d410b72e8272fff8c34fce3da9d33d517 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6f51bfa3d62232aabcb09dbb814c7e77d8535e5b
Author: Julien Boibessot <jul...@ar...>
Date:   Sun Oct 14 21:50:52 2012 +0200

    [LINUX] APF28: 3.6.2 kernel version is out

commit da7285009c0091da12836aa1323ff72a5047a4ec
Author: Julien Boibessot <jul...@ar...>
Date:   Sat Oct 13 23:10:35 2012 +0200

    [DEMOS] capture: fixes soft rgb565_to_yuv420 conversion

-----------------------------------------------------------------------

Summary of changes:
 ...linux-3.6.1.config => apf28-linux-3.6.2.config} |    0
 patches/linux/{3.6.1 => 3.6.2}                     |    0
 target/demos/camera/capture/capture.c              |    4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.6.1.config => apf28-linux-3.6.2.config} (100%)
 rename patches/linux/{3.6.1 => 3.6.2} (100%)

diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.1.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.6.2.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.6.1.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.6.2.config
diff --git a/patches/linux/3.6.1 b/patches/linux/3.6.2
similarity index 100%
rename from patches/linux/3.6.1
rename to patches/linux/3.6.2
diff --git a/target/demos/camera/capture/capture.c b/target/demos/camera/capture/capture.c
index 767facb..c22124c 100644
--- a/target/demos/camera/capture/capture.c
+++ b/target/demos/camera/capture/capture.c
@@ -262,7 +262,7 @@ static void rgb565_to_yuv420(void *rgb, int size, void *yuv)
 
 	for (i = 0; i < nbpix; i++) {
 		R = (src[i] & 0xf800) >> 8;
-		G = (src[i] & 0x07c0) >> 3;
+		G = (src[i] & 0x07e0) >> 3;
 		B = (src[i] & 0x001f) << 3;
 		Y = 0.299 * R + 0.587 * G + 0.114 * B;
 		dest[i] = Y;
@@ -271,7 +271,7 @@ static void rgb565_to_yuv420(void *rgb, int size, void *yuv)
 		if ((y & 0x00000001) == 0) {
 			for (x = 0; x < mycamera.width ; x = x + 2) {
 				R = (src[x] & 0xf800) >> 8;
-				G = (src[x] & 0x07c0) >> 3;
+				G = (src[x] & 0x07e0) >> 3;
 				B = (src[x] & 0x001f) << 3;
 				U = -0.169 * R - 0.331 * G + 0.449 * B + 128;
 				V = 0.499 * R - 0.418 * G - 0.0813 * B + 128;


hooks/post-receive
-- 
armadeus