Merge branch 'jpeg2k-16bit' of github.com:videan42/Pillow into jpeg2k-16bit

Conflicts:
	libImaging/Jpeg2KEncode.c
This commit is contained in:
David Joy 2014-05-28 14:01:12 -04:00
commit e422ef4456

View File

@ -103,6 +103,7 @@ j2k_pack_i16(Imaging im, UINT8 *buf,
}
}
static void
j2k_pack_la(Imaging im, UINT8 *buf,
unsigned x0, unsigned y0, unsigned w, unsigned h)