diff options
| author | Kévin PETIT <kevin.petit@arm.com> | 2014-02-03 12:35:36 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-02-11 11:40:06 +0000 |
| commit | 377b2ec9a2885f9b6405b07ba900a9e3f4349c38 (patch) | |
| tree | b938e1d75a1beefae86244f287ca22f4a277740d /services/camera/libcameraservice/api1/CameraClient.cpp | |
| parent | cdda7bf4d3ca9cad6979374a18dd5be79ea83d80 (diff) | |
| download | frameworks_av-377b2ec9a2885f9b6405b07ba900a9e3f4349c38.zip frameworks_av-377b2ec9a2885f9b6405b07ba900a9e3f4349c38.tar.gz frameworks_av-377b2ec9a2885f9b6405b07ba900a9e3f4349c38.tar.bz2 | |
Make frameworks/av 64-bit compatible
Contains the necessary changes to make frameworks/av build and work
on a 64-bit machine.
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
Diffstat (limited to 'services/camera/libcameraservice/api1/CameraClient.cpp')
| -rw-r--r-- | services/camera/libcameraservice/api1/CameraClient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/api1/CameraClient.cpp b/services/camera/libcameraservice/api1/CameraClient.cpp index bd6805d..30b7bb8 100644 --- a/services/camera/libcameraservice/api1/CameraClient.cpp +++ b/services/camera/libcameraservice/api1/CameraClient.cpp @@ -85,7 +85,7 @@ status_t CameraClient::initialize(camera_module_t *module) { mHardware->setCallbacks(notifyCallback, dataCallback, dataCallbackTimestamp, - (void *)mCameraId); + (void *)(uintptr_t)mCameraId); // Enable zoom, error, focus, and metadata messages by default enableMsgType(CAMERA_MSG_ERROR | CAMERA_MSG_ZOOM | CAMERA_MSG_FOCUS | |