Merge pull request #68 from lordnn/master

agruzdev · web-flow · commit 27ea8e1bdecc · 2026-03-07T23:08:43.000+03:00
More cleanup,
diff --git a/Source/FreeImage/MultiPage.cpp b/Source/FreeImage/MultiPage.cpp
@@ -884,8 +884,6 @@ FreeImage_LoadMultiBitmapFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int
 
 					// 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);
@@ -902,7 +900,7 @@ FreeImage_LoadMultiBitmapFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int
 
 					// no need to open cache - it is in-memory by default
 
-					header.release();
+					bitmap->data = header.release();
 					return bitmap.release();
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -884,8 +884,6 @@ FreeImage_LoadMultiBitmapFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int`
`884`	`884`
`885`	`885`	`// store the MULTIBITMAPHEADER in the surrounding FIMULTIBITMAP structure`
`886`	`886`
`887`		`- bitmap->data = header.get();`
`888`		`-`
`889`	`887`	`// open persistent data is supported`
`890`	`888`	`if (node->SupportsOpenPersistent()) {`
`891`	`889`	`header->persistent_data = node->OpenPersistent(&header->io, header->handle, header->read_only);`
`@@ -902,7 +900,7 @@ FreeImage_LoadMultiBitmapFromMemory(FREE_IMAGE_FORMAT fif, FIMEMORY *stream, int`
`902`	`900`
`903`	`901`	`// no need to open cache - it is in-memory by default`
`904`	`902`
`905`		`- header.release();`
	`903`	`+ bitmap->data = header.release();`
`906`	`904`	`return bitmap.release();`
`907`	`905`	`}`
`908`	`906`	`}`