github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

DTIMING and Minor fixed in Painter and Oci8

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@878 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-02-19 13:45:48 +00:00
parent a3b7d313db
commit d1411d55a6
3 changed files with 242 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Diag.h
View file

@ -120,12 +120,14 @@ inline void UnlockLog() {}
#define DLOG(x) LOG(x)
#define DDUMP(x) DUMP(x)
#define DDUMPC(x) DUMPC(x)
#define DTIMING(x) TIMING(x)
#else
#define DLOG(x) @ // To clean logs after debugging, this produces error in release mode
#define DDUMP(x) @
#define DDUMPC(x) @
#define DTIMING(x) @
#define ASSERT(x)

4
uppsrc/Oracle/Oci8.cpp
View file

@ -1062,8 +1062,8 @@ Vector<String> Oracle8::EnumReservedWords()
void OracleBlob::SetStreamSize(int64 pos) {
ASSERT(pos <= GetStreamSize());
if(pos < GetStreamSize())
session->oci8.OCILobTrim(session->svchp, session->errhp, locp, pos);
if(pos < (int)GetStreamSize())
session->oci8.OCILobTrim(session->svchp, session->errhp, locp, (int)pos);
}
dword OracleBlob::Read(int64 at, void *ptr, dword size) {

6
uppsrc/Painter/Image.cpp
View file

@ -216,9 +216,9 @@ void BufferPainter::RenderImage(double width, const Image& image, const Xform2D&
if(image.GetWidth() == 0 || image.GetHeight() == 0)
return;
PainterImageSpan ss;
ss.style = flags & 15;
ss.hstyle = flags & 3;
ss.vstyle = flags & 12;
ss.style = byte(flags & 15);
ss.hstyle = byte(flags & 3);
ss.vstyle = byte(flags & 12);
ss.fast = flags & FILL_FAST;
ss.Set(transsrc * pathattr.mtx, image);
RenderPath(width, &ss, RGBAZero());