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 /camera/CameraParameters.cpp | |
| 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 'camera/CameraParameters.cpp')
| -rw-r--r-- | camera/CameraParameters.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index 035fa9f..7b4c7f6 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -72,7 +72,7 @@ const char CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED[] = "smooth-zoom-supporte const char CameraParameters::KEY_FOCUS_DISTANCES[] = "focus-distances"; const char CameraParameters::TRUE[] = "true"; -const char CameraParameters::INFINITY[] = "Infinity"; +const char CameraParameters::FOCUS_DISTANCE_INFINITY[] = "Infinity"; // Values for white balance settings. const char CameraParameters::WHITE_BALANCE_AUTO[] = "auto"; |