37 |
|
|
38 |
|
#define BORWIDTH 5 /* border width */ |
39 |
|
|
40 |
+ |
#define ICONSIZ 80 /* maximum icon dimension */ |
41 |
+ |
|
42 |
|
#define ourscreen DefaultScreen(thedisplay) |
43 |
|
#define ourblack BlackPixel(thedisplay,ourscreen) |
44 |
|
#define ourwhite WhitePixel(thedisplay,ourscreen) |
79 |
|
|
80 |
|
double exposure = 1.0; /* exposure compensation used */ |
81 |
|
|
82 |
+ |
int wrongformat = 0; /* input in another format? */ |
83 |
+ |
|
84 |
|
GC revgc; /* graphics context with GXinvert */ |
85 |
|
|
86 |
|
XRASTER *ourras; /* our stored image */ |
92 |
|
|
93 |
|
char *geometry = NULL; /* geometry specification */ |
94 |
|
|
95 |
+ |
char icondata[(ICONSIZ+7)/8*ICONSIZ]; /* icon bitmap data */ |
96 |
+ |
int iconwidth = 0, iconheight = 0; |
97 |
+ |
|
98 |
|
char *progname; |
99 |
|
|
100 |
|
char errmsg[128]; |
163 |
|
} else if (i != argc) |
164 |
|
goto userr; |
165 |
|
/* get header */ |
166 |
< |
getheader(fin, headline); |
166 |
> |
getheader(fin, headline, NULL); |
167 |
|
/* get picture dimensions */ |
168 |
< |
if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR)) |
169 |
< |
quiterr("bad picture size"); |
168 |
> |
if (wrongformat || fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR)) |
169 |
> |
quiterr("bad picture format"); |
170 |
|
/* set view parameters */ |
171 |
|
if (gotview && setview(&ourview) != NULL) |
172 |
|
gotview = 0; |
190 |
|
{ |
191 |
|
static char *altname[] = {"rview","rpict","pinterp",VIEWSTR,NULL}; |
192 |
|
register char **an; |
193 |
+ |
char fmt[32]; |
194 |
|
|
195 |
|
if (isexpos(s)) |
196 |
|
exposure *= exposval(s); |
197 |
< |
else |
197 |
> |
else if (isformat(s)) { |
198 |
> |
formatval(fmt, s); |
199 |
> |
wrongformat = strcmp(fmt, COLRFMT); |
200 |
> |
} else |
201 |
|
for (an = altname; *an != NULL; an++) |
202 |
|
if (!strncmp(*an, s, strlen(*an))) { |
203 |
|
if (sscanview(&ourview, s+strlen(*an)) > 0) |
209 |
|
|
210 |
|
init() /* get data and open window */ |
211 |
|
{ |
212 |
+ |
XWMHints ourxwmhints; |
213 |
|
XSetWindowAttributes ourwinattr; |
214 |
|
XSizeHints oursizhints; |
215 |
|
register int i; |
252 |
|
if (geometry != NULL) { |
253 |
|
bzero((char *)&oursizhints, sizeof(oursizhints)); |
254 |
|
i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y, |
255 |
< |
&oursizhints.width, &oursizhints.height); |
255 |
> |
(unsigned *)&oursizhints.width, |
256 |
> |
(unsigned *)&oursizhints.height); |
257 |
|
if ((i&(WidthValue|HeightValue)) == (WidthValue|HeightValue)) |
258 |
|
oursizhints.flags |= USSize; |
259 |
|
else { |
272 |
|
} |
273 |
|
XSetNormalHints(thedisplay, wind, &oursizhints); |
274 |
|
} |
275 |
+ |
ourxwmhints.flags = InputHint|IconPixmapHint; |
276 |
+ |
ourxwmhints.input = True; |
277 |
+ |
ourxwmhints.icon_pixmap = XCreateBitmapFromData(thedisplay, |
278 |
+ |
wind, icondata, iconwidth, iconheight); |
279 |
+ |
XSetWMHints(thedisplay, wind, &ourxwmhints); |
280 |
|
XSelectInput(thedisplay, wind, ButtonPressMask|ButtonReleaseMask |
281 |
|
|ButtonMotionMask|StructureNotifyMask |
282 |
|
|KeyPressMask|ExposureMask); |
354 |
|
} |
355 |
|
return; |
356 |
|
fail: |
357 |
< |
quit("could not create raster image"); |
357 |
> |
quiterr("could not create raster image"); |
358 |
|
} |
359 |
|
|
360 |
|
|
428 |
|
sprintf(buf, "%.3f", intens(cval)/exposure); |
429 |
|
break; |
430 |
|
case 'l': /* luminance */ |
431 |
< |
sprintf(buf, "%.0fn", bright(cval)*683.0/exposure); |
431 |
> |
sprintf(buf, "%.0fL", luminance(cval)/exposure); |
432 |
|
break; |
433 |
|
case 'c': /* color */ |
434 |
|
comp = pow(2.0, (double)scale); |
463 |
|
XBell(thedisplay, 0); |
464 |
|
return(-1); |
465 |
|
} |
466 |
< |
viewray(rorg, rdir, &ourview, |
466 |
> |
if (viewray(rorg, rdir, &ourview, |
467 |
|
(ekey->x-xoff+.5)/xmax, |
468 |
< |
(ymax-1-ekey->y+yoff+.5)/ymax); |
468 |
> |
(ymax-1-ekey->y+yoff+.5)/ymax) < 0) |
469 |
> |
return(-1); |
470 |
|
printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); |
471 |
|
printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); |
472 |
|
fflush(stdout); |
622 |
|
register unsigned char *dp; |
623 |
|
register int x, err; |
624 |
|
int y; |
606 |
– |
rgbpixel *inl; |
625 |
|
short *cerr; |
626 |
|
|
627 |
< |
if ((inl = (rgbpixel *)malloc(xmax*sizeof(rgbpixel))) == NULL |
628 |
< |
|| (cerr = (short *)calloc(xmax,sizeof(short))) == NULL) |
611 |
< |
quit("out of memory in getmono"); |
627 |
> |
if ((cerr = (short *)calloc(xmax,sizeof(short))) == NULL) |
628 |
> |
quiterr("out of memory in getmono"); |
629 |
|
dp = ourdata - 1; |
630 |
|
for (y = 0; y < ymax; y++) { |
631 |
< |
picreadline3(y, inl); |
631 |
> |
if (getscan(y) < 0) |
632 |
> |
quiterr("seek error in getmono"); |
633 |
> |
normcolrs(scanline, xmax, scale); |
634 |
> |
add2icon(y, scanline); |
635 |
|
err = 0; |
636 |
|
for (x = 0; x < xmax; x++) { |
637 |
|
if (!(x&7)) |
638 |
|
*++dp = 0; |
639 |
< |
err += rgb_bright(&inl[x]) + cerr[x]; |
639 |
> |
err += normbright(scanline[x]) + cerr[x]; |
640 |
|
if (err > 127) |
641 |
|
err -= 255; |
642 |
|
else |
644 |
|
cerr[x] = err >>= 1; |
645 |
|
} |
646 |
|
} |
627 |
– |
free((char *)inl); |
647 |
|
free((char *)cerr); |
648 |
|
} |
649 |
|
|
650 |
|
|
651 |
+ |
add2icon(y, scan) /* add a scanline to our icon data */ |
652 |
+ |
int y; |
653 |
+ |
COLR *scan; |
654 |
+ |
{ |
655 |
+ |
static char *dp = NULL; |
656 |
+ |
static short cerr[ICONSIZ]; |
657 |
+ |
register int err; |
658 |
+ |
register int x, xi; |
659 |
+ |
|
660 |
+ |
if (iconheight == 0) { /* initialize */ |
661 |
+ |
if (xmax < ICONSIZ && ymax < ICONSIZ) { |
662 |
+ |
iconwidth = xmax; |
663 |
+ |
iconheight = ymax; |
664 |
+ |
} else if (xmax > ymax) { |
665 |
+ |
iconwidth = ICONSIZ; |
666 |
+ |
iconheight = ICONSIZ*ymax/xmax; |
667 |
+ |
} else { |
668 |
+ |
iconwidth = ICONSIZ*xmax/ymax; |
669 |
+ |
iconheight = ICONSIZ; |
670 |
+ |
} |
671 |
+ |
dp = icondata - 1; |
672 |
+ |
} |
673 |
+ |
if (dp == NULL) /* done already */ |
674 |
+ |
return; |
675 |
+ |
if (y % (ymax/iconheight)) /* skip this one */ |
676 |
+ |
return; |
677 |
+ |
err = 0; |
678 |
+ |
for (x = 0; x < iconwidth; x++) { |
679 |
+ |
if (!(x&7)) |
680 |
+ |
*++dp = 0; |
681 |
+ |
xi = x*xmax/iconwidth; |
682 |
+ |
err += normbright(scan[xi]) + cerr[x]; |
683 |
+ |
if (err > 127) |
684 |
+ |
err -= 255; |
685 |
+ |
else |
686 |
+ |
*dp |= 1<<(x&07); |
687 |
+ |
cerr[x] = err >>= 1; |
688 |
+ |
} |
689 |
+ |
if (y >= ymax-ymax/iconheight) /* all done */ |
690 |
+ |
dp = NULL; |
691 |
+ |
} |
692 |
+ |
|
693 |
+ |
|
694 |
|
getfull() /* get full (24-bit) data */ |
695 |
|
{ |
696 |
|
int y; |
697 |
< |
|
698 |
< |
for (y = 0; y < ymax; y++) |
699 |
< |
picreadline3(y, (rgbpixel *)(ourdata+y*xmax*3)); |
697 |
> |
register unsigned char *dp; |
698 |
> |
register int x; |
699 |
> |
/* set gamma correction */ |
700 |
> |
setcolrgam(gamcor); |
701 |
> |
/* read and convert file */ |
702 |
> |
dp = ourdata; |
703 |
> |
for (y = 0; y < ymax; y++) { |
704 |
> |
if (getscan(y) < 0) |
705 |
> |
quiterr("seek error in getfull"); |
706 |
> |
if (scale) |
707 |
> |
shiftcolrs(scanline, xmax, scale); |
708 |
> |
colrs_gambs(scanline, xmax); |
709 |
> |
add2icon(y, scanline); |
710 |
> |
for (x = 0; x < xmax; x++) { |
711 |
> |
*dp++ = scanline[x][RED]; |
712 |
> |
*dp++ = scanline[x][GRN]; |
713 |
> |
*dp++ = scanline[x][BLU]; |
714 |
> |
} |
715 |
> |
} |
716 |
|
} |
717 |
|
|
718 |
|
|
751 |
|
if (scanpos == NULL || scanpos[y] == -1) |
752 |
|
return(-1); |
753 |
|
if (fseek(fin, scanpos[y], 0) == -1) |
754 |
< |
quit("fseek error"); |
754 |
> |
quiterr("fseek error"); |
755 |
|
cury = y; |
756 |
|
} else if (scanpos != NULL) |
757 |
|
scanpos[y] = ftell(fin); |
774 |
|
quiterr("cannot seek for picreadline"); |
775 |
|
/* convert scanline */ |
776 |
|
normcolrs(scanline, xmax, scale); |
777 |
+ |
add2icon(y, scanline); |
778 |
|
for (i = 0; i < xmax; i++) { |
779 |
|
l3[i].r = scanline[i][RED]; |
780 |
|
l3[i].g = scanline[i][GRN]; |
798 |
|
register int i, val; |
799 |
|
|
800 |
|
for (i = 0; i < 256; i++) { |
801 |
< |
val = pow(i/256.0, 1.0/gamcor) * 256.0; |
801 |
> |
val = pow((i+0.5)/256.0, 1.0/gamcor) * 256.0; |
802 |
|
map[0][i] = map[1][i] = map[2][i] = val; |
803 |
|
} |
804 |
|
} |