diff options
| author | Henning Makholm <henning@makholm.net> | 2009-07-02 18:00:00 (EDT) |
|---|---|---|
| committer | Julien Jorge <julien.jorge@stuff-o-matic.com> | 2013-01-10 16:11:16 (EST) |
| commit | f43ff6cf8942deab3e554fc2ed1ca83911c62043 (patch) | |
| tree | 6240bbec976d01d68ce5e817e0d403febacf8ddf | |
| parent | 70a9b1ca8750a43e8092807d174a8c49407aa213 (diff) | |
| download | xcftools-f43ff6cf8942deab3e554fc2ed1ca83911c62043.zip xcftools-f43ff6cf8942deab3e554fc2ed1ca83911c62043.tar.gz xcftools-f43ff6cf8942deab3e554fc2ed1ca83911c62043.tar.bz2 | |
Import of release 1.0.6
| -rw-r--r-- | COPYING | 340 | ||||
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.in | 24 | ||||
| -rw-r--r-- | README | 21 | ||||
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 26 | ||||
| -rw-r--r-- | flatspec.c | 40 | ||||
| -rw-r--r-- | flatten.c | 24 | ||||
| -rw-r--r-- | flatten.h | 24 | ||||
| -rw-r--r-- | io-unix.c | 24 | ||||
| -rw-r--r-- | mancombine.pl | 25 | ||||
| -rw-r--r-- | manpo/mantranslate.pl | 23 | ||||
| -rw-r--r-- | manpo/optipot.pl | 23 | ||||
| -rw-r--r-- | mkenumsc.pl | 23 | ||||
| -rw-r--r-- | mkenumsh.pl | 25 | ||||
| -rw-r--r-- | mkopti.pl | 25 | ||||
| -rw-r--r-- | mktablec.pl | 23 | ||||
| -rw-r--r-- | options.i | 24 | ||||
| -rw-r--r-- | palette.c | 24 | ||||
| -rw-r--r-- | palette.h | 24 | ||||
| -rw-r--r-- | pixels.c | 24 | ||||
| -rw-r--r-- | pixels.h | 24 | ||||
| -rw-r--r-- | po/da.po | 12 | ||||
| -rw-r--r-- | po/xcftools.pot | 12 | ||||
| -rw-r--r-- | scaletab.c | 24 | ||||
| -rw-r--r-- | test/answer/masknoalpha-b.png | bin | 0 -> 85 bytes | |||
| -rw-r--r-- | test/answer/masknoalpha-g.png | bin | 0 -> 118 bytes | |||
| -rw-r--r-- | test/answer/masknoalpha-r.png | bin | 0 -> 129 bytes | |||
| -rw-r--r-- | test/answer/masknoalpha-w.png | bin | 0 -> 87 bytes | |||
| -rwxr-xr-x | test/dotest | 30 | ||||
| -rw-r--r-- | test/source/masknoalpha.xcf.gz | bin | 0 -> 408 bytes | |||
| -rw-r--r-- | utils.c | 24 | ||||
| -rw-r--r-- | xcf-general.c | 24 | ||||
| -rw-r--r-- | xcf2png.10 | 24 | ||||
| -rw-r--r-- | xcf2png.c | 24 | ||||
| -rw-r--r-- | xcf2pnm.10 | 24 | ||||
| -rw-r--r-- | xcf2pnm.c | 24 | ||||
| -rw-r--r-- | xcfinfo.10 | 24 | ||||
| -rw-r--r-- | xcfinfo.c | 24 | ||||
| -rw-r--r-- | xcftools.h | 24 | ||||
| -rw-r--r-- | xcftools.spec | 6 | ||||
| -rw-r--r-- | xcfview.10 | 24 |
42 files changed, 428 insertions, 734 deletions
diff --git a/COPYING b/COPYING deleted file mode 100644 index 3912109..0000000 --- a/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, 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 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. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - 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 St, 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. - - <signature of Ty Coon>, 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 Library General -Public License instead of this License. @@ -1,3 +1,13 @@ +2009-07-03 Henning Makholm <henning@makholm.net> + + * Version 1.0.6 + * Change licensing from GPL-2 to PD. + * Fix bug: A layer without an alpha channel bug with an active + layer mask was wrongly considered to obscure all lower layers. + * Fix bug: xcf2pnm would guess PBM as the output format even if + the background was explicitly set to an intermediate gray, or + if -T might produce grays. + 2009-07-02 Henning Makholm <henning@makholm.net> * Version 1.0.5 diff --git a/Makefile.in b/Makefile.in index 73fa06e..07eaf92 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,18 +1,18 @@ # Makefile(.in) for xcftools -# Copyright (C) 2006 Henning Makholm +# This file was written by Henning Makholm <henning@makholm.net> +# It is hereby in the public domain. +# +# In jurisdictions that do not recognise grants of copyright to the +# public domain: I, the author and (presumably, in those jurisdictions) +# copyright holder, hereby permit anyone to distribute and use this code, +# in source code or binary form, with or without modifications. This +# permission is world-wide and irrevocable. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. +# Of course, I will not be liable for any errors or shortcomings in the +# code, since I give it away without asking any compenstations. # -# 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 St, Fifth Floor, Boston, MA 02110-1301 USA +# If you use or distribute this code, I would appreciate receiving +# credit for writing it, in whichever way you find proper and customary. all: @@ -60,17 +60,16 @@ License ======= Xcftools is written by Henning Makholm <henning@makholm.net> -(Copyright 2006). +It is hereby in the public domain. -Xcftools is free software; you can redistribute it and/or modify -it under the terms of version 2 of the GNU General Public License as -published by the Free Software Foundation. +In jurisdictions that do not recognise grants of copyright to the +public domain: I, the author and (presumably, in those jurisdictions) +copyright holder, hereby permit anyone to distribute and use this code, +in source code or binary form, with or without modifications. This +permission is world-wide and irrevocable. -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. +Of course, I will not be liable for any errors or shortcomings in the +code, since I give it away without asking any compenstations. -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 St, Fifth Floor, Boston, MA 02110-1301 USA +If you use or distribute this code, I would appreciate receiving +credit for writing it, in whichever way you find proper and customary. @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for Xcftools 1.0.5. +# Generated by GNU Autoconf 2.63 for Xcftools 1.0.6. # # Report bugs to <henning@makholm.net>. # @@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Xcftools' PACKAGE_TARNAME='xcftools' -PACKAGE_VERSION='1.0.5' -PACKAGE_STRING='Xcftools 1.0.5' +PACKAGE_VERSION='1.0.6' +PACKAGE_STRING='Xcftools 1.0.6' PACKAGE_BUGREPORT='henning@makholm.net' ac_unique_file="xcfinfo.c" @@ -1290,7 +1290,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 Xcftools 1.0.5 to adapt to many kinds of systems. +\`configure' configures Xcftools 1.0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1360,7 +1360,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xcftools 1.0.5:";; + short | recursive ) echo "Configuration of Xcftools 1.0.6:";; esac cat <<\_ACEOF @@ -1459,7 +1459,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xcftools configure 1.0.5 +Xcftools configure 1.0.6 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1473,7 +1473,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 Xcftools $as_me 1.0.5, which was +It was created by Xcftools $as_me 1.0.6, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -7895,7 +7895,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xcftools $as_me 1.0.5, which was +This file was extended by Xcftools $as_me 1.0.6, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7958,7 +7958,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -Xcftools config.status 1.0.5 +Xcftools config.status 1.0.6 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 806520f..cf77477 100644 --- a/configure.ac +++ b/configure.ac @@ -1,23 +1,23 @@ dnl Configure script for xcftools dnl -dnl Copyright (C) 2006 Henning Makholm +dnl This file was written by Henning Makholm <henning@makholm.net> +dnl It is hereby in the public domain. +dnl +dnl In jurisdictions that do not recognise grants of copyright to the +dnl public domain: I, the author and (presumably, in those jurisdictions) +dnl copyright holder, hereby permit anyone to distribute and use this code, +dnl in source code or binary form, with or without modifications. This +dnl permission is world-wide and irrevocable. dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of version 2 of the GNU General Public License as -dnl published by the Free Software Foundation. +dnl Of course, I will not be liable for any errors or shortcomings in the +dnl code, since I give it away without asking any compenstations. dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +dnl If you use or distribute this code, I would appreciate receiving +dnl credit for writing it, in whichever way you find proper and customary. dnl dnl ------------------------ dnl The following line is the MASTER SOURCE for the version number -AC_INIT(Xcftools,1.0.5,henning@makholm.net,xcftools) +AC_INIT(Xcftools,1.0.6,henning@makholm.net,xcftools) AC_CONFIG_SRCDIR(xcfinfo.c) AC_PROG_INSTALL @@ -1,19 +1,19 @@ /* Flattening selections function for xcftools * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #include "xcftools.h" @@ -79,13 +79,22 @@ static enum out_color_mode color_by_layers(struct FlattenSpec *spec) { int colormap_is_colored = 0 ; - enum out_color_mode grayish = COLOR_MONO ; + enum out_color_mode grayish ; int i ; if( spec->default_pixel == CHECKERED_BACKGROUND ) grayish = COLOR_GRAY ; - else if( degrayPixel(spec->default_pixel) < 0 ) - return COLOR_RGB ; + else { + int degrayed = degrayPixel(spec->default_pixel); + if( degrayed < 0 ) { + return COLOR_RGB ; + } else if( spec->gimpish_indexed && + (degrayed == 0 || degrayed == 255) ) { + grayish = COLOR_MONO ; + } else { + grayish = COLOR_GRAY ; + } + } for( i=0; i<colormapLength; i++ ) { if( colormap[i] == NEWALPHA(0,0) || colormap[i] == NEWALPHA(-1,0) ) continue ; @@ -227,6 +236,7 @@ complete_flatspec(struct FlattenSpec *spec, guesser guess_callback) if( spec->layers[i].mode == GIMP_NORMAL_MODE ) anyPartial = 1; } else if( isSubrect(spec->dim.c,spec->layers[i].dim.c) && + !spec->layers[i].hasMask && (spec->layers[i].mode == GIMP_NORMAL_MODE || spec->layers[i].mode == GIMP_NORMAL_NOPARTIAL_MODE || spec->layers[i].mode == GIMP_DISSOLVE_MODE) ) { @@ -1,19 +1,19 @@ /* Flattning functions for xcftools * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #include "xcftools.h" @@ -1,19 +1,19 @@ /* Flattning functions for xcftools * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #ifndef FLATTEN_H @@ -1,19 +1,19 @@ /* OS-specific IO functions for xcftools * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #include "xcftools.h" diff --git a/mancombine.pl b/mancombine.pl index 602ff17..2d01495 100644 --- a/mancombine.pl +++ b/mancombine.pl @@ -1,19 +1,20 @@ #! /usr/bin/perl # This script compiles final manpages for xcftools -# Copyright (C) 2006 Henning Makholm +# +# This file was written by Henning Makholm <henning@makholm.net> +# It is hereby in the public domain. +# +# In jurisdictions that do not recognise grants of copyright to the +# public domain: I, the author and (presumably, in those jurisdictions) +# copyright holder, hereby permit anyone to distribute and use this code, +# in source code or binary form, with or without modifications. This +# permission is world-wide and irrevocable. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. +# Of course, I will not be liable for any errors or shortcomings in the +# code, since I give it away without asking any compenstations. # -# 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 St, Fifth Floor, Boston, MA 02110-1301 USA +# If you use or distribute this code, I would appreciate receiving +# credit for writing it, in whichever way you find proper and customary. use strict ; use warnings ; diff --git a/manpo/mantranslate.pl b/manpo/mantranslate.pl index 713da10..23e2a07 100644 --- a/manpo/mantranslate.pl +++ b/manpo/mantranslate.pl @@ -1,20 +1,21 @@ #! /usr/bin/perl # This script extracts translateable strings from a manpage and/or # translates a manpage using gettext. -# Copyright (C) 2006 Henning Makholm # -# This program is free software; you can redistribute it and/or modify -# it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. +# This file was written by Henning Makholm <henning@makholm.net> +# It is hereby in the public domain. +# +# In jurisdictions that do not recognise grants of copyright to the +# public domain: I, the author and (presumably, in those jurisdictions) +# copyright holder, hereby permit anyone to distribute and use this code, +# in source code or binary form, with or without modifications. This +# permission is world-wide and irrevocable. # -# 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. +# Of course, I will not be liable for any errors or shortcomings in the +# code, since I give it away without asking any compenstations. # -# 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 St, Fifth Floor, Boston, MA 02110-1301 USA +# If you use or distribute this code, I would appreciate receiving +# credit for writing it, in whichever way you find proper and customary. use strict ; use warnings ; diff --git a/manpo/optipot.pl b/manpo/optipot.pl index e8a3d70..aed8b76 100644 --- a/manpo/optipot.pl +++ b/manpo/optipot.pl @@ -1,20 +1,21 @@ #! /usr/bin/perl # This script extracts translatable manpage fragments from # option.i -# Copyright (C) 2006 Henning Makholm # -# This program is free software; you can redistribute it and/or modify -# it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. +# This file was written by Henning Makholm <henning@makholm.net> +# It is hereby in the public domain. +# +# In jurisdictions that do not recognise grants of copyright to the +# public domain: I, the author and (presumably, in those jurisdictions) +# copyright holder, hereby permit anyone to distribute and use this code, +# in source code or binary form, with or without modifications. This +# permission is world-wide and irrevocable. # -# 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. +# Of course, I will not be liable for any errors or shortcomings in the +# code, since I give it away without asking any compenstations. # -# 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 St, Fifth Floor, Boston, MA 02110-1301 USA +# If you use or distribute this code, I would appreciate receiving +# credit for writing it, in whichever way you find proper and customary. use strict ; use warnings ; diff --git a/mkenumsc.pl b/mkenumsc.pl index 0c5f6d9..b9f0829 100644 --- a/mkenumsc.pl +++ b/mkenumsc.pl @@ -1,20 +1,21 @@ #! /usr/bin/perl # This short script extracts enum definitions from files stolen # from the Gimp's sources. -# Copyright (C) 2006 Henning Makholm # -# This program is free software; you can redistribute it and/or modify -# it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. +# This file was written by Henning Makholm <henning@makholm.net> +# It is hereby in the public domain. +# +# In jurisdictions that do not recognise grants of copyright to the +# public domain: I, the author and (presumably, in those jurisdictions) +# copyright holder, hereby permit anyone to distribute and use this code, +# in source code or binary form, with or without modifications. This +# permission is world-wide and irrevocable. # -# 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. +# Of course, I will not be liable for any errors or shortcomings in the +# code, since I give it away without asking any compenstations. # -# 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 St, Fifth Floor, Boston, MA 02110-1301 USA +# If you use or distribute this code, I would appreciate receiving +# credit for writing it, in whichever way you find proper and customary. use strict ; use warnings ; diff --git a/mkenumsh.pl b/mkenumsh.pl index ac1a8de..8b1354f 100644 --- a/mkenumsh.pl +++ b/mkenumsh.pl @@ -1,20 +1,21 @@ #! /usr/bin/perl # This short script extracts enum definitions from files stolen # from the Gimp's sources. -# Copyright (C) 2006 Henning Makholm +# +# This file was written by Henning Makholm <henning@makholm.net> +# It is hereby in the public domain. +# +# In jurisdictions that do not recognise grants of copyright to the +# public domain: I, the author and (presumably, in those jurisdictions) +# copyright holder, hereby permit anyone to distribute and use this code, +# in source code or binary form, with or without modifications. This +# permission is world-wide and irrevocable. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. +# Of course, I will not be liable for any errors or shortcomings in the +# code, since I give it away without asking any compenstations. # -# 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 St, Fifth Floor, Boston, MA 02110-1301 USA +# If you use or distribute this code, I would appreciate receiving +# credit for writing it, in whichever way you find proper and customary. use strict ; use warnings ; @@ -1,20 +1,21 @@ #! /usr/bin/perl # This script extracts option strings, longopt arrays and # manpage fragments for xcftools -# Copyright (C) 2006 Henning Makholm +# +# This file was written by Henning Makholm <henning@makholm.net> +# It is hereby in the public domain. +# +# In jurisdictions that do not recognise grants of copyright to the +# public domain: I, the author and (presumably, in those jurisdictions) +# copyright holder, hereby permit anyone to distribute and use this code, +# in source code or binary form, with or without modifications. This +# permission is world-wide and irrevocable. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. +# Of course, I will not be liable for any errors or shortcomings in the +# code, since I give it away without asking any compenstations. # -# 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 St, Fifth Floor, Boston, MA 02110-1301 USA +# If you use or distribute this code, I would appreciate receiving +# credit for writing it, in whichever way you find proper and customary. use strict ; use warnings ; diff --git a/mktablec.pl b/mktablec.pl index 6467af0..9e190e0 100644 --- a/mktablec.pl +++ b/mktablec.pl @@ -1,19 +1,20 @@ #! /usr/bin/perl # This short script creates fixed look-up tables for xcftools -# Copyright (C) 2006 Henning Makholm # -# This program is free software; you can redistribute it and/or modify -# it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. +# This file was written by Henning Makholm <henning@makholm.net> +# It is hereby in the public domain. +# +# In jurisdictions that do not recognise grants of copyright to the +# public domain: I, the author and (presumably, in those jurisdictions) +# copyright holder, hereby permit anyone to distribute and use this code, +# in source code or binary form, with or without modifications. This +# permission is world-wide and irrevocable. # -# 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. +# Of course, I will not be liable for any errors or shortcomings in the +# code, since I give it away without asking any compenstations. # -# 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 St, Fifth Floor, Boston, MA 02110-1301 USA +# If you use or distribute this code, I would appreciate receiving +# credit for writing it, in whichever way you find proper and customary. use strict ; use warnings ; @@ -1,19 +1,19 @@ /* Option processing for xcftools -*- C -*- * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ OPTIONGROUP(1i,General options); @@ -1,19 +1,19 @@ /* Palette-manipulation functions functions for xcftools * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #include "palette.h" @@ -1,19 +1,19 @@ /* Palette-manipulation functions functions for xcftools * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #ifndef PALETTE_H @@ -1,19 +1,19 @@ /* Pixel and tile functions for xcftools * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #define DEBUG @@ -1,19 +1,19 @@ /* Pixel and tile functions for xcftools * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #ifndef PIXELS_H @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xcftools 0.9\n" "Report-Msgid-Bugs-To: henning@makholm.net\n" -"POT-Creation-Date: 2009-07-03 01:26+0200\n" +"POT-Creation-Date: 2009-07-03 12:48+0200\n" "PO-Revision-Date: 2006-04-17 04:07+0200\n" "Last-Translator: Henning Makholm <henning@makholm.net>\n" "Language-Team: Til test af l10n-faciliteter; ikke vedligeholdt\n" @@ -362,27 +362,27 @@ msgstr "Ikke mere lagerplads" msgid "The %s option must follow a layer name on the command line" msgstr "%s-flaget skal komme efter navnet på et lag" -#: flatspec.c:135 +#: flatspec.c:144 #, c-format msgid "The image has no layer called '%s'" msgstr "Billedet har ikke noget lag der hedder »%s«" -#: flatspec.c:148 +#: flatspec.c:157 #, c-format msgid "Layer '%s' has no layer mask to enable" msgstr "Laget »%s« har ikke nogen lagmaske at tænde for" -#: flatspec.c:262 xcfinfo.c:97 +#: flatspec.c:272 xcfinfo.c:97 #, c-format msgid "/mask" msgstr "/maske" -#: flatspec.c:348 xcf2png.c:233 xcf2pnm.c:158 +#: flatspec.c:358 xcf2png.c:233 xcf2pnm.c:158 #, c-format msgid "Grayscale output selected, but colored pixel(s) found" msgstr "Der er valgt gråtoneformat, men billedet indeholder farvede pixels" -#: flatspec.c:352 xcf2pnm.c:172 +#: flatspec.c:362 xcf2pnm.c:172 #, c-format msgid "Monochrome output selected, but not all pixels are black or white" msgstr "" diff --git a/po/xcftools.pot b/po/xcftools.pot index 198b751..3eb43a0 100644 --- a/po/xcftools.pot +++ b/po/xcftools.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: henning@makholm.net\n" -"POT-Creation-Date: 2009-07-03 01:26+0200\n" +"POT-Creation-Date: 2009-07-03 12:48+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -363,27 +363,27 @@ msgstr "" msgid "The %s option must follow a layer name on the command line" msgstr "" -#: flatspec.c:135 +#: flatspec.c:144 #, c-format msgid "The image has no layer called '%s'" msgstr "" -#: flatspec.c:148 +#: flatspec.c:157 #, c-format msgid "Layer '%s' has no layer mask to enable" msgstr "" -#: flatspec.c:262 xcfinfo.c:97 +#: flatspec.c:272 xcfinfo.c:97 #, c-format msgid "/mask" msgstr "" -#: flatspec.c:348 xcf2png.c:233 xcf2pnm.c:158 +#: flatspec.c:358 xcf2png.c:233 xcf2pnm.c:158 #, c-format msgid "Grayscale output selected, but colored pixel(s) found" msgstr "" -#: flatspec.c:352 xcf2pnm.c:172 +#: flatspec.c:362 xcf2pnm.c:172 #, c-format msgid "Monochrome output selected, but not all pixels are black or white" msgstr "" @@ -1,19 +1,19 @@ /* Run-time scaletable computation for Xcftools * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #include "pixels.h" diff --git a/test/answer/masknoalpha-b.png b/test/answer/masknoalpha-b.png Binary files differnew file mode 100644 index 0000000..e7aeafc --- /dev/null +++ b/test/answer/masknoalpha-b.png diff --git a/test/answer/masknoalpha-g.png b/test/answer/masknoalpha-g.png Binary files differnew file mode 100644 index 0000000..e292b59 --- /dev/null +++ b/test/answer/masknoalpha-g.png diff --git a/test/answer/masknoalpha-r.png b/test/answer/masknoalpha-r.png Binary files differnew file mode 100644 index 0000000..f27f1c6 --- /dev/null +++ b/test/answer/masknoalpha-r.png diff --git a/test/answer/masknoalpha-w.png b/test/answer/masknoalpha-w.png Binary files differnew file mode 100644 index 0000000..daff556 --- /dev/null +++ b/test/answer/masknoalpha-w.png diff --git a/test/dotest b/test/dotest index ae86b1f..1aa34ac 100755 --- a/test/dotest +++ b/test/dotest @@ -1,20 +1,21 @@ #! /bin/bash # Regression test for Xcftools -# Copyright (C) 2006 Henning Makholm # -# This test script is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License as published by the Free Software Foundation. +# This file was written by Henning Makholm <henning@makholm.net> +# It is hereby in the public domain. +# +# In jurisdictions that do not recognise grants of copyright to the +# public domain: I, the author and (presumably, in those jurisdictions) +# copyright holder, hereby permit anyone to distribute and use this code, +# in source code or binary form, with or without modifications. This +# permission is world-wide and irrevocable. # -# 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. +# Of course, I will not be liable for any errors or shortcomings in the +# code, since I give it away without asking any compenstations. # -# 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 St, Fifth Floor, Boston, MA 02110-1301 USA +# If you use or distribute this code, I would appreciate receiving +# credit for writing it, in whichever way you find proper and customary. export LC_CTYPE=C export LC_MESSAGES=C @@ -480,6 +481,13 @@ testpnm o:index256 i256 testpnm o:burmid tiletest Mid -S 27x25 -O 5,5 -b '#963' +# Regression test for bugs fixed in 1.0.6 + +testpnm o:masknoalpha-r masknoalpha -b "#FF0000" +testpnm o:masknoalpha-g masknoalpha -b "#888888" +testpnm o:masknoalpha-b masknoalpha -b "#000000" +testpnm o:masknoalpha-w masknoalpha -b "#FFFFFF" + ############################################################################# ############################################################################# # diff --git a/test/source/masknoalpha.xcf.gz b/test/source/masknoalpha.xcf.gz Binary files differnew file mode 100644 index 0000000..9ba1b35 --- /dev/null +++ b/test/source/masknoalpha.xcf.gz @@ -1,19 +1,19 @@ /* Generic support functions for Xcftools * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #include "xcftools.h" diff --git a/xcf-general.c b/xcf-general.c index 9231134..9d0b4dc 100644 --- a/xcf-general.c +++ b/xcf-general.c @@ -1,19 +1,19 @@ /* Generic functions for reading XCF files * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #include "xcftools.h" @@ -1,18 +1,18 @@ .\" Manual page for xcf2png -.\" Copyright (C) 2006 Henning Makholm +.\" This file was written by Henning Makholm <henning@makholm.net> +.\" It is hereby in the public domain. +.\" +.\" In jurisdictions that do not recognise grants of copyright to the +.\" public domain: I, the author and (presumably, in those jurisdictions) +.\" copyright holder, hereby permit anyone to distribute and use this code, +.\" in source code or binary form, with or without modifications. This +.\" permission is world-wide and irrevocable. .\" -.\" This program is free software; you can redistribute it and/or modify -.\" it under the terms of version 2 of the GNU General Public License as -.\" published by the Free Software Foundation. +.\" Of course, I will not be liable for any errors or shortcomings in the +.\" code, since I give it away without asking any compenstations. .\" -.\" 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 St, Fifth Floor, Boston, MA 02110-1301 USA +.\" If you use or distribute this code, I would appreciate receiving +.\" credit for writing it, in whichever way you find proper and customary. .TH xcf2png 1 2006-02-12 "Xcftools" "" .SH NAME xcf2png \- convert from GIMP xcf files to png format @@ -1,19 +1,19 @@ /* Convert xcf files to png * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #include "xcftools.h" @@ -1,18 +1,18 @@ .\" Manual page for xcf2pnm -.\" Copyright (C) 2006 Henning Makholm +.\" This file was written by Henning Makholm <henning@makholm.net> +.\" It is hereby in the public domain. +.\" +.\" In jurisdictions that do not recognise grants of copyright to the +.\" public domain: I, the author and (presumably, in those jurisdictions) +.\" copyright holder, hereby permit anyone to distribute and use this code, +.\" in source code or binary form, with or without modifications. This +.\" permission is world-wide and irrevocable. .\" -.\" This program is free software; you can redistribute it and/or modify -.\" it under the terms of version 2 of the GNU General Public License as -.\" published by the Free Software Foundation. +.\" Of course, I will not be liable for any errors or shortcomings in the +.\" code, since I give it away without asking any compenstations. .\" -.\" 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 St, Fifth Floor, Boston, MA 02110-1301 USA +.\" If you use or distribute this code, I would appreciate receiving +.\" credit for writing it, in whichever way you find proper and customary. .TH xcf2pnm 1 2006-02-12 "Xcftools" "" .SH NAME xcf2pnm \- convert from GIMP xcf files to ppm/pgm/pbm format @@ -1,19 +1,19 @@ /* Convert xcf files to ppm * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #include "xcftools.h" @@ -1,18 +1,18 @@ .\" Manual page for xcfinfo -.\" Copyright (C) 2006 Henning Makholm +.\" This file was written by Henning Makholm <henning@makholm.net> +.\" It is hereby in the public domain. +.\" +.\" In jurisdictions that do not recognise grants of copyright to the +.\" public domain: I, the author and (presumably, in those jurisdictions) +.\" copyright holder, hereby permit anyone to distribute and use this code, +.\" in source code or binary form, with or without modifications. This +.\" permission is world-wide and irrevocable. .\" -.\" This program is free software; you can redistribute it and/or modify -.\" it under the terms of version 2 of the GNU General Public License as -.\" published by the Free Software Foundation. +.\" Of course, I will not be liable for any errors or shortcomings in the +.\" code, since I give it away without asking any compenstations. .\" -.\" 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 St, Fifth Floor, Boston, MA 02110-1301 USA +.\" If you use or distribute this code, I would appreciate receiving +.\" credit for writing it, in whichever way you find proper and customary. .TH xcfinfo 1 2006-02-12 "Xcftools" "" .SH NAME xcfinfo \- display information about GIMP xcf files @@ -1,19 +1,19 @@ /* A program that extracts metadata from an XCF file * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #include "xcftools.h" @@ -1,19 +1,19 @@ /* Generic functions and macros for reading XCF files * - * Copyright (C) 2006 Henning Makholm + * This file was written by Henning Makholm <henning@makholm.net> + * It is hereby in the public domain. + * + * In jurisdictions that do not recognise grants of copyright to the + * public domain: I, the author and (presumably, in those jurisdictions) + * copyright holder, hereby permit anyone to distribute and use this code, + * in source code or binary form, with or without modifications. This + * permission is world-wide and irrevocable. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * Of course, I will not be liable for any errors or shortcomings in the + * code, since I give it away without asking any compenstations. * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * If you use or distribute this code, I would appreciate receiving + * credit for writing it, in whichever way you find proper and customary. */ #ifndef XCFTOOLS_H diff --git a/xcftools.spec b/xcftools.spec index f6e381c..dbbec69 100644 --- a/xcftools.spec +++ b/xcftools.spec @@ -3,13 +3,13 @@ # Henning Makholm, the xcftools author, have not had occasion to test # it, so use at your own peril. In particular, note that there is a # hard-coded version number just a few lines in. I make no promises -# that I'll remember to update it for versions 1.0.5 - caveat emptor! +# that I'll remember to update it for versions 1.0.6 - caveat emptor! ############################################################################# # Variables ############################################################################# %define name xcftools -%define version 1.0.5 +%define version 1.0.6 %define release 1 ############################################################################# @@ -19,7 +19,7 @@ Summary : xcftools Name : %{name} Version : %{version} Release : %{release} -License : See LICENSE file. +License : Public Domain Group : Development/Tools Source : xcftools-%version.tar.gz Packager : Marcus Alanen <marcus.alanen@gmail.com> @@ -1,18 +1,18 @@ .\" Manual page for xcfview -.\" Copyright (C) 2006 Henning Makholm +.\" This file was written by Henning Makholm <henning@makholm.net> +.\" It is hereby in the public domain. +.\" +.\" In jurisdictions that do not recognise grants of copyright to the +.\" public domain: I, the author and (presumably, in those jurisdictions) +.\" copyright holder, hereby permit anyone to distribute and use this code, +.\" in source code or binary form, with or without modifications. This +.\" permission is world-wide and irrevocable. .\" -.\" This program is free software; you can redistribute it and/or modify -.\" it under the terms of version 2 of the GNU General Public License as -.\" published by the Free Software Foundation. +.\" Of course, I will not be liable for any errors or shortcomings in the +.\" code, since I give it away without asking any compenstations. .\" -.\" 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 St, Fifth Floor, Boston, MA 02110-1301 USA +.\" If you use or distribute this code, I would appreciate receiving +.\" credit for writing it, in whichever way you find proper and customary. .TH xcf2pnm 1 2006-02-12 "Xcftools" "" .SH NAME xcfview \- display GIMP xcf files |
