From: <st...@us...> - 2009-09-19 07:30:38
|
Revision: 4458 http://hugin.svn.sourceforge.net/hugin/?rev=4458&view=rev Author: stativ Date: 2009-09-19 07:30:29 +0000 (Sat, 19 Sep 2009) Log Message: ----------- Revert the change to the handling of output in hugin_hdrmerge. I missed that ImageExportInfo.getFileType() is not implemented (returns "") so it didn't work at all. Modified Paths: -------------- hugin/branches/gsoc2009_deghosting/src/tools/hugin_hdrmerge.cpp Modified: hugin/branches/gsoc2009_deghosting/src/tools/hugin_hdrmerge.cpp =================================================================== --- hugin/branches/gsoc2009_deghosting/src/tools/hugin_hdrmerge.cpp 2009-09-19 07:00:21 UTC (rev 4457) +++ hugin/branches/gsoc2009_deghosting/src/tools/hugin_hdrmerge.cpp 2009-09-19 07:30:29 UTC (rev 4458) @@ -311,12 +311,8 @@ } ImageExportInfo exinfo(outputFile.c_str()); exinfo.setPixelType("FLOAT"); - if (strcmp(exinfo.getFileType(),"HDR")) { - exportImage(srcImageRange(output), exinfo); - } else { - BImage alpha(output.width(), output.height(), 255); - exportImageAlpha(srcImageRange(output), srcImage(alpha), exinfo); - } + BImage alpha(output.width(), output.height(), 255); + exportImageAlpha(srcImageRange(output), srcImage(alpha), exinfo); } else if (mode == "avg") { // apply weighted average functor with // heuristic to deal with pixels that are overexposed in all images @@ -343,12 +339,8 @@ } ImageExportInfo exinfo(outputFile.c_str()); exinfo.setPixelType("FLOAT"); - if (strcmp(exinfo.getFileType(),"HDR")) { - exportImage(srcImageRange(output), exinfo); - } else { - BImage alpha(output.width(), output.height(), 255); - exportImageAlpha(srcImageRange(output), srcImage(alpha), exinfo); - } + BImage alpha(output.width(), output.height(), 255); + exportImageAlpha(srcImageRange(output), srcImage(alpha), exinfo); } else { std::cerr << "Unknown merge mode, see help for a list of possible modes" << std::endl; return 1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |