[Hugin-cvs] SF.net SVN: hugin:[3931] hugin/branches/gsoc2009_deghosting/src/deghosting

[<st...@us...>]

Revision: 3931
          http://hugin.svn.sourceforge.net/hugin/?rev=3931&view=rev
Author:   stativ
Date:     2009-06-09 10:49:46 +0000 (Tue, 09 Jun 2009)

Log Message:
-----------
Removed unnecessary exrInfo vector

Modified Paths:
--------------
    hugin/branches/gsoc2009_deghosting/src/deghosting/khan.cpp
    hugin/branches/gsoc2009_deghosting/src/deghosting/support.h

Modified: hugin/branches/gsoc2009_deghosting/src/deghosting/khan.cpp
===================================================================
--- hugin/branches/gsoc2009_deghosting/src/deghosting/khan.cpp	2009-06-09 10:49:11 UTC (rev 3930)
+++ hugin/branches/gsoc2009_deghosting/src/deghosting/khan.cpp	2009-06-09 10:49:46 UTC (rev 3931)
@@ -104,7 +104,6 @@
     std::vector<FImagePtr> imgWeights;
 
     //file infos for images
-    vector<ImageImportInfo> exrInfo;
     vector<ImageImportInfo> grayInfo;
 
     //load images and prepare initial weights
@@ -120,7 +119,6 @@
 
     if(verbosity >1)
         cout << "Loading source image: " << inputFiles[i].c_str() << endl;
-    exrInfo.push_back(info);
     BImagePtr origGray(new BImage(info.size()));
     FRGBImage img(info.size());
     FImagePtr gray(new FImage(info.size()));
@@ -259,7 +257,7 @@
     if(verbosity > 1)
         cout << "Remappin input images" << endl;
 
-    if((width = Fimages2Vectors(exrInfo,
+    if((width = Fimages2Vectors(inputFiles,
         alpha_images, grayImages, &source_images, &img_bounds)) == -1) {
 
         cerr << "Error converting images to vectors" << endl;
@@ -274,7 +272,7 @@
     height = source_images.size()/width;
 
 
-    if(Fimages2Vectors(exrInfo, alpha_images, imgWeights, &weights) == -1) {
+    if(Fimages2Vectors(inputFiles, alpha_images, imgWeights, &weights) == -1) {
         cerr << "Error converting images to vectors" << endl;
         cerr << "Perhaps *_gray.pgm files missing from command line?" << endl;
         abort();

Modified: hugin/branches/gsoc2009_deghosting/src/deghosting/support.h
===================================================================
--- hugin/branches/gsoc2009_deghosting/src/deghosting/support.h	2009-06-09 10:49:11 UTC (rev 3930)
+++ hugin/branches/gsoc2009_deghosting/src/deghosting/support.h	2009-06-09 10:49:46 UTC (rev 3931)
@@ -71,12 +71,12 @@
   * @param output_bounds Rectangles that store each image's offset and size
   * @return The width of the composite image
   */
-int Fimages2Vectors(const std::vector<vigra::ImageImportInfo> &file_info,
+int Fimages2Vectors(const std::vector<std::string> &input_files,
                         const std::vector<BImagePtr> &alpha_images,
                         const std::vector<FImagePtr> &input_images,
                         std::vector<std::vector<float> > *return_image,
                         std::vector<vigra::Rect2D> *output_bounds = NULL);
-int Bimages2Vectors(const std::vector<vigra::ImageImportInfo> &file_info,
+int Bimages2Vectors(const std::vector<std::string> &input_files,
                         const std::vector<BImagePtr> &alpha_images,
                         const std::vector<BImagePtr> &input_images,
                         std::vector<std::vector<char> > *return_image,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.