Skip to content

Minor cleanup, #67

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
agruzdev merged 1 commit into from
Mar 7, 2026
Merged

Minor cleanup, #67

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
8 changes: 2 additions & 6 deletions Source/FreeImage/MultiPage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,6 @@ FIMULTIBITMAP* OpenMultiBitmapImpl(FREE_IMAGE_FORMAT fif, std::filesystem::path

// store the MULTIBITMAPHEADER in the surrounding FIMULTIBITMAP structure

bitmap->data = header.get();

if (header->handle) {
// open persistent data is supported
if (node->SupportsOpenPersistent()) {
Expand Down Expand Up @@ -287,7 +285,7 @@ FIMULTIBITMAP* OpenMultiBitmapImpl(FREE_IMAGE_FORMAT fif, std::filesystem::path
}
// return the multibitmap
// std::bad_alloc won't be thrown from here on
header.release(); // now owned by bitmap
bitmap->data = header.release(); // now owned by bitmap
return bitmap.release(); // now owned by caller
}
}
Expand Down Expand Up @@ -344,8 +342,6 @@ FreeImage_OpenMultiBitmapFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_h

// store the MULTIBITMAPHEADER in the surrounding FIMULTIBITMAP structure

bitmap->data = header.get();

// open persistent data is supported
if (node->SupportsOpenPersistent()) {
header->persistent_data = node->OpenPersistent(&header->io, header->handle, header->read_only);
Expand All @@ -362,7 +358,7 @@ FreeImage_OpenMultiBitmapFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_h

// no need to open cache - it is in-memory by default

header.release();
bitmap->data = header.release();
return bitmap.release();
}
}
Expand Down