From: <md...@us...> - 2010-10-27 19:41:59
|
Revision: 8766 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8766&view=rev Author: mdboom Date: 2010-10-27 19:41:52 +0000 (Wed, 27 Oct 2010) Log Message: ----------- Tell emacs more about our C++ files. Modified Paths: -------------- trunk/matplotlib/src/_backend_agg.cpp trunk/matplotlib/src/_backend_agg.h trunk/matplotlib/src/_gtkagg.cpp trunk/matplotlib/src/_image.cpp trunk/matplotlib/src/_image.h trunk/matplotlib/src/_path.cpp trunk/matplotlib/src/_png.cpp trunk/matplotlib/src/_subprocess.c trunk/matplotlib/src/_tkagg.cpp trunk/matplotlib/src/_ttconv.cpp trunk/matplotlib/src/_windowing.cpp trunk/matplotlib/src/agg_py_path_iterator.h trunk/matplotlib/src/agg_py_transforms.cpp trunk/matplotlib/src/agg_py_transforms.h trunk/matplotlib/src/cntr.c trunk/matplotlib/src/ft2font.cpp trunk/matplotlib/src/ft2font.h trunk/matplotlib/src/mplutils.cpp trunk/matplotlib/src/mplutils.h trunk/matplotlib/src/nxutils.c trunk/matplotlib/src/path_cleanup.cpp trunk/matplotlib/src/path_cleanup.h trunk/matplotlib/src/path_converters.h trunk/matplotlib/ttconv/global_defines.h trunk/matplotlib/ttconv/pprdrv.h trunk/matplotlib/ttconv/pprdrv_tt.cpp trunk/matplotlib/ttconv/pprdrv_tt2.cpp trunk/matplotlib/ttconv/truetype.h trunk/matplotlib/ttconv/ttutil.cpp Modified: trunk/matplotlib/src/_backend_agg.cpp =================================================================== --- trunk/matplotlib/src/_backend_agg.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/_backend_agg.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + /* A rewrite of _backend_agg using PyCXX to handle ref counting, etc.. */ Modified: trunk/matplotlib/src/_backend_agg.h =================================================================== --- trunk/matplotlib/src/_backend_agg.h 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/_backend_agg.h 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + /* _backend_agg.h - A rewrite of _backend_agg using PyCXX to handle ref counting, etc.. */ Modified: trunk/matplotlib/src/_gtkagg.cpp =================================================================== --- trunk/matplotlib/src/_gtkagg.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/_gtkagg.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + #include <pygobject.h> #include <pygtk/pygtk.h> Modified: trunk/matplotlib/src/_image.cpp =================================================================== --- trunk/matplotlib/src/_image.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/_image.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + /* Python API mandates Python.h is included *first* */ #include "Python.h" #include <string> Modified: trunk/matplotlib/src/_image.h =================================================================== --- trunk/matplotlib/src/_image.h 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/_image.h 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + /* image.h * */ @@ -76,7 +78,7 @@ }; //enum { BICUBIC=0, BILINEAR, BLACKMAN100, BLACKMAN256, BLACKMAN64, - // NEAREST, SINC144, SINC256, SINC64, SPLINE16, SPLINE36}; + // NEAREST, SINC144, SINC256, SINC64, SPLINE16, SPLINE36}; enum { ASPECT_PRESERVE = 0, ASPECT_FREE}; agg::int8u *bufferIn; Modified: trunk/matplotlib/src/_path.cpp =================================================================== --- trunk/matplotlib/src/_path.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/_path.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + #include "agg_py_path_iterator.h" #include "agg_py_transforms.h" #include "path_converters.h" Modified: trunk/matplotlib/src/_png.cpp =================================================================== --- trunk/matplotlib/src/_png.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/_png.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,4 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ /* For linux, png.h must be imported before Python.h because png.h needs to be the one to define setjmp. Modified: trunk/matplotlib/src/_subprocess.c =================================================================== --- trunk/matplotlib/src/_subprocess.c 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/_subprocess.c 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c; c-basic-offset: 4 -*- */ + /* * support routines for subprocess module * @@ -49,8 +51,8 @@ the wrapper is used to provide Detach and Close methods */ typedef struct { - PyObject_HEAD - HANDLE handle; + PyObject_HEAD + HANDLE handle; } sp_handle_object; staticforward PyTypeObject sp_handle_type; @@ -58,89 +60,89 @@ static PyObject* sp_handle_new(HANDLE handle) { - sp_handle_object* self; + sp_handle_object* self; - self = PyObject_NEW(sp_handle_object, &sp_handle_type); - if (self == NULL) - return NULL; + self = PyObject_NEW(sp_handle_object, &sp_handle_type); + if (self == NULL) + return NULL; - self->handle = handle; + self->handle = handle; - return (PyObject*) self; + return (PyObject*) self; } static PyObject* sp_handle_detach(sp_handle_object* self, PyObject* args) { - HANDLE handle; + HANDLE handle; - if (! PyArg_ParseTuple(args, ":Detach")) - return NULL; + if (! PyArg_ParseTuple(args, ":Detach")) + return NULL; - handle = self->handle; + handle = self->handle; - self->handle = NULL; + self->handle = NULL; - /* note: return the current handle, as an integer */ - return PyInt_FromLong((long) handle); + /* note: return the current handle, as an integer */ + return PyInt_FromLong((long) handle); } static PyObject* sp_handle_close(sp_handle_object* self, PyObject* args) { - if (! PyArg_ParseTuple(args, ":Close")) - return NULL; + if (! PyArg_ParseTuple(args, ":Close")) + return NULL; - if (self->handle != INVALID_HANDLE_VALUE) { - CloseHandle(self->handle); - self->handle = INVALID_HANDLE_VALUE; - } - Py_INCREF(Py_None); - return Py_None; + if (self->handle != INVALID_HANDLE_VALUE) { + CloseHandle(self->handle); + self->handle = INVALID_HANDLE_VALUE; + } + Py_INCREF(Py_None); + return Py_None; } static void sp_handle_dealloc(sp_handle_object* self) { - if (self->handle != INVALID_HANDLE_VALUE) - CloseHandle(self->handle); - PyObject_FREE(self); + if (self->handle != INVALID_HANDLE_VALUE) + CloseHandle(self->handle); + PyObject_FREE(self); } static PyMethodDef sp_handle_methods[] = { - {"Detach", (PyCFunction) sp_handle_detach, METH_VARARGS}, - {"Close", (PyCFunction) sp_handle_close, METH_VARARGS}, - {NULL, NULL} + {"Detach", (PyCFunction) sp_handle_detach, METH_VARARGS}, + {"Close", (PyCFunction) sp_handle_close, METH_VARARGS}, + {NULL, NULL} }; static PyObject* sp_handle_getattr(sp_handle_object* self, char* name) { - return Py_FindMethod(sp_handle_methods, (PyObject*) self, name); + return Py_FindMethod(sp_handle_methods, (PyObject*) self, name); } static PyObject* sp_handle_as_int(sp_handle_object* self) { - return PyInt_FromLong((long) self->handle); + return PyInt_FromLong((long) self->handle); } static PyNumberMethods sp_handle_as_number; statichere PyTypeObject sp_handle_type = { - PyObject_HEAD_INIT(NULL) - 0, /*ob_size*/ - "_subprocess_handle", sizeof(sp_handle_object), 0, - (destructor) sp_handle_dealloc, /*tp_dealloc*/ - 0, /*tp_print*/ - (getattrfunc) sp_handle_getattr,/*tp_getattr*/ - 0, /*tp_setattr*/ - 0, /*tp_compare*/ - 0, /*tp_repr*/ - &sp_handle_as_number, /*tp_as_number */ - 0, /*tp_as_sequence */ - 0, /*tp_as_mapping */ - 0 /*tp_hash*/ + PyObject_HEAD_INIT(NULL) + 0, /*ob_size*/ + "_subprocess_handle", sizeof(sp_handle_object), 0, + (destructor) sp_handle_dealloc, /*tp_dealloc*/ + 0, /*tp_print*/ + (getattrfunc) sp_handle_getattr,/*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + 0, /*tp_repr*/ + &sp_handle_as_number, /*tp_as_number */ + 0, /*tp_as_sequence */ + 0, /*tp_as_mapping */ + 0 /*tp_hash*/ }; /* -------------------------------------------------------------------- */ @@ -149,99 +151,99 @@ static PyObject * sp_GetStdHandle(PyObject* self, PyObject* args) { - HANDLE handle; - int std_handle; + HANDLE handle; + int std_handle; - if (! PyArg_ParseTuple(args, "i:GetStdHandle", &std_handle)) - return NULL; + if (! PyArg_ParseTuple(args, "i:GetStdHandle", &std_handle)) + return NULL; - Py_BEGIN_ALLOW_THREADS - handle = GetStdHandle((DWORD) std_handle); - Py_END_ALLOW_THREADS + Py_BEGIN_ALLOW_THREADS + handle = GetStdHandle((DWORD) std_handle); + Py_END_ALLOW_THREADS - if (handle == INVALID_HANDLE_VALUE) - return PyErr_SetFromWindowsErr(GetLastError()); + if (handle == INVALID_HANDLE_VALUE) + return PyErr_SetFromWindowsErr(GetLastError()); - if (! handle) { - Py_INCREF(Py_None); - return Py_None; - } + if (! handle) { + Py_INCREF(Py_None); + return Py_None; + } - /* note: returns integer, not handle object */ - return PyInt_FromLong((long) handle); + /* note: returns integer, not handle object */ + return PyInt_FromLong((long) handle); } static PyObject * sp_GetCurrentProcess(PyObject* self, PyObject* args) { - if (! PyArg_ParseTuple(args, ":GetCurrentProcess")) - return NULL; + if (! PyArg_ParseTuple(args, ":GetCurrentProcess")) + return NULL; - return sp_handle_new(GetCurrentProcess()); + return sp_handle_new(GetCurrentProcess()); } static PyObject * sp_DuplicateHandle(PyObject* self, PyObject* args) { - HANDLE target_handle; - BOOL result; + HANDLE target_handle; + BOOL result; - long source_process_handle; - long source_handle; - long target_process_handle; - int desired_access; - int inherit_handle; - int options = 0; + long source_process_handle; + long source_handle; + long target_process_handle; + int desired_access; + int inherit_handle; + int options = 0; - if (! PyArg_ParseTuple(args, "lllii|i:DuplicateHandle", - &source_process_handle, - &source_handle, - &target_process_handle, - &desired_access, - &inherit_handle, - &options)) - return NULL; + if (! PyArg_ParseTuple(args, "lllii|i:DuplicateHandle", + &source_process_handle, + &source_handle, + &target_process_handle, + &desired_access, + &inherit_handle, + &options)) + return NULL; - Py_BEGIN_ALLOW_THREADS - result = DuplicateHandle( - (HANDLE) source_process_handle, - (HANDLE) source_handle, - (HANDLE) target_process_handle, - &target_handle, - desired_access, - inherit_handle, - options - ); - Py_END_ALLOW_THREADS + Py_BEGIN_ALLOW_THREADS + result = DuplicateHandle( + (HANDLE) source_process_handle, + (HANDLE) source_handle, + (HANDLE) target_process_handle, + &target_handle, + desired_access, + inherit_handle, + options + ); + Py_END_ALLOW_THREADS - if (! result) - return PyErr_SetFromWindowsErr(GetLastError()); + if (! result) + return PyErr_SetFromWindowsErr(GetLastError()); - return sp_handle_new(target_handle); + return sp_handle_new(target_handle); } static PyObject * sp_CreatePipe(PyObject* self, PyObject* args) { - HANDLE read_pipe; - HANDLE write_pipe; - BOOL result; + HANDLE read_pipe; + HANDLE write_pipe; + BOOL result; - PyObject* pipe_attributes; /* ignored */ - int size; + PyObject* pipe_attributes; /* ignored */ + int size; - if (! PyArg_ParseTuple(args, "Oi:CreatePipe", &pipe_attributes, &size)) - return NULL; + if (! PyArg_ParseTuple(args, "Oi:CreatePipe", &pipe_attributes, &size)) + return NULL; - Py_BEGIN_ALLOW_THREADS - result = CreatePipe(&read_pipe, &write_pipe, NULL, size); - Py_END_ALLOW_THREADS + Py_BEGIN_ALLOW_THREADS + result = CreatePipe(&read_pipe, &write_pipe, NULL, size); + Py_END_ALLOW_THREADS - if (! result) - return PyErr_SetFromWindowsErr(GetLastError()); + if (! result) + return PyErr_SetFromWindowsErr(GetLastError()); - return Py_BuildValue( - "NN", sp_handle_new(read_pipe), sp_handle_new(write_pipe)); + return Py_BuildValue( + "NN", sp_handle_new(read_pipe), sp_handle_new(write_pipe)); } /* helpers for createprocess */ @@ -249,288 +251,288 @@ static int getint(PyObject* obj, char* name) { - PyObject* value; - int ret; + PyObject* value; + int ret; - value = PyObject_GetAttrString(obj, name); - if (! value) { - PyErr_Clear(); /* FIXME: propagate error? */ - return 0; - } - ret = (int) PyInt_AsLong(value); - Py_DECREF(value); - return ret; + value = PyObject_GetAttrString(obj, name); + if (! value) { + PyErr_Clear(); /* FIXME: propagate error? */ + return 0; + } + ret = (int) PyInt_AsLong(value); + Py_DECREF(value); + return ret; } static HANDLE gethandle(PyObject* obj, char* name) { - sp_handle_object* value; - HANDLE ret; + sp_handle_object* value; + HANDLE ret; - value = (sp_handle_object*) PyObject_GetAttrString(obj, name); - if (! value) { - PyErr_Clear(); /* FIXME: propagate error? */ - return NULL; - } - if (value->ob_type != &sp_handle_type) - ret = NULL; - else - ret = value->handle; - Py_DECREF(value); - return ret; + value = (sp_handle_object*) PyObject_GetAttrString(obj, name); + if (! value) { + PyErr_Clear(); /* FIXME: propagate error? */ + return NULL; + } + if (value->ob_type != &sp_handle_type) + ret = NULL; + else + ret = value->handle; + Py_DECREF(value); + return ret; } static PyObject* getenvironment(PyObject* environment) { - int i, envsize; - PyObject* out = NULL; - PyObject* keys; - PyObject* values; - char* p; + int i, envsize; + PyObject* out = NULL; + PyObject* keys; + PyObject* values; + char* p; - /* convert environment dictionary to windows enviroment string */ - if (! PyMapping_Check(environment)) { - PyErr_SetString( - PyExc_TypeError, "environment must be dictionary or None"); - return NULL; - } + /* convert environment dictionary to windows enviroment string */ + if (! PyMapping_Check(environment)) { + PyErr_SetString( + PyExc_TypeError, "environment must be dictionary or None"); + return NULL; + } - envsize = PyMapping_Length(environment); + envsize = PyMapping_Length(environment); - keys = PyMapping_Keys(environment); - values = PyMapping_Values(environment); - if (!keys || !values) - goto error; + keys = PyMapping_Keys(environment); + values = PyMapping_Values(environment); + if (!keys || !values) + goto error; - out = PyString_FromStringAndSize(NULL, 2048); - if (! out) - goto error; + out = PyString_FromStringAndSize(NULL, 2048); + if (! out) + goto error; - p = PyString_AS_STRING(out); + p = PyString_AS_STRING(out); - for (i = 0; i < envsize; i++) { - int ksize, vsize, totalsize; - PyObject* key = PyList_GET_ITEM(keys, i); - PyObject* value = PyList_GET_ITEM(values, i); + for (i = 0; i < envsize; i++) { + int ksize, vsize, totalsize; + PyObject* key = PyList_GET_ITEM(keys, i); + PyObject* value = PyList_GET_ITEM(values, i); - if (! PyString_Check(key) || ! PyString_Check(value)) { - PyErr_SetString(PyExc_TypeError, - "environment can only contain strings"); - goto error; - } - ksize = PyString_GET_SIZE(key); - vsize = PyString_GET_SIZE(value); - totalsize = (p - PyString_AS_STRING(out)) + ksize + 1 + - vsize + 1 + 1; - if (totalsize > PyString_GET_SIZE(out)) { - int offset = p - PyString_AS_STRING(out); - _PyString_Resize(&out, totalsize + 1024); - p = PyString_AS_STRING(out) + offset; - } - memcpy(p, PyString_AS_STRING(key), ksize); - p += ksize; - *p++ = '='; - memcpy(p, PyString_AS_STRING(value), vsize); - p += vsize; - *p++ = '\0'; - } + if (! PyString_Check(key) || ! PyString_Check(value)) { + PyErr_SetString(PyExc_TypeError, + "environment can only contain strings"); + goto error; + } + ksize = PyString_GET_SIZE(key); + vsize = PyString_GET_SIZE(value); + totalsize = (p - PyString_AS_STRING(out)) + ksize + 1 + + vsize + 1 + 1; + if (totalsize > PyString_GET_SIZE(out)) { + int offset = p - PyString_AS_STRING(out); + _PyString_Resize(&out, totalsize + 1024); + p = PyString_AS_STRING(out) + offset; + } + memcpy(p, PyString_AS_STRING(key), ksize); + p += ksize; + *p++ = '='; + memcpy(p, PyString_AS_STRING(value), vsize); + p += vsize; + *p++ = '\0'; + } - /* add trailing null byte */ - *p++ = '\0'; - _PyString_Resize(&out, p - PyString_AS_STRING(out)); + /* add trailing null byte */ + *p++ = '\0'; + _PyString_Resize(&out, p - PyString_AS_STRING(out)); - /* PyObject_Print(out, stdout, 0); */ + /* PyObject_Print(out, stdout, 0); */ - Py_XDECREF(keys); - Py_XDECREF(values); + Py_XDECREF(keys); + Py_XDECREF(values); - return out; + return out; error: - Py_XDECREF(out); - Py_XDECREF(keys); - Py_XDECREF(values); - return NULL; + Py_XDECREF(out); + Py_XDECREF(keys); + Py_XDECREF(values); + return NULL; } static PyObject * sp_CreateProcess(PyObject* self, PyObject* args) { - BOOL result; - PROCESS_INFORMATION pi; - STARTUPINFO si; - PyObject* environment; + BOOL result; + PROCESS_INFORMATION pi; + STARTUPINFO si; + PyObject* environment; - char* application_name; - char* command_line; - PyObject* process_attributes; /* ignored */ - PyObject* thread_attributes; /* ignored */ - int inherit_handles; - int creation_flags; - PyObject* env_mapping; - char* current_directory; - PyObject* startup_info; + char* application_name; + char* command_line; + PyObject* process_attributes; /* ignored */ + PyObject* thread_attributes; /* ignored */ + int inherit_handles; + int creation_flags; + PyObject* env_mapping; + char* current_directory; + PyObject* startup_info; - if (! PyArg_ParseTuple(args, "zzOOiiOzO:CreateProcess", - &application_name, - &command_line, - &process_attributes, - &thread_attributes, - &inherit_handles, - &creation_flags, - &env_mapping, - ¤t_directory, - &startup_info)) - return NULL; + if (! PyArg_ParseTuple(args, "zzOOiiOzO:CreateProcess", + &application_name, + &command_line, + &process_attributes, + &thread_attributes, + &inherit_handles, + &creation_flags, + &env_mapping, + ¤t_directory, + &startup_info)) + return NULL; - ZeroMemory(&si, sizeof(si)); - si.cb = sizeof(si); + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); - /* note: we only support a small subset of all SI attributes */ - si.dwFlags = getint(startup_info, "dwFlags"); - si.wShowWindow = getint(startup_info, "wShowWindow"); - si.hStdInput = gethandle(startup_info, "hStdInput"); - si.hStdOutput = gethandle(startup_info, "hStdOutput"); - si.hStdError = gethandle(startup_info, "hStdError"); + /* note: we only support a small subset of all SI attributes */ + si.dwFlags = getint(startup_info, "dwFlags"); + si.wShowWindow = getint(startup_info, "wShowWindow"); + si.hStdInput = gethandle(startup_info, "hStdInput"); + si.hStdOutput = gethandle(startup_info, "hStdOutput"); + si.hStdError = gethandle(startup_info, "hStdError"); - if (PyErr_Occurred()) - return NULL; + if (PyErr_Occurred()) + return NULL; - if (env_mapping == Py_None) - environment = NULL; - else { - environment = getenvironment(env_mapping); - if (! environment) - return NULL; - } + if (env_mapping == Py_None) + environment = NULL; + else { + environment = getenvironment(env_mapping); + if (! environment) + return NULL; + } - Py_BEGIN_ALLOW_THREADS - result = CreateProcess(application_name, - command_line, - NULL, - NULL, - inherit_handles, - creation_flags, - environment ? PyString_AS_STRING(environment) : NULL, - current_directory, - &si, - &pi); - Py_END_ALLOW_THREADS + Py_BEGIN_ALLOW_THREADS + result = CreateProcess(application_name, + command_line, + NULL, + NULL, + inherit_handles, + creation_flags, + environment ? PyString_AS_STRING(environment) : NULL, + current_directory, + &si, + &pi); + Py_END_ALLOW_THREADS - Py_XDECREF(environment); + Py_XDECREF(environment); - if (! result) - return PyErr_SetFromWindowsErr(GetLastError()); + if (! result) + return PyErr_SetFromWindowsErr(GetLastError()); - return Py_BuildValue("NNii", - sp_handle_new(pi.hProcess), - sp_handle_new(pi.hThread), - pi.dwProcessId, - pi.dwThreadId); + return Py_BuildValue("NNii", + sp_handle_new(pi.hProcess), + sp_handle_new(pi.hThread), + pi.dwProcessId, + pi.dwThreadId); } static PyObject * sp_TerminateProcess(PyObject* self, PyObject* args) { - BOOL result; + BOOL result; - long process; - int exit_code; - if (! PyArg_ParseTuple(args, "li:TerminateProcess", &process, - &exit_code)) - return NULL; + long process; + int exit_code; + if (! PyArg_ParseTuple(args, "li:TerminateProcess", &process, + &exit_code)) + return NULL; - result = TerminateProcess((HANDLE) process, exit_code); + result = TerminateProcess((HANDLE) process, exit_code); - if (! result) - return PyErr_SetFromWindowsErr(GetLastError()); + if (! result) + return PyErr_SetFromWindowsErr(GetLastError()); - Py_INCREF(Py_None); - return Py_None; + Py_INCREF(Py_None); + return Py_None; } static PyObject * sp_GetExitCodeProcess(PyObject* self, PyObject* args) { - DWORD exit_code; - BOOL result; + DWORD exit_code; + BOOL result; - long process; - if (! PyArg_ParseTuple(args, "l:GetExitCodeProcess", &process)) - return NULL; + long process; + if (! PyArg_ParseTuple(args, "l:GetExitCodeProcess", &process)) + return NULL; - result = GetExitCodeProcess((HANDLE) process, &exit_code); + result = GetExitCodeProcess((HANDLE) process, &exit_code); - if (! result) - return PyErr_SetFromWindowsErr(GetLastError()); + if (! result) + return PyErr_SetFromWindowsErr(GetLastError()); - return PyInt_FromLong(exit_code); + return PyInt_FromLong(exit_code); } static PyObject * sp_WaitForSingleObject(PyObject* self, PyObject* args) { - DWORD result; + DWORD result; - long handle; - int milliseconds; - if (! PyArg_ParseTuple(args, "li:WaitForSingleObject", - &handle, - &milliseconds)) - return NULL; + long handle; + int milliseconds; + if (! PyArg_ParseTuple(args, "li:WaitForSingleObject", + &handle, + &milliseconds)) + return NULL; - Py_BEGIN_ALLOW_THREADS - result = WaitForSingleObject((HANDLE) handle, (DWORD) milliseconds); - Py_END_ALLOW_THREADS + Py_BEGIN_ALLOW_THREADS + result = WaitForSingleObject((HANDLE) handle, (DWORD) milliseconds); + Py_END_ALLOW_THREADS - if (result == WAIT_FAILED) - return PyErr_SetFromWindowsErr(GetLastError()); + if (result == WAIT_FAILED) + return PyErr_SetFromWindowsErr(GetLastError()); - return PyInt_FromLong((int) result); + return PyInt_FromLong((int) result); } static PyObject * sp_GetVersion(PyObject* self, PyObject* args) { - if (! PyArg_ParseTuple(args, ":GetVersion")) - return NULL; + if (! PyArg_ParseTuple(args, ":GetVersion")) + return NULL; - return PyInt_FromLong((int) GetVersion()); + return PyInt_FromLong((int) GetVersion()); } static PyObject * sp_GetModuleFileName(PyObject* self, PyObject* args) { - BOOL result; - long module; - TCHAR filename[MAX_PATH]; + BOOL result; + long module; + TCHAR filename[MAX_PATH]; - if (! PyArg_ParseTuple(args, "l:GetModuleFileName", &module)) - return NULL; + if (! PyArg_ParseTuple(args, "l:GetModuleFileName", &module)) + return NULL; - result = GetModuleFileName((HMODULE)module, filename, MAX_PATH); - filename[MAX_PATH-1] = '\0'; + result = GetModuleFileName((HMODULE)module, filename, MAX_PATH); + filename[MAX_PATH-1] = '\0'; - if (! result) - return PyErr_SetFromWindowsErr(GetLastError()); + if (! result) + return PyErr_SetFromWindowsErr(GetLastError()); - return PyString_FromString(filename); + return PyString_FromString(filename); } static PyMethodDef sp_functions[] = { - {"GetStdHandle", sp_GetStdHandle, METH_VARARGS}, - {"GetCurrentProcess", sp_GetCurrentProcess, METH_VARARGS}, - {"DuplicateHandle", sp_DuplicateHandle, METH_VARARGS}, - {"CreatePipe", sp_CreatePipe, METH_VARARGS}, - {"CreateProcess", sp_CreateProcess, METH_VARARGS}, - {"TerminateProcess", sp_TerminateProcess, METH_VARARGS}, - {"GetExitCodeProcess", sp_GetExitCodeProcess, METH_VARARGS}, - {"WaitForSingleObject", sp_WaitForSingleObject, METH_VARARGS}, - {"GetVersion", sp_GetVersion, METH_VARARGS}, - {"GetModuleFileName", sp_GetModuleFileName, METH_VARARGS}, - {NULL, NULL} + {"GetStdHandle", sp_GetStdHandle, METH_VARARGS}, + {"GetCurrentProcess", sp_GetCurrentProcess, METH_VARARGS}, + {"DuplicateHandle", sp_DuplicateHandle, METH_VARARGS}, + {"CreatePipe", sp_CreatePipe, METH_VARARGS}, + {"CreateProcess", sp_CreateProcess, METH_VARARGS}, + {"TerminateProcess", sp_TerminateProcess, METH_VARARGS}, + {"GetExitCodeProcess", sp_GetExitCodeProcess, METH_VARARGS}, + {"WaitForSingleObject", sp_WaitForSingleObject, METH_VARARGS}, + {"GetVersion", sp_GetVersion, METH_VARARGS}, + {"GetModuleFileName", sp_GetModuleFileName, METH_VARARGS}, + {NULL, NULL} }; /* -------------------------------------------------------------------- */ @@ -538,11 +540,11 @@ static void defint(PyObject* d, const char* name, int value) { - PyObject* v = PyInt_FromLong((long) value); - if (v) { - PyDict_SetItemString(d, (char*) name, v); - Py_DECREF(v); - } + PyObject* v = PyInt_FromLong((long) value); + if (v) { + PyDict_SetItemString(d, (char*) name, v); + Py_DECREF(v); + } } #if PY_VERSION_HEX >= 0x02030000 @@ -552,27 +554,27 @@ #endif init_subprocess() { - PyObject *d; - PyObject *m; + PyObject *d; + PyObject *m; - /* patch up object descriptors */ - sp_handle_type.ob_type = &PyType_Type; - sp_handle_as_number.nb_int = (unaryfunc) sp_handle_as_int; + /* patch up object descriptors */ + sp_handle_type.ob_type = &PyType_Type; + sp_handle_as_number.nb_int = (unaryfunc) sp_handle_as_int; - m = Py_InitModule("_subprocess", sp_functions); - if (m == NULL) - return; - d = PyModule_GetDict(m); + m = Py_InitModule("_subprocess", sp_functions); + if (m == NULL) + return; + d = PyModule_GetDict(m); - /* constants */ - defint(d, "STD_INPUT_HANDLE", STD_INPUT_HANDLE); - defint(d, "STD_OUTPUT_HANDLE", STD_OUTPUT_HANDLE); - defint(d, "STD_ERROR_HANDLE", STD_ERROR_HANDLE); - defint(d, "DUPLICATE_SAME_ACCESS", DUPLICATE_SAME_ACCESS); - defint(d, "STARTF_USESTDHANDLES", STARTF_USESTDHANDLES); - defint(d, "STARTF_USESHOWWINDOW", STARTF_USESHOWWINDOW); - defint(d, "SW_HIDE", SW_HIDE); - defint(d, "INFINITE", INFINITE); - defint(d, "WAIT_OBJECT_0", WAIT_OBJECT_0); - defint(d, "CREATE_NEW_CONSOLE", CREATE_NEW_CONSOLE); + /* constants */ + defint(d, "STD_INPUT_HANDLE", STD_INPUT_HANDLE); + defint(d, "STD_OUTPUT_HANDLE", STD_OUTPUT_HANDLE); + defint(d, "STD_ERROR_HANDLE", STD_ERROR_HANDLE); + defint(d, "DUPLICATE_SAME_ACCESS", DUPLICATE_SAME_ACCESS); + defint(d, "STARTF_USESTDHANDLES", STARTF_USESTDHANDLES); + defint(d, "STARTF_USESHOWWINDOW", STARTF_USESHOWWINDOW); + defint(d, "SW_HIDE", SW_HIDE); + defint(d, "INFINITE", INFINITE); + defint(d, "WAIT_OBJECT_0", WAIT_OBJECT_0); + defint(d, "CREATE_NEW_CONSOLE", CREATE_NEW_CONSOLE); } Modified: trunk/matplotlib/src/_tkagg.cpp =================================================================== --- trunk/matplotlib/src/_tkagg.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/_tkagg.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + /* * The Python Imaging Library. * $Id$ Modified: trunk/matplotlib/src/_ttconv.cpp =================================================================== --- trunk/matplotlib/src/_ttconv.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/_ttconv.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + /* _ttconv.c Modified: trunk/matplotlib/src/_windowing.cpp =================================================================== --- trunk/matplotlib/src/_windowing.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/_windowing.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + #include "Python.h" #include <windows.h> Modified: trunk/matplotlib/src/agg_py_path_iterator.h =================================================================== --- trunk/matplotlib/src/agg_py_path_iterator.h 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/agg_py_path_iterator.h 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + #ifndef __AGG_PY_PATH_ITERATOR_H__ #define __AGG_PY_PATH_ITERATOR_H__ Modified: trunk/matplotlib/src/agg_py_transforms.cpp =================================================================== --- trunk/matplotlib/src/agg_py_transforms.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/agg_py_transforms.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + #include <Python.h> #define NO_IMPORT_ARRAY Modified: trunk/matplotlib/src/agg_py_transforms.h =================================================================== --- trunk/matplotlib/src/agg_py_transforms.h 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/agg_py_transforms.h 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + #ifndef __AGG_PY_TRANSFORMS_H__ #define __AGG_PY_TRANSFORMS_H__ Modified: trunk/matplotlib/src/cntr.c =================================================================== --- trunk/matplotlib/src/cntr.c 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/cntr.c 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c; c-basic-offset: 4 -*- */ + /* cntr.c General purpose contour tracer for quadrilateral meshes. Modified: trunk/matplotlib/src/ft2font.cpp =================================================================== --- trunk/matplotlib/src/ft2font.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/ft2font.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + #include "ft2font.h" #include "mplutils.h" #include <sstream> Modified: trunk/matplotlib/src/ft2font.h =================================================================== --- trunk/matplotlib/src/ft2font.h 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/ft2font.h 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + /* A python interface to freetype2 */ #ifndef _FT2FONT_H #define _FT2FONT_H Modified: trunk/matplotlib/src/mplutils.cpp =================================================================== --- trunk/matplotlib/src/mplutils.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/mplutils.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + #include <iostream> #include <cstdarg> #include <cstdio> Modified: trunk/matplotlib/src/mplutils.h =================================================================== --- trunk/matplotlib/src/mplutils.h 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/mplutils.h 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + /* mplutils.h -- * * $Header$ Modified: trunk/matplotlib/src/nxutils.c =================================================================== --- trunk/matplotlib/src/nxutils.c 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/nxutils.c 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c; c-basic-offset: 4 -*- */ + #include <Python.h> #include "structmember.h" #include <stdlib.h> @@ -24,8 +26,8 @@ int i, j, c = 0; for (i = 0, j = npol-1; i < npol; j = i++) { if ((((yp[i]<=y) && (y<yp[j])) || - ((yp[j]<=y) && (y<yp[i]))) && - (x < (xp[j] - xp[i]) * (y - yp[i]) / (yp[j] - yp[i]) + xp[i])) + ((yp[j]<=y) && (y<yp[i]))) && + (x < (xp[j] - xp[i]) * (y - yp[i]) / (yp[j] - yp[i]) + xp[i])) c = !c; } @@ -50,7 +52,7 @@ if (verts == NULL) { PyErr_SetString(PyExc_ValueError, - "Arguments verts must be a Nx2 array."); + "Arguments verts must be a Nx2 array."); Py_XDECREF(verts); return NULL; @@ -61,7 +63,7 @@ if (verts->dimensions[1]!=2) { PyErr_SetString(PyExc_ValueError, - "Arguments verts must be a Nx2 array."); + "Arguments verts must be a Nx2 array."); Py_XDECREF(verts); return NULL; @@ -118,7 +120,7 @@ if (verts == NULL) { PyErr_SetString(PyExc_ValueError, - "Argument verts must be a Nx2 array."); + "Argument verts must be a Nx2 array."); Py_XDECREF(verts); return NULL; @@ -129,7 +131,7 @@ if (verts->dimensions[1]!=2) { PyErr_SetString(PyExc_ValueError, - "Arguments verts must be a Nx2 array."); + "Arguments verts must be a Nx2 array."); Py_XDECREF(verts); return NULL; @@ -163,7 +165,7 @@ if (xypoints == NULL) { PyErr_SetString(PyExc_ValueError, - "Arguments xypoints must an Nx2 array."); + "Arguments xypoints must an Nx2 array."); Py_XDECREF(verts); Py_XDECREF(xypoints); PyMem_Free(xv); @@ -175,7 +177,7 @@ if (xypoints->dimensions[1]!=2) { PyErr_SetString(PyExc_ValueError, - "Arguments xypoints must be a Nx2 array."); + "Arguments xypoints must be a Nx2 array."); Py_XDECREF(verts); Py_XDECREF(xypoints); Modified: trunk/matplotlib/src/path_cleanup.cpp =================================================================== --- trunk/matplotlib/src/path_cleanup.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/path_cleanup.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + #include <Python.h> #define NO_IMPORT_ARRAY #include "numpy/arrayobject.h" Modified: trunk/matplotlib/src/path_cleanup.h =================================================================== --- trunk/matplotlib/src/path_cleanup.h 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/path_cleanup.h 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + #ifndef PATH_CLEANUP_H #define PATH_CLEANUP_H Modified: trunk/matplotlib/src/path_converters.h =================================================================== --- trunk/matplotlib/src/path_converters.h 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/src/path_converters.h 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + #ifndef __PATH_CONVERTERS_H__ #define __PATH_CONVERTERS_H__ Modified: trunk/matplotlib/ttconv/global_defines.h =================================================================== --- trunk/matplotlib/ttconv/global_defines.h 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/ttconv/global_defines.h 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c; c-basic-offset: 4 -*- */ + /* * Modified for use within matplotlib * 5 July 2007 @@ -18,8 +20,8 @@ ** ** The PPR project was begun 28 December 1992. ** -** There are many things in this file you may want to change. This file -** should be the first include file. It is the header file for the whole +** There are many things in this file you may want to change. This file +** should be the first include file. It is the header file for the whole ** project. ** ** This file was last modified 22 December 1995. Modified: trunk/matplotlib/ttconv/pprdrv.h =================================================================== --- trunk/matplotlib/ttconv/pprdrv.h 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/ttconv/pprdrv.h 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + /* * Modified for use within matplotlib * 5 July 2007 @@ -84,7 +86,7 @@ ** code you want to have included. */ #ifdef DEBUG -#define DEBUG_TRUETYPE /* truetype fonts, conversion to Postscript */ +#define DEBUG_TRUETYPE /* truetype fonts, conversion to Postscript */ #endif /* Do not change anything below this line. */ Modified: trunk/matplotlib/ttconv/pprdrv_tt.cpp =================================================================== --- trunk/matplotlib/ttconv/pprdrv_tt.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/ttconv/pprdrv_tt.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + /* * Modified for use within matplotlib * 5 July 2007 Modified: trunk/matplotlib/ttconv/pprdrv_tt2.cpp =================================================================== --- trunk/matplotlib/ttconv/pprdrv_tt2.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/ttconv/pprdrv_tt2.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + /* * Modified for use within matplotlib * 5 July 2007 Modified: trunk/matplotlib/ttconv/truetype.h =================================================================== --- trunk/matplotlib/ttconv/truetype.h 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/ttconv/truetype.h 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c; c-basic-offset: 4 -*- */ + /* * Modified for use within matplotlib * 5 July 2007 @@ -48,37 +50,37 @@ TTFONT(); ~TTFONT(); - const char *filename; /* Name of TT file */ - FILE *file; /* the open TT file */ - font_type_enum target_type; /* 42 or 3 for PS, or -3 for PDF */ + const char *filename; /* Name of TT file */ + FILE *file; /* the open TT file */ + font_type_enum target_type; /* 42 or 3 for PS, or -3 for PDF */ - ULONG numTables; /* number of tables present */ - char *PostName; /* Font's PostScript name */ - char *FullName; /* Font's full name */ - char *FamilyName; /* Font's family name */ - char *Style; /* Font's style string */ - char *Copyright; /* Font's copyright string */ - char *Version; /* Font's version string */ - char *Trademark; /* Font's trademark string */ - int llx,lly,urx,ury; /* bounding box */ + ULONG numTables; /* number of tables present */ + char *PostName; /* Font's PostScript name */ + char *FullName; /* Font's full name */ + char *FamilyName; /* Font's family name */ + char *Style; /* Font's style string */ + char *Copyright; /* Font's copyright string */ + char *Version; /* Font's version string */ + char *Trademark; /* Font's trademark string */ + int llx,lly,urx,ury; /* bounding box */ - Fixed TTVersion; /* Truetype version number from offset table */ - Fixed MfrRevision; /* Revision number of this font */ + Fixed TTVersion; /* Truetype version number from offset table */ + Fixed MfrRevision; /* Revision number of this font */ - BYTE *offset_table; /* Offset table in memory */ - BYTE *post_table; /* 'post' table in memory */ + BYTE *offset_table; /* Offset table in memory */ + BYTE *post_table; /* 'post' table in memory */ - BYTE *loca_table; /* 'loca' table in memory */ - BYTE *glyf_table; /* 'glyf' table in memory */ - BYTE *hmtx_table; /* 'hmtx' table in memory */ + BYTE *loca_table; /* 'loca' table in memory */ + BYTE *glyf_table; /* 'glyf' table in memory */ + BYTE *hmtx_table; /* 'hmtx' table in memory */ USHORT numberOfHMetrics; - int unitsPerEm; /* unitsPerEm converted to int */ - int HUPM; /* half of above */ + int unitsPerEm; /* unitsPerEm converted to int */ + int HUPM; /* half of above */ - int numGlyphs; /* from 'post' table */ + int numGlyphs; /* from 'post' table */ - int indexToLocFormat; /* short or long offsets */ + int indexToLocFormat; /* short or long offsets */ }; ULONG getULONG(BYTE *p); Modified: trunk/matplotlib/ttconv/ttutil.cpp =================================================================== --- trunk/matplotlib/ttconv/ttutil.cpp 2010-10-27 12:24:42 UTC (rev 8765) +++ trunk/matplotlib/ttconv/ttutil.cpp 2010-10-27 19:41:52 UTC (rev 8766) @@ -1,3 +1,5 @@ +/* -*- mode: c++; c-basic-offset: 4 -*- */ + /* * Modified for use within matplotlib * 5 July 2007 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |