LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

changed my code style to be more in line with eminence's (and PEP 7), added GPL notice

Browse Source
This commit is contained in:
Aaron Griffith
2011-03-08 19:58:09 -05:00
parent 07dd219d20
commit 5852c17ec8
4 changed files with 247 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/composite.c
View File

@@ -29,15 +29,15 @@
#define MULDIV255(a, b, tmp) \ #define MULDIV255(a, b, tmp) \
(tmp = (a) * (b) + 128, ((((tmp) >> 8) + (tmp)) >> 8)) (tmp = (a) * (b) + 128, ((((tmp) >> 8) + (tmp)) >> 8))
typedef struct typedef struct {
{ PyObject_HEAD;
PyObject_HEAD
Imaging image; Imaging image;
} ImagingObject; } ImagingObject;
Imaging imaging_python_to_c(PyObject* obj) Imaging
imaging_python_to_c(PyObject *obj)
{ {
PyObject* im; PyObject *im;
Imaging image; Imaging image;
/* first, get the 'im' attribute */ /* first, get the 'im' attribute */
@@ -46,14 +46,14 @@ Imaging imaging_python_to_c(PyObject* obj)
return NULL; return NULL;
/* make sure 'im' is the right type */ /* make sure 'im' is the right type */
if (strcmp(im->ob_type->tp_name, "ImagingCore") != 0) if (strcmp(im->ob_type->tp_name, "ImagingCore") != 0) {
{
/* it's not -- raise an error and exit */ /* it's not -- raise an error and exit */
PyErr_SetString(PyExc_TypeError, "image attribute 'im' is not a core Imaging type"); PyErr_SetString(PyExc_TypeError,
"image attribute 'im' is not a core Imaging type");
return NULL; return NULL;
} }
image = ((ImagingObject*)im)->image; image = ((ImagingObject *)im)->image;
Py_DECREF(im); Py_DECREF(im);
return image; return image;
} }
@@ -61,7 +61,9 @@ Imaging imaging_python_to_c(PyObject* obj)
/* the alpha_over function, in a form that can be called from C */ /* 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 */ /* 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! */ /* 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 */ /* libImaging handles */
Imaging imDest, imSrc, imMask; Imaging imDest, imSrc, imMask;
@@ -82,28 +84,28 @@ PyObject* alpha_over(PyObject* dest, PyObject* src, PyObject* mask, int dx, int
return NULL; return NULL;
/* check the various image modes, make sure they make sense */ /* check the various image modes, make sure they make sense */
if (strcmp(imDest->mode, "RGBA") != 0) if (strcmp(imDest->mode, "RGBA") != 0) {
{ PyErr_SetString(PyExc_ValueError,
PyErr_SetString(PyExc_ValueError, "given destination image does not have mode \"RGBA\""); "given destination image does not have mode \"RGBA\"");
return NULL; return NULL;
} }
if (strcmp(imSrc->mode, "RGBA") != 0 && strcmp(imSrc->mode, "RGB") != 0) if (strcmp(imSrc->mode, "RGBA") != 0 && strcmp(imSrc->mode, "RGB") != 0) {
{ PyErr_SetString(PyExc_ValueError,
PyErr_SetString(PyExc_ValueError, "given source image does not have mode \"RGBA\" or \"RGB\""); "given source image does not have mode \"RGBA\" or \"RGB\"");
return NULL; return NULL;
} }
if (strcmp(imMask->mode, "RGBA") != 0 && strcmp(imMask->mode, "L") != 0) if (strcmp(imMask->mode, "RGBA") != 0 && strcmp(imMask->mode, "L") != 0) {
{ PyErr_SetString(PyExc_ValueError,
PyErr_SetString(PyExc_ValueError, "given mask image does not have mode \"RGBA\" or \"L\""); "given mask image does not have mode \"RGBA\" or \"L\"");
return NULL; return NULL;
} }
/* make sure mask size matches src size */ /* make sure mask size matches src size */
if (imSrc->xsize != imMask->xsize || imSrc->ysize != imMask->ysize) if (imSrc->xsize != imMask->xsize || imSrc->ysize != imMask->ysize) {
{ PyErr_SetString(PyExc_ValueError,
PyErr_SetString(PyExc_ValueError, "mask and source image sizes do not match"); "mask and source image sizes do not match");
return NULL; return NULL;
} }
@@ -115,27 +117,26 @@ PyObject* alpha_over(PyObject* dest, PyObject* src, PyObject* mask, int dx, int
mask_stride = imMask->pixelsize; mask_stride = imMask->pixelsize;
/* handle negative/zero sizes appropriately */ /* handle negative/zero sizes appropriately */
if (xsize <= 0 || ysize <= 0) if (xsize <= 0 || ysize <= 0) {
{
xsize = imSrc->xsize; xsize = imSrc->xsize;
ysize = imSrc->ysize; ysize = imSrc->ysize;
} }
/* set up the source position, size and destination position */ /* set up the source position, size and destination position */
/* handle negative dest pos */ /* handle negative dest pos */
if (dx < 0) if (dx < 0) {
{
sx = -dx; sx = -dx;
dx = 0; dx = 0;
} else { }
else {
sx = 0; sx = 0;
} }
if (dy < 0) if (dy < 0) {
{
sy = -dy; sy = -dy;
dy = 0; dy = 0;
} else { }
else {
sy = 0; sy = 0;
} }
@@ -150,24 +151,20 @@ PyObject* alpha_over(PyObject* dest, PyObject* src, PyObject* mask, int dx, int
ysize = imDest->ysize - dy; ysize = imDest->ysize - dy;
/* check that there remains any blending to be done */ /* check that there remains any blending to be done */
if (xsize <= 0 || ysize <= 0) if (xsize <= 0 || ysize <= 0) {
{
/* nothing to do, return */ /* nothing to do, return */
return dest; return dest;
} }
for (y = 0; y < ysize; y++) for (y = 0; y < ysize; y++) {
{ UINT8 *out = (UINT8 *)imDest->image[dy + y] + dx * 4;
UINT8* out = (UINT8*) imDest->image[dy + y] + dx*4; UINT8 *outmask = (UINT8 *)imDest->image[dy + y] + dx * 4 + 3;
UINT8* outmask = (UINT8*) imDest->image[dy + y] + dx*4 + 3; UINT8 *in = (UINT8 *)imSrc->image[sy + y] + sx * (imSrc->pixelsize);
UINT8* in = (UINT8*) imSrc->image[sy + y] + sx*(imSrc->pixelsize); UINT8 *inmask = (UINT8 *)imMask->image[sy + y] + sx * mask_stride + mask_offset;
UINT8* inmask = (UINT8*) imMask->image[sy + y] + sx*mask_stride + mask_offset;
for (x = 0; x < xsize; x++) for (x = 0; x < xsize; x++) {
{
/* special cases */ /* special cases */
if (*inmask == 255 || *outmask == 0) if (*inmask == 255 || *outmask == 0) {
{
*outmask = *inmask; *outmask = *inmask;
*out = *in; *out = *in;
@@ -176,17 +173,20 @@ PyObject* alpha_over(PyObject* dest, PyObject* src, PyObject* mask, int dx, int
out++, in++; out++, in++;
*out = *in; *out = *in;
out++, in++; out++, in++;
} else if (*inmask == 0) { }
else if (*inmask == 0) {
/* do nothing -- source is fully transparent */ /* do nothing -- source is fully transparent */
out += 3; out += 3;
in += 3; in += 3;
} else { }
else {
/* general case */ /* general case */
int alpha = *inmask + MULDIV255(*outmask, 255 - *inmask, tmp1); int alpha = *inmask + MULDIV255(*outmask, 255 - *inmask, tmp1);
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++) {
{
/* general case */ /* general case */
*out = MULDIV255(*in, *inmask, tmp1) + MULDIV255(MULDIV255(*out, *outmask, tmp2), 255 - *inmask, tmp3); *out = MULDIV255(*in, *inmask, tmp1) +
MULDIV255(MULDIV255(*out, *outmask, tmp2), 255 - *inmask, tmp3);
*out = (*out * 255) / alpha; *out = (*out * 255) / alpha;
out++, in++; out++, in++;
} }
@@ -207,10 +207,11 @@ PyObject* alpha_over(PyObject* dest, PyObject* src, PyObject* mask, int dx, int
/* wraps alpha_over so it can be called directly from python */ /* 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 */ /* 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 */ /* raw input python variables */
PyObject* dest, * src, * pos, * mask; PyObject *dest, *src, *pos, *mask;
/* destination position and size */ /* destination position and size */
int dx, dy, xsize, ysize; int dx, dy, xsize, ysize;
@@ -218,21 +219,19 @@ PyObject* alpha_over_wrap(PyObject* self, PyObject* args)
return NULL; return NULL;
/* destination position read */ /* destination position read */
if (!PyArg_ParseTuple(pos, "iiii", &dx, &dy, &xsize, &ysize)) if (!PyArg_ParseTuple(pos, "iiii", &dx, &dy, &xsize, &ysize)) {
{
/* try again, but this time try to read a point */ /* try again, but this time try to read a point */
xsize = 0; xsize = 0;
ysize = 0; ysize = 0;
if (!PyArg_ParseTuple(pos, "ii", &dx, &dy)) if (!PyArg_ParseTuple(pos, "ii", &dx, &dy)) {
{ PyErr_SetString(PyExc_TypeError,
PyErr_SetString(PyExc_TypeError, "given blend destination rect is not valid"); "given blend destination rect is not valid");
return NULL; return NULL;
} }
} }
PyObject* ret = alpha_over(dest, src, mask, dx, dy, xsize, ysize); PyObject *ret = alpha_over(dest, src, mask, dx, dy, xsize, ysize);
if (ret == dest) if (ret == dest) {
{
/* Python needs us to own our return value */ /* Python needs us to own our return value */
Py_INCREF(dest); Py_INCREF(dest);
} }

20
src/iterate.c
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
#include "overviewer.h" #include "overviewer.h"
#include <numpy/arrayobject.h> #include <numpy/arrayobject.h>
@@ -12,7 +29,8 @@ static inline int isTransparent(unsigned char b) {
} }
// helper to handle alpha_over calls involving a texture tuple // 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; PyObject* src, * mask;

19
src/main.c
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
#include "overviewer.h" #include "overviewer.h"
#include <numpy/arrayobject.h> #include <numpy/arrayobject.h>
@@ -13,6 +30,6 @@ static PyMethodDef COverviewerMethods[] = {
PyMODINIT_FUNC PyMODINIT_FUNC
initc_overviewer(void) initc_overviewer(void)
{ {
(void) Py_InitModule("c_overviewer", COverviewerMethods); (void)Py_InitModule("c_overviewer", COverviewerMethods);
import_array(); // for numpy import_array(); // for numpy
} }

9
src/overviewer.h
View File

@@ -29,11 +29,12 @@
#include <Imaging.h> #include <Imaging.h>
/* in composite.c */ /* in composite.c */
Imaging imaging_python_to_c(PyObject* obj); 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(PyObject *dest, PyObject *src, PyObject *mask, int dx,
PyObject* alpha_over_wrap(PyObject* self, PyObject* args); int dy, int xsize, int ysize);
PyObject *alpha_over_wrap(PyObject *self, PyObject *args);
/* in iterate.c */ /* in iterate.c */
PyObject* chunk_render(PyObject *self, PyObject *args); PyObject *chunk_render(PyObject *self, PyObject *args);
#endif /* __OVERVIEWER_H_INCLUDED__ */ #endif /* __OVERVIEWER_H_INCLUDED__ */