Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
caddies
caddies-api
Commits
7eb4f1be
Commit
7eb4f1be
authored
Apr 30, 2017
by
mjg226
Browse files
fix linux problems in ESRI_ASCIIGrid
parent
ba35e132
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12569 additions
and
3621 deletions
+12569
-3621
impls/common/BoxList.hpp
impls/common/BoxList.hpp
+3
-1
impls/square-cell/vn-neighbours/1-levels/opencl/extra/CL/cl.hpp
...square-cell/vn-neighbours/1-levels/opencl/extra/CL/cl.hpp
+12561
-3615
impls/square-cell/vn-neighbours/1-levels/simple/ESRI_ASCIIGrid.hpp
...are-cell/vn-neighbours/1-levels/simple/ESRI_ASCIIGrid.hpp
+5
-5
No files found.
impls/common/BoxList.hpp
View file @
7eb4f1be
...
...
@@ -168,6 +168,8 @@ namespace CA {
if
(
src
.
empty
()
)
return
;
// NOTe: caution is required, I'm not sure this logic is complete. it's ambitious
// Create a list of boxes to add.
Boxes
toadd
;
...
...
@@ -182,7 +184,7 @@ namespace CA {
{
// if box to add is completely within an existing box, then
// if box to add is completely within an existing box, then
remove it from the list to add, and move on
if
((
*
iorg
).
Union
((
*
iadd
),
(
*
iorg
))
==
(
*
iorg
))
{
toadd
.
remove
(
*
iadd
);
continue
;
...
...
impls/square-cell/vn-neighbours/1-levels/opencl/extra/CL/cl.hpp
View file @
7eb4f1be
This diff is collapsed.
Click to expand it.
impls/square-cell/vn-neighbours/1-levels/simple/ESRI_ASCIIGrid.hpp
View file @
7eb4f1be
...
...
@@ -898,11 +898,11 @@ namespace CA {
std
::
ostringstream
Str
;
std
::
string
output
;
Str
<<
"n cols: "
<<
ncols
<<
std
::
endl
;
Str
<<
"n rows: "
<<
nrows
<<
std
::
endl
;
Str
<<
"xllcorner: "
<<
xllcorner
<<
std
::
endl
;
Str
<<
"yllcorner: "
<<
yllcorner
<<
std
::
endl
;
Str
<<
"no_data: "
<<
nodata
<<
std
::
endl
;
Str
<<
"n cols: "
<<
AsciiGridGeneral
<
T
>::
ncols
<<
std
::
endl
;
Str
<<
"n rows: "
<<
AsciiGridGeneral
<
T
>::
nrows
<<
std
::
endl
;
Str
<<
"xllcorner: "
<<
AsciiGridGeneral
<
T
>::
xllcorner
<<
std
::
endl
;
Str
<<
"yllcorner: "
<<
AsciiGridGeneral
<
T
>::
yllcorner
<<
std
::
endl
;
Str
<<
"no_data: "
<<
AsciiGridGeneral
<
T
>::
nodata
<<
std
::
endl
;
output
=
Str
.
str
();
...
...
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