mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 21:29:23 +08:00
9430b3c760
* freeimage remove auto_ptr * v db
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
diff --git a/Source/FreeImage/MultiPage.cpp b/Source/FreeImage/MultiPage.cpp
|
|
index 4f2605188..8af384aff 100644
|
|
--- a/Source/FreeImage/MultiPage.cpp
|
|
+++ b/Source/FreeImage/MultiPage.cpp
|
|
@@ -31,6 +31,8 @@
|
|
#pragma warning (disable : 4786) // identifier was truncated to 'number' characters
|
|
#endif
|
|
|
|
+#include <memory>
|
|
+
|
|
#include "CacheFile.h"
|
|
#include "FreeImageIO.h"
|
|
#include "Plugin.h"
|
|
@@ -271,8 +273,8 @@ FreeImage_OpenMultiBitmap(FREE_IMAGE_FORMAT fif, const char *filename, BOOL crea
|
|
}
|
|
}
|
|
|
|
- std::auto_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP);
|
|
- std::auto_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER);
|
|
+ std::unique_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP);
|
|
+ std::unique_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER);
|
|
header->m_filename = filename;
|
|
// io is default
|
|
header->node = node;
|
|
@@ -337,8 +339,8 @@ FreeImage_OpenMultiBitmapFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_h
|
|
PluginNode *node = list->FindNodeFromFIF(fif);
|
|
|
|
if (node) {
|
|
- std::auto_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP);
|
|
- std::auto_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER);
|
|
+ std::unique_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP);
|
|
+ std::unique_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER);
|
|
header->io = *io;
|
|
header->node = node;
|
|
header->fif = fif;
|