From ee6978cb6891632e3fe84264f832140e590b43f0 Mon Sep 17 00:00:00 2001 From: Craig Donner Date: Wed, 10 Feb 2016 14:48:59 -0800 Subject: [PATCH] Slightly modify the public domain license to keep it in the public domain, but make it clear that even when dedications might not be recognized that the code is still usable. Given that this isn't dual-licensing under a different license, I'm hoping this will be acceptable. --- docs/stb_howto.txt | 6 +++--- docs/why_public_domain.md | 6 +++--- stb.h | 6 +++--- stb_c_lexer.h | 6 +++--- stb_divide.h | 6 +++--- stb_dxt.h | 6 +++--- stb_easy_font.h | 6 +++--- stb_herringbone_wang_tile.h | 6 +++--- stb_image.h | 6 +++--- stb_image_resize.h | 6 +++--- stb_image_write.h | 6 +++--- stb_leakcheck.h | 6 +++--- stb_perlin.h | 6 +++--- stb_rect_pack.h | 6 +++--- stb_textedit.h | 6 +++--- stb_tilemap_editor.h | 6 +++--- stb_truetype.h | 6 +++--- stb_vorbis.c | 6 +++--- stb_voxel_render.h | 6 +++--- stretchy_buffer.h | 6 +++--- 20 files changed, 60 insertions(+), 60 deletions(-) diff --git a/docs/stb_howto.txt b/docs/stb_howto.txt index d0e8ec8..a969b54 100644 --- a/docs/stb_howto.txt +++ b/docs/stb_howto.txt @@ -165,9 +165,9 @@ public domain declarations aren't necessary recognized in the USA and some other locations. For that reason, I recommend a declaration along these lines: -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy -// and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. I typically place this declaration at the end of the initial comment block of the file and just say 'public domain' diff --git a/docs/why_public_domain.md b/docs/why_public_domain.md index 8636921..56cef39 100644 --- a/docs/why_public_domain.md +++ b/docs/why_public_domain.md @@ -95,9 +95,9 @@ public domain declarations aren't necessary recognized in the USA and some other locations. For that reason, I recommend a declaration along these lines: -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy -// and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. I typically place this declaration at the end of the initial comment block of the file and just say 'public domain' diff --git a/stb.h b/stb.h index 4b28ae1..11350ba 100644 --- a/stb.h +++ b/stb.h @@ -171,9 +171,9 @@ Parenthesized items have since been removed. LICENSE -This software is in the public domain. Where that dedication is not -recognized, you are granted a perpetual, irrevocable license to copy, -distribute, and modify this file as you see fit. +This software is dual-licensed to the public domain and under the following +license: you are granted a perpetual, irrevocable license to copy, modify, +publish, and distribute this file as you see fit. CREDITS diff --git a/stb_c_lexer.h b/stb_c_lexer.h index f6a0035..e91c6c3 100644 --- a/stb_c_lexer.h +++ b/stb_c_lexer.h @@ -32,9 +32,9 @@ // // LICENSE // -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy, -// distribute, and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. #ifndef STB_C_LEXER_DEFINITIONS // to change the default parsing rules, copy the following lines diff --git a/stb_divide.h b/stb_divide.h index 4e35abe..d1702f3 100644 --- a/stb_divide.h +++ b/stb_divide.h @@ -78,9 +78,9 @@ // // LICENSE // -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy, -// distribute, and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. #ifndef INCLUDE_STB_DIVIDE_H diff --git a/stb_dxt.h b/stb_dxt.h index 418ba65..0a8b34a 100644 --- a/stb_dxt.h +++ b/stb_dxt.h @@ -19,9 +19,9 @@ // // LICENSE // -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy, -// distribute, and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. #ifndef STB_INCLUDE_STB_DXT_H #define STB_INCLUDE_STB_DXT_H diff --git a/stb_easy_font.h b/stb_easy_font.h index 2fad91f..45bddc9 100644 --- a/stb_easy_font.h +++ b/stb_easy_font.h @@ -67,9 +67,9 @@ // // LICENSE // -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy, -// distribute, and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. // // VERSION HISTORY // diff --git a/stb_herringbone_wang_tile.h b/stb_herringbone_wang_tile.h index de7fb20..ba2cf60 100644 --- a/stb_herringbone_wang_tile.h +++ b/stb_herringbone_wang_tile.h @@ -3,9 +3,9 @@ == LICENSE ============================== -This software is in the public domain. Where that dedication is not -recognized, you are granted a perpetual, irrevocable license to copy, -distribute, and modify this file as you see fit. +This software is dual-licensed to the public domain and under the following +license: you are granted a perpetual, irrevocable license to copy, modify, +publish, and distribute this file as you see fit. == WHAT IT IS =========================== diff --git a/stb_image.h b/stb_image.h index e06f7a1..44e1d56 100644 --- a/stb_image.h +++ b/stb_image.h @@ -209,9 +209,9 @@ LICENSE -This software is in the public domain. Where that dedication is not -recognized, you are granted a perpetual, irrevocable license to copy, -distribute, and modify this file as you see fit. +This software is dual-licensed to the public domain and under the following +license: you are granted a perpetual, irrevocable license to copy, modify, +publish, and distribute this file as you see fit. */ diff --git a/stb_image_resize.h b/stb_image_resize.h index 4ce7ddb..b0699ba 100644 --- a/stb_image_resize.h +++ b/stb_image_resize.h @@ -160,9 +160,9 @@ LICENSE - This software is in the public domain. Where that dedication is not - recognized, you are granted a perpetual, irrevocable license to copy, - distribute, and modify this file as you see fit. + This software is dual-licensed to the public domain and under the following + license: you are granted a perpetual, irrevocable license to copy, modify, + publish, and distribute this file as you see fit. TODO Don't decode all of the image data when only processing a partial tile diff --git a/stb_image_write.h b/stb_image_write.h index 98fa410..6b5a455 100644 --- a/stb_image_write.h +++ b/stb_image_write.h @@ -105,9 +105,9 @@ CREDITS: LICENSE -This software is in the public domain. Where that dedication is not -recognized, you are granted a perpetual, irrevocable license to copy, -distribute, and modify this file as you see fit. +This software is dual-licensed to the public domain and under the following +license: you are granted a perpetual, irrevocable license to copy, modify, +publish, and distribute this file as you see fit. */ diff --git a/stb_leakcheck.h b/stb_leakcheck.h index 7e49fc9..d14c52d 100644 --- a/stb_leakcheck.h +++ b/stb_leakcheck.h @@ -1,9 +1,9 @@ // stb_leakcheck.h - v0.2 - quick & dirty malloc leak-checking - public domain // LICENSE // -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy, -// distribute, and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. #ifdef STB_LEAKCHECK_IMPLEMENTATION #undef STB_LEAKCHECK_IMPLEMENTATION // don't implenment more than once diff --git a/stb_perlin.h b/stb_perlin.h index 399e438..0dac7d9 100644 --- a/stb_perlin.h +++ b/stb_perlin.h @@ -3,9 +3,9 @@ // // LICENSE // -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy, -// distribute, and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. // // // to create the implementation, diff --git a/stb_rect_pack.h b/stb_rect_pack.h index c61de89..bd1cfc6 100644 --- a/stb_rect_pack.h +++ b/stb_rect_pack.h @@ -41,9 +41,9 @@ // // LICENSE // -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy, -// distribute, and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. ////////////////////////////////////////////////////////////////////////////// // diff --git a/stb_textedit.h b/stb_textedit.h index 6740b91..d932e9a 100644 --- a/stb_textedit.h +++ b/stb_textedit.h @@ -17,9 +17,9 @@ // // LICENSE // -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy, -// distribute, and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. // // // DEPENDENCIES diff --git a/stb_tilemap_editor.h b/stb_tilemap_editor.h index b244c9d..cc66dd5 100644 --- a/stb_tilemap_editor.h +++ b/stb_tilemap_editor.h @@ -316,9 +316,9 @@ // // LICENSE // -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy, -// distribute, and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. diff --git a/stb_truetype.h b/stb_truetype.h index bfb1841..57a38e6 100644 --- a/stb_truetype.h +++ b/stb_truetype.h @@ -68,9 +68,9 @@ // // LICENSE // -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy, -// distribute, and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. // // USAGE // diff --git a/stb_vorbis.c b/stb_vorbis.c index d54087f..45540a0 100644 --- a/stb_vorbis.c +++ b/stb_vorbis.c @@ -9,9 +9,9 @@ // // LICENSE // -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy, -// distribute, and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. // // 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. diff --git a/stb_voxel_render.h b/stb_voxel_render.h index 29f6fb7..bfa9902 100644 --- a/stb_voxel_render.h +++ b/stb_voxel_render.h @@ -215,9 +215,9 @@ // // LICENSE // -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy, -// distribute, and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. #ifndef INCLUDE_STB_VOXEL_RENDER_H #define INCLUDE_STB_VOXEL_RENDER_H diff --git a/stretchy_buffer.h b/stretchy_buffer.h index b99c685..b9a493c 100644 --- a/stretchy_buffer.h +++ b/stretchy_buffer.h @@ -164,9 +164,9 @@ // // LICENSE // -// This software is in the public domain. Where that dedication is not -// recognized, you are granted a perpetual, irrevocable license to copy, -// distribute, and modify this file as you see fit. +// This software is dual-licensed to the public domain and under the following +// license: you are granted a perpetual, irrevocable license to copy, modify, +// publish, and distribute this file as you see fit. #ifndef STB_STRETCHY_BUFFER_H_INCLUDED #define STB_STRETCHY_BUFFER_H_INCLUDED