comparison src/fringe.c @ 109736:b817fe3a4e35

merge trunk

109734:650ab6e37354

	      b = (unsigned short)((swap_nibble[b & 0xf] << 12)
				   | (swap_nibble[(b>>4) & 0xf] << 8)
				   | (swap_nibble[(b>>8) & 0xf] << 4)
				   | (swap_nibble[(b>>12) & 0xf]));
	      b >>= (16 - fb->width);
#ifdef WORDS_BIG_ENDIAN
	      b = ((b >> 8) | (b << 8));
#endif
	      *bits++ = b;
	    }
	}

109736:b817fe3a4e35

	      b = (unsigned short)((swap_nibble[b & 0xf] << 12)
				   | (swap_nibble[(b>>4) & 0xf] << 8)
				   | (swap_nibble[(b>>8) & 0xf] << 4)
				   | (swap_nibble[(b>>12) & 0xf]));
	      b >>= (16 - fb->width);
#ifdef WORDS_BIGENDIAN
	      b = ((b >> 8) | (b << 8));
#endif
	      *bits++ = b;
	    }
	}