am 8ef609ab: am a4206029: am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc." (37c1bbb5) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/YuvImage.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,7 @@ public class YuvImage {
	private final static int WORKING_COMPRESS_STORAGE = 4096;		private final static int WORKING_COMPRESS_STORAGE = 4096;

	/**		/**
	* The YUV format as defined in {@link PixelFormat}.		* The YUV format as defined in {@link ImageFormat}.
	*/		*/
	private int mFormat;		private int mFormat;

	@@ -67,7 +67,7 @@ public class YuvImage {
	*		*
	* @param yuv The YUV data. In the case of more than one image plane, all the planes must be		* @param yuv The YUV data. In the case of more than one image plane, all the planes must be
	* concatenated into a single byte array.		* concatenated into a single byte array.
	* @param format The YUV data format as defined in {@link PixelFormat}.		* @param format The YUV data format as defined in {@link ImageFormat}.
	* @param width The width of the YuvImage.		* @param width The width of the YuvImage.
	* @param height The height of the YuvImage.		* @param height The height of the YuvImage.
	* @param strides (Optional) Row bytes of each image plane. If yuv contains padding, the stride		* @param strides (Optional) Row bytes of each image plane. If yuv contains padding, the stride
	@@ -152,7 +152,7 @@ public class YuvImage {
	}		}

	/**		/**
	* @return the YUV format as defined in {@link PixelFormat}.		* @return the YUV format as defined in {@link ImageFormat}.
	*/		*/
	public int getYuvFormat() {		public int getYuvFormat() {
	return mFormat;		return mFormat;