[Bf-blender-cvs] [ed7104ac4a8] greasepencil-object: GP: Update GP to use potrace from SVN/System

Ray Molenkamp noreply at git.blender.org
Thu Sep 17 16:34:24 CEST 2020 

Commit: ed7104ac4a8c526257aa16a28750385e2381b06c
Author: Ray Molenkamp
Date:   Thu Sep 17 08:34:14 2020 -0600
Branches: greasepencil-object
https://developer.blender.org/rBed7104ac4a8c526257aa16a28750385e2381b06c

GP: Update GP to use potrace from SVN/System

and remove it from /extern

===================================================================

M	extern/CMakeLists.txt
D	extern/potrace/AUTHORS
D	extern/potrace/CMakeLists.txt
D	extern/potrace/COPYING
D	extern/potrace/ChangeLog
D	extern/potrace/INSTALL
D	extern/potrace/Makefile.am
D	extern/potrace/Makefile.in
D	extern/potrace/NEWS
D	extern/potrace/README
D	extern/potrace/README-WIN
D	extern/potrace/aclocal.m4
D	extern/potrace/check/Makefile.am
D	extern/potrace/check/Makefile.in
D	extern/potrace/check/backend-check.sh
D	extern/potrace/check/binary-check.sh
D	extern/potrace/check/checkbin.c
D	extern/potrace/check/data/data1-out.pgm
D	extern/potrace/check/data/data1.bmp1
D	extern/potrace/check/data/data1.bmp24
D	extern/potrace/check/data/data1.bmp24td
D	extern/potrace/check/data/data1.bmp24v5
D	extern/potrace/check/data/data1.bmp32
D	extern/potrace/check/data/data1.bmp32bf
D	extern/potrace/check/data/data1.bmp4
D	extern/potrace/check/data/data1.bmp4r
D	extern/potrace/check/data/data1.bmp8
D	extern/potrace/check/data/data1.bmp8r
D	extern/potrace/check/data/data1.pbm
D	extern/potrace/check/data/data1.pbm.gs
D	extern/potrace/check/data/data1.pbm.plain
D	extern/potrace/check/data/data1.pbm.rot
D	extern/potrace/check/data/data1.pgm
D	extern/potrace/check/data/data1.pgm.inv
D	extern/potrace/check/data/data1.pgm.plain
D	extern/potrace/check/data/data1.pgm.rot
D	extern/potrace/check/data/data1.ppm
D	extern/potrace/check/data/data1.ppm.plain
D	extern/potrace/check/data/data2-out1.pbm
D	extern/potrace/check/data/data2-out2.pbm
D	extern/potrace/check/data/data2.bmp32bf
D	extern/potrace/check/data/data2.ppm
D	extern/potrace/check/data/data3.pgm
D	extern/potrace/check/input-check.sh
D	extern/potrace/check/missing.sh
D	extern/potrace/check/mkbitmap-check.sh
D	extern/potrace/check/mkbitmap-input-check.sh
D	extern/potrace/check/pdf-check.sh
D	extern/potrace/check/pgmdiff.c
D	extern/potrace/check/postscript-check.sh
D	extern/potrace/check/potrace-check.sh
D	extern/potrace/compile
D	extern/potrace/config.guess
D	extern/potrace/config.h.in
D	extern/potrace/config.sub
D	extern/potrace/configure
D	extern/potrace/configure.ac
D	extern/potrace/depcomp
D	extern/potrace/doc/Makefile.am
D	extern/potrace/doc/Makefile.in
D	extern/potrace/doc/dictionary.txt
D	extern/potrace/doc/mkbitmap.1.in
D	extern/potrace/doc/placement.pdf
D	extern/potrace/doc/potrace.1.in
D	extern/potrace/doc/potracelib-fig1a.eps
D	extern/potrace/doc/potracelib-fig1b.eps
D	extern/potrace/doc/potracelib-fig2.eps
D	extern/potrace/doc/potracelib-fig3.eps
D	extern/potrace/doc/potracelib-fig4a.eps
D	extern/potrace/doc/potracelib-fig4b.eps
D	extern/potrace/doc/potracelib-fig5.eps
D	extern/potrace/doc/potracelib-fig6a.eps
D	extern/potrace/doc/potracelib-fig6b.eps
D	extern/potrace/doc/potracelib-fig7-00.eps
D	extern/potrace/doc/potracelib-fig7-06.eps
D	extern/potrace/doc/potracelib-fig7-10.eps
D	extern/potrace/doc/potracelib-fig7-12.eps
D	extern/potrace/doc/potracelib-fig7-13.eps
D	extern/potrace/doc/potracelib-fig8.eps
D	extern/potrace/doc/potracelib.tex
D	extern/potrace/install-sh
D	extern/potrace/ltmain.sh
D	extern/potrace/m4/libtool.m4
D	extern/potrace/m4/ltoptions.m4
D	extern/potrace/m4/ltsugar.m4
D	extern/potrace/m4/ltversion.m4
D	extern/potrace/m4/lt~obsolete.m4
D	extern/potrace/missing
D	extern/potrace/mkinstalldirs
D	extern/potrace/src/Makefile.am
D	extern/potrace/src/Makefile.in
D	extern/potrace/src/auxiliary.h
D	extern/potrace/src/backend_dxf.c
D	extern/potrace/src/backend_dxf.h
D	extern/potrace/src/backend_eps.c
D	extern/potrace/src/backend_eps.h
D	extern/potrace/src/backend_geojson.c
D	extern/potrace/src/backend_geojson.h
D	extern/potrace/src/backend_pdf.c
D	extern/potrace/src/backend_pdf.h
D	extern/potrace/src/backend_pgm.c
D	extern/potrace/src/backend_pgm.h
D	extern/potrace/src/backend_svg.c
D	extern/potrace/src/backend_svg.h
D	extern/potrace/src/backend_xfig.c
D	extern/potrace/src/backend_xfig.h
D	extern/potrace/src/bbox.c
D	extern/potrace/src/bbox.h
D	extern/potrace/src/bitmap.h
D	extern/potrace/src/bitmap_io.c
D	extern/potrace/src/bitmap_io.h
D	extern/potrace/src/bitops.h
D	extern/potrace/src/curve.c
D	extern/potrace/src/curve.h
D	extern/potrace/src/decompose.c
D	extern/potrace/src/decompose.h
D	extern/potrace/src/flate.c
D	extern/potrace/src/flate.h
D	extern/potrace/src/getopt.c
D	extern/potrace/src/getopt1.c
D	extern/potrace/src/greymap.c
D	extern/potrace/src/greymap.h
D	extern/potrace/src/include/getopt/getopt.h
D	extern/potrace/src/libpotrace-export.sym
D	extern/potrace/src/lists.h
D	extern/potrace/src/lzw.c
D	extern/potrace/src/lzw.h
D	extern/potrace/src/main.c
D	extern/potrace/src/main.h
D	extern/potrace/src/mkbitmap.c
D	extern/potrace/src/platform.h
D	extern/potrace/src/potracelib.c
D	extern/potrace/src/potracelib.h
D	extern/potrace/src/potracelib_demo.c
D	extern/potrace/src/progress.h
D	extern/potrace/src/progress_bar.c
D	extern/potrace/src/progress_bar.h
D	extern/potrace/src/render.c
D	extern/potrace/src/render.h
D	extern/potrace/src/trace.c
D	extern/potrace/src/trace.h
D	extern/potrace/src/trans.c
D	extern/potrace/src/trans.h
D	extern/potrace/test-driver
M	source/blender/editors/gpencil/CMakeLists.txt
M	source/blender/editors/gpencil/gpencil_ops.c

===================================================================

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index bddcd02b0a4..235c2fa931a 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -109,5 +109,3 @@ endif()
 if(WITH_MOD_FLUID)
   add_subdirectory(mantaflow)
 endif()
-
-add_subdirectory(potrace)
diff --git a/extern/potrace/AUTHORS b/extern/potrace/AUTHORS
deleted file mode 100644
index f6b22007218..00000000000
--- a/extern/potrace/AUTHORS
+++ /dev/null
@@ -1,11 +0,0 @@
-Known contributors are listed here, in alphabetical order by their
-abbreviations (which are used in Changelog).
-
-Main author:
-
- PS1 Peter Selinger <selinger at users.sourceforge.net>
-
-Contributors:
-
- CH1 Christoph Hormann <chris_hormann at gmx.de> (GeoJSON backend)
- TA1 Tor Andersson <tor at ghostscript.com> (PDF backend)
diff --git a/extern/potrace/CMakeLists.txt b/extern/potrace/CMakeLists.txt
deleted file mode 100644
index 79b96678dfd..00000000000
--- a/extern/potrace/CMakeLists.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# 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.
-#
-# The Original Code is Copyright (C) 2020, Blender Foundation
-# All rights reserved.
-# ***** END GPL LICENSE BLOCK *****
-
-set(INC
-  src
-  src/include
-)
-
-set(INC_SYS
-
-)
-
-set(SRC
-  src/backend_dxf.c
-  src/backend_eps.c
-  src/backend_geojson.c
-  src/backend_pdf.c
-  src/backend_pgm.c
-  src/backend_svg.c
-  src/backend_xfig.c
-  src/bbox.c
-  src/bitmap_io.c
-  src/curve.c
-  src/decompose.c
-  src/flate.c
-  #src/getopt.c
-  #src/getopt1.c
-  src/greymap.c
-  src/lzw.c
-  #src/mkbitmap.c
-  src/potracelib.c
-  src/progress_bar.c
-  src/render.c
-  src/trace.c
-  src/trans.c
-)
-set(LIB
-)
-
-if(WIN32)
-  add_definitions(/D_USE_MATH_DEFINES)
-endif()
-
-# normally given by configure.sh
-add_definitions(/DPOTRACE="POTrace")
-add_definitions(/DVERSION="Blender")
-add_definitions(/DHAVE_INTTYPES_H)
-
-blender_add_lib(extern_potrace "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
-
-#demo for testing the library, can be removed 
-#add_executable(potrace src/potracelib_demo.c)
-#target_link_libraries(potrace extern_potrace)
diff --git a/extern/potrace/COPYING b/extern/potrace/COPYING
deleted file mode 100644
index 4c1337ff7df..00000000000
--- a/extern/potrace/COPYING
+++ /dev/null
@@ -1,341 +0,0 @@
-		    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 Library 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 

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list