Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
44984319
Commit
44984319
authored
Sep 09, 2016
by
Rashad Kanavath
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG: close handle in dtor
parent
30c7ab27
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
6 deletions
+21
-6
Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
...ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
+16
-6
Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.h
...s/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.h
+5
-0
No files found.
Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
View file @
44984319
...
...
@@ -71,9 +71,21 @@ namespace ossimplugins
,
theSLC
(
false
)
,
theTOPSAR
(
false
)
{
#if defined(_MSC_VER)
this
->
theFindFileHandle
=
INVALID_HANDLE_VALUE
;
#endif
// theManifestDoc = new ossimXmlDocument();
}
void
ossimSentinel1Model
::~
ossimSentinel1Model
()
{
#if defined(_MSC_VER)
if
(
this
->
theFindFileHandle
!=
INVALID_HANDLE_VALUE
)
{
FindClose
(
this
->
theFindFileHandle
);
}
#endif
}
void
ossimSentinel1Model
::
clearFields
()
{
theOCN
=
false
;
...
...
@@ -522,14 +534,12 @@ namespace ossimplugins
strm
<<
file
.
path
()
<<
"
\\
"
<<
d
<<
pathsep
<<
"*"
<<
ext
;
WIN32_FIND_DATA
search_data
;
memset
(
&
search_data
,
0
,
sizeof
(
WIN32_FIND_DATA
));
HANDLE
h
andle
=
FindFirstFile
(
strm
.
str
().
c_str
(),
&
search_data
);
while
(
h
andle
!=
INVALID_HANDLE_VALUE
)
{
this
->
theFindFileH
andle
=
FindFirstFile
(
strm
.
str
().
c_str
(),
&
search_data
);
while
(
this
->
theFindFileH
andle
!=
INVALID_HANDLE_VALUE
)
{
result
.
push_back
(
std
::
string
(
search_data
.
cFileName
)
);
if
(
FindNextFile
(
h
andle
,
&
search_data
)
==
FALSE
)
if
(
FindNextFile
(
this
->
theFindFileH
andle
,
&
search_data
)
==
FALSE
)
break
;
}
//Close the handle
FindClose
(
handle
);
#else
strm
<<
file
.
path
()
<<
pathsep
<<
d
<<
pathsep
;
...
...
Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.h
View file @
44984319
...
...
@@ -152,6 +152,11 @@ namespace ossimplugins
bool
theOCN
;
bool
theSLC
;
bool
theTOPSAR
;
#if defined(_MSC_VER)
HANDLE
theFindFileHandle
;
#endif
};
//end class ossimSentinel1Model
}
//end namespace ossimplugins
...
...
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