diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2010-05-15 13:05:04 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2010-05-15 13:06:19 +0800 |
| commit | ae7ca4c32cb37ea82e77ad1462fbfcd4d6dfabd3 (patch) | |
| tree | e76e4f72db70f1d1291f6fa0ae334545906617c5 /include/camera | |
| parent | e339c5edbebedf446581f18ad70214007309bf4b (diff) | |
| download | frameworks_base-ae7ca4c32cb37ea82e77ad1462fbfcd4d6dfabd3.zip frameworks_base-ae7ca4c32cb37ea82e77ad1462fbfcd4d6dfabd3.tar.gz frameworks_base-ae7ca4c32cb37ea82e77ad1462fbfcd4d6dfabd3.tar.bz2 | |
Fix build error.
Original name INFINITY conflicts with the macro in math.h.
Change-Id: I9845ed84fca17813dd971239a902cc1e0bad1e3e
Diffstat (limited to 'include/camera')
| -rw-r--r-- | include/camera/CameraParameters.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 19b052b..20eef72 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -243,7 +243,7 @@ public: static const char TRUE[]; // Value for KEY_FOCUS_DISTANCES. - static const char INFINITY[]; + static const char FOCUS_DISTANCE_INFINITY[]; // Values for white balance settings. static const char WHITE_BALANCE_AUTO[]; |