From 5cf652629fb40796cd2e0ab17c3617ed52365473 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 18 八月 2017 10:32:05 +0800
Subject: [PATCH] capnp client fix bug

---
 RtspFace/GraphicHelper.h |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/RtspFace/GraphicHelper.h b/RtspFace/GraphicHelper.h
index 71b9f21..0dcd543 100644
--- a/RtspFace/GraphicHelper.h
+++ b/RtspFace/GraphicHelper.h
@@ -1,9 +1,19 @@
 #ifndef _GRAPHIC_HELPER_H_
 #define _GRAPHIC_HELPER_H_
 
+#ifdef __ANDROID__
+#undef _U
+#undef _L
+#undef _N
+#undef _S
+#undef _P
+#undef _C
+#undef _X
+#undef _B
+#endif
+
 #include <stdint.h>
 #include <vector>
-#include "GraphicHelper.h"
 
 struct PLGH_Color_RGBA
 {
@@ -26,6 +36,10 @@
 		const uint16_t UV = (V << 8 | U);
 		return UV;
 	}
+	uint16_t toRGB565() const
+	{
+		return (((unsigned(R) << 8) & 0xF800) | ((unsigned(G) << 3) & 0x7E0) | ((unsigned(B) >> 3)));
+	}
 };
 
 struct PLGH_Color_YUV

--
Gitblit v1.8.0