|
@@ -98,7 +98,7 @@ RECENT REVISION HISTORY:
|
|
Michaelangel007@github Philipp Wiesemann Dale Weiler github:grim210
|
|
Michaelangel007@github Philipp Wiesemann Dale Weiler github:grim210
|
|
Oriol Ferrer Mesia Josh Tobin Matthew Gregan github:sammyhw
|
|
Oriol Ferrer Mesia Josh Tobin Matthew Gregan github:sammyhw
|
|
Blazej Dariusz Roszkowski Gregory Mullen github:phprus
|
|
Blazej Dariusz Roszkowski Gregory Mullen github:phprus
|
|
-
|
|
|
|
|
|
+ github:poppolopoppo
|
|
*/
|
|
*/
|
|
|
|
|
|
#ifndef STBI_INCLUDE_STB_IMAGE_H
|
|
#ifndef STBI_INCLUDE_STB_IMAGE_H
|
|
@@ -366,12 +366,12 @@ STBIDEF stbi_uc *stbi_load_from_file (FILE *f, int *x, int *y, int *channels_i
|
|
// 16-bits-per-channel interface
|
|
// 16-bits-per-channel interface
|
|
//
|
|
//
|
|
|
|
|
|
-STBIDEF stbi_us *stbi_load_16(char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
|
|
|
|
|
|
+STBIDEF stbi_us *stbi_load_16 (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
|
|
|
|
+STBIDEF stbi_us *stbi_load_16_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels);
|
|
|
|
+STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels);
|
|
#ifndef STBI_NO_STDIO
|
|
#ifndef STBI_NO_STDIO
|
|
STBIDEF stbi_us *stbi_load_from_file_16(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
|
|
STBIDEF stbi_us *stbi_load_from_file_16(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
|
|
#endif
|
|
#endif
|
|
-STBIDEF stbi_us *stbi_load_16_from_memory (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels);
|
|
|
|
-STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels);
|
|
|
|
|
|
|
|
////////////////////////////////////
|
|
////////////////////////////////////
|
|
//
|
|
//
|
|
@@ -1194,16 +1194,16 @@ STBIDEF stbi_us *stbi_load_16(char const *filename, int *x, int *y, int *comp, i
|
|
|
|
|
|
STBIDEF stbi_us *stbi_load_16_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels)
|
|
STBIDEF stbi_us *stbi_load_16_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels)
|
|
{
|
|
{
|
|
- stbi__context s;
|
|
|
|
- stbi__start_mem(&s, buffer, len);
|
|
|
|
- return stbi__load_and_postprocess_16bit(&s, x, y, channels_in_file, desired_channels);
|
|
|
|
|
|
+ stbi__context s;
|
|
|
|
+ stbi__start_mem(&s,buffer,len);
|
|
|
|
+ return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels);
|
|
}
|
|
}
|
|
|
|
|
|
STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels)
|
|
STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels)
|
|
{
|
|
{
|
|
- stbi__context s;
|
|
|
|
- stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user);
|
|
|
|
- return stbi__load_and_postprocess_16bit(&s, x, y, channels_in_file, desired_channels);
|
|
|
|
|
|
+ stbi__context s;
|
|
|
|
+ stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user);
|
|
|
|
+ return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels);
|
|
}
|
|
}
|
|
|
|
|
|
STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
|
|
STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
|