Maj terminée. Pour consulter la release notes associée voici le lien :
https://about.gitlab.com/releases/2021/07/07/critical-security-release-gitlab-14-0-4-released/

Commit 82830e01 authored by MURRAY David's avatar MURRAY David
Browse files

fix compilation for spectral and tests

parent aef04a28
Pipeline #258905 failed with stages
in 31 minutes and 53 seconds
......@@ -612,7 +612,11 @@ optix::Material OptixMaterialHandler::createMaterialFromMRF(
auto idx_utia = dynamic_cast<mrf::materials::IndexedUTIA *>(material);
if (idx_utia)
{
#ifdef MRF_RENDERING_MODE_SPECTRAL
updateTextureIndexedUTIA(idx_utia, wavelengths);
#else
updateTextureIndexedUTIA(idx_utia);
#endif
auto it = _index_map.find(material);
if (it != _index_map.end())
......
......@@ -10,7 +10,7 @@
#include <string>
#include <algorithm>
#include "mrf/image/image_formats.hpp"
#include <mrf_core/image/image_formats.hpp>
#include <iostream>
#include <fstream>
......@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
std::string path_no_ext = file_path.substr(0, found);
std::string ext = file_path.substr(found);
std::unique_ptr<ColorImage> im = load(file_path);
std::unique_ptr<ColorImage> im = loadColorImage(file_path, true);
EXRColorImage *im_dst = new EXRColorImage;
normalize_brdf(im.get(), im_dst);
......
......@@ -9,7 +9,7 @@
#include <string>
#include "mrf/image/image_formats.hpp"
#include <mrf_core/image/image_formats.hpp>
#include <iostream>
#include <fstream>
......@@ -419,10 +419,10 @@ int main(int argc, char *argv[])
std::string path_no_ext = file_path.substr(0, found);
std::string ext = file_path.substr(found);
std::unique_ptr<ColorImage> im = load(file_path);
std::unique_ptr<ColorImage> im = loadColorImage(file_path, true);
std::string stencil_path = path_no_ext + "_diameter" + ext;
std::unique_ptr<ColorImage> stencil = load(file_path);
std::unique_ptr<ColorImage> stencil = loadColorImage(file_path, true);
EXRColorImage *im_dst = new EXRColorImage;
fill_image_laplacian(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment