[panotools-cvs] /hgroot/panotools/libpano: Modified scale calculation for orthog...

[<pan...@li...>]

branch:     
details:    http://panotools.hg.sourceforge.net/hgweb/panotools/panotools/hgroot/panotools/libpano/rev/b2f10b688fd6
changeset:  768:b2f10b688fd6
user:       tmodes
date:       Sat Jan 12 10:21:32 2013 +0100
description:

Modified scale calculation for orthographic images

This takes into account the issue that the image could also contain
a thin black border around the (circular) image.

diffstat:

 adjust.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 376cc090f008 -r b2f10b688fd6 adjust.c
--- a/adjust.c	Fri Dec 28 13:39:28 2012 +0100
+++ b/adjust.c	Sat Jan 12 10:21:32 2013 +0100
@@ -813,7 +813,11 @@
       mp->scale[0] = (double) image_selection_width / (4.0 * sin(a/4.0)) / mp->distance;
       break;
     case _orthographic:
-      mp->scale[0] = (double) image_selection_width / (2.0 * sin(a/2.0)) / mp->distance;
+      {
+          //generate monotonic scale function to help optimizer
+          int t=(int)ceil((a-PI)/(2.0*PI));
+          mp->scale[0] = (double) image_selection_width / (2.0 * (2 * t + pow(-1.0, t) * sin(a/2.0))) / mp->distance;
+      };
       break;
     case _thoby:
       mp->scale[0] = (double) image_selection_width / (2.0 * THOBY_K1_PARM * sin(a * THOBY_K2_PARM /2.0)) / mp->distance;
@@ -1259,7 +1263,11 @@
             mp->scale[0] = (double) im->width / (4.0 * sin(a/4.0)) / mp->distance;
             break;
         case _orthographic:
-            mp->scale[0] = (double) im->width / (2.0 * sin(a/2.0)) / mp->distance;
+            {
+                //generate monotonic scale function to help optimizer
+                int t=(int)ceil((a-PI)/(2.0*PI));
+                mp->scale[0] = (double) im->width / (2.0 * (2 * t + pow(-1.0, t) * sin(a/2.0))) / mp->distance;
+            };
             break;
         case _thoby:
             mp->scale[0] = (double) im->width / (2.0 * THOBY_K1_PARM * sin(a * THOBY_K2_PARM/2.0)) / mp->distance;