mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-11 05:07:00 -04:00
default smart pointer type switched to intrusive_ptr
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@337 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -163,7 +163,7 @@ void DropDownChoiceListBase::generateThumbnailImages() {
|
||||
ThumbnailStatus status = style().thumbnails_status[i];
|
||||
if (i >= image_count || status != THUMB_OK) {
|
||||
// request this thumbnail
|
||||
thumbnail_thread.request( new_shared3<ChoiceThumbnailRequest>(&cve, i, status == THUMB_NOT_MADE) );
|
||||
thumbnail_thread.request( new_intrusive3<ChoiceThumbnailRequest>(&cve, i, status == THUMB_NOT_MADE) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <gui/drop_down_list.hpp>
|
||||
#include <render/value/choice.hpp>
|
||||
|
||||
DECLARE_POINTER_TYPE(DropDownList);
|
||||
DECLARE_SHARED_POINTER_TYPE(DropDownList);
|
||||
|
||||
// ----------------------------------------------------------------------------- : ChoiceValueEditor
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <gui/value/editor.hpp>
|
||||
#include <render/value/color.hpp>
|
||||
|
||||
DECLARE_POINTER_TYPE(DropDownList);
|
||||
DECLARE_SHARED_POINTER_TYPE(DropDownList);
|
||||
|
||||
// ----------------------------------------------------------------------------- : ColorValueEditor
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ void ImageValueEditor::sliceImage(const Image& image) {
|
||||
if (mask_image.LoadFile(*image_file)) {
|
||||
Image resampled(style().width, style().height);
|
||||
resample(mask_image, resampled);
|
||||
mask = new_shared1<AlphaMask>(resampled);
|
||||
mask = new_intrusive1<AlphaMask>(resampled);
|
||||
}
|
||||
}
|
||||
// slice
|
||||
|
||||
Reference in New Issue
Block a user