merge fixes

This commit is contained in:
Blaise Tine
2020-06-23 15:19:24 -07:00
parent c9c34cb71a
commit d4e006d92d
264 changed files with 1 additions and 113266 deletions

View File

@@ -0,0 +1,25 @@
/***************************************************************************
*cr
*cr (C) Copyright 2007 The Board of Trustees of the
*cr University of Illinois
*cr All Rights Reserved
*cr
***************************************************************************/
struct image_i16
{
int width;
int height;
short *data;
};
#ifdef __cplusplus
extern "C" {
#endif
struct image_i16 * load_image(char *filename);
void free_image(struct image_i16 *);
#ifdef __cplusplus
}
#endif