Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
wangsen
paddle_dbnet
Commits
48568aa4
Commit
48568aa4
authored
Jul 09, 2021
by
LDOUBLEV
Browse files
fix bugs
parent
02b75a50
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
15 deletions
+14
-15
deploy/cpp_infer/CMakeLists.txt
deploy/cpp_infer/CMakeLists.txt
+0
-1
deploy/cpp_infer/src/clipper.cpp
deploy/cpp_infer/src/clipper.cpp
+11
-11
deploy/cpp_infer/src/config.cpp
deploy/cpp_infer/src/config.cpp
+3
-3
No files found.
deploy/cpp_infer/CMakeLists.txt
View file @
48568aa4
...
@@ -13,7 +13,6 @@ SET(TENSORRT_DIR "" CACHE PATH "Compile demo with TensorRT")
...
@@ -13,7 +13,6 @@ SET(TENSORRT_DIR "" CACHE PATH "Compile demo with TensorRT")
set
(
DEMO_NAME
"ocr_system"
)
set
(
DEMO_NAME
"ocr_system"
)
macro
(
safe_set_static_flag
)
macro
(
safe_set_static_flag
)
foreach
(
flag_var
foreach
(
flag_var
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
...
...
deploy/cpp_infer/src/clipper.cpp
View file @
48568aa4
...
@@ -668,7 +668,7 @@ void DisposeOutPts(OutPt *&pp) {
...
@@ -668,7 +668,7 @@ void DisposeOutPts(OutPt *&pp) {
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
inline
void
InitEdge
(
TEdge
*
e
,
TEdge
*
eNext
,
TEdge
*
ePrev
,
const
IntPoint
&
Pt
)
{
inline
void
InitEdge
(
TEdge
*
e
,
TEdge
*
eNext
,
TEdge
*
ePrev
,
const
IntPoint
&
Pt
)
{
std
::
memset
(
e
,
0
,
sizeof
(
TEdge
));
std
::
memset
(
e
,
int
(
0
)
,
sizeof
(
TEdge
));
e
->
Next
=
eNext
;
e
->
Next
=
eNext
;
e
->
Prev
=
ePrev
;
e
->
Prev
=
ePrev
;
e
->
Curr
=
Pt
;
e
->
Curr
=
Pt
;
...
@@ -1895,17 +1895,17 @@ void Clipper::InsertLocalMinimaIntoAEL(const cInt botY) {
...
@@ -1895,17 +1895,17 @@ void Clipper::InsertLocalMinimaIntoAEL(const cInt botY) {
TEdge
*
rb
=
lm
->
RightBound
;
TEdge
*
rb
=
lm
->
RightBound
;
OutPt
*
Op1
=
0
;
OutPt
*
Op1
=
0
;
if
(
!
lb
)
{
if
(
!
lb
||
!
rb
)
{
// nb: don't insert LB into either AEL or SEL
// nb: don't insert LB into either AEL or SEL
InsertEdgeIntoAEL
(
rb
,
0
);
InsertEdgeIntoAEL
(
rb
,
0
);
SetWindingCount
(
*
rb
);
SetWindingCount
(
*
rb
);
if
(
IsContributing
(
*
rb
))
if
(
IsContributing
(
*
rb
))
Op1
=
AddOutPt
(
rb
,
rb
->
Bot
);
Op1
=
AddOutPt
(
rb
,
rb
->
Bot
);
}
else
if
(
!
rb
)
{
//
} else if (!rb) {
InsertEdgeIntoAEL
(
lb
,
0
);
//
InsertEdgeIntoAEL(lb, 0);
SetWindingCount
(
*
lb
);
//
SetWindingCount(*lb);
if
(
IsContributing
(
*
lb
))
//
if (IsContributing(*lb))
Op1
=
AddOutPt
(
lb
,
lb
->
Bot
);
//
Op1 = AddOutPt(lb, lb->Bot);
InsertScanbeam
(
lb
->
Top
.
Y
);
InsertScanbeam
(
lb
->
Top
.
Y
);
}
else
{
}
else
{
InsertEdgeIntoAEL
(
lb
,
0
);
InsertEdgeIntoAEL
(
lb
,
0
);
...
@@ -2547,13 +2547,13 @@ void Clipper::ProcessHorizontal(TEdge *horzEdge) {
...
@@ -2547,13 +2547,13 @@ void Clipper::ProcessHorizontal(TEdge *horzEdge) {
if
(
dir
==
dLeftToRight
)
{
if
(
dir
==
dLeftToRight
)
{
maxIt
=
m_Maxima
.
begin
();
maxIt
=
m_Maxima
.
begin
();
while
(
maxIt
!=
m_Maxima
.
end
()
&&
*
maxIt
<=
horzEdge
->
Bot
.
X
)
while
(
maxIt
!=
m_Maxima
.
end
()
&&
*
maxIt
<=
horzEdge
->
Bot
.
X
)
maxIt
++
;
++
maxIt
;
if
(
maxIt
!=
m_Maxima
.
end
()
&&
*
maxIt
>=
eLastHorz
->
Top
.
X
)
if
(
maxIt
!=
m_Maxima
.
end
()
&&
*
maxIt
>=
eLastHorz
->
Top
.
X
)
maxIt
=
m_Maxima
.
end
();
maxIt
=
m_Maxima
.
end
();
}
else
{
}
else
{
maxRit
=
m_Maxima
.
rbegin
();
maxRit
=
m_Maxima
.
rbegin
();
while
(
maxRit
!=
m_Maxima
.
rend
()
&&
*
maxRit
>
horzEdge
->
Bot
.
X
)
while
(
maxRit
!=
m_Maxima
.
rend
()
&&
*
maxRit
>
horzEdge
->
Bot
.
X
)
maxRit
++
;
++
maxRit
;
if
(
maxRit
!=
m_Maxima
.
rend
()
&&
*
maxRit
<=
eLastHorz
->
Top
.
X
)
if
(
maxRit
!=
m_Maxima
.
rend
()
&&
*
maxRit
<=
eLastHorz
->
Top
.
X
)
maxRit
=
m_Maxima
.
rend
();
maxRit
=
m_Maxima
.
rend
();
}
}
...
@@ -2576,13 +2576,13 @@ void Clipper::ProcessHorizontal(TEdge *horzEdge) {
...
@@ -2576,13 +2576,13 @@ void Clipper::ProcessHorizontal(TEdge *horzEdge) {
while
(
maxIt
!=
m_Maxima
.
end
()
&&
*
maxIt
<
e
->
Curr
.
X
)
{
while
(
maxIt
!=
m_Maxima
.
end
()
&&
*
maxIt
<
e
->
Curr
.
X
)
{
if
(
horzEdge
->
OutIdx
>=
0
&&
!
IsOpen
)
if
(
horzEdge
->
OutIdx
>=
0
&&
!
IsOpen
)
AddOutPt
(
horzEdge
,
IntPoint
(
*
maxIt
,
horzEdge
->
Bot
.
Y
));
AddOutPt
(
horzEdge
,
IntPoint
(
*
maxIt
,
horzEdge
->
Bot
.
Y
));
maxIt
++
;
++
maxIt
;
}
}
}
else
{
}
else
{
while
(
maxRit
!=
m_Maxima
.
rend
()
&&
*
maxRit
>
e
->
Curr
.
X
)
{
while
(
maxRit
!=
m_Maxima
.
rend
()
&&
*
maxRit
>
e
->
Curr
.
X
)
{
if
(
horzEdge
->
OutIdx
>=
0
&&
!
IsOpen
)
if
(
horzEdge
->
OutIdx
>=
0
&&
!
IsOpen
)
AddOutPt
(
horzEdge
,
IntPoint
(
*
maxRit
,
horzEdge
->
Bot
.
Y
));
AddOutPt
(
horzEdge
,
IntPoint
(
*
maxRit
,
horzEdge
->
Bot
.
Y
));
maxRit
++
;
++
maxRit
;
}
}
}
}
};
};
...
...
deploy/cpp_infer/src/config.cpp
View file @
48568aa4
...
@@ -21,10 +21,10 @@ std::vector<std::string> OCRConfig::split(const std::string &str,
...
@@ -21,10 +21,10 @@ std::vector<std::string> OCRConfig::split(const std::string &str,
std
::
vector
<
std
::
string
>
res
;
std
::
vector
<
std
::
string
>
res
;
if
(
""
==
str
)
if
(
""
==
str
)
return
res
;
return
res
;
char
*
strs
=
new
char
[
str
.
length
()
+
1
];
char
strs
[
str
.
length
()
+
1
];
std
::
strcpy
(
strs
,
str
.
c_str
());
std
::
strcpy
(
strs
,
str
.
c_str
());
char
*
d
=
new
char
[
delim
.
length
()
+
1
];
char
d
[
delim
.
length
()
+
1
];
std
::
strcpy
(
d
,
delim
.
c_str
());
std
::
strcpy
(
d
,
delim
.
c_str
());
char
*
p
=
std
::
strtok
(
strs
,
d
);
char
*
p
=
std
::
strtok
(
strs
,
d
);
...
...
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