drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build error.

Browse Source 
Original name INFINITY conflicts with the macro in math.h.

Change-Id: I9845ed84fca17813dd971239a902cc1e0bad1e3e
This commit is contained in:
Wu-cheng Li
2010-05-15 13:05:04 +08:00
parent e339c5edbe
commit ae7ca4c32c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/camera/CameraParameters.h
View File

@ -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[];

2
libs/camera/CameraParameters.cpp
View File

@ -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";