#include "../gfxdevice.h"
#include "../gfxtools.h"
#include "../mem.h"
-#define PNG_INLINE_EXPORTS
#include "../types.h"
-#include "../png.c"
+#include "../png.h"
#include "../log.h"
#include "render.h"
gfxmatrix_t*matrix;
gfxcxform_t*cxform;
RGBA*gradient;
- char clip_or_radial;
+ char linear_or_radial;
} fillinfo_t;
if(col.a!=255) {
int ainv = 255-col.a;
- col.r = (col.r*col.a)>>8;
- col.g = (col.g*col.a)>>8;
- col.b = (col.b*col.a)>>8;
+ col.r = (col.r*col.a)/255;
+ col.g = (col.g*col.a)/255;
+ col.b = (col.b*col.a)/255;
do {
if(z[bitpos]&bit) {
- line[x].r = ((line[x].r*ainv)>>8)+col.r;
- line[x].g = ((line[x].g*ainv)>>8)+col.g;
- line[x].b = ((line[x].b*ainv)>>8)+col.b;
+ line[x].r = ((line[x].r*ainv)/255)+col.r;
+ line[x].g = ((line[x].g*ainv)/255)+col.g;
+ line[x].b = ((line[x].b*ainv)/255)+col.b;
//line[x].a = 255;
- line[x].a = ((line[x].a*ainv)>>8)+col.a;
+ line[x].a = ((line[x].a*ainv)/255)+col.a;
}
bit <<= 1;
if(!bit) {
int yy = (int)(yy1 - x * yinc1);
int ainv;
- if(info->clip_or_radial) {
+ if(info->linear_or_radial) {
if(xx<0) xx=0;
if(xx>=b->width) xx = b->width-1;
if(yy<0) yy=0;
ainv = 255-col.a;
/* needs bitmap with premultiplied alpha */
- line[x].r = ((line[x].r*ainv)>>8)+col.r;
- line[x].g = ((line[x].g*ainv)>>8)+col.g;
- line[x].b = ((line[x].b*ainv)>>8)+col.b;
+ line[x].r = ((line[x].r*ainv)/255)+col.r;
+ line[x].g = ((line[x].g*ainv)/255)+col.g;
+ line[x].b = ((line[x].b*ainv)/255)+col.b;
line[x].a = 255;
}
bit <<= 1;
/* x direction equals y direction */
return;
}
+
det = 1.0/det;
double xx1 = ( (-m->tx) * m->m11 - (y - m->ty) * m->m10) * det;
double yy1 = (- (-m->tx) * m->m01 + (y - m->ty) * m->m00) * det;
int ainv;
int pos = 0;
- if(info->clip_or_radial) {
+ if(info->linear_or_radial) {
double xx = xx1 + x * xinc1;
double yy = yy1 + y * yinc1;
double r = sqrt(xx*xx + yy*yy);
ainv = 255-col.a;
/* needs bitmap with premultiplied alpha */
- line[x].r = ((line[x].r*ainv)>>8)+col.r;
- line[x].g = ((line[x].g*ainv)>>8)+col.g;
- line[x].b = ((line[x].b*ainv)>>8)+col.b;
+ line[x].r = ((line[x].r*ainv)/255)+col.r;
+ line[x].g = ((line[x].g*ainv)/255)+col.g;
+ line[x].b = ((line[x].b*ainv)/255)+col.b;
line[x].a = 255;
}
bit <<= 1;
m2.m00 *= i->zoom; m2.m01 *= i->zoom; m2.tx *= i->zoom;
m2.m10 *= i->zoom; m2.m11 *= i->zoom; m2.ty *= i->zoom;
- info.clip_or_radial = type == gfxgradient_radial;
+ info.linear_or_radial = type == gfxgradient_radial;
int pos = 0;
gfxcolor_t color = {0,0,0,0};
int d= 256/depth;
char*str = (char*)malloc(img->width*img->height*4 + 500 + 16*depth*depth*depth);
char*p = str;
- p+= sprintf(p, "static char *noname[] = {\n\"%d %d 262144 3\",\n");
+ p+= sprintf(p, "static char *noname[] = {\n\"%d %d 262144 3\",\n", img->width, img->height);
int r,g,b;
for(r=0;r<depth;r++)
for(g=0;g<depth;g++)