pngtile: comparison python/pypngtile.pyx

equal deleted inserted replaced

-:1c317e0628a7
+:0bf7878bdf5c
 struct pt_tile_info :
 size_t width, height
 size_t x, y
 int zoom
+ctypedef pt_image_info* const_image_info_ptr "const struct pt_image_info *"
 ## functions
-int pt_image_open (pt_image **image_ptr, pt_ctx *ctx, char *png_path, int cache_mode)
+int pt_image_open (pt_image **image_ptr, pt_ctx *ctx, char *png_path, int cache_mode) nogil
-int pt_image_info_ "pt_image_info" (pt_image *image, pt_image_info **info_ptr)
+int pt_image_info_ "pt_image_info" (pt_image *image, pt_image_info **info_ptr) nogil
-int pt_image_status (pt_image *image)
+int pt_image_status (pt_image *image) nogil
-int pt_image_load (pt_image *image)
+int pt_image_load (pt_image *image) nogil
-int pt_image_update (pt_image *image, pt_image_params *params)
+int pt_image_update (pt_image *image, pt_image_params *params) nogil
-int pt_image_tile_file (pt_image *image, pt_tile_info *info, stdio.FILE *out)
+int pt_image_tile_file (pt_image *image, pt_tile_info *info, stdio.FILE *out) nogil
-int pt_image_tile_mem (pt_image *image, pt_tile_info *info, char **buf_ptr, size_t *len_ptr)
+int pt_image_tile_mem (pt_image *image, pt_tile_info *info, char **buf_ptr, size_t *len_ptr) nogil
-void pt_image_destroy (pt_image *image)
+void pt_image_destroy (pt_image *image) nogil
 # error code -> name
 char* pt_strerror (int err)
 ## constants
 CACHE_NONE      = PT_CACHE_NONE
 CACHE_STALE     = PT_CACHE_STALE
 CACHE_INCOMPAT  = PT_CACHE_INCOMPAT
 class Error (BaseException) :
-pass
+"""
+Base class for errors raised by pypngtile.
-# raise Error if the given return value is <0
+"""
-cdef int trap_err (char *op, int ret) except -1 :
-if ret < 0 :
+def __init__ (self, func, err) :
-raise Error("%s: %s: %s" % (op, pt_strerror(ret), strerror(errno)))
+super(Error, self).__init__("%s: %s: %s" % (func, pt_strerror(err), strerror(errno)))
-else :
-return ret
 cdef class Image :
 """
 An image file on disk (.png) and an associated .cache file.
 cdef pt_image *image
 # open the pt_image
 def __cinit__ (self, char *path, int mode = 0) :
-trap_err("pt_image_open",
+cdef int err
-pt_image_open(&self.image, NULL, path, mode)
-)
+# open
+with nogil :
+# XXX: I hope use of path doesn't break...
+err = pt_image_open(&self.image, NULL, path, mode)
+if err :
+raise Error("pt_image_open", err)
 def info (self) :
 """
 Return a dictionary containing various information about the image.
 cache_mtime         - last modification timestamp for cache file
 cache_bytes         - size of cache file in bytes
 cache_blocks        - size of cache file in disk blocks - 512 bytes / block
 """
-cdef pt_image_info *info
+cdef const_image_info_ptr infop
+cdef int err
-trap_err("pt_image_info",
-pt_image_info_(self.image, &info)
+with nogil :
-)
+err = pt_image_info_(self.image, &infop)
+if err :
+raise Error("pt_image_info", err)
 # return as a struct
-return info[0]
+return infop[0]
 def status (self) :
 """
 Return a code describing the status of the underlying cache file.
 CACHE_NONE          - the cache file does not exist
 CACHE_STALE         - the cache file exists, but is older than the source image
 CACHE_INCOMPAT      - the cache file exists, but is incompatible with this version of the library
 """
-return trap_err("pt_image_status",
+cdef int ret
-pt_image_status(self.image)
-)
+with nogil :
+ret = pt_image_status(self.image)
+if ret :
+raise Error("pt_image_status", ret)
+return ret
 def open (self) :
 """
 Open the underlying cache file for reading, if available.
 """
-return trap_err("pt_image_load",
+cdef int err
-pt_image_load(self.image)
-)
+with nogil :
+err = pt_image_load(self.image)
+if err :
+raise Error("pt_image_load", err)
 def update (self, background_color = None) :
 """
 Update the underlying cache file from the source image.
 Requires that the Image was opened using OPEN_UPDATE.
 """
 cdef pt_image_params params
 cdef char *bgcolor
+cdef int err
 memset(&params, 0, sizeof(params))
 # params
 if background_color :
 # cast
 # decode
 memcpy(params.background_color, bgcolor, len(bgcolor))
 # run update
-trap_err("pt_image_update",
+with nogil :
-pt_image_update(self.image, &params)
+err = pt_image_update(self.image, &params)
-)
+if err :
+raise Error("pt_image_update", err)
 def tile_file (self, size_t width, size_t height, size_t x, size_t y, int zoom, object out) :
 """
 Render a region of the source image as a PNG tile to the given output file.
 Note that the given file object MUST be a *real* stdio FILE*, not a fake Python object.
 """
 cdef stdio.FILE *outf
 cdef pt_tile_info ti
+cdef int err
 memset(&ti, 0, sizeof(ti))
 # convert to FILE
 if not PyFile_Check(out) :
 ti.x = x
 ti.y = y
 ti.zoom = zoom
 # render
-trap_err("pt_image_tile_file",
+with nogil :
-pt_image_tile_file(self.image, &ti, outf)
+err = pt_image_tile_file(self.image, &ti, outf)
-)
+if err :
+raise Error("pt_image_tile_file", err)
 def tile_mem (self, size_t width, size_t height, size_t x, size_t y, int zoom) :
 """
 Render a region of the source image as a PNG tile, and return the PNG data a a string.
 """
 cdef pt_tile_info ti
 cdef char *buf
 cdef size_t len
+cdef int err
 memset(&ti, 0, sizeof(ti))
 # pack params
 ti.width = width
 ti.x = x
 ti.y = y
 ti.zoom = zoom
 # render and return via buf/len
-trap_err("pt_image_tile_mem",
+with nogil :
-pt_image_tile_mem(self.image, &ti, &buf, &len)
+err = pt_image_tile_mem(self.image, &ti, &buf, &len)
-)
+if err :
+raise Error("pt_image_tile_mem", err)
 # copy buffer as str...
 data = python_string.PyString_FromStringAndSize(buf, len)
 # drop buffer...

changeset 91	0bf7878bdf5c
parent 87	ecd87b41e884
child 104	b5ae988c78b8