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

dellepiane: fixed AddIntrinsics function, now it works (provided that metadata are present...)

This commit is contained in:
matteodelle 2012-04-24 15:00:49 +00:00
parent 4c44513d4f
commit 4e6f8f55f5
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wrap/io_trimesh/import_out.h
View File

@ -33,7 +33,8 @@
extern "C" extern "C"
{ {
#include <jhead.h> #include <jhead.h>
void ProcessFile(const char * FileName); int ReadJpegSections (FILE * infile, ReadMode_t ReadMode);
void ResetJpgfile(void);
} }
namespace vcg { namespace vcg {
@ -134,7 +135,8 @@ 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], std::string(filename_images_path).append(image_filenames[i]).c_str()); shots[i].Intrinsics.PixelSizeMm = vcg::Point2f(1,1);
AddIntrinsics(shots[i], std::string(filename_images_path).append(image_filenames[i]).c_str());
} }
// load all correspondences // load all correspondences
@ -186,12 +188,19 @@ static bool ReadImagesFilenames(const char * filename,std::vector<std::string>
static bool AddIntrinsics(vcg::Shotf &shot, const char * image_file) static bool AddIntrinsics(vcg::Shotf &shot, const char * image_file)
{ {
::ProcessFile(image_file); ::ResetJpgfile();
shot.Intrinsics.ViewportPx = vcg::Point2i(ImageInfo.Width, ImageInfo.Height); QFile img(image_file);
shot.Intrinsics.CenterPx = vcg::Point2f(float(ImageInfo.Width/2.0), float(ImageInfo.Height/2.0)); img.open(QIODevice::ReadWrite);
int FileDescriptor = img.handle();
FILE* pFile = fdopen(FileDescriptor, "rb");
if (!pFile) return false;
int ret = ::ReadJpegSections (pFile, READ_METADATA);
img.close();
shot.Intrinsics.PixelSizeMm = vcg::Point2f(1,1); shot.Intrinsics.ViewportPx = vcg::Point2i(ImageInfo.Width, ImageInfo.Height);
return true; shot.Intrinsics.CenterPx = vcg::Point2f(float(ImageInfo.Width/2.0), float(ImageInfo.Height/2.0));
return true;
} }
}; // end class }; // end class