commit 8462913d0c19973901a861749b4abbaacdf4b477
author Andreas Gampe <agampe@google.com> Tue Nov 18 22:39:30 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 18 22:39:30 2014 +0000
tree cea52a2030a2d3910eb42a6e4746eccd5e3ea768
parent 56090472230dc56acc203589f3efcb65579fb54d
parent 26109fd328aec626dde78366d961c34600fc7b15

Merge "Frameworks/base: Ignore unknown pragmas in core/jni"

core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp

diff --git a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
index 35e9a1c..7dafb1b 100644
--- a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
+++ b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
@@ -312,8 +312,8 @@
         case HAL_PIXEL_FORMAT_BLOB: {
             int8_t* img = NULL;
             struct camera3_jpeg_blob footer = {
-                jpeg_blob_id: CAMERA3_JPEG_BLOB_ID,
-                jpeg_size: (uint32_t)bufferLength
+                .jpeg_blob_id = CAMERA3_JPEG_BLOB_ID,
+                .jpeg_size = (uint32_t)bufferLength
             };
 
             size_t totalJpegSize = bufferLength + sizeof(footer);