* build settings for Release

* fix off-by-one error in bitmap drawing
This commit is contained in:
StapleButter 2017-09-14 02:30:11 +02:00
parent ba113d0ca9
commit d463f8252d
2 changed files with 7 additions and 14 deletions

View File

@ -54,26 +54,19 @@
<Linker>
<Add option="-s" />
<Add option="-m64" />
<Add library=":libwx_mswu_core-3.0.a" />
<Add library=":libwx_baseu-3.0.a" />
<Add library="SDL2" />
<Add library=":libpng.a" />
<Add library=":libjpeg.a" />
<Add library=":libtiff.a" />
<Add library=":libz.a" />
<Add library="rpcrt4" />
<Add library="oleaut32" />
<Add library="ole32" />
<Add library="uuid" />
<Add library="winspool" />
<Add library="winmm" />
<Add library="shell32" />
<Add library="comctl32" />
<Add library="comdlg32" />
<Add library="advapi32" />
<Add library="wsock32" />
<Add library="oleacc" />
<Add library="ole32" />
<Add library="gdi32" />
<Add library="d2d1" />
<Add library="dwrite" />
<Add library="uxtheme" />
<Add library="usp10" />
</Linker>
</Target>
<Target title="Debug Linux">

View File

@ -550,8 +550,8 @@ void uiDrawBitmapUpdate(uiDrawBitmap* bmp, const void* data)
void uiDrawBitmapDraw(uiDrawContext* c, uiDrawBitmap* bmp, uiRect* srcrect, uiRect* dstrect)
{
D2D_RECT_F _srcrect = D2D1::RectF(srcrect->X, srcrect->Y, srcrect->X+srcrect->Width-1, srcrect->Y+srcrect->Height-1);
D2D_RECT_F _dstrect = D2D1::RectF(dstrect->X, dstrect->Y, dstrect->X+dstrect->Width-1, dstrect->Y+dstrect->Height-1);
D2D_RECT_F _srcrect = D2D1::RectF(srcrect->X, srcrect->Y, srcrect->X+srcrect->Width, srcrect->Y+srcrect->Height);
D2D_RECT_F _dstrect = D2D1::RectF(dstrect->X, dstrect->Y, dstrect->X+dstrect->Width, dstrect->Y+dstrect->Height);
c->rt->DrawBitmap(bmp->bmp, &_dstrect, 1.0f, D2D1_BITMAP_INTERPOLATION_MODE_LINEAR, &_srcrect);
}