Skip to content

fix(webp): Move write_complete_data() to close() for proper scanline … #4973

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

Merged
lgritz merged 1 commit into from
Dec 8, 2025
Merged

fix(webp): Move write_complete_data() to close() for proper scanline … #4973

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
13 changes: 7 additions & 6 deletions src/webp.imageio/webpoutput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,11 +238,6 @@ WebpOutput::write_scanline(int y, int z, TypeDesc format, const void* data,
std::vector<uint8_t> scratch;
data = to_native_scanline(format, data, xstride, scratch, m_dither, y, z);
memcpy(&m_uncompressed_image[y * m_scanline_size], data, m_scanline_size);

/* If this was the final scanline, we are done. */
if (y == m_spec.height - 1) {
return write_complete_data();
}
return true;
}

Expand Down Expand Up @@ -271,9 +266,15 @@ WebpOutput::close()
OIIO_DASSERT(m_uncompressed_image.size());
ok &= write_scanlines(m_spec.y, m_spec.y + m_spec.height, 0,
m_spec.format, &m_uncompressed_image[0]);
std::vector<uint8_t>().swap(m_uncompressed_image);
}

// Write the complete image data on close, not during write_scanline.
// This allows scanlines to be written in any order.
if (ok && m_uncompressed_image.size()) {
ok = write_complete_data();
}

std::vector<uint8_t>().swap(m_uncompressed_image);
WebPPictureFree(&m_webp_picture);
init();
return ok;
Expand Down
Loading