← Back to branch summary

~ubuntu-branches/ubuntu/trusty/python-enable/trusty

« back to all changes in this revision

Viewing changes to enthought/kiva/agg/src/gtk1/agg_bmp.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Varun Hiremath
  • Date: 2010-02-28 14:56:36 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100228145636-9ghfhe3uy37tt3q6
Tags: 3.3.0-1
* New upstream release
* Bump Standards-Version to 3.8.4
* Switch to source format 3.0
* Update patches/freetype2.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
enthought/kiva/agg/src/gtk1/agg_bmp.cpp
117
117
    pix_format_e format = get_pix_format();
118
118
    rgba8 c;
119
119
    unsigned i,j;
120
 
    int dims[3];
 
120
    npy_intp dims[3];
121
121
    PyObject* arr = NULL;
122
122
    char* data = NULL;
123
123
    dims[0] = w;
124
124
    dims[1] = h;
125
125
    dims[2] = 3;
126
126
    import_array();
127
 
    arr = PyArray_FromDims(3,dims,PyArray_CHAR);
 
127
    arr = PyArray_SimpleNew(3, dims, PyArray_BYTE);
128
128
    if (arr==NULL)
129
129
      return NULL;
130
130
    data = ((PyArrayObject *)arr)->data;