2019.0 beta2

parent 944bd865
hugin (2019.0.0~beta2+dfsg-1) experimental; urgency=low
* New upstream version.
+ Drop 30_*diff.
-- Andreas Metzler <ametzler@debian.org> Sun, 10 Feb 2019 19:31:46 +0100
hugin (2019.0.0~beta1+dfsg-2) experimental; urgency=low
* Update to head of release branch:
......
# HG changeset patch
# User tmodes
# Date 1548515355 -3600
# Sat Jan 26 16:09:15 2019 +0100
# Branch 2019.0
# Node ID 537f0ed7aeefbd12b9c288b3f8dd8615505dce5a
# Parent d63ae78cb128414e3f1ecb8032360ab2bf86aeaa
Fix typos, found by lintian.
Patch by Andreas Metzler
diff -r d63ae78cb128 -r 537f0ed7aeef doc/cpfind.pod
--- a/doc/cpfind.pod Sat Jan 26 11:07:23 2019 +0100
+++ b/doc/cpfind.pod Sat Jan 26 16:09:15 2019 +0100
@@ -29,7 +29,7 @@
=head2 Rectilinear and fisheye images
-Cpfind can find control points in rectilinear and fisheye images. To achieve good control points images with a high horizontal field of view (e.g. ultra wide rectilinear or fisheye) are therefor remapped into a conformal space (cpfind is using the stereographic projection) and the feature matching occurs in this space. Before writing the control points the coordinates are remapped back to the image space. This happens automatic depending on the information about the lens in the input project file. So check that your input project file contains reasonable information about the used lens.
+Cpfind can find control points in rectilinear and fisheye images. To achieve good control points images with a high horizontal field of view (e.g. ultra wide rectilinear or fisheye) are therefore remapped into a conformal space (cpfind is using the stereographic projection) and the feature matching occurs in this space. Before writing the control points the coordinates are remapped back to the image space. This happens automatic depending on the information about the lens in the input project file. So check that your input project file contains reasonable information about the used lens.
=head2 Using celeste
diff -r d63ae78cb128 -r 537f0ed7aeef src/hugin1/hugin/MainFrame.h
--- a/src/hugin1/hugin/MainFrame.h Sat Jan 26 11:07:23 2019 +0100
+++ b/src/hugin1/hugin/MainFrame.h Sat Jan 26 16:09:15 2019 +0100
@@ -81,7 +81,7 @@
* It contains the menu & statusbar and a big notebook with
* the different tabs. It also holds the Panorama model.
*
- * it therefor also hold operations that determine the lifecycle
+ * it therefore also hold operations that determine the lifecycle
* of the panorama object (new, open, save, quit).
*/
class MainFrame : public wxFrame, public HuginBase::PanoramaObserver, public AppBase::ProgressDisplay
diff -r d63ae78cb128 -r 537f0ed7aeef src/tools/pano_modify.cpp
--- a/src/tools/pano_modify.cpp Sat Jan 26 11:07:23 2019 +0100
+++ b/src/tools/pano_modify.cpp Sat Jan 26 16:09:15 2019 +0100
@@ -787,7 +787,7 @@
std::cout << "Setting verdandi arguments to " << blenderArgs << std::endl;
break;
default:
- std::cout << "Unknow blender in pto file." << std::endl;
+ std::cout << "Unknown blender in pto file." << std::endl;
break;
};
pano.setOptions(opt);
diff -r d63ae78cb128 -r 537f0ed7aeef src/tools/pto_lensstack.cpp
--- a/src/tools/pto_lensstack.cpp Sat Jan 26 11:07:23 2019 +0100
+++ b/src/tools/pto_lensstack.cpp Sat Jan 26 16:09:15 2019 +0100
@@ -305,7 +305,7 @@
else
{
std::cout << "Warning: Pto project contains only one lens." << std::endl
- << " Therefor the lens can not be changed. Use --new-lens instead." << std::endl;
+ << " Therefore the lens can not be changed. Use --new-lens instead." << std::endl;
};
};
# HG changeset patch
# User tmodes
# Date 1548529375 -3600
# Sat Jan 26 20:02:55 2019 +0100
# Branch 2019.0
# Node ID e6ffd30a86c7b761d7d07ec7413b60f6d9e94be2
# Parent 537f0ed7aeefbd12b9c288b3f8dd8615505dce5a
Store also user files according to XDG spec
diff -r 537f0ed7aeef -r e6ffd30a86c7 CMakeLists.txt
--- a/CMakeLists.txt Sat Jan 26 16:09:15 2019 +0100
+++ b/CMakeLists.txt Sat Jan 26 20:02:55 2019 +0100
@@ -173,6 +173,11 @@
IF(wxWidgets_VERSION VERSION_LESS "3.0")
MESSAGE(FATAL_ERROR "At least wxWidgets 3.0 is required")
ENDIF()
+ IF(wxWidgets_VERSION VERSION_GREATER "3.1.0")
+ SET(USE_XDG_DIRS 1)
+ ELSE()
+ UNSET(USE_XDG_DIRS)
+ ENDIF()
# Ubuntu has 2 different devel packages, we need the GUI version
EXEC_PROGRAM(sh ARGS "${wxWidgets_CONFIG_EXECUTABLE} --query-toolkit" OUTPUT_VARIABLE wxWidgets_TOOLKIT)
IF(wxWidgets_TOOLKIT STREQUAL "base")
diff -r 537f0ed7aeef -r e6ffd30a86c7 src/hugin_base/hugin_utils/utils.cpp
--- a/src/hugin_base/hugin_utils/utils.cpp Sat Jan 26 16:09:15 2019 +0100
+++ b/src/hugin_base/hugin_utils/utils.cpp Sat Jan 26 20:02:55 2019 +0100
@@ -436,6 +436,27 @@
#endif
};
+#ifndef _WIN32
+std::string GetHomeDir()
+{
+ char *homedir = getenv("HOME");
+ struct passwd *pw;
+ if (homedir == NULL)
+ {
+ pw = getpwuid(getuid());
+ if (pw != NULL)
+ {
+ homedir = pw->pw_dir;
+ };
+ };
+ if (homedir == NULL)
+ {
+ return std::string();
+ };
+ return std::string(homedir);
+}
+#endif
+
std::string GetUserAppDataDir()
{
fs::path path;
@@ -448,25 +469,39 @@
path = fs::path(fullpath);
path /= "hugin";
#else
- char *homedir = getenv("HOME");
- struct passwd *pw;
- if (homedir == NULL)
+#ifdef USE_XDG_DIRS
+ char *xdgDataDir = getenv("XDG_DATA_HOME");
+ if (strlen(xdgDataDir) == 0)
{
- pw = getpwuid(getuid());
- if(pw != NULL)
+ // no XDG_DATA_HOME enviroment variable set
+ // use $HOME/.local/share instead
+ const std::string homeDir = GetHomeDir();
+ if (homeDir.empty())
{
- homedir = pw->pw_dir;
+ return std::string();
};
+ path = fs::path(homeDir);
+ path /= ".local/share/hugin";
+ }
+ else
+ {
+ // XDG_DATA_HOME set, use hugindata sub directory
+ path = fs::path(xdgDataDir);
+ path /= "hugin";
};
- if(homedir == NULL)
+#else
+ // old behaviour, save in users home directory, sub-directory .hugindata
+ const std::string homeDir = GetHomeDir();
+ if (homeDir.empty())
{
return std::string();
};
- path = fs::path(homedir);
+ path = fs::path(homeDir);
// we have already a file with name ".hugin" for our wxWidgets settings
// therefore we use directory ".hugindata" in homedir
path /= ".hugindata";
#endif
+#endif
if (!fs::exists(path))
{
if (!fs::create_directories(path))
diff -r 537f0ed7aeef -r e6ffd30a86c7 src/hugin_config.h.in.cmake
--- a/src/hugin_config.h.in.cmake Sat Jan 26 16:09:15 2019 +0100
+++ b/src/hugin_config.h.in.cmake Sat Jan 26 20:02:55 2019 +0100
@@ -34,4 +34,7 @@
/* Build a fully self contained OSX bundle (with embedded ressources) */
#cmakedefine UNIX_SELF_CONTAINED_BUNDLE 1
+/* Store settings according to XDG specification, works only with wxWidgets 3.1.1 or later */
+#cmakedefine USE_XDG_DIRS 1
+
#endif
# HG changeset patch
# User tmodes
# Date 1548529445 -3600
# Sat Jan 26 20:04:05 2019 +0100
# Branch 2019.0
# Node ID 450bd3d741ebd3bafd229828e5eb8ffb89631dcf
# Parent e6ffd30a86c7b761d7d07ec7413b60f6d9e94be2
Fixes crash on closing simple interface [1813404]
diff -r e6ffd30a86c7 -r 450bd3d741eb src/hugin1/hugin/GLPreviewFrame.cpp
--- a/src/hugin1/hugin/GLPreviewFrame.cpp Sat Jan 26 20:02:55 2019 +0100
+++ b/src/hugin1/hugin/GLPreviewFrame.cpp Sat Jan 26 20:04:05 2019 +0100
@@ -782,9 +782,8 @@
FillBlendChoice();
};
-GLPreviewFrame::~GLPreviewFrame()
+void GLPreviewFrame::StorePositionAndSize()
{
- DEBUG_TRACE("dtor writing config");
wxConfigBase * cfg = wxConfigBase::Get();
StoreFramePosition(this, wxT("GLPreviewFrame"));
@@ -801,7 +800,13 @@
cfg->Write(wxT("/GLPreviewFrame/showPreviewGrid"), GetMenuBar()->FindItem(XRCID("action_show_grid"))->IsChecked());
cfg->Write(wxT("/GLPreviewFrame/individualDragMode"), individualDragging());
cfg->Write(wxT("/GLPreviewFrame/guide"),m_GuideChoiceProj->GetSelection());
-
+};
+
+GLPreviewFrame::~GLPreviewFrame()
+{
+ DEBUG_TRACE("dtor writing config");
+ StorePositionAndSize();
+
// delete all of the tools. When the preview is never used we never get an
// OpenGL context and therefore don't create the tools.
if (crop_tool)
diff -r e6ffd30a86c7 -r 450bd3d741eb src/hugin1/hugin/GLPreviewFrame.h
--- a/src/hugin1/hugin/GLPreviewFrame.h Sat Jan 26 20:02:55 2019 +0100
+++ b/src/hugin1/hugin/GLPreviewFrame.h Sat Jan 26 20:04:05 2019 +0100
@@ -193,6 +193,8 @@
/** dtor.
*/
virtual ~GLPreviewFrame();
+ /** store position and size of window in wxConfig */
+ void StorePositionAndSize();
virtual void panoramaChanged(HuginBase::Panorama &pano);
virtual void panoramaImagesChanged(HuginBase::Panorama &pano, const HuginBase::UIntSet &changed);
diff -r e6ffd30a86c7 -r 450bd3d741eb src/hugin1/hugin/MainFrame.cpp
--- a/src/hugin1/hugin/MainFrame.cpp Sat Jan 26 20:02:55 2019 +0100
+++ b/src/hugin1/hugin/MainFrame.cpp Sat Jan 26 20:04:05 2019 +0100
@@ -908,7 +908,14 @@
}
if(gl_preview_frame)
{
- gl_preview_frame->Close(true);
+ if(m_guiLevel==GUI_SIMPLE)
+ {
+ gl_preview_frame->StorePositionAndSize();
+ }
+ else
+ {
+ gl_preview_frame->Close(true);
+ };
}
ImageCache::getInstance().flush();
# HG changeset patch
# User tmodes
# Date 1548533675 -3600
# Sat Jan 26 21:14:35 2019 +0100
# Branch 2019.0
# Node ID 6a79af4e19b66bc1cf442a2bc49c12016c346fba
# Parent 450bd3d741ebd3bafd229828e5eb8ffb89631dcf
calibrate_lens_gui: Correctly initialize member variable m_monitorProfile
Patch by Niklas Mischkulnig
diff -r 450bd3d741eb -r 6a79af4e19b6 src/hugin1/calibrate_lens/LensCalImageCtrl.cpp
--- a/src/hugin1/calibrate_lens/LensCalImageCtrl.cpp Sat Jan 26 20:04:05 2019 +0100
+++ b/src/hugin1/calibrate_lens/LensCalImageCtrl.cpp Sat Jan 26 21:14:35 2019 +0100
@@ -55,6 +55,7 @@
m_c=0;
m_d=0;
m_e=0;
+ m_monitorProfile = NULL;
// load monitor profile
wxString profileName;
HuginBase::Color::GetMonitorProfile(profileName, m_monitorProfile);
30_8078_537f0ed7aeef_Fix_typos__found_by_lintian_.diff
30_8080_e6ffd30a86c7_Store_also_user_files_according_to_XDG_spec.diff
30_8081_450bd3d741eb_Fixes_crash_on_closing_simple_interface__1813404_.diff
30_8084_6a79af4e19b6_calibrate_lens_gui__Correctly_initialize_member_variable_m_monitorProfile.diff
43_fallbackhelp.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment