Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
imagej-elphel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
imagej-elphel
Commits
02f6e62d
Commit
02f6e62d
authored
Apr 19, 2020
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed rByRDist calculation error
parent
9b711009
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
GPUTileProcessor.java
src/main/java/com/elphel/imagej/gpu/GPUTileProcessor.java
+3
-3
geometry_correction.cu
src/main/resources/kernels/geometry_correction.cu
+11
-11
No files found.
src/main/java/com/elphel/imagej/gpu/GPUTileProcessor.java
View file @
02f6e62d
...
@@ -1501,9 +1501,9 @@ public class GPUTileProcessor {
...
@@ -1501,9 +1501,9 @@ public class GPUTileProcessor {
for
(
int
i
=
0
;
i
<
texture_indices
.
length
;
i
++)
{
for
(
int
i
=
0
;
i
<
texture_indices
.
length
;
i
++)
{
if
(((
texture_indices
[
i
]
>>
CORR_TEXTURE_BIT
)
&
1
)
!=
0
)
{
if
(((
texture_indices
[
i
]
>>
CORR_TEXTURE_BIT
)
&
1
)
!=
0
)
{
int
ntile
=
texture_indices
[
i
]
>>
CORR_NTILE_SHIFT
;
int
ntile
=
texture_indices
[
i
]
>>
CORR_NTILE_SHIFT
;
if
(
ntile
==
22507
)
{
//
if (ntile == 22507) {
System
.
out
.
println
(
"i="
+
i
+
", ntile="
+
ntile
);
//
System.out.println("i="+i+", ntile="+ntile);
}
//
}
for
(
int
l
=
0
;
l
<
num_tile_extra
;
l
++)
{
for
(
int
l
=
0
;
l
<
num_tile_extra
;
l
++)
{
extra
[
l
][
ntile
]
=
diff_rgb_combo
[
i
*
num_tile_extra
+
l
];
extra
[
l
][
ntile
]
=
diff_rgb_combo
[
i
*
num_tile_extra
+
l
];
}
}
...
...
src/main/resources/kernels/geometry_correction.cu
View file @
02f6e62d
...
@@ -363,8 +363,8 @@ extern "C" __global__ void get_tiles_offsets(
...
@@ -363,8 +363,8 @@ extern "C" __global__ void get_tiles_offsets(
(
extrinsic_corr
.
imu_move
[
0
]
!=
0.0
)
||
(
extrinsic_corr
.
imu_move
[
0
]
!=
0.0
)
||
(
extrinsic_corr
.
imu_move
[
1
]
!=
0.0
)
||
(
extrinsic_corr
.
imu_move
[
1
]
!=
0.0
)
||
(
extrinsic_corr
.
imu_move
[
2
]
!=
0.0
);
(
extrinsic_corr
.
imu_move
[
2
]
!=
0.0
);
// Temporary
imu_exists
=
0
;
#ifdef DEBUG21
#ifdef DEBUG21
if
((
ncam
==
DBG_CAM
)
&&
(
task_num
==
DBG_TILE
)){
if
((
ncam
==
DBG_CAM
)
&&
(
task_num
==
DBG_TILE
)){
printf
(
"
\n
Tile = %d, camera= %d
\n
"
,
task_num
,
ncam
);
printf
(
"
\n
Tile = %d, camera= %d
\n
"
,
task_num
,
ncam
);
...
@@ -733,7 +733,7 @@ extern "C" __global__ void calcReverseDistortionTable(
...
@@ -733,7 +733,7 @@ extern "C" __global__ void calcReverseDistortionTable(
}
}
if
(
i
==
0
){
if
(
i
==
0
){
rByRDist
[
0
]
=
(
float
)
1.0
/
d
;
rByRDist
[
0
]
=
(
float
)
1.0
/
d
;
break
;
continue
;
}
}
double
rDist
=
RBYRDIST_STEP
*
i
;
double
rDist
=
RBYRDIST_STEP
*
i
;
double
r
=
(
p
==
0
)
?
rDist
:
rPrev
;
double
r
=
(
p
==
0
)
?
rDist
:
rPrev
;
...
...
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