Revision: 700
http://svn.sourceforge.net/panotools/?rev=700&view=rev
Author: brunopostle
Date: 2007-04-30 14:32:07 -0700 (Mon, 30 Apr 2007)
Log Message:
-----------
New accessor methods: Mode(), Panorama(), Variable(), Image(), Output(), Control(), ControlMorph()
Modified Paths:
--------------
trunk/Panotools-Script/Changes
trunk/Panotools-Script/bin/cubic2erect
trunk/Panotools-Script/bin/erect2cubic
trunk/Panotools-Script/bin/erect2planet
trunk/Panotools-Script/bin/erect2qtvr
trunk/Panotools-Script/bin/nona-mask
trunk/Panotools-Script/bin/pto2tiff
trunk/Panotools-Script/lib/Panotools/Script.pm
trunk/Panotools-Script/t/010.read-stitch.t
trunk/Panotools-Script/t/012.read-pto.t
trunk/Panotools-Script/t/020.create-script.t
trunk/Panotools-Script/t/021.morph.t
Modified: trunk/Panotools-Script/Changes
===================================================================
--- trunk/Panotools-Script/Changes 2007-04-30 20:43:15 UTC (rev 699)
+++ trunk/Panotools-Script/Changes 2007-04-30 21:32:07 UTC (rev 700)
@@ -7,6 +7,7 @@
- allow setting STITCHER and OPTIMISER environment
- pass options to Stitch()
- New Clone() and Preview() methods
+ - New accessor methods: Mode(), Panorama(), Variable(), Image(), Output(), Control(), ControlMorph()
0.05
- change order of nona parameters for BSD (Milan Knizek)
Modified: trunk/Panotools-Script/bin/cubic2erect
===================================================================
--- trunk/Panotools-Script/bin/cubic2erect 2007-04-30 20:43:15 UTC (rev 699)
+++ trunk/Panotools-Script/bin/cubic2erect 2007-04-30 21:32:07 UTC (rev 700)
@@ -21,25 +21,25 @@
my $pano = new Panotools::Script;
-$pano->{panorama}->Set (v => 360, f => 2, u => 0, w => 4000, h => 2000, n => '"TIF"');
+$pano->Panorama->Set (v => 360, f => 2, u => 0, w => 4000, h => 2000, n => '"TIF"');
-$pano->{image}->[0] = new Panotools::Script::Line::Image;
-$pano->{image}->[0]->Set (v => 90, r => 0, p => 0, y => 0, n => "\"$images[0]\"");
+$pano->Image->[0] = new Panotools::Script::Line::Image;
+$pano->Image->[0]->Set (v => 90, r => 0, p => 0, y => 0, n => "\"$images[0]\"");
-$pano->{image}->[1] = new Panotools::Script::Line::Image;
-$pano->{image}->[1]->Set (v => 90, r => 0, p => 0, y => 90, n => "\"$images[1]\"");
+$pano->Image->[1] = new Panotools::Script::Line::Image;
+$pano->Image->[1]->Set (v => 90, r => 0, p => 0, y => 90, n => "\"$images[1]\"");
-$pano->{image}->[2] = new Panotools::Script::Line::Image;
-$pano->{image}->[2]->Set (v => 90, r => 0, p => 0, y => 180, n => "\"$images[2]\"");
+$pano->Image->[2] = new Panotools::Script::Line::Image;
+$pano->Image->[2]->Set (v => 90, r => 0, p => 0, y => 180, n => "\"$images[2]\"");
-$pano->{image}->[3] = new Panotools::Script::Line::Image;
-$pano->{image}->[3]->Set (v => 90, r => 0, p => 0, y => 270, n => "\"$images[3]\"");
+$pano->Image->[3] = new Panotools::Script::Line::Image;
+$pano->Image->[3]->Set (v => 90, r => 0, p => 0, y => 270, n => "\"$images[3]\"");
-$pano->{image}->[4] = new Panotools::Script::Line::Image;
-$pano->{image}->[4]->Set (v => 90, r => 0, p => 90, y => 0, n => "\"$images[4]\"");
+$pano->Image->[4] = new Panotools::Script::Line::Image;
+$pano->Image->[4]->Set (v => 90, r => 0, p => 90, y => 0, n => "\"$images[4]\"");
-$pano->{image}->[5] = new Panotools::Script::Line::Image;
-$pano->{image}->[5]->Set (v => 90, r => 0, p => -90, y => 0, n => "\"$images[5]\"");
+$pano->Image->[5] = new Panotools::Script::Line::Image;
+$pano->Image->[5]->Set (v => 90, r => 0, p => -90, y => 0, n => "\"$images[5]\"");
$pano->Stitch ($out);
Modified: trunk/Panotools-Script/bin/erect2cubic
===================================================================
--- trunk/Panotools-Script/bin/erect2cubic 2007-04-30 20:43:15 UTC (rev 699)
+++ trunk/Panotools-Script/bin/erect2cubic 2007-04-30 21:32:07 UTC (rev 700)
@@ -21,13 +21,13 @@
my $face = int ($width / 3.1418);
my $scratch = new Panotools::Script;
-$scratch->{panorama}->Set (v => 90, f => 0, u => 0, w => $face, h => $face, n => '"TIFF"');
+$scratch->Panorama->Set (v => 90, f => 0, u => 0, w => $face, h => $face, n => '"TIFF"');
$scratch->{stitcher} = 'nona';
-$scratch->{image}->[0] = new Panotools::Script::Line::Image;
+$scratch->Image->[0] = new Panotools::Script::Line::Image;
-$scratch->{image}->[0]->Set (w => $width, h => $height, v => 360, f => 4, r => 0, p => 0, y => 0, n => "\"$erect\"");
+$scratch->Image->[0]->Set (w => $width, h => $height, v => 360, f => 4, r => 0, p => 0, y => 0, n => "\"$erect\"");
$scratch->Stitch (File::Spec->catfile ($cwd, 'front.tif'));
$scratch->Transform (0, 0, -90);
Modified: trunk/Panotools-Script/bin/erect2planet
===================================================================
--- trunk/Panotools-Script/bin/erect2planet 2007-04-30 20:43:15 UTC (rev 699)
+++ trunk/Panotools-Script/bin/erect2planet 2007-04-30 21:32:07 UTC (rev 700)
@@ -26,13 +26,13 @@
my $face = $width;
my $stereographic = new Panotools::Script;
-$stereographic->{panorama}->Set (v => 270, f => 4, u => 0, w => $face, h => $face, n => '"TIFF"');
+$stereographic->Panorama->Set (v => 270, f => 4, u => 0, w => $face, h => $face, n => '"TIFF"');
$stereographic->{stitcher} = 'nona';
-$stereographic->{image}->[0] = new Panotools::Script::Line::Image;
+$stereographic->Image->[0] = new Panotools::Script::Line::Image;
-$stereographic->{image}->[0]->Set (w => $width, h => $height, v => 360, f => 4, r => 0, p => 0, y => 0, n => "\"$erect\"");
+$stereographic->Image->[0]->Set (w => $width, h => $height, v => 360, f => 4, r => 0, p => 0, y => 0, n => "\"$erect\"");
$stereographic->Stitch ($sgraphic);
__END__
Modified: trunk/Panotools-Script/bin/erect2qtvr
===================================================================
--- trunk/Panotools-Script/bin/erect2qtvr 2007-04-30 20:43:15 UTC (rev 699)
+++ trunk/Panotools-Script/bin/erect2qtvr 2007-04-30 21:32:07 UTC (rev 700)
@@ -74,13 +74,13 @@
# generate JPEG cubefaces
my $scratch = new Panotools::Script;
-$scratch->{panorama}->Set (v => 90, f => 0, u => 0, w => $face, h => $face, n => '"TIFF"');
+$scratch->Panorama->Set (v => 90, f => 0, u => 0, w => $face, h => $face, n => '"TIFF"');
$scratch->{stitcher} = 'nona';
-$scratch->{image}->[0] = new Panotools::Script::Line::Image;
+$scratch->Image->[0] = new Panotools::Script::Line::Image;
-$scratch->{image}->[0]->Set (w => $width, h => $height, v => 360, f => 4, r => 0, p => $pitch, y => 0, n => "\"$erect\"");
+$scratch->Image->[0]->Set (w => $width, h => $height, v => 360, f => 4, r => 0, p => $pitch, y => 0, n => "\"$erect\"");
$scratch->Stitch ("$prefix-0.tif");
@@ -107,9 +107,9 @@
# fisheye cubefaces for preview track
-$scratch->{panorama}->Set (v => 100, f => 3);
+$scratch->Panorama->Set (v => 100, f => 3);
-$scratch->{image}->[0]->Set (r => 0, p => $pitch, y => 0);
+$scratch->Image->[0]->Set (r => 0, p => $pitch, y => 0);
$scratch->Stitch ("$prefix-preview-0.tif");
$scratch->Transform (0, 0, -90);
@@ -128,13 +128,13 @@
$scratch->Transform (0, 180, 0);
$scratch->Stitch ("$prefix-preview-5.tif");
-$scratch->{panorama}->Set (v => 90, f => 0, w => 256, h => 256, n => '"JPEG"');
+$scratch->Panorama->Set (v => 90, f => 0, w => 256, h => 256, n => '"JPEG"');
for my $index (0 .. 5)
{
# generate JPEG preview cubefaces
system ('mogrify', '-geometry', '32x32', "$prefix-preview-$index.tif");
- $scratch->{image}->[0]->Set (w => 32, h => 32, v => 100, f => 3, r => 0, p => 0, y => 0, n => "\"$prefix-preview-$index.tif\"");
+ $scratch->Image->[0]->Set (w => 32, h => 32, v => 100, f => 3, r => 0, p => 0, y => 0, n => "\"$prefix-preview-$index.tif\"");
$scratch->Stitch ("$prefix-preview-$index.jpg");
system ('mogrify', '-quality', $quality, "$prefix-preview-$index.jpg");
}
Modified: trunk/Panotools-Script/bin/nona-mask
===================================================================
--- trunk/Panotools-Script/bin/nona-mask 2007-04-30 20:43:15 UTC (rev 699)
+++ trunk/Panotools-Script/bin/nona-mask 2007-04-30 21:32:07 UTC (rev 700)
@@ -38,11 +38,11 @@
for my $file (@files)
{
- $pano->{image}->[$index]->{n} = "\"$file\"";
+ $pano->Image->[$index]->{n} = "\"$file\"";
$index++;
}
-for my $image (@{$pano->{image}})
+for my $image (@{$pano->Image})
{
my $tempfile = File::Spec->catfile ($tempdir, "$index.tif");
my $name = $image->{n};
Modified: trunk/Panotools-Script/bin/pto2tiff
===================================================================
--- trunk/Panotools-Script/bin/pto2tiff 2007-04-30 20:43:15 UTC (rev 699)
+++ trunk/Panotools-Script/bin/pto2tiff 2007-04-30 21:32:07 UTC (rev 700)
@@ -17,11 +17,11 @@
my $p = new Panotools::Script;
$p->{stitcher} = 'nona-mask';
$p->Read ($pto);
- $p->{panorama}->Set (n => '"TIFF_m r:CROP c:DEFLATE"');
+ $p->Panorama->Set (n => '"TIFF_m r:CROP c:DEFLATE"');
$p->Stitch ($stub .'_');
my $args = '-a -l 29';
- $args .= ' -w' if $p->{panorama}->{v} == 360;
+ $args .= ' -w' if $p->Panorama->{v} == 360;
`enblend-mask $args -o $stub.tif $stub\_????.tif`;
`convert $stub.tif $stub.jpg`;
Modified: trunk/Panotools-Script/lib/Panotools/Script.pm
===================================================================
--- trunk/Panotools-Script/lib/Panotools/Script.pm 2007-04-30 20:43:15 UTC (rev 699)
+++ trunk/Panotools-Script/lib/Panotools/Script.pm 2007-04-30 21:32:07 UTC (rev 700)
@@ -93,32 +93,32 @@
for my $line (@raw)
{
$line =~ s/(\r|\n)//g;
- $self->{mode}->Parse ($line) if ($line =~ /^m /);
- $self->{panorama}->Parse ($line) if ($line =~ /^p /);
- $self->{variable}->Parse ($line) if ($line =~ /^v /);
+ $self->Mode->Parse ($line) if ($line =~ /^m /);
+ $self->Panorama->Parse ($line) if ($line =~ /^p /);
+ $self->Variable->Parse ($line) if ($line =~ /^v /);
if ($line =~ /^i /)
{
my $image = new Panotools::Script::Line::Image;
$image->Parse ($line);
- push @{$self->{image}}, $image;
+ push @{$self->Image}, $image;
}
if ($line =~ /^o /)
{
my $output = new Panotools::Script::Line::Output;
$output->Parse ($line);
- push @{$self->{output}}, $output;
+ push @{$self->Output}, $output;
}
if ($line =~ /^c /)
{
my $control = new Panotools::Script::Line::Control;
$control->Parse ($line);
- push @{$self->{control}}, $control;
+ push @{$self->Control}, $control;
}
if ($line =~ /^C /)
{
my $controlmorph = new Panotools::Script::Line::ControlMorph;
$controlmorph->Parse ($line);
- push @{$self->{controlmorph}}, $controlmorph;
+ push @{$self->ControlMorph}, $controlmorph;
}
}
$self->Output2Image;
@@ -144,27 +144,27 @@
my $vector = shift || '';
open FILE, ">", $path or die "cannot write-open $path";
print FILE "# Created by ". (ref $self) ." $VERSION\n\n";
- print FILE $self->{panorama}->Assemble;
- print FILE $self->{mode}->Assemble;
+ print FILE $self->Panorama->Assemble;
+ print FILE $self->Mode->Assemble;
print FILE "\n# Image lines\n";
- for my $image (@{$self->{image}})
+ for my $image (@{$self->Image})
{
print FILE $image->Assemble ($vector);
}
print FILE "\n# Variable lines\n";
- print FILE $self->{variable}->Assemble;
+ print FILE $self->Variable->Assemble;
print FILE "\n# Control point lines\n";
- for my $control (@{$self->{control}})
+ for my $control (@{$self->Control})
{
print FILE $control->Assemble;
}
- for my $controlmorph (@{$self->{controlmorph}})
+ for my $controlmorph (@{$self->ControlMorph})
{
print FILE $controlmorph->Assemble;
}
print FILE "\n*\n";
print FILE "\n# Output image lines\n";
- for my $output (@{$self->{output}})
+ for my $output (@{$self->Output})
{
print FILE $output->Assemble ($vector);
}
@@ -197,17 +197,78 @@
{
my $self = shift;
my ($fh, $tempfile) = tempfile (SUFFIX => '.jpg', UNLINK => $CLEANUP);
- my $aspect = $self->{panorama}->{w} / $self->{panorama}->{h};
+ my $aspect = $self->Panorama->{w} / $self->Panorama->{h};
my $clone = $self->Clone;
my $height = sqrt (40000 / $aspect);
my $width = $aspect * $height;
- $clone->{panorama}->Set (w => int ($width), h => int ($height), n => '"JPEG"');
+ $clone->Panorama->Set (w => int ($width), h => int ($height), n => '"JPEG"');
$clone->Stitch ($tempfile);
system ('display', '-sample', '200%', $tempfile);
}
=pod
+Access various sections of the scriptfile:
+
+ $p->Mode; # a L<Panotools::Script::Line::Mode> object
+ $p->Panorama; # a L<Panotools::Script::Line::Panorama> object
+ $p->Variable; # a L<Panotools::Script::Line::Variable> object
+
+=cut
+
+sub Mode
+{
+ my $self = shift;
+ $self->{mode};
+}
+
+sub Panorama
+{
+ my $self = shift;
+ $self->{panorama};
+}
+
+sub Variable
+{
+ my $self = shift;
+ $self->{variable};
+}
+
+=pod
+
+ $p->Image; # an array of L<Panotools::Script::Line::Image> objects
+ $p->Output; # an array of L<Panotools::Script::Line::Output> objects
+ $p->Control; # an array of L<Panotools::Script::Line::Control> objects
+ $p->ControlMorph; # an array of L<Panotools::Script::Line::ControlMorph> objects
+
+=cut
+
+sub Image
+{
+ my $self = shift;
+ $self->{image};
+}
+
+sub Output
+{
+ my $self = shift;
+ $self->{output};
+}
+
+sub Control
+{
+ my $self = shift;
+ $self->{control};
+}
+
+sub ControlMorph
+{
+ my $self = shift;
+ $self->{controlmorph};
+}
+
+=pod
+
Optimise image parameters in a project:
$p->Optimise;
@@ -224,7 +285,7 @@
return 0 unless ($? == 0);
my $try = new Panotools::Script;
$try->Read ($tempfile) || return 0;
- $self->{output} = $try->{output};
+ $self->{output} = $try->Output;
$self->Output2Image;
return 1;
}
@@ -243,7 +304,7 @@
my ($roll, $pitch, $yaw) = @_;
my @transform_rpy = map (deg2rad ($_), ($roll, $pitch, $yaw));
my $transform_matrix = rollpitchyaw2matrix (@transform_rpy);
- for my $image (@{$self->{image}})
+ for my $image (@{$self->Image})
{
my @rpy = map (deg2rad ($_), ($image->{r}, $image->{p}, $image->{y}));
my $matrix = rollpitchyaw2matrix (@rpy);
@@ -272,13 +333,13 @@
sub Output2Image
{
my $self = shift;
- for my $index (0 .. (@{$self->{output}} - 1))
+ for my $index (0 .. (@{$self->Output} - 1))
{
- for my $entry (keys %{$self->{output}->[$index]})
+ for my $entry (keys %{$self->Output->[$index]})
{
- $self->{image}->[$index] = new Panotools::Script::Line::Image unless (defined $self->{image}->[$index]);
- $self->{image}->[$index]->{$entry} = $self->{output}->[$index]->{$entry}
- unless (defined $self->{image}->[$index]->{$entry} and $self->{image}->[$index]->{$entry} =~ /=/);
+ $self->Image->[$index] = new Panotools::Script::Line::Image unless (defined $self->Image->[$index]);
+ $self->Image->[$index]->{$entry} = $self->Output->[$index]->{$entry}
+ unless (defined $self->Image->[$index]->{$entry} and $self->Image->[$index]->{$entry} =~ /=/);
}
}
}
@@ -286,20 +347,20 @@
sub Image2Output
{
my $self = shift;
- for my $index (0 .. (@{$self->{image}} - 1))
+ for my $index (0 .. (@{$self->Image} - 1))
{
- for my $entry (keys %{$self->{image}->[$index]})
+ for my $entry (keys %{$self->Image->[$index]})
{
- $self->{output}->[$index] = new Panotools::Script::Line::Output unless (defined $self->{output}->[$index]);
- unless ($self->{image}->[$index]->{$entry} =~ /=/)
+ $self->Output->[$index] = new Panotools::Script::Line::Output unless (defined $self->Output->[$index]);
+ unless ($self->Image->[$index]->{$entry} =~ /=/)
{
- $self->{output}->[$index]->{$entry} = $self->{image}->[$index]->{$entry};
+ $self->Output->[$index]->{$entry} = $self->Image->[$index]->{$entry};
}
else
{
- my $base = $self->{image}->[$index]->{$entry};
+ my $base = $self->Image->[$index]->{$entry};
$base =~ s/=//;
- $self->{output}->[$index]->{$entry} = $self->{image}->[$base]->{$entry};
+ $self->Output->[$index]->{$entry} = $self->Image->[$base]->{$entry};
}
}
}
Modified: trunk/Panotools-Script/t/010.read-stitch.t
===================================================================
--- trunk/Panotools-Script/t/010.read-stitch.t 2007-04-30 20:43:15 UTC (rev 699)
+++ trunk/Panotools-Script/t/010.read-stitch.t 2007-04-30 21:32:07 UTC (rev 700)
@@ -18,10 +18,10 @@
}
# set Gamma correction to 2.2
-$p->{mode}->{g} = '2.2';
+$p->Mode->{g} = '2.2';
# set projection to Mercator
-$p->{panorama}->{f} = '5';
+$p->Panorama->{f} = '5';
{
my ($fh, $tempfile) = tempfile (SUFFIX => '.txt', UNLINK => 1);
@@ -35,21 +35,21 @@
{
my ($fh, $image) = tempfile (SUFFIX => '.tif', UNLINK => 1);
- $p->{panorama}->{n} = '"TIFF c:NONE"';
+ $p->Panorama->{n} = '"TIFF c:NONE"';
ok ($p->Stitch ($image), "$stitcher stitched uncompressed file");
like ((stat($image))[7], '/^1[12][0-9]{5}$/', "$stitcher uncompressed size is about 1.2MiB");
}
-{
- my ($fh, $image) = tempfile (SUFFIX => '.tif', UNLINK => 1);
- $p->{panorama}->{n} = '"TIFF c:LZW"';
- ok ($p->Stitch ($image), "$stitcher stitched LZW compressed file");
- like ((stat($image))[7], '/^[567][0-9]{5}$/', "$stitcher LZW compressed size is about 5-700kB");
-}
+#{
+# my ($fh, $image) = tempfile (SUFFIX => '.tif', UNLINK => 1);
+# $p->Panorama->{n} = '"TIFF c:LZW"';
+# ok ($p->Stitch ($image), "$stitcher stitched LZW compressed file");
+# like ((stat($image))[7], '/^[567][0-9]{5}$/', "$stitcher LZW compressed size is about 5-700kB");
+#}
{
my ($fh, $image) = tempfile (SUFFIX => '.tif', UNLINK => 1);
- $p->{panorama}->{n} = '"TIFF c:DEFLATE"';
+ $p->Panorama->{n} = '"TIFF c:DEFLATE"';
ok ($p->Stitch ($image), "$stitcher stitched DEFLATE compressed file");
like ((stat($image))[7], '/^[567][0-9]{5}$/', "$stitcher DEFLATE compressed size is about 5-700kB");
}
Modified: trunk/Panotools-Script/t/012.read-pto.t
===================================================================
--- trunk/Panotools-Script/t/012.read-pto.t 2007-04-30 20:43:15 UTC (rev 699)
+++ trunk/Panotools-Script/t/012.read-pto.t 2007-04-30 21:32:07 UTC (rev 700)
@@ -25,6 +25,6 @@
}
# set projection to Mercator
-$p->{panorama}->{f} = '5';
+$p->Panorama->{f} = '5';
ok ($p->Optimise == 0, 'Optimisation fails');
Modified: trunk/Panotools-Script/t/020.create-script.t
===================================================================
--- trunk/Panotools-Script/t/020.create-script.t 2007-04-30 20:43:15 UTC (rev 699)
+++ trunk/Panotools-Script/t/020.create-script.t 2007-04-30 21:32:07 UTC (rev 700)
@@ -16,10 +16,10 @@
ok ($p->Write ($tempfile), "script written to $tempfile");
}
# set Gamma correction to 2.2
-$p->{mode}->{g} = '2.2';
+$p->Mode->{g} = '2.2';
# set projection to Mercator
-$p->{panorama}->{f} = '5';
+$p->Panorama->{f} = '5';
{
my $image = new Panotools::Script::Line::Image;
@@ -29,7 +29,7 @@
v => 50,
y => 0, p => 0, r => 0,
n => '"somefile.jpg"');
- push @{$p->{image}}, $image;
+ push @{$p->Image}, $image;
}
{
@@ -40,7 +40,7 @@
v => '=0',
y => 40, p => 0, r => 0,
n => '"someotherfile.jpg"');
- push @{$p->{image}}, $image;
+ push @{$p->Image}, $image;
}
{
@@ -48,26 +48,26 @@
ok ($p->Write ($tempfile), "script written to $tempfile");
}
-ok (@{$p->{output}} == 0, 'no o lines yet');
+ok (@{$p->Output} == 0, 'no o lines yet');
$p->Image2Output;
-ok (@{$p->{output}} == 2, 'two o lines after Image2Output()');
+ok (@{$p->Output} == 2, 'two o lines after Image2Output()');
-ok ($p->{output}->[1]->{v} == 50, 'second image inherits fov from first');
+ok ($p->Output->[1]->{v} == 50, 'second image inherits fov from first');
-$p->{output}->[0]->{v} = 40;
-$p->{output}->[1]->{v} = 30;
+$p->Output->[0]->{v} = 40;
+$p->Output->[1]->{v} = 30;
$p->Output2Image;
-ok ($p->{image}->[0]->{v} == 40, 'fov propogates back to first image');
-ok ($p->{image}->[1]->{v} eq '=0', 'fov doesn\'t propogate back to second image');
+ok ($p->Image->[0]->{v} == 40, 'fov propogates back to first image');
+ok ($p->Image->[1]->{v} eq '=0', 'fov doesn\'t propogate back to second image');
$p->Image2Output;
-ok ($p->{output}->[1]->{v} == 40, 'second image inherits fov from first');
+ok ($p->Output->[1]->{v} == 40, 'second image inherits fov from first');
-ok ($p->{output}->[0]->{n} eq '"somefile.jpg"', 'filename reverts');
-ok ($p->{output}->[1]->{n} eq '"someotherfile.jpg"', 'filename reverts');
+ok ($p->Output->[0]->{n} eq '"somefile.jpg"', 'filename reverts');
+ok ($p->Output->[1]->{n} eq '"someotherfile.jpg"', 'filename reverts');
#use Data::Dumper; warn Dumper $p;
Modified: trunk/Panotools-Script/t/021.morph.t
===================================================================
--- trunk/Panotools-Script/t/021.morph.t 2007-04-30 20:43:15 UTC (rev 699)
+++ trunk/Panotools-Script/t/021.morph.t 2007-04-30 21:32:07 UTC (rev 700)
@@ -12,11 +12,11 @@
my $p = new Panotools::Script;
# set projection to cylindrical
-$p->{panorama}->Set (f => 1, w => 600, h => 600, n => 'JPEG');
+$p->Panorama->Set (f => 1, w => 600, h => 600, n => 'JPEG');
{
- $p->{image}->[0] = new Panotools::Script::Line::Image;
- $p->{image}->[0]->Set (w => 600, h => 300,
+ $p->Image->[0] = new Panotools::Script::Line::Image;
+ $p->Image->[0]->Set (w => 600, h => 300,
f => 4,
v => 360,
y => 180, p => 0, r => 0,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|