github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

new uvs2 releases : uppsrc-2601 tutorial-38 examples-141 reference-113

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@302 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
mdelfede 2008-06-18 18:49:45 +00:00
parent 537fd3c3ad
commit d91cd76752
7 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
uppsrc/Core/AString.hpp
View file

@ -201,10 +201,5 @@ inline int String0::Compare(const String0& s) const
return 0;
}
#endif
/* int l1 = GetLength();
int l2 = s.GetLength();
int q = memcmp(Begin(), s.Begin(), min(l1, l2));
int q = MemCmp_aligned__(Begin(), s.Begin(), min(l1, l2));
return q ? q : l1 - l2;*/
return LCompare(s);
}

4
uppsrc/Core/Log.cpp
View file

@ -282,10 +282,10 @@ String AsString(MemoryProfile& mem)
text << "Free pages " << mem.freepages << " (" << mem.freepages * 4 << " KB)\n";
text << "Large block count " << mem.large_count
<< ", total size " << (mem.large_total >> 10) << " KB\n";
sLarge(text, mem.large_size, mem.large_count, "allocated");
// sLarge(text, mem.large_size, mem.large_count, "allocated");
text << "Large fragments count " << mem.large_free_count
<< ", total size " << (mem.large_free_total >> 10) << " KB\n";
sLarge(text, mem.large_free_size, mem.large_free_count, "fragments");
// sLarge(text, mem.large_free_size, mem.large_free_count, "fragments");
return text;
}

1
uppsrc/Core/String.h
View file

@ -4,7 +4,6 @@ class Nuller;
#define FAST_STRING_COMPARE
#endif
int wstrlen(const wchar *s);
#ifdef PLATFORM_POSIX

1
uppsrc/Draw/DrawOpX11.cpp
View file

@ -116,6 +116,7 @@ Rect Draw::GetClipOp() const
bool Draw::IsPaintingOp(const Rect& r) const
{
LTIMING("IsPaintingOp");
Rect rr = r + actual_offset;
const Vector<Rect>& cl = clip[cloff.Top().clipi];
for(int i = 0; i < cl.GetCount(); i++)

2
uppsrc/Draw/DrawTextXft.cpp
View file

@ -5,7 +5,7 @@ NAMESPACE_UPP
#ifdef PLATFORM_XFT
#define LLOG(x) //LOG(x)
#define LTIMING(x) //RTIMING(x)
#define LTIMING(x) RTIMING(x)
struct XFTFontFaceInfo {
String name;

2
uppsrc/ide/version.h
View file

@ -1 +1 @@
#define IDE_VERSION "806.r123"
#define IDE_VERSION "806.r124"

2
uppsrc/plugin/sqlite3/Sqlite3upp.cpp
View file

@ -268,7 +268,7 @@ void Sqlite3Session::Close() {
if (NULL != db) {
int retval;
#ifndef flagNOAPPSQL
if(&SQL.GetSession() == this)
if(SQL.IsOpen() && &SQL.GetSession() == this)
SQL.Cancel();
#endif
retval = sqlite3_close(db);