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

Jump to bottom

Switch to non-deprecated overload of oiio::ImageBufAlgo::make_kernel() #1199

Merged
merged 1 commit into from
Jul 29, 2022
Merged

Switch to non-deprecated overload of oiio::ImageBufAlgo::make_kernel() #1199

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions src/aliceVision/mvsData/imageAlgo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,7 @@ void convolveImage(oiio::TypeDesc typeDesc,
const oiio::ImageBuf inBuf(oiio::ImageSpec(inWidth, inHeight, nchannels, typeDesc), const_cast<T*>(inBuffer.data()));
oiio::ImageBuf outBuf(oiio::ImageSpec(inWidth, inHeight, nchannels, typeDesc), outBuffer.data());

oiio::ImageBuf K;
oiio::ImageBufAlgo::make_kernel(K, kernel, kernelWidth, kernelHeight);
oiio::ImageBuf K = oiio::ImageBufAlgo::make_kernel(kernel, kernelWidth, kernelHeight);

oiio::ImageBufAlgo::convolve(outBuf, inBuf, K);
}
Expand Down
5 changes: 2 additions & 3 deletions src/aliceVision/panorama/gaussian.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ bool GaussianPyramidNoMask::process(const image::Image<image::RGBfColor>& input)
/**
* Kernel
*/
oiio::ImageBuf K;
oiio::ImageBufAlgo::make_kernel(K, "gaussian", 5, 5);
oiio::ImageBuf K = oiio::ImageBufAlgo::make_kernel("gaussian", 5, 5);

/**
* Build pyramid
Expand Down Expand Up @@ -88,4 +87,4 @@ bool GaussianPyramidNoMask::downscale(image::Image<image::RGBfColor>& output,
return true;
}

} // namespace aliceVision
} // namespace aliceVision
6 changes: 2 additions & 4 deletions src/software/utils/main_lightingEstimation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,7 @@ void initAlbedo(image::Image<image::RGBfColor>& albedo, const image::Image<image
albedo.resize(picture.Width(), picture.Height());
const oiio::ImageBuf pictureBuf(oiio::ImageSpec(picture.Width(), picture.Height(), 3, oiio::TypeDesc::FLOAT), const_cast<void*>((void*)&picture(0,0)(0)));
oiio::ImageBuf albedoBuf(oiio::ImageSpec(picture.Width(), picture.Height(), 3, oiio::TypeDesc::FLOAT), albedo.data());
oiio::ImageBuf K;
oiio::ImageBufAlgo::make_kernel(K, "gaussian", albedoEstimationFilterSize, albedoEstimationFilterSize);
oiio::ImageBuf K = oiio::ImageBufAlgo::make_kernel("gaussian", albedoEstimationFilterSize, albedoEstimationFilterSize);
oiio::ImageBufAlgo::convolve(albedoBuf, pictureBuf, K);
image::writeImage((fs::path(outputFolder) / (std::to_string(viewId) + "_albedo.jpg")).string(), albedo,
image::EImageColorSpace::AUTO);
Expand Down Expand Up @@ -254,8 +253,7 @@ void initAlbedo(image::Image<float>& albedo, const image::Image<float>& picture,
albedo.resize(picture.Width(), picture.Height());
const oiio::ImageBuf pictureBuf(oiio::ImageSpec(picture.Width(), picture.Height(), 1, oiio::TypeDesc::FLOAT), const_cast<float*>(picture.data()));
oiio::ImageBuf albedoBuf(oiio::ImageSpec(picture.Width(), picture.Height(), 1, oiio::TypeDesc::FLOAT), albedo.data());
oiio::ImageBuf K;
oiio::ImageBufAlgo::make_kernel(K, "gaussian", albedoEstimationFilterSize, albedoEstimationFilterSize);
oiio::ImageBuf K = oiio::ImageBufAlgo::make_kernel("gaussian", albedoEstimationFilterSize, albedoEstimationFilterSize);
oiio::ImageBufAlgo::convolve(albedoBuf, pictureBuf, K);
image::writeImage((fs::path(outputFolder) / (std::to_string(viewId) + "_albedo.jpg")).string(), albedo,
image::EImageColorSpace::AUTO);
Expand Down