amy/upiwin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hackathon-dev #1

Merged
amy merged 101 commits from hackathon-dev into develop 2019-12-12 13:56:11 -07:00
Conversation 0 Commits 101 Files Changed 67 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 971826e118 - Show all commits

2
src/ep_bitmap.c
View File

@ -105,7 +105,7 @@ PyObject *Epython_wrap_bitmap(PBITMAP pbmp)
rc = PyType_GenericNew(&BitmapType, args, kwargs); rc = PyType_GenericNew(&BitmapType, args, kwargs);
if (rc) if (rc)
{ {
pbitmapobj = (BitmapObject)rc; pbitmapobj = (BitmapObject *)rc;
BMP_Delete(pbitmapobj->pbmp); BMP_Delete(pbitmapobj->pbmp);
pbitmapobj->pbmp = pbmp; pbitmapobj->pbmp = pbmp;
} }

4
src/ep_devctxt.c
View File

@ -156,11 +156,11 @@ static PyObject *devctxt_select_bitmap(DevCtxtObject *self, BitmapObject *newbmp
old_bitmap = Epython_wrap_bitmap(old_pbmp); old_bitmap = Epython_wrap_bitmap(old_pbmp);
if (!old_bitmap) if (!old_bitmap)
{ {
DC_SelectObject(self->pdctxt, old_pbmp); DC_SelectObject(self->pdctxt, (PGFXOBJECT)old_pbmp);
return NULL; return NULL;
} }
else else
PY_INCREF(old_bitmap); Py_INCREF(old_bitmap);
} }
Py_DECREF(self->selected_bitmap); Py_DECREF(self->selected_bitmap);
self->selected_bitmap = newbmp; self->selected_bitmap = newbmp;