Skip to content

Commit a4c265c

Browse files
authored
Merge branch 'AcademySoftwareFoundation:main' into docs-typos
2 parents 98c5585 + 5958e16 commit a4c265c

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

src/libOpenImageIO/imagebuf.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,6 @@ ImageBufImpl::init_spec(string_view filename, int subimage, int miplevel,
12531253
m_pixels_read = false;
12541254
m_nsubimages = 0;
12551255
m_nmiplevels = 0;
1256-
m_badfile = false;
12571256
m_current_subimage = -1;
12581257
m_current_miplevel = -1;
12591258
auto input = ImageInput::open(filename, m_configspec.get(), m_rioproxy);
@@ -2118,7 +2117,6 @@ ImageBuf::nchannels() const
21182117
int
21192118
ImageBuf::orientation() const
21202119
{
2121-
m_impl->validate_spec();
21222120
return m_impl->spec().get_int_attribute("Orientation", 1);
21232121
}
21242122

@@ -2407,7 +2405,7 @@ ImageBuf::copy(const ImageBuf& src, TypeDesc format)
24072405
m_impl->m_deepdata = src.m_impl->m_deepdata;
24082406
return true;
24092407
}
2410-
if (format.basetype == TypeDesc::UNKNOWN || src.deep())
2408+
if (format.basetype == TypeDesc::UNKNOWN)
24112409
m_impl->reset(src.name(), src.spec(), &src.nativespec());
24122410
else {
24132411
ImageSpec newspec(src.spec());

0 commit comments

Comments
 (0)