diff --git a/ChangeLog b/ChangeLog index 98ba7bd6..17c215a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ - VipsFormat is deprecated - remove outchecks from documented API - support gobject-introspection +- new Python binding based on gobject-introspection 12/10/11 started 7.26.6 - NOCACHE was not being set correctly on OS X causing performance diff --git a/TODO b/TODO index 57c25505..48118b9b 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,5 @@ -- add more checks to Python vips_call() - - need an exception class - - how do we structure the module? - +- cache tracing is very handy, maybe make the VIPS_DEBUG macros in cache.c + into glog things diff --git a/libvips/arithmetic/measure.c b/libvips/arithmetic/measure.c index 7fc800ef..77d8a3dc 100644 --- a/libvips/arithmetic/measure.c +++ b/libvips/arithmetic/measure.c @@ -111,11 +111,11 @@ vips_measure_build( VipsObject *object ) /* left/top/width/height default to the size of the image. */ - if( !vips_object_get_assigned( object, "width" ) ) + if( !vips_object_get_argument_assigned( object, "width" ) ) g_object_set( object, "width", vips_image_get_width( measure->in ), NULL ); - if( !vips_object_get_assigned( object, "height" ) ) + if( !vips_object_get_argument_assigned( object, "height" ) ) g_object_set( object, "height", vips_image_get_height( measure->in ), NULL ); diff --git a/libvips/foreign/tiffsave.c b/libvips/foreign/tiffsave.c index 8c0b116b..f3bb88a8 100644 --- a/libvips/foreign/tiffsave.c +++ b/libvips/foreign/tiffsave.c @@ -93,14 +93,14 @@ vips_foreign_save_tiff_build( VipsObject *object ) /* Default xres/yres to the values from the image. */ - if( !vips_object_get_assigned( object, "xres" ) ) + if( !vips_object_get_argument_assigned( object, "xres" ) ) tiff->xres = save->ready->Xres * 10.0; - if( !vips_object_get_assigned( object, "yres" ) ) + if( !vips_object_get_argument_assigned( object, "yres" ) ) tiff->yres = save->ready->Yres * 10.0; /* resunit param overrides resunit metadata. */ - if( !vips_object_get_assigned( object, "resunit" ) && + if( !vips_object_get_argument_assigned( object, "resunit" ) && vips_image_get_typeof( save->ready, VIPS_META_RESOLUTION_UNIT ) && !vips_image_get_string( save->ready, diff --git a/libvips/include/vips/object.h b/libvips/include/vips/object.h index 5cf28702..697fb2c2 100644 --- a/libvips/include/vips/object.h +++ b/libvips/include/vips/object.h @@ -293,8 +293,11 @@ int vips_object_get_argument( VipsObject *object, const char *name, GParamSpec **pspec, VipsArgumentClass **argument_class, VipsArgumentInstance **argument_instance ); -gboolean vips_object_get_assigned( VipsObject *object, const char *name ); -VipsArgumentFlags vips_object_get_flags( VipsObject *object, const char *name ); +gboolean vips_object_get_argument_assigned( VipsObject *object, + const char *name ); +VipsArgumentFlags vips_object_get_argument_flags( VipsObject *object, + const char *name ); +int vips_object_get_argument_priority( VipsObject *object, const char *name ); /* We have to loop over an objects args in several places, and we can't always * use vips_argument_map(), the preferred looper. Have the loop code as a diff --git a/libvips/iofuncs/cache.c b/libvips/iofuncs/cache.c index e5e81a87..847d661c 100644 --- a/libvips/iofuncs/cache.c +++ b/libvips/iofuncs/cache.c @@ -46,8 +46,8 @@ */ /* - */ #define VIPS_DEBUG + */ #ifdef HAVE_CONFIG_H #include diff --git a/libvips/iofuncs/image.c b/libvips/iofuncs/image.c index 84a8de35..a9d87dda 100644 --- a/libvips/iofuncs/image.c +++ b/libvips/iofuncs/image.c @@ -1008,6 +1008,8 @@ vips_image_init( VipsImage *image ) image->sslock = g_mutex_new(); image->sizeof_header = VIPS_SIZEOF_HEADER; + + image->mode = g_strdup( "p" ); } int diff --git a/libvips/iofuncs/object.c b/libvips/iofuncs/object.c index 56cff603..b1617637 100644 --- a/libvips/iofuncs/object.c +++ b/libvips/iofuncs/object.c @@ -505,16 +505,16 @@ vips_object_get_argument( VipsObject *object, const char *name, } /** - * vips_object_get_assigned: + * vips_object_get_argument_assigned: * @object: the object to fetch the args from * @name: arg to fetch * - * Convenience: has an argument been assigned. + * Convenience: has an argument been assigned. Useful for bindings. * * Returns: %TRUE if the arguent has been assigned. */ gboolean -vips_object_get_assigned( VipsObject *object, const char *name ) +vips_object_get_argument_assigned( VipsObject *object, const char *name ) { GParamSpec *pspec; VipsArgumentClass *argument_class; @@ -528,16 +528,16 @@ vips_object_get_assigned( VipsObject *object, const char *name ) } /** - * vips_object_get_flags: + * vips_object_get_argument_flags: * @object: the object to fetch the args from * @name: arg to fetch * - * Convenience: get the flags for an argument. + * Convenience: get the flags for an argument. Useful for bindings. * * Returns: The #VipsArgmentFlags for this argument. */ VipsArgumentFlags -vips_object_get_flags( VipsObject *object, const char *name ) +vips_object_get_argument_flags( VipsObject *object, const char *name ) { GParamSpec *pspec; VipsArgumentClass *argument_class; @@ -550,6 +550,29 @@ vips_object_get_flags( VipsObject *object, const char *name ) return( argument_class->flags ); } +/** + * vips_object_get_argument_priority: + * @object: the object to fetch the args from + * @name: arg to fetch + * + * Convenience: get the priority for an argument. Useful for bindings. + * + * Returns: The priority of this argument. + */ +int +vips_object_get_argument_priority( VipsObject *object, const char *name ) +{ + GParamSpec *pspec; + VipsArgumentClass *argument_class; + VipsArgumentInstance *argument_instance; + + if( vips_object_get_argument( object, name, + &pspec, &argument_class, &argument_instance ) ) + return( 0 ); + + return( argument_class->priority ); +} + static void vips_object_clear_member( VipsObject *object, GParamSpec *pspec, GObject **member ) diff --git a/python/LICENSE.txt b/python/LICENSE.txt new file mode 100644 index 00000000..b1e3f5a2 --- /dev/null +++ b/python/LICENSE.txt @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, 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 library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete 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 distribute a copy of this License along with the +Library. + + 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 Library or any portion +of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +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 Library, 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 Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you 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. + + If distribution of 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 satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be 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. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library 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. + + 9. 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 Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +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 with +this License. + + 11. 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 Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library 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 Library. + +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. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library 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. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +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 Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +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 + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. 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 LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/python/README.txt b/python/README.txt new file mode 100644 index 00000000..01bfa536 --- /dev/null +++ b/python/README.txt @@ -0,0 +1,7 @@ +vips8 binding for Python + +This binding adds a few small helper functions to the gobject-introspection +binding for libvips. + +This is the vips8 API, so it's not yet fully implemented. Use the older vipsCC +binding if you want a more complete system. diff --git a/python/setup.py b/python/setup.py new file mode 100644 index 00000000..ccbb501d --- /dev/null +++ b/python/setup.py @@ -0,0 +1,14 @@ +#!/usr/bin/python + +from distutils.core import setup + +setup(name = 'vips8', + version = '7.28.0dev', + description = 'vips-8.x image processing library', + long_description = open('README.txt').read(), + license = 'LGPL' + author = 'John Cupitt', + author_email = 'jcupitt@gmail.com', + url = 'http://www.vips.ecs.soton.ac.uk', + requires = ['gi'], + packages = ['vips8']) diff --git a/python/try.py b/python/try.py index aaecc9d6..4755dde6 100755 --- a/python/try.py +++ b/python/try.py @@ -30,14 +30,14 @@ print 'call operation:' op = Vips.Operation.new("add") for prop in op.props: print 'prop.name =', prop.name - flags = op.get_flags(prop.name) + flags = op.get_argument_flags(prop.name) if flags & Vips.ArgumentFlags.OUTPUT: print '\toutput' if flags & Vips.ArgumentFlags.INPUT: print '\tinput' if flags & Vips.ArgumentFlags.REQUIRED: print '\trequired' - print '\tassigned', op.get_assigned(prop.name) + print '\tassigned', op.get_argument_assigned(prop.name) op.props.left = a op.props.right = b @@ -77,7 +77,7 @@ def vips_call(name, *required, **optional): # set required input args i = 0 for prop in op.props: - flags = op.get_flags(prop.name) + flags = op.get_argument_flags(prop.name) if required_input(flags): if i >= len(required): print 'too few required args!' @@ -90,7 +90,7 @@ def vips_call(name, *required, **optional): # set optional input args for i in optional.keys(): - flags = op.get_flags(i) + flags = op.get_argument_flags(i) if optional_input(flags): op.props.__setattr__(i, optional[i]) @@ -102,11 +102,11 @@ def vips_call(name, *required, **optional): # gather output args out = [] for prop in op2.props: - flags = op2.get_flags(prop.name) + flags = op2.get_argument_flags(prop.name) if required_output(flags): out.append(op2.props.__getattribute__(prop.name)) for i in optional.keys(): - flags = op2.get_flags(i) + flags = op2.get_argument_flags(i) if optional_output(flags): out.append(op2.props.__getattribute__(i)) diff --git a/python/try2.py b/python/try2.py new file mode 100755 index 00000000..e7e69867 --- /dev/null +++ b/python/try2.py @@ -0,0 +1,25 @@ +#!/usr/bin/python + +import logging +logging.basicConfig(level = logging.DEBUG) + +from vips8 import vips + +try: + a = vips.Image("/home/john/pics/babe.poop") +except vips.Error, e: + print e + +a = vips.Image("/home/john/pics/babe.jpg") +b = vips.Image("/home/john/pics/xmaspank2b.jpg") + +print 'a =', a +print 'b =', b + +out = vips.call("add", a, b) + +print 'out =', out + +out = a.add(b) + +print 'out =', out diff --git a/python/vips8/__init__.py b/python/vips8/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/python/vips8/vips.py b/python/vips8/vips.py new file mode 100755 index 00000000..117144ff --- /dev/null +++ b/python/vips8/vips.py @@ -0,0 +1,153 @@ +#!/usr/bin/python + +import logging + +from gi.repository import GLib +from gi.repository import GObject + +# you might need this in your .bashrc +# export GI_TYPELIB_PATH=$VIPSHOME/lib/girepository-1.0 +from gi.repository import Vips + +class Error(Exception): + + """An error from vips. + + message -- a high-level description of the error + detail -- a string with some detailed diagnostics + """ + + def __init__(self, message, detail = None): + self.message = message + if detail == None: + detail = Vips.error_buffer() + Vips.error_clear() + self.detail = detail + + logging.debug('vips: Error %s %s', self.message, self.detail) + + def __str__(self): + return '%s %s' % (self.message, self.detail) + +class Argument: + def __init__(self, op, prop): + self.op = op; + self.prop = prop; + self.name = prop.name; + self.flags = op.get_argument_flags(self.name) + self.priority = op.get_argument_priority(self.name) + self.assigned = op.get_argument_assigned(self.name) + +def _call_base(name, self, required, optional): + logging.debug('_call_base name=%s, self=%s, required=%s optional=%s' % + (name, self, required, optional)) + + op = Vips.Operation.new(name) + + # find all the args for this op, sort into priority order + args = [Argument(op, x) for x in op.props] + args.sort(lambda a, b: a.priority - b.priority) + + enm = Vips.ArgumentFlags + + # find all required, unassigned input args + required_input = [x for x in args if x.flags & enm.INPUT and + x.flags & enm.REQUIRED and + not x.assigned] + + # do we have a non-NULL self pointer? this is used to set the first + # compatible input arg + if self != None: + found = False + for x in required_input: + if GObject.type_is_a(self, x.prop.value_type): + op.props.__setattr__(x.name, self) + required_input.remove(x) + found = True + break + + if not found: + raise Error('Bad arguments.', 'No %s argument to %s.' % + (str(self.__class__), name)) + + if len(required_input) != len(required): + raise Error('Wrong number of arguments.', + '"%s" needs %d arguments, you supplied %d' % + (name, len(required_input), len(required))) + + for i in range(len(required_input)): + op.props.__setattr__(required_input[i].name, required[i]) + + # find all optional, unassigned input args ... just need the names + optional_input = [x.name for x in args if x.flags & enm.INPUT and + not x.flags & enm.REQUIRED and + not x.assigned] + + for key in optional.keys(): + if not key in optional_input: + raise Error('Unknown argument.', + 'Operator %s has no argument %s' % (name, key)) + + # set optional input args + for key in optional.keys(): + op.props.__setattr__(key, optional[key]) + + # call + op2 = Vips.cache_operation_build(op) + if op2 == None: + raise Error('Error calling operator %s.' % name) + + # find all required output args ... just need the names + # we can't check assigned here (since we captured the value before the call) + # but the getattr will test that for us anyway + required_output = [x.name for x in args if x.flags & enm.OUTPUT and + x.flags & enm.REQUIRED] + + # gather output args + out = [] + for x in required_output: + out.append(op2.props.__getattribute__(x)) + + # find all optional output args ... just need the names + optional_output = [x.name for x in args if x.flags & enm.OUTPUT and + not x.flags & enm.REQUIRED] + + for x in optional.keys(): + if x in optional_output: + out.append(op2.props.__getattribute__(x)) + + if len(out) == 1: + out = out[0] + + # unref everything now we have refs to all outputs we want + op2.unref_outputs() + + return out + +# general user entrypoint +def call(name, *args, **kwargs): + return _call_base(name, None, args, kwargs) + +# from getattr ... try to run the attr as a method +def _call_instance(self, name, args, kwargs): + return _call_base(name, self, args, kwargs) + +class Image(Vips.Image): + def __init__(self, filename = None, mode = None): + Vips.Image.__init__(self) + + if filename: + self.props.filename = filename + if not mode: + mode = "rd" + if mode: + self.props.mode = mode + + if self.build() != 0: + print 'build failed' + raise Error('Unable to build image') + + def __getattr__(self, name): + logging.debug('vipsimage: __getattr__ %s' % name) + return lambda *args, **kwargs: _call_instance(self, name, args, kwargs) +