diff --git a/CMakeLists.txt b/CMakeLists.txt index a65a3ffe94..6c9293e3e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1026,7 +1026,6 @@ add_subdirectory( gerbview ) add_subdirectory( pcbnew ) add_subdirectory( polygon ) add_subdirectory( pagelayout_editor ) -add_subdirectory( potrace ) add_subdirectory( bitmap2component ) add_subdirectory( pcb_calculator ) add_subdirectory( plugins ) # 3D plugins must be built before kicad diff --git a/LICENSE.README b/LICENSE.README index 4b6c1bc81b..48b18da22b 100644 --- a/LICENSE.README +++ b/LICENSE.README @@ -12,13 +12,14 @@ You are free to use the *sources* under the terms of their respective licenses. Licensed under AGPLv3 (or later): - TTL [https://www.sintef.no/projectweb/geometry-toolkits/ttl/], sources in include/ttl/* Licensed under BOOSTv1: -- libcontext [https://github.com/boostorg/context], sources in common/system/libcontext.cpp +- libcontext [https://github.com/boostorg/context] in thirdparty/libcontext Licensed under ISC: - portions of code in include/geometry/polygon_triangulation.h Licensed under MIT: - tinyspline_lib in thirdparty/tinyspline_lib Licensed under GPLv2 (or later): - dxflib in thirdparty/dxflib_qcad +- potrace in thirdparty/potrace Licensed under ZLib: - nanosvg in thirdparty/nanosvg Licensed under CC-BY-SA-4.0: diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt index e08fb06052..1a2acc56ce 100644 --- a/bitmap2component/CMakeLists.txt +++ b/bitmap2component/CMakeLists.txt @@ -6,10 +6,7 @@ endif() add_definitions( -DBITMAP_2_CMP ) include_directories( BEFORE ${INC_BEFORE} ) -include_directories( - ../potrace - ${INC_AFTER} - ) +include_directories( ${INC_AFTER} ) set( BITMAP2COMPONENT_SRCS ../common/single_top.cpp diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index cda3001daa..5cd384dd16 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -356,17 +356,8 @@ if( BUILD_GITHUB_PLUGIN ) ) endif() -# Link-time optimization (LTO) on GCC conflicts with embedded assembly (__asm), -# following GCC's recommendation to disable LTO per translation unit. -if( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - set_source_files_properties( system/libcontext.cpp PROPERTIES - COMPILE_FLAGS "-fno-lto" - ) -endif() - set( COMMON_SRCS ${COMMON_SRCS} - system/libcontext.cpp view/view.cpp view/view_item.cpp @@ -409,8 +400,19 @@ set( COMMON_SRCS libeval/numeric_evaluator.cpp ) -add_library( common STATIC ${COMMON_SRCS} ) + +add_library( common STATIC + ${COMMON_SRCS} + $ + ) + +target_include_directories( common PRIVATE + $ + ) + +add_dependencies( common libcontext ) add_dependencies( common version_header ) + target_link_libraries( common bitmaps polygon diff --git a/include/tool/coroutine.h b/include/tool/coroutine.h index 7cd0450176..73150bb386 100644 --- a/include/tool/coroutine.h +++ b/include/tool/coroutine.h @@ -35,7 +35,7 @@ #endif #include -#include +#include #include /** diff --git a/potrace/CMakeLists.txt b/potrace/CMakeLists.txt deleted file mode 100644 index 476bb0702c..0000000000 --- a/potrace/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -include_directories(BEFORE ${INC_BEFORE}) -include_directories( - ${INC_AFTER} - ) - -set(POTRACE_SRCS - bitmap_io.cpp - curve.cpp - decompose.cpp - greymap.cpp - potracelib.cpp - render.cpp - trace.cpp - ) - -add_library(potrace STATIC ${POTRACE_SRCS}) diff --git a/qa/common/CMakeLists.txt b/qa/common/CMakeLists.txt index 71dd152a12..487a613cbf 100644 --- a/qa/common/CMakeLists.txt +++ b/qa/common/CMakeLists.txt @@ -77,16 +77,25 @@ set( common_libs add_executable( qa_common_gerbview ${common_srcs} ) target_link_libraries( qa_common_gerbview ${common_libs} ) target_compile_definitions( qa_common_gerbview PRIVATE GERBVIEW ) +target_include_directories( qa_common_gerbview PRIVATE + $ +) # Use code with PCBNEW defines in place add_executable( qa_common_pcbnew ${common_srcs} ) target_link_libraries( qa_common_pcbnew ${common_libs} ) target_compile_definitions( qa_common_pcbnew PRIVATE PCBNEW ) +target_include_directories( qa_common_pcbnew PRIVATE + $ +) # Use code with EESCHEMA defines in place add_executable( qa_common_eeschema ${common_srcs} ) target_link_libraries( qa_common_eeschema ${common_libs} ) target_compile_definitions( qa_common_eeschema PRIVATE EESCHEMA ) +target_include_directories( qa_common_eeschema PRIVATE + $ +) include_directories( ${CMAKE_SOURCE_DIR} @@ -97,4 +106,4 @@ include_directories( kicad_add_boost_test( qa_common_eeschema common_eeschema ) kicad_add_boost_test( qa_common_pcbnew common_pcbnew ) -kicad_add_boost_test( qa_common_gerbview qa_common_gerbview ) \ No newline at end of file +kicad_add_boost_test( qa_common_gerbview qa_common_gerbview ) diff --git a/qa/common_tools/CMakeLists.txt b/qa/common_tools/CMakeLists.txt index 959eb77447..60acf0d330 100644 --- a/qa/common_tools/CMakeLists.txt +++ b/qa/common_tools/CMakeLists.txt @@ -59,4 +59,8 @@ target_compile_definitions( qa_common_tools PRIVATE PCBNEW ) -kicad_add_utils_executable( qa_common_tools ) \ No newline at end of file +target_include_directories( qa_common_tools PRIVATE + $ +) + +kicad_add_utils_executable( qa_common_tools ) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index f2f8f903a4..c3fb08d757 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -23,6 +23,8 @@ add_subdirectory( dxflib_qcad ) +add_subdirectory( libcontext ) add_subdirectory( markdown2html ) add_subdirectory( nanosvg ) add_subdirectory( tinyspline_lib ) +add_subdirectory( potrace ) diff --git a/thirdparty/libcontext/CMakeLists.txt b/thirdparty/libcontext/CMakeLists.txt new file mode 100644 index 0000000000..80e0d0dd71 --- /dev/null +++ b/thirdparty/libcontext/CMakeLists.txt @@ -0,0 +1,19 @@ +# The libcontext library is only included inside common, so we create it as an +# object library and then add the objects to common. + +# Link-time optimization (LTO) on GCC conflicts with embedded assembly (__asm), +# following GCC's recommendation to disable LTO per translation unit. +if( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + set_source_files_properties( libcontext.cpp PROPERTIES + COMPILE_FLAGS "-fno-lto" + ) +endif() + + +add_library( libcontext OBJECT + libcontext.cpp + ) + +target_include_directories( libcontext PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ) diff --git a/thirdparty/libcontext/LICENSE.BOOSTv1_0 b/thirdparty/libcontext/LICENSE.BOOSTv1_0 new file mode 100644 index 0000000000..36b7cd93cd --- /dev/null +++ b/thirdparty/libcontext/LICENSE.BOOSTv1_0 @@ -0,0 +1,23 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/thirdparty/libcontext/README.txt b/thirdparty/libcontext/README.txt new file mode 100644 index 0000000000..a3247bd159 --- /dev/null +++ b/thirdparty/libcontext/README.txt @@ -0,0 +1,3 @@ +This directory contains modified context switching code from the Boost library. + +It is licensed under the Boost Software License, with the license text in this directory. diff --git a/common/system/libcontext.cpp b/thirdparty/libcontext/libcontext.cpp similarity index 99% rename from common/system/libcontext.cpp rename to thirdparty/libcontext/libcontext.cpp index 5b3c358f03..9904f78aef 100644 --- a/common/system/libcontext.cpp +++ b/thirdparty/libcontext/libcontext.cpp @@ -15,7 +15,7 @@ */ #include #include -#include +#include #if defined(LIBCONTEXT_PLATFORM_windows_i386) && defined(LIBCONTEXT_COMPILER_gcc) __asm ( diff --git a/include/system/libcontext.h b/thirdparty/libcontext/libcontext.h similarity index 100% rename from include/system/libcontext.h rename to thirdparty/libcontext/libcontext.h diff --git a/potrace/AUTHORS b/thirdparty/potrace/AUTHORS similarity index 100% rename from potrace/AUTHORS rename to thirdparty/potrace/AUTHORS diff --git a/thirdparty/potrace/CMakeLists.txt b/thirdparty/potrace/CMakeLists.txt new file mode 100644 index 0000000000..6ab8cd660b --- /dev/null +++ b/thirdparty/potrace/CMakeLists.txt @@ -0,0 +1,16 @@ +set(POTRACE_SRCS + src/bitmap_io.cpp + src/curve.cpp + src/decompose.cpp + src/greymap.cpp + src/potracelib.cpp + src/render.cpp + src/trace.cpp + ) + +add_library( potrace STATIC ${POTRACE_SRCS} ) + +target_include_directories( potrace + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/include + ) diff --git a/thirdparty/potrace/LICENSE.GPLv2 b/thirdparty/potrace/LICENSE.GPLv2 new file mode 100644 index 0000000000..d159169d10 --- /dev/null +++ b/thirdparty/potrace/LICENSE.GPLv2 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/thirdparty/potrace/README.txt b/thirdparty/potrace/README.txt new file mode 100644 index 0000000000..2658c0b665 --- /dev/null +++ b/thirdparty/potrace/README.txt @@ -0,0 +1,3 @@ +This directory contains the potrace library from http://potrace.sourceforge.net/. + +It is licensed under GPLv2, with the license text in this directory. diff --git a/potrace/auxiliary.h b/thirdparty/potrace/include/auxiliary.h similarity index 100% rename from potrace/auxiliary.h rename to thirdparty/potrace/include/auxiliary.h diff --git a/potrace/bitmap.h b/thirdparty/potrace/include/bitmap.h similarity index 100% rename from potrace/bitmap.h rename to thirdparty/potrace/include/bitmap.h diff --git a/potrace/bitmap_io.h b/thirdparty/potrace/include/bitmap_io.h similarity index 100% rename from potrace/bitmap_io.h rename to thirdparty/potrace/include/bitmap_io.h diff --git a/potrace/bitops.h b/thirdparty/potrace/include/bitops.h similarity index 100% rename from potrace/bitops.h rename to thirdparty/potrace/include/bitops.h diff --git a/potrace/curve.h b/thirdparty/potrace/include/curve.h similarity index 100% rename from potrace/curve.h rename to thirdparty/potrace/include/curve.h diff --git a/potrace/decompose.h b/thirdparty/potrace/include/decompose.h similarity index 100% rename from potrace/decompose.h rename to thirdparty/potrace/include/decompose.h diff --git a/potrace/greymap.h b/thirdparty/potrace/include/greymap.h similarity index 100% rename from potrace/greymap.h rename to thirdparty/potrace/include/greymap.h diff --git a/potrace/lists.h b/thirdparty/potrace/include/lists.h similarity index 100% rename from potrace/lists.h rename to thirdparty/potrace/include/lists.h diff --git a/potrace/platform.h b/thirdparty/potrace/include/platform.h similarity index 100% rename from potrace/platform.h rename to thirdparty/potrace/include/platform.h diff --git a/potrace/potrace_version.h b/thirdparty/potrace/include/potrace_version.h similarity index 100% rename from potrace/potrace_version.h rename to thirdparty/potrace/include/potrace_version.h diff --git a/potrace/potracelib.h b/thirdparty/potrace/include/potracelib.h similarity index 100% rename from potrace/potracelib.h rename to thirdparty/potrace/include/potracelib.h diff --git a/potrace/progress.h b/thirdparty/potrace/include/progress.h similarity index 100% rename from potrace/progress.h rename to thirdparty/potrace/include/progress.h diff --git a/potrace/render.h b/thirdparty/potrace/include/render.h similarity index 100% rename from potrace/render.h rename to thirdparty/potrace/include/render.h diff --git a/potrace/trace.h b/thirdparty/potrace/include/trace.h similarity index 100% rename from potrace/trace.h rename to thirdparty/potrace/include/trace.h diff --git a/potrace/bitmap_io.cpp b/thirdparty/potrace/src/bitmap_io.cpp similarity index 100% rename from potrace/bitmap_io.cpp rename to thirdparty/potrace/src/bitmap_io.cpp diff --git a/potrace/curve.cpp b/thirdparty/potrace/src/curve.cpp similarity index 100% rename from potrace/curve.cpp rename to thirdparty/potrace/src/curve.cpp diff --git a/potrace/decompose.cpp b/thirdparty/potrace/src/decompose.cpp similarity index 100% rename from potrace/decompose.cpp rename to thirdparty/potrace/src/decompose.cpp diff --git a/potrace/greymap.cpp b/thirdparty/potrace/src/greymap.cpp similarity index 100% rename from potrace/greymap.cpp rename to thirdparty/potrace/src/greymap.cpp diff --git a/potrace/potracelib.cpp b/thirdparty/potrace/src/potracelib.cpp similarity index 100% rename from potrace/potracelib.cpp rename to thirdparty/potrace/src/potracelib.cpp diff --git a/potrace/render.cpp b/thirdparty/potrace/src/render.cpp similarity index 100% rename from potrace/render.cpp rename to thirdparty/potrace/src/render.cpp diff --git a/potrace/trace.cpp b/thirdparty/potrace/src/trace.cpp similarity index 100% rename from potrace/trace.cpp rename to thirdparty/potrace/src/trace.cpp