manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added path for the images

This commit is contained in:
ganovelli 2012-01-19 13:50:15 +00:00
parent f64b175b13
commit c6d261e5c8
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wrap/io_trimesh/import_out.h
View File

@ -91,12 +91,12 @@ static bool ReadHeader(const char * filename,unsigned int &num_cams, unsigned in
static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> > & shots, static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> > & shots,
std::vector<std::string > & image_filenames, std::vector<std::string > & image_filenames,
const char * filename,const char * filename_images, CallBackPos *cb=0) const char * filename,const char * filename_images, const char * filename_images_path = "",CallBackPos *cb=0)
{ {
unsigned int num_cams,num_points; unsigned int num_cams,num_points;
FILE *fp = fopen(filename,"r"); FILE *fp = fopen(filename,"r");
if(!fp) return false; if(!fp) return false;
ReadHeader(fp, num_cams, num_points); ReadHeader(fp, num_cams, num_points);
char line[100]; char line[100];
@ -130,7 +130,7 @@ static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> > & shots,
shots[i].Intrinsics.FocalMm = f; shots[i].Intrinsics.FocalMm = f;
shots[i].Intrinsics.k[0] = 0.0;//k1; To be uncommented when distortion is taken into account reliably shots[i].Intrinsics.k[0] = 0.0;//k1; To be uncommented when distortion is taken into account reliably
shots[i].Intrinsics.k[1] = 0.0;//k2; shots[i].Intrinsics.k[1] = 0.0;//k2;
AddIntrinsics(shots[i],image_filenames[i].c_str()); AddIntrinsics(shots[i], std::string(filename_images_path).append(image_filenames[i]).c_str());
} }
// load all correspondences // load all correspondences
@ -160,13 +160,6 @@ static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> > & shots,
return (shots.size() == 0); return (shots.size() == 0);
} }
static int Open( OpenMeshType &m, std::vector<Shot<typename OpenMeshType::ScalarType> > shots, const char * filename_out,const char * filename_list, CallBackPos *cb=0){
ReadHeader(filename_out);
std::vector<std::string> image_filenames;
ReadImagesFilenames(filename_list,image_filenames);
return Open( m, shots,filename_out, image_filenames, cb);
}
static bool ReadImagesFilenames(const char * filename,std::vector<std::string> &image_filenames) static bool ReadImagesFilenames(const char * filename,std::vector<std::string> &image_filenames)
{ {