commit ae77ffa16bda593fb3751e41d45327d867f3c8e1
author Wu-cheng Li <wuchengli@google.com> Sat May 15 13:05:04 2010 +0800
committer Wu-cheng Li <wuchengli@google.com> Sat May 15 13:06:19 2010 +0800
tree bc71c40bbbbce19b827c407fd901c03a3cf87e81
parent 09a2ab9dfe5c8fe74703b9894d930b1b1dbf0c11

Fix build error.

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

Change-Id: I9845ed84fca17813dd971239a902cc1e0bad1e3e

camera/CameraParameters.cpp

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

include/camera/CameraParameters.h

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