755 |
|
dp = ourdata - 1; |
756 |
|
for (y = 0; y < ymax; y++) { |
757 |
|
getscan(y); |
758 |
– |
normcolrs(scanline, xmax, scale); |
758 |
|
add2icon(y, scanline); |
759 |
+ |
normcolrs(scanline, xmax, scale); |
760 |
|
err = 0; |
761 |
|
for (x = 0; x < xmax; x++) { |
762 |
|
if (!(x&7)) |
782 |
|
static short cerr[ICONSIZ]; |
783 |
|
static int ynext; |
784 |
|
static char *dp; |
785 |
+ |
double sf; |
786 |
+ |
COLOR col; |
787 |
|
register int err; |
788 |
|
register int x, ti; |
789 |
|
int errp; |
808 |
|
} |
809 |
|
if (y < ynext*ymax/iconheight) /* skip this one */ |
810 |
|
return; |
811 |
+ |
sf = pow(2.0, (double)(scale+8)); |
812 |
|
err = 0; |
813 |
|
for (x = 0; x < iconwidth; x++) { |
814 |
|
if (!(x&7)) |
815 |
|
*++dp = 0; |
816 |
|
errp = err; |
817 |
|
ti = x*xmax/iconwidth; |
818 |
< |
err += normbright(scan[ti]) + cerr[x]; |
818 |
> |
colr_color(col, scan[ti]); |
819 |
> |
ti = sf*bright(col); |
820 |
> |
if (ti > 255) ti = 255; |
821 |
> |
err += ti + cerr[x]; |
822 |
|
if (err > 127) |
823 |
|
err -= 255; |
824 |
|
else |
841 |
|
dp = (unsigned long *)ourdata; |
842 |
|
for (y = 0; y < ymax; y++) { |
843 |
|
getscan(y); |
844 |
+ |
add2icon(y, scanline); |
845 |
|
if (scale) |
846 |
|
shiftcolrs(scanline, xmax, scale); |
847 |
|
colrs_gambs(scanline, xmax); |
841 |
– |
add2icon(y, scanline); |
848 |
|
if (ourras->image->blue_mask & 1) |
849 |
|
for (x = 0; x < xmax; x++) |
850 |
|
*dp++ = scanline[x][RED] << 16 | |
870 |
|
dp = ourdata; |
871 |
|
for (y = 0; y < ymax; y++) { |
872 |
|
getscan(y); |
873 |
+ |
add2icon(y, scanline); |
874 |
|
if (scale) |
875 |
|
shiftcolrs(scanline, xmax, scale); |
876 |
|
colrs_gambs(scanline, xmax); |
870 |
– |
add2icon(y, scanline); |
877 |
|
if (maxcolors < 256) |
878 |
|
for (x = 0; x < xmax; x++) |
879 |
|
*dp++ = ((long)normbright(scanline[x]) * |
898 |
|
for (y = 0; y < ymax; y++) { |
899 |
|
if (getscan(y) < 0) |
900 |
|
quiterr("seek error in getmapped"); |
901 |
+ |
add2icon(y, scanline); |
902 |
|
if (scale) |
903 |
|
shiftcolrs(scanline, xmax, scale); |
904 |
|
colrs_gambs(scanline, xmax); |
898 |
– |
add2icon(y, scanline); |
905 |
|
cnt_colrs(scanline, xmax); |
906 |
|
} |
907 |
|
/* map pixels */ |