diff --git a/src/composite.c b/src/composite.c
index b7f2cf3..6904e75 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -29,212 +29,211 @@
#define MULDIV255(a, b, tmp) \
(tmp = (a) * (b) + 128, ((((tmp) >> 8) + (tmp)) >> 8))
-typedef struct
-{
- PyObject_HEAD
- Imaging image;
+typedef struct {
+ PyObject_HEAD;
+ Imaging image;
} ImagingObject;
-Imaging imaging_python_to_c(PyObject* obj)
+Imaging
+imaging_python_to_c(PyObject *obj)
{
- PyObject* im;
- Imaging image;
+ PyObject *im;
+ Imaging image;
- /* first, get the 'im' attribute */
- im = PyObject_GetAttrString(obj, "im");
- if (!im)
- return NULL;
-
- /* make sure 'im' is the right type */
- if (strcmp(im->ob_type->tp_name, "ImagingCore") != 0)
- {
- /* it's not -- raise an error and exit */
- PyErr_SetString(PyExc_TypeError, "image attribute 'im' is not a core Imaging type");
- return NULL;
- }
-
- image = ((ImagingObject*)im)->image;
- Py_DECREF(im);
- return image;
+ /* first, get the 'im' attribute */
+ im = PyObject_GetAttrString(obj, "im");
+ if (!im)
+ return NULL;
+
+ /* make sure 'im' is the right type */
+ if (strcmp(im->ob_type->tp_name, "ImagingCore") != 0) {
+ /* it's not -- raise an error and exit */
+ PyErr_SetString(PyExc_TypeError,
+ "image attribute 'im' is not a core Imaging type");
+ return NULL;
+ }
+
+ image = ((ImagingObject *)im)->image;
+ Py_DECREF(im);
+ return image;
}
/* the alpha_over function, in a form that can be called from C */
/* if xsize, ysize are negative, they are instead set to the size of the image in src */
/* returns NULL on error, dest on success. You do NOT need to decref the return! */
-PyObject* alpha_over(PyObject* dest, PyObject* src, PyObject* mask, int dx, int dy, int xsize, int ysize)
+PyObject *
+alpha_over(PyObject *dest, PyObject *src, PyObject *mask, int dx, int dy,
+ int xsize, int ysize)
{
- /* libImaging handles */
- Imaging imDest, imSrc, imMask;
- /* cached blend properties */
- int src_has_alpha, mask_offset, mask_stride;
- /* source position */
- int sx, sy;
- /* iteration variables */
- unsigned int x, y, i;
- /* temporary calculation variables */
- int tmp1, tmp2, tmp3;
-
- imDest = imaging_python_to_c(dest);
- imSrc = imaging_python_to_c(src);
- imMask = imaging_python_to_c(mask);
-
- if (!imDest || !imSrc || !imMask)
- return NULL;
-
- /* check the various image modes, make sure they make sense */
- if (strcmp(imDest->mode, "RGBA") != 0)
- {
- PyErr_SetString(PyExc_ValueError, "given destination image does not have mode \"RGBA\"");
- return NULL;
- }
-
- if (strcmp(imSrc->mode, "RGBA") != 0 && strcmp(imSrc->mode, "RGB") != 0)
- {
- PyErr_SetString(PyExc_ValueError, "given source image does not have mode \"RGBA\" or \"RGB\"");
- return NULL;
- }
-
- if (strcmp(imMask->mode, "RGBA") != 0 && strcmp(imMask->mode, "L") != 0)
- {
- PyErr_SetString(PyExc_ValueError, "given mask image does not have mode \"RGBA\" or \"L\"");
- return NULL;
- }
-
- /* make sure mask size matches src size */
- if (imSrc->xsize != imMask->xsize || imSrc->ysize != imMask->ysize)
- {
- PyErr_SetString(PyExc_ValueError, "mask and source image sizes do not match");
- return NULL;
- }
-
- /* set up flags for the src/mask type */
+ /* libImaging handles */
+ Imaging imDest, imSrc, imMask;
+ /* cached blend properties */
+ int src_has_alpha, mask_offset, mask_stride;
+ /* source position */
+ int sx, sy;
+ /* iteration variables */
+ unsigned int x, y, i;
+ /* temporary calculation variables */
+ int tmp1, tmp2, tmp3;
+
+ imDest = imaging_python_to_c(dest);
+ imSrc = imaging_python_to_c(src);
+ imMask = imaging_python_to_c(mask);
+
+ if (!imDest || !imSrc || !imMask)
+ return NULL;
+
+ /* check the various image modes, make sure they make sense */
+ if (strcmp(imDest->mode, "RGBA") != 0) {
+ PyErr_SetString(PyExc_ValueError,
+ "given destination image does not have mode \"RGBA\"");
+ return NULL;
+ }
+
+ if (strcmp(imSrc->mode, "RGBA") != 0 && strcmp(imSrc->mode, "RGB") != 0) {
+ PyErr_SetString(PyExc_ValueError,
+ "given source image does not have mode \"RGBA\" or \"RGB\"");
+ return NULL;
+ }
+
+ if (strcmp(imMask->mode, "RGBA") != 0 && strcmp(imMask->mode, "L") != 0) {
+ PyErr_SetString(PyExc_ValueError,
+ "given mask image does not have mode \"RGBA\" or \"L\"");
+ return NULL;
+ }
+
+ /* make sure mask size matches src size */
+ if (imSrc->xsize != imMask->xsize || imSrc->ysize != imMask->ysize) {
+ PyErr_SetString(PyExc_ValueError,
+ "mask and source image sizes do not match");
+ return NULL;
+ }
+
+ /* set up flags for the src/mask type */
src_has_alpha = (imSrc->pixelsize == 4 ? 1 : 0);
- /* how far into image the first alpha byte resides */
- mask_offset = (imMask->pixelsize == 4 ? 3 : 0);
- /* how many bytes to skip to get to the next alpha byte */
- mask_stride = imMask->pixelsize;
-
- /* handle negative/zero sizes appropriately */
- if (xsize <= 0 || ysize <= 0)
- {
- xsize = imSrc->xsize;
- ysize = imSrc->ysize;
- }
-
- /* set up the source position, size and destination position */
- /* handle negative dest pos */
- if (dx < 0)
- {
- sx = -dx;
- dx = 0;
- } else {
- sx = 0;
- }
-
- if (dy < 0)
- {
- sy = -dy;
- dy = 0;
- } else {
- sy = 0;
- }
-
- /* set up source dimensions */
- xsize -= sx;
- ysize -= sy;
-
- /* clip dimensions, if needed */
- if (dx + xsize > imDest->xsize)
- xsize = imDest->xsize - dx;
- if (dy + ysize > imDest->ysize)
- ysize = imDest->ysize - dy;
-
- /* check that there remains any blending to be done */
- if (xsize <= 0 || ysize <= 0)
- {
- /* nothing to do, return */
- return dest;
- }
-
- for (y = 0; y < ysize; y++)
- {
- UINT8* out = (UINT8*) imDest->image[dy + y] + dx*4;
- UINT8* outmask = (UINT8*) imDest->image[dy + y] + dx*4 + 3;
- UINT8* in = (UINT8*) imSrc->image[sy + y] + sx*(imSrc->pixelsize);
- UINT8* inmask = (UINT8*) imMask->image[sy + y] + sx*mask_stride + mask_offset;
-
- for (x = 0; x < xsize; x++)
- {
- /* special cases */
- if (*inmask == 255 || *outmask == 0)
- {
- *outmask = *inmask;
-
- *out = *in;
- out++, in++;
- *out = *in;
- out++, in++;
- *out = *in;
- out++, in++;
- } else if (*inmask == 0) {
- /* do nothing -- source is fully transparent */
- out += 3;
- in += 3;
- } else {
- /* general case */
- int alpha = *inmask + MULDIV255(*outmask, 255 - *inmask, tmp1);
- for (i = 0; i < 3; i++)
- {
- /* general case */
- *out = MULDIV255(*in, *inmask, tmp1) + MULDIV255(MULDIV255(*out, *outmask, tmp2), 255 - *inmask, tmp3);
- *out = (*out * 255) / alpha;
- out++, in++;
- }
-
- *outmask = alpha;
- }
-
- out++;
- if (src_has_alpha)
- in++;
- outmask += 4;
- inmask += mask_stride;
- }
- }
-
- return dest;
+ /* how far into image the first alpha byte resides */
+ mask_offset = (imMask->pixelsize == 4 ? 3 : 0);
+ /* how many bytes to skip to get to the next alpha byte */
+ mask_stride = imMask->pixelsize;
+
+ /* handle negative/zero sizes appropriately */
+ if (xsize <= 0 || ysize <= 0) {
+ xsize = imSrc->xsize;
+ ysize = imSrc->ysize;
+ }
+
+ /* set up the source position, size and destination position */
+ /* handle negative dest pos */
+ if (dx < 0) {
+ sx = -dx;
+ dx = 0;
+ }
+ else {
+ sx = 0;
+ }
+
+ if (dy < 0) {
+ sy = -dy;
+ dy = 0;
+ }
+ else {
+ sy = 0;
+ }
+
+ /* set up source dimensions */
+ xsize -= sx;
+ ysize -= sy;
+
+ /* clip dimensions, if needed */
+ if (dx + xsize > imDest->xsize)
+ xsize = imDest->xsize - dx;
+ if (dy + ysize > imDest->ysize)
+ ysize = imDest->ysize - dy;
+
+ /* check that there remains any blending to be done */
+ if (xsize <= 0 || ysize <= 0) {
+ /* nothing to do, return */
+ return dest;
+ }
+
+ for (y = 0; y < ysize; y++) {
+ UINT8 *out = (UINT8 *)imDest->image[dy + y] + dx * 4;
+ UINT8 *outmask = (UINT8 *)imDest->image[dy + y] + dx * 4 + 3;
+ UINT8 *in = (UINT8 *)imSrc->image[sy + y] + sx * (imSrc->pixelsize);
+ UINT8 *inmask = (UINT8 *)imMask->image[sy + y] + sx * mask_stride + mask_offset;
+
+ for (x = 0; x < xsize; x++) {
+ /* special cases */
+ if (*inmask == 255 || *outmask == 0) {
+ *outmask = *inmask;
+
+ *out = *in;
+ out++, in++;
+ *out = *in;
+ out++, in++;
+ *out = *in;
+ out++, in++;
+ }
+ else if (*inmask == 0) {
+ /* do nothing -- source is fully transparent */
+ out += 3;
+ in += 3;
+ }
+ else {
+ /* general case */
+ int alpha = *inmask + MULDIV255(*outmask, 255 - *inmask, tmp1);
+ for (i = 0; i < 3; i++) {
+ /* general case */
+ *out = MULDIV255(*in, *inmask, tmp1) +
+ MULDIV255(MULDIV255(*out, *outmask, tmp2), 255 - *inmask, tmp3);
+
+ *out = (*out * 255) / alpha;
+ out++, in++;
+ }
+
+ *outmask = alpha;
+ }
+
+ out++;
+ if (src_has_alpha)
+ in++;
+ outmask += 4;
+ inmask += mask_stride;
+ }
+ }
+
+ return dest;
}
/* wraps alpha_over so it can be called directly from python */
/* properly refs the return value when needed: you DO need to decref the return */
-PyObject* alpha_over_wrap(PyObject* self, PyObject* args)
+PyObject *
+alpha_over_wrap(PyObject *self, PyObject *args)
{
- /* raw input python variables */
- PyObject* dest, * src, * pos, * mask;
- /* destination position and size */
- int dx, dy, xsize, ysize;
-
- if (!PyArg_ParseTuple(args, "OOOO", &dest, &src, &pos, &mask))
- return NULL;
-
- /* destination position read */
- if (!PyArg_ParseTuple(pos, "iiii", &dx, &dy, &xsize, &ysize))
- {
- /* try again, but this time try to read a point */
- xsize = 0;
- ysize = 0;
- if (!PyArg_ParseTuple(pos, "ii", &dx, &dy))
- {
- PyErr_SetString(PyExc_TypeError, "given blend destination rect is not valid");
- return NULL;
- }
- }
-
- PyObject* ret = alpha_over(dest, src, mask, dx, dy, xsize, ysize);
- if (ret == dest)
- {
- /* Python needs us to own our return value */
- Py_INCREF(dest);
- }
- return ret;
+ /* raw input python variables */
+ PyObject *dest, *src, *pos, *mask;
+ /* destination position and size */
+ int dx, dy, xsize, ysize;
+
+ if (!PyArg_ParseTuple(args, "OOOO", &dest, &src, &pos, &mask))
+ return NULL;
+
+ /* destination position read */
+ if (!PyArg_ParseTuple(pos, "iiii", &dx, &dy, &xsize, &ysize)) {
+ /* try again, but this time try to read a point */
+ xsize = 0;
+ ysize = 0;
+ if (!PyArg_ParseTuple(pos, "ii", &dx, &dy)) {
+ PyErr_SetString(PyExc_TypeError,
+ "given blend destination rect is not valid");
+ return NULL;
+ }
+ }
+
+ PyObject *ret = alpha_over(dest, src, mask, dx, dy, xsize, ysize);
+ if (ret == dest) {
+ /* Python needs us to own our return value */
+ Py_INCREF(dest);
+ }
+ return ret;
}
diff --git a/src/iterate.c b/src/iterate.c
index 7a5d1ef..c7676d6 100644
--- a/src/iterate.c
+++ b/src/iterate.c
@@ -1,3 +1,20 @@
+/*
+ * This file is part of the Minecraft Overviewer.
+ *
+ * Minecraft Overviewer is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Minecraft Overviewer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with the Overviewer. If not, see .
+ */
+
#include "overviewer.h"
#include
@@ -12,17 +29,18 @@ static inline int isTransparent(unsigned char b) {
}
// helper to handle alpha_over calls involving a texture tuple
-static inline PyObject* texture_alpha_over(PyObject* dest, PyObject* t, int imgx, int imgy)
+static inline PyObject *
+texture_alpha_over(PyObject *dest, PyObject *t, int imgx, int imgy)
{
- PyObject* src, * mask;
-
- src = PyTuple_GET_ITEM(t, 0);
- mask = PyTuple_GET_ITEM(t, 1);
- if (mask == Py_None) {
- mask = src;
- }
-
- return alpha_over(dest, src, mask, imgx, imgy, 0, 0);
+ PyObject* src, * mask;
+
+ src = PyTuple_GET_ITEM(t, 0);
+ mask = PyTuple_GET_ITEM(t, 1);
+ if (mask == Py_None) {
+ mask = src;
+ }
+
+ return alpha_over(dest, src, mask, imgx, imgy, 0, 0);
}
// TODO triple check this to make sure reference counting is correct
diff --git a/src/main.c b/src/main.c
index 29fa4e6..7f56918 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,18 +1,35 @@
+/*
+ * This file is part of the Minecraft Overviewer.
+ *
+ * Minecraft Overviewer is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Minecraft Overviewer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with the Overviewer. If not, see .
+ */
+
#include "overviewer.h"
#include
static PyMethodDef COverviewerMethods[] = {
- {"alpha_over", alpha_over_wrap, METH_VARARGS,
- "alpha over composite function"},
+ {"alpha_over", alpha_over_wrap, METH_VARARGS,
+ "alpha over composite function"},
{"render_loop", chunk_render, METH_VARARGS,
- "Renders stuffs"},
- {NULL, NULL, 0, NULL} /* Sentinel */
+ "Renders stuffs"},
+ {NULL, NULL, 0, NULL} /* Sentinel */
};
PyMODINIT_FUNC
initc_overviewer(void)
{
- (void) Py_InitModule("c_overviewer", COverviewerMethods);
- import_array(); // for numpy
+ (void)Py_InitModule("c_overviewer", COverviewerMethods);
+ import_array(); // for numpy
}
diff --git a/src/overviewer.h b/src/overviewer.h
index 692f5d4..5746b53 100644
--- a/src/overviewer.h
+++ b/src/overviewer.h
@@ -29,11 +29,12 @@
#include
/* in composite.c */
-Imaging imaging_python_to_c(PyObject* obj);
-PyObject* alpha_over(PyObject* dest, PyObject* src, PyObject* mask, int dx, int dy, int xsize, int ysize);
-PyObject* alpha_over_wrap(PyObject* self, PyObject* args);
+Imaging imaging_python_to_c(PyObject *obj);
+PyObject *alpha_over(PyObject *dest, PyObject *src, PyObject *mask, int dx,
+ int dy, int xsize, int ysize);
+PyObject *alpha_over_wrap(PyObject *self, PyObject *args);
/* in iterate.c */
-PyObject* chunk_render(PyObject *self, PyObject *args);
+PyObject *chunk_render(PyObject *self, PyObject *args);
#endif /* __OVERVIEWER_H_INCLUDED__ */