From 070bb0312e2f69fe2350866e3e867bdc1f711a13 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 20 Sep 2010 19:17:05 +0000
Subject: [PATCH] .RasterEncoder fix

git-svn-id: svn://ultimatepp.org/upp/trunk@2715 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/Update.cpp     |  2 ++
 uppsrc/Draw/RasterEncoder.cpp |  2 ++
 uppsrc/Sql/SqlStatement.cpp   | 11 ++++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/uppsrc/CtrlLib/Update.cpp b/uppsrc/CtrlLib/Update.cpp
index 51398459d..e931461d5 100644
--- a/uppsrc/CtrlLib/Update.cpp
+++ b/uppsrc/CtrlLib/Update.cpp
@@ -146,6 +146,8 @@ void SelfUpdate() {
 			commandline += ' ';
 			commandline += FixArg(cmd[i]);
 		}
+		Exclamation(dst);
+		Exclamation(src);
 		if(WinExec(GetExeDirFile("updater.exe") + " " + GetFileName(dst) + commandline, SW_SHOWNORMAL) <= 31)
 			return;
 	}
diff --git a/uppsrc/Draw/RasterEncoder.cpp b/uppsrc/Draw/RasterEncoder.cpp
index 70079db50..89ce9cc8b 100644
--- a/uppsrc/Draw/RasterEncoder.cpp
+++ b/uppsrc/Draw/RasterEncoder.cpp
@@ -134,6 +134,8 @@ void ImageEncoder::WriteLineRaw(const byte *data)
 
 void StreamRasterEncoder::Save(Stream& s, Raster& raster)
 {
+	if(raster.GetWidth() == 0 || raster.GetHeight() == 0)
+		return;
 	SetStream(s);
 	Size sz = raster.GetSize();
 	SetDots(raster.GetInfo().dots);
diff --git a/uppsrc/Sql/SqlStatement.cpp b/uppsrc/Sql/SqlStatement.cpp
index a74b8ca99..29fc9a067 100644
--- a/uppsrc/Sql/SqlStatement.cpp
+++ b/uppsrc/Sql/SqlStatement.cpp
@@ -383,10 +383,12 @@ bool SqlPerformScript(SqlSession& session, Stream& script,
 		}
 		else
 		if(c == ';' && level == 0) {
-			if(session.GetDialect() == ORACLE)
-				stmt.Cat(";\n");
 			Sql sql(session);
 			session.ClearError();
+			int q = 0;
+			while(stmt[q] == '\r' || stmt[q] == '\n')
+				q++;
+			stmt = stmt.Mid(q);
 			if(!sql.Execute(stmt)) {
 				ok = false;
 				if(stoponerror)
@@ -400,8 +402,11 @@ bool SqlPerformScript(SqlSession& session, Stream& script,
 				level++;
 			if(c == ')')
 				level--;
-			if(session.GetDialect() != ORACLE || c != '\r')
+			if(c != '\r') {
+				if(session.GetDialect() == ORACLE && c == '\n')
+					stmt.Cat('\r');
 				stmt.Cat(c);
+			}
 			script.Get();
 		}
 	}