[Hugin-cvs] hugin/src/hugin wxPanoCommand.cpp,1.3,1.4

[Pablo d'A. <da...@us...>]

Update of /cvsroot/hugin/hugin/src/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5694/src/hugin

Modified Files:
	wxPanoCommand.cpp 
Log Message:
use MainFrame as parent window for HFOVDialog, unfortunately, still leads to a crash..


Index: wxPanoCommand.cpp
===================================================================
RCS file: /cvsroot/hugin/hugin/src/hugin/wxPanoCommand.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- wxPanoCommand.cpp	30 Dec 2006 17:46:59 -0000	1.3
+++ wxPanoCommand.cpp	31 Dec 2006 14:50:16 -0000	1.4
@@ -197,7 +197,7 @@
 #endif
         // if no similar image found, ask user
         if (! ok) {
-            getLensDataFromUser(srcImg, focalLength, cropFactor);
+            getLensDataFromUser(MainFrame::Get(), srcImg, focalLength, cropFactor);
         }
 
         if( srcImg.getSize().x == 0) {
@@ -230,8 +230,8 @@
             matchingLensNr = pano.addLens(lens);
         }
         PanoImage img(filename, srcImg.getSize().x, srcImg.getSize().y, (unsigned int) matchingLensNr);
-        int i = pano.addImage(img, vars);
-        pano.setSrcImage(i, srcImg);
+        int imgNr = pano.addImage(img, vars);
+        pano.setSrcImage(imgNr, srcImg);
     }
     pano.changeFinished();
 }
@@ -312,7 +312,7 @@
                 // something is wrong here, try to read from exif data
                 bool ok = initImageFromFile(srcImg, focalLength, cropFactor);
                 if (! ok) {
-                    getLensDataFromUser(srcImg, focalLength, cropFactor);
+                    getLensDataFromUser(MainFrame::Get(), srcImg, focalLength, cropFactor);
                 }
                 pano.setSrcImage(i, srcImg);
             }