Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cudaimgproc: remove incorrectly added NppStreamHandler from cv::cuda:evenLevels #3831

Merged
merged 1 commit into from
Nov 26, 2024
Merged

cudaimgproc: remove incorrectly added NppStreamHandler from cv::cuda:evenLevels #3831

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions modules/cudaimgproc/src/histogram.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,24 +553,6 @@ namespace
};
}

class OldNppStreamHandlerForEvenLevels
{
public:
explicit OldNppStreamHandlerForEvenLevels(Stream& newStream)
{
oldStream = nppGetStream();
nppSafeSetStream(oldStream, StreamAccessor::getStream(newStream));
}

~OldNppStreamHandlerForEvenLevels()
{
nppSafeSetStream(nppGetStream(), oldStream);
}

private:
cudaStream_t oldStream;
};

void cv::cuda::evenLevels(OutputArray _levels, int nLevels, int lowerLevel, int upperLevel, Stream& stream)
{
const int kind = _levels.kind();
Expand All @@ -583,9 +565,6 @@ void cv::cuda::evenLevels(OutputArray _levels, int nLevels, int lowerLevel, int
else
host_levels = _levels.getMat();

// Update to use NppStreamHandler when nppiEvenLevelsHost_32s_Ctx is included in nppist.lib and libnppist.so
OldNppStreamHandlerForEvenLevels h(stream);

nppSafeCall( nppiEvenLevelsHost_32s(host_levels.ptr<Npp32s>(), nLevels, lowerLevel, upperLevel) );

if (kind == _InputArray::CUDA_GPU_MAT)
Expand Down
Loading