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 | ae77ffa16bda593fb3751e41d45327d867f3c8e1 (patch) | |
| tree | bc71c40bbbbce19b827c407fd901c03a3cf87e81 /include/camera | |
| parent | 09a2ab9dfe5c8fe74703b9894d930b1b1dbf0c11 (diff) | |
| download | frameworks_av-ae77ffa16bda593fb3751e41d45327d867f3c8e1.zip frameworks_av-ae77ffa16bda593fb3751e41d45327d867f3c8e1.tar.gz frameworks_av-ae77ffa16bda593fb3751e41d45327d867f3c8e1.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[]; |