diff options
author | Wu-cheng Li <wuchengli@google.com> | 2011-06-07 04:05:35 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-07 04:05:35 -0700 |
commit | a4a48a484fe862787cf2fbe1314deab8ac375951 (patch) | |
tree | eafe490eb4ce35414011e8082a64d9a762769bd2 /include | |
parent | 4da7b10c45dfa86be5636444b2c3caebc462659c (diff) | |
parent | bde61a5731cdfef76a0691f8bd53b880606f5f6e (diff) | |
download | frameworks_base-a4a48a484fe862787cf2fbe1314deab8ac375951.zip frameworks_base-a4a48a484fe862787cf2fbe1314deab8ac375951.tar.gz frameworks_base-a4a48a484fe862787cf2fbe1314deab8ac375951.tar.bz2 |
Merge "Improve android.hardware.Camera.Area javadoc."
Diffstat (limited to 'include')
-rw-r--r-- | include/camera/CameraParameters.h | 4 |
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 |