diff --git a/COPYING b/COPYING index d159169..0a04128 100644 --- a/COPYING +++ b/COPYING @@ -1,339 +1,165 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 2007 Free Software Foundation, Inc. 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. + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser 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 +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/LATEST.md b/LATEST.md index 97f3cee..62f977d 100644 --- a/LATEST.md +++ b/LATEST.md @@ -1,3 +1,5 @@ -Changes in v1.3.2 +Changes in v1.4.0 ------------------ -- bug fix with spaces at end of string causing failure on open_device in Fortran interface (#35) +- added mp4 driver, can simply give "file.mp4" as the device to generate mp4 file +- can amend flags to ffmpeg using GIZA_FFMPEG_FLAGS environment variable +- automated cleanup of temporary .png files used to make the movie diff --git a/configure b/configure index 7960019..14938fd 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for giza 1.3.2. +# Generated by GNU Autoconf 2.71 for giza 1.4.0. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='giza' PACKAGE_TARNAME='giza' -PACKAGE_VERSION='1.3.2' -PACKAGE_STRING='giza 1.3.2' +PACKAGE_VERSION='1.4.0' +PACKAGE_STRING='giza 1.4.0' PACKAGE_BUGREPORT='daniel.price@monash.edu' PACKAGE_URL='http://danieljprice.github.io/giza' @@ -1386,7 +1386,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures giza 1.3.2 to adapt to many kinds of systems. +\`configure' configures giza 1.4.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1457,7 +1457,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of giza 1.3.2:";; + short | recursive ) echo "Configuration of giza 1.4.0:";; esac cat <<\_ACEOF @@ -1587,7 +1587,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -giza configure 1.3.2 +giza configure 1.4.0 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1891,7 +1891,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by giza $as_me 1.3.2, which was +It was created by giza $as_me 1.4.0, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3161,7 +3161,7 @@ fi # Define the identity of the package. PACKAGE='giza' - VERSION='1.3.2' + VERSION='1.4.0' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -4810,9 +4810,9 @@ ac_config_headers="$ac_config_headers config.h" GIZA_VERSION_MAJOR=1 -GIZA_VERSION_MINOR=3 +GIZA_VERSION_MINOR=4 -GIZA_VERSION_MICRO=2 +GIZA_VERSION_MICRO=0 # # The following specify the interface version numbers for giza. @@ -4828,7 +4828,7 @@ GIZA_VERSION_MICRO=2 # LT_CURRENT=1 -LT_REVISION=2 +LT_REVISION=0 LT_AGE=1 @@ -16970,7 +16970,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by giza $as_me 1.3.2, which was +This file was extended by giza $as_me 1.4.0, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17039,7 +17039,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -giza config.status 1.3.2 +giza config.status 1.4.0 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index aa81138..3becaec 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.61) m4_define(giza_version_major,1) -m4_define(giza_version_minor,3) -m4_define(giza_version_micro,2) +m4_define(giza_version_minor,4) +m4_define(giza_version_micro,0) AC_INIT([giza], [giza_version_major.giza_version_minor.giza_version_micro], [daniel.price@monash.edu],[], diff --git a/docs/documentation/api.html b/docs/documentation/api.html index dd66c11..b351d49 100644 --- a/docs/documentation/api.html +++ b/docs/documentation/api.html @@ -249,6 +249,8 @@

Input:

/png :Portable Network Graphics file +/mp4 :Mpeg4 movie [requires ffmpeg support] + /svg :Scalable Vector Graphics file /pdf :Portable Document Format diff --git a/docs/index.html b/docs/index.html index 8320412..a9d164f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -24,8 +24,8 @@

Overview

Giza is an open, lightweight scientific plotting library built on top of cairo that provides uniform output to multiple devices.
Giza is currently distributed under - the - GPLv2 licence. It is written in standard ANSI C and has bindings for Fortran 90/95/2003.
+ the + LGPL license. It is written in standard ANSI C and has bindings for Fortran 90/95/2003.
Devices currently supported by giza are: the X Window system, PDF, PostScript, eps, png and svg.

diff --git a/docs/news/index.html b/docs/news/index.html index 2b1a6ea..81f2a0d 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -21,6 +21,8 @@

News

+

2023.11.28: 1.4.0 released.

+

2022.03.28: 1.3.2 released.

2022.01.28: 1.3.1 released.

2022.01.27: 1.3.0 released.

2021.06.18: 1.2.1 released.

diff --git a/src/Makefile.am b/src/Makefile.am index 7f62a49..e4fc57a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ libgiza_la_SOURCES = giza-annotate.c giza-arrow-style.c giza-arrow.c giza-axis.c giza-cursor-routines.c giza-device-has-cursor.c \ giza-draw-background.c giza-draw.c giza-driver-eps.c \ giza-driver-null.c giza-driver-pdf.c giza-driver-png.c \ - giza-driver-ps.c giza-driver-svg.c giza-driver-xw.c \ + giza-driver-mp4.c giza-driver-ps.c giza-driver-svg.c giza-driver-xw.c \ giza-drivers.c giza-environment.c giza-error-bars.c giza-fill.c \ giza-format-number.c giza-function-t.c giza-function-x.c \ giza-function-y.c giza-get-key-press.c giza-get-surface-size.c \ @@ -32,7 +32,7 @@ libgiza_la_SOURCES = giza-annotate.c giza-arrow-style.c giza-arrow.c giza-axis.c giza-driver-eps-private.h giza-line-style-private.h giza-version.h \ giza-driver-null-private.h giza-private.h giza-viewport-private.h \ giza-driver-pdf-private.h giza-render-private.h giza-warnings-private.h \ - giza-driver-png-private.h giza-set-font-private.h giza-window-private.h \ + giza-driver-png-private.h giza-driver-mp4-private.h giza-set-font-private.h giza-window-private.h \ giza-driver-ps-private.h giza-shared.h giza.h giza-itf.h libgiza_la_CPPFLAGS = $(X11_CFLAGS) $(CAIRO_CFLAGS) $(FT_CFLAGS) $(FC_CFLAGS) diff --git a/src/Makefile.in b/src/Makefile.in index 2b208e7..4967ff7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -160,12 +160,13 @@ am_libgiza_la_OBJECTS = libgiza_la-giza-annotate.lo \ libgiza_la-giza-draw-background.lo libgiza_la-giza-draw.lo \ libgiza_la-giza-driver-eps.lo libgiza_la-giza-driver-null.lo \ libgiza_la-giza-driver-pdf.lo libgiza_la-giza-driver-png.lo \ - libgiza_la-giza-driver-ps.lo libgiza_la-giza-driver-svg.lo \ - libgiza_la-giza-driver-xw.lo libgiza_la-giza-drivers.lo \ - libgiza_la-giza-environment.lo libgiza_la-giza-error-bars.lo \ - libgiza_la-giza-fill.lo libgiza_la-giza-format-number.lo \ - libgiza_la-giza-function-t.lo libgiza_la-giza-function-x.lo \ - libgiza_la-giza-function-y.lo libgiza_la-giza-get-key-press.lo \ + libgiza_la-giza-driver-mp4.lo libgiza_la-giza-driver-ps.lo \ + libgiza_la-giza-driver-svg.lo libgiza_la-giza-driver-xw.lo \ + libgiza_la-giza-drivers.lo libgiza_la-giza-environment.lo \ + libgiza_la-giza-error-bars.lo libgiza_la-giza-fill.lo \ + libgiza_la-giza-format-number.lo libgiza_la-giza-function-t.lo \ + libgiza_la-giza-function-x.lo libgiza_la-giza-function-y.lo \ + libgiza_la-giza-get-key-press.lo \ libgiza_la-giza-get-surface-size.lo libgiza_la-giza-io.lo \ libgiza_la-giza-histogram.lo libgiza_la-giza-label.lo \ libgiza_la-giza-line-cap.lo libgiza_la-giza-line-style.lo \ @@ -231,6 +232,7 @@ am__depfiles_remade = ./$(DEPDIR)/libcpgplot_la-giza-cpgplot.Plo \ ./$(DEPDIR)/libgiza_la-giza-draw-background.Plo \ ./$(DEPDIR)/libgiza_la-giza-draw.Plo \ ./$(DEPDIR)/libgiza_la-giza-driver-eps.Plo \ + ./$(DEPDIR)/libgiza_la-giza-driver-mp4.Plo \ ./$(DEPDIR)/libgiza_la-giza-driver-null.Plo \ ./$(DEPDIR)/libgiza_la-giza-driver-pdf.Plo \ ./$(DEPDIR)/libgiza_la-giza-driver-png.Plo \ @@ -505,7 +507,7 @@ libgiza_la_SOURCES = giza-annotate.c giza-arrow-style.c giza-arrow.c giza-axis.c giza-cursor-routines.c giza-device-has-cursor.c \ giza-draw-background.c giza-draw.c giza-driver-eps.c \ giza-driver-null.c giza-driver-pdf.c giza-driver-png.c \ - giza-driver-ps.c giza-driver-svg.c giza-driver-xw.c \ + giza-driver-mp4.c giza-driver-ps.c giza-driver-svg.c giza-driver-xw.c \ giza-drivers.c giza-environment.c giza-error-bars.c giza-fill.c \ giza-format-number.c giza-function-t.c giza-function-x.c \ giza-function-y.c giza-get-key-press.c giza-get-surface-size.c \ @@ -525,7 +527,7 @@ libgiza_la_SOURCES = giza-annotate.c giza-arrow-style.c giza-arrow.c giza-axis.c giza-driver-eps-private.h giza-line-style-private.h giza-version.h \ giza-driver-null-private.h giza-private.h giza-viewport-private.h \ giza-driver-pdf-private.h giza-render-private.h giza-warnings-private.h \ - giza-driver-png-private.h giza-set-font-private.h giza-window-private.h \ + giza-driver-png-private.h giza-driver-mp4-private.h giza-set-font-private.h giza-window-private.h \ giza-driver-ps-private.h giza-shared.h giza.h giza-itf.h libgiza_la_CPPFLAGS = $(X11_CFLAGS) $(CAIRO_CFLAGS) $(FT_CFLAGS) $(FC_CFLAGS) @@ -658,6 +660,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_la-giza-draw-background.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_la-giza-draw.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_la-giza-driver-eps.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_la-giza-driver-mp4.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_la-giza-driver-null.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_la-giza-driver-pdf.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_la-giza-driver-png.Plo@am__quote@ # am--include-marker @@ -929,6 +932,13 @@ libgiza_la-giza-driver-png.lo: giza-driver-png.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgiza_la-giza-driver-png.lo `test -f 'giza-driver-png.c' || echo '$(srcdir)/'`giza-driver-png.c +libgiza_la-giza-driver-mp4.lo: giza-driver-mp4.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgiza_la-giza-driver-mp4.lo -MD -MP -MF $(DEPDIR)/libgiza_la-giza-driver-mp4.Tpo -c -o libgiza_la-giza-driver-mp4.lo `test -f 'giza-driver-mp4.c' || echo '$(srcdir)/'`giza-driver-mp4.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgiza_la-giza-driver-mp4.Tpo $(DEPDIR)/libgiza_la-giza-driver-mp4.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='giza-driver-mp4.c' object='libgiza_la-giza-driver-mp4.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgiza_la-giza-driver-mp4.lo `test -f 'giza-driver-mp4.c' || echo '$(srcdir)/'`giza-driver-mp4.c + libgiza_la-giza-driver-ps.lo: giza-driver-ps.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgiza_la-giza-driver-ps.lo -MD -MP -MF $(DEPDIR)/libgiza_la-giza-driver-ps.Tpo -c -o libgiza_la-giza-driver-ps.lo `test -f 'giza-driver-ps.c' || echo '$(srcdir)/'`giza-driver-ps.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgiza_la-giza-driver-ps.Tpo $(DEPDIR)/libgiza_la-giza-driver-ps.Plo @@ -1480,6 +1490,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/libgiza_la-giza-draw-background.Plo -rm -f ./$(DEPDIR)/libgiza_la-giza-draw.Plo -rm -f ./$(DEPDIR)/libgiza_la-giza-driver-eps.Plo + -rm -f ./$(DEPDIR)/libgiza_la-giza-driver-mp4.Plo -rm -f ./$(DEPDIR)/libgiza_la-giza-driver-null.Plo -rm -f ./$(DEPDIR)/libgiza_la-giza-driver-pdf.Plo -rm -f ./$(DEPDIR)/libgiza_la-giza-driver-png.Plo @@ -1598,6 +1609,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libgiza_la-giza-draw-background.Plo -rm -f ./$(DEPDIR)/libgiza_la-giza-draw.Plo -rm -f ./$(DEPDIR)/libgiza_la-giza-driver-eps.Plo + -rm -f ./$(DEPDIR)/libgiza_la-giza-driver-mp4.Plo -rm -f ./$(DEPDIR)/libgiza_la-giza-driver-null.Plo -rm -f ./$(DEPDIR)/libgiza_la-giza-driver-pdf.Plo -rm -f ./$(DEPDIR)/libgiza_la-giza-driver-png.Plo diff --git a/src/giza-driver-mp4-private.h b/src/giza-driver-mp4-private.h new file mode 100644 index 0000000..1bf1ae5 --- /dev/null +++ b/src/giza-driver-mp4-private.h @@ -0,0 +1,25 @@ +/* giza - a scientific plotting library built on cairo + * + * Copyright (c) 2010 James Wetter and Daniel Price + * Copyright (c) 2010-2023 Daniel Price + * + * This library is free software; and you are welcome to redistribute + * it under the terms of the GNU General Public License + * (GPL, see LICENSE file for details) and the provision that + * this notice remains intact. If you modify this file, please + * note section 2a) of the GPLv2 states that: + * + * a) You must cause the modified files to carry prominent notices + * stating that you changed the files and the date of any change. + * + * This software is distributed "AS IS", with ABSOLUTELY NO WARRANTY. + * See the GPL for specific language governing rights and limitations. + * + * The Original code is the giza plotting library. + * + * Contributor(s): + * James Wetter + * Daniel Price (main contact) + */ + +void _giza_close_device_mp4 (int last); diff --git a/src/giza-driver-mp4.c b/src/giza-driver-mp4.c new file mode 100644 index 0000000..96d57a5 --- /dev/null +++ b/src/giza-driver-mp4.c @@ -0,0 +1,97 @@ +/* giza - a scientific plotting library built on cairo + * + * Copyright (c) 2010 James Wetter and Daniel Price + * Copyright (c) 2010-2023 Daniel Price + * + * This library is free software; and you are welcome to redistribute + * it under the terms of the GNU General Public License + * (GPL, see LICENSE file for details) and the provision that + * this notice remains intact. If you modify this file, please + * note section 2a) of the GPLv2 states that: + * + * a) You must cause the modified files to carry prominent notices + * stating that you changed the files and the date of any change. + * + * This software is distributed "AS IS", with ABSOLUTELY NO WARRANTY. + * See the GPL for specific language governing rights and limitations. + * + * The Original code is the giza plotting library. + * + * Contributor(s): + * James Wetter + * Daniel Price (main contact) + */ + +#include "giza-private.h" +#include "giza-drivers-private.h" +#include "giza-io-private.h" +#include "giza-driver-png-private.h" +#include "giza-driver-mp4-private.h" +#include +#include +#include +#include +#include + +#define GIZA_DEVICE_EXTENSION ".mp4" +#define GIZA_FFMPEG_FLAGS_DEFAULT "-r 10 -vb 50M -bt 100M -pix_fmt yuv420p -vf setpts=4.*PTS" + +/** + * Closes an open mp4 device. This closes the sequence of png images + * and compiles them into a movie + */ +void +_giza_close_device_mp4 (int last) +{ + _giza_close_device_png(last); + if (Dev[id].drawn && last==1) { + /* construct filename for mp4 file */ + int lenext = strlen(GIZA_DEVICE_EXTENSION); + int length = strlen(Dev[id].prefix) + lenext + 5; + char fileName[length + 1]; + _giza_get_filename_for_device(fileName, Dev[id].prefix, 0, GIZA_DEVICE_EXTENSION, 1); + + /* delete the existing mp4 file if it exists */ + if (access(fileName, F_OK) != -1) + { + remove(fileName); + } + + /* allow the user to change the ffmpeg flags with an environment variable */ + char *userFlags = getenv("GIZA_FFMPEG_FLAGS"); + char *flagsToUse = userFlags ? userFlags : GIZA_FFMPEG_FLAGS_DEFAULT; + + /* construct ffmpeg command and repeat it to the user */ + char command[512]; /* Adjust size as needed */ + sprintf(command, "ffmpeg -i %s_%%04d.png %s %s", Dev[id].prefix,flagsToUse,fileName); + _giza_message(command); + + /* issue command and check that it succeeded */ + int success = system(command); + if (success != 0) { + _giza_message("Error: ffmpeg command failed: please install ffmpeg using your package manager"); + } else { + char tmp[length + 10]; + sprintf(tmp, "%s created", fileName); + _giza_message(tmp); + + /* if the mp4 file exists, clean up the temporary .png files */ + if (access(fileName, F_OK) != -1) + { + for (int i = 0; i <= Dev[id].pgNum; i++) + { + _giza_get_filename_for_device(fileName, Dev[id].prefix, i, ".png", 0); + + if (access(fileName, F_OK) != -1) + { + if (remove(fileName) != 0) + { + printf("Unable to delete %s \n",fileName); + } + } + } + } + } + } +} + diff --git a/src/giza-drivers-private.h b/src/giza-drivers-private.h index e5a5b56..078c65f 100644 --- a/src/giza-drivers-private.h +++ b/src/giza-drivers-private.h @@ -32,6 +32,7 @@ #define GIZA_DEVICE_VPS 7 #define GIZA_DEVICE_EPS 8 #define GIZA_DEVICE_SVG 9 +#define GIZA_DEVICE_MP4 10 #define GIZA_DEFAULT_PREFIX "giza" diff --git a/src/giza-drivers.c b/src/giza-drivers.c index 220e843..21fbc3e 100644 --- a/src/giza-drivers.c +++ b/src/giza-drivers.c @@ -26,6 +26,7 @@ #include "giza-drivers-private.h" #include "giza-driver-xw-private.h" #include "giza-driver-png-private.h" +#include "giza-driver-mp4-private.h" #include "giza-driver-pdf-private.h" #include "giza-driver-ps-private.h" #include "giza-driver-eps-private.h" @@ -89,6 +90,7 @@ giza_device_t Dev[GIZA_MAX_DEVICES]; * -/xw :- X-window * -/eps :- Encapsulated Postscript * -/png :- Portable Network Graphics file + * -/mp4 :- Mpeg4 movie [requires ffmpeg support] * -/svg :- Scalable Vector Graphics file * -/pdf :- Portable Document Format * -/vpdf :- Landscape Portable Document Format @@ -198,6 +200,7 @@ giza_open_device_size (const char *newDeviceName, const char *newPrefix, double success = _giza_open_device_xw (width, height, units); break; #endif + case GIZA_DEVICE_MP4: case GIZA_DEVICE_PNG: success = _giza_open_device_png (width, height, units); break; @@ -447,6 +450,7 @@ giza_change_page (void) _giza_change_page_xw (); break; #endif + case GIZA_DEVICE_MP4: case GIZA_DEVICE_PNG: _giza_change_page_png (); break; @@ -571,8 +575,11 @@ _giza_close_device_unchecked (void) { _giza_close_device_xw (); break; #endif + case GIZA_DEVICE_MP4: + _giza_close_device_mp4(1); + break; case GIZA_DEVICE_PNG: - _giza_close_device_png (1); + _giza_close_device_png(1); break; case GIZA_DEVICE_SVG: _giza_close_device_svg (); @@ -904,7 +911,9 @@ _giza_device_to_int (const char *newDeviceName) #endif else if (!strcmp (devName, "/png")) newDevice = GIZA_DEVICE_PNG; - else if (!strcmp (devName, "/svg")) + else if (!strcmp(devName, "/mp4")) + newDevice = GIZA_DEVICE_MP4; + else if (!strcmp(devName, "/svg")) newDevice = GIZA_DEVICE_SVG; else if (!strcmp (devName, "/pdf")) newDevice = GIZA_DEVICE_PDF; @@ -928,7 +937,9 @@ _giza_device_to_int (const char *newDeviceName) */ if (!strcmp (devName, ".png")) newDevice = GIZA_DEVICE_PNG; - else if (!strcmp (devName, ".svg")) + else if (!strcmp(devName, ".mp4")) + newDevice = GIZA_DEVICE_MP4; + else if (!strcmp(devName, ".svg")) newDevice = GIZA_DEVICE_SVG; else if (!strcmp (devName, ".pdf")) newDevice = GIZA_DEVICE_PDF; @@ -969,8 +980,11 @@ _giza_int_to_device (int numDevice, char *DeviceName, int rval) case GIZA_DEVICE_PNG: strncpy(DeviceName,"/png",max_chars); break; + case GIZA_DEVICE_MP4: + strncpy(DeviceName, "/mp4", max_chars); + break; case GIZA_DEVICE_SVG: - strncpy(DeviceName,"/svg",max_chars); + strncpy(DeviceName, "/svg", max_chars); break; case GIZA_DEVICE_PS: strncpy(DeviceName,"/ps",max_chars); @@ -1022,6 +1036,7 @@ _giza_init_device_list (char **deviceList) #endif strcat (*deviceList, "Non-interactive file formats:\n"); strcat (*deviceList, "\t/png or file.png (Portable network graphics file)\n"); + strcat (*deviceList, "\t/mp4 or file.mp4 (mpeg4 movie [requires ffmpeg installation])\n"); strcat (*deviceList, "\t/svg or file.svg (Scalable vector graphics file)\n"); #ifdef _GIZA_HAS_EPS strcat (*deviceList, "\t/eps or file.eps (Encapsulated Postscript, one file per page)\n");