Merge branch 'master' into py-package

Conflicts:
	overviewerConfig.js
	overviewer_core/data/overviewerConfig.js
	setup.py
	web_assets/overviewerConfig.js

overviewer_core/src/iterate.c

@@ -24,43 +24,41 @@ static PyObject *special_blocks = NULL;
 static PyObject *specialblockmap = NULL;
 static PyObject *transparent_blocks = NULL;
 
-int init_chunk_render(void) {
+PyObject *init_chunk_render(PyObject *self, PyObject *args) {
    
-    /* 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;
+    /* this function only needs to be called once, anything more is an
+     * error... */
+    if (blockmap) {
+        PyErr_SetString(PyExc_RuntimeError, "init_chunk_render should only be called once per process.");
+        return NULL;
+    }
 
     textures = PyImport_ImportModule("overviewer_core.textures");
     /* ensure none of these pointers are NULL */    
     if ((!textures)) {
-        fprintf(stderr, "\ninit_chunk_render failed to load; textures\n");
-        PyErr_Print();
-        return 1;
+        return NULL;
     }
 
     chunk_mod = PyImport_ImportModule("overviewer_core.chunk");
     /* ensure none of these pointers are NULL */    
     if ((!chunk_mod)) {
-        fprintf(stderr, "\ninit_chunk_render failed to load; chunk\n");
-        PyErr_Print();
-        return 1;
+        return NULL;
     }
     
     blockmap = PyObject_GetAttrString(textures, "blockmap");
+    if (!blockmap)
+        return NULL;
     special_blocks = PyObject_GetAttrString(textures, "special_blocks");
+    if (!special_blocks)
+        return NULL;
     specialblockmap = PyObject_GetAttrString(textures, "specialblockmap");
+    if (!specialblockmap)
+        return NULL;
     transparent_blocks = PyObject_GetAttrString(chunk_mod, "transparent_blocks");
+    if (!transparent_blocks)
+        return NULL;
     
-    /* ensure none of these pointers are NULL */    
-    if ((!transparent_blocks) || (!blockmap) || (!special_blocks) || (!specialblockmap)) {
-        fprintf(stderr, "\ninit_chunk_render failed\n");
-        PyErr_Print();
-        return 1;
-    }
-
-    return 0;
-
+    Py_RETURN_NONE;
 }
 
 int
@@ -310,7 +308,7 @@ chunk_render(PyObject *self, PyObject *args) {
     PyObject *t = NULL;
     
     if (!PyArg_ParseTuple(args, "OOiiO",  &state.self, &state.img, &xoff, &yoff, &blockdata_expanded))
-        return Py_BuildValue("i", "-1");
+        return NULL;
     
     /* fill in important modules */
     state.textures = textures;
@@ -435,7 +433,7 @@ chunk_render(PyObject *self, PyObject *args) {
                 blockid = NULL;
             }
         }
-    } 
+    }
 
     /* free up the rendermode info */
     rendermode->finish(rm_data, &state);

overviewer_core/src/main.c

@@ -26,6 +26,8 @@ static PyMethodDef COverviewerMethods[] = {
     {"alpha_over", alpha_over_wrap, METH_VARARGS,
      "alpha over composite function"},
     
+    {"init_chunk_render", init_chunk_render, METH_VARARGS,
+     "Initializes the stuffs renderer."},
     {"render_loop", chunk_render, METH_VARARGS,
      "Renders stuffs"},
     
@@ -53,12 +55,6 @@ 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?
-    }
     
     init_endian();
 }

overviewer_core/src/overviewer.h

@@ -26,7 +26,7 @@
 
 // increment this value if you've made a change to the c extesion
 // and want to force users to rebuild
-#define OVERVIEWER_EXTENSION_VERSION 5
+#define OVERVIEWER_EXTENSION_VERSION 6
 
 /* Python PIL, and numpy headers */
 #include <Python.h>
@@ -76,7 +76,7 @@ typedef struct {
     PyObject *left_blocks;
     PyObject *right_blocks;
 } RenderState;
-int init_chunk_render(void);
+PyObject *init_chunk_render(PyObject *self, PyObject *args);
 int is_transparent(unsigned char b);
 PyObject *chunk_render(PyObject *self, PyObject *args);