From: <da...@us...> - 2008-10-25 06:12:32
|
Revision: 3520 http://hugin.svn.sourceforge.net/hugin/?rev=3520&view=rev Author: dangelo Date: 2008-10-25 06:12:28 +0000 (Sat, 25 Oct 2008) Log Message: ----------- merged rev 3519 from release-0.7.0 into trunk Revision Links: -------------- http://hugin.svn.sourceforge.net/hugin/?rev=3519&view=rev Modified Paths: -------------- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp =================================================================== --- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2008-10-24 19:24:12 UTC (rev 3519) +++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2008-10-25 06:12:28 UTC (rev 3520) @@ -45,7 +45,13 @@ vector<UIntSet> getHDRStacks(const PanoramaData & pano, UIntSet allImgs) { vector<UIntSet> result; - if(pano.getNrOfImages() == 0) return result; + + // if no images are available, return empty result vector + if ( allImgs.empty() ) + { + return result; + } + UIntSet stack; do { @@ -78,7 +84,13 @@ vector<UIntSet> getExposureLayers(const PanoramaData & pano, UIntSet allImgs) { vector<UIntSet> result; - if(pano.getNrOfImages() == 0) return result; + + // if no images are available, return empty result vector + if ( allImgs.empty() ) + { + return result; + } + UIntSet stack; do { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-02-10 23:22:47
|
Revision: 3636 http://hugin.svn.sourceforge.net/hugin/?rev=3636&view=rev Author: brunopostle Date: 2009-02-10 21:30:45 +0000 (Tue, 10 Feb 2009) Log Message: ----------- Fix stack detection when spanning 180 degree boundary, bug #2084923 Modified Paths: -------------- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp =================================================================== --- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-02-10 11:15:52 UTC (rev 3635) +++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-02-10 21:30:45 UTC (rev 3636) @@ -62,11 +62,13 @@ // find all images that have a suitable overlap. SrcPanoImage simg = pano.getSrcImage(srcImg); double maxShift = simg.getHFOV() / 10.0; + double minShift = 360.0 - maxShift; for (UIntSet::iterator it = allImgs.begin(); it != allImgs.end(); ) { unsigned srcImg2 = *it; it++; SrcPanoImage simg2 = pano.getSrcImage(srcImg2); - if ( fabs(simg.getYaw() - simg2.getYaw()) < maxShift + if ( (fabs(simg.getYaw() - simg2.getYaw()) < maxShift + || fabs(simg.getYaw() - simg2.getYaw()) > minShift) && fabs(simg.getPitch() - simg2.getPitch()) < maxShift ) { stack.insert(srcImg2); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-02-25 08:23:01
|
Revision: 3668 http://hugin.svn.sourceforge.net/hugin/?rev=3668&view=rev Author: stativ Date: 2009-02-25 08:22:56 +0000 (Wed, 25 Feb 2009) Log Message: ----------- Beautified PanoramaMakefileExport.cpp Modified Paths: -------------- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp =================================================================== --- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-02-24 23:16:52 UTC (rev 3667) +++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-02-25 08:22:56 UTC (rev 3668) @@ -78,10 +78,10 @@ result.push_back(stack); stack.clear(); } while (allImgs.size() > 0); - + return result; } - + // should be moved somewhere else (will be after GSOC anyway) vector<UIntSet> getExposureLayers(const PanoramaData & pano, UIntSet allImgs) { @@ -126,13 +126,13 @@ { UIntSet images; PanoramaOptions opts = pano.getOptions(); - for (UIntSet::const_iterator it = activeImages.begin(); it != activeImages.end(); ++it) - { - Rect2D roi = estimateOutputROI(pano, opts, *it); - if (! (roi.isEmpty())) { - images.insert(*it); - } - } + for (UIntSet::const_iterator it = activeImages.begin(); it != activeImages.end(); ++it) + { + Rect2D roi = estimateOutputROI(pano, opts, *it); + if (! (roi.isEmpty())) { + images.insert(*it); + } + } return images; } @@ -156,8 +156,8 @@ setlocale(LC_NUMERIC,"C"); #endif - // output only images in current ROI - UIntSet images = getImagesinROI(pano,rimages); + // output only images in current ROI + UIntSet images = getImagesinROI(pano,rimages); // execute exiftool with perl if necessary #ifdef COULD_EXECUTE_EXIFTOOL_WITH_PERL @@ -172,13 +172,13 @@ } #endif #endif - + o << "# makefile for panorama stitching, created by hugin " << endl << endl; // pass settings for different temporary directory if (tmpDir != "") { - o << "# set temporary directory" << endl; + o << "# set temporary directory" << endl; #ifdef __unix__ o << "export TMPDIR=" << quoteStringShell(tmpDir) << endl; #else // WINDOWS @@ -207,15 +207,6 @@ << "EXIFTOOL=" << quoteStringShell(progs.exiftool) << endl #endif << endl -// This is completely unnecessary because it should be handled by default values in struct progs -// << "ifndef ENBLEND" << endl -// << " ENBLEND=false" << endl -// << "endif" << endl -// << endl -// << "ifndef ENFUSE" << endl -// << " ENFUSE=false" << endl -// << "endif" << endl -// << endl << "# Project parameters" << endl << "HUGIN_PROJECTION=" << opts.getProjection() << endl @@ -226,44 +217,87 @@ << "# options for the programs" << endl << endl; - o << "NONA_LDR_REMAPPED_COMP="; - if (opts.outputImageType == "tif" && opts.outputLayersCompression.size() != 0) { - o << "-z " << opts.outputLayersCompression; - } else if (opts.outputImageType == "jpg") { - o << "-z PACKBITS "; + // set remapper specific settings + switch(opts.remapper) { + case PanoramaOptions::NONA: + { + o << "NONA_LDR_REMAPPED_COMP="; + if (opts.outputImageType == "tif" && opts.outputLayersCompression.size() != 0) { + o << "-z " << opts.outputLayersCompression; + } else if (opts.outputImageType == "jpg") { + o << "-z PACKBITS "; + } + o << endl; + } + break; + case PanoramaOptions::PTMENDER: + break; } - o << endl; - o << "ENBLEND_OPTS=" << opts.enblendOptions; - if (opts.getHFOV() == 360.0) { - // blend over the border - o << " -w"; - } + // set blender specific settings + switch(opts.blendMode) { + case PanoramaOptions::ENBLEND_BLEND: + { + o << "ENBLEND_OPTS=" << opts.enblendOptions; + if (opts.getHFOV() == 360.0) { + // blend over the border + o << " -w"; + } + vigra::Rect2D roi = opts.getROI(); + if (roi.top() != 0 || roi.left() != 0 ) { + o << " -f" << roi.width() << "x" << roi.height() << "+" << roi.left() << "+" << roi.top(); + } else { + o << " -f" << roi.width() << "x" << roi.height(); + } + o << endl; - vigra::Rect2D roi = opts.getROI(); - if (roi.top() != 0 || roi.left() != 0 ) { - o << " -f" << roi.width() << "x" << roi.height() << "+" << roi.left() << "+" << roi.top(); - } else { - o << " -f" << roi.width() << "x" << roi.height(); + o << "ENBLEND_LDR_COMP="; + if (opts.outputImageType == "tif" && opts.outputImageTypeCompression.size() != 0) { + o << "--compression " << opts.outputImageTypeCompression; + } else if (opts.outputImageType == "jpg") { + o << "--compression " << opts.quality; + } + o << endl; + + o << "ENBLEND_HDR_COMP="; + if (opts.outputImageType == "tif" && opts.outputImageTypeHDRCompression.size() != 0) { + o << "--compression " << opts.outputImageTypeHDRCompression; + } + o << endl; + } + break; + case PanoramaOptions::PTBLENDER_BLEND: + { + o << "PTBLENDER_OPTS="; + switch (opts.colorCorrection) { + case PanoramaOptions::NONE: + break; + case PanoramaOptions::BRIGHTNESS_COLOR: + o << " -k " << opts.colorReferenceImage; + break; + case PanoramaOptions::BRIGHTNESS: + o << " -k " << opts.colorReferenceImage; + break; + case PanoramaOptions::COLOR: + o << " -k " << opts.colorReferenceImage; + break; + } + o << endl; + } + break; + case PanoramaOptions::SMARTBLEND_BLEND: + { + o << "SMARTBLEND_OPTS=" << progs.smartblend_opts; + if (opts.getHFOV() == 360.0) { + // blend over the border + o << " -w"; + } + o << endl; + // TODO: build smartblend command line from given images. (requires additional program) + } + break; } - o << endl; - - o << "ENBLEND_LDR_COMP="; - if (opts.outputImageType == "tif" && opts.outputImageTypeCompression.size() != 0) { - o << "--compression " << opts.outputImageTypeCompression; - } else if (opts.outputImageType == "jpg") { - o << "--compression " << opts.quality; - } - o << endl; - - o << "ENBLEND_HDR_COMP="; - if (opts.outputImageType == "tif" && opts.outputImageTypeHDRCompression.size() != 0) { - o << "--compression " << opts.outputImageTypeHDRCompression; - } - o << endl; - - o << "ENFUSE_OPTS=" << opts.enfuseOptions; // TODO: blend only over border if this is indeed a // image with 360 deg overlap @@ -547,7 +581,7 @@ } o << endl << endl; - + vector<string> ldrStackedImages; o << endl << "# stacked images for enfuse or other automatic exposure blending tools" << endl @@ -592,7 +626,7 @@ o << "$(LDR_STACK_" << i << "_SHELL) "; o << endl; - + // TODO: include custom makefile here if (includePath.size() > 0) { o << "include " << escapeStringMake(includePath) << endl << endl; @@ -726,12 +760,12 @@ { string destImg = escapeStringMake(similarExposureRemappedImages[j]); string srcImg = escapeStringMake(pano.getImage(*it).getFilename()); - /* + /* o << destImg << ": " << srcImg << " $(PROJECT_FILE)" << endl << "\t$(NONA) -r ldr -e $(LDR_EXPOSURE_LAYER_" << i << "_EXPOSURE) -m " << ldrRemappedMode << " -o $(LDR_EXPOSURE_REMAPPED_PREFIX) -i " << *it << " $(PROJECT_FILE)" << endl << endl; - */ + */ o << destImg << ": " << srcImg << " $(PROJECT_FILE)" << endl << "\t$(NONA) $(NONA_LDR_REMAPPED_COMP) -r ldr -e " << pano.getSrcImage(*it).getExposureValue() << " -m " << ldrRemappedMode << " -o $(LDR_EXPOSURE_REMAPPED_PREFIX_SHELL) -i " << *it @@ -817,30 +851,9 @@ break; case PanoramaOptions::PTBLENDER_BLEND: - o << "PTBLENDER_OPTS="; - switch (opts.colorCorrection) { - case PanoramaOptions::NONE: - break; - case PanoramaOptions::BRIGHTNESS_COLOR: - o << " -k " << opts.colorReferenceImage; - break; - case PanoramaOptions::BRIGHTNESS: - o << " -k " << opts.colorReferenceImage; - break; - case PanoramaOptions::COLOR: - o << " -k " << opts.colorReferenceImage; - break; - } - o << endl; // TODO: output PTBlender + PTmasker + PTroller rules break; case PanoramaOptions::SMARTBLEND_BLEND: - o << "SMARTBLEND_OPTS=" << progs.smartblend_opts; - if (opts.getHFOV() == 360.0) { - // blend over the border - o << " -w"; - } - o << endl; // TODO: build smartblend command line from given images. (requires additional program) break; default: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-03-11 07:33:14
|
Revision: 3719 http://hugin.svn.sourceforge.net/hugin/?rev=3719&view=rev Author: stativ Date: 2009-03-11 07:33:03 +0000 (Wed, 11 Mar 2009) Log Message: ----------- Changed all tests to be non-fatal. This will be probably changed after 0.8 release. Modified Paths: -------------- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp =================================================================== --- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-03-11 06:34:20 UTC (rev 3718) +++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-03-11 07:33:03 UTC (rev 3719) @@ -732,7 +732,7 @@ switch(opts.remapper) { case PanoramaOptions::NONA: o << "\t@echo -n 'Checking nona...'" << endl - << "\t@$(NONA) --help > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; + << "\t@-$(NONA) --help > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; break; case PanoramaOptions::PTMENDER: break; @@ -741,23 +741,23 @@ switch(opts.blendMode) { case PanoramaOptions::ENBLEND_BLEND: o << "\t@echo -n 'Checking enblend...'" << endl - << "\t@$(ENBLEND) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; + << "\t@-$(ENBLEND) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; break; case PanoramaOptions::PTBLENDER_BLEND: o << "\t@echo -n 'Checking PTblender...'" << endl - << "\t@$(PTBLENDER) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; + << "\t@-$(PTBLENDER) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; break; case PanoramaOptions::SMARTBLEND_BLEND: o << "\t@echo -n 'Checking smartblend...'" << endl - << "\t@$(SMARTBLEND) > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; + << "\t@-$(SMARTBLEND) > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; break; } // test enfuse o << "\t@echo -n 'Checking enfuse...'" << endl - << "\t@$(ENFUSE) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; + << "\t@-$(ENFUSE) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; // test hugin_hdrmerge o << "\t@echo -n 'Checking hugin_hdrmerge...'" << endl - << "\t@$(HDRMERGE) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; + << "\t@-$(HDRMERGE) -h > " << NULL_DEVICE << " 2>&1 && echo '[OK]'" << endl; // test exiftool o << "\t@echo -n 'Checking exiftool...'" << endl << "\t@-$(EXIFTOOL) -ver > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-06-05 17:50:29
|
Revision: 3922 http://hugin.svn.sourceforge.net/hugin/?rev=3922&view=rev Author: stativ Date: 2009-06-05 17:50:20 +0000 (Fri, 05 Jun 2009) Log Message: ----------- Fixed test target check for rm on OS X. Thanks to Yulia Kotseruba for the idea. Modified Paths: -------------- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp =================================================================== --- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-06-05 16:18:18 UTC (rev 3921) +++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-06-05 17:50:20 UTC (rev 3922) @@ -763,7 +763,11 @@ << "\t@-$(EXIFTOOL) -ver > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl; // test rm o << "\t@echo -n 'Checking rm...'" << endl +#ifdef MAC_OS_X + << "\t@-which $(RM) > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl; +#else << "\t@-$(RM) --version > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl; +#endif o << endl; // ============================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-06-14 11:53:50
|
Revision: 3943 http://hugin.svn.sourceforge.net/hugin/?rev=3943&view=rev Author: brunopostle Date: 2009-06-14 11:53:40 +0000 (Sun, 14 Jun 2009) Log Message: ----------- Don't test 'rm' as behaviour is inconsistent across platforms Modified Paths: -------------- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp =================================================================== --- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-06-14 11:03:38 UTC (rev 3942) +++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-06-14 11:53:40 UTC (rev 3943) @@ -762,12 +762,14 @@ o << "\t@echo -n 'Checking exiftool...'" << endl << "\t@-$(EXIFTOOL) -ver > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl; // test rm +/* Needs to be replaced by a test that creates and deletes a file in the TEMP dir o << "\t@echo -n 'Checking rm...'" << endl #ifdef MAC_OS_X << "\t@-which $(RM) > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl; #else << "\t@-$(RM) --version > " << NULL_DEVICE << " 2>&1 && echo '[OK]' || echo '[FAIL]'" << endl; #endif +*/ o << endl; // ============================== This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-08-13 22:46:28
|
Revision: 4207 http://hugin.svn.sourceforge.net/hugin/?rev=4207&view=rev Author: brunopostle Date: 2009-08-13 22:46:21 +0000 (Thu, 13 Aug 2009) Log Message: ----------- Makefile rule to fuse blended exposure layers rather than blend fused stacks. Much requested feature, though not generally useful. Somebody else needs to modify the GUI to make this an option. Modified Paths: -------------- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp =================================================================== --- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-08-13 15:46:45 UTC (rev 4206) +++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-08-13 22:46:21 UTC (rev 4207) @@ -342,6 +342,7 @@ */ std::string sLDR_BLENDED = output + ldrExt; std::string sLDR_STACKED_BLENDED = output + "_fused" + ldrExt; + std::string sLDR_EXPOSURE_LAYERS_FUSED = output + "_blended_fused" + ldrExt; std::string sHDR_BLENDED = output + "_hdr" + hdrExt; o << "# the output panorama" << endl @@ -363,6 +364,9 @@ << "LDR_STACKED_BLENDED=" << escapeStringMake(sLDR_STACKED_BLENDED) << endl << "LDR_STACKED_BLENDED_SHELL=" << quoteStringShell(sLDR_STACKED_BLENDED) << endl + << "LDR_EXPOSURE_LAYERS_FUSED=" << escapeStringMake(sLDR_EXPOSURE_LAYERS_FUSED) << endl + << "LDR_EXPOSURE_LAYERS_FUSED_SHELL=" << quoteStringShell(sLDR_EXPOSURE_LAYERS_FUSED) << endl + << "HDR_BLENDED=" << escapeStringMake(sHDR_BLENDED) << endl << "HDR_BLENDED_SHELL=" << quoteStringShell(sHDR_BLENDED) << endl << endl @@ -873,6 +877,11 @@ << "\t$(ENBLEND) $(ENBLEND_LDR_COMP) $(ENBLEND_OPTS) -o $(LDR_STACKED_BLENDED_SHELL) $(LDR_STACKS_SHELL) " << endl << "\t- $(EXIFTOOL) -overwrite_original_in_place -TagsFromFile $(INPUT_IMAGE_1_SHELL) $(EXIFTOOL_COPY_ARGS) $(LDR_STACKED_BLENDED_SHELL)" << endl << endl; + // rules for fusing blended layers + o << "$(LDR_EXPOSURE_LAYERS_FUSED) : $(LDR_EXPOSURE_LAYERS)" << endl + << "\t$(ENFUSE) $(ENBLEND_LDR_COMP) $(ENFUSE_OPTS) -o $(LDR_EXPOSURE_LAYERS_FUSED_SHELL) $(LDR_EXPOSURE_LAYERS_SHELL) " << endl + << "\t- $(EXIFTOOL) -overwrite_original_in_place -TagsFromFile $(INPUT_IMAGE_1_SHELL) $(EXIFTOOL_COPY_ARGS) $(LDR_EXPOSURE_LAYERS_FUSED_SHELL)" << endl << endl; + // rules for hdr blending o << "$(HDR_BLENDED) : $(HDR_STACKS)" << endl; o << "\t$(ENBLEND) $(ENBLEND_HDR_COMP) $(ENBLEND_OPTS) -o $(HDR_BLENDED_SHELL) $(HDR_STACKS_SHELL) " << endl << endl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-08-25 20:16:25
|
Revision: 4280 http://hugin.svn.sourceforge.net/hugin/?rev=4280&view=rev Author: brunopostle Date: 2009-08-25 20:16:19 +0000 (Tue, 25 Aug 2009) Log Message: ----------- Change EV threshold for determining exposure layers. Really needs to become a project option with feedback. Modified Paths: -------------- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp =================================================================== --- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-08-25 20:14:11 UTC (rev 4279) +++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-08-25 20:16:19 UTC (rev 4280) @@ -61,6 +61,7 @@ // find all images that have a suitable overlap. SrcPanoImage simg = pano.getSrcImage(srcImg); + // FIXME this should be a user preference double maxShift = simg.getHFOV() / 10.0; double minShift = 360.0 - maxShift; for (UIntSet::iterator it = allImgs.begin(); it != allImgs.end(); ) { @@ -102,7 +103,8 @@ // find all images that have a suitable overlap. SrcPanoImage simg = pano.getSrcImage(srcImg); - double maxEVDiff = 0.2; + // FIXME this should be a user preference + double maxEVDiff = 0.5; for (UIntSet::iterator it = allImgs.begin(); it != allImgs.end(); ) { unsigned srcImg2 = *it; it++; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-08-25 21:33:16
|
Revision: 4282 http://hugin.svn.sourceforge.net/hugin/?rev=4282&view=rev Author: brunopostle Date: 2009-08-25 21:33:07 +0000 (Tue, 25 Aug 2009) Log Message: ----------- Only put intermediate files in multilayer output. Final stitched images may not be in TIFF format so this failed in those cases. Modified Paths: -------------- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp =================================================================== --- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-08-25 20:31:27 UTC (rev 4281) +++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-08-25 21:33:07 UTC (rev 4282) @@ -908,17 +908,17 @@ // rules for multilayer output - o << "$(LDR_REMAPPED_PREFIX)_multilayer.tif : $(LDR_REMAPPED_PREFIX).tif $(LDR_LAYERS)" << endl; - o << "\ttiffcp $(LDR_REMAPPED_PREFIX_SHELL).tif $(LDR_LAYERS_SHELL) $(LDR_REMAPPED_PREFIX_SHELL)_multilayer.tif" << endl << endl; + o << "$(LDR_REMAPPED_PREFIX)_multilayer.tif : $(LDR_LAYERS)" << endl; + o << "\ttiffcp $(LDR_LAYERS_SHELL) $(LDR_REMAPPED_PREFIX_SHELL)_multilayer.tif" << endl << endl; - o << "$(LDR_REMAPPED_PREFIX)_fused_multilayer.tif : $(LDR_REMAPPED_PREFIX)_fused.tif $(LDR_STACKS) $(LDR_EXPOSURE_LAYERS)" << endl; - o << "\ttiffcp $(LDR_REMAPPED_PREFIX_SHELL)_fused.tif $(LDR_STACKS_SHELL) $(LDR_EXPOSURE_LAYERS_SHELL) $(LDR_REMAPPED_PREFIX_SHELL)_fused_multilayer.tif" << endl << endl; + o << "$(LDR_REMAPPED_PREFIX)_fused_multilayer.tif : $(LDR_STACKS) $(LDR_EXPOSURE_LAYERS)" << endl; + o << "\ttiffcp $(LDR_STACKS_SHELL) $(LDR_EXPOSURE_LAYERS_SHELL) $(LDR_REMAPPED_PREFIX_SHELL)_fused_multilayer.tif" << endl << endl; - o << "$(LDR_REMAPPED_PREFIX)_multilayer.psd : $(LDR_REMAPPED_PREFIX).tif $(LDR_LAYERS)" << endl; - o << "\tPTtiff2psd -o $(LDR_REMAPPED_PREFIX_SHELL)_multilayer.psd $(LDR_REMAPPED_PREFIX_SHELL).tif $(LDR_LAYERS_SHELL)" << endl << endl; + o << "$(LDR_REMAPPED_PREFIX)_multilayer.psd : $(LDR_LAYERS)" << endl; + o << "\tPTtiff2psd -o $(LDR_REMAPPED_PREFIX_SHELL)_multilayer.psd $(LDR_LAYERS_SHELL)" << endl << endl; - o << "$(LDR_REMAPPED_PREFIX)_fused_multilayer.psd : $(LDR_REMAPPED_PREFIX)_fused.tif $(LDR_STACKS) $(LDR_EXPOSURE_LAYERS)" << endl; - o << "\tPTtiff2psd -o $(LDR_REMAPPED_PREFIX_SHELL)_fused_multilayer.psd $(LDR_REMAPPED_PREFIX_SHELL)_fused.tif $(LDR_STACKS_SHELL) $(LDR_EXPOSURE_LAYERS_SHELL)" << endl << endl; + o << "$(LDR_REMAPPED_PREFIX)_fused_multilayer.psd : $(LDR_STACKS) $(LDR_EXPOSURE_LAYERS)" << endl; + o << "\tPTtiff2psd -o $(LDR_REMAPPED_PREFIX_SHELL)_fused_multilayer.psd $(LDR_STACKS_SHELL) $(LDR_EXPOSURE_LAYERS_SHELL)" << endl << endl; break; case PanoramaOptions::NO_BLEND: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-11-14 19:37:48
|
Revision: 4719 http://hugin.svn.sourceforge.net/hugin/?rev=4719&view=rev Author: brunopostle Date: 2009-11-14 19:37:42 +0000 (Sat, 14 Nov 2009) Log Message: ----------- Fix double counting of exposure values Modified Paths: -------------- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp =================================================================== --- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-11-14 08:34:02 UTC (rev 4718) +++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-11-14 19:37:42 UTC (rev 4719) @@ -554,7 +554,6 @@ o << endl << endl; o << expImgVar.str() << "_INPUT_SHELL = "; for (UIntSet::iterator it = similarExposures[i].begin(); it != similarExposures[i].end();) { - exposure += pano.getSrcImage(*it).getExposureValue(); std::ostringstream fns; fns << output << "_exposure_layers_" << std::setfill('0') << std::setw(4) << *it << ldrRemappedExt; o << quoteStringShell(fns.str()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-11-17 00:08:42
|
Revision: 4721 http://hugin.svn.sourceforge.net/hugin/?rev=4721&view=rev Author: brunopostle Date: 2009-11-17 00:08:29 +0000 (Tue, 17 Nov 2009) Log Message: ----------- Fix bug where 'HDR' enblend --compression setting was only used if 'normal' output was set to TIFF (even if no 'normal' output is requested). Also TIFF --compression setting would be used for EXR output, non-fatal bug. Modified Paths: -------------- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp =================================================================== --- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-11-16 22:07:39 UTC (rev 4720) +++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2009-11-17 00:08:29 UTC (rev 4721) @@ -274,7 +274,7 @@ o << endl; o << "ENBLEND_HDR_COMP="; - if (opts.outputImageType == "tif" && opts.outputImageTypeHDRCompression.size() != 0) { + if (opts.outputImageTypeHDR == "tif" && opts.outputImageTypeHDRCompression.size() != 0) { o << "--compression " << opts.outputImageTypeHDRCompression; } o << endl; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-01-17 13:19:28
|
Revision: 4902 http://hugin.svn.sourceforge.net/hugin/?rev=4902&view=rev Author: stativ Date: 2010-01-17 13:18:58 +0000 (Sun, 17 Jan 2010) Log Message: ----------- Use UNIX_LIKE instead of __unix__ in makefile export. Fixes problem when Mac OS was recognized as Windows. Modified Paths: -------------- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp Modified: hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp =================================================================== --- hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2010-01-16 23:22:00 UTC (rev 4901) +++ hugin/trunk/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2010-01-17 13:18:58 UTC (rev 4902) @@ -150,7 +150,7 @@ const std::string& tmpDir) { PanoramaOptions opts = pano.getOptions(); -#ifdef __unix__ +#ifdef UNIX_LIKE // set numeric locale to C, for correct number output char * t = setlocale(LC_NUMERIC,NULL); char * old_locale = (char*) malloc(strlen(t)+1); @@ -158,7 +158,7 @@ setlocale(LC_NUMERIC,"C"); #endif -#ifdef __unix__ +#ifdef UNIX_LIKE std::string NULL_DEVICE("/dev/null"); #else // WINDOWS std::string NULL_DEVICE("NUL"); @@ -187,7 +187,7 @@ // pass settings for different temporary directory if (tmpDir != "") { o << "# set temporary directory" << endl; -#ifdef __unix__ +#ifdef UNIX_LIKE o << "export TMPDIR=" << quoteStringShell(tmpDir) << endl; #else // WINDOWS o << "export TEMP=" << quoteStringShell(tmpDir) << endl @@ -965,7 +965,7 @@ } } -#ifdef __unix__ +#ifdef UNIX_LIKE // reset locale setlocale(LC_NUMERIC,old_locale); free(old_locale); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |