Commit: eb0e70d24744d623f960b3cc188e791351caacc0 - frameworks-base (git)

frameworks/base

Commit MetaInfo

• Revision: eb0e70d24744d623f960b3cc188e791351caacc0 (tree)
• Time: 2009-07-16 17:21:01
• Author: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Log Message

fix compiling error

Change Summary

• modified: camera/libcameraservice/Android.mk
• modified: camera/libcameraservice/CameraHardware.h
• modified: camera/libcameraservice/V4L2Camera.cpp

Incremental Difference

--- a/camera/libcameraservice/Android.mk
+++ b/camera/libcameraservice/Android.mk
@@ -10,6 +10,8 @@ LOCAL_SRC_FILES:=               \
     CameraHardware.cpp         \
     V4L2Camera.cpp
 
+LOCAL_CFLAGS += -Iexternal/jpeg
+
 LOCAL_MODULE:= libcamera
 
 LOCAL_SHARED_LIBRARIES:= \

--- a/camera/libcameraservice/CameraHardware.h
+++ b/camera/libcameraservice/CameraHardware.h
@@ -25,7 +25,6 @@
 #include <utils/threads.h>
 
 #include <sys/ioctl.h>
-#include <jpeglib.h>
 #include "V4L2Camera.h"
 
 namespace android {

--- a/camera/libcameraservice/V4L2Camera.cpp
+++ b/camera/libcameraservice/V4L2Camera.cpp
@@ -21,10 +21,12 @@
 
 #include <linux/videodev.h>
 
-#include <jpeglib.h>
-
 #include "V4L2Camera.h"
 
+extern "C" { /* Android jpeglib.h missed extern "C" */
+#include <jpeglib.h>
+}
+
 namespace android {
 
 V4L2Camera::V4L2Camera ()