Merge branch 'headerify'
Conflicts: tests/stretch_test.dsp
This commit is contained in:
commit
b96edc012c
4632
stb_image.h
Normal file
4632
stb_image.h
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
|||||||
/* stb_image_write - v0.93 - public domain - http://nothings.org/stb/stb_image_write.h
|
/* stb_image_write - v0.94 - public domain - http://nothings.org/stb/stb_image_write.h
|
||||||
writes out PNG/BMP/TGA images to C stdio - Sean Barrett 2010
|
writes out PNG/BMP/TGA images to C stdio - Sean Barrett 2010
|
||||||
no warranty implied; use at your own risk
|
no warranty implied; use at your own risk
|
||||||
|
|
||||||
@ -183,43 +183,43 @@ int stbi_write_tga(char const *filename, int x, int y, int comp, const void *dat
|
|||||||
"111 221 2222 11", 0,0,2, 0,0,0, 0,0,x,y, 24+8*has_alpha, 8*has_alpha);
|
"111 221 2222 11", 0,0,2, 0,0,0, 0,0,x,y, 24+8*has_alpha, 8*has_alpha);
|
||||||
}
|
}
|
||||||
|
|
||||||
// stretchy buffer; stbi__sbpush() == vector<>::push_back() -- stbi__sbcount() == vector<>::size()
|
// stretchy buffer; stbiw__sbpush() == vector<>::push_back() -- stbiw__sbcount() == vector<>::size()
|
||||||
#define stbi__sbraw(a) ((int *) (a) - 2)
|
#define stbiw__sbraw(a) ((int *) (a) - 2)
|
||||||
#define stbi__sbm(a) stbi__sbraw(a)[0]
|
#define stbiw__sbm(a) stbiw__sbraw(a)[0]
|
||||||
#define stbi__sbn(a) stbi__sbraw(a)[1]
|
#define stbiw__sbn(a) stbiw__sbraw(a)[1]
|
||||||
|
|
||||||
#define stbi__sbneedgrow(a,n) ((a)==0 || stbi__sbn(a)+n >= stbi__sbm(a))
|
#define stbiw__sbneedgrow(a,n) ((a)==0 || stbiw__sbn(a)+n >= stbiw__sbm(a))
|
||||||
#define stbi__sbmaybegrow(a,n) (stbi__sbneedgrow(a,(n)) ? stbi__sbgrow(a,n) : 0)
|
#define stbiw__sbmaybegrow(a,n) (stbiw__sbneedgrow(a,(n)) ? stbiw__sbgrow(a,n) : 0)
|
||||||
#define stbi__sbgrow(a,n) stbi__sbgrowf((void **) &(a), (n), sizeof(*(a)))
|
#define stbiw__sbgrow(a,n) stbiw__sbgrowf((void **) &(a), (n), sizeof(*(a)))
|
||||||
|
|
||||||
#define stbi__sbpush(a, v) (stbi__sbmaybegrow(a,1), (a)[stbi__sbn(a)++] = (v))
|
#define stbiw__sbpush(a, v) (stbiw__sbmaybegrow(a,1), (a)[stbiw__sbn(a)++] = (v))
|
||||||
#define stbi__sbcount(a) ((a) ? stbi__sbn(a) : 0)
|
#define stbiw__sbcount(a) ((a) ? stbiw__sbn(a) : 0)
|
||||||
#define stbi__sbfree(a) ((a) ? free(stbi__sbraw(a)),0 : 0)
|
#define stbiw__sbfree(a) ((a) ? free(stbiw__sbraw(a)),0 : 0)
|
||||||
|
|
||||||
static void *stbi__sbgrowf(void **arr, int increment, int itemsize)
|
static void *stbiw__sbgrowf(void **arr, int increment, int itemsize)
|
||||||
{
|
{
|
||||||
int m = *arr ? 2*stbi__sbm(*arr)+increment : increment+1;
|
int m = *arr ? 2*stbiw__sbm(*arr)+increment : increment+1;
|
||||||
void *p = realloc(*arr ? stbi__sbraw(*arr) : 0, itemsize * m + sizeof(int)*2);
|
void *p = realloc(*arr ? stbiw__sbraw(*arr) : 0, itemsize * m + sizeof(int)*2);
|
||||||
assert(p);
|
assert(p);
|
||||||
if (p) {
|
if (p) {
|
||||||
if (!*arr) ((int *) p)[1] = 0;
|
if (!*arr) ((int *) p)[1] = 0;
|
||||||
*arr = (void *) ((int *) p + 2);
|
*arr = (void *) ((int *) p + 2);
|
||||||
stbi__sbm(*arr) = m;
|
stbiw__sbm(*arr) = m;
|
||||||
}
|
}
|
||||||
return *arr;
|
return *arr;
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned char *stbi__zlib_flushf(unsigned char *data, unsigned int *bitbuffer, int *bitcount)
|
static unsigned char *stbiw__zlib_flushf(unsigned char *data, unsigned int *bitbuffer, int *bitcount)
|
||||||
{
|
{
|
||||||
while (*bitcount >= 8) {
|
while (*bitcount >= 8) {
|
||||||
stbi__sbpush(data, (unsigned char) *bitbuffer);
|
stbiw__sbpush(data, (unsigned char) *bitbuffer);
|
||||||
*bitbuffer >>= 8;
|
*bitbuffer >>= 8;
|
||||||
*bitcount -= 8;
|
*bitcount -= 8;
|
||||||
}
|
}
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int stbi__zlib_bitrev(int code, int codebits)
|
static int stbiw__zlib_bitrev(int code, int codebits)
|
||||||
{
|
{
|
||||||
int res=0;
|
int res=0;
|
||||||
while (codebits--) {
|
while (codebits--) {
|
||||||
@ -229,7 +229,7 @@ static int stbi__zlib_bitrev(int code, int codebits)
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned int stbi__zlib_countm(unsigned char *a, unsigned char *b, int limit)
|
static unsigned int stbiw__zlib_countm(unsigned char *a, unsigned char *b, int limit)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
for (i=0; i < limit && i < 258; ++i)
|
for (i=0; i < limit && i < 258; ++i)
|
||||||
@ -237,7 +237,7 @@ static unsigned int stbi__zlib_countm(unsigned char *a, unsigned char *b, int li
|
|||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned int stbi__zhash(unsigned char *data)
|
static unsigned int stbiw__zhash(unsigned char *data)
|
||||||
{
|
{
|
||||||
stbiw_uint32 hash = data[0] + (data[1] << 8) + (data[2] << 16);
|
stbiw_uint32 hash = data[0] + (data[1] << 8) + (data[2] << 16);
|
||||||
hash ^= hash << 3;
|
hash ^= hash << 3;
|
||||||
@ -249,19 +249,19 @@ static unsigned int stbi__zhash(unsigned char *data)
|
|||||||
return hash;
|
return hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define stbi__zlib_flush() (out = stbi__zlib_flushf(out, &bitbuf, &bitcount))
|
#define stbiw__zlib_flush() (out = stbiw__zlib_flushf(out, &bitbuf, &bitcount))
|
||||||
#define stbi__zlib_add(code,codebits) \
|
#define stbiw__zlib_add(code,codebits) \
|
||||||
(bitbuf |= (code) << bitcount, bitcount += (codebits), stbi__zlib_flush())
|
(bitbuf |= (code) << bitcount, bitcount += (codebits), stbiw__zlib_flush())
|
||||||
#define stbi__zlib_huffa(b,c) stbi__zlib_add(stbi__zlib_bitrev(b,c),c)
|
#define stbiw__zlib_huffa(b,c) stbiw__zlib_add(stbiw__zlib_bitrev(b,c),c)
|
||||||
// default huffman tables
|
// default huffman tables
|
||||||
#define stbi__zlib_huff1(n) stbi__zlib_huffa(0x30 + (n), 8)
|
#define stbiw__zlib_huff1(n) stbiw__zlib_huffa(0x30 + (n), 8)
|
||||||
#define stbi__zlib_huff2(n) stbi__zlib_huffa(0x190 + (n)-144, 9)
|
#define stbiw__zlib_huff2(n) stbiw__zlib_huffa(0x190 + (n)-144, 9)
|
||||||
#define stbi__zlib_huff3(n) stbi__zlib_huffa(0 + (n)-256,7)
|
#define stbiw__zlib_huff3(n) stbiw__zlib_huffa(0 + (n)-256,7)
|
||||||
#define stbi__zlib_huff4(n) stbi__zlib_huffa(0xc0 + (n)-280,8)
|
#define stbiw__zlib_huff4(n) stbiw__zlib_huffa(0xc0 + (n)-280,8)
|
||||||
#define stbi__zlib_huff(n) ((n) <= 143 ? stbi__zlib_huff1(n) : (n) <= 255 ? stbi__zlib_huff2(n) : (n) <= 279 ? stbi__zlib_huff3(n) : stbi__zlib_huff4(n))
|
#define stbiw__zlib_huff(n) ((n) <= 143 ? stbiw__zlib_huff1(n) : (n) <= 255 ? stbiw__zlib_huff2(n) : (n) <= 279 ? stbiw__zlib_huff3(n) : stbiw__zlib_huff4(n))
|
||||||
#define stbi__zlib_huffb(n) ((n) <= 143 ? stbi__zlib_huff1(n) : stbi__zlib_huff2(n))
|
#define stbiw__zlib_huffb(n) ((n) <= 143 ? stbiw__zlib_huff1(n) : stbiw__zlib_huff2(n))
|
||||||
|
|
||||||
#define stbi__ZHASH 16384
|
#define stbiw__ZHASH 16384
|
||||||
|
|
||||||
unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_len, int quality)
|
unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_len, int quality)
|
||||||
{
|
{
|
||||||
@ -272,45 +272,45 @@ unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_l
|
|||||||
unsigned int bitbuf=0;
|
unsigned int bitbuf=0;
|
||||||
int i,j, bitcount=0;
|
int i,j, bitcount=0;
|
||||||
unsigned char *out = NULL;
|
unsigned char *out = NULL;
|
||||||
unsigned char **hash_table[stbi__ZHASH]; // 64KB on the stack!
|
unsigned char **hash_table[stbiw__ZHASH]; // 64KB on the stack!
|
||||||
if (quality < 5) quality = 5;
|
if (quality < 5) quality = 5;
|
||||||
|
|
||||||
stbi__sbpush(out, 0x78); // DEFLATE 32K window
|
stbiw__sbpush(out, 0x78); // DEFLATE 32K window
|
||||||
stbi__sbpush(out, 0x5e); // FLEVEL = 1
|
stbiw__sbpush(out, 0x5e); // FLEVEL = 1
|
||||||
stbi__zlib_add(1,1); // BFINAL = 1
|
stbiw__zlib_add(1,1); // BFINAL = 1
|
||||||
stbi__zlib_add(1,2); // BTYPE = 1 -- fixed huffman
|
stbiw__zlib_add(1,2); // BTYPE = 1 -- fixed huffman
|
||||||
|
|
||||||
for (i=0; i < stbi__ZHASH; ++i)
|
for (i=0; i < stbiw__ZHASH; ++i)
|
||||||
hash_table[i] = NULL;
|
hash_table[i] = NULL;
|
||||||
|
|
||||||
i=0;
|
i=0;
|
||||||
while (i < data_len-3) {
|
while (i < data_len-3) {
|
||||||
// hash next 3 bytes of data to be compressed
|
// hash next 3 bytes of data to be compressed
|
||||||
int h = stbi__zhash(data+i)&(stbi__ZHASH-1), best=3;
|
int h = stbiw__zhash(data+i)&(stbiw__ZHASH-1), best=3;
|
||||||
unsigned char *bestloc = 0;
|
unsigned char *bestloc = 0;
|
||||||
unsigned char **hlist = hash_table[h];
|
unsigned char **hlist = hash_table[h];
|
||||||
int n = stbi__sbcount(hlist);
|
int n = stbiw__sbcount(hlist);
|
||||||
for (j=0; j < n; ++j) {
|
for (j=0; j < n; ++j) {
|
||||||
if (hlist[j]-data > i-32768) { // if entry lies within window
|
if (hlist[j]-data > i-32768) { // if entry lies within window
|
||||||
int d = stbi__zlib_countm(hlist[j], data+i, data_len-i);
|
int d = stbiw__zlib_countm(hlist[j], data+i, data_len-i);
|
||||||
if (d >= best) best=d,bestloc=hlist[j];
|
if (d >= best) best=d,bestloc=hlist[j];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// when hash table entry is too long, delete half the entries
|
// when hash table entry is too long, delete half the entries
|
||||||
if (hash_table[h] && stbi__sbn(hash_table[h]) == 2*quality) {
|
if (hash_table[h] && stbiw__sbn(hash_table[h]) == 2*quality) {
|
||||||
memcpy(hash_table[h], hash_table[h]+quality, sizeof(hash_table[h][0])*quality);
|
memcpy(hash_table[h], hash_table[h]+quality, sizeof(hash_table[h][0])*quality);
|
||||||
stbi__sbn(hash_table[h]) = quality;
|
stbiw__sbn(hash_table[h]) = quality;
|
||||||
}
|
}
|
||||||
stbi__sbpush(hash_table[h],data+i);
|
stbiw__sbpush(hash_table[h],data+i);
|
||||||
|
|
||||||
if (bestloc) {
|
if (bestloc) {
|
||||||
// "lazy matching" - check match at *next* byte, and if it's better, do cur byte as literal
|
// "lazy matching" - check match at *next* byte, and if it's better, do cur byte as literal
|
||||||
h = stbi__zhash(data+i+1)&(stbi__ZHASH-1);
|
h = stbiw__zhash(data+i+1)&(stbiw__ZHASH-1);
|
||||||
hlist = hash_table[h];
|
hlist = hash_table[h];
|
||||||
n = stbi__sbcount(hlist);
|
n = stbiw__sbcount(hlist);
|
||||||
for (j=0; j < n; ++j) {
|
for (j=0; j < n; ++j) {
|
||||||
if (hlist[j]-data > i-32767) {
|
if (hlist[j]-data > i-32767) {
|
||||||
int e = stbi__zlib_countm(hlist[j], data+i+1, data_len-i-1);
|
int e = stbiw__zlib_countm(hlist[j], data+i+1, data_len-i-1);
|
||||||
if (e > best) { // if next match is better, bail on current match
|
if (e > best) { // if next match is better, bail on current match
|
||||||
bestloc = NULL;
|
bestloc = NULL;
|
||||||
break;
|
break;
|
||||||
@ -323,27 +323,27 @@ unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_l
|
|||||||
int d = (int) (data+i - bestloc); // distance back
|
int d = (int) (data+i - bestloc); // distance back
|
||||||
assert(d <= 32767 && best <= 258);
|
assert(d <= 32767 && best <= 258);
|
||||||
for (j=0; best > lengthc[j+1]-1; ++j);
|
for (j=0; best > lengthc[j+1]-1; ++j);
|
||||||
stbi__zlib_huff(j+257);
|
stbiw__zlib_huff(j+257);
|
||||||
if (lengtheb[j]) stbi__zlib_add(best - lengthc[j], lengtheb[j]);
|
if (lengtheb[j]) stbiw__zlib_add(best - lengthc[j], lengtheb[j]);
|
||||||
for (j=0; d > distc[j+1]-1; ++j);
|
for (j=0; d > distc[j+1]-1; ++j);
|
||||||
stbi__zlib_add(stbi__zlib_bitrev(j,5),5);
|
stbiw__zlib_add(stbiw__zlib_bitrev(j,5),5);
|
||||||
if (disteb[j]) stbi__zlib_add(d - distc[j], disteb[j]);
|
if (disteb[j]) stbiw__zlib_add(d - distc[j], disteb[j]);
|
||||||
i += best;
|
i += best;
|
||||||
} else {
|
} else {
|
||||||
stbi__zlib_huffb(data[i]);
|
stbiw__zlib_huffb(data[i]);
|
||||||
++i;
|
++i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// write out final bytes
|
// write out final bytes
|
||||||
for (;i < data_len; ++i)
|
for (;i < data_len; ++i)
|
||||||
stbi__zlib_huffb(data[i]);
|
stbiw__zlib_huffb(data[i]);
|
||||||
stbi__zlib_huff(256); // end of block
|
stbiw__zlib_huff(256); // end of block
|
||||||
// pad with 0 bits to byte boundary
|
// pad with 0 bits to byte boundary
|
||||||
while (bitcount)
|
while (bitcount)
|
||||||
stbi__zlib_add(0,1);
|
stbiw__zlib_add(0,1);
|
||||||
|
|
||||||
for (i=0; i < stbi__ZHASH; ++i)
|
for (i=0; i < stbiw__ZHASH; ++i)
|
||||||
(void) stbi__sbfree(hash_table[i]);
|
(void) stbiw__sbfree(hash_table[i]);
|
||||||
|
|
||||||
{
|
{
|
||||||
// compute adler32 on input
|
// compute adler32 on input
|
||||||
@ -355,18 +355,18 @@ unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, int *out_l
|
|||||||
j += blocklen;
|
j += blocklen;
|
||||||
blocklen = 5552;
|
blocklen = 5552;
|
||||||
}
|
}
|
||||||
stbi__sbpush(out, (unsigned char) (s2 >> 8));
|
stbiw__sbpush(out, (unsigned char) (s2 >> 8));
|
||||||
stbi__sbpush(out, (unsigned char) s2);
|
stbiw__sbpush(out, (unsigned char) s2);
|
||||||
stbi__sbpush(out, (unsigned char) (s1 >> 8));
|
stbiw__sbpush(out, (unsigned char) (s1 >> 8));
|
||||||
stbi__sbpush(out, (unsigned char) s1);
|
stbiw__sbpush(out, (unsigned char) s1);
|
||||||
}
|
}
|
||||||
*out_len = stbi__sbn(out);
|
*out_len = stbiw__sbn(out);
|
||||||
// make returned pointer freeable
|
// make returned pointer freeable
|
||||||
memmove(stbi__sbraw(out), out, *out_len);
|
memmove(stbiw__sbraw(out), out, *out_len);
|
||||||
return (unsigned char *) stbi__sbraw(out);
|
return (unsigned char *) stbiw__sbraw(out);
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int stbi__crc32(unsigned char *buffer, int len)
|
unsigned int stbiw__crc32(unsigned char *buffer, int len)
|
||||||
{
|
{
|
||||||
static unsigned int crc_table[256];
|
static unsigned int crc_table[256];
|
||||||
unsigned int crc = ~0u;
|
unsigned int crc = ~0u;
|
||||||
@ -380,17 +380,17 @@ unsigned int stbi__crc32(unsigned char *buffer, int len)
|
|||||||
return ~crc;
|
return ~crc;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define stbi__wpng4(o,a,b,c,d) ((o)[0]=(unsigned char)(a),(o)[1]=(unsigned char)(b),(o)[2]=(unsigned char)(c),(o)[3]=(unsigned char)(d),(o)+=4)
|
#define stbiw__wpng4(o,a,b,c,d) ((o)[0]=(unsigned char)(a),(o)[1]=(unsigned char)(b),(o)[2]=(unsigned char)(c),(o)[3]=(unsigned char)(d),(o)+=4)
|
||||||
#define stbi__wp32(data,v) stbi__wpng4(data, (v)>>24,(v)>>16,(v)>>8,(v));
|
#define stbiw__wp32(data,v) stbiw__wpng4(data, (v)>>24,(v)>>16,(v)>>8,(v));
|
||||||
#define stbi__wptag(data,s) stbi__wpng4(data, s[0],s[1],s[2],s[3])
|
#define stbiw__wptag(data,s) stbiw__wpng4(data, s[0],s[1],s[2],s[3])
|
||||||
|
|
||||||
static void stbi__wpcrc(unsigned char **data, int len)
|
static void stbiw__wpcrc(unsigned char **data, int len)
|
||||||
{
|
{
|
||||||
unsigned int crc = stbi__crc32(*data - len - 4, len+4);
|
unsigned int crc = stbiw__crc32(*data - len - 4, len+4);
|
||||||
stbi__wp32(*data, crc);
|
stbiw__wp32(*data, crc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned char stbi__paeth(int a, int b, int c)
|
static unsigned char stbiw__paeth(int a, int b, int c)
|
||||||
{
|
{
|
||||||
int p = a + b - c, pa = abs(p-a), pb = abs(p-b), pc = abs(p-c);
|
int p = a + b - c, pa = abs(p-a), pb = abs(p-b), pc = abs(p-c);
|
||||||
if (pa <= pb && pa <= pc) return (unsigned char) a;
|
if (pa <= pb && pa <= pc) return (unsigned char) a;
|
||||||
@ -426,7 +426,7 @@ unsigned char *stbi_write_png_to_mem(unsigned char *pixels, int stride_bytes, in
|
|||||||
case 1: line_buffer[i] = z[i]; break;
|
case 1: line_buffer[i] = z[i]; break;
|
||||||
case 2: line_buffer[i] = z[i] - z[i-stride_bytes]; break;
|
case 2: line_buffer[i] = z[i] - z[i-stride_bytes]; break;
|
||||||
case 3: line_buffer[i] = z[i] - (z[i-stride_bytes]>>1); break;
|
case 3: line_buffer[i] = z[i] - (z[i-stride_bytes]>>1); break;
|
||||||
case 4: line_buffer[i] = (signed char) (z[i] - stbi__paeth(0,z[i-stride_bytes],0)); break;
|
case 4: line_buffer[i] = (signed char) (z[i] - stbiw__paeth(0,z[i-stride_bytes],0)); break;
|
||||||
case 5: line_buffer[i] = z[i]; break;
|
case 5: line_buffer[i] = z[i]; break;
|
||||||
case 6: line_buffer[i] = z[i]; break;
|
case 6: line_buffer[i] = z[i]; break;
|
||||||
}
|
}
|
||||||
@ -436,9 +436,9 @@ unsigned char *stbi_write_png_to_mem(unsigned char *pixels, int stride_bytes, in
|
|||||||
case 1: line_buffer[i] = z[i] - z[i-n]; break;
|
case 1: line_buffer[i] = z[i] - z[i-n]; break;
|
||||||
case 2: line_buffer[i] = z[i] - z[i-stride_bytes]; break;
|
case 2: line_buffer[i] = z[i] - z[i-stride_bytes]; break;
|
||||||
case 3: line_buffer[i] = z[i] - ((z[i-n] + z[i-stride_bytes])>>1); break;
|
case 3: line_buffer[i] = z[i] - ((z[i-n] + z[i-stride_bytes])>>1); break;
|
||||||
case 4: line_buffer[i] = z[i] - stbi__paeth(z[i-n], z[i-stride_bytes], z[i-stride_bytes-n]); break;
|
case 4: line_buffer[i] = z[i] - stbiw__paeth(z[i-n], z[i-stride_bytes], z[i-stride_bytes-n]); break;
|
||||||
case 5: line_buffer[i] = z[i] - (z[i-n]>>1); break;
|
case 5: line_buffer[i] = z[i] - (z[i-n]>>1); break;
|
||||||
case 6: line_buffer[i] = z[i] - stbi__paeth(z[i-n], 0,0); break;
|
case 6: line_buffer[i] = z[i] - stbiw__paeth(z[i-n], 0,0); break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (p) break;
|
if (p) break;
|
||||||
@ -463,25 +463,25 @@ unsigned char *stbi_write_png_to_mem(unsigned char *pixels, int stride_bytes, in
|
|||||||
|
|
||||||
o=out;
|
o=out;
|
||||||
memcpy(o,sig,8); o+= 8;
|
memcpy(o,sig,8); o+= 8;
|
||||||
stbi__wp32(o, 13); // header length
|
stbiw__wp32(o, 13); // header length
|
||||||
stbi__wptag(o, "IHDR");
|
stbiw__wptag(o, "IHDR");
|
||||||
stbi__wp32(o, x);
|
stbiw__wp32(o, x);
|
||||||
stbi__wp32(o, y);
|
stbiw__wp32(o, y);
|
||||||
*o++ = 8;
|
*o++ = 8;
|
||||||
*o++ = (unsigned char) ctype[n];
|
*o++ = (unsigned char) ctype[n];
|
||||||
*o++ = 0;
|
*o++ = 0;
|
||||||
*o++ = 0;
|
*o++ = 0;
|
||||||
*o++ = 0;
|
*o++ = 0;
|
||||||
stbi__wpcrc(&o,13);
|
stbiw__wpcrc(&o,13);
|
||||||
|
|
||||||
stbi__wp32(o, zlen);
|
stbiw__wp32(o, zlen);
|
||||||
stbi__wptag(o, "IDAT");
|
stbiw__wptag(o, "IDAT");
|
||||||
memcpy(o, zlib, zlen); o += zlen; free(zlib);
|
memcpy(o, zlib, zlen); o += zlen; free(zlib);
|
||||||
stbi__wpcrc(&o, zlen);
|
stbiw__wpcrc(&o, zlen);
|
||||||
|
|
||||||
stbi__wp32(o,0);
|
stbiw__wp32(o,0);
|
||||||
stbi__wptag(o, "IEND");
|
stbiw__wptag(o, "IEND");
|
||||||
stbi__wpcrc(&o,0);
|
stbiw__wpcrc(&o,0);
|
||||||
|
|
||||||
assert(o == out + *out_len);
|
assert(o == out + *out_len);
|
||||||
|
|
||||||
@ -505,6 +505,8 @@ int stbi_write_png(char const *filename, int x, int y, int comp, const void *dat
|
|||||||
|
|
||||||
/* Revision history
|
/* Revision history
|
||||||
|
|
||||||
|
0.94 (2014-05-31)
|
||||||
|
rename private functions to avoid conflicts with stb_image.h
|
||||||
0.93 (2014-05-27)
|
0.93 (2014-05-27)
|
||||||
warning fixes
|
warning fixes
|
||||||
0.92 (2010-08-01)
|
0.92 (2010-08-01)
|
||||||
|
@ -1,15 +1,45 @@
|
|||||||
#define STB_IMAGE_WRITE_IMPLEMENTATION
|
#define STB_IMAGE_WRITE_IMPLEMENTATION
|
||||||
#include "stb_image_write.h"
|
#include "stb_image_write.h"
|
||||||
|
|
||||||
#define STBI_HEADER_FILE_ONLY
|
#define STB_IMAGE_IMPLEMENTATION
|
||||||
#include "stb_image.c"
|
#include "stb_image.h"
|
||||||
|
|
||||||
|
#define STB_DEFINE
|
||||||
|
#include "stb.h"
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int w,h;
|
int w,h;
|
||||||
unsigned char *data = stbi_load(argv[1], &w, &h, 0, 4);
|
if (argc > 1) {
|
||||||
if (data)
|
int i;
|
||||||
stbi_write_png("c:/x/result.png", w, h, 4, data, w*4);
|
for (i=1; i < argc; ++i) {
|
||||||
|
unsigned char *data;
|
||||||
|
printf("%s\n", argv[i]);
|
||||||
|
data = stbi_load(argv[i], &w, &h, 0, 4);
|
||||||
|
assert(data);
|
||||||
|
if (data) {
|
||||||
|
char fname[512];
|
||||||
|
stb_splitpath(fname, argv[i], STB_FILE);
|
||||||
|
stbi_write_png(stb_sprintf("output/%s.png", fname), w, h, 4, data, w*4);
|
||||||
|
free(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
int i;
|
||||||
|
char **files = stb_readdir_files("images");
|
||||||
|
for (i=0; i < stb_arr_len(files); ++i) {
|
||||||
|
unsigned char *data;
|
||||||
|
printf("%s\n", files[i]);
|
||||||
|
data = stbi_load(files[i], &w, &h, 0, 4);
|
||||||
|
//assert(data);
|
||||||
|
if (data) {
|
||||||
|
char fname[512];
|
||||||
|
stb_splitpath(fname, files[i], STB_FILE);
|
||||||
|
stbi_write_png(stb_sprintf("output/%s.png", fname), w, h, 4, data, w*4);
|
||||||
|
free(data);
|
||||||
|
} else
|
||||||
|
printf("FAILED\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -86,10 +86,6 @@ SOURCE=.\image_test.c
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\stb_image.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\..\stb_image_write.h
|
SOURCE=..\..\stb_image_write.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# End Target
|
# End Target
|
||||||
|
@ -90,10 +90,6 @@ SOURCE=.\stb.c
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\stb_image.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\stb_vorbis.c
|
SOURCE=..\stb_vorbis.c
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
@ -87,10 +87,6 @@ SOURCE=.\stb_cpp.cpp
|
|||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\stb_image.c
|
|
||||||
# End Source File
|
|
||||||
# Begin Source File
|
|
||||||
|
|
||||||
SOURCE=..\stb_vorbis.c
|
SOURCE=..\stb_vorbis.c
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
@ -41,15 +41,15 @@ RSC=rc.exe
|
|||||||
# PROP Intermediate_Dir "Release"
|
# PROP Intermediate_Dir "Release"
|
||||||
# PROP Target_Dir ""
|
# PROP Target_Dir ""
|
||||||
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||||
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
# ADD CPP /nologo /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
|
||||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||||
# ADD RSC /l 0x409 /d "NDEBUG"
|
# ADD RSC /l 0x409 /d "NDEBUG"
|
||||||
BSC32=bscmake.exe
|
BSC32=bscmake.exe
|
||||||
# ADD BASE BSC32 /nologo
|
# ADD BASE BSC32 /nologo
|
||||||
# ADD BSC32 /nologo
|
# ADD BSC32 /nologo
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
|
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
|
||||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
|
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
|
||||||
|
|
||||||
!ELSEIF "$(CFG)" == "stretch_test - Win32 Debug"
|
!ELSEIF "$(CFG)" == "stretch_test - Win32 Debug"
|
||||||
|
|
||||||
@ -71,8 +71,8 @@ BSC32=bscmake.exe
|
|||||||
# ADD BASE BSC32 /nologo
|
# ADD BASE BSC32 /nologo
|
||||||
# ADD BSC32 /nologo
|
# ADD BSC32 /nologo
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
|
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
|
||||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
|
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
|
||||||
|
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
|
@ -3,7 +3,9 @@
|
|||||||
#define STB_DXT_IMPLEMENATION
|
#define STB_DXT_IMPLEMENATION
|
||||||
#define STB_C_LEXER_IMPLEMENTATIOn
|
#define STB_C_LEXER_IMPLEMENTATIOn
|
||||||
#define STB_DIVIDE_IMPLEMENTATION
|
#define STB_DIVIDE_IMPLEMENTATION
|
||||||
|
#define STB_IMAGE_IMPLEMENTATION
|
||||||
|
|
||||||
|
#include "stb_image.h"
|
||||||
#include "stb_image_write.h"
|
#include "stb_image_write.h"
|
||||||
#include "stb_perlin.h"
|
#include "stb_perlin.h"
|
||||||
#include "stb_dxt.h"
|
#include "stb_dxt.h"
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
#define STB_DXT_IMPLEMENATION
|
#define STB_DXT_IMPLEMENATION
|
||||||
#define STB_C_LEXER_IMPLEMENTATIOn
|
#define STB_C_LEXER_IMPLEMENTATIOn
|
||||||
#define STB_DIVIDE_IMPLEMENTATION
|
#define STB_DIVIDE_IMPLEMENTATION
|
||||||
|
#define STB_IMAGE_IMPLEMENTATION
|
||||||
|
|
||||||
#include "stb_truetype.h"
|
#include "stb_truetype.h"
|
||||||
#include "stb_image_write.h"
|
#include "stb_image_write.h"
|
||||||
@ -11,3 +12,6 @@
|
|||||||
#include "stb_dxt.h"
|
#include "stb_dxt.h"
|
||||||
#include "stb_c_lexer.h"
|
#include "stb_c_lexer.h"
|
||||||
#include "stb_divide.h"
|
#include "stb_divide.h"
|
||||||
|
#include "stb_image.h"
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user