daily update on 20240226 by nitload youmu
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
|
||||
#include "include/stb_image.h"
|
||||
#include "stb_image.h"
|
||||
|
||||
#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \
|
||||
|| defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \
|
||||
@@ -38,7 +37,6 @@
|
||||
#define STBI_NO_ZLIB
|
||||
#endif
|
||||
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h> // ptrdiff_t on osx
|
||||
#include <stdlib.h>
|
||||
@@ -64,7 +62,6 @@
|
||||
#define STBI_EXTERN extern
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#ifdef __cplusplus
|
||||
#define stbi_inline inline
|
||||
@@ -274,7 +271,6 @@ typedef struct
|
||||
stbi_uc* img_buffer_original, * img_buffer_original_end;
|
||||
} stbi__context;
|
||||
|
||||
|
||||
static void stbi__refill_buffer(stbi__context* s);
|
||||
|
||||
// initialize a memory-decode context
|
||||
@@ -817,7 +813,6 @@ static FILE* stbi__fopen(char const* filename, char const* mode)
|
||||
return f;
|
||||
}
|
||||
|
||||
|
||||
STBIDEF stbi_uc* stbi_load(char const* filename, int* x, int* y, int* comp, int req_comp)
|
||||
{
|
||||
FILE* f = stbi__fopen(filename, "rb");
|
||||
@@ -840,7 +835,6 @@ STBIDEF void stbi_load_to_target(char const* filename, int* x, int* y, stbi_uc*
|
||||
fclose(f);
|
||||
}
|
||||
|
||||
|
||||
STBIDEF stbi_uc* stbi_load_from_file(FILE* f, int* x, int* y, int* comp, int req_comp)
|
||||
{
|
||||
unsigned char* result;
|
||||
@@ -877,7 +871,6 @@ STBIDEF stbi_us* stbi_load_16(char const* filename, int* x, int* y, int* comp, i
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
#endif //!STBI_NO_STDIO
|
||||
|
||||
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)
|
||||
@@ -1049,7 +1042,6 @@ static float stbi__h2l_gamma_i = 1.0f / 2.2f, stbi__h2l_scale_i = 1.0f;
|
||||
STBIDEF void stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1 / gamma; }
|
||||
STBIDEF void stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1 / scale; }
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Common code used by all image loaders
|
||||
@@ -4124,7 +4116,6 @@ typedef struct
|
||||
int depth;
|
||||
} stbi__png;
|
||||
|
||||
|
||||
enum {
|
||||
STBI__F_none = 0,
|
||||
STBI__F_sub = 1,
|
||||
@@ -4894,7 +4885,6 @@ static int stbi__bmp_test(stbi__context* s)
|
||||
return r;
|
||||
}
|
||||
|
||||
|
||||
// returns 0..31 for the highest set bit
|
||||
static int stbi__high_bit(unsigned int z)
|
||||
{
|
||||
@@ -5062,7 +5052,6 @@ static void* stbi__bmp_parse_header(stbi__context* s, stbi__bmp_data* info)
|
||||
return (void*)1;
|
||||
}
|
||||
|
||||
|
||||
static void* stbi__bmp_load(stbi__context* s, int* x, int* y, int* comp, int req_comp, stbi__result_info* ri)
|
||||
{
|
||||
stbi_uc* out;
|
||||
@@ -5794,7 +5783,6 @@ static void* stbi__psd_load(stbi__context* s, int* x, int* y, int* comp, int req
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else {
|
||||
// We're at the raw image data. It's each channel in order (Red, Green, Blue, Alpha, ...)
|
||||
@@ -7340,10 +7328,6 @@ STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const* c, void* user
|
||||
return stbi__is_16_main(&s);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
revision history:
|
||||
2.20 (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs
|
||||
@@ -7527,7 +7511,6 @@ STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const* c, void* user
|
||||
first released version
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
------------------------------------------------------------------------------
|
||||
This software is available under 2 licenses -- choose whichever you prefer.
|
||||
|
||||
Reference in New Issue
Block a user