SHA256
1
0
forked from pool/hugin
OBS User unknown 2007-10-04 22:30:44 +00:00 committed by Git OBS Bridge
parent e0e6ee82f9
commit 8f9a5e4111
3 changed files with 25 additions and 26 deletions

View File

@ -1,34 +1,26 @@
--- src/Panorama/PTOptimise.cpp
+++ src/Panorama/PTOptimise.cpp
@@ -28,6 +28,9 @@
#include <fstream>
#include <sstream>
+#include <unistd.h>
+#include <time.h>
+
#include "common/stl_utils.h"
#include "PT/PTOptimise.h"
#include "PT/ImageGraph.h"
@@ -37,7 +40,7 @@
@@ -36,9 +36,6 @@
#include <boost/property_map.hpp>
#include <boost/graph/graph_utility.hpp>
#define DEBUG_WRITE_OPTIM_OUTPUT
-#define DEBUG_WRITE_OPTIM_OUTPUT
-#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results.txt"
+#define DEBUG_WRITE_OPTIM_OUTPUT_FILE "hugin_debug_optim_results_%d_%d.txt"
-
using namespace std;
using namespace PT;
@@ -134,7 +137,11 @@
using namespace PTools;
@@ -132,13 +129,6 @@
RunLMOptimizer( &opt );
ainf.data = opt.message;
// get results from align info.
#ifdef DEBUG_WRITE_OPTIM_OUTPUT
fullPath path;
-#ifdef DEBUG_WRITE_OPTIM_OUTPUT
- fullPath path;
- StringtoFullPath(&path, DEBUG_WRITE_OPTIM_OUTPUT_FILE );
+
+ char tmpfilename[256];
+ snprintf(tmpfilename, 256, DEBUG_WRITE_OPTIM_OUTPUT_FILE, time(NULL), getpid() );
+
+ StringtoFullPath(&path, tmpfilename );
ainf.data = opt.message;
WriteResults( script, &path, &ainf, distSquared, 0);
-
- ainf.data = opt.message;
- WriteResults( script, &path, &ainf, distSquared, 0);
-#endif
pano.updateVariables(GetAlignInfoVariables(ainf) );
pano.updateCtrlPointErrors( GetAlignInfoCtrlPoints(ainf) );
}

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 4 15:44:11 CEST 2007 - prusnak@suse.cz
- totally removed creation of fixed-name file in /tmp from last patch
-------------------------------------------------------------------
Wed Sep 27 14:28:38 CEST 2007 - prusnak@suse.cz

View File

@ -16,7 +16,7 @@ License: GPL v2 or later
Group: Productivity/Graphics/Bitmap Editors
Summary: Front-End for Panorama Tools
Version: 0.6.99.4
Release: 36
Release: 37
%define _version 0.7_beta4
Source: %{name}-%{_version}.tar.bz2
Patch2: hugin-fftw.patch
@ -113,6 +113,8 @@ fi
%{_datadir}/pixmaps/*.png
%doc %{_mandir}/man?/*
%changelog
* Thu Oct 04 2007 - prusnak@suse.cz
- totally removed creation of fixed-name file in /tmp from last patch
* Thu Sep 27 2007 - prusnak@suse.cz
- fixed creation of fixed-name file in /tmp [#307684]
(optim_file.patch)