On 24.08.19 15:56, T. Modes wrote:
From you python_plugins.diff
diff --git a/src/hugin_base/panodata/PanoramaOptions.h
b/src/hugin_base/panodata/PanoramaOptions.h
--- a/src/hugin_base/panodata/PanoramaOptions.h
+++ b/src/hugin_base/panodata/PanoramaOptions.h
@@ -240,7 +240,7 @@
??I don't know what changes do PanoramaOptions.h have to do with the
plugins
Nothing at all, that was a private change which accidentally leaked into
the first patch I sent
> Also all files are contained twice.
I don't know what you mean by that, can you explain?
line 1-7 are
diff --git a/src/hugin_script_interface/plugins-dev/dual_use.py
b/src/hugin_script_interface/plugins-dev/dual_use.py
--- a/src/hugin_script_interface/plugins-dev/dual_use.py
+++ b/src/hugin_script_interface/plugins-dev/dual_use.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
then the same lines again at line 456, 929 and 1390 (so the same changes
are 4 times in the diff)
This apply is several files, I just mention the first one.
I see. You are right. Inspecting my history I see that I used '>>'
instead of '>' to write to the patch. I was in a hurry. My mistake.
Corrected patch attached. This new patch is against a pull as of
2019-08-24 17:10 CEST and has:
- removal of the api limits in the plugin scripts
- removal of the shebangs (I still think that's a good idea)
- change of permissions removing execute permission
And it was done with
hg diff --git
because, as far as I understand it, this transports the mode changes as
well, which plain hg diff does not. I hope that works now.
I hope that Terry can apply this patch and that it allows the fedora
package to build. Then we can discuss if we should use shebangs at all,
and if so, which it should be. Roger has posted concerning this issue,
I'll answer that separately.
Kay
--
A list of frequently asked questions is available at:
http://wiki.panotools.org/Hugin_FAQ
---
You received this message because you are subscribed to the Google Groups "hugin and other free panoramic software" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/hugin-ptx/84dd2056-8721-52a2-45bb-e248e273a0d6%40yahoo.com.
diff --git a/src/hugin_script_interface/hpi.py b/src/hugin_script_interface/hpi.py
old mode 100755
new mode 100644
--- a/src/hugin_script_interface/hpi.py
+++ b/src/hugin_script_interface/hpi.py
@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
from __future__ import print_function
# hpi.py - dispatcher for hugin plugins
diff --git a/src/hugin_script_interface/plugins-dev/dual_use.py b/src/hugin_script_interface/plugins-dev/dual_use.py
old mode 100755
new mode 100644
--- a/src/hugin_script_interface/plugins-dev/dual_use.py
+++ b/src/hugin_script_interface/plugins-dev/dual_use.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
from __future__ import print_function
gpl = r"""
@@ -23,8 +21,6 @@
# @category Examples
# @name Dual Use Plugin
-# @api-min 2011.1
-# @api-max 2012.0
# dual_use will function as a hugin plugin and as a standalone
# Python script.
diff --git a/src/hugin_script_interface/plugins-dev/plugin_skeleton.py b/src/hugin_script_interface/plugins-dev/plugin_skeleton.py
old mode 100755
new mode 100644
--- a/src/hugin_script_interface/plugins-dev/plugin_skeleton.py
+++ b/src/hugin_script_interface/plugins-dev/plugin_skeleton.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
# plugin_skeleton.py - a skeleton for a hugin plugin
# Copyright (C) 2011 Kay F. Jahnke
@@ -18,8 +16,6 @@
# @category Examples
# @name Skeleton Plugin
-# @api-min 2011.1
-# @api-max 2012.0
# we use modern type python print statements:
diff --git a/src/hugin_script_interface/plugins/top_five.py b/src/hugin_script_interface/plugins/top_five.py
old mode 100755
new mode 100644
--- a/src/hugin_script_interface/plugins/top_five.py
+++ b/src/hugin_script_interface/plugins/top_five.py
@@ -1,11 +1,7 @@
-#!/usr/bin/env python
-
from __future__ import print_function
# @category Control Points
# @name keep 5 CPs per image pair
-# @api-min 2011.1
-# @api-max 2016.1
# top_five.py - keep the five best CPs for each image pair
@@ -66,7 +62,10 @@
# finally we attach the new CP vector to the panorama
- print ( 'keeping %d control points' % len ( cpv ) )
+ print ( 'keeping %d control points:' % len ( cpv ) )
+ for cp in cpv:
+ print ( "%d %d %d %d" % ( cp.x1 , cp.y1 , cp.x2 , cp.y2 ) )
+
pano.setCtrlPoints ( cpv )
return 0
diff --git a/src/hugin_script_interface/plugins/woa.py b/src/hugin_script_interface/plugins/woa.py
old mode 100755
new mode 100644
--- a/src/hugin_script_interface/plugins/woa.py
+++ b/src/hugin_script_interface/plugins/woa.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
# -*- coding: utf-8 -*-
from __future__ import print_function
@@ -24,8 +23,6 @@
"""
# @category Control Points
# @name Warped Overlap Analysis
-# @api-min 2014.0
-# @api-max 2016.3
# note that if you want to read the script, it's written bottom-up, so the
# higher-level routines are towards the end.
