summaryrefslogtreecommitdiffstats
path: root/include/camera
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-06-07 04:05:35 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-07 04:05:35 -0700
commit6e49bd393f263bd17a65eb5c1a0e649933c78504 (patch)
treed785db5e5a82727a2403c2763e6aa7d44119209e /include/camera
parent5e7271d6e24efb891e0de141a06228c99866f49f (diff)
parent0c08325b66b74e1353d84662c684e4380bb8292f (diff)
downloadframeworks_av-6e49bd393f263bd17a65eb5c1a0e649933c78504.zip
frameworks_av-6e49bd393f263bd17a65eb5c1a0e649933c78504.tar.gz
frameworks_av-6e49bd393f263bd17a65eb5c1a0e649933c78504.tar.bz2
Merge "Improve android.hardware.Camera.Area javadoc."
Diffstat (limited to 'include/camera')
-rw-r--r--include/camera/CameraParameters.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index 7992861..83d4f6d 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -263,7 +263,7 @@ public:
// direction is not affected by the rotation or mirroring of
// CAMERA_CMD_SET_DISPLAY_ORIENTATION. Coordinates range from -1000 to 1000.
// (-1000,-1000) is the upper left point. (1000, 1000) is the lower right
- // point. The length and width of focus areas cannot be 0 or negative.
+ // point. The width and height of focus areas cannot be 0 or negative.
//
// The fifth element is the weight. Values for weight must range from 1 to
// 1000. The weight should be interpreted as a per-pixel weight - all
@@ -373,7 +373,7 @@ public:
// direction is not affected by the rotation or mirroring of
// CAMERA_CMD_SET_DISPLAY_ORIENTATION. Coordinates of the rectangle range
// from -1000 to 1000. (-1000, -1000) is the upper left point. (1000, 1000)
- // is the lower right point. The length and width of metering areas cannot
+ // is the lower right point. The width and height of metering areas cannot
// be 0 or negative.
//
// The fifth element is the weight. Values for weight must range from 1 to