From 30f55f67f44b0039a82dc69b499fc24ce6931dfd Mon Sep 17 00:00:00 2001
From: Edgard Lima <edgard.lima@indt.org.br>
Date: Tue, 5 Feb 2008 17:10:11 +0000
Subject: Add more tags mapping.

Original commit message from CVS:
Add more tags mapping.
---
 ChangeLog                         |   8 +
 ext/metadata/metadata_mapping.htm | 558 ++++++++++++++++++++++++--------------
 ext/metadata/metadataexif.c       |  84 ++++--
 ext/metadata/metadatatags.c       |  24 +-
 ext/metadata/metadatatags.h       |   7 +-
 5 files changed, 450 insertions(+), 231 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d891dea7..ed0b806b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-05  Edgard Lima  <edgard.lima@indt.org.br>
+
+	* ext/metadata/metadata_mapping.htm:
+	* ext/metadata/metadataexif.c:
+	* ext/metadata/metadatatags.c:
+	* ext/metadata/metadatatags.h:
+	  Add more tags mapping.
+
 2008-02-05  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
 	* gst/mpegtsparse/mpegtsparse.c:
diff --git a/ext/metadata/metadata_mapping.htm b/ext/metadata/metadata_mapping.htm
index f6c6ba1c..0816fca6 100644
--- a/ext/metadata/metadata_mapping.htm
+++ b/ext/metadata/metadata_mapping.htm
@@ -7,7 +7,8 @@
 	<META NAME="AUTHOR" CONTENT="Edgard Lima">
 	<META NAME="CREATED" CONTENT="20080131;12581600">
 	<META NAME="CHANGEDBY" CONTENT="Edgard Lima">
-	<META NAME="CHANGED" CONTENT="20080202;22134000">
+	<META NAME="CHANGED" CONTENT="20080205;19004300">
+	<META NAME="CHANGEDBY" CONTENT="Edgard Lima">
 	<!--  -->
 	<META NAME="CHANGEDBY" CONTENT="Edgard Lima">
 	<STYLE TYPE="text/css">
@@ -24,37 +25,37 @@
 <P CLASS="western" STYLE="margin-bottom: 0cm"><BR>
 </P>
 <TABLE WIDTH=100% BORDER=1 BORDERCOLOR="#000000" CELLPADDING=4 CELLSPACING=0>
-	<COL WIDTH=32*>
-	<COL WIDTH=39*>
-	<COL WIDTH=25*>
-	<COL WIDTH=31*>
+	<COL WIDTH=34*>
+	<COL WIDTH=37*>
+	<COL WIDTH=27*>
+	<COL WIDTH=27*>
+	<COL WIDTH=36*>
+	<COL WIDTH=36*>
 	<COL WIDTH=33*>
-	<COL WIDTH=32*>
-	<COL WIDTH=32*>
-	<COL WIDTH=31*>
+	<COL WIDTH=26*>
 	<TR VALIGN=TOP>
 		<TD WIDTH=13% BGCOLOR="#cccccc">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt"><B>gsttaglist.h</B></FONT></P>
 		</TD>
-		<TD WIDTH=15% BGCOLOR="#cccccc">
+		<TD WIDTH=14% BGCOLOR="#cccccc">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt"><B>metadatatags.h</B></FONT></P>
 		</TD>
-		<TD WIDTH=10% BGCOLOR="#cccccc">
+		<TD WIDTH=11% BGCOLOR="#cccccc">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt"><B>value</B></FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#cccccc">
+		<TD WIDTH=11% BGCOLOR="#cccccc">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt"><B>type</B></FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#cccccc">
+		<TD WIDTH=14% BGCOLOR="#cccccc">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt"><B>description</B></FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#cccccc">
+		<TD WIDTH=14% BGCOLOR="#cccccc">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt"><B>EXIF</B></FONT></P>
 		</TD>
 		<TD WIDTH=13% BGCOLOR="#cccccc">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt"><B>IPTC</B></FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#cccccc">
+		<TD WIDTH=10% BGCOLOR="#cccccc">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt"><B>XMP</B></FONT></P>
 		</TD>
 	</TR>
@@ -62,26 +63,26 @@
 		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_EXIF</FONT></P>
 		</TD>
-		<TD WIDTH=10%>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT>“<FONT SIZE=1 STYLE="font-size: 8pt">exif”</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_BUFFER</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">exif
 			chunk that could be used directly by the application</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">exif_data_new_from_data()</FONT></P>
 		</TD>
 		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=10%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
@@ -89,26 +90,26 @@
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_IPTC</FONT></P>
 		</TD>
-		<TD WIDTH=10% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT>“<FONT SIZE=1 STYLE="font-size: 8pt">iptc”</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_BUFFER</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">iptc
 			chunk that could be used directly by the application</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">iptc_data_new_from_data()</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=10% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
@@ -116,26 +117,26 @@
 		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_XMP</FONT></P>
 		</TD>
-		<TD WIDTH=10%>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT>“<FONT SIZE=1 STYLE="font-size: 8pt">xmp”</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_BUFFER</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">xmp
 			chunk that could be used directly by the application</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=10%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">xmp_new()</FONT></P>
 		</TD>
 	</TR>
@@ -143,56 +144,110 @@
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15% BGCOLOR="#e6e6ff">
-			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_BRIGHTNESS</FONT></P>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_APERTURE</FONT></P>
+		</TD>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-aperture&quot;</FONT></P>
+		</TD>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
+		</TD>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">The
+			lens aperture. <BR>(APEX)</FONT></P>
+		</TD>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_APERTURE_VALUE</FONT></P>
+		</TD>
+		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 		<TD WIDTH=10% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+		</TD>
+	</TR>
+	<TR VALIGN=TOP>
+		<TD WIDTH=13%>
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+		</TD>
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_BRIGHTNESS</FONT></P>
+		</TD>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-brightness&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Brightness
 			(APEX from -99.99 to 99.99)</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_BRIGHTNESS_VALUE</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=10%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
 	<TR VALIGN=TOP>
-		<TD WIDTH=13%>
+		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15%>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_CONTRAST</FONT></P>
 		</TD>
-		<TD WIDTH=10%>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-contrast&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_INT</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">from
 			-100 to 100:<BR>[-100, -34] – soft ;<BR>[-33, 33] – normal
 			;<BR>[34, 100] – hard </FONT>
 			</P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_CONTRAST<BR>0-
 			normal;<BR>1- soft;<BR>2- hard</FONT></P>
 		</TD>
+		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+		</TD>
+		<TD WIDTH=10% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+		</TD>
+	</TR>
+	<TR VALIGN=TOP>
 		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_CUSTOM_RENDERED</FONT></P>
+		</TD>
+		<TD WIDTH=11%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-custom-rendered&quot;</FONT></P>
+		</TD>
+		<TD WIDTH=11%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></P>
+		</TD>
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">0-
+			Normal process;<BR>1- Custom process</FONT></P>
+		</TD>
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_CUSTOM_RENDERED</FONT></P>
+		</TD>
+		<TD WIDTH=13%>
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+		</TD>
+		<TD WIDTH=10%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
@@ -200,26 +255,26 @@
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_DIGITAL_ZOOM</FONT></P>
 		</TD>
-		<TD WIDTH=10% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-digital-zoom&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Digital
 			zoom ratio&quot;<BR>(zero, means digital zoom not used)</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_DIGITAL_ZOOM_RATIO</FONT></P>
 		</TD>
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=10% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
@@ -227,16 +282,16 @@
 		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_EXPOSURE_PROGRAM</FONT></P>
 		</TD>
-		<TD WIDTH=10%>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-exposure-program&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0.5cm"><FONT SIZE=1 STYLE="font-size: 8pt">0-
 			not defined; 1-Manual; 2- Normal program ; 3- Aperture priority ;
 			4- Shutter priority ; 5- Creative program (biased toward death of
@@ -252,7 +307,7 @@
 			Night ; 10- Back-light ; 11- Spotlight ; 12- Snow ; 13- Beach </FONT>
 			</P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0.5cm"><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_EXPOSURE_PROGRAM</FONT></P>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">(only
 			from 0 to 8)</FONT></P>
@@ -260,7 +315,7 @@
 		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=10%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
@@ -268,26 +323,26 @@
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_EXPOSURE_TIME</FONT></P>
 		</TD>
-		<TD WIDTH=10% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-exposure-time&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Exposure
 			time in seconds</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_EXPOSURE_TIME</FONT></P>
 		</TD>
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=10% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
@@ -296,16 +351,16 @@
 			<P CLASS="western" ALIGN=CENTER><BR>
 			</P>
 		</TD>
-		<TD WIDTH=15%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_FLASH</FONT></FONT></P>
 		</TD>
-		<TD WIDTH=10%>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-flash&quot;</FONT></FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">0000.H
 			= Flash did not fire; 0001.H = Flash fired; 0005.H = Strobe return
 			light not detected; 0007.H = Strobe return light detected; 0009.H
@@ -326,9 +381,9 @@
 			= Flash fired, auto mode, red-eye reduction mode; 005D.H = Flash
 			fired, auto mode, return light not detected, red-eye reduction
 			mode; 005F.H = Flash fired, auto mode, return light detected,
-			red-eye reduction mode; Other  = reserved</FONT></FONT></P>
+			red-eye reduction mode; Other = reserved</FONT></FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0.5cm"><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_FLASH</FONT></FONT></P>
 			<P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">BUG
 			in libexif. Can't be created in a exif data created from the
@@ -338,7 +393,7 @@
 		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=10%>
 			<P CLASS="western" ALIGN=CENTER><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></FONT></P>
 		</TD>
 	</TR>
@@ -346,26 +401,26 @@
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_FNUMBER</FONT></P>
 		</TD>
-		<TD WIDTH=10% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-fnumber&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">F
 			number (focal ratio)</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_FNUMBER</FONT></P>
 		</TD>
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=10% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
@@ -374,26 +429,26 @@
 			<P CLASS="western" ALIGN=CENTER><BR>
 			</P>
 		</TD>
-		<TD WIDTH=15%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_FOCAL_LEN</FONT></P>
 		</TD>
-		<TD WIDTH=10%>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-focal-len&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Focal
 			length of lens used to take image. Unit is millimeter</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_FOCAL_LENGTH</FONT></P>
 		</TD>
 		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=10%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
@@ -401,27 +456,27 @@
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_GAIN</FONT></P>
 		</TD>
-		<TD WIDTH=10% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-gain&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">0-
 			None ; 1- Low gain up ; 2- High gain up ; 3- Low gain down ; 4-
 			High gain down</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_GAIN_CONTROL</FONT></P>
 		</TD>
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=10% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
@@ -429,20 +484,20 @@
 		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></FONT></P>
 		</TD>
-		<TD WIDTH=15%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_ISO_SPEED_RATINGS</FONT></FONT></P>
 		</TD>
-		<TD WIDTH=10%>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-iso-speed-ratings&quot;</FONT></FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_INT</FONT></FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">ISO
 			Speed and ISO Latitude as specified in ISO 12232</FONT></FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_ISO_SPEED_RATINGS<BR>BUG:
 			<A HREF="https://sourceforge.net/tracker/?func=detail&amp;atid=112272&amp;aid=1884609&amp;group_id=12272">clique
 			here</A></FONT></FONT></P>
@@ -450,7 +505,7 @@
 		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=10%>
 			<P CLASS="western" ALIGN=CENTER><FONT COLOR="#ff0000"><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></FONT></P>
 		</TD>
 	</TR>
@@ -458,16 +513,16 @@
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_LIGHT_SOURCE</FONT></P>
 		</TD>
-		<TD WIDTH=10% BGCOLOR="#e6e6ff">
-			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-light_source&quot;</FONT></P>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-light-source&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">0-
 			unknown (default); 1- Daylight; 2- Fluorescent; 3- Tungsten
 			(incandescent light); 4- Flash; 9- Fine weather; 10- Cloudy
@@ -478,13 +533,13 @@
 			light C; 20- D55; 21- D65; 22- D75; 23- D50; 24- ISO studio
 			tungsten; 255- other light source; Other = reserved</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_LIGHT_SOURCE</FONT></P>
 		</TD>
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=10% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
@@ -493,28 +548,28 @@
 			<P CLASS="western" ALIGN=CENTER><BR>
 			</P>
 		</TD>
-		<TD WIDTH=15%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_ORIENTATION</FONT></P>
 		</TD>
-		<TD WIDTH=10%>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-orientation&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">The
 			relation of the '0th row' and '0th column' to visual position:<BR>1-
 			top-left; 2- top-right; 3- bottom-right; 4- bottom-left; 5-
 			left-top; 6- right-top; 7- right-bottom; 8- left-bottom</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_ORIENTATION</FONT></P>
 		</TD>
 		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=10%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
@@ -522,28 +577,28 @@
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_SATURATION</FONT></P>
 		</TD>
-		<TD WIDTH=10% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-saturation&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_INT</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">from
 			-100 to 100:<BR>[-100, -34] – low ;<BR>[-33, 33] – normal
 			;<BR>[34, 100] - high</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_SATURATION<BR>0-
 			normal;<BR>1- low;<BR>2- high</FONT></P>
 		</TD>
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=10% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
@@ -551,16 +606,43 @@
 		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15%>
-			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_WHITE_BALANCE</FONT></P>
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_SHUTTER_SPEED</FONT></P>
+		</TD>
+		<TD WIDTH=11%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-shutter-speed&quot;</FONT></P>
+		</TD>
+		<TD WIDTH=11%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
+		</TD>
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Saturation<BR>(in
+			APEX units)</FONT></P>
+		</TD>
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_SHUTTER_SPEED_VALUE</FONT></P>
+		</TD>
+		<TD WIDTH=13%>
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 		<TD WIDTH=10%>
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+		</TD>
+	</TR>
+	<TR VALIGN=TOP>
+		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+		</TD>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CAPTURE_WHITE_BALANCE</FONT></P>
+		</TD>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;capture-white-balance&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0.5cm"><FONT SIZE=1 STYLE="font-size: 8pt">0-
 			Auto; 1- Off </FONT>
 			</P>
@@ -571,97 +653,124 @@
 			Sunlight ; 3- Cloudy ; 4- Shade ; 5- Tungsten ; 6- Fluorescent ;
 			7- Incandescent; 8- Flash ; 9- Horizon (sun on the horizon)</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT STYLE="margin-bottom: 0.5cm"><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_WHITE_BALANCE</FONT></P>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">(only
 			0 and 1)</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=10% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
 	<TR VALIGN=TOP>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_CREATOR_TOOL</FONT></P>
 		</TD>
-		<TD WIDTH=10% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;creator-tool&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
-			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;The
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">The
 			name of the first known tool used to create the resource. Or
-			firmware or driver version of device&quot;</FONT></P>
+			firmware or driver version of device</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_SOFTWARE</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=10%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
 	<TR VALIGN=TOP>
-		<TD WIDTH=13%>
+		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15%>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_DEVICE_MAKE</FONT></P>
 		</TD>
-		<TD WIDTH=10%>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;device-make&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
-			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;The
-			manufacturer of the recording equipment&quot;</FONT></P>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">The
+			manufacturer of the recording equipment</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_MAKE</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=10% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
 	<TR VALIGN=TOP>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_DEVICE_MODEL</FONT></P>
 		</TD>
-		<TD WIDTH=10% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;device-model&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
-			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;The
-			model name or model number of the equipment&quot;</FONT></P>
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">The
+			model name or model number of the equipment</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_MODEL</FONT></P>
 		</TD>
+		<TD WIDTH=13%>
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+		</TD>
+		<TD WIDTH=10%>
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+		</TD>
+	</TR>
+	<TR VALIGN=TOP>
 		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_IMAGE_HEIGHT</FONT></P>
+		</TD>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;image-height&quot;</FONT></P>
+		</TD>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></P>
+		</TD>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Image
+			height in pixels</FONT></P>
+		</TD>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_PIXEL_Y_DIMENSION</FONT></P>
+		</TD>
+		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+		</TD>
+		<TD WIDTH=10% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
@@ -669,164 +778,191 @@
 		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15%>
-			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_IMAGE_XRESOLUTION</FONT></P>
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_IMAGE_WIDTH</FONT></P>
+		</TD>
+		<TD WIDTH=11%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;image-width&quot;</FONT></P>
+		</TD>
+		<TD WIDTH=11%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_UINT</FONT></P>
+		</TD>
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Image
+			width in pixels</FONT></P>
+		</TD>
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_PIXEL_X_DIMENSION</FONT></P>
+		</TD>
+		<TD WIDTH=13%>
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 		<TD WIDTH=10%>
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+		</TD>
+	</TR>
+	<TR VALIGN=TOP>
+		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
+		</TD>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_IMAGE_XRESOLUTION</FONT></P>
+		</TD>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;image-xresolution&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
-			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;Horizontal
-			resolution in pixels per inch&quot;.<BR>Here it is always in
-			inches.<BR>In EXIF it depends on EXIF_TAG_RESOLUTION_UNIT</FONT></P>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Horizontal
+			resolution in pixels per inch.<BR>Here it is always in inches.<BR>In
+			EXIF it depends on EXIF_TAG_RESOLUTION_UNIT</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_X_RESOLUTION</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=10% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
 	<TR VALIGN=TOP>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=15% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_IMAGE_YRESOLUTION</FONT></P>
 		</TD>
-		<TD WIDTH=10% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;image-yresolution&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TYPE_FRACTION</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
-			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;Vertical
-			resolution in pixels per inch&quot;.<BR>Here it is always in
-			inches.<BR>In EXIF it depends on EXIF_TAG_RESOLUTION_UNIT</FONT></P>
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Vertical
+			resolution in pixels per inch.<BR>Here it is always in inches.<BR>In
+			EXIF it depends on EXIF_TAG_RESOLUTION_UNIT</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">EXIF_TAG_Y_RESOLUTION</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=10%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
 	<TR VALIGN=TOP>
-		<TD WIDTH=13%>
+		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_COMPOSER</FONT></P>
 		</TD>
-		<TD WIDTH=15%>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=10%>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;composer&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
-			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;Name
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Name
 			of the creator of the object, e.g. writer, photographer or graphic
-			artist.&quot;</FONT></P>
+			artist.</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">IPTC_TAG_BYLINE</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=10% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
 	</TR>
 	<TR VALIGN=TOP>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_COPYRIGHT</FONT></P>
 		</TD>
-		<TD WIDTH=15% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=10% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;copyright&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
-			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;Any
-			necessary copyright notice.&quot;</FONT></P>
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">Any
+			necessary copyright notice.</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">IPTC_TAG_COPYRIGHT_NOTICE</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=10%>
 			<P CLASS="western" ALIGN=LEFT>“<FONT SIZE=1 STYLE="font-size: 8pt">dc:rights”</FONT></P>
 		</TD>
 	</TR>
 	<TR VALIGN=TOP>
-		<TD WIDTH=13%>
+		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_DESCRIPTION</FONT></P>
 		</TD>
-		<TD WIDTH=15%>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=10%>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;description&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=11% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
-			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;A
-			textual description of the data&quot;</FONT></P>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">A
+			textual description of the data</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=14% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=13%>
+		<TD WIDTH=13% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">IPTC_TAG_CAPTION</FONT></P>
 		</TD>
-		<TD WIDTH=12%>
+		<TD WIDTH=10% BGCOLOR="#e6e6ff">
 			<P CLASS="western" ALIGN=LEFT>“<FONT SIZE=1 STYLE="font-size: 8pt">dc:description”</FONT></P>
 		</TD>
 	</TR>
 	<TR VALIGN=TOP>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">GST_TAG_TITLE</FONT></P>
 		</TD>
-		<TD WIDTH=15% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=10% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;title&quot;</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=11%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">G_TYPE_STRING</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
-			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">&quot;A
-			shorthand reference for the object.&quot;</FONT></P>
+		<TD WIDTH=14%>
+			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">A
+			shorthand reference for the object.</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=14%>
 			<P CLASS="western" ALIGN=CENTER><FONT SIZE=1 STYLE="font-size: 8pt">-</FONT></P>
 		</TD>
-		<TD WIDTH=13% BGCOLOR="#e6e6ff">
+		<TD WIDTH=13%>
 			<P CLASS="western" ALIGN=LEFT><FONT SIZE=1 STYLE="font-size: 8pt">IPTC_TAG_OBJECT_NAME</FONT></P>
 		</TD>
-		<TD WIDTH=12% BGCOLOR="#e6e6ff">
+		<TD WIDTH=10%>
 			<P CLASS="western" ALIGN=LEFT>“<FONT SIZE=1 STYLE="font-size: 8pt">dc:title”</FONT></P>
 		</TD>
 	</TR>
diff --git a/ext/metadata/metadataexif.c b/ext/metadata/metadataexif.c
index 1be70932..33052869 100644
--- a/ext/metadata/metadataexif.c
+++ b/ext/metadata/metadataexif.c
@@ -140,44 +140,78 @@ typedef struct _tag_MapIntStr
 /* *INDENT-OFF* */
 /* When changing this table, update 'metadata_mapping.htm' file too. */
 static MapIntStr mappedTags[] = {
-  {EXIF_TAG_BRIGHTNESS_VALUE,            /*SRATIONAL,*/ EXIF_IFD_0,
+  {EXIF_TAG_APERTURE_VALUE,              /*RATIONAL,*/ EXIF_IFD_EXIF,
+   GST_TAG_CAPTURE_APERTURE              /*GST_TYPE_FRACTION*/},
+
+  {EXIF_TAG_BRIGHTNESS_VALUE,            /*SRATIONAL,*/ EXIF_IFD_EXIF,
    GST_TAG_CAPTURE_BRIGHTNESS            /*GST_TYPE_FRACTION*/},
-  {EXIF_TAG_CONTRAST,                    /*SHORT,*/     EXIF_IFD_0,
+
+  {EXIF_TAG_CONTRAST,                    /*SHORT,*/     EXIF_IFD_EXIF,
    GST_TAG_CAPTURE_CONTRAST              /*G_TYPE_INT*/},
-  {EXIF_TAG_DIGITAL_ZOOM_RATIO,          /*RATIONAL,*/  EXIF_IFD_0,
+
+  {EXIF_TAG_CUSTOM_RENDERED,             /*SHORT,*/     EXIF_IFD_EXIF,
+   GST_TAG_CAPTURE_CUSTOM_RENDERED       /*G_TYPE_UINT*/},
+
+  {EXIF_TAG_DIGITAL_ZOOM_RATIO,          /*RATIONAL,*/  EXIF_IFD_EXIF,
    GST_TAG_CAPTURE_DIGITAL_ZOOM          /*GST_TYPE_FRACTION*/},
+
   {EXIF_TAG_EXPOSURE_PROGRAM,            /*SHORT,*/     EXIF_IFD_EXIF,
    GST_TAG_CAPTURE_EXPOSURE_PROGRAM      /*G_TYPE_UINT*/},
+
   {EXIF_TAG_EXPOSURE_TIME,               /*RATIONAL,*/  EXIF_IFD_EXIF,
    GST_TAG_CAPTURE_EXPOSURE_TIME         /*GST_TYPE_FRACTION*/},
+
   {EXIF_TAG_FLASH,                       /*SHORT*/      EXIF_IFD_EXIF,
    GST_TAG_CAPTURE_FLASH                 /*G_TYPE_UINT*/},
+
   {EXIF_TAG_FNUMBER,                     /*RATIONAL,*/  EXIF_IFD_EXIF,
    GST_TAG_CAPTURE_FNUMBER               /*GST_TYPE_FRACTION*/},
+
   {EXIF_TAG_FOCAL_LENGTH,                /*SRATIONAL*/  EXIF_IFD_EXIF,
    GST_TAG_CAPTURE_FOCAL_LEN             /*GST_TYPE_FRACTION*/},
-  {EXIF_TAG_GAIN_CONTROL,                /*SHORT,*/     EXIF_IFD_0,
+
+  {EXIF_TAG_GAIN_CONTROL,                /*SHORT,*/     EXIF_IFD_EXIF,
    GST_TAG_CAPTURE_GAIN                  /*G_TYPE_UINT*/},
+
   {EXIF_TAG_ISO_SPEED_RATINGS,           /*SHORT,*/     EXIF_IFD_EXIF,
    GST_TAG_CAPTURE_ISO_SPEED_RATINGS     /*G_TYPE_INT*/},
-  {EXIF_TAG_LIGHT_SOURCE     ,           /*SHORT,*/     EXIF_IFD_EXIF,
+
+  {EXIF_TAG_LIGHT_SOURCE,                /*SHORT,*/     EXIF_IFD_EXIF,
    GST_TAG_CAPTURE_LIGHT_SOURCE          /*G_TYPE_UINT*/},
-  {EXIF_TAG_ORIENTATION     ,           /*SHORT,*/     EXIF_IFD_0,
+
+  {EXIF_TAG_ORIENTATION,                 /*SHORT,*/     EXIF_IFD_0,
    GST_TAG_CAPTURE_ORIENTATION           /*G_TYPE_UINT*/},
-  {EXIF_TAG_SATURATION,                  /*SHORT,*/     EXIF_IFD_0,
+
+  {EXIF_TAG_SATURATION,                  /*SHORT,*/     EXIF_IFD_EXIF,
    GST_TAG_CAPTURE_SATURATION            /*G_TYPE_INT*/},
-  {EXIF_TAG_WHITE_BALANCE,               /*SHORT,*/     EXIF_IFD_0,
+
+  {EXIF_TAG_SHUTTER_SPEED_VALUE,         /*SRATIONAL,*/ EXIF_IFD_EXIF,
+   GST_TAG_CAPTURE_SHUTTER_SPEED         /*GST_TYPE_FRACTION*/},
+
+  {EXIF_TAG_WHITE_BALANCE,               /*SHORT,*/     EXIF_IFD_EXIF,
    GST_TAG_CAPTURE_WHITE_BALANCE         /*G_TYPE_UINT*/},
+
   {EXIF_TAG_SOFTWARE,                    /*ASCII,*/     EXIF_IFD_0,
    GST_TAG_CREATOR_TOOL                  /*G_TYPE_STRING*/},
+
   {EXIF_TAG_MAKE,                        /*ASCII,*/     EXIF_IFD_0,
    GST_TAG_DEVICE_MAKE                   /*G_TYPE_STRING*/},
+
   {EXIF_TAG_MODEL,                       /*ASCII,*/     EXIF_IFD_0,
    GST_TAG_DEVICE_MODEL                  /*G_TYPE_STRING*/},
+
+  {EXIF_TAG_PIXEL_Y_DIMENSION,           /*LONG,*/      EXIF_IFD_EXIF,
+   GST_TAG_IMAGE_HEIGHT                  /*G_TYPE_INT*/},          /* inches */
+
+  {EXIF_TAG_PIXEL_X_DIMENSION,           /*LONG,*/      EXIF_IFD_EXIF,
+   GST_TAG_IMAGE_WIDTH                   /*G_TYPE_INT*/},          /* inches */
+
   {EXIF_TAG_X_RESOLUTION,                /*RATIONAL,*/  EXIF_IFD_0,
    GST_TAG_IMAGE_XRESOLUTION             /*GST_TYPE_FRACTION*/},   /* inches */
+
   {EXIF_TAG_Y_RESOLUTION,                /*RATIONAL,*/  EXIF_IFD_0,
    GST_TAG_IMAGE_YRESOLUTION             /*GST_TYPE_FRACTION*/},   /* inches */
+
   {0, EXIF_IFD_COUNT, NULL}
 };
 /* *INDENT-ON* */
@@ -532,6 +566,9 @@ metadataparse_exif_content_foreach_entry_func (ExifEntry * entry,
           case EXIF_FORMAT_SHORT:
             value = exif_get_short (entry->data, byte_order);
             break;
+          case EXIF_FORMAT_LONG:
+            value = exif_get_long (entry->data, byte_order);
+            break;
           default:
             GST_ERROR ("Unexpected Exif Tag Type (%s - %s)",
                 tag, exif_format_get_name (entry->format));
@@ -685,17 +722,28 @@ metadatamux_exif_for_each_tag_in_list (const GstTagList * list,
         } else {
           gst_tag_list_get_int (list, tag, &value);
         }
-        if (entry->tag == EXIF_TAG_CONTRAST
-            || entry->tag == EXIF_TAG_SATURATION) {
-          if (value < -33)
-            value = 1;          /* low */
-          else if (value < 34)
-            value = 0;          /* normal */
-          else
-            value = 2;          /* high */
+
+        switch (entry->format) {
+          case EXIF_FORMAT_SHORT:
+            if (entry->tag == EXIF_TAG_CONTRAST
+                || entry->tag == EXIF_TAG_SATURATION) {
+              if (value < -33)
+                value = 1;      /* low */
+              else if (value < 34)
+                value = 0;      /* normal */
+              else
+                value = 2;      /* high */
+            }
+            v_short = value;
+            exif_set_short (entry->data, byte_order, v_short);
+            break;
+          case EXIF_FORMAT_LONG:
+            exif_set_long (entry->data, byte_order, value);
+            break;
+          default:
+            break;
         }
-        v_short = value;
-        exif_set_short (entry->data, byte_order, v_short);
+
       }
         break;
       default:
diff --git a/ext/metadata/metadatatags.c b/ext/metadata/metadatatags.c
index c1a16a78..fd4d27e0 100644
--- a/ext/metadata/metadatatags.c
+++ b/ext/metadata/metadatatags.c
@@ -114,6 +114,10 @@ metadata_tags_exif_register (void)
 
   /* capture tags */
 
+  gst_tag_register (GST_TAG_CAPTURE_APERTURE, GST_TAG_FLAG_META,
+      GST_TYPE_FRACTION, GST_TAG_CAPTURE_APERTURE,
+      "Aperture (in APEX units)", NULL);
+
   /* The unit is the APEX value.
      Ordinarily it is given in the range of -99.99 to 99.99.
      if numerator is 0xFFFFFFFF means unknown      
@@ -132,6 +136,15 @@ metadata_tags_exif_register (void)
   gst_tag_register (GST_TAG_CAPTURE_CONTRAST, GST_TAG_FLAG_META, G_TYPE_INT,
       GST_TAG_CAPTURE_CONTRAST, "", NULL);
 
+  /*
+   * 0- Normal process
+   * 1- Custom process
+   */
+
+  gst_tag_register (GST_TAG_CAPTURE_CUSTOM_RENDERED, GST_TAG_FLAG_META,
+      G_TYPE_UINT, GST_TAG_CAPTURE_CUSTOM_RENDERED,
+      "Indicates the use of special processing on image data", NULL);
+
   /* if Zero ZOOM not used
    */
   gst_tag_register (GST_TAG_CAPTURE_DIGITAL_ZOOM, GST_TAG_FLAG_META,
@@ -295,7 +308,11 @@ metadata_tags_exif_register (void)
      *** exif is just 0, 1, 2 (normal, low and high)
    */
   gst_tag_register (GST_TAG_CAPTURE_SATURATION, GST_TAG_FLAG_META, G_TYPE_INT,
-      GST_TAG_CAPTURE_SATURATION, "", NULL);
+      GST_TAG_CAPTURE_SATURATION, "The saturation", NULL);
+
+  gst_tag_register (GST_TAG_CAPTURE_SHUTTER_SPEED, GST_TAG_FLAG_META,
+      GST_TYPE_FRACTION, GST_TAG_CAPTURE_SHUTTER_SPEED, "Shutter speed (APEX)",
+      NULL);
 
   /*
      0- Auto
@@ -331,6 +348,11 @@ metadata_tags_exif_register (void)
 
   /* image tags */
 
+  gst_tag_register (GST_TAG_IMAGE_HEIGHT, GST_TAG_FLAG_META,
+      G_TYPE_UINT, GST_TAG_IMAGE_HEIGHT, "Image height in pixels", NULL);
+  gst_tag_register (GST_TAG_IMAGE_WIDTH, GST_TAG_FLAG_META,
+      G_TYPE_UINT, GST_TAG_IMAGE_WIDTH, "Image width in pixels", NULL);
+
   gst_tag_register (GST_TAG_IMAGE_XRESOLUTION, GST_TAG_FLAG_META,
       GST_TYPE_FRACTION, GST_TAG_IMAGE_XRESOLUTION,
       "Horizontal resolution in pixels per inch", NULL);
diff --git a/ext/metadata/metadatatags.h b/ext/metadata/metadatatags.h
index 053e18fc..0db30c54 100644
--- a/ext/metadata/metadatatags.h
+++ b/ext/metadata/metadatatags.h
@@ -79,8 +79,10 @@ typedef enum {
 
 /* individual tags */
 
+#define GST_TAG_CAPTURE_APERTURE           "capture-aperture"
 #define GST_TAG_CAPTURE_BRIGHTNESS         "capture-brightness"
 #define GST_TAG_CAPTURE_CONTRAST           "capture-contrast"
+#define GST_TAG_CAPTURE_CUSTOM_RENDERED    "capture-custom-rendered"
 #define GST_TAG_CAPTURE_DIGITAL_ZOOM       "capture-digital-zoom"
 #define GST_TAG_CAPTURE_EXPOSURE_PROGRAM   "capture-exposure-program"
 #define GST_TAG_CAPTURE_EXPOSURE_TIME      "capture-exposure-time"
@@ -89,9 +91,10 @@ typedef enum {
 #define GST_TAG_CAPTURE_FOCAL_LEN          "capture-focal-len"
 #define GST_TAG_CAPTURE_GAIN               "capture-gain"
 #define GST_TAG_CAPTURE_ISO_SPEED_RATINGS  "capture-iso-speed-ratings"
-#define GST_TAG_CAPTURE_LIGHT_SOURCE       "capture-light_source"
+#define GST_TAG_CAPTURE_LIGHT_SOURCE       "capture-light-source"
 #define GST_TAG_CAPTURE_ORIENTATION        "capture-orientation"
 #define GST_TAG_CAPTURE_SATURATION         "capture-saturation"
+#define GST_TAG_CAPTURE_SHUTTER_SPEED      "capture-shutter-speed"
 #define GST_TAG_CAPTURE_WHITE_BALANCE      "capture-white-balance"
 
 #define GST_TAG_CREATOR_TOOL               "creator-tool"
@@ -99,6 +102,8 @@ typedef enum {
 #define GST_TAG_DEVICE_MAKE                "device-make"
 #define GST_TAG_DEVICE_MODEL               "device-model"
 
+#define GST_TAG_IMAGE_HEIGHT               "image-height"
+#define GST_TAG_IMAGE_WIDTH                "image-width"
 #define GST_TAG_IMAGE_XRESOLUTION          "image-xresolution"
 #define GST_TAG_IMAGE_YRESOLUTION          "image-yresolution"
 
-- 
cgit v1.2.1