Merged android-experimental branch back to trunk.

2011-04-06 14:31:03 +00:00
parent bbdd0aecbd
commit 68534d70f3
120 changed files with 3483 additions and 1620 deletions
--- a/android/android-opencv/jni/include/yuv420sp2rgb.h
+++ b/android/android-opencv/jni/include/yuv420sp2rgb.h
@@ -0,0 +1,17 @@
+#ifndef YUV420SP2RGB_H
+#define YUV420SP2RGB_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void color_convert_common(
+    const unsigned char *pY, const unsigned char *pUV,
+    int width, int height, unsigned char *buffer,
+    int grey);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif