From: <bru...@us...> - 2008-02-15 22:51:24
|
Revision: 819 http://panotools.svn.sourceforge.net/panotools/?rev=819&view=rev Author: brunopostle Date: 2008-02-15 14:51:28 -0800 (Fri, 15 Feb 2008) Log Message: ----------- Some win32 fixes Modified Paths: -------------- trunk/Panotools-Script/bin/cubic2erect trunk/Panotools-Script/bin/match-n-shift trunk/Panotools-Script/lib/Panotools/Script.pm trunk/Panotools-Script/make_exe.pl Modified: trunk/Panotools-Script/bin/cubic2erect =================================================================== --- trunk/Panotools-Script/bin/cubic2erect 2008-02-15 21:47:04 UTC (rev 818) +++ trunk/Panotools-Script/bin/cubic2erect 2008-02-15 22:51:28 UTC (rev 819) @@ -20,7 +20,6 @@ my $width = $height * 2; $pano->Panorama->Set (v => 360, f => 2, u => 0, w => $width, h => $height, n => "\"TIFF c:DEFLATE\""); -$pano->{basedir} = File::Spec->curdir; $pano->Image->[0] = new Panotools::Script::Line::Image; $pano->Image->[0]->Set (v => 90, w => $face, h => $face, f => 0, r => 0, p => 0, y => 0, n => "\"" . File::Spec->rel2abs ($images[0]) . "\""); Modified: trunk/Panotools-Script/bin/match-n-shift =================================================================== --- trunk/Panotools-Script/bin/match-n-shift 2008-02-15 21:47:04 UTC (rev 818) +++ trunk/Panotools-Script/bin/match-n-shift 2008-02-15 22:51:28 UTC (rev 819) @@ -141,7 +141,7 @@ pix_width => $n->{w}, pix_height => $n->{h}}); # scale back to original image dimensions - my ($n_pix_width, $n_pix_height) = imgsize ($paths_input[$point->{n}]); + my ($n_pix_width, $n_pix_height) = imgsize (File::Spec->rel2abs ($paths_input[$point->{n}])); my $n_scale_w = $n_pix_width / $n->{w}; my $n_scale_h = $n_pix_height / $n->{h}; $point->{x} *= $n_scale_w; @@ -164,7 +164,7 @@ pix_width => $N->{w}, pix_height => $N->{h}}); # scale back to original image dimensions - my ($N_pix_width, $N_pix_height) = imgsize ($paths_input[$point->{N}]); + my ($N_pix_width, $N_pix_height) = imgsize (File::Spec->rel2abs ($paths_input[$point->{N}])); my $N_scale_w = $N_pix_width / $N->{w}; my $N_scale_h = $N_pix_height / $N->{h}; $point->{X} *= $N_scale_w; @@ -176,7 +176,7 @@ for my $image (@{$oto->Image}) { $image->{n} = '"'. $paths_input[$index] .'"'; - ($image->{w}, $image->{h}) = imgsize ($paths_input[$index]); + ($image->{w}, $image->{h}) = imgsize (File::Spec->rel2abs ($paths_input[$index])); $image->{S} = $crop_s if defined $crop_s; $image->{v} = '=0' if $index > 0; $image->{d} = '=0' if $index > 0; Modified: trunk/Panotools-Script/lib/Panotools/Script.pm =================================================================== --- trunk/Panotools-Script/lib/Panotools/Script.pm 2008-02-15 21:47:04 UTC (rev 818) +++ trunk/Panotools-Script/lib/Panotools/Script.pm 2008-02-15 22:51:28 UTC (rev 819) @@ -68,7 +68,6 @@ $self->{output} = []; $self->{control} = []; $self->{controlmorph} = []; - $self->{basedir} = File::Spec->rel2abs (File::Spec->curdir); } =pod @@ -86,8 +85,6 @@ close FILE; my ($volume, $directories, $file) = File::Spec->splitpath ($path); - $self->{basedir} = File::Spec->catpath ($volume, $directories, ''); - $self->{basedir} = File::Spec->rel2abs ($self->{basedir}); for my $line (@raw) { Modified: trunk/Panotools-Script/make_exe.pl =================================================================== --- trunk/Panotools-Script/make_exe.pl 2008-02-15 21:47:04 UTC (rev 818) +++ trunk/Panotools-Script/make_exe.pl 2008-02-15 22:51:28 UTC (rev 819) @@ -26,6 +26,6 @@ for my $stub (@stubs) { system ('copy', "bin\\$stub", "$stub.pl"); - system ('p2e', "--output-file=$stub.exe", "$stub.pl"); + system ('p2e', '--add-module=Win32', '--add-module=File::Spec::Win32', "--output-file=$stub.exe", "$stub.pl"); unlink ("$stub.pl"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |