| Subject: | perl 5.18.1 qw syntax errors |
perl 5.18.1 changed rules about qw, so bare qw causes syntax errors. see perlchanges.
proposed patch adapts Panotools-Script to perl 5.18.1
--- Panotools-Script-0.28/bin/lens-submit 2013-05-12 22:22:27.000000000 +0000
+++ Panotools-Script-0.28/bin/lens-submit 2013-10-07 18:27:07.848967054 +0000
@@ -29,7 +29,7 @@
my $image = $pto->Image->[0];
my $query_image = {};
- for my $parameter qw/w h f v a b c d e g t Ra Rb Rc Rd Re Va Vb Vc Vd Vx Vy/
+ for my $parameter (qw/w h f v a b c d e g t Ra Rb Rc Rd Re Va Vb Vc Vd Vx Vy/)
{
$query_image->{$parameter} = $image->{$parameter}
if defined $image->{$parameter};
@@ -50,10 +50,10 @@
}
my $query_photo = {};
- for my $parameter qw/ColorSpace ExifVersion FileType FNumber FocalLength FOV
+ for my $parameter (qw/ColorSpace ExifVersion FileType FNumber FocalLength FOV
FocalLengthIn35mmFormat ImageHeight ImageWidth Lens LensModel LensType Make
Model ResolutionUnit ScaleFactor35efl Software SubjectDistanceRange XResolution
- YResolution/
+ YResolution/)
{
$query_photo->{$parameter} = $photo->{$parameter}
if defined $photo->{$parameter};
--- Panotools-Script-0.28/bin/pto2mk2 2013-05-12 22:22:27.000000000 +0000
+++ Panotools-Script-0.28/bin/pto2mk2 2013-10-07 18:33:01.424231694 +0000
@@ -393,10 +393,10 @@
$rule = $mk->Rule ('$(LDR_BLENDED)');
$rule->Prerequisites ('$(LDR_LAYERS)');
-$rule->Command qw/$(ENBLEND_SHELL) $(ENBLEND_LDR_COMP_SHELL) $(ENBLEND_OPTS_SHELL)
- -o $(LDR_BLENDED_SHELL) $(LDR_LAYERS_SHELL)/;
-$rule->Command qw/$(EXIFTOOL_SHELL) -overwrite_original_in_place
- -TagsFromFile $(INPUT_IMAGE_1_SHELL) $(EXIFTOOL_COPY_ARGS_SHELL) $(LDR_BLENDED_SHELL)/;
+$rule->Command (qw/$(ENBLEND_SHELL) $(ENBLEND_LDR_COMP_SHELL) $(ENBLEND_OPTS_SHELL)
+ -o $(LDR_BLENDED_SHELL) $(LDR_LAYERS_SHELL)/);
+$rule->Command (qw/$(EXIFTOOL_SHELL) -overwrite_original_in_place
+ -TagsFromFile $(INPUT_IMAGE_1_SHELL) $(EXIFTOOL_COPY_ARGS_SHELL) $(LDR_BLENDED_SHELL)/);
$mk->Comment ('ldr fused stacks then blended output');
| Subject: | Panotools-Script-0.28-perl-syntax.patch |
--- Panotools-Script-0.28/bin/lens-submit 2013-05-12 22:22:27.000000000 +0000
+++ Panotools-Script-0.28/bin/lens-submit 2013-10-07 18:27:07.848967054 +0000
@@ -29,7 +29,7 @@
my $image = $pto->Image->[0];
my $query_image = {};
- for my $parameter qw/w h f v a b c d e g t Ra Rb Rc Rd Re Va Vb Vc Vd Vx Vy/
+ for my $parameter (qw/w h f v a b c d e g t Ra Rb Rc Rd Re Va Vb Vc Vd Vx Vy/)
{
$query_image->{$parameter} = $image->{$parameter}
if defined $image->{$parameter};
@@ -50,10 +50,10 @@
}
my $query_photo = {};
- for my $parameter qw/ColorSpace ExifVersion FileType FNumber FocalLength FOV
+ for my $parameter (qw/ColorSpace ExifVersion FileType FNumber FocalLength FOV
FocalLengthIn35mmFormat ImageHeight ImageWidth Lens LensModel LensType Make
Model ResolutionUnit ScaleFactor35efl Software SubjectDistanceRange XResolution
- YResolution/
+ YResolution/)
{
$query_photo->{$parameter} = $photo->{$parameter}
if defined $photo->{$parameter};
--- Panotools-Script-0.28/bin/pto2mk2 2013-05-12 22:22:27.000000000 +0000
+++ Panotools-Script-0.28/bin/pto2mk2 2013-10-07 18:33:01.424231694 +0000
@@ -393,10 +393,10 @@
$rule = $mk->Rule ('$(LDR_BLENDED)');
$rule->Prerequisites ('$(LDR_LAYERS)');
-$rule->Command qw/$(ENBLEND_SHELL) $(ENBLEND_LDR_COMP_SHELL) $(ENBLEND_OPTS_SHELL)
- -o $(LDR_BLENDED_SHELL) $(LDR_LAYERS_SHELL)/;
-$rule->Command qw/$(EXIFTOOL_SHELL) -overwrite_original_in_place
- -TagsFromFile $(INPUT_IMAGE_1_SHELL) $(EXIFTOOL_COPY_ARGS_SHELL) $(LDR_BLENDED_SHELL)/;
+$rule->Command (qw/$(ENBLEND_SHELL) $(ENBLEND_LDR_COMP_SHELL) $(ENBLEND_OPTS_SHELL)
+ -o $(LDR_BLENDED_SHELL) $(LDR_LAYERS_SHELL)/);
+$rule->Command (qw/$(EXIFTOOL_SHELL) -overwrite_original_in_place
+ -TagsFromFile $(INPUT_IMAGE_1_SHELL) $(EXIFTOOL_COPY_ARGS_SHELL) $(LDR_BLENDED_SHELL)/);
$mk->Comment ('ldr fused stacks then blended output');