simplify typemap for convertFieldToObject()

Author: knonomura

src/gstype_python.i

@@ -228,159 +228,12 @@ static PyObject* convertFieldToObject(GSValue* value, GSType type, bool timestam
         case GS_TYPE_NULL:
             Py_RETURN_NONE;
 %#endif
-        case GS_TYPE_BLOB:
-            return PyByteArray_FromStringAndSize((GSChar *)value->asBlob.data, value->asBlob.size);
-
-        case GS_TYPE_BOOL:
-            return PyBool_FromLong(value->asBool);
         case GS_TYPE_INTEGER:
             return PyInt_FromLong(value->asInteger);
-        case GS_TYPE_FLOAT:
-            return PyFloat_FromDouble(value->asFloat);
         case GS_TYPE_DOUBLE:
             return PyFloat_FromDouble(value->asDouble);
         case GS_TYPE_TIMESTAMP:
             return convertTimestampToObject(&value->asTimestamp, timestampToFloat);
-        case GS_TYPE_BYTE:
-            return PyInt_FromLong(value->asByte);
-        case GS_TYPE_SHORT:
-            return PyInt_FromLong(value->asShort);
-        case GS_TYPE_GEOMETRY:
-            return convertStrToObj(value->asGeometry);
-        case GS_TYPE_INTEGER_ARRAY:{
-            const int32_t *intArrVal;
-%#if GS_COMPATIBILITY_VALUE_1_1_106
-            size = value->asIntegerArray.size;
-            intArrVal = value->asIntegerArray.elements;
-%#else
-            size = value->asArray.length;
-            intArrVal = value->asArray.elements.asInteger;
-%#endif
-            list = PyList_New(size);
-            for (i = 0; i < size; i++) {
-                PyList_SetItem(list, i, PyInt_FromLong(intArrVal[i]));
-            }
-            return list;
-        }
-        case GS_TYPE_STRING_ARRAY: {
-            const GSChar *const *stringArrVal;
-%#if GS_COMPATIBILITY_VALUE_1_1_106
-            size = value->asStringArray.size;
-            stringArrVal = value->asStringArray.elements;
-%#else
-            size = value->asArray.length;
-            stringArrVal = value->asArray.elements.asString;
-%#endif
-            list = PyList_New(size);
-            for (i = 0; i < size; i++) {
-                PyList_SetItem(list, i, convertStrToObj(stringArrVal[i]));
-            }
-            return list;
-        }
-        case GS_TYPE_BOOL_ARRAY:
-            const GSBool *boolArrVal;
-%#if GS_COMPATIBILITY_VALUE_1_1_106
-            size = value->asBoolArray.size;
-            boolArrVal = value->value.asBoolArray.elements;
-%#else
-            size = value->asArray.length;
-            boolArrVal = value->asArray.elements.asBool;
-%#endif
-            list = PyList_New(size);
-            for (i = 0; i < size; i++) {
-                PyList_SetItem(list, i, PyBool_FromLong(boolArrVal[i]));
-            }
-            return list;
-        case GS_TYPE_BYTE_ARRAY: {
-            const int8_t *byteArrVal;
-%#if GS_COMPATIBILITY_VALUE_1_1_106
-            size = value->asByteArray.size;
-            byteArrVal = value->asByteArray.elements;
-%#else
-            size = value->asArray.length;
-            byteArrVal = value->asArray.elements.asByte;
-%#endif
-            list = PyList_New(size);
-            for (i = 0; i < size; i++) {
-                PyList_SetItem(list, i, PyInt_FromLong(byteArrVal[i]));
-            }
-            return list;
-        }
-        case GS_TYPE_SHORT_ARRAY: {
-            const int16_t *shortArrVal;
-%#if GS_COMPATIBILITY_VALUE_1_1_106
-            size = value->asShortArray.size;
-            shortArrVal = value->asShortArray.elements;
-%#else
-            size = value->asArray.length;
-            shortArrVal = value->asArray.elements.asShort;
-%#endif
-            list = PyList_New(size);
-            for (i = 0; i < size; i++) {
-                PyList_SetItem(list, i, PyInt_FromLong(shortArrVal[i]));
-            }
-            return list;
-        }
-        case GS_TYPE_LONG_ARRAY: {
-            const int64_t *longArrVal;
-%#if GS_COMPATIBILITY_VALUE_1_1_106
-            size = value->asLongArray.size;
-            longArrVal = value->asLongArray.elements;
-%#else
-            size = value->asArray.length;
-            longArrVal = value->asArray.elements.asLong;
-%#endif
-            list = PyList_New(size);
-            for (i = 0; i < size; i++) {
-                PyList_SetItem(list, i, PyLong_FromLong(longArrVal[i]));
-            }
-            return list;
-        }
-        case GS_TYPE_FLOAT_ARRAY: {
-            const float *floatArrVal;
-%#if GS_COMPATIBILITY_VALUE_1_1_106
-            size = value->asFloatArray.size;
-            floatArrVal = value->asFloatArray.elements;
-%#else
-            size = value->asArray.length;
-            floatArrVal = value->asArray.elements.asFloat;
-%#endif
-            list = PyList_New(size);
-            for (i = 0; i < size; i++) {
-                PyList_SetItem(list, i, PyFloat_FromDouble(static_cast<double>(floatArrVal[i])));
-            }
-            return list;
-        }
-        case GS_TYPE_DOUBLE_ARRAY: {
-            const double *doubleArrVal;
-%#if GS_COMPATIBILITY_VALUE_1_1_106
-            size = value->asDoubleArray.size;
-            doubleArrVal = value->asDoubleArray.elements;
-%#else
-            size = value->asArray.length;
-            doubleArrVal = value->asArray.elements.asDouble;
-%#endif
-            list = PyList_New(size);
-            for (i = 0; i < size; i++) {
-                PyList_SetItem(list, i, PyFloat_FromDouble(doubleArrVal[i]));
-            }
-            return list;
-        }
-        case GS_TYPE_TIMESTAMP_ARRAY: {
-            const GSTimestamp *timestampArrVal;
-%#if GS_COMPATIBILITY_VALUE_1_1_106
-            size = value->asTimestampArray.size;
-            timestampArrVal = value->asTimestampArray.elements;
-%#else
-            size = value->asArray.length;
-            timestampArrVal = value->asArray.elements.asTimestamp;
-%#endif
-            list = PyList_New(size);
-            for (i = 0; i < size; i++) {
-                PyList_SetItem(list, i, convertTimestampToObject((GSTimestamp*)&(timestampArrVal[i]), timestampToFloat));
-            }
-            return list;
-        }
         default:
             return NULL;
     }