Cleanup: fix deprecation warnings after OpenImageIO upgrade
This commit is contained in:
parent
eb7ac996cc
commit
32b861b14a
|
@ -113,14 +113,18 @@ static void oiio_load_pixels(const ImageMetaData &metadata,
|
|||
|
||||
if (depth <= 1) {
|
||||
size_t scanlinesize = width * components * sizeof(StorageType);
|
||||
in->read_image(FileFormat,
|
||||
in->read_image(0,
|
||||
0,
|
||||
0,
|
||||
components,
|
||||
FileFormat,
|
||||
(uchar *)readpixels + (height - 1) * scanlinesize,
|
||||
AutoStride,
|
||||
-scanlinesize,
|
||||
AutoStride);
|
||||
}
|
||||
else {
|
||||
in->read_image(FileFormat, (uchar *)readpixels);
|
||||
in->read_image(0, 0, 0, components, FileFormat, (uchar *)readpixels);
|
||||
}
|
||||
|
||||
if (components > 4) {
|
||||
|
|
|
@ -439,9 +439,12 @@ bool DenoiseImage::read_previous_pixels(const DenoiseImageLayer &layer,
|
|||
{
|
||||
/* Load pixels from neighboring frames, and copy them into device buffer
|
||||
* with channels reshuffled. */
|
||||
size_t num_pixels = (size_t)width * (size_t)height;
|
||||
const size_t num_pixels = (size_t)width * (size_t)height;
|
||||
const int num_channels = in_previous->spec().nchannels;
|
||||
|
||||
array<float> neighbor_pixels(num_pixels * num_channels);
|
||||
if (!in_previous->read_image(TypeDesc::FLOAT, neighbor_pixels.data())) {
|
||||
|
||||
if (!in_previous->read_image(0, 0, 0, num_channels, TypeDesc::FLOAT, neighbor_pixels.data())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -491,7 +494,7 @@ bool DenoiseImage::load(const string &in_filepath, string &error)
|
|||
|
||||
/* Read all channels into buffer. Reading all channels at once is faster
|
||||
* than individually due to interleaved EXR channel storage. */
|
||||
if (!in->read_image(TypeDesc::FLOAT, pixels.data())) {
|
||||
if (!in->read_image(0, 0, 0, num_channels, TypeDesc::FLOAT, pixels.data())) {
|
||||
error = "Failed to read image: " + in_filepath;
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -401,8 +401,8 @@ static bool merge_pixels(const vector<MergeImage> &images,
|
|||
* faster than individually due to interleaved EXR channel storage. */
|
||||
array<float> pixels;
|
||||
alloc_pixels(image.in->spec(), pixels);
|
||||
|
||||
if (!image.in->read_image(TypeDesc::FLOAT, pixels.data())) {
|
||||
const int num_channels = image.in->spec().nchannels;
|
||||
if (!image.in->read_image(0, 0, 0, num_channels, TypeDesc::FLOAT, pixels.data())) {
|
||||
error = "Failed to read image: " + image.filepath;
|
||||
return false;
|
||||
}
|
||||
|
@ -538,6 +538,7 @@ static void read_layer_samples(vector<MergeImage> &images,
|
|||
/* Load the "Debug Sample Count" pass and add the samples to the layer's sample count. */
|
||||
array<float> sample_count_buffer;
|
||||
sample_count_buffer.resize(in_spec.width * in_spec.height);
|
||||
|
||||
image.in->read_image(0,
|
||||
0,
|
||||
layer.sample_pass_offset,
|
||||
|
|
|
@ -646,7 +646,8 @@ bool TileManager::read_full_buffer_from_disk(const string_view filename,
|
|||
return false;
|
||||
}
|
||||
|
||||
if (!in->read_image(TypeDesc::FLOAT, buffers->buffer.data())) {
|
||||
const int num_channels = in->spec().nchannels;
|
||||
if (!in->read_image(0, 0, 0, num_channels, TypeDesc::FLOAT, buffers->buffer.data())) {
|
||||
LOG(ERROR) << "Error reading pixels from the tile file " << in->geterror();
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -73,7 +73,11 @@ static ImBuf *imb_oiio_load_image(
|
|||
ibuf = IMB_allocImBuf(width, height, is_alpha ? 32 : 24, flags | IB_rect);
|
||||
|
||||
try {
|
||||
if (!in->read_image(TypeDesc::UINT8,
|
||||
if (!in->read_image(0,
|
||||
0,
|
||||
0,
|
||||
components,
|
||||
TypeDesc::UINT8,
|
||||
(uchar *)ibuf->rect + (height - 1) * scanlinesize,
|
||||
AutoStride,
|
||||
-scanlinesize,
|
||||
|
@ -113,7 +117,11 @@ static ImBuf *imb_oiio_load_image_float(
|
|||
ibuf = IMB_allocImBuf(width, height, is_alpha ? 32 : 24, flags | IB_rectfloat);
|
||||
|
||||
try {
|
||||
if (!in->read_image(TypeDesc::FLOAT,
|
||||
if (!in->read_image(0,
|
||||
0,
|
||||
0,
|
||||
components,
|
||||
TypeDesc::FLOAT,
|
||||
(uchar *)ibuf->rect_float + (height - 1) * scanlinesize,
|
||||
AutoStride,
|
||||
-scanlinesize,
|
||||
|
|
Loading…
Reference in New Issue