yyc12345/stb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into working

Browse Source
This commit is contained in:
Sean Barrett 2016-04-01 21:43:22 -07:00
commit efdfbb3c7c
20 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/stb_howto.txt
View File

@ -165,9 +165,9 @@ public domain declarations aren't necessary recognized
in the USA and some other locations. For that reason, in the USA and some other locations. For that reason,
I recommend a declaration along these lines: I recommend a declaration along these lines:
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy // license: you are granted a perpetual, irrevocable license to copy, modify,
// and modify this file as you see fit. // publish, and distribute this file as you see fit.
I typically place this declaration at the end of the initial I typically place this declaration at the end of the initial
comment block of the file and just say 'public domain' comment block of the file and just say 'public domain'

6
docs/why_public_domain.md
View File

@ -95,9 +95,9 @@ public domain declarations aren't necessary recognized
in the USA and some other locations. For that reason, in the USA and some other locations. For that reason,
I recommend a declaration along these lines: I recommend a declaration along these lines:
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy // license: you are granted a perpetual, irrevocable license to copy, modify,
// and modify this file as you see fit. // publish, and distribute this file as you see fit.
I typically place this declaration at the end of the initial I typically place this declaration at the end of the initial
comment block of the file and just say 'public domain' comment block of the file and just say 'public domain'

6
stb.h
View File

@ -171,9 +171,9 @@ Parenthesized items have since been removed.
LICENSE LICENSE
This software is in the public domain. Where that dedication is not This software is dual-licensed to the public domain and under the following
recognized, you are granted a perpetual, irrevocable license to copy, license: you are granted a perpetual, irrevocable license to copy, modify,
distribute, and modify this file as you see fit. publish, and distribute this file as you see fit.
CREDITS CREDITS

6
stb_c_lexer.h
View File

@ -32,9 +32,9 @@
// //
// LICENSE // LICENSE
// //
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy, // license: you are granted a perpetual, irrevocable license to copy, modify,
// distribute, and modify this file as you see fit. // publish, and distribute this file as you see fit.
#ifndef STB_C_LEXER_DEFINITIONS #ifndef STB_C_LEXER_DEFINITIONS
// to change the default parsing rules, copy the following lines // to change the default parsing rules, copy the following lines

6
stb_divide.h
View File

@ -78,9 +78,9 @@
// //
// LICENSE // LICENSE
// //
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy, // license: you are granted a perpetual, irrevocable license to copy, modify,
// distribute, and modify this file as you see fit. // publish, and distribute this file as you see fit.
#ifndef INCLUDE_STB_DIVIDE_H #ifndef INCLUDE_STB_DIVIDE_H

6
stb_dxt.h
View File

@ -19,9 +19,9 @@
// //
// LICENSE // LICENSE
// //
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy, // license: you are granted a perpetual, irrevocable license to copy, modify,
// distribute, and modify this file as you see fit. // publish, and distribute this file as you see fit.
#ifndef STB_INCLUDE_STB_DXT_H #ifndef STB_INCLUDE_STB_DXT_H
#define STB_INCLUDE_STB_DXT_H #define STB_INCLUDE_STB_DXT_H

6
stb_easy_font.h
View File

@ -67,9 +67,9 @@
// //
// LICENSE // LICENSE
// //
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy, // license: you are granted a perpetual, irrevocable license to copy, modify,
// distribute, and modify this file as you see fit. // publish, and distribute this file as you see fit.
// //
// VERSION HISTORY // VERSION HISTORY
// //

6
stb_herringbone_wang_tile.h
View File

@ -3,9 +3,9 @@
== LICENSE ============================== == LICENSE ==============================
This software is in the public domain. Where that dedication is not This software is dual-licensed to the public domain and under the following
recognized, you are granted a perpetual, irrevocable license to copy, license: you are granted a perpetual, irrevocable license to copy, modify,
distribute, and modify this file as you see fit. publish, and distribute this file as you see fit.
== WHAT IT IS =========================== == WHAT IT IS ===========================

6
stb_image.h
View File

@ -209,9 +209,9 @@
LICENSE LICENSE
This software is in the public domain. Where that dedication is not This software is dual-licensed to the public domain and under the following
recognized, you are granted a perpetual, irrevocable license to copy, license: you are granted a perpetual, irrevocable license to copy, modify,
distribute, and modify this file as you see fit. publish, and distribute this file as you see fit.
*/ */

6
stb_image_resize.h
View File

@ -160,9 +160,9 @@
LICENSE LICENSE
This software is in the public domain. Where that dedication is not This software is dual-licensed to the public domain and under the following
recognized, you are granted a perpetual, irrevocable license to copy, license: you are granted a perpetual, irrevocable license to copy, modify,
distribute, and modify this file as you see fit. publish, and distribute this file as you see fit.
TODO TODO
Don't decode all of the image data when only processing a partial tile Don't decode all of the image data when only processing a partial tile

6
stb_image_write.h
View File

@ -105,9 +105,9 @@ CREDITS:
LICENSE LICENSE
This software is in the public domain. Where that dedication is not This software is dual-licensed to the public domain and under the following
recognized, you are granted a perpetual, irrevocable license to copy, license: you are granted a perpetual, irrevocable license to copy, modify,
distribute, and modify this file as you see fit. publish, and distribute this file as you see fit.
*/ */

6
stb_leakcheck.h
View File

@ -1,9 +1,9 @@
// stb_leakcheck.h - v0.2 - quick & dirty malloc leak-checking - public domain // stb_leakcheck.h - v0.2 - quick & dirty malloc leak-checking - public domain
// LICENSE // LICENSE
// //
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy, // license: you are granted a perpetual, irrevocable license to copy, modify,
// distribute, and modify this file as you see fit. // publish, and distribute this file as you see fit.
#ifdef STB_LEAKCHECK_IMPLEMENTATION #ifdef STB_LEAKCHECK_IMPLEMENTATION
#undef STB_LEAKCHECK_IMPLEMENTATION // don't implenment more than once #undef STB_LEAKCHECK_IMPLEMENTATION // don't implenment more than once

6
stb_perlin.h
View File

@ -3,9 +3,9 @@
// //
// LICENSE // LICENSE
// //
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy, // license: you are granted a perpetual, irrevocable license to copy, modify,
// distribute, and modify this file as you see fit. // publish, and distribute this file as you see fit.
// //
// //
// to create the implementation, // to create the implementation,

6
stb_rect_pack.h
View File

@ -41,9 +41,9 @@
// //
// LICENSE // LICENSE
// //
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy, // license: you are granted a perpetual, irrevocable license to copy, modify,
// distribute, and modify this file as you see fit. // publish, and distribute this file as you see fit.
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// //

6
stb_textedit.h
View File

@ -17,9 +17,9 @@
// //
// LICENSE // LICENSE
// //
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy, // license: you are granted a perpetual, irrevocable license to copy, modify,
// distribute, and modify this file as you see fit. // publish, and distribute this file as you see fit.
// //
// //
// DEPENDENCIES // DEPENDENCIES

6
stb_tilemap_editor.h
View File

@ -316,9 +316,9 @@
// //
// LICENSE // LICENSE
// //
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy, // license: you are granted a perpetual, irrevocable license to copy, modify,
// distribute, and modify this file as you see fit. // publish, and distribute this file as you see fit.

6
stb_truetype.h
View File

@ -68,9 +68,9 @@
// //
// LICENSE // LICENSE
// //
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy, // license: you are granted a perpetual, irrevocable license to copy, modify,
// distribute, and modify this file as you see fit. // publish, and distribute this file as you see fit.
// //
// USAGE // USAGE
// //

6
stb_vorbis.c
View File

@ -9,9 +9,9 @@
// //
// LICENSE // LICENSE
// //
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy, // license: you are granted a perpetual, irrevocable license to copy, modify,
// distribute, and modify this file as you see fit. // publish, and distribute this file as you see fit.
// //
// No warranty for any purpose is expressed or implied by the author (nor // No warranty for any purpose is expressed or implied by the author (nor
// by RAD Game Tools). Report bugs and send enhancements to the author. // by RAD Game Tools). Report bugs and send enhancements to the author.

6
stb_voxel_render.h
View File

@ -215,9 +215,9 @@
// //
// LICENSE // LICENSE
// //
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy, // license: you are granted a perpetual, irrevocable license to copy, modify,
// distribute, and modify this file as you see fit. // publish, and distribute this file as you see fit.
#ifndef INCLUDE_STB_VOXEL_RENDER_H #ifndef INCLUDE_STB_VOXEL_RENDER_H
#define INCLUDE_STB_VOXEL_RENDER_H #define INCLUDE_STB_VOXEL_RENDER_H

6
stretchy_buffer.h
View File

@ -164,9 +164,9 @@
// //
// LICENSE // LICENSE
// //
// This software is in the public domain. Where that dedication is not // This software is dual-licensed to the public domain and under the following
// recognized, you are granted a perpetual, irrevocable license to copy, // license: you are granted a perpetual, irrevocable license to copy, modify,
// distribute, and modify this file as you see fit. // publish, and distribute this file as you see fit.
#ifndef STB_STRETCHY_BUFFER_H_INCLUDED #ifndef STB_STRETCHY_BUFFER_H_INCLUDED
#define STB_STRETCHY_BUFFER_H_INCLUDED #define STB_STRETCHY_BUFFER_H_INCLUDED