ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/px/x11image.c

Comparing ray/src/px/x11image.c (file contents):
Revision 2.14 by greg, Mon Oct 12 16:24:02 1992 UTC vs.
Revision 2.15 by greg, Tue Oct 13 16:43:39 1992 UTC

#	Line 725 | Line 725 | COLOR  clr;
725		return(-1);
726		if (left == ll && right == lr && top == lt && bottom == lb) {
727		copycolor(clr, lc);
728	<	return;
728	>	return(0);
729		}
730		for (y = top; y < bottom; y++) {
731		if (getscan(y) == -1)
#	Line 754 | Line 754 | getmono()                      /* get monochrome data */
754		quiterr("out of memory in getmono");
755		dp = ourdata - 1;
756		for (y = 0; y < ymax; y++) {
757	<	if (getscan(y) < 0)
758	<	quiterr("seek error in getmono");
757	>	getscan(y);
758		normcolrs(scanline, xmax, scale);
759		add2icon(y, scanline);
760		err = 0;
#	Line 835 | Line 834 | getfull()                      /* get full (24-bit) data */
834		/* read and convert file */
835		dp = (unsigned long *)ourdata;
836		for (y = 0; y < ymax; y++) {
837	<	if (getscan(y) < 0)
839	<	quiterr("seek error in getfull");
837	>	getscan(y);
838		if (scale)
839		shiftcolrs(scanline, xmax, scale);
840		colrs_gambs(scanline, xmax);
#	Line 865 | Line 863 | getgrey()                      /* get greyscale data */
863		/* read and convert file */
864		dp = ourdata;
865		for (y = 0; y < ymax; y++) {
866	<	if (getscan(y) < 0)
869	<	quiterr("seek error in getgrey");
866	>	getscan(y);
867		if (scale)
868		shiftcolrs(scanline, xmax, scale);
869		colrs_gambs(scanline, xmax);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)