[Hugin-cvs] SF.net SVN: hugin:[5015] hugin/trunk/platforms/windows/smartblend-wrapper

[<bav...@us...>]

Revision: 5015
          http://hugin.svn.sourceforge.net/hugin/?rev=5015&view=rev
Author:   bavanandel
Date:     2010-02-23 22:14:44 +0000 (Tue, 23 Feb 2010)

Log Message:
-----------
Update to smartblend-wrapper: don't change the filename anymore; only strip arguments which Hugin forcibly supplies; documentation update

Modified Paths:
--------------
    hugin/trunk/platforms/windows/smartblend-wrapper/smartblend-hugin-windows-readme.txt
    hugin/trunk/platforms/windows/smartblend-wrapper/smartblend-hugin.bat

Modified: hugin/trunk/platforms/windows/smartblend-wrapper/smartblend-hugin-windows-readme.txt
===================================================================
--- hugin/trunk/platforms/windows/smartblend-wrapper/smartblend-hugin-windows-readme.txt	2010-02-23 06:31:32 UTC (rev 5014)
+++ hugin/trunk/platforms/windows/smartblend-wrapper/smartblend-hugin-windows-readme.txt	2010-02-23 22:14:44 UTC (rev 5015)
@@ -1,14 +1,33 @@
-  1. save smartblend-hugin.bat to the same folder as smartblend.
+Usage instructions
+--------------------
+
+  1. Save smartblend-hugin.bat to the same folder as smartblend.
   2. Start Hugin.
   3. Open File -> preferences.
   4. Switch to Enblend tab.
   5. Check "Use alternative Enblend program".
-  6. Choose "smartblend-hugin.bat" as the executable (use the full
-path).
+  6. Choose "smartblend-hugin.bat" as the executable (use the full path).
   7. Press OK to save the settings.
-  8. On the Stitcher tab in Hugin, click the Options button next to
-the Remapper and make sure "Save cropped images" is unchecked.
-  9. Enjoy SmartBlend!
+  8. On the Stitcher tab in Hugin, click the Options button next to the
+     Remapper and make sure "Save cropped images" is unchecked. Newer versions
+	 of Hugin have an option in the Preferences, on the Stitching tab, called
+	 "Create cropped images by default". Uncheck this option to make the
+	 setting persistent for all new projects.
+  9. Enjoy Smartblend!
 
-Reference
-http://groups.google.com/group/hugin-ptx/t/b11d91ad0280ace0
\ No newline at end of file
+
+Download
+--------------------
+Smartblend can be downloaded from the following location:
+http://wiki.panotools.org/SmartBlend
+
+
+Other
+--------------------
+Related discussion threads:
+http://groups.google.com/group/hugin-ptx/t/b11d91ad0280ace0
+http://groups.google.com/group/hugin-ptx/t/65b6583530106584
+
+More discussions can be found by searching for Smartblend in the hugin-ptx
+group archives, which is easiest at the Nabble website:
+http://old.nabble.com/hugin-ptx-f14411.html
\ No newline at end of file

Modified: hugin/trunk/platforms/windows/smartblend-wrapper/smartblend-hugin.bat
===================================================================
--- hugin/trunk/platforms/windows/smartblend-wrapper/smartblend-hugin.bat	2010-02-23 06:31:32 UTC (rev 5014)
+++ hugin/trunk/platforms/windows/smartblend-wrapper/smartblend-hugin.bat	2010-02-23 22:14:44 UTC (rev 5015)
@@ -1,21 +1,21 @@
 @echo off & setlocal
 
-set SMARTBLEND="%~dp0\smartblend.exe"
+set SMARTBLEND=%~dp0\smartblend.exe
 set SMARTBLENDARGS=
 
+rem Hugin sets -w, -o and --compression automatically. Smartblend does not
+rem understand --compression (and its parameter), so we have to drop those.
+rem The -w argument is only partly understood as a "compatibility" feature
+rem for Enblend users (see the readme.txt file which came with Smartblend).
 :paramstrip
 set arg=%1
 if not "%arg%"=="" (
 	if "%arg%"=="--compression" (
 		rem Skip compression parameter and its argument
 		shift
-	) else if "%arg:~0,2%"=="-f" (
-		rem Skip ...
-	) else if "%arg:~0,2%"=="-l" (
-		rem Skip ...
 	) else if "%arg:~0,2%"=="-o" (
-		rem Reformat output parameter: add "smartblend-" prefix
-		set SMARTBLENDARGS=%SMARTBLENDARGS% -o smartblend-%2
+		rem Set output parameter
+		set SMARTBLENDARGS=%SMARTBLENDARGS% -o %2
 		shift
 	) else (
 		rem Copy other parameters
@@ -29,6 +29,6 @@
 echo Executing smartblend.exe %SMARTBLENDARGS%
 echo.
 
-%SMARTBLEND% %SMARTBLENDARGS%
+"%SMARTBLEND%" %SMARTBLENDARGS%
 
 endlocal
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.