Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-18 14:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #168 from mmozeiko/fixassert

Browse Source 
Replace assert() with IM_ASSERT in some functions copied from stb.h
This commit is contained in:
omar 2015-03-20 08:37:13 +00:00
commit 3b3a32cbd6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
imgui.cpp
View File

@ -10335,7 +10335,7 @@ static unsigned char *stb__dout;
static void stb__match(unsigned char *data, unsigned int length) static void stb__match(unsigned char *data, unsigned int length)
{ {
// INVERSE of memmove... write each byte before copying the next... // INVERSE of memmove... write each byte before copying the next...
assert (stb__dout + length <= stb__barrier); IM_ASSERT (stb__dout + length <= stb__barrier);
if (stb__dout + length > stb__barrier) { stb__dout += length; return; } if (stb__dout + length > stb__barrier) { stb__dout += length; return; }
if (data < stb__barrier4) { stb__dout = stb__barrier+1; return; } if (data < stb__barrier4) { stb__dout = stb__barrier+1; return; }
while (length--) *stb__dout++ = *data++; while (length--) *stb__dout++ = *data++;
@ -10343,7 +10343,7 @@ static void stb__match(unsigned char *data, unsigned int length)
static void stb__lit(unsigned char *data, unsigned int length) static void stb__lit(unsigned char *data, unsigned int length)
{ {
assert (stb__dout + length <= stb__barrier); IM_ASSERT (stb__dout + length <= stb__barrier);
if (stb__dout + length > stb__barrier) { stb__dout += length; return; } if (stb__dout + length > stb__barrier) { stb__dout += length; return; }
if (data < stb__barrier2) { stb__dout = stb__barrier+1; return; } if (data < stb__barrier2) { stb__dout = stb__barrier+1; return; }
memcpy(stb__dout, data, length); memcpy(stb__dout, data, length);
@ -10420,17 +10420,17 @@ static unsigned int stb_decompress(unsigned char *output, unsigned char *i, unsi
i = stb_decompress_token(i); i = stb_decompress_token(i);
if (i == old_i) { if (i == old_i) {
if (*i == 0x05 && i[1] == 0xfa) { if (*i == 0x05 && i[1] == 0xfa) {
assert(stb__dout == output + olen); IM_ASSERT(stb__dout == output + olen);
if (stb__dout != output + olen) return 0; if (stb__dout != output + olen) return 0;
if (stb_adler32(1, output, olen) != (unsigned int) stb__in4(2)) if (stb_adler32(1, output, olen) != (unsigned int) stb__in4(2))
return 0; return 0;
return olen; return olen;
} else { } else {
assert(0); /* NOTREACHED */ IM_ASSERT(0); /* NOTREACHED */
return 0; return 0;
} }
} }
assert(stb__dout <= output + olen); IM_ASSERT(stb__dout <= output + olen);
if (stb__dout > output + olen) if (stb__dout > output + olen)
return 0; return 0;
} }