Skip to content

Commit ec9d892

Browse files
authored
Merge pull request #3831 from cudawarped:fix_cuda_even_levels_stream
`cudaimgproc`: remove incorrectly added `NppStreamHandler` from `cv::cuda:evenLevels`
2 parents 475f6fa + 3f26817 commit ec9d892

File tree

1 file changed

+0
-21
lines changed

1 file changed

+0
-21
lines changed

modules/cudaimgproc/src/histogram.cpp

-21
Original file line numberDiff line numberDiff line change
@@ -553,24 +553,6 @@ namespace
553553
};
554554
}
555555

556-
class OldNppStreamHandlerForEvenLevels
557-
{
558-
public:
559-
explicit OldNppStreamHandlerForEvenLevels(Stream& newStream)
560-
{
561-
oldStream = nppGetStream();
562-
nppSafeSetStream(oldStream, StreamAccessor::getStream(newStream));
563-
}
564-
565-
~OldNppStreamHandlerForEvenLevels()
566-
{
567-
nppSafeSetStream(nppGetStream(), oldStream);
568-
}
569-
570-
private:
571-
cudaStream_t oldStream;
572-
};
573-
574556
void cv::cuda::evenLevels(OutputArray _levels, int nLevels, int lowerLevel, int upperLevel, Stream& stream)
575557
{
576558
const int kind = _levels.kind();
@@ -583,9 +565,6 @@ void cv::cuda::evenLevels(OutputArray _levels, int nLevels, int lowerLevel, int
583565
else
584566
host_levels = _levels.getMat();
585567

586-
// Update to use NppStreamHandler when nppiEvenLevelsHost_32s_Ctx is included in nppist.lib and libnppist.so
587-
OldNppStreamHandlerForEvenLevels h(stream);
588-
589568
nppSafeCall( nppiEvenLevelsHost_32s(host_levels.ptr<Npp32s>(), nLevels, lowerLevel, upperLevel) );
590569

591570
if (kind == _InputArray::CUDA_GPU_MAT)

0 commit comments

Comments
 (0)