Merged in dtt-c-render

Conflicts:
	src/overviewer.h

src/composite.c

@@ -253,6 +253,7 @@ alpha_over_wrap(PyObject *self, PyObject *args)
     /* destination position read */
     if (!PyArg_ParseTuple(pos, "iiii", &dx, &dy, &xsize, &ysize)) {
         /* try again, but this time try to read a point */
+        PyErr_Clear();
         xsize = 0;
         ysize = 0;
         if (!PyArg_ParseTuple(pos, "ii", &dx, &dy)) {

src/iterate.c

@@ -22,6 +22,40 @@
 /* macro for getting blockID from a chunk of memory */
 #define getBlock(blockThing, x,y,z) (*(unsigned char *)(PyArray_GETPTR3(blockThing, (x), (y), (z))))
 
+static PyObject *textures = NULL;
+static PyObject *chunk_mod = NULL;
+static PyObject *blockmap = NULL;
+static PyObject *special_blocks = NULL;
+static PyObject *specialblockmap = NULL;
+static PyObject *transparent_blocks = NULL;
+
+int init_chunk_render(void) {
+   
+    /* if blockmap (or any of these) is not NULL, then that means that we've 
+     * somehow called this function twice.  error out so we can notice this
+     * */
+    if (blockmap) return 1;
+
+    textures = PyImport_ImportModule("textures");
+    chunk_mod = PyImport_ImportModule("chunk");
+
+    blockmap = PyObject_GetAttrString(textures, "blockmap");
+    special_blocks = PyObject_GetAttrString(textures, "special_blocks");
+    specialblockmap = PyObject_GetAttrString(textures, "specialblockmap");
+    transparent_blocks = PyObject_GetAttrString(chunk_mod, "transparent_blocks");
+    
+    /* ensure none of these pointers are NULL */    
+    if ((!transparent_blocks) || (!blockmap) || (!special_blocks) || (!specialblockmap)){
+        fprintf(stderr, "\ninit_chunk_render failed\n");
+        return 1;
+    }
+
+    Py_DECREF(textures);
+    Py_DECREF(chunk_mod);
+    return 0;
+
+}
+
 static inline int isTransparent(PyObject* tup, unsigned char b) {
     PyObject *block = PyInt_FromLong(b);
     int ret = PySequence_Contains(tup, block);
@@ -302,8 +336,6 @@ chunk_render(PyObject *self, PyObject *args) {
     
     PyObject *blocks_py;
     
-    PyObject *textures, *blockmap, *special_blocks, *specialblockmap, *chunk_mod, *transparent_blocks;
-    
     int imgx, imgy;
     int x, y, z;
 
@@ -331,23 +363,6 @@ chunk_render(PyObject *self, PyObject *args) {
     PyObject *right_blocks = PyObject_GetAttrString(chunk, "right_blocks");
     */
     
-    textures = PyImport_ImportModule("textures");
-    chunk_mod = PyImport_ImportModule("chunk");
-
-    /* TODO can these be global static?  these don't change during program execution */
-    blockmap = PyObject_GetAttrString(textures, "blockmap");
-    special_blocks = PyObject_GetAttrString(textures, "special_blocks");
-    specialblockmap = PyObject_GetAttrString(textures, "specialblockmap");
-    transparent_blocks = PyObject_GetAttrString(chunk_mod, "transparent_blocks");
-    if (transparent_blocks == NULL) {
-        PyErr_SetString(PyExc_ValueError,
-                        "transparent_blocks is NULL");
-        return NULL;
-    }
-        
-
-    Py_DECREF(textures);
-    Py_DECREF(chunk_mod);
     
     for (x = 15; x > -1; x--) {
         for (y = 0; y < 16; y++) {
@@ -427,9 +442,6 @@ chunk_render(PyObject *self, PyObject *args) {
     } 
 
     Py_DECREF(blocks_py);
-    Py_DECREF(blockmap);
-    Py_DECREF(special_blocks);
-    Py_DECREF(specialblockmap);
 
     return Py_BuildValue("i",2);
 }

src/main.c

@@ -35,4 +35,10 @@ initc_overviewer(void)
     (void)Py_InitModule("c_overviewer", COverviewerMethods);
     /* for numpy */
     import_array();
+
+    /* initialize some required variables in iterage.c */
+    if (init_chunk_render()) {
+        fprintf(stderr, "failed to init_chunk_render\n");
+        exit(1); // TODO better way to indicate error?
+    }
 }

src/overviewer.h

@@ -38,5 +38,6 @@ PyObject *brightness(PyObject *img, double factor);
 /* in iterate.c */
 PyObject *chunk_render(PyObject *self, PyObject *args);
 PyObject *chunk_render_lighting(PyObject *self, PyObject *args);
+int init_chunk_render(void);
 
 #endif /* __OVERVIEWER_H_INCLUDED__ */