From: <da...@us...> - 2007-11-23 07:11:27
|
Revision: 2540 http://hugin.svn.sourceforge.net/hugin/?rev=2540&view=rev Author: dangelo Date: 2007-11-22 23:11:26 -0800 (Thu, 22 Nov 2007) Log Message: ----------- fixed failure on JPEG, TIFF and PNG output types, bug #1833833 Modified Paths: -------------- hugin/trunk/src/hugin_base/nona/Stitcher.h Modified: hugin/trunk/src/hugin_base/nona/Stitcher.h =================================================================== --- hugin/trunk/src/hugin_base/nona/Stitcher.h 2007-11-17 22:06:26 UTC (rev 2539) +++ hugin/trunk/src/hugin_base/nona/Stitcher.h 2007-11-23 07:11:26 UTC (rev 2540) @@ -582,17 +582,21 @@ exinfo.setXResolution(150); exinfo.setYResolution(150); exinfo.setICCProfile(iccProfile); + if (opts.outputPixelType.size() > 0) { + exinfo.setPixelType(opts.outputPixelType.c_str()); + } + // set compression quality for jpeg images. if (opts.outputFormat == PanoramaOptions::JPEG) { char jpgCompr[4]; snprintf(jpgCompr,4,"%d", opts.quality); exinfo.setCompression(jpgCompr); vigra::exportImage(srcImageRange(pano), exinfo); - } else if (opts.outputFormat == PanoramaOptions::TIFF) { - exinfo.setCompression(opts.tiffCompression.c_str()); + } else if (opts.outputFormat == PanoramaOptions::TIFF) { + exinfo.setCompression(opts.tiffCompression.c_str()); vigra::exportImageAlpha(srcImageRange(pano), srcImage(panoMask), exinfo); - } else { + } else { vigra::exportImageAlpha(srcImageRange(pano), srcImage(panoMask), exinfo); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-02-06 15:15:43
|
Revision: 2797 http://hugin.svn.sourceforge.net/hugin/?rev=2797&view=rev Author: dangelo Date: 2008-02-06 07:15:42 -0800 (Wed, 06 Feb 2008) Log Message: ----------- fixed bug [ 1803220 ] \"internal error: pixeltype not supported\" JPG->HDR Modified Paths: -------------- hugin/trunk/src/hugin_base/nona/Stitcher.h Modified: hugin/trunk/src/hugin_base/nona/Stitcher.h =================================================================== --- hugin/trunk/src/hugin_base/nona/Stitcher.h 2008-02-05 22:42:35 UTC (rev 2796) +++ hugin/trunk/src/hugin_base/nona/Stitcher.h 2008-02-06 15:15:42 UTC (rev 2797) @@ -604,6 +604,9 @@ exinfo.setCompression(opts.tiffCompression.c_str()); vigra::exportImageAlpha(srcImageRange(pano), srcImage(panoMask), exinfo); + } else if (opts.outputFormat == PanoramaOptions::HDR) { + exinfo.setPixelType("FLOAT"); + vigra::exportImage(srcImageRange(pano), exinfo); } else { vigra::exportImageAlpha(srcImageRange(pano), srcImage(panoMask), exinfo); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-02-13 14:41:10
|
Revision: 2828 http://hugin.svn.sourceforge.net/hugin/?rev=2828&view=rev Author: dangelo Date: 2008-02-13 06:41:04 -0800 (Wed, 13 Feb 2008) Log Message: ----------- reverse drawing order in preview, to better approximate enblends behaviour Modified Paths: -------------- hugin/trunk/src/hugin_base/nona/Stitcher.h Modified: hugin/trunk/src/hugin_base/nona/Stitcher.h =================================================================== --- hugin/trunk/src/hugin_base/nona/Stitcher.h 2008-02-12 18:11:54 UTC (rev 2827) +++ hugin/trunk/src/hugin_base/nona/Stitcher.h 2008-02-13 14:41:04 UTC (rev 2828) @@ -859,8 +859,8 @@ unsigned i=0; // remap each image and blend into main pano image - for (UIntSet::const_iterator it = imgSet.begin(); - it != imgSet.end(); ++it) + for (UIntSet::reverse_iterator it = imgSet.rbegin(); + it != imgSet.rend(); ++it) { // get a remapped image. RemappedPanoImage<ImageType, AlphaType> * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-02-18 18:09:49
|
Revision: 2892 http://hugin.svn.sourceforge.net/hugin/?rev=2892&view=rev Author: dangelo Date: 2008-02-18 10:09:46 -0800 (Mon, 18 Feb 2008) Log Message: ----------- fixed [ 1891419 ] Crash when blending (enbelnd) on WIN Modified Paths: -------------- hugin/trunk/src/hugin_base/nona/Stitcher.h Modified: hugin/trunk/src/hugin_base/nona/Stitcher.h =================================================================== --- hugin/trunk/src/hugin_base/nona/Stitcher.h 2008-02-18 18:06:06 UTC (rev 2891) +++ hugin/trunk/src/hugin_base/nona/Stitcher.h 2008-02-18 18:09:46 UTC (rev 2892) @@ -318,8 +318,7 @@ alpha_img = &remapped.m_mask; } - - std::string ext = opts.getOutputExtension(); +/* std::string cext = hugin_utils::getExtension(m_basename); std::transform(cext.begin(),cext.end(), cext.begin(), (int(*)(int))std::tolower); // remove extension only if it specifies the same file type, otherwise @@ -327,7 +326,8 @@ if (cext == ext) { m_basename = hugin_utils::stripExtension(m_basename); } - +*/ + std::string ext = opts.getOutputExtension(); std::ostringstream filename; filename << m_basename << std::setfill('0') << std::setw(4) << imgNr << "." + ext; @@ -573,7 +573,7 @@ stitch(opts, imgSet, vigra::destImageRange(pano), vigra::destImage(panoMask), remapper); - std::string ext = opts.getOutputExtension(); + std::string ext = opts.getOutputExtension(); std::string cext = hugin_utils::getExtension(basename); std::transform(cext.begin(),cext.end(), cext.begin(), (int(*)(int))std::tolower); // remove extension only if it specifies the same file type, otherwise @@ -710,7 +710,7 @@ stitch(opts, imgSet, vigra::destImageRange(pano), vigra::destImage(panoMask), remapper, reduce); - std::string ext = opts.getOutputExtension(); + std::string ext = opts.getOutputExtension(); std::string cext = hugin_utils::getExtension(basename); std::transform(cext.begin(),cext.end(), cext.begin(), (int(*)(int))std::tolower); // remove extension only if it specifies the same file type, otherwise @@ -902,7 +902,7 @@ stitch(opts, imgSet, vigra::destImageRange(pano), vigra::destImage(panoMask), remapper, blend); - std::string ext = opts.getOutputExtension(); + std::string ext = opts.getOutputExtension(); std::string cext = hugin_utils::getExtension(basename); std::transform(cext.begin(),cext.end(), cext.begin(), (int(*)(int))std::tolower); // remove extension only if it specifies the same file type, otherwise @@ -1179,9 +1179,9 @@ * */ void stitchPanorama(const PanoramaData & pano, - const PanoramaOptions & opts, - AppBase::MultiProgressDisplay & progress, - const std::string & basename, + const PanoramaOptions & opts, + AppBase::MultiProgressDisplay & progress, + const std::string & basename, const UIntSet & usedImgs); // the instantiations of the stitching functions have been divided into two .cpp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2008-07-06 10:54:16
|
Revision: 3170 http://hugin.svn.sourceforge.net/hugin/?rev=3170&view=rev Author: ippei Date: 2008-07-06 03:54:14 -0700 (Sun, 06 Jul 2008) Log Message: ----------- I think this fixes the weird progress display of Nona; confirmation needed. Modified Paths: -------------- hugin/trunk/src/hugin_base/nona/Stitcher.h Modified: hugin/trunk/src/hugin_base/nona/Stitcher.h =================================================================== --- hugin/trunk/src/hugin_base/nona/Stitcher.h 2008-07-06 10:28:52 UTC (rev 3169) +++ hugin/trunk/src/hugin_base/nona/Stitcher.h 2008-07-06 10:54:14 UTC (rev 3170) @@ -224,7 +224,7 @@ prepareOutputFile(opts); unsigned int nImg = images.size(); - Base::m_progress.pushTask(AppBase::ProgressTask("Remapping", "", 1.0/(nImg+1))); + Base::m_progress.pushTask(AppBase::ProgressTask("Remapping", "", 1.0/(nImg))); // remap each image and save int i=0; for (UIntSet::const_iterator it = images.begin(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |