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

src/gfx/generated_image.cpp

@@ -138,6 +138,11 @@ bool BuiltInImage::operator == (const GeneratedImage& that) const {
 
 // ----------------------------------------------------------------------------- : SymbolToImage
 
+SymbolToImage::SymbolToImage(const String& filename, Age age, const SymbolVariationP& variation)
+	: filename(filename), age(age), variation(variation)
+{}
+SymbolToImage::~SymbolToImage() {}
+
 Image SymbolToImage::generate(const Options& opt) const {
 	// TODO : use opt.width and opt.height?
 	if (!opt.symbol_package) throw ScriptError(_("Can only load images in a context where an image is expected"));

src/gfx/generated_image.hpp

@@ -14,7 +14,7 @@
 #include <gfx/gfx.hpp>
 #include <script/value.hpp>
 
-DECLARE_INTRUSIVE_POINTER_TYPE(GeneratedImage);
+DECLARE_POINTER_TYPE(GeneratedImage);
 DECLARE_POINTER_TYPE(SymbolVariation);
 class Package;
 
@@ -161,12 +161,12 @@ class BuiltInImage : public GeneratedImage {
 /// Use a symbol as an image
 class SymbolToImage : public GeneratedImage {
   public:
-	inline SymbolToImage(const String& filename, Age age, const SymbolVariationP& variation)
-		: filename(filename), age(age), variation(variation)
-	{}
+	SymbolToImage(const String& filename, Age age, const SymbolVariationP& variation);
+	~SymbolToImage();
 	virtual Image generate(const Options& opt) const;
 	virtual bool operator == (const GeneratedImage& that) const;
   private:
+	SymbolToImage(const SymbolToImage&); // copy ctor
 	String           filename;
 	Age              age; ///< Age the symbol was last updated
 	SymbolVariationP variation;

src/gfx/gfx.hpp

@@ -127,7 +127,7 @@ void set_alpha(Image& img, const Image& img_alpha);
 /// An alpha mask is an alpha channel that can be copied to another image
 /** It is created by treating black in the source image as transparent and white (red) as opaque
  */
-class AlphaMask {
+class AlphaMask : public IntrusivePtrBase<AlphaMask> {
   public:
 	AlphaMask(const Image& mask);
 	~AlphaMask();