Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
stitchEm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Franco (nextime) Lanza
stitchEm
Commits
93a48ba8
Unverified
Commit
93a48ba8
authored
4 years ago
by
Wieland Morgenstern
Committed by
GitHub
4 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #98 from stitchEm/w-m/pto-parsing
PTGui file parsing with float e+ notation
parents
20b4202b
2fee5d2a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
CMakeLists.txt
lib/CMakeLists.txt
+1
-1
ptoParse.cpp
lib/src/core/defs/ptoParse.cpp
+6
-6
ptsParsingTest.cpp
lib/src/test/ptsParsingTest.cpp
+1
-1
No files found.
lib/CMakeLists.txt
View file @
93a48ba8
...
...
@@ -894,7 +894,7 @@ add_subdirectory(samples/depth)
# ----------------------------------------------------------------------------
# libvideostitch unit tests
# ----------------------------------------------------------------------------
if
(
LIB_TESTS
)
if
(
BUILD_
LIB_TESTS
)
add_subdirectory
(
src/test
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
lib/src/core/defs/ptoParse.cpp
View file @
93a48ba8
...
...
@@ -538,8 +538,8 @@ Potential<ReaderInputDefinition> ReaderInputDefinition::parseFromPtoLine(
}
break
;
default
:
//[0-9.eE]
if
(
!
((
'0'
<=
*
lp
&&
*
lp
<=
'9'
)
||
*
lp
==
'e'
||
*
lp
==
'E'
||
*
lp
==
'.'
||
*
lp
==
'-'
))
{
//[0-9.eE
+-
]
if
(
!
((
'0'
<=
*
lp
&&
*
lp
<=
'9'
)
||
*
lp
==
'e'
||
*
lp
==
'E'
||
*
lp
==
'.'
||
*
lp
==
'-'
||
*
lp
==
'+'
))
{
char
c
=
*
lp
;
*
lp
=
0
;
switch
(
state
)
{
...
...
@@ -758,8 +758,8 @@ Potential<InputDefinition> InputDefinition::parseFromPtoLine(char* line,
}
break
;
default
:
//[0-9.eE]
if
(
!
((
'0'
<=
*
lp
&&
*
lp
<=
'9'
)
||
*
lp
==
'e'
||
*
lp
==
'E'
||
*
lp
==
'.'
||
*
lp
==
'-'
))
{
//[0-9.eE
+-
]
if
(
!
((
'0'
<=
*
lp
&&
*
lp
<=
'9'
)
||
*
lp
==
'e'
||
*
lp
==
'E'
||
*
lp
==
'.'
||
*
lp
==
'-'
||
*
lp
==
'+'
))
{
char
c
=
*
lp
;
*
lp
=
0
;
switch
(
state
)
{
...
...
@@ -1062,8 +1062,8 @@ Status PanoDefinition::readParams(char* line) {
}
break
;
default
:
//[0-9.eE]
if
(
!
((
'0'
<=
*
lp
&&
*
lp
<=
'9'
)
||
*
lp
==
'e'
||
*
lp
==
'E'
||
*
lp
==
'.'
||
*
lp
==
'-'
))
{
//[0-9.eE
+-
]
if
(
!
((
'0'
<=
*
lp
&&
*
lp
<=
'9'
)
||
*
lp
==
'e'
||
*
lp
==
'E'
||
*
lp
==
'.'
||
*
lp
==
'-'
||
*
lp
==
'+'
))
{
char
c
=
*
lp
;
*
lp
=
0
;
switch
(
state
)
{
...
...
This diff is collapsed.
Click to expand it.
lib/src/test/ptsParsingTest.cpp
View file @
93a48ba8
...
...
@@ -122,7 +122,7 @@ void ptsToPanoDefinitionTest() {
"# input images:
\n
"
"#-dummyimage
\n
"
"# The following line contains a 'dummy image' containing some global parameters for the project
\n
"
"o w1 h1 y0 r0 p0 v1
24.785166312651
a-0.1712794685889779 b0.6799971985994054 c-0.7660565920132166 f3 "
"o w1 h1 y0 r0 p0 v1
.24785166312651e+02
a-0.1712794685889779 b0.6799971985994054 c-0.7660565920132166 f3 "
"d0.0009362105412644209 e-0.0007190110954970641 g0 t0
\n
"
"#-imgfile 1920 1440
\"
input-00.jpg
\"\n
"
"#-metadata -1 -1 -1 0000-00-00T00:00:00 3*8 0 -1 -1 -1 * * * curve -1 * T *
\n
"
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment