From ae77ffa16bda593fb3751e41d45327d867f3c8e1 Mon Sep 17 00:00:00 2001 From: Wu-cheng Li Date: Sat, 15 May 2010 13:05:04 +0800 Subject: Fix build error. Original name INFINITY conflicts with the macro in math.h. Change-Id: I9845ed84fca17813dd971239a902cc1e0bad1e3e --- camera/CameraParameters.cpp | 2 +- include/camera/CameraParameters.h | 2 +- 2 files changed, 2 insertions(+), 2 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"; 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[]; -- cgit v1.1