mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

quench some minor warnings

metadata
Wenzel Jakob 2013-12-02 11:25:48 +01:00
parent 15a872eae0
commit b17916e679
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libpython/core.cpp
View File

@ -782,7 +782,7 @@ struct NativeBuffer {
const char* formatString; const char* formatString;
NativeBuffer(Object *owner, void *ptr, Bitmap::EComponentFormat format, int ndim, NativeBuffer(Object *owner, void *ptr, Bitmap::EComponentFormat format, int ndim,
size_t shape[3]) : owner(owner), ptr(ptr), format(format), ndim(ndim) { Py_ssize_t shape[3]) : owner(owner), ptr(ptr), format(format), ndim(ndim) {
size_t itemSize = 0; size_t itemSize = 0;
switch (format) { switch (format) {
case Bitmap::EUInt8: formatString = "B"; itemSize = 1; break; case Bitmap::EUInt8: formatString = "B"; itemSize = 1; break;
@ -915,10 +915,10 @@ struct NativeBuffer {
static NativeBuffer bitmap_getNativeBuffer(Bitmap *bitmap) { static NativeBuffer bitmap_getNativeBuffer(Bitmap *bitmap) {
int ndim = bitmap->getChannelCount() == 1 ? 2 : 3; int ndim = bitmap->getChannelCount() == 1 ? 2 : 3;
size_t shape[3] = { Py_ssize_t shape[3] = {
bitmap->getHeight(), (Py_ssize_t) bitmap->getHeight(),
bitmap->getWidth(), (Py_ssize_t) bitmap->getWidth(),
bitmap->getChannelCount() (Py_ssize_t) bitmap->getChannelCount()
}; };
return NativeBuffer(bitmap, bitmap->getUInt8Data(), bitmap->getComponentFormat(), ndim, shape); return NativeBuffer(bitmap, bitmap->getUInt8Data(), bitmap->getComponentFormat(), ndim, shape);