commit 6ad70389f554359d2c16120bc4d1df190ab74ae6
author Ruben Brunk <rubenbrunk@google.com> Fri Jun 12 10:19:40 2015 -0700
committer Ruben Brunk <rubenbrunk@google.com> Mon Jun 15 15:32:42 2015 -0700
tree 7fde73df557eec519ba46fcbe63b2ba08f7f5457
parent ced125957686293054a572ca0319a2a90888f98e

Add addional scale component for radialDistortion.

Bug: 20491394
Change-Id: I4646da03a0d7f4483de71cc3e6c5a15f04b5ee58

camera/docs/docs.html

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index e5ae1e9..e05d55e 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -12275,7 +12275,7 @@
                 <span class="entry_type_container">x</span>
 
                 <span class="entry_type_array">
-                  5
+                  6
                 </span>
               <span class="entry_type_visibility"> [public]</span>
 
@@ -12312,13 +12312,13 @@
           </tr>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
-              <p>Three radial distortion coefficients <code>[kappa_<wbr/>1,<wbr/> kappa_<wbr/>2,<wbr/>
+              <p>Four radial distortion coefficients <code>[kappa_<wbr/>0,<wbr/> kappa_<wbr/>1,<wbr/> kappa_<wbr/>2,<wbr/>
 kappa_<wbr/>3]</code> and two tangential distortion coefficients
 <code>[kappa_<wbr/>4,<wbr/> kappa_<wbr/>5]</code> that can be used to correct the
 lens's geometric distortion with the mapping equations:</p>
-<pre><code> x_<wbr/>c = x_<wbr/>i * ( 1 + kappa_<wbr/>1 * r^2 + kappa_<wbr/>2 * r^4 + kappa_<wbr/>3 * r^6 ) +
+<pre><code> x_<wbr/>c = x_<wbr/>i * ( kappa_<wbr/>0 + kappa_<wbr/>1 * r^2 + kappa_<wbr/>2 * r^4 + kappa_<wbr/>3 * r^6 ) +
        kappa_<wbr/>4 * (2 * x_<wbr/>i * y_<wbr/>i) + kappa_<wbr/>5 * ( r^2 + 2 * x_<wbr/>i^2 )
- y_<wbr/>c = y_<wbr/>i * ( 1 + kappa_<wbr/>1 * r^2 + kappa_<wbr/>2 * r^4 + kappa_<wbr/>3 * r^6 ) +
+ y_<wbr/>c = y_<wbr/>i * ( kappa_<wbr/>0 + kappa_<wbr/>1 * r^2 + kappa_<wbr/>2 * r^4 + kappa_<wbr/>3 * r^6 ) +
        kappa_<wbr/>5 * (2 * x_<wbr/>i * y_<wbr/>i) + kappa_<wbr/>4 * ( r^2 + 2 * y_<wbr/>i^2 )
 </code></pre>
 <p>Here,<wbr/> <code>[x_<wbr/>c,<wbr/> y_<wbr/>c]</code> are the coordinates to sample in the
@@ -13087,7 +13087,7 @@
                 <span class="entry_type_container">x</span>
 
                 <span class="entry_type_array">
-                  5
+                  6
                 </span>
               <span class="entry_type_visibility"> [public]</span>
 
@@ -13124,13 +13124,13 @@
           </tr>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
-              <p>Three radial distortion coefficients <code>[kappa_<wbr/>1,<wbr/> kappa_<wbr/>2,<wbr/>
+              <p>Four radial distortion coefficients <code>[kappa_<wbr/>0,<wbr/> kappa_<wbr/>1,<wbr/> kappa_<wbr/>2,<wbr/>
 kappa_<wbr/>3]</code> and two tangential distortion coefficients
 <code>[kappa_<wbr/>4,<wbr/> kappa_<wbr/>5]</code> that can be used to correct the
 lens's geometric distortion with the mapping equations:</p>
-<pre><code> x_<wbr/>c = x_<wbr/>i * ( 1 + kappa_<wbr/>1 * r^2 + kappa_<wbr/>2 * r^4 + kappa_<wbr/>3 * r^6 ) +
+<pre><code> x_<wbr/>c = x_<wbr/>i * ( kappa_<wbr/>0 + kappa_<wbr/>1 * r^2 + kappa_<wbr/>2 * r^4 + kappa_<wbr/>3 * r^6 ) +
        kappa_<wbr/>4 * (2 * x_<wbr/>i * y_<wbr/>i) + kappa_<wbr/>5 * ( r^2 + 2 * x_<wbr/>i^2 )
- y_<wbr/>c = y_<wbr/>i * ( 1 + kappa_<wbr/>1 * r^2 + kappa_<wbr/>2 * r^4 + kappa_<wbr/>3 * r^6 ) +
+ y_<wbr/>c = y_<wbr/>i * ( kappa_<wbr/>0 + kappa_<wbr/>1 * r^2 + kappa_<wbr/>2 * r^4 + kappa_<wbr/>3 * r^6 ) +
        kappa_<wbr/>5 * (2 * x_<wbr/>i * y_<wbr/>i) + kappa_<wbr/>4 * ( r^2 + 2 * y_<wbr/>i^2 )
 </code></pre>
 <p>Here,<wbr/> <code>[x_<wbr/>c,<wbr/> y_<wbr/>c]</code> are the coordinates to sample in the

camera/docs/metadata_properties.xml

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index c763664..75a4a09 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -3716,7 +3716,7 @@
         <entry name="radialDistortion" type="float" visibility="public"
                container="array">
           <array>
-            <size>5</size>
+            <size>6</size>
           </array>
           <description>
             The correction coefficients to correct for this camera device's
@@ -3726,14 +3726,14 @@
             Unitless coefficients.
           </units>
           <details>
-            Three radial distortion coefficients `[kappa_1, kappa_2,
+            Four radial distortion coefficients `[kappa_0, kappa_1, kappa_2,
             kappa_3]` and two tangential distortion coefficients
             `[kappa_4, kappa_5]` that can be used to correct the
             lens's geometric distortion with the mapping equations:
 
-                 x_c = x_i * ( 1 + kappa_1 * r^2 + kappa_2 * r^4 + kappa_3 * r^6 ) +
+                 x_c = x_i * ( kappa_0 + kappa_1 * r^2 + kappa_2 * r^4 + kappa_3 * r^6 ) +
                        kappa_4 * (2 * x_i * y_i) + kappa_5 * ( r^2 + 2 * x_i^2 )
-                 y_c = y_i * ( 1 + kappa_1 * r^2 + kappa_2 * r^4 + kappa_3 * r^6 ) +
+                 y_c = y_i * ( kappa_0 + kappa_1 * r^2 + kappa_2 * r^4 + kappa_3 * r^6 ) +
                        kappa_5 * (2 * x_i * y_i) + kappa_4 * ( r^2 + 2 * y_i^2 )
 
             Here, `[x_c, y_c]` are the coordinates to sample in the