Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
IceT
IceT
Commits
9f7d4004
Commit
9f7d4004
authored
May 04, 2011
by
Kenneth Moreland
Browse files
Radix-k: Special case of no-split, one composite not handled correctly.
parent
413e5d7e
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/strategies/radixk.c
View file @
9f7d4004
...
...
@@ -720,8 +720,8 @@ static void radixkCompositeIncomingImages(radixkPartnerInfo *partners,
/* We will be reusing buffers like crazy, but we'll need at least one more
for the first composite, assuming we have at least two composites. */
width
=
icetSparseImageGetWidth
(
me
->
send
Image
);
height
=
icetSparseImageGetHeight
(
me
->
send
Image
);
width
=
icetSparseImageGetWidth
(
me
->
receive
Image
);
height
=
icetSparseImageGetHeight
(
me
->
receive
Image
);
if
(
total_composites
>=
2
)
{
spare_image
=
icetGetStateBufferSparseImage
(
RADIXK_SPARE_BUFFER
,
width
,
...
...
@@ -730,15 +730,18 @@ static void radixkCompositeIncomingImages(radixkPartnerInfo *partners,
spare_image
=
icetSparseImageNull
();
}
/* Grumble. Stupid special case where there is only one composite and
we
want the result to go in the same image as my
send
image (which can
/* Grumble. Stupid special case where there is only one composite and
we
want the result to go in the same image as my
receive
image (which can
happen when not splitting). */
if
(
icetSparseImageEqual
(
me
->
send
Image
,
image
)
&&
(
total_composites
<
2
))
{
if
(
icetSparseImageEqual
(
me
->
receive
Image
,
image
)
&&
(
total_composites
<
2
)){
spare_image
=
icetGetStateBufferSparseImage
(
RADIXK_SPARE_BUFFER
,
width
,
height
);
icetSparseImageCopyPixels
(
me
->
sendImage
,
0
,
width
*
height
,
spare_image
);
me
->
sendImage
=
spare_image
;
icetSparseImageCopyPixels
(
me
->
receiveImage
,
0
,
width
*
height
,
spare_image
);
me
->
receiveImage
=
spare_image
;
}
/* Start by trying to composite the implicit receive from myself. It won't
...
...
Write
Preview
Supports
Markdown
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