Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[10248] trunk/octave-forge/main/image
|
From: <car...@us...> - 2012-04-16 12:50:01
|
Revision: 10248
http://octave.svn.sourceforge.net/octave/?rev=10248&view=rev
Author: carandraug
Date: 2012-04-16 12:49:47 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
maint: update license to GPLv3 and mention non GPL files
Modified Paths:
--------------
trunk/octave-forge/main/image/COPYING
trunk/octave-forge/main/image/inst/blkproc.m
trunk/octave-forge/main/image/inst/blockproc.m
trunk/octave-forge/main/image/inst/bmpwrite.m
trunk/octave-forge/main/image/inst/bwarea.m
trunk/octave-forge/main/image/inst/bwborder.m
trunk/octave-forge/main/image/inst/bwboundaries.m
trunk/octave-forge/main/image/inst/bwconncomp.m
trunk/octave-forge/main/image/inst/bwdist.m
trunk/octave-forge/main/image/inst/bweuler.m
trunk/octave-forge/main/image/inst/bwhitmiss.m
trunk/octave-forge/main/image/inst/bwperim.m
trunk/octave-forge/main/image/inst/bwselect.m
trunk/octave-forge/main/image/inst/colfilt.m
trunk/octave-forge/main/image/inst/conndef.m
trunk/octave-forge/main/image/inst/corr2.m
trunk/octave-forge/main/image/inst/edge.m
trunk/octave-forge/main/image/inst/entropy.m
trunk/octave-forge/main/image/inst/entropyfilt.m
trunk/octave-forge/main/image/inst/fchcode.m
trunk/octave-forge/main/image/inst/fspecial.m
trunk/octave-forge/main/image/inst/getrangefromclass.m
trunk/octave-forge/main/image/inst/grayslice.m
trunk/octave-forge/main/image/inst/graythresh.m
trunk/octave-forge/main/image/inst/histeq.m
trunk/octave-forge/main/image/inst/hough_circle.m
trunk/octave-forge/main/image/inst/houghtf.m
trunk/octave-forge/main/image/inst/imabsdiff.m
trunk/octave-forge/main/image/inst/imadd.m
trunk/octave-forge/main/image/inst/imbothat.m
trunk/octave-forge/main/image/inst/imclose.m
trunk/octave-forge/main/image/inst/imcomplement.m
trunk/octave-forge/main/image/inst/imdilate.m
trunk/octave-forge/main/image/inst/imdivide.m
trunk/octave-forge/main/image/inst/imerode.m
trunk/octave-forge/main/image/inst/imfilter.m
trunk/octave-forge/main/image/inst/imhist.m
trunk/octave-forge/main/image/inst/imlincomb.m
trunk/octave-forge/main/image/inst/immultiply.m
trunk/octave-forge/main/image/inst/imopen.m
trunk/octave-forge/main/image/inst/impad.m
trunk/octave-forge/main/image/inst/imperspectivewarp.m
trunk/octave-forge/main/image/inst/imremap.m
trunk/octave-forge/main/image/inst/imresize.m
trunk/octave-forge/main/image/inst/imrotate.m
trunk/octave-forge/main/image/inst/imrotate_Fourier.m
trunk/octave-forge/main/image/inst/imshear.m
trunk/octave-forge/main/image/inst/imsmooth.m
trunk/octave-forge/main/image/inst/imsubtract.m
trunk/octave-forge/main/image/inst/imtophat.m
trunk/octave-forge/main/image/inst/imtranslate.m
trunk/octave-forge/main/image/inst/iptcheckconn.m
trunk/octave-forge/main/image/inst/iptcheckmap.m
trunk/octave-forge/main/image/inst/iptchecknargin.m
trunk/octave-forge/main/image/inst/iptcheckstrs.m
trunk/octave-forge/main/image/inst/iptnum2ordinal.m
trunk/octave-forge/main/image/inst/iradon.m
trunk/octave-forge/main/image/inst/isbw.m
trunk/octave-forge/main/image/inst/isgray.m
trunk/octave-forge/main/image/inst/isind.m
trunk/octave-forge/main/image/inst/isrgb.m
trunk/octave-forge/main/image/inst/label2rgb.m
trunk/octave-forge/main/image/inst/mat2gray.m
trunk/octave-forge/main/image/inst/mean2.m
trunk/octave-forge/main/image/inst/medfilt2.m
trunk/octave-forge/main/image/inst/mmgradm.m
trunk/octave-forge/main/image/inst/nlfilter.m
trunk/octave-forge/main/image/inst/normxcorr2.m
trunk/octave-forge/main/image/inst/ordfilt2.m
trunk/octave-forge/main/image/inst/ordfiltn.m
trunk/octave-forge/main/image/inst/padarray.m
trunk/octave-forge/main/image/inst/phantom.m
trunk/octave-forge/main/image/inst/poly2mask.m
trunk/octave-forge/main/image/inst/qtdecomp.m
trunk/octave-forge/main/image/inst/radon.m
trunk/octave-forge/main/image/inst/rangefilt.m
trunk/octave-forge/main/image/inst/readexif.m
trunk/octave-forge/main/image/inst/regionprops.m
trunk/octave-forge/main/image/inst/rgb2gray.m
trunk/octave-forge/main/image/inst/rgb2ycbcr.m
trunk/octave-forge/main/image/inst/rgbplot.m
trunk/octave-forge/main/image/inst/rho_filter.m
trunk/octave-forge/main/image/inst/std2.m
trunk/octave-forge/main/image/inst/stdfilt.m
trunk/octave-forge/main/image/inst/stretchlim.m
trunk/octave-forge/main/image/inst/tiff_tag_read.m
trunk/octave-forge/main/image/src/__bilateral__.cc
trunk/octave-forge/main/image/src/__boundary__.cc
trunk/octave-forge/main/image/src/__bwdist.cc
trunk/octave-forge/main/image/src/__custom_gaussian_smoothing__.cc
trunk/octave-forge/main/image/src/__spatial_filtering__.cc
trunk/octave-forge/main/image/src/bwlabeln.cc
trunk/octave-forge/main/image/src/edtfunc.c
trunk/octave-forge/main/image/src/graycomatrix.cc
trunk/octave-forge/main/image/src/hough_line.cc
trunk/octave-forge/main/image/src/nonmax_supress.cc
trunk/octave-forge/main/image/src/union-find.h++
Modified: trunk/octave-forge/main/image/COPYING
===================================================================
--- trunk/octave-forge/main/image/COPYING 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/COPYING 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,337 +1 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc. <http://fsf.org/>
- 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, see <http://www.gnu.org/licenses/>.
-
-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.
+See individual files for licenses
Modified: trunk/octave-forge/main/image/inst/blkproc.m
===================================================================
--- trunk/octave-forge/main/image/inst/blkproc.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/blkproc.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,17 +1,17 @@
## Copyright (C) 2004 Josep Mones i Teixidor
##
-## 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 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 3 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.
+## 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, see <http://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
## -*- texinfo -*-
## @deftypefn {Function File} {@var{B} = } blkproc (@var{A}, [@var{m},@var{n}], @var{fun})
Modified: trunk/octave-forge/main/image/inst/blockproc.m
===================================================================
--- trunk/octave-forge/main/image/inst/blockproc.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/blockproc.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,23 +1,23 @@
-## Copyright (C) 2004 Josep Mones i Teixidor
+## Copyright (C) 2004 Josep Mones i Teixidor <jm...@pu...>
##
-## 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 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 3 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.
+## 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, see <http://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
## -*- texinfo -*-
## @deftypefn {Function File} {@var{B} = } blockproc (@var{A}, [@var{m},@var{n}], @var{fun})
-## @deftypefnx {Function File} {@var{B} = } blockproc (@var{A}, [@var{m},@var{n}], @var{fun}, ...)
-## @deftypefnx {Function File} {@var{B} = } blockproc (@var{A}, [@var{m},@var{n}], [@var{mborder},@var{nborder}], @var{fun}, @var{...})
-## @deftypefnx {Function File} {@var{B} = } blockproc (@var{A}, 'indexed', ...)
+## @deftypefnx {Function File} {@var{B} = } blockproc (@var{A}, [@var{m},@var{n}], @var{fun}, @dots{})
+## @deftypefnx {Function File} {@var{B} = } blockproc (@var{A}, [@var{m},@var{n}], [@var{mborder},@var{nborder}], @var{fun}, @dots{})
+## @deftypefnx {Function File} {@var{B} = } blockproc (@var{A}, 'indexed', @dots{})
## Processes image in blocks using user-supplied function.
##
## @code{B=blockproc(A,[m,n],fun)} divides image @var{A} in
@@ -27,10 +27,10 @@
## at the bottom and right borders of the image. 0 is used as a padding
## value.
##
-## @code{B=blockproc(A,[m,n],fun,...)} behaves as described above but
+## @code{B=blockproc(A,[m,n],fun, @dots{})} behaves as described above but
## passes extra parameters to function @var{fun}.
##
-## @code{B=blockproc(A,[m,n],[mborder,nborder],fun,...)} behaves as
+## @code{B=blockproc(A,[m,n],[mborder,nborder],fun, @dots{})} behaves as
## described but uses blocks which overlap with neighbour blocks.
## Overlapping dimensions are @var{mborder} vertically and @var{nborder}
## horizontally. This doesn't change the number of blocks in an image
@@ -38,7 +38,7 @@
## border requires extra padding on all edges of the image. 0 is used as
## a padding value.
##
-## @code{B=blockproc(A,'indexed',...)} assumes that @var{A} is an indexed
+## @code{B=blockproc(A,'indexed', @dots{})} assumes that @var{A} is an indexed
## image, so it pads the image using proper value: 0 for uint8 and
## uint16 images and 1 for double images. Keep in mind that if 'indexed'
## is not specified padding is always done using 0.
@@ -46,8 +46,6 @@
## @seealso{colfilt,inline,bestblk}
## @end deftypefn
-## Author: Josep Mones i Teixidor <jm...@pu...>
-
function B = blockproc(A, varargin)
if(nargin<3)
print_usage;
@@ -167,38 +165,3 @@
%!assert(blockproc(uint8(eye(6)),'indexed',[1,2],[1,1],inline("sum(x(:))","x")),[2,1,0;3,2,0;2,3,1;1,3,2;0,2,3;0,1,2]);
%!assert(blockproc(uint16(eye(6)),[1,2],[1,1],inline("sum(x(:))","x")),[2,1,0;3,2,0;2,3,1;1,3,2;0,2,3;0,1,2]);
%!assert(blockproc(uint16(eye(6)),'indexed',[1,2],[1,1],inline("sum(x(:))","x")),[2,1,0;3,2,0;2,3,1;1,3,2;0,2,3;0,1,2]);
-
-
-%
-% $Log$
-% Revision 1.5 2007/03/23 16:14:36 adb014
-% Update the FSF address
-%
-% Revision 1.4 2007/01/04 23:44:22 hauberg
-% Minor changes in help text
-%
-% Revision 1.3 2007/01/04 23:37:54 hauberg
-% Minor changes in help text
-%
-% Revision 1.2 2006/10/08 21:41:04 adb014
-% check isnumeric for vector and 'function_handle' not 'function handle' in isa test
-%
-% Revision 1.1 2006/08/20 12:59:31 hauberg
-% Changed the structure to match the package system
-%
-% Revision 1.5 2005/09/08 02:00:17 pkienzle
-% [for Bill Denney] isstr -> ischar
-%
-% Revision 1.4 2004/11/15 16:04:20 pkienzle
-% Fix tests for functions which return boolean matrices
-%
-% Revision 1.3 2004/09/03 17:49:37 jmones
-% Improved uint8 and uint16 padding expections
-%
-% Revision 1.2 2004/09/03 13:40:13 jmones
-% Check result has same class as function result, and improved fun param checking
-%
-% Revision 1.1 2004/08/15 19:27:46 jmones
-% blockproc: block process an image using user-supplied function
-%
-%
Modified: trunk/octave-forge/main/image/inst/bmpwrite.m
===================================================================
--- trunk/octave-forge/main/image/inst/bmpwrite.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/bmpwrite.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,3 +1,6 @@
+## Author: Paul Kienzle <pki...@us...>
+## This program is granted to the public domain.
+
## -*- texinfo -*-
## @deftypefn {Function File} bmpwrite (@var{X}, @var{map}, @var{file})
## Write the bitmap @var{X} into @var{file} (8-bit indexed uncompressed).
@@ -7,10 +10,6 @@
## @var{X} is an m x n x 3 array of R,G,B integer values in the range 0 to 255.
## @end deftypefn
-## This code is in the public domain.
-## Author: Paul Kienzle <pki...@us...>
-
-
function bmpwrite(x,colormap_or_file,file)
if nargin==2
bmpwrite_truecolor(x(:,:,1),x(:,:,2),x(:,:,3),colormap_or_file);
Modified: trunk/octave-forge/main/image/inst/bwarea.m
===================================================================
--- trunk/octave-forge/main/image/inst/bwarea.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/bwarea.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,17 +1,17 @@
-## Copyright (C) 2005 S\xF8ren Hauberg
-##
-## 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, see <http://www.gnu.org/licenses/>.
+## Copyright (C) 2005 S\xF8ren Hauberg <so...@ha...>
+##
+## 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 3 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, see <http://www.gnu.org/licenses/>.
## -*- texinfo -*-
## @deftypefn {Function File} @var{total}= bwarea(@var{bw})
@@ -24,12 +24,6 @@
## and not the image object.
## @end deftypefn
-## Author: S\xF8ren Hauberg <hauberg at gmail dot com>
-##
-## 2005-06-05 S\xF8ren Hauberg <hauberg at gmail dot com>
-## * Initial revision
-
-
function total = bwarea(bw)
if (isgray(bw))
bw = (bw > 0);
Modified: trunk/octave-forge/main/image/inst/bwborder.m
===================================================================
--- trunk/octave-forge/main/image/inst/bwborder.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/bwborder.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,17 +1,17 @@
-## Copyright (C) 2000 Etienne Grossmann
+## Copyright (C) 2000 Etienne Grossmann <et...@eg...>
##
-## 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 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 3 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.
+## 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, see <http://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
## -*- texinfo -*-
## @deftypefn {Function File} {@var{b} = } bwborder (@var{im})
@@ -23,9 +23,6 @@
## neighbor that is not set.
## @end deftypefn
-## Author: Etienne Grossmann <et...@eg...>
-## Last modified: January 2000
-
function b = bwborder(im)
[R,C]=size(im);
Modified: trunk/octave-forge/main/image/inst/bwboundaries.m
===================================================================
--- trunk/octave-forge/main/image/inst/bwboundaries.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/bwboundaries.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,18 +1,18 @@
-## Copyright (C) 2010 Soren Hauberg
-## Modified December 2010 by Andrew Kelly, IPS Radio & Space Services
+## Copyright (C) 2010 Soren Hauberg <so...@ha...>
+## Copyright (C) Andrew Kelly, IPS Radio & Space Services
##
-## 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 3 of the License, or
-## (at your option) any later version.
+## 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 3 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.
+## 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, see <http://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
## -*- texinfo -*-
## @deftypefn {Function File} {@var{boundaries} = } bwboundaries(@var{BW})
Modified: trunk/octave-forge/main/image/inst/bwconncomp.m
===================================================================
--- trunk/octave-forge/main/image/inst/bwconncomp.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/bwconncomp.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,17 +1,17 @@
## Copyright (C) 2010 Soren Hauberg
##
-## 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 3 of the License, or
-## (at your option) any later version.
+## 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 3 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.
+## 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, see <http://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
## -*- texinfo -*-
## @deftypefn {Function File} {@var{cc} = } bwconncomp (@var{BW})
Modified: trunk/octave-forge/main/image/inst/bwdist.m
===================================================================
--- trunk/octave-forge/main/image/inst/bwdist.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/bwdist.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,17 +1,17 @@
-## Copyright (C) 2006 Stefan Gustavson
-##
-## 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, 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 file. If not, see <http://www.gnu.org/licenses/>.
+## Copyright (C) 2006 Stefan Gustavson
+##
+## 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 3 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, see <http://www.gnu.org/licenses/>.
## -*- texinfo -*-
## @deftypefn {Function File} {@var{D} =} bwdist(@var{bw})
Modified: trunk/octave-forge/main/image/inst/bweuler.m
===================================================================
--- trunk/octave-forge/main/image/inst/bweuler.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/bweuler.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,18 +1,18 @@
## Copyright (C) 2004 Josep Mones i Teixidor <jm...@pu...>
## Copyright (C) 2011 Adrián del Pino <del...@gm...>
##
-## 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 3 of the License, or
-## (at your option) any later version.
+## 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 3 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.
+## 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, see <http://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
## -*- texinfo -*-
## @deftypefn {Function File} {@var{eul} = } bweuler (@var{BW}, @var{n})
@@ -34,8 +34,6 @@
## @seealso{bwmorph, bwperim, qtgetblk}
## @end deftypefn
-## Author: Josep Mones i Teixidor <jm...@pu...>
-
function eul = bweuler (BW, n = 8)
if (nargin < 1 || nargin > 2)
print_usage;
@@ -97,19 +95,3 @@
%! assert(bweuler(A,4),2);
%! assert(bweuler(A,8),1);
%! assert(bweuler(A),1);
-
-% $Log$
-% Revision 1.3 2007/03/23 16:14:36 adb014
-% Update the FSF address
-%
-% Revision 1.2 2007/01/04 23:41:47 hauberg
-% Minor changes in help text
-%
-% Revision 1.1 2006/08/20 12:59:31 hauberg
-% Changed the structure to match the package system
-%
-% Revision 1.2 2005/07/03 01:10:19 pkienzle
-% Try to correct for missing newline at the end of the file
-%
-% Revision 1.1 2004/08/15 19:33:20 jmones
-% bweuler: Calculates the Euler number of a binary image
Modified: trunk/octave-forge/main/image/inst/bwhitmiss.m
===================================================================
--- trunk/octave-forge/main/image/inst/bwhitmiss.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/bwhitmiss.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,64 +1,67 @@
-## Copyright (C) 2008 Soren Hauberg
-##
-## 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.
-
-## -*- texinfo -*-
-## @deftypefn {Function File} @var{bw2} = bwhitmiss (@var{bw1}, @var{se1}, @var{se1})
-## @deftypefnx{Function File} @var{bw2} = bwhitmiss (@var{bw1}, @var{interval})
-## Perform the binary hit-miss operation.
-##
-## If two structuring elements @var{se1} and @var{se1} are given, the hit-miss
-## operation is defined as
-## @example
-## bw2 = erode(bw1, se1) & erode(!bw1, se2);
-## @end example
-## If instead an 'interval' array is given, two structuring elements are computed
-## as
-## @example
-## se1 = (interval == 1)
-## se2 = (interval == -1)
-## @end example
-## and then the operation is defined as previously.
-## @seealso{bwmorph}
-## @end deftypefn
+## Copyright (C) 2008 Soren Hauberg <so...@ha...>
+##
+## 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 3 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, see <http://www.gnu.org/licenses/>.
-function bw = bwhitmiss(im, varargin)
- ## Checkinput
- if (nargin != 2 && nargin != 3)
- print_usage();
- endif
- if (!ismatrix(im) || !isreal(im))
- error("bwhitmiss: first input argument must be a real matrix");
- endif
-
- ## Get structuring elements
- if (nargin == 2) # bwhitmiss (im, interval)
+## -*- texinfo -*-
+## @deftypefn {Function File} @var{bw2} = bwhitmiss (@var{bw1}, @var{se1}, @var{se1})
+## @deftypefnx{Function File} @var{bw2} = bwhitmiss (@var{bw1}, @var{interval})
+## Perform the binary hit-miss operation.
+##
+## If two structuring elements @var{se1} and @var{se1} are given, the hit-miss
+## operation is defined as
+## @example
+## bw2 = erode(bw1, se1) & erode(!bw1, se2);
+## @end example
+## If instead an 'interval' array is given, two structuring elements are computed
+## as
+## @example
+## se1 = (interval == 1)
+## se2 = (interval == -1)
+## @end example
+## and then the operation is defined as previously.
+## @seealso{bwmorph}
+## @end deftypefn
+
+function bw = bwhitmiss(im, varargin)
+ ## Checkinput
+ if (nargin != 2 && nargin != 3)
+ print_usage();
+ endif
+ if (!ismatrix(im) || !isreal(im))
+ error("bwhitmiss: first input argument must be a real matrix");
+ endif
+
+ ## Get structuring elements
+ if (nargin == 2) # bwhitmiss (im, interval)
interval = varargin{1};
- if (!isreal(interval))
- error("bwhitmiss: second input argument must be a real matrix");
- endif
- if (!all( (interval(:) == 1) | (interval(:) == 0) | (interval(:) == -1) ))
+ if (!isreal(interval))
+ error("bwhitmiss: second input argument must be a real matrix");
+ endif
+ if (!all( (interval(:) == 1) | (interval(:) == 0) | (interval(:) == -1) ))
error("bwhitmiss: second input argument can only contain the values -1, 0, and 1");
- endif
- se1 = (interval == 1);
- se2 = (interval == -1);
- else # bwhitmiss (im, se1, se2)
- se1 = varargin{1};
- se2 = varargin{2};
- if (!all((se1(:) == 1) | (se1(:) == 0)) || !all((se2(:) == 1) | (se2(:) == 0)))
+ endif
+ se1 = (interval == 1);
+ se2 = (interval == -1);
+ else # bwhitmiss (im, se1, se2)
+ se1 = varargin{1};
+ se2 = varargin{2};
+ if (!all((se1(:) == 1) | (se1(:) == 0)) || !all((se2(:) == 1) | (se2(:) == 0)))
error("bwhitmiss: structuring elements can only contain zeros and ones.");
- endif
- endif
-
- ## Perform filtering
- bw = erode(im, se1) & erode(!im, se2);
-
-endfunction
+ endif
+ endif
+
+ ## Perform filtering
+ bw = erode(im, se1) & erode(!im, se2);
+
+endfunction
Modified: trunk/octave-forge/main/image/inst/bwperim.m
===================================================================
--- trunk/octave-forge/main/image/inst/bwperim.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/bwperim.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,35 +1,35 @@
-## Copyright (C) 2006 S\xF8ren Hauberg
-##
-## 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, 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 file. If not, see <http://www.gnu.org/licenses/>.
+## Copyright (C) 2006 S\xF8ren Hauberg <so...@ha...>
+##
+## 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 3 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, see <http://www.gnu.org/licenses/>.
## -*- texinfo -*-
## @deftypefn {Function File} @var{BW2} = bwperim(@var{BW1})
## @deftypefnx{Function File} @var{BW2} = bwperim(@var{BW1}, @var{n})
## Find the perimeter of objects in binary images.
##
-## A pixel is part of an object perimeter if its value is one and there
+## A pixel is part of an object perimeter if its value is one and there
## is at least one zero-valued pixel in its neighborhood.
##
## By default the neighborhood of a pixel is 4 nearest pixels, but
-## if @var{n} is set to 8 the 8 nearest pixels will be considered.
+## if @var{n} is set to 8 the 8 nearest pixels will be considered.
## @end deftypefn
-
-function out = bwperim(bw, n=4)
+
+function out = bwperim(bw, n=4)
## Input checking
if (nargin < 1)
print_usage();
- endif
+ endif
if (!isbw(bw) || ndims(bw)!=2)
error("bwperim: first input argument must be a 2-dimensional binary image");
endif
@@ -41,7 +41,7 @@
bw = logical (bw);
## Translate image by one pixel in all directions
- [rows, cols] = size(bw);
+ [rows, cols] = size(bw);
north = [bw(2:end, :); zeros(1, cols, "logical")];
south = [zeros(1, cols, "logical"); bw(1:end-1, :)];
west = [bw(:, 2:end), zeros(rows, 1, "logical")];
@@ -54,7 +54,7 @@
south_west (2:end, 1:end-1) = bw (1:end-1, 2:end);
endif
- ## Do the comparing
+ ## Do the comparing
if (n == 4)
out = bw;
idx = (north == bw) & (south == bw) & (west == bw) & (east == bw);
Modified: trunk/octave-forge/main/image/inst/bwselect.m
===================================================================
--- trunk/octave-forge/main/image/inst/bwselect.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/bwselect.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,3 +1,7 @@
+## Copyright (C) 1999 Andy Adler
+## This code has no warrany whatsoever.
+## Do what you like with this code as long as you leave this copyright in place.
+
## -*- texinfo -*-
## @deftypefn {Function File} {[@var{imout}, @var{idx}] =} bwselect(@var{im}, @var{cols}, @var{rows}, @var{connect})
## Select connected regions in a binary image.
@@ -17,12 +21,6 @@
## @end table
## @end deftypefn
-# Copyright (C) 1999 Andy Adler
-# This code has no warrany whatsoever.
-# Do what you like with this code as long as you
-# leave this copyright in place.
-#
-# $Id$
function [imout, idx] = bwselect( im, cols, rows, connect )
if nargin<4
@@ -33,23 +31,3 @@
imout= zeros( size(jnk) );
imout( idx ) = 1;
-
-#
-# $Log$
-# Revision 1.3 2007/01/04 23:41:47 hauberg
-# Minor changes in help text
-#
-# Revision 1.2 2007/01/02 21:58:38 hauberg
-# Documentation is now in Texinfo (looks better on the website)
-#
-# Revision 1.1 2006/08/20 12:59:32 hauberg
-# Changed the structure to match the package system
-#
-# Revision 1.1 2002/03/17 02:38:52 aadler
-# fill and edge detection operators
-#
-# Revision 1.1 1999/06/08 17:06:01 aadler
-# Initial revision
-#
-#
-
Modified: trunk/octave-forge/main/image/inst/colfilt.m
===================================================================
--- trunk/octave-forge/main/image/inst/colfilt.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/colfilt.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,3 +1,6 @@
+## Author: Paul Kienzle <pki...@us...>
+## This program is granted to the public domain.
+
## -*- texinfo -*-
## @deftypefn {Function File} colfilt(@var{A}, [@var{r}, @var{c}], [@var{m}, @var{n}], 'sliding', @var{f},...)
## Apply filter to matrix blocks
@@ -25,9 +28,6 @@
## The present version does not handle 'distinct'
## @end deftypefn
-## This software is granted to the public domain
-## Author: Paul Kienzle <pki...@us...>
-
function B = colfilt(A,filtsize,blksize,blktype,f,varargin)
## Input checking
real_nargin = nargin - length(varargin);
Modified: trunk/octave-forge/main/image/inst/conndef.m
===================================================================
--- trunk/octave-forge/main/image/inst/conndef.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/conndef.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,17 +1,17 @@
-## Copyright (C) 2004 Josep Mones i Teixidor
+## Copyright (C) 2004 Josep Mones i Teixidor <jm...@pu...>
##
-## 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 3 of the License, or
-## (at your option) any later version.
+## 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 3 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.
+## 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, see <http://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
## -*- texinfo -*-
## @deftypefn {Function File} {@var{conn} = } conndef (@var{num_dims}, @var{type})
@@ -32,8 +32,6 @@
## @seealso{iptcheckconn}
## @end deftypefn
-## Author: Josep Mones i Teixidor <jm...@pu...>
-
function conn = conndef (num_dims, conntype)
if (nargin!=2)
Modified: trunk/octave-forge/main/image/inst/corr2.m
===================================================================
--- trunk/octave-forge/main/image/inst/corr2.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/corr2.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,17 +1,17 @@
-## Copyright (C) 2000 Kai Habel
+## Copyright (C) 2000 Kai Habel <kai...@gm...>
##
-## 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 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 3 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.
+## 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, see <http://www.gnu.org/licenses/>.
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, see <http://www.gnu.org/licenses/>.
## -*- texinfo -*-
## @deftypefn {Function File} @var{r} = corr2 (@var{I},@var{J})
@@ -21,10 +21,6 @@
##
## @end deftypefn
-
-## Author: Kai Habel <kai...@gm...>
-## Date: 01/08/2000
-
function r = corr2 (I, J)
if (nargin != 2)
Modified: trunk/octave-forge/main/image/inst/edge.m
===================================================================
--- trunk/octave-forge/main/image/inst/edge.m 2012-04-16 11:47:35 UTC (rev 10247)
+++ trunk/octave-forge/main/image/inst/edge.m 2012-04-16 12:49:47 UTC (rev 10248)
@@ -1,25 +1,17 @@
-## Copyright (C) 2008 S\xF8ren Hauberg
-##
-## 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 3 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
+## Copyright (C) 2008 S\xF8ren Hauberg <so...@ha...>
##
-## Note: The implementation and help text for the 'andy' edge detector came with
-## the following notice:
-## Copyright (C) 1999 Andy Adler
-## This code has no warrany whatsoever.
-## Do what you like with this code as long as you
-## leave this copyright in place.
+## 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 3 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, see <http://www.gnu.org/licenses/>.
## -*- te...
[truncated message content] |
