Mercurial > octave
diff src/mexproto.h @ 6686:2aad75fcc93a
[project @ 2007-06-03 20:58:28 by dbateman]
author | dbateman |
---|---|
date | Sun, 03 Jun 2007 20:58:29 +0000 |
parents | ec88b4ab6d10 |
children | 963a19576024 |
line wrap: on
line diff
--- a/src/mexproto.h Sat Jun 02 11:39:42 2007 +0000 +++ b/src/mexproto.h Sun Jun 03 20:58:29 2007 +0000 @@ -109,22 +109,22 @@ extern OCTINTERP_API void mxFree (void *ptr); // Constructors. -extern OCTINTERP_API mxArray *mxCreateCellArray (int ndims, const int *dims); -extern OCTINTERP_API mxArray *mxCreateCellMatrix (int m, int n); -extern OCTINTERP_API mxArray *mxCreateCharArray (int ndims, const int *dims); -extern OCTINTERP_API mxArray *mxCreateCharMatrixFromStrings (int m, const char **str); -extern OCTINTERP_API mxArray *mxCreateDoubleMatrix (int nr, int nc, mxComplexity flag); +extern OCTINTERP_API mxArray *mxCreateCellArray (mwSize ndims, const mwSize *dims); +extern OCTINTERP_API mxArray *mxCreateCellMatrix (mwSize m, mwSize n); +extern OCTINTERP_API mxArray *mxCreateCharArray (mwSize ndims, const mwSize *dims); +extern OCTINTERP_API mxArray *mxCreateCharMatrixFromStrings (mwSize m, const char **str); +extern OCTINTERP_API mxArray *mxCreateDoubleMatrix (mwSize nr, mwSize nc, mxComplexity flag); extern OCTINTERP_API mxArray *mxCreateDoubleScalar (double val); -extern OCTINTERP_API mxArray *mxCreateLogicalArray (int ndims, const int *dims); -extern OCTINTERP_API mxArray *mxCreateLogicalMatrix (int m, int n); +extern OCTINTERP_API mxArray *mxCreateLogicalArray (mwSize ndims, const mwSize *dims); +extern OCTINTERP_API mxArray *mxCreateLogicalMatrix (mwSize m, mwSize n); extern OCTINTERP_API mxArray *mxCreateLogicalScalar (int val); -extern OCTINTERP_API mxArray *mxCreateNumericArray (int ndims, const int *dims, mxClassID class_id, mxComplexity flag); -extern OCTINTERP_API mxArray *mxCreateNumericMatrix (int m, int n, mxClassID class_id, mxComplexity flag); -extern OCTINTERP_API mxArray *mxCreateSparse (int m, int n, int nzmax, mxComplexity flag); -extern OCTINTERP_API mxArray *mxCreateSparseLogicalMatrix (int m, int n, int nzmax); +extern OCTINTERP_API mxArray *mxCreateNumericArray (mwSize ndims, const mwSize *dims, mxClassID class_id, mxComplexity flag); +extern OCTINTERP_API mxArray *mxCreateNumericMatrix (mwSize m, mwSize n, mxClassID class_id, mxComplexity flag); +extern OCTINTERP_API mxArray *mxCreateSparse (mwSize m, mwSize n, mwSize nzmax, mxComplexity flag); +extern OCTINTERP_API mxArray *mxCreateSparseLogicalMatrix (mwSize m, mwSize n, mwSize nzmax); extern OCTINTERP_API mxArray *mxCreateString (const char *str); -extern OCTINTERP_API mxArray *mxCreateStructArray (int ndims, int *dims, int num_keys, const char **keys); -extern OCTINTERP_API mxArray *mxCreateStructMatrix (int rows, int cols, int num_keys, const char **keys); +extern OCTINTERP_API mxArray *mxCreateStructArray (mwSize ndims, mwSize *dims, int num_keys, const char **keys); +extern OCTINTERP_API mxArray *mxCreateStructMatrix (mwSize rows, mwSize cols, int num_keys, const char **keys); // Copy constructor. extern OCTINTERP_API mxArray *mxDuplicateArray (const mxArray *v); @@ -165,16 +165,16 @@ extern OCTINTERP_API int mxIsFromGlobalWS (const mxArray *ptr); // Dimension extractors. -extern OCTINTERP_API int mxGetM (const mxArray *ptr); -extern OCTINTERP_API int mxGetN (const mxArray *ptr); -extern OCTINTERP_API int *mxGetDimensions (const mxArray *ptr); -extern OCTINTERP_API int mxGetNumberOfDimensions (const mxArray *ptr); -extern OCTINTERP_API int mxGetNumberOfElements (const mxArray *ptr); +extern OCTINTERP_API size_t mxGetM (const mxArray *ptr); +extern OCTINTERP_API size_t mxGetN (const mxArray *ptr); +extern OCTINTERP_API mwSize *mxGetDimensions (const mxArray *ptr); +extern OCTINTERP_API mwSize mxGetNumberOfDimensions (const mxArray *ptr); +extern OCTINTERP_API size_t mxGetNumberOfElements (const mxArray *ptr); // Dimension setters. -extern OCTINTERP_API void mxSetM (mxArray *ptr, int M); -extern OCTINTERP_API void mxSetN (mxArray *ptr, int N); -extern OCTINTERP_API void mxSetDimensions (mxArray *ptr, int *dims, int ndims); +extern OCTINTERP_API void mxSetM (mxArray *ptr, mwSize M); +extern OCTINTERP_API void mxSetN (mxArray *ptr, mwSize N); +extern OCTINTERP_API void mxSetDimensions (mxArray *ptr, mwSize *dims, mwSize ndims); // Data extractors. extern OCTINTERP_API double *mxGetPi (const mxArray *ptr); @@ -185,7 +185,7 @@ extern OCTINTERP_API void *mxGetData (const mxArray *ptr); extern OCTINTERP_API void *mxGetImagData (const mxArray *ptr); -// Data setters. +// Data setters./ extern OCTINTERP_API void mxSetPr (mxArray *ptr, double *pr); extern OCTINTERP_API void mxSetPi (mxArray *ptr, double *pi); extern OCTINTERP_API void mxSetData (mxArray *ptr, void *data); @@ -198,36 +198,36 @@ extern OCTINTERP_API void mxSetClassName (mxArray *ptr, const char *name); // Cell support. -extern OCTINTERP_API mxArray *mxGetCell (const mxArray *ptr, int idx); +extern OCTINTERP_API mxArray *mxGetCell (const mxArray *ptr, mwIndex idx); -extern OCTINTERP_API void mxSetCell (mxArray *ptr, int idx, mxArray *val); +extern OCTINTERP_API void mxSetCell (mxArray *ptr, mwIndex idx, mxArray *val); // Sparse support. -extern OCTINTERP_API int *mxGetIr (const mxArray *ptr); -extern OCTINTERP_API int *mxGetJc (const mxArray *ptr); -extern OCTINTERP_API int mxGetNzmax (const mxArray *ptr); +extern OCTINTERP_API mwIndex *mxGetIr (const mxArray *ptr); +extern OCTINTERP_API mwIndex *mxGetJc (const mxArray *ptr); +extern OCTINTERP_API mwSize mxGetNzmax (const mxArray *ptr); -extern OCTINTERP_API void mxSetIr (mxArray *ptr, int *ir); -extern OCTINTERP_API void mxSetJc (mxArray *ptr, int *jc); -extern OCTINTERP_API void mxSetNzmax (mxArray *ptr, int nzmax); +extern OCTINTERP_API void mxSetIr (mxArray *ptr, mwIndex *ir); +extern OCTINTERP_API void mxSetJc (mxArray *ptr, mwIndex *jc); +extern OCTINTERP_API void mxSetNzmax (mxArray *ptr, mwSize nzmax); // Structure support. extern OCTINTERP_API int mxAddField (mxArray *ptr, const char *key); extern OCTINTERP_API void mxRemoveField (mxArray *ptr, int key_num); -extern OCTINTERP_API mxArray *mxGetField (const mxArray *ptr, int index, const char *key); -extern OCTINTERP_API mxArray *mxGetFieldByNumber (const mxArray *ptr, int index, int key_num); +extern OCTINTERP_API mxArray *mxGetField (const mxArray *ptr, mwIndex index, const char *key); +extern OCTINTERP_API mxArray *mxGetFieldByNumber (const mxArray *ptr, mwIndex index, int key_num); -extern OCTINTERP_API void mxSetField (mxArray *ptr, int index, const char *key, mxArray *val); -extern OCTINTERP_API void mxSetFieldByNumber (mxArray *ptr, int index, int key_num, mxArray *val); +extern OCTINTERP_API void mxSetField (mxArray *ptr, mwIndex index, const char *key, mxArray *val); +extern OCTINTERP_API void mxSetFieldByNumber (mxArray *ptr, mwIndex index, int key_num, mxArray *val); extern OCTINTERP_API int mxGetNumberOfFields (const mxArray *ptr); extern OCTINTERP_API const char *mxGetFieldNameByNumber (const mxArray *ptr, int key_num); extern OCTINTERP_API int mxGetFieldNumber (const mxArray *ptr, const char *key); -extern OCTINTERP_API int mxGetString (const mxArray *ptr, char *buf, int buflen); +extern OCTINTERP_API int mxGetString (const mxArray *ptr, char *buf, mwSize buflen); extern OCTINTERP_API char *mxArrayToString (const mxArray *ptr); // Miscellaneous. @@ -259,9 +259,9 @@ #define mxAssertS(expr, msg) #endif -extern OCTINTERP_API int mxCalcSingleSubscript (const mxArray *ptr, int nsubs, int *subs); +extern OCTINTERP_API mwIndex mxCalcSingleSubscript (const mxArray *ptr, mwSize nsubs, mwIndex *subs); -extern OCTINTERP_API int mxGetElementSize (const mxArray *ptr); +extern OCTINTERP_API size_t mxGetElementSize (const mxArray *ptr); #if defined (__cplusplus) }