From ea4448d9954dac206d0ffba12cecc9b2380e23ab Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 2 May 2009 13:23:08 +0000
Subject: [PATCH] Fixed ugly cluster of problems with Drawing, Painting,
 RichValue serialization, ValueArray...

git-svn-id: svn://ultimatepp.org/upp/trunk@1118 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Uuid.cpp    |  4 ++++
 uppsrc/Core/Value.cpp   | 16 ++++++----------
 uppsrc/Draw/Draw.cpp    |  5 +++++
 uppsrc/Draw/Draw.h      | 16 +++++++++-------
 uppsrc/Draw/Drawing.cpp | 12 +++++++++++-
 uppsrc/Draw/Image.cpp   |  4 ++++
 6 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/uppsrc/Core/Uuid.cpp b/uppsrc/Core/Uuid.cpp
index bb7e1bab8..f5f173693 100644
--- a/uppsrc/Core/Uuid.cpp
+++ b/uppsrc/Core/Uuid.cpp
@@ -4,6 +4,10 @@ NAMESPACE_UPP
 
 //#BLITZ_APPROVE
 
+INITBLOCK {
+	RichValue<Uuid>::Register();
+}
+
 void Uuid::Serialize(Stream& s) {
 	int version = 0;
 	s / version % a % b %c % d;
diff --git a/uppsrc/Core/Value.cpp b/uppsrc/Core/Value.cpp
index bdb11db68..31d40d6ca 100644
--- a/uppsrc/Core/Value.cpp
+++ b/uppsrc/Core/Value.cpp
@@ -137,6 +137,8 @@ static void sRegisterStd()
 		RichValue<WString>::Register();
 		RichValue<Date>::Register();
 		RichValue<Time>::Register();
+		RichValue<ValueArray>::Register();
+		RichValue<ValueMap>::Register();		
 	};
 }
 
@@ -352,8 +354,10 @@ ValueArray::ValueArray(const Value& src)
 }
 
 void ValueArray::Serialize(Stream& s) {
-	if(s.IsStoring())
-		Clone();
+	if(s.IsLoading()) {
+		data->Release();
+		Create();
+	}
 	data->Serialize(s);
 }
 
@@ -406,10 +410,6 @@ String AsString(const ValueArray& v) {
 	return sAsString(v.Get());
 }
 
-INITBLOCK {
-	RichValue<ValueArray>::Register();
-}
-
 bool ValueMap::Data::IsNull() const {
 	return this == &Single<ValueMap::NullData>();
 }
@@ -546,10 +546,6 @@ Value ValueMap::operator[](const Value& key) const
 	return q >= 0 ? data->value[q] : ErrorValue();
 }
 
-INITBLOCK {
-	RichValue<Color>::Register();
-}
-
 // ----------------------------------
 
 struct IdList : public Index<String> {
diff --git a/uppsrc/Draw/Draw.cpp b/uppsrc/Draw/Draw.cpp
index f59927f91..c1a616699 100644
--- a/uppsrc/Draw/Draw.cpp
+++ b/uppsrc/Draw/Draw.cpp
@@ -8,6 +8,11 @@ NAMESPACE_UPP
 
 static StaticMutex sDrawLock;
 
+INITBLOCK {
+	RichValue<Painting>::Register();
+	RichValue<Drawing>::Register();
+}
+
 Size Draw::GetNativeDpi() const
 {
 	return nativeDpi;
diff --git a/uppsrc/Draw/Draw.h b/uppsrc/Draw/Draw.h
index 95a4acf61..f2e2448d0 100644
--- a/uppsrc/Draw/Draw.h
+++ b/uppsrc/Draw/Draw.h
@@ -87,7 +87,6 @@ enum {
 
 class Drawing;
 class Draw;
-
 class Painting;
 
 #ifdef PLATFORM_WIN32
@@ -475,7 +474,7 @@ void SColorDkShadow_Write(Color c);
 inline Color InvertColor() { return Color(255, 0); }
 inline Color DefaultInk() { return Black(); } //TODO!
 
-class Painting : AssignValueTypeNo<Painting, 48, Moveable<Painting> >{
+class Painting : AssignValueTypeNo<Painting, 48, Moveable<Painting> > {
 	String     cmd;
 	ValueArray data;
 	Sizef      size;
@@ -488,7 +487,7 @@ public:
 
 	void    Clear()                             { size = Null; data.Clear(); cmd.Clear(); }
 	void    Serialize(Stream& s)                { s % cmd % data % size; }
-	bool    IsNullInstance() const              { return data.IsEmpty(); }
+	bool    IsNullInstance() const              { return cmd.IsEmpty(); }
 	bool    operator==(const Painting& b) const { return cmd == b.cmd && data == b.data && size == b.size; }
 	unsigned GetHashValue() const               { return CombineHash(cmd, data); }
 	String  ToString() const                    { return "painting " + AsString(size); }
@@ -971,7 +970,7 @@ public:
 class WinMetaFile;
 #endif
 
-class Drawing : Moveable<Drawing> {
+class Drawing : AssignValueTypeNo<Drawing, 49, Moveable<Drawing> > {
 	Size       size;
 	String     data;
 	ValueArray val;
@@ -994,10 +993,13 @@ public:
 
 	void Serialize(Stream& s);
 
-	bool IsNullInstance() const    { return data.IsEmpty(); }
+	bool    IsNullInstance() const             { return data.IsEmpty(); }
+	bool    operator==(const Drawing& b) const { return val == b.val && data == b.data && size == b.size; }
+	String  ToString() const                   { return "drawing " + AsString(size); }
+	unsigned GetHashValue() const              { return CombineHash(data, val); }
 
-	operator Value() const         { return RawValue<Drawing>(*this); }
-	Drawing(const Value& src)      { if(!IsNull(src)) *this = RawValue<Drawing>::Extract(src); }
+	operator Value() const         { return RichValue<Drawing>(*this); }
+	Drawing(const Value& src);
 
 	Drawing()                      { size = Null; }
 	Drawing(const Nuller&)         { size = Null; }
diff --git a/uppsrc/Draw/Drawing.cpp b/uppsrc/Draw/Drawing.cpp
index 401b974f1..c90300fdf 100644
--- a/uppsrc/Draw/Drawing.cpp
+++ b/uppsrc/Draw/Drawing.cpp
@@ -2,7 +2,7 @@
 
 NAMESPACE_UPP
 
-#define LLOG(x)  // LOG(x)
+#define LLOG(x)  // DLOG(x)
 
 #ifdef COMPILER_MSC
 #pragma warning(disable: 4700)
@@ -682,6 +682,16 @@ void Drawing::Append(Drawing& dw)
 	if(IsNull(size))
 		size = dw.size;
 	data << dw.data;
+	for(int i = 0; i < dw.val.GetCount(); i++)
+		val.Add(dw.val[i]);
+}
+
+Drawing::Drawing(const Value& src)
+{
+	if(IsNull(src))
+		size = Null;
+	else
+		*this = RichValue<Drawing>::Extract(src);
 }
 
 void Drawing::Serialize(Stream& s)
diff --git a/uppsrc/Draw/Image.cpp b/uppsrc/Draw/Image.cpp
index 798d2f199..02463021a 100644
--- a/uppsrc/Draw/Image.cpp
+++ b/uppsrc/Draw/Image.cpp
@@ -236,6 +236,10 @@ void Image::Serialize(Stream& s)
 		s.Put(~*this, len * sizeof(RGBA));
 }
 
+INITBLOCK {
+	RichValue<Image>::Register();
+}
+
 bool Image::operator==(const Image& img) const
 {
 	if(GetLength() != img.GetLength())