Add getAttributeDouble() and focal length tag. (5d9661be) · Commits · e / os / android_frameworks_base

api/current.xml

+26 −0

Original line number	Diff line number	Diff line
		@@ -80725,6 +80725,21 @@
		<parameter name="tag" type="java.lang.String">
		</parameter>
		</method>
		<method name="getAttributeDouble"
		return="double"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="tag" type="java.lang.String">
		</parameter>
		<parameter name="defaultValue" type="double">
		</parameter>
		</method>
		<method name="getAttributeInt"
		return="int"
		abstract="false"
		@@ -80924,6 +80939,17 @@
		visibility="public"
		>
		</field>
		<field name="TAG_FOCAL_LENGTH"
		type="java.lang.String"
		transient="false"
		volatile="false"
		value=""FocalLength""
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="TAG_GPS_DATESTAMP"
		type="java.lang.String"
		transient="false"

media/java/android/media/ExifInterface.java

+39 −1

Original line number	Diff line number	Diff line
		@@ -28,22 +28,37 @@ import java.util.TimeZone;
		* This is a class for reading and writing Exif tags in a JPEG file.
		*/
		public class ExifInterface {

		// The Exif tag names
		/** Type is int. */
		public static final String TAG_ORIENTATION = "Orientation";
		/** Type is String. */
		public static final String TAG_DATETIME = "DateTime";
		/** Type is String. */
		public static final String TAG_MAKE = "Make";
		/** Type is String. */
		public static final String TAG_MODEL = "Model";
		/** Type is int. */
		public static final String TAG_FLASH = "Flash";
		/** Type is int. */
		public static final String TAG_IMAGE_WIDTH = "ImageWidth";
		/** Type is int. */
		public static final String TAG_IMAGE_LENGTH = "ImageLength";
		/** String. Format is "num1/denom1,num2/denom2,num3/denom3". */
		public static final String TAG_GPS_LATITUDE = "GPSLatitude";
		/** String. Format is "num1/denom1,num2/denom2,num3/denom3". */
		public static final String TAG_GPS_LONGITUDE = "GPSLongitude";
		/** Type is String. */
		public static final String TAG_GPS_LATITUDE_REF = "GPSLatitudeRef";
		/** Type is String. */
		public static final String TAG_GPS_LONGITUDE_REF = "GPSLongitudeRef";
		/** Type is String. */
		public static final String TAG_GPS_TIMESTAMP = "GPSTimeStamp";
		/** Type is String. */
		public static final String TAG_GPS_DATESTAMP = "GPSDateStamp";
		/** Type is int. */
		public static final String TAG_WHITE_BALANCE = "WhiteBalance";
		/** Type is rational. */
		public static final String TAG_FOCAL_LENGTH = "FocalLength";

		// Constants used for the Orientation Exif tag.
		public static final int ORIENTATION_UNDEFINED = 0;
		@@ -113,6 +128,29 @@ public class ExifInterface {
		}
		}

		/**
		* Returns the double value of the specified rational tag. If there is no
		* such tag in the JPEG file or the value cannot be parsed as double, return
		* <var>defaultValue</var>.
		*
		* @param tag the name of the tag.
		* @param defaultValue the value to return if the tag is not available.
		*/
		public double getAttributeDouble(String tag, double defaultValue) {
		String value = mAttributes.get(tag);
		if (value == null) return defaultValue;
		try {
		int index = value.indexOf("/");
		if (index == -1) return defaultValue;
		double denom = Double.parseDouble(value.substring(index + 1));
		if (denom == 0) return defaultValue;
		double num = Double.parseDouble(value.substring(0, index));
		return num / denom;
		} catch (NumberFormatException ex) {
		return defaultValue;
		}
		}

		/**
		* Set the value of the specified tag.
		*