summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wiebe <mwwiebe@gmail.com>2011-04-23 21:37:38 -0700
committerMark Wiebe <mwwiebe@gmail.com>2011-04-23 21:52:42 -0700
commitbe364f74946c8fb4eb8486c51c96f70642175829 (patch)
tree6bc75293aa1647ebb3adff0d30f6dd77e520fcf5
parentc518d07e83a2c4889e5520b045b29089daebd11a (diff)
downloadnumpy-be364f74946c8fb4eb8486c51c96f70642175829.tar.gz
BUG: Switch char to npy_byte/npy_ubyte in min_scalar_type
-rw-r--r--numpy/core/src/multiarray/convert_datatype.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/convert_datatype.c b/numpy/core/src/multiarray/convert_datatype.c
index 1c64af85e..45b699cef 100644
--- a/numpy/core/src/multiarray/convert_datatype.c
+++ b/numpy/core/src/multiarray/convert_datatype.c
@@ -770,14 +770,14 @@ static int min_scalar_type_num(char *valueptr, int type_num,
return NPY_BOOL;
}
case NPY_UBYTE: {
- char value = *valueptr;
+ npy_ubyte value = *(npy_ubyte *)valueptr;
if (value <= NPY_MAX_BYTE) {
*is_small_unsigned = 1;
}
return NPY_UBYTE;
}
case NPY_BYTE: {
- char value = *valueptr;
+ npy_byte value = *(npy_byte *)valueptr;
if (value >= 0) {
*is_small_unsigned = 1;
return NPY_UBYTE;