diff -Nru opencpn-plugin-weatherfax-1.3.1/buildosx/InstallOSX/weatherfax_pi.pkgproj.in opencpn-plugin-weatherfax-1.5001.0/buildosx/InstallOSX/weatherfax_pi.pkgproj.in --- opencpn-plugin-weatherfax-1.3.1/buildosx/InstallOSX/weatherfax_pi.pkgproj.in 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/buildosx/InstallOSX/weatherfax_pi.pkgproj.in 2016-02-25 19:25:30.000000000 +0000 @@ -8,7 +8,7 @@ PACKAGE_FILES DEFAULT_INSTALL_LOCATION - /Applications/OpenCPN.app/Contents + / HIERARCHY CHILDREN @@ -74,183 +74,17 @@ CHILDREN - - - CHILDREN - - - CHILDREN - - GID - 80 - PATH - Resources/de.lproj/opencpn-${PACKAGE_NAME}.mo - PATH_TYPE - 3 - PERMISSIONS - 420 - TYPE - 3 - UID - 0 - - - GID - 80 - PATH - de.lproj - PATH_TYPE - 0 - PERMISSIONS - 509 - TYPE - 2 - UID - 0 - - - CHILDREN - - - CHILDREN - - GID - 80 - PATH - Resources/es.lproj/opencpn-${PACKAGE_NAME}.mo - PATH_TYPE - 3 - PERMISSIONS - 420 - TYPE - 3 - UID - 0 - - - GID - 80 - PATH - es.lproj - PATH_TYPE - 0 - PERMISSIONS - 509 - TYPE - 2 - UID - 0 - - - CHILDREN - - - CHILDREN - - GID - 80 - PATH - Resources/et.lproj/opencpn-${PACKAGE_NAME}.mo - PATH_TYPE - 3 - PERMISSIONS - 420 - TYPE - 3 - UID - 0 - - - GID - 80 - PATH - et.lproj - PATH_TYPE - 0 - PERMISSIONS - 509 - TYPE - 2 - UID - 0 - - - CHILDREN - - - CHILDREN - - GID - 80 - PATH - Resources/fr.lproj/opencpn-${PACKAGE_NAME}.mo - PATH_TYPE - 3 - PERMISSIONS - 420 - TYPE - 3 - UID - 0 - - - GID - 80 - PATH - fr.lproj - PATH_TYPE - 0 - PERMISSIONS - 509 - TYPE - 2 - UID - 0 - - - CHILDREN - - - CHILDREN - - GID - 80 - PATH - Resources/pl.lproj/opencpn-${PACKAGE_NAME}.mo - PATH_TYPE - 3 - PERMISSIONS - 420 - TYPE - 3 - UID - 0 - - - GID - 80 - PATH - pl.lproj - PATH_TYPE - 0 - PERMISSIONS - 509 - TYPE - 2 - UID - 0 - - + GID 80 PATH Resources PATH_TYPE - 0 + 3 PERMISSIONS - 509 + 493 TYPE - 2 + 3 UID 0 @@ -767,6 +601,73 @@ UID 0 + + CHILDREN + + + CHILDREN + + + CHILDREN + + + CHILDREN + + GID + 80 + PATH + /usr/local/lib/libportaudio.2.dylib + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 3 + UID + 0 + + + GID + 80 + PATH + lib + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 2 + UID + 0 + + + GID + 80 + PATH + local + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 2 + UID + 0 + + + GID + 80 + PATH + usr + PATH_TYPE + 0 + PERMISSIONS + 493 + TYPE + 2 + UID + 0 + GID 0 @@ -847,15 +748,15 @@ 4 BACKGROUND_PATH - PATH - pkg_background.jpg - PATH_TYPE - 1 - - CUSTOM - 1 - SCALING - 1 + PATH + pkg_background.jpg + PATH_TYPE + 1 + + CUSTOM + 1 + SCALING + 1 INSTALLATION TYPE @@ -1539,7 +1440,7 @@ // return the check results return chk_flag; } - + TYPE 0 diff -Nru opencpn-plugin-weatherfax-1.3.1/cmake/gpl.txt opencpn-plugin-weatherfax-1.5001.0/cmake/gpl.txt --- opencpn-plugin-weatherfax-1.3.1/cmake/gpl.txt 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/cmake/gpl.txt 2016-02-25 19:25:30.000000000 +0000 @@ -1,626 +1,291 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + +This program is distributed under the terms of the GPL v2. + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to + 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 -them 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 prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. +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 pass on to the recipients the same -freedoms that you received. 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. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. +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. - TERMS AND CONDITIONS - - 0. Definitions. + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey 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; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of + 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. - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or + 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 convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. +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. - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will + 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 that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - 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. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -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. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. +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 - END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + 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 @@ -628,15 +293,15 @@ 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 -state the exclusion of warranty; and each file should have at least +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) + Copyright (C) 19yy - This program is free software: you can redistribute it and/or modify + 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 + 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, @@ -645,30 +310,104 @@ 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 . + along with this program; if not, write to the Free Software + Foundation, Inc.,51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + Gnomovision version 69, Copyright (C) 19yy 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, your program's commands -might be different; for a GUI interface, you would use an "about box". +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. + +--------------------------------------------------------------------------- +Additional Licenses +--------------------------------------------------------------------------- +Portions of this program are distributed under the terms of the New BSD +License. Those portions, herinafter called "BSD Modules", include: + +FindPortaudio.cmake +Copyright (c) 2006 Andreas Schneider + +CrashRpt Package +Copyright (c) 2003, The CrashRpt Project Authors. + +Redistribution and use is allowed according to the terms of the New BSD license. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +* Neither the name of the BSD Modules nor the names of its +contributors may be used to endorse or promote products derived from this +software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-------------------------------------------------------------------------------- +Portions of this program are distributed under the terms of the MIT License. +Those portions, herinafter called "MIT Modules", include: + +pugixml library (http://pugixml.org). +pugixml is Copyright (C) 2006-2012 Arseny Kapoulkine. + + +The MIT License (MIT) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff -Nru opencpn-plugin-weatherfax-1.3.1/cmake/PluginConfigure.cmake opencpn-plugin-weatherfax-1.5001.0/cmake/PluginConfigure.cmake --- opencpn-plugin-weatherfax-1.3.1/cmake/PluginConfigure.cmake 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/cmake/PluginConfigure.cmake 2016-02-25 19:25:30.000000000 +0000 @@ -19,7 +19,7 @@ SET(PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}" ) #SET(CMAKE_BUILD_TYPE Debug) -#SET(CMAKE_VERBOSE_MAKEFILE ON) +SET(CMAKE_VERBOSE_MAKEFILE ON) INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include ${PROJECT_SOURCE_DIR}/src) @@ -48,18 +48,29 @@ ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_DEPRECATE) ENDIF(MSVC) -SET(wxWidgets_USE_LIBS base core net xml html adv) -SET(BUILD_SHARED_LIBS TRUE) +SET_PROPERTY(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE) +SET(BUILD_SHARED_LIBS "ON") + -FIND_PACKAGE(wxWidgets REQUIRED) +# QT_ANDROID is a cross-build, so the native FIND_PACKAGE(wxWidgets...) and wxWidgets_USE_FILE is not useful. +IF(NOT QT_ANDROID) +IF(NOT DEFINED wxWidgets_USE_FILE) + SET(wxWidgets_USE_LIBS base core net xml html adv) + SET(BUILD_SHARED_LIBS TRUE) + FIND_PACKAGE(wxWidgets REQUIRED) +ENDIF(NOT DEFINED wxWidgets_USE_FILE) + + INCLUDE(${wxWidgets_USE_FILE}) +ENDIF(NOT QT_ANDROID) IF(MSYS) # this is just a hack. I think the bug is in FindwxWidgets.cmake STRING( REGEX REPLACE "/usr/local" "\\\\;C:/MinGW/msys/1.0/usr/local" wxWidgets_INCLUDE_DIRS ${wxWidgets_INCLUDE_DIRS} ) ENDIF(MSYS) -INCLUDE(${wxWidgets_USE_FILE}) - +# QT_ANDROID is a cross-build, so the native FIND_PACKAGE(OpenGL) is not useful. +# +IF (NOT QT_ANDROID ) FIND_PACKAGE(OpenGL) IF(OPENGL_GLU_FOUND) @@ -73,6 +84,39 @@ ELSE(OPENGL_GLU_FOUND) MESSAGE (STATUS "OpenGL not found..." ) ENDIF(OPENGL_GLU_FOUND) +ENDIF(NOT QT_ANDROID) + +# On Android, PlugIns need a specific linkage set.... +IF (QT_ANDROID ) + # These libraries are needed to create PlugIns on Android. + + SET(OCPN_Core_LIBRARIES + # Presently, Android Plugins are built in the core tree, so the variables {wxQT_BASE}, etc. + # flow to this module from above. If we want to build Android plugins out-of-core, this will need improvement. + + # TODO This is pretty ugly, but there seems no way to avoid specifying a full path in a cross build.... + /home/dsr/Projects/opencpn_sf/opencpn/build-opencpn-Android_for_armeabi_v7a_GCC_4_8_Qt_5_5_0-Debug/libopencpn.so + + ${wxQt_Base}/${wxQt_Build}/lib/libwx_baseu-3.1-arm-linux-androideabi.a + ${wxQt_Base}/${wxQt_Build}/lib/libwx_qtu_core-3.1-arm-linux-androideabi.a + ${wxQt_Base}/${wxQt_Build}/lib/libwx_qtu_html-3.1-arm-linux-androideabi.a + ${wxQt_Base}/${wxQt_Build}/lib/libwx_baseu_xml-3.1-arm-linux-androideabi.a + ${wxQt_Base}/${wxQt_Build}/lib/libwx_qtu_qa-3.1-arm-linux-androideabi.a + ${wxQt_Base}/${wxQt_Build}/lib/libwx_qtu_adv-3.1-arm-linux-androideabi.a + ${wxQt_Base}/${wxQt_Build}/lib/libwx_qtu_aui-3.1-arm-linux-androideabi.a + ${wxQt_Base}/${wxQt_Build}/lib/libwx_baseu_net-3.1-arm-linux-androideabi.a + ${wxQt_Base}/${wxQt_Build}/lib/libwx_qtu_gl-3.1-arm-linux-androideabi.a + ${Qt_Base}/android_armv7/lib/libQt5Core.so + ${Qt_Base}/android_armv7/lib/libQt5OpenGL.so + ${Qt_Base}/android_armv7/lib/libQt5Widgets.so + ${Qt_Base}/android_armv7/lib/libQt5Gui.so + ${Qt_Base}/android_armv7/lib/libQt5AndroidExtras.so + + #${NDK_Base}/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/libgnustl_shared.so + ) + +ENDIF(QT_ANDROID) + SET(BUILD_SHARED_LIBS TRUE) diff -Nru opencpn-plugin-weatherfax-1.3.1/cmake/PluginCurl.cmake opencpn-plugin-weatherfax-1.5001.0/cmake/PluginCurl.cmake --- opencpn-plugin-weatherfax-1.3.1/cmake/PluginCurl.cmake 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/cmake/PluginCurl.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -##--------------------------------------------------------------------------- -## Author: Sean D'Epagnier -## Copyright: -## License: GPLv3+ -##--------------------------------------------------------------------------- - -# configure curl library - -INCLUDE_DIRECTORIES(src/wxcurl) -IF(WIN32) - IF(MSVC) - SET(CURL_LIBRARIES "../buildwin/curllib") - INSTALL(FILES "buildwin/curllib.dll" DESTINATION ".") - INSTALL(FILES "buildwin/libeay32.dll" DESTINATION ".") - INSTALL(FILES "buildwin/openldap.dll" DESTINATION ".") - INSTALL(FILES "buildwin/ssleay32.dll" DESTINATION ".") - INSTALL(FILES "buildwin/libsasl.dll" DESTINATION ".") - INSTALL(FILES "buildwin/curl-ca-bundle.crt" DESTINATION ".") - ELSE(MSVC) ## mingw - SET(CURL_LIBRARIES "curl.dll") - INSTALL(FILES "buildwin/libcurl.dll" DESTINATION ".") - ENDIF(MSVC) - - TARGET_LINK_LIBRARIES(${PACKAGE_NAME} ${CURL_LIBRARIES}) - INCLUDE_DIRECTORIES(src/wxcurl/include) -ENDIF(WIN32) - -IF(UNIX) - FIND_PACKAGE(CURL REQUIRED) - INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR}) - TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} ${CURL_LIBRARIES} ) -ENDIF(UNIX) diff -Nru opencpn-plugin-weatherfax-1.3.1/cmake/PluginInstall.cmake opencpn-plugin-weatherfax-1.5001.0/cmake/PluginInstall.cmake --- opencpn-plugin-weatherfax-1.3.1/cmake/PluginInstall.cmake 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/cmake/PluginInstall.cmake 2016-02-25 19:25:30.000000000 +0000 @@ -49,6 +49,11 @@ FIND_PACKAGE(ZLIB REQUIRED) TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} ${ZLIB_LIBRARIES} ) INSTALL(TARGETS ${PACKAGE_NAME} RUNTIME LIBRARY DESTINATION ${CMAKE_BINARY_DIR}/OpenCPN.app/Contents/PlugIns) + + IF(EXISTS ${PROJECT_SOURCE_DIR}/data) + INSTALL(DIRECTORY data DESTINATION ${CMAKE_BINARY_DIR}/OpenCPN.app/Contents/SharedSupport/plugins/${PACKAGE_NAME}) + ENDIF() + ENDIF(APPLE) IF(UNIX AND NOT APPLE) @@ -82,8 +87,10 @@ IF(UNIX AND NOT APPLE) SET(PREFIX_PARENTDATA ${PREFIX_DATA}/${PARENT}) - SET(PREFIX_PARENTLIB ${PREFIX_LIB}/${PARENT}) - INSTALL(TARGETS ${PACKAGE_NAME} RUNTIME LIBRARY DESTINATION ${PREFIX_PARENTLIB}) + IF(NOT DEFINED PREFIX_PLUGINS) + SET(PREFIX_PLUGINS ${PREFIX_LIB}/${PARENT}) + ENDIF(NOT DEFINED PREFIX_PLUGINS) + INSTALL(TARGETS ${PACKAGE_NAME} RUNTIME LIBRARY DESTINATION ${PREFIX_PLUGINS}) IF(EXISTS ${PROJECT_SOURCE_DIR}/data) INSTALL(DIRECTORY data DESTINATION ${PREFIX_PARENTDATA}/plugins/${PACKAGE_NAME}) diff -Nru opencpn-plugin-weatherfax-1.3.1/cmake/PluginPackage.cmake opencpn-plugin-weatherfax-1.5001.0/cmake/PluginPackage.cmake --- opencpn-plugin-weatherfax-1.3.1/cmake/PluginPackage.cmake 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/cmake/PluginPackage.cmake 2016-02-25 19:25:30.000000000 +0000 @@ -6,6 +6,9 @@ # build a CPack driven installer package #include (InstallRequiredSystemLibraries) +IF (COMMAND cmake_policy) + CMAKE_POLICY(SET CMP0002 OLD) +ENDIF (COMMAND cmake_policy) SET(CPACK_PACKAGE_NAME "${PACKAGE_NAME}") SET(CPACK_PACKAGE_VENDOR "opencpn.org") @@ -147,8 +150,9 @@ INCLUDE(CPack) - +IF(NOT STANDALONE MATCHES "BUNDLED") IF(APPLE) +MESSAGE (STATUS "*** Staging to build PlugIn OSX Package ***") # Copy a bunch of files so the Packages installer builder can find them # relative to ${CMAKE_CURRENT_BINARY_DIR} @@ -181,3 +185,4 @@ ENDIF(APPLE) +ENDIF(NOT STANDALONE MATCHES "BUNDLED") diff -Nru opencpn-plugin-weatherfax-1.3.1/CMakeLists.txt opencpn-plugin-weatherfax-1.5001.0/CMakeLists.txt --- opencpn-plugin-weatherfax-1.3.1/CMakeLists.txt 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/CMakeLists.txt 2016-02-25 19:25:30.000000000 +0000 @@ -1,155 +1,148 @@ -##--------------------------------------------------------------------------- -## Author: Sean D'Epagnier -## Copyright: -## License: GPLv3 -##--------------------------------------------------------------------------- - -# define minimum cmake version -CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) - -PROJECT(weatherfax_pi) -SET(PACKAGE_NAME weatherfax_pi) -SET(VERBOSE_NAME WeatherFax) -SET(TITLE_NAME WEATHERFAX) -SET(CPACK_PACKAGE_CONTACT "Sean D'Epagnier ") - -SET(VERSION_MAJOR "1") -SET(VERSION_MINOR "3") - -IF (UNIX) -INCLUDE("cmake/FindPortaudio.cmake") -IF (PORTAUDIO_FOUND) - MESSAGE (STATUS "Portaudio Found") - INCLUDE_DIRECTORIES(${PORTAUDIO_INCLUDE_DIRS}) - SET(EXTRA_LIBS ${EXTRA_LIBS} ${PORTAUDIO_LIBRARIES}) - ADD_DEFINITIONS(${PORTAUDIO_DEFINITIONS}) - ADD_DEFINITIONS(-DOCPN_USE_PORTAUDIO) -ELSE (PORTAUDIO_FOUND) - MESSAGE (STATUS "Portaudio Not Found...") -ENDIF (PORTAUDIO_FOUND) -ELSE (UNIX) - INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/include) - SET(EXTRA_LIBS ${EXTRA_LIBS} ../buildwin/portaudio_x86) - ADD_DEFINITIONS(-DOCPN_USE_PORTAUDIO) -ENDIF (UNIX) - -IF (MSVC) - INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/include/msvc) -ENDIF (MSVC) - -INCLUDE("cmake/PluginConfigure.cmake") - -SET(SRC_WEATHERFAX - src/weatherfax_pi.cpp - src/FaxDecoder.cpp - src/DecoderOptionsDialog.cpp - src/WeatherFax.cpp - src/WeatherFaxWizard.cpp - src/WeatherFaxUI.cpp - src/WeatherFaxImage.cpp - src/SchedulesDialog.cpp - src/InternetRetrievalDialog.cpp - src/AboutDialog.cpp - src/icons.cpp - - src/wximgkap.cpp - - src/wxcurl/base.cpp - src/wxcurl/dav.cpp - src/wxcurl/davtool.cpp - src/wxcurl/dialog.cpp - src/wxcurl/ftp.cpp - src/wxcurl/ftpparse.cpp - src/wxcurl/ftptool.cpp - src/wxcurl/http.cpp - src/wxcurl/panel.cpp - src/wxcurl/telnet.cpp - src/wxcurl/thread.cpp - src/wxcurl/utils.cpp - - src/libaudiofile/aupv.c - src/libaudiofile/error.c - src/libaudiofile/extended.c - src/libaudiofile/g711.c - - src/libaudiofile/AIFF.cpp - src/libaudiofile/AVR.cpp - src/libaudiofile/CAF.cpp - src/libaudiofile/IFF.cpp - src/libaudiofile/IRCAM.cpp - src/libaudiofile/NIST.cpp - src/libaudiofile/NeXT.cpp - src/libaudiofile/Raw.cpp - src/libaudiofile/SampleVision.cpp - src/libaudiofile/VOC.cpp - - src/libaudiofile/AudioFormat.cpp - src/libaudiofile/File.cpp - src/libaudiofile/FileHandle.cpp - src/libaudiofile/Instrument.cpp - src/libaudiofile/Loop.cpp - src/libaudiofile/Marker.cpp - src/libaudiofile/Miscellaneous.cpp - src/libaudiofile/Setup.cpp - src/libaudiofile/Track.cpp - src/libaudiofile/UUID.cpp - src/libaudiofile/WAVE.cpp - src/libaudiofile/aes.cpp - src/libaudiofile/af_vfs.cpp - src/libaudiofile/compression.cpp - src/libaudiofile/data.cpp - src/libaudiofile/debug.cpp - src/libaudiofile/format.cpp - src/libaudiofile/openclose.cpp - src/libaudiofile/pcm.cpp - src/libaudiofile/query.cpp - src/libaudiofile/units.cpp - src/libaudiofile/util.cpp - - src/libaudiofile/modules/FileModule.cpp - src/libaudiofile/modules/G711.cpp - src/libaudiofile/modules/IMA.cpp - src/libaudiofile/modules/MSADPCM.cpp - src/libaudiofile/modules/Module.cpp - src/libaudiofile/modules/ModuleState.cpp - src/libaudiofile/modules/PCM.cpp - src/libaudiofile/modules/RebufferModule.cpp - src/libaudiofile/modules/SimpleModule.cpp - ) - -IF(UNIX) - INCLUDE("cmake/FindTinyXML.cmake") - FIND_PACKAGE(TinyXML QUIET) -ENDIF(UNIX) - -IF(TINYXML_FOUND) - message (STATUS "Building with system tinyxml") - INCLUDE_DIRECTORIES(${TINYXML_INCLUDE_DIR}) - ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_WEATHERFAX}) - TARGET_LINK_LIBRARIES(${PACKAGE_NAME} ${TINYXML_LIBRARIES}) -ELSE(TINYXML_FOUND) - message (STATUS "Building with embedded tinyxml") - INCLUDE_DIRECTORIES(src/tinyxml/) - SET(SRC_LTINYXML - src/tinyxml/tinyxml.cpp - src/tinyxml/tinyxmlparser.cpp - src/tinyxml/tinyxmlerror.cpp - ) - ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_WEATHERFAX} ${SRC_LTINYXML}) -ENDIF(TINYXML_FOUND) -ADD_DEFINITIONS(-DTIXML_USE_STL) - - -IF(WIN32) - INSTALL(FILES "buildwin/PVW32Con.exe" DESTINATION "plugins\\\\${PACKAGE_NAME}") -ENDIF(WIN32) - -ADD_DEFINITIONS(-DTIXML_USE_STL) - -INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/libaudiofile) - -INCLUDE("cmake/PluginInstall.cmake") -INCLUDE("cmake/PluginCurl.cmake") -INCLUDE("cmake/PluginLocalization.cmake") -INCLUDE("cmake/PluginPackage.cmake") - +##--------------------------------------------------------------------------- +## Author: Sean D'Epagnier +## Copyright: +## License: GPLv3 +##--------------------------------------------------------------------------- + +# define minimum cmake version +CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2) + +PROJECT(weatherfax_pi) +SET(PACKAGE_NAME weatherfax_pi) +SET(VERBOSE_NAME WeatherFax) +SET(TITLE_NAME WEATHERFAX) +SET(CPACK_PACKAGE_CONTACT "Sean D'Epagnier ") + +SET(BUNDLE_DATA TRUE) + +INCLUDE( VERSION.cmake ) +SET(PLUGIN_VERSION "${PLUGIN_VERSION_MAJOR}.${PLUGIN_VERSION_MINOR}.${PLUGIN_VERSION_PATCH}" ) + +SET(VERSION_MAJOR ${PLUGIN_VERSION_MAJOR}) +SET(VERSION_MINOR "${PLUGIN_VERSION_MINOR}${PLUGIN_VERSION_PATCH}") +SET(VERSION_DATE ${PLUGIN_VERSION_DATE}) + +IF (UNIX) +INCLUDE("cmake/FindPortaudio.cmake") +IF (PORTAUDIO_FOUND) + MESSAGE (STATUS "Portaudio Found") + INCLUDE_DIRECTORIES(${PORTAUDIO_INCLUDE_DIRS}) + SET(EXTRA_LIBS ${EXTRA_LIBS} ${PORTAUDIO_LIBRARIES}) + ADD_DEFINITIONS(${PORTAUDIO_DEFINITIONS}) + ADD_DEFINITIONS(-DOCPN_USE_PORTAUDIO) +ELSE (PORTAUDIO_FOUND) + MESSAGE (STATUS "Portaudio Not Found...") +ENDIF (PORTAUDIO_FOUND) +ELSE (UNIX) + INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/include) + SET(EXTRA_LIBS ${EXTRA_LIBS} ../buildwin/portaudio_x86) + ADD_DEFINITIONS(-DOCPN_USE_PORTAUDIO) + INSTALL(FILES "buildwin/portaudio_x86.dll" DESTINATION ".") +ENDIF (UNIX) + +IF (MSVC) + INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/include/msvc) +ENDIF (MSVC) + +INCLUDE("cmake/PluginConfigure.cmake") + +SET(SRC_WEATHERFAX + src/weatherfax_pi.cpp + src/FaxDecoder.cpp + src/DecoderOptionsDialog.cpp + src/WeatherFax.cpp + src/WeatherFaxWizard.cpp + src/WeatherFaxUI.cpp + src/WeatherFaxImage.cpp + src/SchedulesDialog.cpp + src/InternetRetrievalDialog.cpp + src/AboutDialog.cpp + src/icons.cpp + + src/wximgkap.cpp + + src/libaudiofile/aupv.c + src/libaudiofile/error.c + src/libaudiofile/extended.c + src/libaudiofile/g711.c + + src/libaudiofile/AIFF.cpp + src/libaudiofile/AVR.cpp + src/libaudiofile/CAF.cpp + src/libaudiofile/IFF.cpp + src/libaudiofile/IRCAM.cpp + src/libaudiofile/NIST.cpp + src/libaudiofile/NeXT.cpp + src/libaudiofile/Raw.cpp + src/libaudiofile/SampleVision.cpp + src/libaudiofile/VOC.cpp + + src/libaudiofile/AudioFormat.cpp + src/libaudiofile/File.cpp + src/libaudiofile/FileHandle.cpp + src/libaudiofile/Instrument.cpp + src/libaudiofile/Loop.cpp + src/libaudiofile/Marker.cpp + src/libaudiofile/Miscellaneous.cpp + src/libaudiofile/Setup.cpp + src/libaudiofile/Track.cpp + src/libaudiofile/UUID.cpp + src/libaudiofile/WAVE.cpp + src/libaudiofile/aes.cpp + src/libaudiofile/af_vfs.cpp + src/libaudiofile/compression.cpp + src/libaudiofile/data.cpp + src/libaudiofile/debug.cpp + src/libaudiofile/format.cpp + src/libaudiofile/openclose.cpp + src/libaudiofile/pcm.cpp + src/libaudiofile/query.cpp + src/libaudiofile/units.cpp + src/libaudiofile/util.cpp + + src/libaudiofile/modules/FileModule.cpp + src/libaudiofile/modules/G711.cpp + src/libaudiofile/modules/IMA.cpp + src/libaudiofile/modules/MSADPCM.cpp + src/libaudiofile/modules/Module.cpp + src/libaudiofile/modules/ModuleState.cpp + src/libaudiofile/modules/PCM.cpp + src/libaudiofile/modules/RebufferModule.cpp + src/libaudiofile/modules/SimpleModule.cpp + ) + +IF(UNIX) + INCLUDE("cmake/FindTinyXML.cmake") + FIND_PACKAGE(TinyXML QUIET) +ENDIF(UNIX) + +IF(TINYXML_FOUND) + message (STATUS "Building with system tinyxml") + INCLUDE_DIRECTORIES(${TINYXML_INCLUDE_DIR}) + ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_WEATHERFAX}) + TARGET_LINK_LIBRARIES(${PACKAGE_NAME} ${TINYXML_LIBRARIES}) +ELSE(TINYXML_FOUND) + message (STATUS "Building with embedded tinyxml") + INCLUDE_DIRECTORIES(src/tinyxml/) + SET(SRC_LTINYXML + src/tinyxml/tinyxml.cpp + src/tinyxml/tinyxmlparser.cpp + src/tinyxml/tinyxmlerror.cpp + ) + ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_WEATHERFAX} ${SRC_LTINYXML}) +ENDIF(TINYXML_FOUND) +ADD_DEFINITIONS(-DTIXML_USE_STL) + + +IF(WIN32) + INSTALL(FILES "buildwin/PVW32Con.exe" DESTINATION "plugins\\\\${PACKAGE_NAME}") +ENDIF(WIN32) + +ADD_DEFINITIONS(-DTIXML_USE_STL) + +INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/libaudiofile) + +INCLUDE("cmake/PluginInstall.cmake") +INCLUDE("cmake/PluginLocalization.cmake") +INCLUDE("cmake/PluginPackage.cmake") + diff -Nru opencpn-plugin-weatherfax-1.3.1/data/CoordinateSets.xml opencpn-plugin-weatherfax-1.5001.0/data/CoordinateSets.xml --- opencpn-plugin-weatherfax-1.3.1/data/CoordinateSets.xml 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/data/CoordinateSets.xml 2016-02-25 19:25:30.000000000 +0000 @@ -15,7 +15,7 @@ - + @@ -142,4 +142,6 @@ + + diff -Nru opencpn-plugin-weatherfax-1.3.1/data/WeatherFaxInternetRetrieval.xml opencpn-plugin-weatherfax-1.5001.0/data/WeatherFaxInternetRetrieval.xml --- opencpn-plugin-weatherfax-1.3.1/data/WeatherFaxInternetRetrieval.xml 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/data/WeatherFaxInternetRetrieval.xml 2016-02-25 19:25:30.000000000 +0000 @@ -69,7 +69,7 @@ - + @@ -2156,7 +2156,7 @@ - + @@ -2183,6 +2183,7 @@ + diff -Nru opencpn-plugin-weatherfax-1.3.1/debian/changelog opencpn-plugin-weatherfax-1.5001.0/debian/changelog --- opencpn-plugin-weatherfax-1.3.1/debian/changelog 2015-04-23 16:53:44.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/debian/changelog 2016-02-25 19:48:22.000000000 +0000 @@ -1,3 +1,58 @@ +opencpn-plugin-weatherfax (1.5001.0-0~trusty1) trusty; urgency=low + + * Version 1.5001 + + -- Pavel Kalian Thu, 25 Feb 2016 13:46:39 -0600 +opencpn-plugin-weatherfax (1.5001.0-0~vivid1) vivid; urgency=low + + * Version 1.5001 + + -- Pavel Kalian Thu, 25 Feb 2016 13:46:39 -0600 +opencpn-plugin-weatherfax (1.5001.0-0~wily1) wily; urgency=low + + * Version 1.5001 + + -- Pavel Kalian Thu, 25 Feb 2016 13:46:39 -0600 +opencpn-plugin-weatherfax (1.5001.0-0~xenial1) xenial; urgency=low + + * Version 1.5001 + + -- Pavel Kalian Thu, 25 Feb 2016 13:46:39 -0600 +opencpn-plugin-weatherfax (1.4.0-0~precise1) precise; urgency=low + + * Version 1.4 + + -- Pavel Kalian Thu, 04 Jun 2015 13:15:51 -0500 +opencpn-plugin-weatherfax (1.4.0-0~trusty1) trusty; urgency=low + + * Version 1.4 + + -- Pavel Kalian Thu, 04 Jun 2015 13:15:51 -0500 +opencpn-plugin-weatherfax (1.4.0-0~utopic1) utopic; urgency=low + + * Version 1.4 + + -- Pavel Kalian Thu, 04 Jun 2015 13:15:51 -0500 +opencpn-plugin-weatherfax (1.4.0-0~vivid1) vivid; urgency=low + + * Version 1.4 + + -- Pavel Kalian Thu, 04 Jun 2015 13:15:51 -0500 +opencpn-plugin-weatherfax (1.4.0-0~wily1) wily; urgency=low + + * Version 1.4 + + -- Pavel Kalian Thu, 04 Jun 2015 13:15:51 -0500 +opencpn-plugin-weatherfax (1.3.1-0~lucid1) lucid; urgency=low + + * Version 1.3 beta + + -- Pavel Kalian Thu, 23 Apr 2015 11:53:06 -0500 +opencpn-plugin-weatherfax (1.3.1-0~precise1) precise; urgency=low + + * Version 1.3 beta + + -- Pavel Kalian Thu, 23 Apr 2015 11:53:06 -0500 opencpn-plugin-weatherfax (1.3.1-0~trusty1) trusty; urgency=low * Version 1.3 beta diff -Nru opencpn-plugin-weatherfax-1.3.1/debian/control opencpn-plugin-weatherfax-1.5001.0/debian/control --- opencpn-plugin-weatherfax-1.3.1/debian/control 2015-04-23 16:53:44.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/debian/control 2016-02-25 19:48:22.000000000 +0000 @@ -2,7 +2,7 @@ Section: misc Priority: extra Maintainer: Pavel Kalian -Build-Depends: debhelper (>= 8.0.0), cmake, cdbs, libgtk2.0-dev, gettext, gpsd, gpsd-clients, libgps-dev, wx-common, libwxgtk2.8-dev, libglu1-mesa-dev, libgtk2.0-dev, wx2.8-headers, libbz2-dev, libtinyxml-dev, libsdl1.2debian, libportaudio2, portaudio19-dev, libcurl4-openssl-dev,portaudio19-dev +Build-Depends: debhelper (>= 8.0.0), cmake, cdbs, libgtk2.0-dev, gettext, gpsd, gpsd-clients, libgps-dev, wx-common, libwxgtk3.0-dev, libglu1-mesa-dev, libgtk2.0-dev, wx3.0-headers, libbz2-dev, libtinyxml-dev, libsdl1.2debian, libportaudio2, portaudio19-dev, portaudio19-dev Standards-Version: 3.9.3 Homepage: http://www.opencpn.org #Vcs-Git: git://git.debian.org/collab-maint/opencpn.git @@ -10,6 +10,6 @@ Package: opencpn-plugin-weatherfax Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, wx2.8-i18n, opencpn, libcurl3,libportaudio2 +Depends: ${shlibs:Depends}, ${misc:Depends}, wx3.0-i18n, opencpn (>= 4.1.0), libportaudio2 Description: Plugin for OpenCPN OpenCPN is a free software (GPLv2) project to create a concise chartplotter and navigation software for use as an underway or planning tool. OpenCPN is developed by a team of active sailors using real world conditions for program testing and refinement. diff -Nru opencpn-plugin-weatherfax-1.3.1/debian/rules opencpn-plugin-weatherfax-1.5001.0/debian/rules --- opencpn-plugin-weatherfax-1.3.1/debian/rules 2015-04-23 16:53:08.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/debian/rules 2016-02-25 19:47:00.000000000 +0000 @@ -9,6 +9,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +#Don't touch the SVG files otherwise cairo is not able to render them... +DEB_DH_SCOUR_ARGS += -Xsvg + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/cmake.mk diff -Nru opencpn-plugin-weatherfax-1.3.1/include/GL/glext.h opencpn-plugin-weatherfax-1.5001.0/include/GL/glext.h --- opencpn-plugin-weatherfax-1.3.1/include/GL/glext.h 1970-01-01 00:00:00.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/include/GL/glext.h 2016-02-25 19:25:30.000000000 +0000 @@ -0,0 +1,7260 @@ +#ifndef __glext_h_ +#define __glext_h_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* +** Copyright (c) 2007 The Khronos Group Inc. +** +** Permission is hereby granted, free of charge, to any person obtaining a +** copy of this software and/or associated documentation files (the +** "Materials"), to deal in the Materials without restriction, including +** without limitation the rights to use, copy, modify, merge, publish, +** distribute, sublicense, and/or sell copies of the Materials, and to +** permit persons to whom the Materials are furnished to do so, subject to +** the following conditions: +** +** The above copyright notice and this permission notice shall be included +** in all copies or substantial portions of the Materials. +** +** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +*/ + +#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) +#define WIN32_LEAN_AND_MEAN 1 +#include +#endif + +#ifndef APIENTRY +#define APIENTRY +#endif +#ifndef APIENTRYP +#define APIENTRYP APIENTRY * +#endif +#ifndef GLAPI +#define GLAPI extern +#endif + +/*************************************************************/ + +/* Header file version number, required by OpenGL ABI for Linux */ +/* glext.h last updated 2007/02/12 */ +/* Current version at http://www.opengl.org/registry/ */ +#define GL_GLEXT_VERSION 39 + +#ifndef GL_VERSION_1_2 +#define GL_UNSIGNED_BYTE_3_3_2 0x8032 +#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 +#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 +#define GL_UNSIGNED_INT_8_8_8_8 0x8035 +#define GL_UNSIGNED_INT_10_10_10_2 0x8036 +#define GL_RESCALE_NORMAL 0x803A +#define GL_TEXTURE_BINDING_3D 0x806A +#define GL_PACK_SKIP_IMAGES 0x806B +#define GL_PACK_IMAGE_HEIGHT 0x806C +#define GL_UNPACK_SKIP_IMAGES 0x806D +#define GL_UNPACK_IMAGE_HEIGHT 0x806E +#define GL_TEXTURE_3D 0x806F +#define GL_PROXY_TEXTURE_3D 0x8070 +#define GL_TEXTURE_DEPTH 0x8071 +#define GL_TEXTURE_WRAP_R 0x8072 +#define GL_MAX_3D_TEXTURE_SIZE 0x8073 +#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 +#define GL_UNSIGNED_SHORT_5_6_5 0x8363 +#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 +#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 +#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 +#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 +#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 +#define GL_BGR 0x80E0 +#define GL_BGRA 0x80E1 +#define GL_MAX_ELEMENTS_VERTICES 0x80E8 +#define GL_MAX_ELEMENTS_INDICES 0x80E9 +#define GL_CLAMP_TO_EDGE 0x812F +#define GL_TEXTURE_MIN_LOD 0x813A +#define GL_TEXTURE_MAX_LOD 0x813B +#define GL_TEXTURE_BASE_LEVEL 0x813C +#define GL_TEXTURE_MAX_LEVEL 0x813D +#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 +#define GL_SINGLE_COLOR 0x81F9 +#define GL_SEPARATE_SPECULAR_COLOR 0x81FA +#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 +#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 +#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 +#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 +#define GL_ALIASED_POINT_SIZE_RANGE 0x846D +#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E +#endif + +#ifndef GL_ARB_imaging +#define GL_CONSTANT_COLOR 0x8001 +#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 +#define GL_CONSTANT_ALPHA 0x8003 +#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 +#define GL_BLEND_COLOR 0x8005 +#define GL_FUNC_ADD 0x8006 +#define GL_MIN 0x8007 +#define GL_MAX 0x8008 +#define GL_BLEND_EQUATION 0x8009 +#define GL_FUNC_SUBTRACT 0x800A +#define GL_FUNC_REVERSE_SUBTRACT 0x800B +#define GL_CONVOLUTION_1D 0x8010 +#define GL_CONVOLUTION_2D 0x8011 +#define GL_SEPARABLE_2D 0x8012 +#define GL_CONVOLUTION_BORDER_MODE 0x8013 +#define GL_CONVOLUTION_FILTER_SCALE 0x8014 +#define GL_CONVOLUTION_FILTER_BIAS 0x8015 +#define GL_REDUCE 0x8016 +#define GL_CONVOLUTION_FORMAT 0x8017 +#define GL_CONVOLUTION_WIDTH 0x8018 +#define GL_CONVOLUTION_HEIGHT 0x8019 +#define GL_MAX_CONVOLUTION_WIDTH 0x801A +#define GL_MAX_CONVOLUTION_HEIGHT 0x801B +#define GL_POST_CONVOLUTION_RED_SCALE 0x801C +#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D +#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E +#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F +#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 +#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 +#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 +#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 +#define GL_HISTOGRAM 0x8024 +#define GL_PROXY_HISTOGRAM 0x8025 +#define GL_HISTOGRAM_WIDTH 0x8026 +#define GL_HISTOGRAM_FORMAT 0x8027 +#define GL_HISTOGRAM_RED_SIZE 0x8028 +#define GL_HISTOGRAM_GREEN_SIZE 0x8029 +#define GL_HISTOGRAM_BLUE_SIZE 0x802A +#define GL_HISTOGRAM_ALPHA_SIZE 0x802B +#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C +#define GL_HISTOGRAM_SINK 0x802D +#define GL_MINMAX 0x802E +#define GL_MINMAX_FORMAT 0x802F +#define GL_MINMAX_SINK 0x8030 +#define GL_TABLE_TOO_LARGE 0x8031 +#define GL_COLOR_MATRIX 0x80B1 +#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 +#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 +#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 +#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 +#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 +#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 +#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 +#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 +#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA +#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB +#define GL_COLOR_TABLE 0x80D0 +#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 +#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 +#define GL_PROXY_COLOR_TABLE 0x80D3 +#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 +#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 +#define GL_COLOR_TABLE_SCALE 0x80D6 +#define GL_COLOR_TABLE_BIAS 0x80D7 +#define GL_COLOR_TABLE_FORMAT 0x80D8 +#define GL_COLOR_TABLE_WIDTH 0x80D9 +#define GL_COLOR_TABLE_RED_SIZE 0x80DA +#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB +#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC +#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD +#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE +#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF +#define GL_CONSTANT_BORDER 0x8151 +#define GL_REPLICATE_BORDER 0x8153 +#define GL_CONVOLUTION_BORDER_COLOR 0x8154 +#endif + +#ifndef GL_VERSION_1_3 +#define GL_TEXTURE0 0x84C0 +#define GL_TEXTURE1 0x84C1 +#define GL_TEXTURE2 0x84C2 +#define GL_TEXTURE3 0x84C3 +#define GL_TEXTURE4 0x84C4 +#define GL_TEXTURE5 0x84C5 +#define GL_TEXTURE6 0x84C6 +#define GL_TEXTURE7 0x84C7 +#define GL_TEXTURE8 0x84C8 +#define GL_TEXTURE9 0x84C9 +#define GL_TEXTURE10 0x84CA +#define GL_TEXTURE11 0x84CB +#define GL_TEXTURE12 0x84CC +#define GL_TEXTURE13 0x84CD +#define GL_TEXTURE14 0x84CE +#define GL_TEXTURE15 0x84CF +#define GL_TEXTURE16 0x84D0 +#define GL_TEXTURE17 0x84D1 +#define GL_TEXTURE18 0x84D2 +#define GL_TEXTURE19 0x84D3 +#define GL_TEXTURE20 0x84D4 +#define GL_TEXTURE21 0x84D5 +#define GL_TEXTURE22 0x84D6 +#define GL_TEXTURE23 0x84D7 +#define GL_TEXTURE24 0x84D8 +#define GL_TEXTURE25 0x84D9 +#define GL_TEXTURE26 0x84DA +#define GL_TEXTURE27 0x84DB +#define GL_TEXTURE28 0x84DC +#define GL_TEXTURE29 0x84DD +#define GL_TEXTURE30 0x84DE +#define GL_TEXTURE31 0x84DF +#define GL_ACTIVE_TEXTURE 0x84E0 +#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 +#define GL_MAX_TEXTURE_UNITS 0x84E2 +#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 +#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 +#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 +#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 +#define GL_MULTISAMPLE 0x809D +#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E +#define GL_SAMPLE_ALPHA_TO_ONE 0x809F +#define GL_SAMPLE_COVERAGE 0x80A0 +#define GL_SAMPLE_BUFFERS 0x80A8 +#define GL_SAMPLES 0x80A9 +#define GL_SAMPLE_COVERAGE_VALUE 0x80AA +#define GL_SAMPLE_COVERAGE_INVERT 0x80AB +#define GL_MULTISAMPLE_BIT 0x20000000 +#define GL_NORMAL_MAP 0x8511 +#define GL_REFLECTION_MAP 0x8512 +#define GL_TEXTURE_CUBE_MAP 0x8513 +#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A +#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B +#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C +#define GL_COMPRESSED_ALPHA 0x84E9 +#define GL_COMPRESSED_LUMINANCE 0x84EA +#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB +#define GL_COMPRESSED_INTENSITY 0x84EC +#define GL_COMPRESSED_RGB 0x84ED +#define GL_COMPRESSED_RGBA 0x84EE +#define GL_TEXTURE_COMPRESSION_HINT 0x84EF +#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 +#define GL_TEXTURE_COMPRESSED 0x86A1 +#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 +#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 +#define GL_CLAMP_TO_BORDER 0x812D +#define GL_COMBINE 0x8570 +#define GL_COMBINE_RGB 0x8571 +#define GL_COMBINE_ALPHA 0x8572 +#define GL_SOURCE0_RGB 0x8580 +#define GL_SOURCE1_RGB 0x8581 +#define GL_SOURCE2_RGB 0x8582 +#define GL_SOURCE0_ALPHA 0x8588 +#define GL_SOURCE1_ALPHA 0x8589 +#define GL_SOURCE2_ALPHA 0x858A +#define GL_OPERAND0_RGB 0x8590 +#define GL_OPERAND1_RGB 0x8591 +#define GL_OPERAND2_RGB 0x8592 +#define GL_OPERAND0_ALPHA 0x8598 +#define GL_OPERAND1_ALPHA 0x8599 +#define GL_OPERAND2_ALPHA 0x859A +#define GL_RGB_SCALE 0x8573 +#define GL_ADD_SIGNED 0x8574 +#define GL_INTERPOLATE 0x8575 +#define GL_SUBTRACT 0x84E7 +#define GL_CONSTANT 0x8576 +#define GL_PRIMARY_COLOR 0x8577 +#define GL_PREVIOUS 0x8578 +#define GL_DOT3_RGB 0x86AE +#define GL_DOT3_RGBA 0x86AF +#endif + +#ifndef GL_VERSION_1_4 +#define GL_BLEND_DST_RGB 0x80C8 +#define GL_BLEND_SRC_RGB 0x80C9 +#define GL_BLEND_DST_ALPHA 0x80CA +#define GL_BLEND_SRC_ALPHA 0x80CB +#define GL_POINT_SIZE_MIN 0x8126 +#define GL_POINT_SIZE_MAX 0x8127 +#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128 +#define GL_POINT_DISTANCE_ATTENUATION 0x8129 +#define GL_GENERATE_MIPMAP 0x8191 +#define GL_GENERATE_MIPMAP_HINT 0x8192 +#define GL_DEPTH_COMPONENT16 0x81A5 +#define GL_DEPTH_COMPONENT24 0x81A6 +#define GL_DEPTH_COMPONENT32 0x81A7 +#define GL_MIRRORED_REPEAT 0x8370 +#define GL_FOG_COORDINATE_SOURCE 0x8450 +#define GL_FOG_COORDINATE 0x8451 +#define GL_FRAGMENT_DEPTH 0x8452 +#define GL_CURRENT_FOG_COORDINATE 0x8453 +#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454 +#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455 +#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456 +#define GL_FOG_COORDINATE_ARRAY 0x8457 +#define GL_COLOR_SUM 0x8458 +#define GL_CURRENT_SECONDARY_COLOR 0x8459 +#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A +#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B +#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C +#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D +#define GL_SECONDARY_COLOR_ARRAY 0x845E +#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD +#define GL_TEXTURE_FILTER_CONTROL 0x8500 +#define GL_TEXTURE_LOD_BIAS 0x8501 +#define GL_INCR_WRAP 0x8507 +#define GL_DECR_WRAP 0x8508 +#define GL_TEXTURE_DEPTH_SIZE 0x884A +#define GL_DEPTH_TEXTURE_MODE 0x884B +#define GL_TEXTURE_COMPARE_MODE 0x884C +#define GL_TEXTURE_COMPARE_FUNC 0x884D +#define GL_COMPARE_R_TO_TEXTURE 0x884E +#endif + +#ifndef GL_VERSION_1_5 +#define GL_BUFFER_SIZE 0x8764 +#define GL_BUFFER_USAGE 0x8765 +#define GL_QUERY_COUNTER_BITS 0x8864 +#define GL_CURRENT_QUERY 0x8865 +#define GL_QUERY_RESULT 0x8866 +#define GL_QUERY_RESULT_AVAILABLE 0x8867 +#define GL_ARRAY_BUFFER 0x8892 +#define GL_ELEMENT_ARRAY_BUFFER 0x8893 +#define GL_ARRAY_BUFFER_BINDING 0x8894 +#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 +#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 +#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 +#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 +#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899 +#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A +#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B +#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C +#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D +#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E +#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F +#define GL_READ_ONLY 0x88B8 +#define GL_WRITE_ONLY 0x88B9 +#define GL_READ_WRITE 0x88BA +#define GL_BUFFER_ACCESS 0x88BB +#define GL_BUFFER_MAPPED 0x88BC +#define GL_BUFFER_MAP_POINTER 0x88BD +#define GL_STREAM_DRAW 0x88E0 +#define GL_STREAM_READ 0x88E1 +#define GL_STREAM_COPY 0x88E2 +#define GL_STATIC_DRAW 0x88E4 +#define GL_STATIC_READ 0x88E5 +#define GL_STATIC_COPY 0x88E6 +#define GL_DYNAMIC_DRAW 0x88E8 +#define GL_DYNAMIC_READ 0x88E9 +#define GL_DYNAMIC_COPY 0x88EA +#define GL_SAMPLES_PASSED 0x8914 +#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE +#define GL_FOG_COORD GL_FOG_COORDINATE +#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE +#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE +#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE +#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER +#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY +#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING +#define GL_SRC0_RGB GL_SOURCE0_RGB +#define GL_SRC1_RGB GL_SOURCE1_RGB +#define GL_SRC2_RGB GL_SOURCE2_RGB +#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA +#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA +#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA +#endif + +#ifndef GL_VERSION_2_0 +#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION +#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 +#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 +#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 +#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 +#define GL_CURRENT_VERTEX_ATTRIB 0x8626 +#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 +#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 +#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 +#define GL_STENCIL_BACK_FUNC 0x8800 +#define GL_STENCIL_BACK_FAIL 0x8801 +#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 +#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 +#define GL_MAX_DRAW_BUFFERS 0x8824 +#define GL_DRAW_BUFFER0 0x8825 +#define GL_DRAW_BUFFER1 0x8826 +#define GL_DRAW_BUFFER2 0x8827 +#define GL_DRAW_BUFFER3 0x8828 +#define GL_DRAW_BUFFER4 0x8829 +#define GL_DRAW_BUFFER5 0x882A +#define GL_DRAW_BUFFER6 0x882B +#define GL_DRAW_BUFFER7 0x882C +#define GL_DRAW_BUFFER8 0x882D +#define GL_DRAW_BUFFER9 0x882E +#define GL_DRAW_BUFFER10 0x882F +#define GL_DRAW_BUFFER11 0x8830 +#define GL_DRAW_BUFFER12 0x8831 +#define GL_DRAW_BUFFER13 0x8832 +#define GL_DRAW_BUFFER14 0x8833 +#define GL_DRAW_BUFFER15 0x8834 +#define GL_BLEND_EQUATION_ALPHA 0x883D +#define GL_POINT_SPRITE 0x8861 +#define GL_COORD_REPLACE 0x8862 +#define GL_MAX_VERTEX_ATTRIBS 0x8869 +#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A +#define GL_MAX_TEXTURE_COORDS 0x8871 +#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 +#define GL_FRAGMENT_SHADER 0x8B30 +#define GL_VERTEX_SHADER 0x8B31 +#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 +#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A +#define GL_MAX_VARYING_FLOATS 0x8B4B +#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C +#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D +#define GL_SHADER_TYPE 0x8B4F +#define GL_FLOAT_VEC2 0x8B50 +#define GL_FLOAT_VEC3 0x8B51 +#define GL_FLOAT_VEC4 0x8B52 +#define GL_INT_VEC2 0x8B53 +#define GL_INT_VEC3 0x8B54 +#define GL_INT_VEC4 0x8B55 +#define GL_BOOL 0x8B56 +#define GL_BOOL_VEC2 0x8B57 +#define GL_BOOL_VEC3 0x8B58 +#define GL_BOOL_VEC4 0x8B59 +#define GL_FLOAT_MAT2 0x8B5A +#define GL_FLOAT_MAT3 0x8B5B +#define GL_FLOAT_MAT4 0x8B5C +#define GL_SAMPLER_1D 0x8B5D +#define GL_SAMPLER_2D 0x8B5E +#define GL_SAMPLER_3D 0x8B5F +#define GL_SAMPLER_CUBE 0x8B60 +#define GL_SAMPLER_1D_SHADOW 0x8B61 +#define GL_SAMPLER_2D_SHADOW 0x8B62 +#define GL_DELETE_STATUS 0x8B80 +#define GL_COMPILE_STATUS 0x8B81 +#define GL_LINK_STATUS 0x8B82 +#define GL_VALIDATE_STATUS 0x8B83 +#define GL_INFO_LOG_LENGTH 0x8B84 +#define GL_ATTACHED_SHADERS 0x8B85 +#define GL_ACTIVE_UNIFORMS 0x8B86 +#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 +#define GL_SHADER_SOURCE_LENGTH 0x8B88 +#define GL_ACTIVE_ATTRIBUTES 0x8B89 +#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A +#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B +#define GL_SHADING_LANGUAGE_VERSION 0x8B8C +#define GL_CURRENT_PROGRAM 0x8B8D +#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 +#define GL_LOWER_LEFT 0x8CA1 +#define GL_UPPER_LEFT 0x8CA2 +#define GL_STENCIL_BACK_REF 0x8CA3 +#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 +#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 +#endif + +#ifndef GL_VERSION_2_1 +#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F +#define GL_PIXEL_PACK_BUFFER 0x88EB +#define GL_PIXEL_UNPACK_BUFFER 0x88EC +#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED +#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF +#define GL_FLOAT_MAT2x3 0x8B65 +#define GL_FLOAT_MAT2x4 0x8B66 +#define GL_FLOAT_MAT3x2 0x8B67 +#define GL_FLOAT_MAT3x4 0x8B68 +#define GL_FLOAT_MAT4x2 0x8B69 +#define GL_FLOAT_MAT4x3 0x8B6A +#define GL_SRGB 0x8C40 +#define GL_SRGB8 0x8C41 +#define GL_SRGB_ALPHA 0x8C42 +#define GL_SRGB8_ALPHA8 0x8C43 +#define GL_SLUMINANCE_ALPHA 0x8C44 +#define GL_SLUMINANCE8_ALPHA8 0x8C45 +#define GL_SLUMINANCE 0x8C46 +#define GL_SLUMINANCE8 0x8C47 +#define GL_COMPRESSED_SRGB 0x8C48 +#define GL_COMPRESSED_SRGB_ALPHA 0x8C49 +#define GL_COMPRESSED_SLUMINANCE 0x8C4A +#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B +#endif + +#ifndef GL_ARB_multitexture +#define GL_TEXTURE0_ARB 0x84C0 +#define GL_TEXTURE1_ARB 0x84C1 +#define GL_TEXTURE2_ARB 0x84C2 +#define GL_TEXTURE3_ARB 0x84C3 +#define GL_TEXTURE4_ARB 0x84C4 +#define GL_TEXTURE5_ARB 0x84C5 +#define GL_TEXTURE6_ARB 0x84C6 +#define GL_TEXTURE7_ARB 0x84C7 +#define GL_TEXTURE8_ARB 0x84C8 +#define GL_TEXTURE9_ARB 0x84C9 +#define GL_TEXTURE10_ARB 0x84CA +#define GL_TEXTURE11_ARB 0x84CB +#define GL_TEXTURE12_ARB 0x84CC +#define GL_TEXTURE13_ARB 0x84CD +#define GL_TEXTURE14_ARB 0x84CE +#define GL_TEXTURE15_ARB 0x84CF +#define GL_TEXTURE16_ARB 0x84D0 +#define GL_TEXTURE17_ARB 0x84D1 +#define GL_TEXTURE18_ARB 0x84D2 +#define GL_TEXTURE19_ARB 0x84D3 +#define GL_TEXTURE20_ARB 0x84D4 +#define GL_TEXTURE21_ARB 0x84D5 +#define GL_TEXTURE22_ARB 0x84D6 +#define GL_TEXTURE23_ARB 0x84D7 +#define GL_TEXTURE24_ARB 0x84D8 +#define GL_TEXTURE25_ARB 0x84D9 +#define GL_TEXTURE26_ARB 0x84DA +#define GL_TEXTURE27_ARB 0x84DB +#define GL_TEXTURE28_ARB 0x84DC +#define GL_TEXTURE29_ARB 0x84DD +#define GL_TEXTURE30_ARB 0x84DE +#define GL_TEXTURE31_ARB 0x84DF +#define GL_ACTIVE_TEXTURE_ARB 0x84E0 +#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 +#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 +#endif + +#ifndef GL_ARB_transpose_matrix +#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3 +#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 +#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 +#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6 +#endif + +#ifndef GL_ARB_multisample +#define GL_MULTISAMPLE_ARB 0x809D +#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E +#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F +#define GL_SAMPLE_COVERAGE_ARB 0x80A0 +#define GL_SAMPLE_BUFFERS_ARB 0x80A8 +#define GL_SAMPLES_ARB 0x80A9 +#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA +#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB +#define GL_MULTISAMPLE_BIT_ARB 0x20000000 +#endif + +#ifndef GL_ARB_texture_env_add +#endif + +#ifndef GL_ARB_texture_cube_map +#define GL_NORMAL_MAP_ARB 0x8511 +#define GL_REFLECTION_MAP_ARB 0x8512 +#define GL_TEXTURE_CUBE_MAP_ARB 0x8513 +#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A +#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B +#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C +#endif + +#ifndef GL_ARB_texture_compression +#define GL_COMPRESSED_ALPHA_ARB 0x84E9 +#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA +#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB +#define GL_COMPRESSED_INTENSITY_ARB 0x84EC +#define GL_COMPRESSED_RGB_ARB 0x84ED +#define GL_COMPRESSED_RGBA_ARB 0x84EE +#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF +#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0 +#define GL_TEXTURE_COMPRESSED_ARB 0x86A1 +#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2 +#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3 +#endif + +#ifndef GL_ARB_texture_border_clamp +#define GL_CLAMP_TO_BORDER_ARB 0x812D +#endif + +#ifndef GL_ARB_point_parameters +#define GL_POINT_SIZE_MIN_ARB 0x8126 +#define GL_POINT_SIZE_MAX_ARB 0x8127 +#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128 +#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129 +#endif + +#ifndef GL_ARB_vertex_blend +#define GL_MAX_VERTEX_UNITS_ARB 0x86A4 +#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5 +#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6 +#define GL_VERTEX_BLEND_ARB 0x86A7 +#define GL_CURRENT_WEIGHT_ARB 0x86A8 +#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9 +#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA +#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB +#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC +#define GL_WEIGHT_ARRAY_ARB 0x86AD +#define GL_MODELVIEW0_ARB 0x1700 +#define GL_MODELVIEW1_ARB 0x850A +#define GL_MODELVIEW2_ARB 0x8722 +#define GL_MODELVIEW3_ARB 0x8723 +#define GL_MODELVIEW4_ARB 0x8724 +#define GL_MODELVIEW5_ARB 0x8725 +#define GL_MODELVIEW6_ARB 0x8726 +#define GL_MODELVIEW7_ARB 0x8727 +#define GL_MODELVIEW8_ARB 0x8728 +#define GL_MODELVIEW9_ARB 0x8729 +#define GL_MODELVIEW10_ARB 0x872A +#define GL_MODELVIEW11_ARB 0x872B +#define GL_MODELVIEW12_ARB 0x872C +#define GL_MODELVIEW13_ARB 0x872D +#define GL_MODELVIEW14_ARB 0x872E +#define GL_MODELVIEW15_ARB 0x872F +#define GL_MODELVIEW16_ARB 0x8730 +#define GL_MODELVIEW17_ARB 0x8731 +#define GL_MODELVIEW18_ARB 0x8732 +#define GL_MODELVIEW19_ARB 0x8733 +#define GL_MODELVIEW20_ARB 0x8734 +#define GL_MODELVIEW21_ARB 0x8735 +#define GL_MODELVIEW22_ARB 0x8736 +#define GL_MODELVIEW23_ARB 0x8737 +#define GL_MODELVIEW24_ARB 0x8738 +#define GL_MODELVIEW25_ARB 0x8739 +#define GL_MODELVIEW26_ARB 0x873A +#define GL_MODELVIEW27_ARB 0x873B +#define GL_MODELVIEW28_ARB 0x873C +#define GL_MODELVIEW29_ARB 0x873D +#define GL_MODELVIEW30_ARB 0x873E +#define GL_MODELVIEW31_ARB 0x873F +#endif + +#ifndef GL_ARB_matrix_palette +#define GL_MATRIX_PALETTE_ARB 0x8840 +#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841 +#define GL_MAX_PALETTE_MATRICES_ARB 0x8842 +#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843 +#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844 +#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845 +#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846 +#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847 +#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848 +#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849 +#endif + +#ifndef GL_ARB_texture_env_combine +#define GL_COMBINE_ARB 0x8570 +#define GL_COMBINE_RGB_ARB 0x8571 +#define GL_COMBINE_ALPHA_ARB 0x8572 +#define GL_SOURCE0_RGB_ARB 0x8580 +#define GL_SOURCE1_RGB_ARB 0x8581 +#define GL_SOURCE2_RGB_ARB 0x8582 +#define GL_SOURCE0_ALPHA_ARB 0x8588 +#define GL_SOURCE1_ALPHA_ARB 0x8589 +#define GL_SOURCE2_ALPHA_ARB 0x858A +#define GL_OPERAND0_RGB_ARB 0x8590 +#define GL_OPERAND1_RGB_ARB 0x8591 +#define GL_OPERAND2_RGB_ARB 0x8592 +#define GL_OPERAND0_ALPHA_ARB 0x8598 +#define GL_OPERAND1_ALPHA_ARB 0x8599 +#define GL_OPERAND2_ALPHA_ARB 0x859A +#define GL_RGB_SCALE_ARB 0x8573 +#define GL_ADD_SIGNED_ARB 0x8574 +#define GL_INTERPOLATE_ARB 0x8575 +#define GL_SUBTRACT_ARB 0x84E7 +#define GL_CONSTANT_ARB 0x8576 +#define GL_PRIMARY_COLOR_ARB 0x8577 +#define GL_PREVIOUS_ARB 0x8578 +#endif + +#ifndef GL_ARB_texture_env_crossbar +#endif + +#ifndef GL_ARB_texture_env_dot3 +#define GL_DOT3_RGB_ARB 0x86AE +#define GL_DOT3_RGBA_ARB 0x86AF +#endif + +#ifndef GL_ARB_texture_mirrored_repeat +#define GL_MIRRORED_REPEAT_ARB 0x8370 +#endif + +#ifndef GL_ARB_depth_texture +#define GL_DEPTH_COMPONENT16_ARB 0x81A5 +#define GL_DEPTH_COMPONENT24_ARB 0x81A6 +#define GL_DEPTH_COMPONENT32_ARB 0x81A7 +#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A +#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B +#endif + +#ifndef GL_ARB_shadow +#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C +#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D +#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E +#endif + +#ifndef GL_ARB_shadow_ambient +#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF +#endif + +#ifndef GL_ARB_window_pos +#endif + +#ifndef GL_ARB_vertex_program +#define GL_COLOR_SUM_ARB 0x8458 +#define GL_VERTEX_PROGRAM_ARB 0x8620 +#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622 +#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB 0x8623 +#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624 +#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB 0x8625 +#define GL_CURRENT_VERTEX_ATTRIB_ARB 0x8626 +#define GL_PROGRAM_LENGTH_ARB 0x8627 +#define GL_PROGRAM_STRING_ARB 0x8628 +#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E +#define GL_MAX_PROGRAM_MATRICES_ARB 0x862F +#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640 +#define GL_CURRENT_MATRIX_ARB 0x8641 +#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB 0x8642 +#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB 0x8643 +#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645 +#define GL_PROGRAM_ERROR_POSITION_ARB 0x864B +#define GL_PROGRAM_BINDING_ARB 0x8677 +#define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869 +#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A +#define GL_PROGRAM_ERROR_STRING_ARB 0x8874 +#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 +#define GL_PROGRAM_FORMAT_ARB 0x8876 +#define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0 +#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB 0x88A1 +#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2 +#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3 +#define GL_PROGRAM_TEMPORARIES_ARB 0x88A4 +#define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5 +#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6 +#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7 +#define GL_PROGRAM_PARAMETERS_ARB 0x88A8 +#define GL_MAX_PROGRAM_PARAMETERS_ARB 0x88A9 +#define GL_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AA +#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB +#define GL_PROGRAM_ATTRIBS_ARB 0x88AC +#define GL_MAX_PROGRAM_ATTRIBS_ARB 0x88AD +#define GL_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AE +#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF +#define GL_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B0 +#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1 +#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2 +#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3 +#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4 +#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5 +#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6 +#define GL_TRANSPOSE_CURRENT_MATRIX_ARB 0x88B7 +#define GL_MATRIX0_ARB 0x88C0 +#define GL_MATRIX1_ARB 0x88C1 +#define GL_MATRIX2_ARB 0x88C2 +#define GL_MATRIX3_ARB 0x88C3 +#define GL_MATRIX4_ARB 0x88C4 +#define GL_MATRIX5_ARB 0x88C5 +#define GL_MATRIX6_ARB 0x88C6 +#define GL_MATRIX7_ARB 0x88C7 +#define GL_MATRIX8_ARB 0x88C8 +#define GL_MATRIX9_ARB 0x88C9 +#define GL_MATRIX10_ARB 0x88CA +#define GL_MATRIX11_ARB 0x88CB +#define GL_MATRIX12_ARB 0x88CC +#define GL_MATRIX13_ARB 0x88CD +#define GL_MATRIX14_ARB 0x88CE +#define GL_MATRIX15_ARB 0x88CF +#define GL_MATRIX16_ARB 0x88D0 +#define GL_MATRIX17_ARB 0x88D1 +#define GL_MATRIX18_ARB 0x88D2 +#define GL_MATRIX19_ARB 0x88D3 +#define GL_MATRIX20_ARB 0x88D4 +#define GL_MATRIX21_ARB 0x88D5 +#define GL_MATRIX22_ARB 0x88D6 +#define GL_MATRIX23_ARB 0x88D7 +#define GL_MATRIX24_ARB 0x88D8 +#define GL_MATRIX25_ARB 0x88D9 +#define GL_MATRIX26_ARB 0x88DA +#define GL_MATRIX27_ARB 0x88DB +#define GL_MATRIX28_ARB 0x88DC +#define GL_MATRIX29_ARB 0x88DD +#define GL_MATRIX30_ARB 0x88DE +#define GL_MATRIX31_ARB 0x88DF +#endif + +#ifndef GL_ARB_fragment_program +#define GL_FRAGMENT_PROGRAM_ARB 0x8804 +#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805 +#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB 0x8806 +#define GL_PROGRAM_TEX_INDIRECTIONS_ARB 0x8807 +#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808 +#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809 +#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A +#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B +#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C +#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D +#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E +#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F +#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810 +#define GL_MAX_TEXTURE_COORDS_ARB 0x8871 +#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB 0x8872 +#endif + +#ifndef GL_ARB_vertex_buffer_object +#define GL_BUFFER_SIZE_ARB 0x8764 +#define GL_BUFFER_USAGE_ARB 0x8765 +#define GL_ARRAY_BUFFER_ARB 0x8892 +#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893 +#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894 +#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895 +#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896 +#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897 +#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898 +#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899 +#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A +#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B +#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C +#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D +#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E +#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F +#define GL_READ_ONLY_ARB 0x88B8 +#define GL_WRITE_ONLY_ARB 0x88B9 +#define GL_READ_WRITE_ARB 0x88BA +#define GL_BUFFER_ACCESS_ARB 0x88BB +#define GL_BUFFER_MAPPED_ARB 0x88BC +#define GL_BUFFER_MAP_POINTER_ARB 0x88BD +#define GL_STREAM_DRAW_ARB 0x88E0 +#define GL_STREAM_READ_ARB 0x88E1 +#define GL_STREAM_COPY_ARB 0x88E2 +#define GL_STATIC_DRAW_ARB 0x88E4 +#define GL_STATIC_READ_ARB 0x88E5 +#define GL_STATIC_COPY_ARB 0x88E6 +#define GL_DYNAMIC_DRAW_ARB 0x88E8 +#define GL_DYNAMIC_READ_ARB 0x88E9 +#define GL_DYNAMIC_COPY_ARB 0x88EA +#endif + +#ifndef GL_ARB_occlusion_query +#define GL_QUERY_COUNTER_BITS_ARB 0x8864 +#define GL_CURRENT_QUERY_ARB 0x8865 +#define GL_QUERY_RESULT_ARB 0x8866 +#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867 +#define GL_SAMPLES_PASSED_ARB 0x8914 +#endif + +#ifndef GL_ARB_shader_objects +#define GL_PROGRAM_OBJECT_ARB 0x8B40 +#define GL_SHADER_OBJECT_ARB 0x8B48 +#define GL_OBJECT_TYPE_ARB 0x8B4E +#define GL_OBJECT_SUBTYPE_ARB 0x8B4F +#define GL_FLOAT_VEC2_ARB 0x8B50 +#define GL_FLOAT_VEC3_ARB 0x8B51 +#define GL_FLOAT_VEC4_ARB 0x8B52 +#define GL_INT_VEC2_ARB 0x8B53 +#define GL_INT_VEC3_ARB 0x8B54 +#define GL_INT_VEC4_ARB 0x8B55 +#define GL_BOOL_ARB 0x8B56 +#define GL_BOOL_VEC2_ARB 0x8B57 +#define GL_BOOL_VEC3_ARB 0x8B58 +#define GL_BOOL_VEC4_ARB 0x8B59 +#define GL_FLOAT_MAT2_ARB 0x8B5A +#define GL_FLOAT_MAT3_ARB 0x8B5B +#define GL_FLOAT_MAT4_ARB 0x8B5C +#define GL_SAMPLER_1D_ARB 0x8B5D +#define GL_SAMPLER_2D_ARB 0x8B5E +#define GL_SAMPLER_3D_ARB 0x8B5F +#define GL_SAMPLER_CUBE_ARB 0x8B60 +#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61 +#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62 +#define GL_SAMPLER_2D_RECT_ARB 0x8B63 +#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64 +#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80 +#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81 +#define GL_OBJECT_LINK_STATUS_ARB 0x8B82 +#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83 +#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84 +#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85 +#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86 +#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87 +#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88 +#endif + +#ifndef GL_ARB_vertex_shader +#define GL_VERTEX_SHADER_ARB 0x8B31 +#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A +#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B +#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C +#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D +#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89 +#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A +#endif + +#ifndef GL_ARB_fragment_shader +#define GL_FRAGMENT_SHADER_ARB 0x8B30 +#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49 +#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B +#endif + +#ifndef GL_ARB_shading_language_100 +#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C +#endif + +#ifndef GL_ARB_texture_non_power_of_two +#endif + +#ifndef GL_ARB_point_sprite +#define GL_POINT_SPRITE_ARB 0x8861 +#define GL_COORD_REPLACE_ARB 0x8862 +#endif + +#ifndef GL_ARB_fragment_program_shadow +#endif + +#ifndef GL_ARB_draw_buffers +#define GL_MAX_DRAW_BUFFERS_ARB 0x8824 +#define GL_DRAW_BUFFER0_ARB 0x8825 +#define GL_DRAW_BUFFER1_ARB 0x8826 +#define GL_DRAW_BUFFER2_ARB 0x8827 +#define GL_DRAW_BUFFER3_ARB 0x8828 +#define GL_DRAW_BUFFER4_ARB 0x8829 +#define GL_DRAW_BUFFER5_ARB 0x882A +#define GL_DRAW_BUFFER6_ARB 0x882B +#define GL_DRAW_BUFFER7_ARB 0x882C +#define GL_DRAW_BUFFER8_ARB 0x882D +#define GL_DRAW_BUFFER9_ARB 0x882E +#define GL_DRAW_BUFFER10_ARB 0x882F +#define GL_DRAW_BUFFER11_ARB 0x8830 +#define GL_DRAW_BUFFER12_ARB 0x8831 +#define GL_DRAW_BUFFER13_ARB 0x8832 +#define GL_DRAW_BUFFER14_ARB 0x8833 +#define GL_DRAW_BUFFER15_ARB 0x8834 +#endif + +#ifndef GL_ARB_texture_rectangle +#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 +#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6 +#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7 +#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 +#endif + +#ifndef GL_ARB_color_buffer_float +#define GL_RGBA_FLOAT_MODE_ARB 0x8820 +#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A +#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B +#define GL_CLAMP_READ_COLOR_ARB 0x891C +#define GL_FIXED_ONLY_ARB 0x891D +#endif + +#ifndef GL_ARB_half_float_pixel +#define GL_HALF_FLOAT_ARB 0x140B +#endif + +#ifndef GL_ARB_texture_float +#define GL_TEXTURE_RED_TYPE_ARB 0x8C10 +#define GL_TEXTURE_GREEN_TYPE_ARB 0x8C11 +#define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12 +#define GL_TEXTURE_ALPHA_TYPE_ARB 0x8C13 +#define GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14 +#define GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15 +#define GL_TEXTURE_DEPTH_TYPE_ARB 0x8C16 +#define GL_UNSIGNED_NORMALIZED_ARB 0x8C17 +#define GL_RGBA32F_ARB 0x8814 +#define GL_RGB32F_ARB 0x8815 +#define GL_ALPHA32F_ARB 0x8816 +#define GL_INTENSITY32F_ARB 0x8817 +#define GL_LUMINANCE32F_ARB 0x8818 +#define GL_LUMINANCE_ALPHA32F_ARB 0x8819 +#define GL_RGBA16F_ARB 0x881A +#define GL_RGB16F_ARB 0x881B +#define GL_ALPHA16F_ARB 0x881C +#define GL_INTENSITY16F_ARB 0x881D +#define GL_LUMINANCE16F_ARB 0x881E +#define GL_LUMINANCE_ALPHA16F_ARB 0x881F +#endif + +#ifndef GL_ARB_pixel_buffer_object +#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB +#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC +#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED +#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF +#endif + +#ifndef GL_EXT_abgr +#define GL_ABGR_EXT 0x8000 +#endif + +#ifndef GL_EXT_blend_color +#define GL_CONSTANT_COLOR_EXT 0x8001 +#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002 +#define GL_CONSTANT_ALPHA_EXT 0x8003 +#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004 +#define GL_BLEND_COLOR_EXT 0x8005 +#endif + +#ifndef GL_EXT_polygon_offset +#define GL_POLYGON_OFFSET_EXT 0x8037 +#define GL_POLYGON_OFFSET_FACTOR_EXT 0x8038 +#define GL_POLYGON_OFFSET_BIAS_EXT 0x8039 +#endif + +#ifndef GL_EXT_texture +#define GL_ALPHA4_EXT 0x803B +#define GL_ALPHA8_EXT 0x803C +#define GL_ALPHA12_EXT 0x803D +#define GL_ALPHA16_EXT 0x803E +#define GL_LUMINANCE4_EXT 0x803F +#define GL_LUMINANCE8_EXT 0x8040 +#define GL_LUMINANCE12_EXT 0x8041 +#define GL_LUMINANCE16_EXT 0x8042 +#define GL_LUMINANCE4_ALPHA4_EXT 0x8043 +#define GL_LUMINANCE6_ALPHA2_EXT 0x8044 +#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 +#define GL_LUMINANCE12_ALPHA4_EXT 0x8046 +#define GL_LUMINANCE12_ALPHA12_EXT 0x8047 +#define GL_LUMINANCE16_ALPHA16_EXT 0x8048 +#define GL_INTENSITY_EXT 0x8049 +#define GL_INTENSITY4_EXT 0x804A +#define GL_INTENSITY8_EXT 0x804B +#define GL_INTENSITY12_EXT 0x804C +#define GL_INTENSITY16_EXT 0x804D +#define GL_RGB2_EXT 0x804E +#define GL_RGB4_EXT 0x804F +#define GL_RGB5_EXT 0x8050 +#define GL_RGB8_EXT 0x8051 +#define GL_RGB10_EXT 0x8052 +#define GL_RGB12_EXT 0x8053 +#define GL_RGB16_EXT 0x8054 +#define GL_RGBA2_EXT 0x8055 +#define GL_RGBA4_EXT 0x8056 +#define GL_RGB5_A1_EXT 0x8057 +#define GL_RGBA8_EXT 0x8058 +#define GL_RGB10_A2_EXT 0x8059 +#define GL_RGBA12_EXT 0x805A +#define GL_RGBA16_EXT 0x805B +#define GL_TEXTURE_RED_SIZE_EXT 0x805C +#define GL_TEXTURE_GREEN_SIZE_EXT 0x805D +#define GL_TEXTURE_BLUE_SIZE_EXT 0x805E +#define GL_TEXTURE_ALPHA_SIZE_EXT 0x805F +#define GL_TEXTURE_LUMINANCE_SIZE_EXT 0x8060 +#define GL_TEXTURE_INTENSITY_SIZE_EXT 0x8061 +#define GL_REPLACE_EXT 0x8062 +#define GL_PROXY_TEXTURE_1D_EXT 0x8063 +#define GL_PROXY_TEXTURE_2D_EXT 0x8064 +#define GL_TEXTURE_TOO_LARGE_EXT 0x8065 +#endif + +#ifndef GL_EXT_texture3D +#define GL_PACK_SKIP_IMAGES_EXT 0x806B +#define GL_PACK_IMAGE_HEIGHT_EXT 0x806C +#define GL_UNPACK_SKIP_IMAGES_EXT 0x806D +#define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E +#define GL_TEXTURE_3D_EXT 0x806F +#define GL_PROXY_TEXTURE_3D_EXT 0x8070 +#define GL_TEXTURE_DEPTH_EXT 0x8071 +#define GL_TEXTURE_WRAP_R_EXT 0x8072 +#define GL_MAX_3D_TEXTURE_SIZE_EXT 0x8073 +#endif + +#ifndef GL_SGIS_texture_filter4 +#define GL_FILTER4_SGIS 0x8146 +#define GL_TEXTURE_FILTER4_SIZE_SGIS 0x8147 +#endif + +#ifndef GL_EXT_subtexture +#endif + +#ifndef GL_EXT_copy_texture +#endif + +#ifndef GL_EXT_histogram +#define GL_HISTOGRAM_EXT 0x8024 +#define GL_PROXY_HISTOGRAM_EXT 0x8025 +#define GL_HISTOGRAM_WIDTH_EXT 0x8026 +#define GL_HISTOGRAM_FORMAT_EXT 0x8027 +#define GL_HISTOGRAM_RED_SIZE_EXT 0x8028 +#define GL_HISTOGRAM_GREEN_SIZE_EXT 0x8029 +#define GL_HISTOGRAM_BLUE_SIZE_EXT 0x802A +#define GL_HISTOGRAM_ALPHA_SIZE_EXT 0x802B +#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT 0x802C +#define GL_HISTOGRAM_SINK_EXT 0x802D +#define GL_MINMAX_EXT 0x802E +#define GL_MINMAX_FORMAT_EXT 0x802F +#define GL_MINMAX_SINK_EXT 0x8030 +#define GL_TABLE_TOO_LARGE_EXT 0x8031 +#endif + +#ifndef GL_EXT_convolution +#define GL_CONVOLUTION_1D_EXT 0x8010 +#define GL_CONVOLUTION_2D_EXT 0x8011 +#define GL_SEPARABLE_2D_EXT 0x8012 +#define GL_CONVOLUTION_BORDER_MODE_EXT 0x8013 +#define GL_CONVOLUTION_FILTER_SCALE_EXT 0x8014 +#define GL_CONVOLUTION_FILTER_BIAS_EXT 0x8015 +#define GL_REDUCE_EXT 0x8016 +#define GL_CONVOLUTION_FORMAT_EXT 0x8017 +#define GL_CONVOLUTION_WIDTH_EXT 0x8018 +#define GL_CONVOLUTION_HEIGHT_EXT 0x8019 +#define GL_MAX_CONVOLUTION_WIDTH_EXT 0x801A +#define GL_MAX_CONVOLUTION_HEIGHT_EXT 0x801B +#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C +#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D +#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E +#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F +#define GL_POST_CONVOLUTION_RED_BIAS_EXT 0x8020 +#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021 +#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022 +#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023 +#endif + +#ifndef GL_SGI_color_matrix +#define GL_COLOR_MATRIX_SGI 0x80B1 +#define GL_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B2 +#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3 +#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4 +#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5 +#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6 +#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7 +#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8 +#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9 +#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA +#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB +#endif + +#ifndef GL_SGI_color_table +#define GL_COLOR_TABLE_SGI 0x80D0 +#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1 +#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2 +#define GL_PROXY_COLOR_TABLE_SGI 0x80D3 +#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4 +#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5 +#define GL_COLOR_TABLE_SCALE_SGI 0x80D6 +#define GL_COLOR_TABLE_BIAS_SGI 0x80D7 +#define GL_COLOR_TABLE_FORMAT_SGI 0x80D8 +#define GL_COLOR_TABLE_WIDTH_SGI 0x80D9 +#define GL_COLOR_TABLE_RED_SIZE_SGI 0x80DA +#define GL_COLOR_TABLE_GREEN_SIZE_SGI 0x80DB +#define GL_COLOR_TABLE_BLUE_SIZE_SGI 0x80DC +#define GL_COLOR_TABLE_ALPHA_SIZE_SGI 0x80DD +#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE +#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF +#endif + +#ifndef GL_SGIS_pixel_texture +#define GL_PIXEL_TEXTURE_SGIS 0x8353 +#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354 +#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355 +#define GL_PIXEL_GROUP_COLOR_SGIS 0x8356 +#endif + +#ifndef GL_SGIX_pixel_texture +#define GL_PIXEL_TEX_GEN_SGIX 0x8139 +#define GL_PIXEL_TEX_GEN_MODE_SGIX 0x832B +#endif + +#ifndef GL_SGIS_texture4D +#define GL_PACK_SKIP_VOLUMES_SGIS 0x8130 +#define GL_PACK_IMAGE_DEPTH_SGIS 0x8131 +#define GL_UNPACK_SKIP_VOLUMES_SGIS 0x8132 +#define GL_UNPACK_IMAGE_DEPTH_SGIS 0x8133 +#define GL_TEXTURE_4D_SGIS 0x8134 +#define GL_PROXY_TEXTURE_4D_SGIS 0x8135 +#define GL_TEXTURE_4DSIZE_SGIS 0x8136 +#define GL_TEXTURE_WRAP_Q_SGIS 0x8137 +#define GL_MAX_4D_TEXTURE_SIZE_SGIS 0x8138 +#define GL_TEXTURE_4D_BINDING_SGIS 0x814F +#endif + +#ifndef GL_SGI_texture_color_table +#define GL_TEXTURE_COLOR_TABLE_SGI 0x80BC +#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI 0x80BD +#endif + +#ifndef GL_EXT_cmyka +#define GL_CMYK_EXT 0x800C +#define GL_CMYKA_EXT 0x800D +#define GL_PACK_CMYK_HINT_EXT 0x800E +#define GL_UNPACK_CMYK_HINT_EXT 0x800F +#endif + +#ifndef GL_EXT_texture_object +#define GL_TEXTURE_PRIORITY_EXT 0x8066 +#define GL_TEXTURE_RESIDENT_EXT 0x8067 +#define GL_TEXTURE_1D_BINDING_EXT 0x8068 +#define GL_TEXTURE_2D_BINDING_EXT 0x8069 +#define GL_TEXTURE_3D_BINDING_EXT 0x806A +#endif + +#ifndef GL_SGIS_detail_texture +#define GL_DETAIL_TEXTURE_2D_SGIS 0x8095 +#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096 +#define GL_LINEAR_DETAIL_SGIS 0x8097 +#define GL_LINEAR_DETAIL_ALPHA_SGIS 0x8098 +#define GL_LINEAR_DETAIL_COLOR_SGIS 0x8099 +#define GL_DETAIL_TEXTURE_LEVEL_SGIS 0x809A +#define GL_DETAIL_TEXTURE_MODE_SGIS 0x809B +#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C +#endif + +#ifndef GL_SGIS_sharpen_texture +#define GL_LINEAR_SHARPEN_SGIS 0x80AD +#define GL_LINEAR_SHARPEN_ALPHA_SGIS 0x80AE +#define GL_LINEAR_SHARPEN_COLOR_SGIS 0x80AF +#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0 +#endif + +#ifndef GL_EXT_packed_pixels +#define GL_UNSIGNED_BYTE_3_3_2_EXT 0x8032 +#define GL_UNSIGNED_SHORT_4_4_4_4_EXT 0x8033 +#define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034 +#define GL_UNSIGNED_INT_8_8_8_8_EXT 0x8035 +#define GL_UNSIGNED_INT_10_10_10_2_EXT 0x8036 +#endif + +#ifndef GL_SGIS_texture_lod +#define GL_TEXTURE_MIN_LOD_SGIS 0x813A +#define GL_TEXTURE_MAX_LOD_SGIS 0x813B +#define GL_TEXTURE_BASE_LEVEL_SGIS 0x813C +#define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D +#endif + +#ifndef GL_SGIS_multisample +#define GL_MULTISAMPLE_SGIS 0x809D +#define GL_SAMPLE_ALPHA_TO_MASK_SGIS 0x809E +#define GL_SAMPLE_ALPHA_TO_ONE_SGIS 0x809F +#define GL_SAMPLE_MASK_SGIS 0x80A0 +#define GL_1PASS_SGIS 0x80A1 +#define GL_2PASS_0_SGIS 0x80A2 +#define GL_2PASS_1_SGIS 0x80A3 +#define GL_4PASS_0_SGIS 0x80A4 +#define GL_4PASS_1_SGIS 0x80A5 +#define GL_4PASS_2_SGIS 0x80A6 +#define GL_4PASS_3_SGIS 0x80A7 +#define GL_SAMPLE_BUFFERS_SGIS 0x80A8 +#define GL_SAMPLES_SGIS 0x80A9 +#define GL_SAMPLE_MASK_VALUE_SGIS 0x80AA +#define GL_SAMPLE_MASK_INVERT_SGIS 0x80AB +#define GL_SAMPLE_PATTERN_SGIS 0x80AC +#endif + +#ifndef GL_EXT_rescale_normal +#define GL_RESCALE_NORMAL_EXT 0x803A +#endif + +#ifndef GL_EXT_vertex_array +#define GL_VERTEX_ARRAY_EXT 0x8074 +#define GL_NORMAL_ARRAY_EXT 0x8075 +#define GL_COLOR_ARRAY_EXT 0x8076 +#define GL_INDEX_ARRAY_EXT 0x8077 +#define GL_TEXTURE_COORD_ARRAY_EXT 0x8078 +#define GL_EDGE_FLAG_ARRAY_EXT 0x8079 +#define GL_VERTEX_ARRAY_SIZE_EXT 0x807A +#define GL_VERTEX_ARRAY_TYPE_EXT 0x807B +#define GL_VERTEX_ARRAY_STRIDE_EXT 0x807C +#define GL_VERTEX_ARRAY_COUNT_EXT 0x807D +#define GL_NORMAL_ARRAY_TYPE_EXT 0x807E +#define GL_NORMAL_ARRAY_STRIDE_EXT 0x807F +#define GL_NORMAL_ARRAY_COUNT_EXT 0x8080 +#define GL_COLOR_ARRAY_SIZE_EXT 0x8081 +#define GL_COLOR_ARRAY_TYPE_EXT 0x8082 +#define GL_COLOR_ARRAY_STRIDE_EXT 0x8083 +#define GL_COLOR_ARRAY_COUNT_EXT 0x8084 +#define GL_INDEX_ARRAY_TYPE_EXT 0x8085 +#define GL_INDEX_ARRAY_STRIDE_EXT 0x8086 +#define GL_INDEX_ARRAY_COUNT_EXT 0x8087 +#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT 0x8088 +#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT 0x8089 +#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A +#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT 0x808B +#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT 0x808C +#define GL_EDGE_FLAG_ARRAY_COUNT_EXT 0x808D +#define GL_VERTEX_ARRAY_POINTER_EXT 0x808E +#define GL_NORMAL_ARRAY_POINTER_EXT 0x808F +#define GL_COLOR_ARRAY_POINTER_EXT 0x8090 +#define GL_INDEX_ARRAY_POINTER_EXT 0x8091 +#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092 +#define GL_EDGE_FLAG_ARRAY_POINTER_EXT 0x8093 +#endif + +#ifndef GL_EXT_misc_attribute +#endif + +#ifndef GL_SGIS_generate_mipmap +#define GL_GENERATE_MIPMAP_SGIS 0x8191 +#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 +#endif + +#ifndef GL_SGIX_clipmap +#define GL_LINEAR_CLIPMAP_LINEAR_SGIX 0x8170 +#define GL_TEXTURE_CLIPMAP_CENTER_SGIX 0x8171 +#define GL_TEXTURE_CLIPMAP_FRAME_SGIX 0x8172 +#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX 0x8173 +#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174 +#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175 +#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX 0x8176 +#define GL_MAX_CLIPMAP_DEPTH_SGIX 0x8177 +#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178 +#define GL_NEAREST_CLIPMAP_NEAREST_SGIX 0x844D +#define GL_NEAREST_CLIPMAP_LINEAR_SGIX 0x844E +#define GL_LINEAR_CLIPMAP_NEAREST_SGIX 0x844F +#endif + +#ifndef GL_SGIX_shadow +#define GL_TEXTURE_COMPARE_SGIX 0x819A +#define GL_TEXTURE_COMPARE_OPERATOR_SGIX 0x819B +#define GL_TEXTURE_LEQUAL_R_SGIX 0x819C +#define GL_TEXTURE_GEQUAL_R_SGIX 0x819D +#endif + +#ifndef GL_SGIS_texture_edge_clamp +#define GL_CLAMP_TO_EDGE_SGIS 0x812F +#endif + +#ifndef GL_SGIS_texture_border_clamp +#define GL_CLAMP_TO_BORDER_SGIS 0x812D +#endif + +#ifndef GL_EXT_blend_minmax +#define GL_FUNC_ADD_EXT 0x8006 +#define GL_MIN_EXT 0x8007 +#define GL_MAX_EXT 0x8008 +#define GL_BLEND_EQUATION_EXT 0x8009 +#endif + +#ifndef GL_EXT_blend_subtract +#define GL_FUNC_SUBTRACT_EXT 0x800A +#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800B +#endif + +#ifndef GL_EXT_blend_logic_op +#endif + +#ifndef GL_SGIX_interlace +#define GL_INTERLACE_SGIX 0x8094 +#endif + +#ifndef GL_SGIX_pixel_tiles +#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E +#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F +#define GL_PIXEL_TILE_WIDTH_SGIX 0x8140 +#define GL_PIXEL_TILE_HEIGHT_SGIX 0x8141 +#define GL_PIXEL_TILE_GRID_WIDTH_SGIX 0x8142 +#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX 0x8143 +#define GL_PIXEL_TILE_GRID_DEPTH_SGIX 0x8144 +#define GL_PIXEL_TILE_CACHE_SIZE_SGIX 0x8145 +#endif + +#ifndef GL_SGIS_texture_select +#define GL_DUAL_ALPHA4_SGIS 0x8110 +#define GL_DUAL_ALPHA8_SGIS 0x8111 +#define GL_DUAL_ALPHA12_SGIS 0x8112 +#define GL_DUAL_ALPHA16_SGIS 0x8113 +#define GL_DUAL_LUMINANCE4_SGIS 0x8114 +#define GL_DUAL_LUMINANCE8_SGIS 0x8115 +#define GL_DUAL_LUMINANCE12_SGIS 0x8116 +#define GL_DUAL_LUMINANCE16_SGIS 0x8117 +#define GL_DUAL_INTENSITY4_SGIS 0x8118 +#define GL_DUAL_INTENSITY8_SGIS 0x8119 +#define GL_DUAL_INTENSITY12_SGIS 0x811A +#define GL_DUAL_INTENSITY16_SGIS 0x811B +#define GL_DUAL_LUMINANCE_ALPHA4_SGIS 0x811C +#define GL_DUAL_LUMINANCE_ALPHA8_SGIS 0x811D +#define GL_QUAD_ALPHA4_SGIS 0x811E +#define GL_QUAD_ALPHA8_SGIS 0x811F +#define GL_QUAD_LUMINANCE4_SGIS 0x8120 +#define GL_QUAD_LUMINANCE8_SGIS 0x8121 +#define GL_QUAD_INTENSITY4_SGIS 0x8122 +#define GL_QUAD_INTENSITY8_SGIS 0x8123 +#define GL_DUAL_TEXTURE_SELECT_SGIS 0x8124 +#define GL_QUAD_TEXTURE_SELECT_SGIS 0x8125 +#endif + +#ifndef GL_SGIX_sprite +#define GL_SPRITE_SGIX 0x8148 +#define GL_SPRITE_MODE_SGIX 0x8149 +#define GL_SPRITE_AXIS_SGIX 0x814A +#define GL_SPRITE_TRANSLATION_SGIX 0x814B +#define GL_SPRITE_AXIAL_SGIX 0x814C +#define GL_SPRITE_OBJECT_ALIGNED_SGIX 0x814D +#define GL_SPRITE_EYE_ALIGNED_SGIX 0x814E +#endif + +#ifndef GL_SGIX_texture_multi_buffer +#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E +#endif + +#ifndef GL_EXT_point_parameters +#define GL_POINT_SIZE_MIN_EXT 0x8126 +#define GL_POINT_SIZE_MAX_EXT 0x8127 +#define GL_POINT_FADE_THRESHOLD_SIZE_EXT 0x8128 +#define GL_DISTANCE_ATTENUATION_EXT 0x8129 +#endif + +#ifndef GL_SGIS_point_parameters +#define GL_POINT_SIZE_MIN_SGIS 0x8126 +#define GL_POINT_SIZE_MAX_SGIS 0x8127 +#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128 +#define GL_DISTANCE_ATTENUATION_SGIS 0x8129 +#endif + +#ifndef GL_SGIX_instruments +#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180 +#define GL_INSTRUMENT_MEASUREMENTS_SGIX 0x8181 +#endif + +#ifndef GL_SGIX_texture_scale_bias +#define GL_POST_TEXTURE_FILTER_BIAS_SGIX 0x8179 +#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A +#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B +#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C +#endif + +#ifndef GL_SGIX_framezoom +#define GL_FRAMEZOOM_SGIX 0x818B +#define GL_FRAMEZOOM_FACTOR_SGIX 0x818C +#define GL_MAX_FRAMEZOOM_FACTOR_SGIX 0x818D +#endif + +#ifndef GL_SGIX_tag_sample_buffer +#endif + +#ifndef GL_FfdMaskSGIX +#define GL_TEXTURE_DEFORMATION_BIT_SGIX 0x00000001 +#define GL_GEOMETRY_DEFORMATION_BIT_SGIX 0x00000002 +#endif + +#ifndef GL_SGIX_polynomial_ffd +#define GL_GEOMETRY_DEFORMATION_SGIX 0x8194 +#define GL_TEXTURE_DEFORMATION_SGIX 0x8195 +#define GL_DEFORMATIONS_MASK_SGIX 0x8196 +#define GL_MAX_DEFORMATION_ORDER_SGIX 0x8197 +#endif + +#ifndef GL_SGIX_reference_plane +#define GL_REFERENCE_PLANE_SGIX 0x817D +#define GL_REFERENCE_PLANE_EQUATION_SGIX 0x817E +#endif + +#ifndef GL_SGIX_flush_raster +#endif + +#ifndef GL_SGIX_depth_texture +#define GL_DEPTH_COMPONENT16_SGIX 0x81A5 +#define GL_DEPTH_COMPONENT24_SGIX 0x81A6 +#define GL_DEPTH_COMPONENT32_SGIX 0x81A7 +#endif + +#ifndef GL_SGIS_fog_function +#define GL_FOG_FUNC_SGIS 0x812A +#define GL_FOG_FUNC_POINTS_SGIS 0x812B +#define GL_MAX_FOG_FUNC_POINTS_SGIS 0x812C +#endif + +#ifndef GL_SGIX_fog_offset +#define GL_FOG_OFFSET_SGIX 0x8198 +#define GL_FOG_OFFSET_VALUE_SGIX 0x8199 +#endif + +#ifndef GL_HP_image_transform +#define GL_IMAGE_SCALE_X_HP 0x8155 +#define GL_IMAGE_SCALE_Y_HP 0x8156 +#define GL_IMAGE_TRANSLATE_X_HP 0x8157 +#define GL_IMAGE_TRANSLATE_Y_HP 0x8158 +#define GL_IMAGE_ROTATE_ANGLE_HP 0x8159 +#define GL_IMAGE_ROTATE_ORIGIN_X_HP 0x815A +#define GL_IMAGE_ROTATE_ORIGIN_Y_HP 0x815B +#define GL_IMAGE_MAG_FILTER_HP 0x815C +#define GL_IMAGE_MIN_FILTER_HP 0x815D +#define GL_IMAGE_CUBIC_WEIGHT_HP 0x815E +#define GL_CUBIC_HP 0x815F +#define GL_AVERAGE_HP 0x8160 +#define GL_IMAGE_TRANSFORM_2D_HP 0x8161 +#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162 +#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163 +#endif + +#ifndef GL_HP_convolution_border_modes +#define GL_IGNORE_BORDER_HP 0x8150 +#define GL_CONSTANT_BORDER_HP 0x8151 +#define GL_REPLICATE_BORDER_HP 0x8153 +#define GL_CONVOLUTION_BORDER_COLOR_HP 0x8154 +#endif + +#ifndef GL_INGR_palette_buffer +#endif + +#ifndef GL_SGIX_texture_add_env +#define GL_TEXTURE_ENV_BIAS_SGIX 0x80BE +#endif + +#ifndef GL_EXT_color_subtable +#endif + +#ifndef GL_PGI_vertex_hints +#define GL_VERTEX_DATA_HINT_PGI 0x1A22A +#define GL_VERTEX_CONSISTENT_HINT_PGI 0x1A22B +#define GL_MATERIAL_SIDE_HINT_PGI 0x1A22C +#define GL_MAX_VERTEX_HINT_PGI 0x1A22D +#define GL_COLOR3_BIT_PGI 0x00010000 +#define GL_COLOR4_BIT_PGI 0x00020000 +#define GL_EDGEFLAG_BIT_PGI 0x00040000 +#define GL_INDEX_BIT_PGI 0x00080000 +#define GL_MAT_AMBIENT_BIT_PGI 0x00100000 +#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000 +#define GL_MAT_DIFFUSE_BIT_PGI 0x00400000 +#define GL_MAT_EMISSION_BIT_PGI 0x00800000 +#define GL_MAT_COLOR_INDEXES_BIT_PGI 0x01000000 +#define GL_MAT_SHININESS_BIT_PGI 0x02000000 +#define GL_MAT_SPECULAR_BIT_PGI 0x04000000 +#define GL_NORMAL_BIT_PGI 0x08000000 +#define GL_TEXCOORD1_BIT_PGI 0x10000000 +#define GL_TEXCOORD2_BIT_PGI 0x20000000 +#define GL_TEXCOORD3_BIT_PGI 0x40000000 +#define GL_TEXCOORD4_BIT_PGI 0x80000000 +#define GL_VERTEX23_BIT_PGI 0x00000004 +#define GL_VERTEX4_BIT_PGI 0x00000008 +#endif + +#ifndef GL_PGI_misc_hints +#define GL_PREFER_DOUBLEBUFFER_HINT_PGI 0x1A1F8 +#define GL_CONSERVE_MEMORY_HINT_PGI 0x1A1FD +#define GL_RECLAIM_MEMORY_HINT_PGI 0x1A1FE +#define GL_NATIVE_GRAPHICS_HANDLE_PGI 0x1A202 +#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203 +#define GL_NATIVE_GRAPHICS_END_HINT_PGI 0x1A204 +#define GL_ALWAYS_FAST_HINT_PGI 0x1A20C +#define GL_ALWAYS_SOFT_HINT_PGI 0x1A20D +#define GL_ALLOW_DRAW_OBJ_HINT_PGI 0x1A20E +#define GL_ALLOW_DRAW_WIN_HINT_PGI 0x1A20F +#define GL_ALLOW_DRAW_FRG_HINT_PGI 0x1A210 +#define GL_ALLOW_DRAW_MEM_HINT_PGI 0x1A211 +#define GL_STRICT_DEPTHFUNC_HINT_PGI 0x1A216 +#define GL_STRICT_LIGHTING_HINT_PGI 0x1A217 +#define GL_STRICT_SCISSOR_HINT_PGI 0x1A218 +#define GL_FULL_STIPPLE_HINT_PGI 0x1A219 +#define GL_CLIP_NEAR_HINT_PGI 0x1A220 +#define GL_CLIP_FAR_HINT_PGI 0x1A221 +#define GL_WIDE_LINE_HINT_PGI 0x1A222 +#define GL_BACK_NORMALS_HINT_PGI 0x1A223 +#endif + +#ifndef GL_EXT_paletted_texture +#define GL_COLOR_INDEX1_EXT 0x80E2 +#define GL_COLOR_INDEX2_EXT 0x80E3 +#define GL_COLOR_INDEX4_EXT 0x80E4 +#define GL_COLOR_INDEX8_EXT 0x80E5 +#define GL_COLOR_INDEX12_EXT 0x80E6 +#define GL_COLOR_INDEX16_EXT 0x80E7 +#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED +#endif + +#ifndef GL_EXT_clip_volume_hint +#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT 0x80F0 +#endif + +#ifndef GL_SGIX_list_priority +#define GL_LIST_PRIORITY_SGIX 0x8182 +#endif + +#ifndef GL_SGIX_ir_instrument1 +#define GL_IR_INSTRUMENT1_SGIX 0x817F +#endif + +#ifndef GL_SGIX_calligraphic_fragment +#define GL_CALLIGRAPHIC_FRAGMENT_SGIX 0x8183 +#endif + +#ifndef GL_SGIX_texture_lod_bias +#define GL_TEXTURE_LOD_BIAS_S_SGIX 0x818E +#define GL_TEXTURE_LOD_BIAS_T_SGIX 0x818F +#define GL_TEXTURE_LOD_BIAS_R_SGIX 0x8190 +#endif + +#ifndef GL_SGIX_shadow_ambient +#define GL_SHADOW_AMBIENT_SGIX 0x80BF +#endif + +#ifndef GL_EXT_index_texture +#endif + +#ifndef GL_EXT_index_material +#define GL_INDEX_MATERIAL_EXT 0x81B8 +#define GL_INDEX_MATERIAL_PARAMETER_EXT 0x81B9 +#define GL_INDEX_MATERIAL_FACE_EXT 0x81BA +#endif + +#ifndef GL_EXT_index_func +#define GL_INDEX_TEST_EXT 0x81B5 +#define GL_INDEX_TEST_FUNC_EXT 0x81B6 +#define GL_INDEX_TEST_REF_EXT 0x81B7 +#endif + +#ifndef GL_EXT_index_array_formats +#define GL_IUI_V2F_EXT 0x81AD +#define GL_IUI_V3F_EXT 0x81AE +#define GL_IUI_N3F_V2F_EXT 0x81AF +#define GL_IUI_N3F_V3F_EXT 0x81B0 +#define GL_T2F_IUI_V2F_EXT 0x81B1 +#define GL_T2F_IUI_V3F_EXT 0x81B2 +#define GL_T2F_IUI_N3F_V2F_EXT 0x81B3 +#define GL_T2F_IUI_N3F_V3F_EXT 0x81B4 +#endif + +#ifndef GL_EXT_compiled_vertex_array +#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT 0x81A8 +#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT 0x81A9 +#endif + +#ifndef GL_EXT_cull_vertex +#define GL_CULL_VERTEX_EXT 0x81AA +#define GL_CULL_VERTEX_EYE_POSITION_EXT 0x81AB +#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC +#endif + +#ifndef GL_SGIX_ycrcb +#define GL_YCRCB_422_SGIX 0x81BB +#define GL_YCRCB_444_SGIX 0x81BC +#endif + +#ifndef GL_SGIX_fragment_lighting +#define GL_FRAGMENT_LIGHTING_SGIX 0x8400 +#define GL_FRAGMENT_COLOR_MATERIAL_SGIX 0x8401 +#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402 +#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403 +#define GL_MAX_FRAGMENT_LIGHTS_SGIX 0x8404 +#define GL_MAX_ACTIVE_LIGHTS_SGIX 0x8405 +#define GL_CURRENT_RASTER_NORMAL_SGIX 0x8406 +#define GL_LIGHT_ENV_MODE_SGIX 0x8407 +#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408 +#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409 +#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A +#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B +#define GL_FRAGMENT_LIGHT0_SGIX 0x840C +#define GL_FRAGMENT_LIGHT1_SGIX 0x840D +#define GL_FRAGMENT_LIGHT2_SGIX 0x840E +#define GL_FRAGMENT_LIGHT3_SGIX 0x840F +#define GL_FRAGMENT_LIGHT4_SGIX 0x8410 +#define GL_FRAGMENT_LIGHT5_SGIX 0x8411 +#define GL_FRAGMENT_LIGHT6_SGIX 0x8412 +#define GL_FRAGMENT_LIGHT7_SGIX 0x8413 +#endif + +#ifndef GL_IBM_rasterpos_clip +#define GL_RASTER_POSITION_UNCLIPPED_IBM 0x19262 +#endif + +#ifndef GL_HP_texture_lighting +#define GL_TEXTURE_LIGHTING_MODE_HP 0x8167 +#define GL_TEXTURE_POST_SPECULAR_HP 0x8168 +#define GL_TEXTURE_PRE_SPECULAR_HP 0x8169 +#endif + +#ifndef GL_EXT_draw_range_elements +#define GL_MAX_ELEMENTS_VERTICES_EXT 0x80E8 +#define GL_MAX_ELEMENTS_INDICES_EXT 0x80E9 +#endif + +#ifndef GL_WIN_phong_shading +#define GL_PHONG_WIN 0x80EA +#define GL_PHONG_HINT_WIN 0x80EB +#endif + +#ifndef GL_WIN_specular_fog +#define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC +#endif + +#ifndef GL_EXT_light_texture +#define GL_FRAGMENT_MATERIAL_EXT 0x8349 +#define GL_FRAGMENT_NORMAL_EXT 0x834A +#define GL_FRAGMENT_COLOR_EXT 0x834C +#define GL_ATTENUATION_EXT 0x834D +#define GL_SHADOW_ATTENUATION_EXT 0x834E +#define GL_TEXTURE_APPLICATION_MODE_EXT 0x834F +#define GL_TEXTURE_LIGHT_EXT 0x8350 +#define GL_TEXTURE_MATERIAL_FACE_EXT 0x8351 +#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352 +/* reuse GL_FRAGMENT_DEPTH_EXT */ +#endif + +#ifndef GL_SGIX_blend_alpha_minmax +#define GL_ALPHA_MIN_SGIX 0x8320 +#define GL_ALPHA_MAX_SGIX 0x8321 +#endif + +#ifndef GL_SGIX_impact_pixel_texture +#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX 0x8184 +#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX 0x8185 +#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX 0x8186 +#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187 +#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188 +#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX 0x8189 +#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX 0x818A +#endif + +#ifndef GL_EXT_bgra +#define GL_BGR_EXT 0x80E0 +#define GL_BGRA_EXT 0x80E1 +#endif + +#ifndef GL_SGIX_async +#define GL_ASYNC_MARKER_SGIX 0x8329 +#endif + +#ifndef GL_SGIX_async_pixel +#define GL_ASYNC_TEX_IMAGE_SGIX 0x835C +#define GL_ASYNC_DRAW_PIXELS_SGIX 0x835D +#define GL_ASYNC_READ_PIXELS_SGIX 0x835E +#define GL_MAX_ASYNC_TEX_IMAGE_SGIX 0x835F +#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX 0x8360 +#define GL_MAX_ASYNC_READ_PIXELS_SGIX 0x8361 +#endif + +#ifndef GL_SGIX_async_histogram +#define GL_ASYNC_HISTOGRAM_SGIX 0x832C +#define GL_MAX_ASYNC_HISTOGRAM_SGIX 0x832D +#endif + +#ifndef GL_INTEL_texture_scissor +#endif + +#ifndef GL_INTEL_parallel_arrays +#define GL_PARALLEL_ARRAYS_INTEL 0x83F4 +#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5 +#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6 +#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7 +#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8 +#endif + +#ifndef GL_HP_occlusion_test +#define GL_OCCLUSION_TEST_HP 0x8165 +#define GL_OCCLUSION_TEST_RESULT_HP 0x8166 +#endif + +#ifndef GL_EXT_pixel_transform +#define GL_PIXEL_TRANSFORM_2D_EXT 0x8330 +#define GL_PIXEL_MAG_FILTER_EXT 0x8331 +#define GL_PIXEL_MIN_FILTER_EXT 0x8332 +#define GL_PIXEL_CUBIC_WEIGHT_EXT 0x8333 +#define GL_CUBIC_EXT 0x8334 +#define GL_AVERAGE_EXT 0x8335 +#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336 +#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337 +#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT 0x8338 +#endif + +#ifndef GL_EXT_pixel_transform_color_table +#endif + +#ifndef GL_EXT_shared_texture_palette +#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB +#endif + +#ifndef GL_EXT_separate_specular_color +#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT 0x81F8 +#define GL_SINGLE_COLOR_EXT 0x81F9 +#define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA +#endif + +#ifndef GL_EXT_secondary_color +#define GL_COLOR_SUM_EXT 0x8458 +#define GL_CURRENT_SECONDARY_COLOR_EXT 0x8459 +#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A +#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B +#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C +#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D +#define GL_SECONDARY_COLOR_ARRAY_EXT 0x845E +#endif + +#ifndef GL_EXT_texture_perturb_normal +#define GL_PERTURB_EXT 0x85AE +#define GL_TEXTURE_NORMAL_EXT 0x85AF +#endif + +#ifndef GL_EXT_multi_draw_arrays +#endif + +#ifndef GL_EXT_fog_coord +#define GL_FOG_COORDINATE_SOURCE_EXT 0x8450 +#define GL_FOG_COORDINATE_EXT 0x8451 +#define GL_FRAGMENT_DEPTH_EXT 0x8452 +#define GL_CURRENT_FOG_COORDINATE_EXT 0x8453 +#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT 0x8454 +#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455 +#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456 +#define GL_FOG_COORDINATE_ARRAY_EXT 0x8457 +#endif + +#ifndef GL_REND_screen_coordinates +#define GL_SCREEN_COORDINATES_REND 0x8490 +#define GL_INVERTED_SCREEN_W_REND 0x8491 +#endif + +#ifndef GL_EXT_coordinate_frame +#define GL_TANGENT_ARRAY_EXT 0x8439 +#define GL_BINORMAL_ARRAY_EXT 0x843A +#define GL_CURRENT_TANGENT_EXT 0x843B +#define GL_CURRENT_BINORMAL_EXT 0x843C +#define GL_TANGENT_ARRAY_TYPE_EXT 0x843E +#define GL_TANGENT_ARRAY_STRIDE_EXT 0x843F +#define GL_BINORMAL_ARRAY_TYPE_EXT 0x8440 +#define GL_BINORMAL_ARRAY_STRIDE_EXT 0x8441 +#define GL_TANGENT_ARRAY_POINTER_EXT 0x8442 +#define GL_BINORMAL_ARRAY_POINTER_EXT 0x8443 +#define GL_MAP1_TANGENT_EXT 0x8444 +#define GL_MAP2_TANGENT_EXT 0x8445 +#define GL_MAP1_BINORMAL_EXT 0x8446 +#define GL_MAP2_BINORMAL_EXT 0x8447 +#endif + +#ifndef GL_EXT_texture_env_combine +#define GL_COMBINE_EXT 0x8570 +#define GL_COMBINE_RGB_EXT 0x8571 +#define GL_COMBINE_ALPHA_EXT 0x8572 +#define GL_RGB_SCALE_EXT 0x8573 +#define GL_ADD_SIGNED_EXT 0x8574 +#define GL_INTERPOLATE_EXT 0x8575 +#define GL_CONSTANT_EXT 0x8576 +#define GL_PRIMARY_COLOR_EXT 0x8577 +#define GL_PREVIOUS_EXT 0x8578 +#define GL_SOURCE0_RGB_EXT 0x8580 +#define GL_SOURCE1_RGB_EXT 0x8581 +#define GL_SOURCE2_RGB_EXT 0x8582 +#define GL_SOURCE0_ALPHA_EXT 0x8588 +#define GL_SOURCE1_ALPHA_EXT 0x8589 +#define GL_SOURCE2_ALPHA_EXT 0x858A +#define GL_OPERAND0_RGB_EXT 0x8590 +#define GL_OPERAND1_RGB_EXT 0x8591 +#define GL_OPERAND2_RGB_EXT 0x8592 +#define GL_OPERAND0_ALPHA_EXT 0x8598 +#define GL_OPERAND1_ALPHA_EXT 0x8599 +#define GL_OPERAND2_ALPHA_EXT 0x859A +#endif + +#ifndef GL_APPLE_specular_vector +#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0 +#endif + +#ifndef GL_APPLE_transform_hint +#define GL_TRANSFORM_HINT_APPLE 0x85B1 +#endif + +#ifndef GL_SGIX_fog_scale +#define GL_FOG_SCALE_SGIX 0x81FC +#define GL_FOG_SCALE_VALUE_SGIX 0x81FD +#endif + +#ifndef GL_SUNX_constant_data +#define GL_UNPACK_CONSTANT_DATA_SUNX 0x81D5 +#define GL_TEXTURE_CONSTANT_DATA_SUNX 0x81D6 +#endif + +#ifndef GL_SUN_global_alpha +#define GL_GLOBAL_ALPHA_SUN 0x81D9 +#define GL_GLOBAL_ALPHA_FACTOR_SUN 0x81DA +#endif + +#ifndef GL_SUN_triangle_list +#define GL_RESTART_SUN 0x0001 +#define GL_REPLACE_MIDDLE_SUN 0x0002 +#define GL_REPLACE_OLDEST_SUN 0x0003 +#define GL_TRIANGLE_LIST_SUN 0x81D7 +#define GL_REPLACEMENT_CODE_SUN 0x81D8 +#define GL_REPLACEMENT_CODE_ARRAY_SUN 0x85C0 +#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1 +#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2 +#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3 +#define GL_R1UI_V3F_SUN 0x85C4 +#define GL_R1UI_C4UB_V3F_SUN 0x85C5 +#define GL_R1UI_C3F_V3F_SUN 0x85C6 +#define GL_R1UI_N3F_V3F_SUN 0x85C7 +#define GL_R1UI_C4F_N3F_V3F_SUN 0x85C8 +#define GL_R1UI_T2F_V3F_SUN 0x85C9 +#define GL_R1UI_T2F_N3F_V3F_SUN 0x85CA +#define GL_R1UI_T2F_C4F_N3F_V3F_SUN 0x85CB +#endif + +#ifndef GL_SUN_vertex +#endif + +#ifndef GL_EXT_blend_func_separate +#define GL_BLEND_DST_RGB_EXT 0x80C8 +#define GL_BLEND_SRC_RGB_EXT 0x80C9 +#define GL_BLEND_DST_ALPHA_EXT 0x80CA +#define GL_BLEND_SRC_ALPHA_EXT 0x80CB +#endif + +#ifndef GL_INGR_color_clamp +#define GL_RED_MIN_CLAMP_INGR 0x8560 +#define GL_GREEN_MIN_CLAMP_INGR 0x8561 +#define GL_BLUE_MIN_CLAMP_INGR 0x8562 +#define GL_ALPHA_MIN_CLAMP_INGR 0x8563 +#define GL_RED_MAX_CLAMP_INGR 0x8564 +#define GL_GREEN_MAX_CLAMP_INGR 0x8565 +#define GL_BLUE_MAX_CLAMP_INGR 0x8566 +#define GL_ALPHA_MAX_CLAMP_INGR 0x8567 +#endif + +#ifndef GL_INGR_interlace_read +#define GL_INTERLACE_READ_INGR 0x8568 +#endif + +#ifndef GL_EXT_stencil_wrap +#define GL_INCR_WRAP_EXT 0x8507 +#define GL_DECR_WRAP_EXT 0x8508 +#endif + +#ifndef GL_EXT_422_pixels +#define GL_422_EXT 0x80CC +#define GL_422_REV_EXT 0x80CD +#define GL_422_AVERAGE_EXT 0x80CE +#define GL_422_REV_AVERAGE_EXT 0x80CF +#endif + +#ifndef GL_NV_texgen_reflection +#define GL_NORMAL_MAP_NV 0x8511 +#define GL_REFLECTION_MAP_NV 0x8512 +#endif + +#ifndef GL_EXT_texture_cube_map +#define GL_NORMAL_MAP_EXT 0x8511 +#define GL_REFLECTION_MAP_EXT 0x8512 +#define GL_TEXTURE_CUBE_MAP_EXT 0x8513 +#define GL_TEXTURE_BINDING_CUBE_MAP_EXT 0x8514 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A +#define GL_PROXY_TEXTURE_CUBE_MAP_EXT 0x851B +#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT 0x851C +#endif + +#ifndef GL_SUN_convolution_border_modes +#define GL_WRAP_BORDER_SUN 0x81D4 +#endif + +#ifndef GL_EXT_texture_env_add +#endif + +#ifndef GL_EXT_texture_lod_bias +#define GL_MAX_TEXTURE_LOD_BIAS_EXT 0x84FD +#define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500 +#define GL_TEXTURE_LOD_BIAS_EXT 0x8501 +#endif + +#ifndef GL_EXT_texture_filter_anisotropic +#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE +#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF +#endif + +#ifndef GL_EXT_vertex_weighting +#define GL_MODELVIEW0_STACK_DEPTH_EXT GL_MODELVIEW_STACK_DEPTH +#define GL_MODELVIEW1_STACK_DEPTH_EXT 0x8502 +#define GL_MODELVIEW0_MATRIX_EXT GL_MODELVIEW_MATRIX +#define GL_MODELVIEW1_MATRIX_EXT 0x8506 +#define GL_VERTEX_WEIGHTING_EXT 0x8509 +#define GL_MODELVIEW0_EXT GL_MODELVIEW +#define GL_MODELVIEW1_EXT 0x850A +#define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B +#define GL_VERTEX_WEIGHT_ARRAY_EXT 0x850C +#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT 0x850D +#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT 0x850E +#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F +#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510 +#endif + +#ifndef GL_NV_light_max_exponent +#define GL_MAX_SHININESS_NV 0x8504 +#define GL_MAX_SPOT_EXPONENT_NV 0x8505 +#endif + +#ifndef GL_NV_vertex_array_range +#define GL_VERTEX_ARRAY_RANGE_NV 0x851D +#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV 0x851E +#define GL_VERTEX_ARRAY_RANGE_VALID_NV 0x851F +#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520 +#define GL_VERTEX_ARRAY_RANGE_POINTER_NV 0x8521 +#endif + +#ifndef GL_NV_register_combiners +#define GL_REGISTER_COMBINERS_NV 0x8522 +#define GL_VARIABLE_A_NV 0x8523 +#define GL_VARIABLE_B_NV 0x8524 +#define GL_VARIABLE_C_NV 0x8525 +#define GL_VARIABLE_D_NV 0x8526 +#define GL_VARIABLE_E_NV 0x8527 +#define GL_VARIABLE_F_NV 0x8528 +#define GL_VARIABLE_G_NV 0x8529 +#define GL_CONSTANT_COLOR0_NV 0x852A +#define GL_CONSTANT_COLOR1_NV 0x852B +#define GL_PRIMARY_COLOR_NV 0x852C +#define GL_SECONDARY_COLOR_NV 0x852D +#define GL_SPARE0_NV 0x852E +#define GL_SPARE1_NV 0x852F +#define GL_DISCARD_NV 0x8530 +#define GL_E_TIMES_F_NV 0x8531 +#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532 +#define GL_UNSIGNED_IDENTITY_NV 0x8536 +#define GL_UNSIGNED_INVERT_NV 0x8537 +#define GL_EXPAND_NORMAL_NV 0x8538 +#define GL_EXPAND_NEGATE_NV 0x8539 +#define GL_HALF_BIAS_NORMAL_NV 0x853A +#define GL_HALF_BIAS_NEGATE_NV 0x853B +#define GL_SIGNED_IDENTITY_NV 0x853C +#define GL_SIGNED_NEGATE_NV 0x853D +#define GL_SCALE_BY_TWO_NV 0x853E +#define GL_SCALE_BY_FOUR_NV 0x853F +#define GL_SCALE_BY_ONE_HALF_NV 0x8540 +#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV 0x8541 +#define GL_COMBINER_INPUT_NV 0x8542 +#define GL_COMBINER_MAPPING_NV 0x8543 +#define GL_COMBINER_COMPONENT_USAGE_NV 0x8544 +#define GL_COMBINER_AB_DOT_PRODUCT_NV 0x8545 +#define GL_COMBINER_CD_DOT_PRODUCT_NV 0x8546 +#define GL_COMBINER_MUX_SUM_NV 0x8547 +#define GL_COMBINER_SCALE_NV 0x8548 +#define GL_COMBINER_BIAS_NV 0x8549 +#define GL_COMBINER_AB_OUTPUT_NV 0x854A +#define GL_COMBINER_CD_OUTPUT_NV 0x854B +#define GL_COMBINER_SUM_OUTPUT_NV 0x854C +#define GL_MAX_GENERAL_COMBINERS_NV 0x854D +#define GL_NUM_GENERAL_COMBINERS_NV 0x854E +#define GL_COLOR_SUM_CLAMP_NV 0x854F +#define GL_COMBINER0_NV 0x8550 +#define GL_COMBINER1_NV 0x8551 +#define GL_COMBINER2_NV 0x8552 +#define GL_COMBINER3_NV 0x8553 +#define GL_COMBINER4_NV 0x8554 +#define GL_COMBINER5_NV 0x8555 +#define GL_COMBINER6_NV 0x8556 +#define GL_COMBINER7_NV 0x8557 +/* reuse GL_TEXTURE0_ARB */ +/* reuse GL_TEXTURE1_ARB */ +/* reuse GL_ZERO */ +/* reuse GL_NONE */ +/* reuse GL_FOG */ +#endif + +#ifndef GL_NV_fog_distance +#define GL_FOG_DISTANCE_MODE_NV 0x855A +#define GL_EYE_RADIAL_NV 0x855B +#define GL_EYE_PLANE_ABSOLUTE_NV 0x855C +/* reuse GL_EYE_PLANE */ +#endif + +#ifndef GL_NV_texgen_emboss +#define GL_EMBOSS_LIGHT_NV 0x855D +#define GL_EMBOSS_CONSTANT_NV 0x855E +#define GL_EMBOSS_MAP_NV 0x855F +#endif + +#ifndef GL_NV_blend_square +#endif + +#ifndef GL_NV_texture_env_combine4 +#define GL_COMBINE4_NV 0x8503 +#define GL_SOURCE3_RGB_NV 0x8583 +#define GL_SOURCE3_ALPHA_NV 0x858B +#define GL_OPERAND3_RGB_NV 0x8593 +#define GL_OPERAND3_ALPHA_NV 0x859B +#endif + +#ifndef GL_MESA_resize_buffers +#endif + +#ifndef GL_MESA_window_pos +#endif + +#ifndef GL_EXT_texture_compression_s3tc +#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 +#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 +#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 +#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 +#endif + +#ifndef GL_IBM_cull_vertex +#define GL_CULL_VERTEX_IBM 103050 +#endif + +#ifndef GL_IBM_multimode_draw_arrays +#endif + +#ifndef GL_IBM_vertex_array_lists +#define GL_VERTEX_ARRAY_LIST_IBM 103070 +#define GL_NORMAL_ARRAY_LIST_IBM 103071 +#define GL_COLOR_ARRAY_LIST_IBM 103072 +#define GL_INDEX_ARRAY_LIST_IBM 103073 +#define GL_TEXTURE_COORD_ARRAY_LIST_IBM 103074 +#define GL_EDGE_FLAG_ARRAY_LIST_IBM 103075 +#define GL_FOG_COORDINATE_ARRAY_LIST_IBM 103076 +#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077 +#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM 103080 +#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM 103081 +#define GL_COLOR_ARRAY_LIST_STRIDE_IBM 103082 +#define GL_INDEX_ARRAY_LIST_STRIDE_IBM 103083 +#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084 +#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085 +#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086 +#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087 +#endif + +#ifndef GL_SGIX_subsample +#define GL_PACK_SUBSAMPLE_RATE_SGIX 0x85A0 +#define GL_UNPACK_SUBSAMPLE_RATE_SGIX 0x85A1 +#define GL_PIXEL_SUBSAMPLE_4444_SGIX 0x85A2 +#define GL_PIXEL_SUBSAMPLE_2424_SGIX 0x85A3 +#define GL_PIXEL_SUBSAMPLE_4242_SGIX 0x85A4 +#endif + +#ifndef GL_SGIX_ycrcb_subsample +#endif + +#ifndef GL_SGIX_ycrcba +#define GL_YCRCB_SGIX 0x8318 +#define GL_YCRCBA_SGIX 0x8319 +#endif + +#ifndef GL_SGI_depth_pass_instrument +#define GL_DEPTH_PASS_INSTRUMENT_SGIX 0x8310 +#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311 +#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312 +#endif + +#ifndef GL_3DFX_texture_compression_FXT1 +#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 +#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1 +#endif + +#ifndef GL_3DFX_multisample +#define GL_MULTISAMPLE_3DFX 0x86B2 +#define GL_SAMPLE_BUFFERS_3DFX 0x86B3 +#define GL_SAMPLES_3DFX 0x86B4 +#define GL_MULTISAMPLE_BIT_3DFX 0x20000000 +#endif + +#ifndef GL_3DFX_tbuffer +#endif + +#ifndef GL_EXT_multisample +#define GL_MULTISAMPLE_EXT 0x809D +#define GL_SAMPLE_ALPHA_TO_MASK_EXT 0x809E +#define GL_SAMPLE_ALPHA_TO_ONE_EXT 0x809F +#define GL_SAMPLE_MASK_EXT 0x80A0 +#define GL_1PASS_EXT 0x80A1 +#define GL_2PASS_0_EXT 0x80A2 +#define GL_2PASS_1_EXT 0x80A3 +#define GL_4PASS_0_EXT 0x80A4 +#define GL_4PASS_1_EXT 0x80A5 +#define GL_4PASS_2_EXT 0x80A6 +#define GL_4PASS_3_EXT 0x80A7 +#define GL_SAMPLE_BUFFERS_EXT 0x80A8 +#define GL_SAMPLES_EXT 0x80A9 +#define GL_SAMPLE_MASK_VALUE_EXT 0x80AA +#define GL_SAMPLE_MASK_INVERT_EXT 0x80AB +#define GL_SAMPLE_PATTERN_EXT 0x80AC +#define GL_MULTISAMPLE_BIT_EXT 0x20000000 +#endif + +#ifndef GL_SGIX_vertex_preclip +#define GL_VERTEX_PRECLIP_SGIX 0x83EE +#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF +#endif + +#ifndef GL_SGIX_convolution_accuracy +#define GL_CONVOLUTION_HINT_SGIX 0x8316 +#endif + +#ifndef GL_SGIX_resample +#define GL_PACK_RESAMPLE_SGIX 0x842C +#define GL_UNPACK_RESAMPLE_SGIX 0x842D +#define GL_RESAMPLE_REPLICATE_SGIX 0x842E +#define GL_RESAMPLE_ZERO_FILL_SGIX 0x842F +#define GL_RESAMPLE_DECIMATE_SGIX 0x8430 +#endif + +#ifndef GL_SGIS_point_line_texgen +#define GL_EYE_DISTANCE_TO_POINT_SGIS 0x81F0 +#define GL_OBJECT_DISTANCE_TO_POINT_SGIS 0x81F1 +#define GL_EYE_DISTANCE_TO_LINE_SGIS 0x81F2 +#define GL_OBJECT_DISTANCE_TO_LINE_SGIS 0x81F3 +#define GL_EYE_POINT_SGIS 0x81F4 +#define GL_OBJECT_POINT_SGIS 0x81F5 +#define GL_EYE_LINE_SGIS 0x81F6 +#define GL_OBJECT_LINE_SGIS 0x81F7 +#endif + +#ifndef GL_SGIS_texture_color_mask +#define GL_TEXTURE_COLOR_WRITEMASK_SGIS 0x81EF +#endif + +#ifndef GL_EXT_texture_env_dot3 +#define GL_DOT3_RGB_EXT 0x8740 +#define GL_DOT3_RGBA_EXT 0x8741 +#endif + +#ifndef GL_ATI_texture_mirror_once +#define GL_MIRROR_CLAMP_ATI 0x8742 +#define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743 +#endif + +#ifndef GL_NV_fence +#define GL_ALL_COMPLETED_NV 0x84F2 +#define GL_FENCE_STATUS_NV 0x84F3 +#define GL_FENCE_CONDITION_NV 0x84F4 +#endif + +#ifndef GL_IBM_texture_mirrored_repeat +#define GL_MIRRORED_REPEAT_IBM 0x8370 +#endif + +#ifndef GL_NV_evaluators +#define GL_EVAL_2D_NV 0x86C0 +#define GL_EVAL_TRIANGULAR_2D_NV 0x86C1 +#define GL_MAP_TESSELLATION_NV 0x86C2 +#define GL_MAP_ATTRIB_U_ORDER_NV 0x86C3 +#define GL_MAP_ATTRIB_V_ORDER_NV 0x86C4 +#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5 +#define GL_EVAL_VERTEX_ATTRIB0_NV 0x86C6 +#define GL_EVAL_VERTEX_ATTRIB1_NV 0x86C7 +#define GL_EVAL_VERTEX_ATTRIB2_NV 0x86C8 +#define GL_EVAL_VERTEX_ATTRIB3_NV 0x86C9 +#define GL_EVAL_VERTEX_ATTRIB4_NV 0x86CA +#define GL_EVAL_VERTEX_ATTRIB5_NV 0x86CB +#define GL_EVAL_VERTEX_ATTRIB6_NV 0x86CC +#define GL_EVAL_VERTEX_ATTRIB7_NV 0x86CD +#define GL_EVAL_VERTEX_ATTRIB8_NV 0x86CE +#define GL_EVAL_VERTEX_ATTRIB9_NV 0x86CF +#define GL_EVAL_VERTEX_ATTRIB10_NV 0x86D0 +#define GL_EVAL_VERTEX_ATTRIB11_NV 0x86D1 +#define GL_EVAL_VERTEX_ATTRIB12_NV 0x86D2 +#define GL_EVAL_VERTEX_ATTRIB13_NV 0x86D3 +#define GL_EVAL_VERTEX_ATTRIB14_NV 0x86D4 +#define GL_EVAL_VERTEX_ATTRIB15_NV 0x86D5 +#define GL_MAX_MAP_TESSELLATION_NV 0x86D6 +#define GL_MAX_RATIONAL_EVAL_ORDER_NV 0x86D7 +#endif + +#ifndef GL_NV_packed_depth_stencil +#define GL_DEPTH_STENCIL_NV 0x84F9 +#define GL_UNSIGNED_INT_24_8_NV 0x84FA +#endif + +#ifndef GL_NV_register_combiners2 +#define GL_PER_STAGE_CONSTANTS_NV 0x8535 +#endif + +#ifndef GL_NV_texture_compression_vtc +#endif + +#ifndef GL_NV_texture_rectangle +#define GL_TEXTURE_RECTANGLE_NV 0x84F5 +#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6 +#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7 +#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8 +#endif + +#ifndef GL_NV_texture_shader +#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C +#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D +#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E +#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9 +#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA +#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB +#define GL_DSDT_MAG_INTENSITY_NV 0x86DC +#define GL_SHADER_CONSISTENT_NV 0x86DD +#define GL_TEXTURE_SHADER_NV 0x86DE +#define GL_SHADER_OPERATION_NV 0x86DF +#define GL_CULL_MODES_NV 0x86E0 +#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1 +#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2 +#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3 +#define GL_OFFSET_TEXTURE_2D_MATRIX_NV GL_OFFSET_TEXTURE_MATRIX_NV +#define GL_OFFSET_TEXTURE_2D_SCALE_NV GL_OFFSET_TEXTURE_SCALE_NV +#define GL_OFFSET_TEXTURE_2D_BIAS_NV GL_OFFSET_TEXTURE_BIAS_NV +#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4 +#define GL_CONST_EYE_NV 0x86E5 +#define GL_PASS_THROUGH_NV 0x86E6 +#define GL_CULL_FRAGMENT_NV 0x86E7 +#define GL_OFFSET_TEXTURE_2D_NV 0x86E8 +#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9 +#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA +#define GL_DOT_PRODUCT_NV 0x86EC +#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED +#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE +#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0 +#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1 +#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2 +#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3 +#define GL_HILO_NV 0x86F4 +#define GL_DSDT_NV 0x86F5 +#define GL_DSDT_MAG_NV 0x86F6 +#define GL_DSDT_MAG_VIB_NV 0x86F7 +#define GL_HILO16_NV 0x86F8 +#define GL_SIGNED_HILO_NV 0x86F9 +#define GL_SIGNED_HILO16_NV 0x86FA +#define GL_SIGNED_RGBA_NV 0x86FB +#define GL_SIGNED_RGBA8_NV 0x86FC +#define GL_SIGNED_RGB_NV 0x86FE +#define GL_SIGNED_RGB8_NV 0x86FF +#define GL_SIGNED_LUMINANCE_NV 0x8701 +#define GL_SIGNED_LUMINANCE8_NV 0x8702 +#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703 +#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704 +#define GL_SIGNED_ALPHA_NV 0x8705 +#define GL_SIGNED_ALPHA8_NV 0x8706 +#define GL_SIGNED_INTENSITY_NV 0x8707 +#define GL_SIGNED_INTENSITY8_NV 0x8708 +#define GL_DSDT8_NV 0x8709 +#define GL_DSDT8_MAG8_NV 0x870A +#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B +#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C +#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D +#define GL_HI_SCALE_NV 0x870E +#define GL_LO_SCALE_NV 0x870F +#define GL_DS_SCALE_NV 0x8710 +#define GL_DT_SCALE_NV 0x8711 +#define GL_MAGNITUDE_SCALE_NV 0x8712 +#define GL_VIBRANCE_SCALE_NV 0x8713 +#define GL_HI_BIAS_NV 0x8714 +#define GL_LO_BIAS_NV 0x8715 +#define GL_DS_BIAS_NV 0x8716 +#define GL_DT_BIAS_NV 0x8717 +#define GL_MAGNITUDE_BIAS_NV 0x8718 +#define GL_VIBRANCE_BIAS_NV 0x8719 +#define GL_TEXTURE_BORDER_VALUES_NV 0x871A +#define GL_TEXTURE_HI_SIZE_NV 0x871B +#define GL_TEXTURE_LO_SIZE_NV 0x871C +#define GL_TEXTURE_DS_SIZE_NV 0x871D +#define GL_TEXTURE_DT_SIZE_NV 0x871E +#define GL_TEXTURE_MAG_SIZE_NV 0x871F +#endif + +#ifndef GL_NV_texture_shader2 +#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF +#endif + +#ifndef GL_NV_vertex_array_range2 +#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533 +#endif + +#ifndef GL_NV_vertex_program +#define GL_VERTEX_PROGRAM_NV 0x8620 +#define GL_VERTEX_STATE_PROGRAM_NV 0x8621 +#define GL_ATTRIB_ARRAY_SIZE_NV 0x8623 +#define GL_ATTRIB_ARRAY_STRIDE_NV 0x8624 +#define GL_ATTRIB_ARRAY_TYPE_NV 0x8625 +#define GL_CURRENT_ATTRIB_NV 0x8626 +#define GL_PROGRAM_LENGTH_NV 0x8627 +#define GL_PROGRAM_STRING_NV 0x8628 +#define GL_MODELVIEW_PROJECTION_NV 0x8629 +#define GL_IDENTITY_NV 0x862A +#define GL_INVERSE_NV 0x862B +#define GL_TRANSPOSE_NV 0x862C +#define GL_INVERSE_TRANSPOSE_NV 0x862D +#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E +#define GL_MAX_TRACK_MATRICES_NV 0x862F +#define GL_MATRIX0_NV 0x8630 +#define GL_MATRIX1_NV 0x8631 +#define GL_MATRIX2_NV 0x8632 +#define GL_MATRIX3_NV 0x8633 +#define GL_MATRIX4_NV 0x8634 +#define GL_MATRIX5_NV 0x8635 +#define GL_MATRIX6_NV 0x8636 +#define GL_MATRIX7_NV 0x8637 +#define GL_CURRENT_MATRIX_STACK_DEPTH_NV 0x8640 +#define GL_CURRENT_MATRIX_NV 0x8641 +#define GL_VERTEX_PROGRAM_POINT_SIZE_NV 0x8642 +#define GL_VERTEX_PROGRAM_TWO_SIDE_NV 0x8643 +#define GL_PROGRAM_PARAMETER_NV 0x8644 +#define GL_ATTRIB_ARRAY_POINTER_NV 0x8645 +#define GL_PROGRAM_TARGET_NV 0x8646 +#define GL_PROGRAM_RESIDENT_NV 0x8647 +#define GL_TRACK_MATRIX_NV 0x8648 +#define GL_TRACK_MATRIX_TRANSFORM_NV 0x8649 +#define GL_VERTEX_PROGRAM_BINDING_NV 0x864A +#define GL_PROGRAM_ERROR_POSITION_NV 0x864B +#define GL_VERTEX_ATTRIB_ARRAY0_NV 0x8650 +#define GL_VERTEX_ATTRIB_ARRAY1_NV 0x8651 +#define GL_VERTEX_ATTRIB_ARRAY2_NV 0x8652 +#define GL_VERTEX_ATTRIB_ARRAY3_NV 0x8653 +#define GL_VERTEX_ATTRIB_ARRAY4_NV 0x8654 +#define GL_VERTEX_ATTRIB_ARRAY5_NV 0x8655 +#define GL_VERTEX_ATTRIB_ARRAY6_NV 0x8656 +#define GL_VERTEX_ATTRIB_ARRAY7_NV 0x8657 +#define GL_VERTEX_ATTRIB_ARRAY8_NV 0x8658 +#define GL_VERTEX_ATTRIB_ARRAY9_NV 0x8659 +#define GL_VERTEX_ATTRIB_ARRAY10_NV 0x865A +#define GL_VERTEX_ATTRIB_ARRAY11_NV 0x865B +#define GL_VERTEX_ATTRIB_ARRAY12_NV 0x865C +#define GL_VERTEX_ATTRIB_ARRAY13_NV 0x865D +#define GL_VERTEX_ATTRIB_ARRAY14_NV 0x865E +#define GL_VERTEX_ATTRIB_ARRAY15_NV 0x865F +#define GL_MAP1_VERTEX_ATTRIB0_4_NV 0x8660 +#define GL_MAP1_VERTEX_ATTRIB1_4_NV 0x8661 +#define GL_MAP1_VERTEX_ATTRIB2_4_NV 0x8662 +#define GL_MAP1_VERTEX_ATTRIB3_4_NV 0x8663 +#define GL_MAP1_VERTEX_ATTRIB4_4_NV 0x8664 +#define GL_MAP1_VERTEX_ATTRIB5_4_NV 0x8665 +#define GL_MAP1_VERTEX_ATTRIB6_4_NV 0x8666 +#define GL_MAP1_VERTEX_ATTRIB7_4_NV 0x8667 +#define GL_MAP1_VERTEX_ATTRIB8_4_NV 0x8668 +#define GL_MAP1_VERTEX_ATTRIB9_4_NV 0x8669 +#define GL_MAP1_VERTEX_ATTRIB10_4_NV 0x866A +#define GL_MAP1_VERTEX_ATTRIB11_4_NV 0x866B +#define GL_MAP1_VERTEX_ATTRIB12_4_NV 0x866C +#define GL_MAP1_VERTEX_ATTRIB13_4_NV 0x866D +#define GL_MAP1_VERTEX_ATTRIB14_4_NV 0x866E +#define GL_MAP1_VERTEX_ATTRIB15_4_NV 0x866F +#define GL_MAP2_VERTEX_ATTRIB0_4_NV 0x8670 +#define GL_MAP2_VERTEX_ATTRIB1_4_NV 0x8671 +#define GL_MAP2_VERTEX_ATTRIB2_4_NV 0x8672 +#define GL_MAP2_VERTEX_ATTRIB3_4_NV 0x8673 +#define GL_MAP2_VERTEX_ATTRIB4_4_NV 0x8674 +#define GL_MAP2_VERTEX_ATTRIB5_4_NV 0x8675 +#define GL_MAP2_VERTEX_ATTRIB6_4_NV 0x8676 +#define GL_MAP2_VERTEX_ATTRIB7_4_NV 0x8677 +#define GL_MAP2_VERTEX_ATTRIB8_4_NV 0x8678 +#define GL_MAP2_VERTEX_ATTRIB9_4_NV 0x8679 +#define GL_MAP2_VERTEX_ATTRIB10_4_NV 0x867A +#define GL_MAP2_VERTEX_ATTRIB11_4_NV 0x867B +#define GL_MAP2_VERTEX_ATTRIB12_4_NV 0x867C +#define GL_MAP2_VERTEX_ATTRIB13_4_NV 0x867D +#define GL_MAP2_VERTEX_ATTRIB14_4_NV 0x867E +#define GL_MAP2_VERTEX_ATTRIB15_4_NV 0x867F +#endif + +#ifndef GL_SGIX_texture_coordinate_clamp +#define GL_TEXTURE_MAX_CLAMP_S_SGIX 0x8369 +#define GL_TEXTURE_MAX_CLAMP_T_SGIX 0x836A +#define GL_TEXTURE_MAX_CLAMP_R_SGIX 0x836B +#endif + +#ifndef GL_SGIX_scalebias_hint +#define GL_SCALEBIAS_HINT_SGIX 0x8322 +#endif + +#ifndef GL_OML_interlace +#define GL_INTERLACE_OML 0x8980 +#define GL_INTERLACE_READ_OML 0x8981 +#endif + +#ifndef GL_OML_subsample +#define GL_FORMAT_SUBSAMPLE_24_24_OML 0x8982 +#define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983 +#endif + +#ifndef GL_OML_resample +#define GL_PACK_RESAMPLE_OML 0x8984 +#define GL_UNPACK_RESAMPLE_OML 0x8985 +#define GL_RESAMPLE_REPLICATE_OML 0x8986 +#define GL_RESAMPLE_ZERO_FILL_OML 0x8987 +#define GL_RESAMPLE_AVERAGE_OML 0x8988 +#define GL_RESAMPLE_DECIMATE_OML 0x8989 +#endif + +#ifndef GL_NV_copy_depth_to_color +#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E +#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F +#endif + +#ifndef GL_ATI_envmap_bumpmap +#define GL_BUMP_ROT_MATRIX_ATI 0x8775 +#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776 +#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777 +#define GL_BUMP_TEX_UNITS_ATI 0x8778 +#define GL_DUDV_ATI 0x8779 +#define GL_DU8DV8_ATI 0x877A +#define GL_BUMP_ENVMAP_ATI 0x877B +#define GL_BUMP_TARGET_ATI 0x877C +#endif + +#ifndef GL_ATI_fragment_shader +#define GL_FRAGMENT_SHADER_ATI 0x8920 +#define GL_REG_0_ATI 0x8921 +#define GL_REG_1_ATI 0x8922 +#define GL_REG_2_ATI 0x8923 +#define GL_REG_3_ATI 0x8924 +#define GL_REG_4_ATI 0x8925 +#define GL_REG_5_ATI 0x8926 +#define GL_REG_6_ATI 0x8927 +#define GL_REG_7_ATI 0x8928 +#define GL_REG_8_ATI 0x8929 +#define GL_REG_9_ATI 0x892A +#define GL_REG_10_ATI 0x892B +#define GL_REG_11_ATI 0x892C +#define GL_REG_12_ATI 0x892D +#define GL_REG_13_ATI 0x892E +#define GL_REG_14_ATI 0x892F +#define GL_REG_15_ATI 0x8930 +#define GL_REG_16_ATI 0x8931 +#define GL_REG_17_ATI 0x8932 +#define GL_REG_18_ATI 0x8933 +#define GL_REG_19_ATI 0x8934 +#define GL_REG_20_ATI 0x8935 +#define GL_REG_21_ATI 0x8936 +#define GL_REG_22_ATI 0x8937 +#define GL_REG_23_ATI 0x8938 +#define GL_REG_24_ATI 0x8939 +#define GL_REG_25_ATI 0x893A +#define GL_REG_26_ATI 0x893B +#define GL_REG_27_ATI 0x893C +#define GL_REG_28_ATI 0x893D +#define GL_REG_29_ATI 0x893E +#define GL_REG_30_ATI 0x893F +#define GL_REG_31_ATI 0x8940 +#define GL_CON_0_ATI 0x8941 +#define GL_CON_1_ATI 0x8942 +#define GL_CON_2_ATI 0x8943 +#define GL_CON_3_ATI 0x8944 +#define GL_CON_4_ATI 0x8945 +#define GL_CON_5_ATI 0x8946 +#define GL_CON_6_ATI 0x8947 +#define GL_CON_7_ATI 0x8948 +#define GL_CON_8_ATI 0x8949 +#define GL_CON_9_ATI 0x894A +#define GL_CON_10_ATI 0x894B +#define GL_CON_11_ATI 0x894C +#define GL_CON_12_ATI 0x894D +#define GL_CON_13_ATI 0x894E +#define GL_CON_14_ATI 0x894F +#define GL_CON_15_ATI 0x8950 +#define GL_CON_16_ATI 0x8951 +#define GL_CON_17_ATI 0x8952 +#define GL_CON_18_ATI 0x8953 +#define GL_CON_19_ATI 0x8954 +#define GL_CON_20_ATI 0x8955 +#define GL_CON_21_ATI 0x8956 +#define GL_CON_22_ATI 0x8957 +#define GL_CON_23_ATI 0x8958 +#define GL_CON_24_ATI 0x8959 +#define GL_CON_25_ATI 0x895A +#define GL_CON_26_ATI 0x895B +#define GL_CON_27_ATI 0x895C +#define GL_CON_28_ATI 0x895D +#define GL_CON_29_ATI 0x895E +#define GL_CON_30_ATI 0x895F +#define GL_CON_31_ATI 0x8960 +#define GL_MOV_ATI 0x8961 +#define GL_ADD_ATI 0x8963 +#define GL_MUL_ATI 0x8964 +#define GL_SUB_ATI 0x8965 +#define GL_DOT3_ATI 0x8966 +#define GL_DOT4_ATI 0x8967 +#define GL_MAD_ATI 0x8968 +#define GL_LERP_ATI 0x8969 +#define GL_CND_ATI 0x896A +#define GL_CND0_ATI 0x896B +#define GL_DOT2_ADD_ATI 0x896C +#define GL_SECONDARY_INTERPOLATOR_ATI 0x896D +#define GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E +#define GL_NUM_FRAGMENT_CONSTANTS_ATI 0x896F +#define GL_NUM_PASSES_ATI 0x8970 +#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI 0x8971 +#define GL_NUM_INSTRUCTIONS_TOTAL_ATI 0x8972 +#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973 +#define GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974 +#define GL_COLOR_ALPHA_PAIRING_ATI 0x8975 +#define GL_SWIZZLE_STR_ATI 0x8976 +#define GL_SWIZZLE_STQ_ATI 0x8977 +#define GL_SWIZZLE_STR_DR_ATI 0x8978 +#define GL_SWIZZLE_STQ_DQ_ATI 0x8979 +#define GL_SWIZZLE_STRQ_ATI 0x897A +#define GL_SWIZZLE_STRQ_DQ_ATI 0x897B +#define GL_RED_BIT_ATI 0x00000001 +#define GL_GREEN_BIT_ATI 0x00000002 +#define GL_BLUE_BIT_ATI 0x00000004 +#define GL_2X_BIT_ATI 0x00000001 +#define GL_4X_BIT_ATI 0x00000002 +#define GL_8X_BIT_ATI 0x00000004 +#define GL_HALF_BIT_ATI 0x00000008 +#define GL_QUARTER_BIT_ATI 0x00000010 +#define GL_EIGHTH_BIT_ATI 0x00000020 +#define GL_SATURATE_BIT_ATI 0x00000040 +#define GL_COMP_BIT_ATI 0x00000002 +#define GL_NEGATE_BIT_ATI 0x00000004 +#define GL_BIAS_BIT_ATI 0x00000008 +#endif + +#ifndef GL_ATI_pn_triangles +#define GL_PN_TRIANGLES_ATI 0x87F0 +#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1 +#define GL_PN_TRIANGLES_POINT_MODE_ATI 0x87F2 +#define GL_PN_TRIANGLES_NORMAL_MODE_ATI 0x87F3 +#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4 +#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5 +#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6 +#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7 +#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8 +#endif + +#ifndef GL_ATI_vertex_array_object +#define GL_STATIC_ATI 0x8760 +#define GL_DYNAMIC_ATI 0x8761 +#define GL_PRESERVE_ATI 0x8762 +#define GL_DISCARD_ATI 0x8763 +#define GL_OBJECT_BUFFER_SIZE_ATI 0x8764 +#define GL_OBJECT_BUFFER_USAGE_ATI 0x8765 +#define GL_ARRAY_OBJECT_BUFFER_ATI 0x8766 +#define GL_ARRAY_OBJECT_OFFSET_ATI 0x8767 +#endif + +#ifndef GL_EXT_vertex_shader +#define GL_VERTEX_SHADER_EXT 0x8780 +#define GL_VERTEX_SHADER_BINDING_EXT 0x8781 +#define GL_OP_INDEX_EXT 0x8782 +#define GL_OP_NEGATE_EXT 0x8783 +#define GL_OP_DOT3_EXT 0x8784 +#define GL_OP_DOT4_EXT 0x8785 +#define GL_OP_MUL_EXT 0x8786 +#define GL_OP_ADD_EXT 0x8787 +#define GL_OP_MADD_EXT 0x8788 +#define GL_OP_FRAC_EXT 0x8789 +#define GL_OP_MAX_EXT 0x878A +#define GL_OP_MIN_EXT 0x878B +#define GL_OP_SET_GE_EXT 0x878C +#define GL_OP_SET_LT_EXT 0x878D +#define GL_OP_CLAMP_EXT 0x878E +#define GL_OP_FLOOR_EXT 0x878F +#define GL_OP_ROUND_EXT 0x8790 +#define GL_OP_EXP_BASE_2_EXT 0x8791 +#define GL_OP_LOG_BASE_2_EXT 0x8792 +#define GL_OP_POWER_EXT 0x8793 +#define GL_OP_RECIP_EXT 0x8794 +#define GL_OP_RECIP_SQRT_EXT 0x8795 +#define GL_OP_SUB_EXT 0x8796 +#define GL_OP_CROSS_PRODUCT_EXT 0x8797 +#define GL_OP_MULTIPLY_MATRIX_EXT 0x8798 +#define GL_OP_MOV_EXT 0x8799 +#define GL_OUTPUT_VERTEX_EXT 0x879A +#define GL_OUTPUT_COLOR0_EXT 0x879B +#define GL_OUTPUT_COLOR1_EXT 0x879C +#define GL_OUTPUT_TEXTURE_COORD0_EXT 0x879D +#define GL_OUTPUT_TEXTURE_COORD1_EXT 0x879E +#define GL_OUTPUT_TEXTURE_COORD2_EXT 0x879F +#define GL_OUTPUT_TEXTURE_COORD3_EXT 0x87A0 +#define GL_OUTPUT_TEXTURE_COORD4_EXT 0x87A1 +#define GL_OUTPUT_TEXTURE_COORD5_EXT 0x87A2 +#define GL_OUTPUT_TEXTURE_COORD6_EXT 0x87A3 +#define GL_OUTPUT_TEXTURE_COORD7_EXT 0x87A4 +#define GL_OUTPUT_TEXTURE_COORD8_EXT 0x87A5 +#define GL_OUTPUT_TEXTURE_COORD9_EXT 0x87A6 +#define GL_OUTPUT_TEXTURE_COORD10_EXT 0x87A7 +#define GL_OUTPUT_TEXTURE_COORD11_EXT 0x87A8 +#define GL_OUTPUT_TEXTURE_COORD12_EXT 0x87A9 +#define GL_OUTPUT_TEXTURE_COORD13_EXT 0x87AA +#define GL_OUTPUT_TEXTURE_COORD14_EXT 0x87AB +#define GL_OUTPUT_TEXTURE_COORD15_EXT 0x87AC +#define GL_OUTPUT_TEXTURE_COORD16_EXT 0x87AD +#define GL_OUTPUT_TEXTURE_COORD17_EXT 0x87AE +#define GL_OUTPUT_TEXTURE_COORD18_EXT 0x87AF +#define GL_OUTPUT_TEXTURE_COORD19_EXT 0x87B0 +#define GL_OUTPUT_TEXTURE_COORD20_EXT 0x87B1 +#define GL_OUTPUT_TEXTURE_COORD21_EXT 0x87B2 +#define GL_OUTPUT_TEXTURE_COORD22_EXT 0x87B3 +#define GL_OUTPUT_TEXTURE_COORD23_EXT 0x87B4 +#define GL_OUTPUT_TEXTURE_COORD24_EXT 0x87B5 +#define GL_OUTPUT_TEXTURE_COORD25_EXT 0x87B6 +#define GL_OUTPUT_TEXTURE_COORD26_EXT 0x87B7 +#define GL_OUTPUT_TEXTURE_COORD27_EXT 0x87B8 +#define GL_OUTPUT_TEXTURE_COORD28_EXT 0x87B9 +#define GL_OUTPUT_TEXTURE_COORD29_EXT 0x87BA +#define GL_OUTPUT_TEXTURE_COORD30_EXT 0x87BB +#define GL_OUTPUT_TEXTURE_COORD31_EXT 0x87BC +#define GL_OUTPUT_FOG_EXT 0x87BD +#define GL_SCALAR_EXT 0x87BE +#define GL_VECTOR_EXT 0x87BF +#define GL_MATRIX_EXT 0x87C0 +#define GL_VARIANT_EXT 0x87C1 +#define GL_INVARIANT_EXT 0x87C2 +#define GL_LOCAL_CONSTANT_EXT 0x87C3 +#define GL_LOCAL_EXT 0x87C4 +#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5 +#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6 +#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7 +#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8 +#define GL_MAX_VERTEX_SHADER_LOCALS_EXT 0x87C9 +#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA +#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB +#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC +#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD +#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE +#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF +#define GL_VERTEX_SHADER_VARIANTS_EXT 0x87D0 +#define GL_VERTEX_SHADER_INVARIANTS_EXT 0x87D1 +#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2 +#define GL_VERTEX_SHADER_LOCALS_EXT 0x87D3 +#define GL_VERTEX_SHADER_OPTIMIZED_EXT 0x87D4 +#define GL_X_EXT 0x87D5 +#define GL_Y_EXT 0x87D6 +#define GL_Z_EXT 0x87D7 +#define GL_W_EXT 0x87D8 +#define GL_NEGATIVE_X_EXT 0x87D9 +#define GL_NEGATIVE_Y_EXT 0x87DA +#define GL_NEGATIVE_Z_EXT 0x87DB +#define GL_NEGATIVE_W_EXT 0x87DC +#define GL_ZERO_EXT 0x87DD +#define GL_ONE_EXT 0x87DE +#define GL_NEGATIVE_ONE_EXT 0x87DF +#define GL_NORMALIZED_RANGE_EXT 0x87E0 +#define GL_FULL_RANGE_EXT 0x87E1 +#define GL_CURRENT_VERTEX_EXT 0x87E2 +#define GL_MVP_MATRIX_EXT 0x87E3 +#define GL_VARIANT_VALUE_EXT 0x87E4 +#define GL_VARIANT_DATATYPE_EXT 0x87E5 +#define GL_VARIANT_ARRAY_STRIDE_EXT 0x87E6 +#define GL_VARIANT_ARRAY_TYPE_EXT 0x87E7 +#define GL_VARIANT_ARRAY_EXT 0x87E8 +#define GL_VARIANT_ARRAY_POINTER_EXT 0x87E9 +#define GL_INVARIANT_VALUE_EXT 0x87EA +#define GL_INVARIANT_DATATYPE_EXT 0x87EB +#define GL_LOCAL_CONSTANT_VALUE_EXT 0x87EC +#define GL_LOCAL_CONSTANT_DATATYPE_EXT 0x87ED +#endif + +#ifndef GL_ATI_vertex_streams +#define GL_MAX_VERTEX_STREAMS_ATI 0x876B +#define GL_VERTEX_STREAM0_ATI 0x876C +#define GL_VERTEX_STREAM1_ATI 0x876D +#define GL_VERTEX_STREAM2_ATI 0x876E +#define GL_VERTEX_STREAM3_ATI 0x876F +#define GL_VERTEX_STREAM4_ATI 0x8770 +#define GL_VERTEX_STREAM5_ATI 0x8771 +#define GL_VERTEX_STREAM6_ATI 0x8772 +#define GL_VERTEX_STREAM7_ATI 0x8773 +#define GL_VERTEX_SOURCE_ATI 0x8774 +#endif + +#ifndef GL_ATI_element_array +#define GL_ELEMENT_ARRAY_ATI 0x8768 +#define GL_ELEMENT_ARRAY_TYPE_ATI 0x8769 +#define GL_ELEMENT_ARRAY_POINTER_ATI 0x876A +#endif + +#ifndef GL_SUN_mesh_array +#define GL_QUAD_MESH_SUN 0x8614 +#define GL_TRIANGLE_MESH_SUN 0x8615 +#endif + +#ifndef GL_SUN_slice_accum +#define GL_SLICE_ACCUM_SUN 0x85CC +#endif + +#ifndef GL_NV_multisample_filter_hint +#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534 +#endif + +#ifndef GL_NV_depth_clamp +#define GL_DEPTH_CLAMP_NV 0x864F +#endif + +#ifndef GL_NV_occlusion_query +#define GL_PIXEL_COUNTER_BITS_NV 0x8864 +#define GL_CURRENT_OCCLUSION_QUERY_ID_NV 0x8865 +#define GL_PIXEL_COUNT_NV 0x8866 +#define GL_PIXEL_COUNT_AVAILABLE_NV 0x8867 +#endif + +#ifndef GL_NV_point_sprite +#define GL_POINT_SPRITE_NV 0x8861 +#define GL_COORD_REPLACE_NV 0x8862 +#define GL_POINT_SPRITE_R_MODE_NV 0x8863 +#endif + +#ifndef GL_NV_texture_shader3 +#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850 +#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851 +#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852 +#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853 +#define GL_OFFSET_HILO_TEXTURE_2D_NV 0x8854 +#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855 +#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856 +#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857 +#define GL_DEPENDENT_HILO_TEXTURE_2D_NV 0x8858 +#define GL_DEPENDENT_RGB_TEXTURE_3D_NV 0x8859 +#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A +#define GL_DOT_PRODUCT_PASS_THROUGH_NV 0x885B +#define GL_DOT_PRODUCT_TEXTURE_1D_NV 0x885C +#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D +#define GL_HILO8_NV 0x885E +#define GL_SIGNED_HILO8_NV 0x885F +#define GL_FORCE_BLUE_TO_ONE_NV 0x8860 +#endif + +#ifndef GL_NV_vertex_program1_1 +#endif + +#ifndef GL_EXT_shadow_funcs +#endif + +#ifndef GL_EXT_stencil_two_side +#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910 +#define GL_ACTIVE_STENCIL_FACE_EXT 0x8911 +#endif + +#ifndef GL_ATI_text_fragment_shader +#define GL_TEXT_FRAGMENT_SHADER_ATI 0x8200 +#endif + +#ifndef GL_APPLE_client_storage +#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2 +#endif + +#ifndef GL_APPLE_element_array +#define GL_ELEMENT_ARRAY_APPLE 0x8768 +#define GL_ELEMENT_ARRAY_TYPE_APPLE 0x8769 +#define GL_ELEMENT_ARRAY_POINTER_APPLE 0x876A +#endif + +#ifndef GL_APPLE_fence +#define GL_DRAW_PIXELS_APPLE 0x8A0A +#define GL_FENCE_APPLE 0x8A0B +#endif + +#ifndef GL_APPLE_vertex_array_object +#define GL_VERTEX_ARRAY_BINDING_APPLE 0x85B5 +#endif + +#ifndef GL_APPLE_vertex_array_range +#define GL_VERTEX_ARRAY_RANGE_APPLE 0x851D +#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E +#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F +#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521 +#define GL_STORAGE_CACHED_APPLE 0x85BE +#define GL_STORAGE_SHARED_APPLE 0x85BF +#endif + +#ifndef GL_APPLE_ycbcr_422 +#define GL_YCBCR_422_APPLE 0x85B9 +#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA +#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB +#endif + +#ifndef GL_S3_s3tc +#define GL_RGB_S3TC 0x83A0 +#define GL_RGB4_S3TC 0x83A1 +#define GL_RGBA_S3TC 0x83A2 +#define GL_RGBA4_S3TC 0x83A3 +#endif + +#ifndef GL_ATI_draw_buffers +#define GL_MAX_DRAW_BUFFERS_ATI 0x8824 +#define GL_DRAW_BUFFER0_ATI 0x8825 +#define GL_DRAW_BUFFER1_ATI 0x8826 +#define GL_DRAW_BUFFER2_ATI 0x8827 +#define GL_DRAW_BUFFER3_ATI 0x8828 +#define GL_DRAW_BUFFER4_ATI 0x8829 +#define GL_DRAW_BUFFER5_ATI 0x882A +#define GL_DRAW_BUFFER6_ATI 0x882B +#define GL_DRAW_BUFFER7_ATI 0x882C +#define GL_DRAW_BUFFER8_ATI 0x882D +#define GL_DRAW_BUFFER9_ATI 0x882E +#define GL_DRAW_BUFFER10_ATI 0x882F +#define GL_DRAW_BUFFER11_ATI 0x8830 +#define GL_DRAW_BUFFER12_ATI 0x8831 +#define GL_DRAW_BUFFER13_ATI 0x8832 +#define GL_DRAW_BUFFER14_ATI 0x8833 +#define GL_DRAW_BUFFER15_ATI 0x8834 +#endif + +#ifndef GL_ATI_pixel_format_float +#define GL_TYPE_RGBA_FLOAT_ATI 0x8820 +#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835 +#endif + +#ifndef GL_ATI_texture_env_combine3 +#define GL_MODULATE_ADD_ATI 0x8744 +#define GL_MODULATE_SIGNED_ADD_ATI 0x8745 +#define GL_MODULATE_SUBTRACT_ATI 0x8746 +#endif + +#ifndef GL_ATI_texture_float +#define GL_RGBA_FLOAT32_ATI 0x8814 +#define GL_RGB_FLOAT32_ATI 0x8815 +#define GL_ALPHA_FLOAT32_ATI 0x8816 +#define GL_INTENSITY_FLOAT32_ATI 0x8817 +#define GL_LUMINANCE_FLOAT32_ATI 0x8818 +#define GL_LUMINANCE_ALPHA_FLOAT32_ATI 0x8819 +#define GL_RGBA_FLOAT16_ATI 0x881A +#define GL_RGB_FLOAT16_ATI 0x881B +#define GL_ALPHA_FLOAT16_ATI 0x881C +#define GL_INTENSITY_FLOAT16_ATI 0x881D +#define GL_LUMINANCE_FLOAT16_ATI 0x881E +#define GL_LUMINANCE_ALPHA_FLOAT16_ATI 0x881F +#endif + +#ifndef GL_NV_float_buffer +#define GL_FLOAT_R_NV 0x8880 +#define GL_FLOAT_RG_NV 0x8881 +#define GL_FLOAT_RGB_NV 0x8882 +#define GL_FLOAT_RGBA_NV 0x8883 +#define GL_FLOAT_R16_NV 0x8884 +#define GL_FLOAT_R32_NV 0x8885 +#define GL_FLOAT_RG16_NV 0x8886 +#define GL_FLOAT_RG32_NV 0x8887 +#define GL_FLOAT_RGB16_NV 0x8888 +#define GL_FLOAT_RGB32_NV 0x8889 +#define GL_FLOAT_RGBA16_NV 0x888A +#define GL_FLOAT_RGBA32_NV 0x888B +#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C +#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D +#define GL_FLOAT_RGBA_MODE_NV 0x888E +#endif + +#ifndef GL_NV_fragment_program +#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868 +#define GL_FRAGMENT_PROGRAM_NV 0x8870 +#define GL_MAX_TEXTURE_COORDS_NV 0x8871 +#define GL_MAX_TEXTURE_IMAGE_UNITS_NV 0x8872 +#define GL_FRAGMENT_PROGRAM_BINDING_NV 0x8873 +#define GL_PROGRAM_ERROR_STRING_NV 0x8874 +#endif + +#ifndef GL_NV_half_float +#define GL_HALF_FLOAT_NV 0x140B +#endif + +#ifndef GL_NV_pixel_data_range +#define GL_WRITE_PIXEL_DATA_RANGE_NV 0x8878 +#define GL_READ_PIXEL_DATA_RANGE_NV 0x8879 +#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A +#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B +#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C +#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D +#endif + +#ifndef GL_NV_primitive_restart +#define GL_PRIMITIVE_RESTART_NV 0x8558 +#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559 +#endif + +#ifndef GL_NV_texture_expand_normal +#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F +#endif + +#ifndef GL_NV_vertex_program2 +#endif + +#ifndef GL_ATI_map_object_buffer +#endif + +#ifndef GL_ATI_separate_stencil +#define GL_STENCIL_BACK_FUNC_ATI 0x8800 +#define GL_STENCIL_BACK_FAIL_ATI 0x8801 +#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802 +#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803 +#endif + +#ifndef GL_ATI_vertex_attrib_array_object +#endif + +#ifndef GL_OES_read_format +#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A +#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B +#endif + +#ifndef GL_EXT_depth_bounds_test +#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 +#define GL_DEPTH_BOUNDS_EXT 0x8891 +#endif + +#ifndef GL_EXT_texture_mirror_clamp +#define GL_MIRROR_CLAMP_EXT 0x8742 +#define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743 +#define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912 +#endif + +#ifndef GL_EXT_blend_equation_separate +#define GL_BLEND_EQUATION_RGB_EXT GL_BLEND_EQUATION +#define GL_BLEND_EQUATION_ALPHA_EXT 0x883D +#endif + +#ifndef GL_MESA_pack_invert +#define GL_PACK_INVERT_MESA 0x8758 +#endif + +#ifndef GL_MESA_ycbcr_texture +#define GL_UNSIGNED_SHORT_8_8_MESA 0x85BA +#define GL_UNSIGNED_SHORT_8_8_REV_MESA 0x85BB +#define GL_YCBCR_MESA 0x8757 +#endif + +#ifndef GL_EXT_pixel_buffer_object +#define GL_PIXEL_PACK_BUFFER_EXT 0x88EB +#define GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC +#define GL_PIXEL_PACK_BUFFER_BINDING_EXT 0x88ED +#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF +#endif + +#ifndef GL_NV_fragment_program_option +#endif + +#ifndef GL_NV_fragment_program2 +#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4 +#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 +#define GL_MAX_PROGRAM_IF_DEPTH_NV 0x88F6 +#define GL_MAX_PROGRAM_LOOP_DEPTH_NV 0x88F7 +#define GL_MAX_PROGRAM_LOOP_COUNT_NV 0x88F8 +#endif + +#ifndef GL_NV_vertex_program2_option +/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */ +/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */ +#endif + +#ifndef GL_NV_vertex_program3 +/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */ +#endif + +#ifndef GL_EXT_framebuffer_object +#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506 +#define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8 +#define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6 +#define GL_RENDERBUFFER_BINDING_EXT 0x8CA7 +#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0 +#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4 +#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5 +#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6 +#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7 +#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 +#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA +#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB +#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC +#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD +#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF +#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0 +#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1 +#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2 +#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3 +#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4 +#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5 +#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6 +#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7 +#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8 +#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9 +#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA +#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB +#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC +#define GL_COLOR_ATTACHMENT13_EXT 0x8CED +#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE +#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF +#define GL_DEPTH_ATTACHMENT_EXT 0x8D00 +#define GL_STENCIL_ATTACHMENT_EXT 0x8D20 +#define GL_FRAMEBUFFER_EXT 0x8D40 +#define GL_RENDERBUFFER_EXT 0x8D41 +#define GL_RENDERBUFFER_WIDTH_EXT 0x8D42 +#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43 +#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44 +#define GL_STENCIL_INDEX1_EXT 0x8D46 +#define GL_STENCIL_INDEX4_EXT 0x8D47 +#define GL_STENCIL_INDEX8_EXT 0x8D48 +#define GL_STENCIL_INDEX16_EXT 0x8D49 +#define GL_RENDERBUFFER_RED_SIZE_EXT 0x8D50 +#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51 +#define GL_RENDERBUFFER_BLUE_SIZE_EXT 0x8D52 +#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53 +#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54 +#define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55 +#endif + +#ifndef GL_GREMEDY_string_marker +#endif + +#ifndef GL_EXT_packed_depth_stencil +#define GL_DEPTH_STENCIL_EXT 0x84F9 +#define GL_UNSIGNED_INT_24_8_EXT 0x84FA +#define GL_DEPTH24_STENCIL8_EXT 0x88F0 +#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1 +#endif + +#ifndef GL_EXT_stencil_clear_tag +#define GL_STENCIL_TAG_BITS_EXT 0x88F2 +#define GL_STENCIL_CLEAR_TAG_VALUE_EXT 0x88F3 +#endif + +#ifndef GL_EXT_texture_sRGB +#define GL_SRGB_EXT 0x8C40 +#define GL_SRGB8_EXT 0x8C41 +#define GL_SRGB_ALPHA_EXT 0x8C42 +#define GL_SRGB8_ALPHA8_EXT 0x8C43 +#define GL_SLUMINANCE_ALPHA_EXT 0x8C44 +#define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45 +#define GL_SLUMINANCE_EXT 0x8C46 +#define GL_SLUMINANCE8_EXT 0x8C47 +#define GL_COMPRESSED_SRGB_EXT 0x8C48 +#define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49 +#define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A +#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B +#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F +#endif + +#ifndef GL_EXT_framebuffer_blit +#define GL_READ_FRAMEBUFFER_EXT 0x8CA8 +#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9 +#define GL_READ_FRAMEBUFFER_BINDING_EXT GL_FRAMEBUFFER_BINDING_EXT +#define GL_DRAW_FRAMEBUFFER_BINDING_EXT 0x8CAA +#endif + +#ifndef GL_EXT_framebuffer_multisample +#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 +#define GL_MAX_SAMPLES_EXT 0x8D57 +#endif + +#ifndef GL_MESAX_texture_stack +#define GL_TEXTURE_1D_STACK_MESAX 0x8759 +#define GL_TEXTURE_2D_STACK_MESAX 0x875A +#define GL_PROXY_TEXTURE_1D_STACK_MESAX 0x875B +#define GL_PROXY_TEXTURE_2D_STACK_MESAX 0x875C +#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D +#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E +#endif + +#ifndef GL_EXT_timer_query +#define GL_TIME_ELAPSED_EXT 0x88BF +#endif + +#ifndef GL_EXT_gpu_program_parameters +#endif + +#ifndef GL_APPLE_flush_buffer_range +#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12 +#define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8A13 +#endif + +#ifndef GL_NV_gpu_program4 +#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV 0x8904 +#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV 0x8905 +#define GL_PROGRAM_ATTRIB_COMPONENTS_NV 0x8906 +#define GL_PROGRAM_RESULT_COMPONENTS_NV 0x8907 +#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908 +#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909 +#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5 +#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6 +#endif + +#ifndef GL_NV_geometry_program4 +#define GL_LINES_ADJACENCY_EXT 0x000A +#define GL_LINE_STRIP_ADJACENCY_EXT 0x000B +#define GL_TRIANGLES_ADJACENCY_EXT 0x000C +#define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0x000D +#define GL_GEOMETRY_PROGRAM_NV 0x8C26 +#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27 +#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28 +#define GL_GEOMETRY_VERTICES_OUT_EXT 0x8DDA +#define GL_GEOMETRY_INPUT_TYPE_EXT 0x8DDB +#define GL_GEOMETRY_OUTPUT_TYPE_EXT 0x8DDC +#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29 +#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7 +#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8 +#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9 +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4 +#define GL_PROGRAM_POINT_SIZE_EXT 0x8642 +#endif + +#ifndef GL_EXT_geometry_shader4 +#define GL_GEOMETRY_SHADER_EXT 0x8DD9 +/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */ +/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */ +/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */ +/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */ +#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD +#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE +#define GL_MAX_VARYING_COMPONENTS_EXT 0x8B4B +#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF +#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0 +#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1 +/* reuse GL_LINES_ADJACENCY_EXT */ +/* reuse GL_LINE_STRIP_ADJACENCY_EXT */ +/* reuse GL_TRIANGLES_ADJACENCY_EXT */ +/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */ +/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */ +/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */ +/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */ +/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */ +/* reuse GL_PROGRAM_POINT_SIZE_EXT */ +#endif + +#ifndef GL_NV_vertex_program4 +#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD +#endif + +#ifndef GL_EXT_gpu_shader4 +#define GL_SAMPLER_1D_ARRAY_EXT 0x8DC0 +#define GL_SAMPLER_2D_ARRAY_EXT 0x8DC1 +#define GL_SAMPLER_BUFFER_EXT 0x8DC2 +#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT 0x8DC3 +#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT 0x8DC4 +#define GL_SAMPLER_CUBE_SHADOW_EXT 0x8DC5 +#define GL_UNSIGNED_INT_VEC2_EXT 0x8DC6 +#define GL_UNSIGNED_INT_VEC3_EXT 0x8DC7 +#define GL_UNSIGNED_INT_VEC4_EXT 0x8DC8 +#define GL_INT_SAMPLER_1D_EXT 0x8DC9 +#define GL_INT_SAMPLER_2D_EXT 0x8DCA +#define GL_INT_SAMPLER_3D_EXT 0x8DCB +#define GL_INT_SAMPLER_CUBE_EXT 0x8DCC +#define GL_INT_SAMPLER_2D_RECT_EXT 0x8DCD +#define GL_INT_SAMPLER_1D_ARRAY_EXT 0x8DCE +#define GL_INT_SAMPLER_2D_ARRAY_EXT 0x8DCF +#define GL_INT_SAMPLER_BUFFER_EXT 0x8DD0 +#define GL_UNSIGNED_INT_SAMPLER_1D_EXT 0x8DD1 +#define GL_UNSIGNED_INT_SAMPLER_2D_EXT 0x8DD2 +#define GL_UNSIGNED_INT_SAMPLER_3D_EXT 0x8DD3 +#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT 0x8DD4 +#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5 +#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6 +#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7 +#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8 +#endif + +#ifndef GL_EXT_draw_instanced +#endif + +#ifndef GL_EXT_packed_float +#define GL_R11F_G11F_B10F_EXT 0x8C3A +#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B +#define GL_RGBA_SIGNED_COMPONENTS_EXT 0x8C3C +#endif + +#ifndef GL_EXT_texture_array +#define GL_TEXTURE_1D_ARRAY_EXT 0x8C18 +#define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19 +#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A +#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B +#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C +#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D +#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF +#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E +/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */ +#endif + +#ifndef GL_EXT_texture_buffer_object +#define GL_TEXTURE_BUFFER_EXT 0x8C2A +#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT 0x8C2B +#define GL_TEXTURE_BINDING_BUFFER_EXT 0x8C2C +#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D +#define GL_TEXTURE_BUFFER_FORMAT_EXT 0x8C2E +#endif + +#ifndef GL_EXT_texture_compression_latc +#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70 +#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71 +#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72 +#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73 +#endif + +#ifndef GL_EXT_texture_compression_rgtc +#define GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB +#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC +#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD +#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE +#endif + +#ifndef GL_EXT_texture_shared_exponent +#define GL_RGB9_E5_EXT 0x8C3D +#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT 0x8C3E +#define GL_TEXTURE_SHARED_SIZE_EXT 0x8C3F +#endif + +#ifndef GL_NV_depth_buffer_float +#define GL_DEPTH_COMPONENT32F_NV 0x8DAB +#define GL_DEPTH32F_STENCIL8_NV 0x8DAC +#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD +#define GL_DEPTH_BUFFER_FLOAT_MODE_NV 0x8DAF +#endif + +#ifndef GL_NV_fragment_program4 +#endif + +#ifndef GL_NV_framebuffer_multisample_coverage +#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB +#define GL_RENDERBUFFER_COLOR_SAMPLES_NV 0x8E10 +#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11 +#define GL_MULTISAMPLE_COVERAGE_MODES_NV 0x8E12 +#endif + +#ifndef GL_EXT_framebuffer_sRGB +#define GL_FRAMEBUFFER_SRGB_EXT 0x8DB9 +#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x8DBA +#endif + +#ifndef GL_NV_geometry_shader4 +#endif + +#ifndef GL_NV_parameter_buffer_object +#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0 +#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1 +#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2 +#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3 +#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4 +#endif + +#ifndef GL_EXT_draw_buffers2 +#endif + +#ifndef GL_NV_transform_feedback +#define GL_BACK_PRIMARY_COLOR_NV 0x8C77 +#define GL_BACK_SECONDARY_COLOR_NV 0x8C78 +#define GL_TEXTURE_COORD_NV 0x8C79 +#define GL_CLIP_DISTANCE_NV 0x8C7A +#define GL_VERTEX_ID_NV 0x8C7B +#define GL_PRIMITIVE_ID_NV 0x8C7C +#define GL_GENERIC_ATTRIB_NV 0x8C7D +#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV 0x8C7E +#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F +#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80 +#define GL_ACTIVE_VARYINGS_NV 0x8C81 +#define GL_ACTIVE_VARYING_MAX_LENGTH_NV 0x8C82 +#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83 +#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84 +#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85 +#define GL_TRANSFORM_FEEDBACK_RECORD_NV 0x8C86 +#define GL_PRIMITIVES_GENERATED_NV 0x8C87 +#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88 +#define GL_RASTERIZER_DISCARD_NV 0x8C89 +#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A +#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B +#define GL_INTERLEAVED_ATTRIBS_NV 0x8C8C +#define GL_SEPARATE_ATTRIBS_NV 0x8C8D +#define GL_TRANSFORM_FEEDBACK_BUFFER_NV 0x8C8E +#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F +#endif + +#ifndef GL_EXT_bindable_uniform +#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2 +#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3 +#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4 +#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT 0x8DED +#define GL_UNIFORM_BUFFER_EXT 0x8DEE +#define GL_UNIFORM_BUFFER_BINDING_EXT 0x8DEF +#endif + +#ifndef GL_EXT_texture_integer +#define GL_RGBA32UI_EXT 0x8D70 +#define GL_RGB32UI_EXT 0x8D71 +#define GL_ALPHA32UI_EXT 0x8D72 +#define GL_INTENSITY32UI_EXT 0x8D73 +#define GL_LUMINANCE32UI_EXT 0x8D74 +#define GL_LUMINANCE_ALPHA32UI_EXT 0x8D75 +#define GL_RGBA16UI_EXT 0x8D76 +#define GL_RGB16UI_EXT 0x8D77 +#define GL_ALPHA16UI_EXT 0x8D78 +#define GL_INTENSITY16UI_EXT 0x8D79 +#define GL_LUMINANCE16UI_EXT 0x8D7A +#define GL_LUMINANCE_ALPHA16UI_EXT 0x8D7B +#define GL_RGBA8UI_EXT 0x8D7C +#define GL_RGB8UI_EXT 0x8D7D +#define GL_ALPHA8UI_EXT 0x8D7E +#define GL_INTENSITY8UI_EXT 0x8D7F +#define GL_LUMINANCE8UI_EXT 0x8D80 +#define GL_LUMINANCE_ALPHA8UI_EXT 0x8D81 +#define GL_RGBA32I_EXT 0x8D82 +#define GL_RGB32I_EXT 0x8D83 +#define GL_ALPHA32I_EXT 0x8D84 +#define GL_INTENSITY32I_EXT 0x8D85 +#define GL_LUMINANCE32I_EXT 0x8D86 +#define GL_LUMINANCE_ALPHA32I_EXT 0x8D87 +#define GL_RGBA16I_EXT 0x8D88 +#define GL_RGB16I_EXT 0x8D89 +#define GL_ALPHA16I_EXT 0x8D8A +#define GL_INTENSITY16I_EXT 0x8D8B +#define GL_LUMINANCE16I_EXT 0x8D8C +#define GL_LUMINANCE_ALPHA16I_EXT 0x8D8D +#define GL_RGBA8I_EXT 0x8D8E +#define GL_RGB8I_EXT 0x8D8F +#define GL_ALPHA8I_EXT 0x8D90 +#define GL_INTENSITY8I_EXT 0x8D91 +#define GL_LUMINANCE8I_EXT 0x8D92 +#define GL_LUMINANCE_ALPHA8I_EXT 0x8D93 +#define GL_RED_INTEGER_EXT 0x8D94 +#define GL_GREEN_INTEGER_EXT 0x8D95 +#define GL_BLUE_INTEGER_EXT 0x8D96 +#define GL_ALPHA_INTEGER_EXT 0x8D97 +#define GL_RGB_INTEGER_EXT 0x8D98 +#define GL_RGBA_INTEGER_EXT 0x8D99 +#define GL_BGR_INTEGER_EXT 0x8D9A +#define GL_BGRA_INTEGER_EXT 0x8D9B +#define GL_LUMINANCE_INTEGER_EXT 0x8D9C +#define GL_LUMINANCE_ALPHA_INTEGER_EXT 0x8D9D +#define GL_RGBA_INTEGER_MODE_EXT 0x8D9E +#endif + + +/*************************************************************/ + +#include +#ifndef GL_VERSION_2_0 +/* GL type for program/shader text */ +typedef char GLchar; /* native character */ +#endif + +#ifndef GL_VERSION_1_5 +/* GL types for handling large vertex buffer objects */ +typedef ptrdiff_t GLintptr; +typedef ptrdiff_t GLsizeiptr; +#endif + +#ifndef GL_ARB_vertex_buffer_object +/* GL types for handling large vertex buffer objects */ +typedef ptrdiff_t GLintptrARB; +typedef ptrdiff_t GLsizeiptrARB; +#endif + +#ifndef GL_ARB_shader_objects +/* GL types for handling shader object handles and program/shader text */ +typedef char GLcharARB; /* native character */ +typedef unsigned int GLhandleARB; /* shader object handle */ +#endif + +/* GL types for "half" precision (s10e5) float data in host memory */ +#ifndef GL_ARB_half_float_pixel +typedef unsigned short GLhalfARB; +#endif + +#ifndef GL_NV_half_float +typedef unsigned short GLhalfNV; +#endif + +#ifndef GLEXT_64_TYPES_DEFINED +/* This code block is duplicated in glext.h, so must be protected */ +#define GLEXT_64_TYPES_DEFINED +/* Define int32_t, int64_t, and uint64_t types for UST/MSC */ +/* (as used in the GL_EXT_timer_query extension). */ +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#include +#elif defined(__sun__) +#include +#if defined(__STDC__) +#if defined(__arch64__) +typedef long int int64_t; +typedef unsigned long int uint64_t; +#else +typedef long long int int64_t; +typedef unsigned long long int uint64_t; +#endif /* __arch64__ */ +#endif /* __STDC__ */ +#elif defined( __VMS ) +#include +#elif defined(__SCO__) || defined(__USLC__) +#include +#elif defined(__UNIXOS2__) || defined(__SOL64__) +typedef long int int32_t; +typedef long long int int64_t; +typedef unsigned long long int uint64_t; +#elif defined(_WIN32) && defined(__GNUC__) +#include +#elif defined(_WIN32) +typedef __int32 int32_t; +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; +#else +#include /* Fallback option */ +#endif +#endif + +#ifndef GL_EXT_timer_query +typedef int64_t GLint64EXT; +typedef uint64_t GLuint64EXT; +#endif + +#ifndef GL_VERSION_1_2 +#define GL_VERSION_1_2 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf); +GLAPI void APIENTRY glBlendEquation (GLenum); +GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *); +GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); +GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *); +GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *); +GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei); +GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *); +GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); +GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei); +GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); +GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); +GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat); +GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *); +GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint); +GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *); +GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei); +GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei); +GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *); +GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *); +GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *); +GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *); +GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *); +GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean); +GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean); +GLAPI void APIENTRY glResetHistogram (GLenum); +GLAPI void APIENTRY glResetMinmax (GLenum); +GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); +GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); +GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); +typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); +typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); +typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); +typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); +typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table); +typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); +typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); +typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); +typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params); +typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params); +typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); +typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image); +typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); +typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); +typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); +typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); +typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); +typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink); +typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target); +typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target); +typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); +typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); +typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); +#endif + +#ifndef GL_VERSION_1_3 +#define GL_VERSION_1_3 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glActiveTexture (GLenum); +GLAPI void APIENTRY glClientActiveTexture (GLenum); +GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble); +GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *); +GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat); +GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *); +GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint); +GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *); +GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort); +GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *); +GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble); +GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *); +GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat); +GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *); +GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint); +GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *); +GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort); +GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *); +GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *); +GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *); +GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint); +GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *); +GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort); +GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *); +GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *); +GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *); +GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint); +GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *); +GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort); +GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *); +GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *); +GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *); +GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *); +GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *); +GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean); +GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); +GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); +GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *); +GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); +GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); +GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *); +GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture); +typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v); +typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m); +typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m); +typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m); +typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m); +typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img); +#endif + +#ifndef GL_VERSION_1_4 +#define GL_VERSION_1_4 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum); +GLAPI void APIENTRY glFogCoordf (GLfloat); +GLAPI void APIENTRY glFogCoordfv (const GLfloat *); +GLAPI void APIENTRY glFogCoordd (GLdouble); +GLAPI void APIENTRY glFogCoorddv (const GLdouble *); +GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *); +GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei); +GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei); +GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat); +GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *); +GLAPI void APIENTRY glPointParameteri (GLenum, GLint); +GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *); +GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte); +GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *); +GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *); +GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *); +GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint); +GLAPI void APIENTRY glSecondaryColor3iv (const GLint *); +GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort); +GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *); +GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte); +GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *); +GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint); +GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *); +GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort); +GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *); +GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *); +GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble); +GLAPI void APIENTRY glWindowPos2dv (const GLdouble *); +GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat); +GLAPI void APIENTRY glWindowPos2fv (const GLfloat *); +GLAPI void APIENTRY glWindowPos2i (GLint, GLint); +GLAPI void APIENTRY glWindowPos2iv (const GLint *); +GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort); +GLAPI void APIENTRY glWindowPos2sv (const GLshort *); +GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glWindowPos3dv (const GLdouble *); +GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glWindowPos3fv (const GLfloat *); +GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint); +GLAPI void APIENTRY glWindowPos3iv (const GLint *); +GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort); +GLAPI void APIENTRY glWindowPos3sv (const GLshort *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); +typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord); +typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord); +typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord); +typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord); +typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); +typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); +typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); +typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y); +typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v); +typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y); +typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v); +typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y); +typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v); +typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y); +typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v); +typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z); +typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v); +typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v); +typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z); +typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v); +typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z); +typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v); +#endif + +#ifndef GL_VERSION_1_5 +#define GL_VERSION_1_5 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *); +GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *); +GLAPI GLboolean APIENTRY glIsQuery (GLuint); +GLAPI void APIENTRY glBeginQuery (GLenum, GLuint); +GLAPI void APIENTRY glEndQuery (GLenum); +GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *); +GLAPI void APIENTRY glBindBuffer (GLenum, GLuint); +GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *); +GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *); +GLAPI GLboolean APIENTRY glIsBuffer (GLuint); +GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum); +GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *); +GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *); +GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum); +GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum); +GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids); +typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids); +typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id); +typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id); +typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target); +typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params); +typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); +typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers); +typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); +typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer); +typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage); +typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data); +typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data); +typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); +typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target); +typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params); +#endif + +#ifndef GL_VERSION_2_0 +#define GL_VERSION_2_0 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum); +GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *); +GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum); +GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint); +GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint); +GLAPI void APIENTRY glAttachShader (GLuint, GLuint); +GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *); +GLAPI void APIENTRY glCompileShader (GLuint); +GLAPI GLuint APIENTRY glCreateProgram (void); +GLAPI GLuint APIENTRY glCreateShader (GLenum); +GLAPI void APIENTRY glDeleteProgram (GLuint); +GLAPI void APIENTRY glDeleteShader (GLuint); +GLAPI void APIENTRY glDetachShader (GLuint, GLuint); +GLAPI void APIENTRY glDisableVertexAttribArray (GLuint); +GLAPI void APIENTRY glEnableVertexAttribArray (GLuint); +GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *); +GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *); +GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *); +GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *); +GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *); +GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *); +GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *); +GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *); +GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *); +GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *); +GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *); +GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *); +GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *); +GLAPI GLboolean APIENTRY glIsProgram (GLuint); +GLAPI GLboolean APIENTRY glIsShader (GLuint); +GLAPI void APIENTRY glLinkProgram (GLuint); +GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *); +GLAPI void APIENTRY glUseProgram (GLuint); +GLAPI void APIENTRY glUniform1f (GLint, GLfloat); +GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat); +GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glUniform1i (GLint, GLint); +GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint); +GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint); +GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint); +GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *); +GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *); +GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *); +GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *); +GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *); +GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *); +GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *); +GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *); +GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *); +GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *); +GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *); +GLAPI void APIENTRY glValidateProgram (GLuint); +GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble); +GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *); +GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat); +GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *); +GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort); +GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble); +GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *); +GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat); +GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *); +GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort); +GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *); +GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *); +GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort); +GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *); +GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *); +GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte); +GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *); +GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *); +GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *); +GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *); +GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *); +GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *); +GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *); +GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort); +GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *); +GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *); +GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *); +GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha); +typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs); +typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); +typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); +typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask); +typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); +typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name); +typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader); +typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void); +typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type); +typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program); +typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader); +typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader); +typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index); +typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); +typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); +typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); +typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj); +typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name); +typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); +typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); +typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); +typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name); +typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params); +typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); +typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program); +typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader); +typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program); +typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length); +typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program); +typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0); +typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1); +typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); +typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); +typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0); +typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1); +typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2); +typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); +typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value); +typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value); +typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value); +typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value); +typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); +#endif + +#ifndef GL_VERSION_2_1 +#define GL_VERSION_2_1 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glUniformMatrix2x3fv (GLint, GLsizei, GLboolean, const GLfloat *); +GLAPI void APIENTRY glUniformMatrix3x2fv (GLint, GLsizei, GLboolean, const GLfloat *); +GLAPI void APIENTRY glUniformMatrix2x4fv (GLint, GLsizei, GLboolean, const GLfloat *); +GLAPI void APIENTRY glUniformMatrix4x2fv (GLint, GLsizei, GLboolean, const GLfloat *); +GLAPI void APIENTRY glUniformMatrix3x4fv (GLint, GLsizei, GLboolean, const GLfloat *); +GLAPI void APIENTRY glUniformMatrix4x3fv (GLint, GLsizei, GLboolean, const GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +#endif + +#ifndef GL_ARB_multitexture +#define GL_ARB_multitexture 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glActiveTextureARB (GLenum); +GLAPI void APIENTRY glClientActiveTextureARB (GLenum); +GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble); +GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *); +GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat); +GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *); +GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint); +GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *); +GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort); +GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *); +GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble); +GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *); +GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat); +GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *); +GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint); +GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *); +GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort); +GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *); +GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *); +GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *); +GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint); +GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *); +GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort); +GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *); +GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *); +GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *); +GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint); +GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *); +GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort); +GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture); +typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v); +#endif + +#ifndef GL_ARB_transpose_matrix +#define GL_ARB_transpose_matrix 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *); +GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *); +GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *); +GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m); +typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m); +typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m); +typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m); +#endif + +#ifndef GL_ARB_multisample +#define GL_ARB_multisample 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert); +#endif + +#ifndef GL_ARB_texture_env_add +#define GL_ARB_texture_env_add 1 +#endif + +#ifndef GL_ARB_texture_cube_map +#define GL_ARB_texture_cube_map 1 +#endif + +#ifndef GL_ARB_texture_compression +#define GL_ARB_texture_compression 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); +GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); +GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *); +GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); +GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); +GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *); +GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img); +#endif + +#ifndef GL_ARB_texture_border_clamp +#define GL_ARB_texture_border_clamp 1 +#endif + +#ifndef GL_ARB_point_parameters +#define GL_ARB_point_parameters 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat); +GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params); +#endif + +#ifndef GL_ARB_vertex_blend +#define GL_ARB_vertex_blend 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *); +GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *); +GLAPI void APIENTRY glWeightivARB (GLint, const GLint *); +GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *); +GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *); +GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *); +GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *); +GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *); +GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *); +GLAPI void APIENTRY glVertexBlendARB (GLint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights); +typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights); +typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights); +typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights); +typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights); +typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights); +typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights); +typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights); +typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); +typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count); +#endif + +#ifndef GL_ARB_matrix_palette +#define GL_ARB_matrix_palette 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint); +GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *); +GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *); +GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *); +GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index); +typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices); +typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices); +typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices); +typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); +#endif + +#ifndef GL_ARB_texture_env_combine +#define GL_ARB_texture_env_combine 1 +#endif + +#ifndef GL_ARB_texture_env_crossbar +#define GL_ARB_texture_env_crossbar 1 +#endif + +#ifndef GL_ARB_texture_env_dot3 +#define GL_ARB_texture_env_dot3 1 +#endif + +#ifndef GL_ARB_texture_mirrored_repeat +#define GL_ARB_texture_mirrored_repeat 1 +#endif + +#ifndef GL_ARB_depth_texture +#define GL_ARB_depth_texture 1 +#endif + +#ifndef GL_ARB_shadow +#define GL_ARB_shadow 1 +#endif + +#ifndef GL_ARB_shadow_ambient +#define GL_ARB_shadow_ambient 1 +#endif + +#ifndef GL_ARB_window_pos +#define GL_ARB_window_pos 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble); +GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *); +GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat); +GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *); +GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint); +GLAPI void APIENTRY glWindowPos2ivARB (const GLint *); +GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort); +GLAPI void APIENTRY glWindowPos2svARB (const GLshort *); +GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *); +GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *); +GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint); +GLAPI void APIENTRY glWindowPos3ivARB (const GLint *); +GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort); +GLAPI void APIENTRY glWindowPos3svARB (const GLshort *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y); +typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v); +typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y); +typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v); +typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y); +typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v); +typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y); +typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v); +typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z); +typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v); +typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v); +typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z); +typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v); +typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z); +typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v); +#endif + +#ifndef GL_ARB_vertex_program +#define GL_ARB_vertex_program 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble); +GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *); +GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat); +GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *); +GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort); +GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble); +GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *); +GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat); +GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *); +GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort); +GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *); +GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *); +GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort); +GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *); +GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *); +GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte); +GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *); +GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *); +GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *); +GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *); +GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *); +GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *); +GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *); +GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort); +GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *); +GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *); +GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *); +GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *); +GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint); +GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint); +GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *); +GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint); +GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *); +GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *); +GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *); +GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *); +GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *); +GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *); +GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *); +GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *); +GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *); +GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *); +GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *); +GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *); +GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *); +GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *); +GLAPI GLboolean APIENTRY glIsProgramARB (GLuint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); +typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); +typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); +typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string); +typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program); +typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs); +typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs); +typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params); +typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params); +typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params); +typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params); +typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params); +typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params); +typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params); +typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params); +typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer); +typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program); +#endif + +#ifndef GL_ARB_fragment_program +#define GL_ARB_fragment_program 1 +/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */ +#endif + +#ifndef GL_ARB_vertex_buffer_object +#define GL_ARB_vertex_buffer_object 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint); +GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *); +GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *); +GLAPI GLboolean APIENTRY glIsBufferARB (GLuint); +GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum); +GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *); +GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *); +GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum); +GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum); +GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer); +typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers); +typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers); +typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer); +typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage); +typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data); +typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data); +typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access); +typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target); +typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params); +#endif + +#ifndef GL_ARB_occlusion_query +#define GL_ARB_occlusion_query 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *); +GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *); +GLAPI GLboolean APIENTRY glIsQueryARB (GLuint); +GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint); +GLAPI void APIENTRY glEndQueryARB (GLenum); +GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids); +typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids); +typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id); +typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id); +typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target); +typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params); +#endif + +#ifndef GL_ARB_shader_objects +#define GL_ARB_shader_objects 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB); +GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum); +GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB); +GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum); +GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *); +GLAPI void APIENTRY glCompileShaderARB (GLhandleARB); +GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void); +GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB); +GLAPI void APIENTRY glLinkProgramARB (GLhandleARB); +GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB); +GLAPI void APIENTRY glValidateProgramARB (GLhandleARB); +GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat); +GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat); +GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glUniform1iARB (GLint, GLint); +GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint); +GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint); +GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint); +GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *); +GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *); +GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *); +GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *); +GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *); +GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *); +GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *); +GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *); +GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *); +GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *); +GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *); +GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *); +GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *); +GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *); +GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *); +GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *); +GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *); +GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *); +GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *); +GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj); +typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname); +typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj); +typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType); +typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length); +typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj); +typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void); +typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj); +typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj); +typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj); +typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj); +typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0); +typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1); +typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); +typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); +typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0); +typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1); +typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2); +typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); +typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value); +typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value); +typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value); +typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value); +typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); +typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog); +typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj); +typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name); +typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); +typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params); +typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params); +typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source); +#endif + +#ifndef GL_ARB_vertex_shader +#define GL_ARB_vertex_shader 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *); +GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *); +GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name); +typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); +typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name); +#endif + +#ifndef GL_ARB_fragment_shader +#define GL_ARB_fragment_shader 1 +#endif + +#ifndef GL_ARB_shading_language_100 +#define GL_ARB_shading_language_100 1 +#endif + +#ifndef GL_ARB_texture_non_power_of_two +#define GL_ARB_texture_non_power_of_two 1 +#endif + +#ifndef GL_ARB_point_sprite +#define GL_ARB_point_sprite 1 +#endif + +#ifndef GL_ARB_fragment_program_shadow +#define GL_ARB_fragment_program_shadow 1 +#endif + +#ifndef GL_ARB_draw_buffers +#define GL_ARB_draw_buffers 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDrawBuffersARB (GLsizei, const GLenum *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs); +#endif + +#ifndef GL_ARB_texture_rectangle +#define GL_ARB_texture_rectangle 1 +#endif + +#ifndef GL_ARB_color_buffer_float +#define GL_ARB_color_buffer_float 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glClampColorARB (GLenum, GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp); +#endif + +#ifndef GL_ARB_half_float_pixel +#define GL_ARB_half_float_pixel 1 +#endif + +#ifndef GL_ARB_texture_float +#define GL_ARB_texture_float 1 +#endif + +#ifndef GL_ARB_pixel_buffer_object +#define GL_ARB_pixel_buffer_object 1 +#endif + +#ifndef GL_EXT_abgr +#define GL_EXT_abgr 1 +#endif + +#ifndef GL_EXT_blend_color +#define GL_EXT_blend_color 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); +#endif + +#ifndef GL_EXT_polygon_offset +#define GL_EXT_polygon_offset 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias); +#endif + +#ifndef GL_EXT_texture +#define GL_EXT_texture 1 +#endif + +#ifndef GL_EXT_texture3D +#define GL_EXT_texture3D 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); +GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); +typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); +#endif + +#ifndef GL_SGIS_texture_filter4 +#define GL_SGIS_texture_filter4 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights); +typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights); +#endif + +#ifndef GL_EXT_subtexture +#define GL_EXT_subtexture 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *); +GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); +typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); +#endif + +#ifndef GL_EXT_copy_texture +#define GL_EXT_copy_texture 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint); +GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint); +GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei); +GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei); +GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); +typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); +typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); +typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); +#endif + +#ifndef GL_EXT_histogram +#define GL_EXT_histogram 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *); +GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *); +GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean); +GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean); +GLAPI void APIENTRY glResetHistogramEXT (GLenum); +GLAPI void APIENTRY glResetMinmaxEXT (GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); +typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); +typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); +typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink); +typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target); +typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target); +#endif + +#ifndef GL_EXT_convolution +#define GL_EXT_convolution 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); +GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); +GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat); +GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *); +GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint); +GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *); +GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei); +GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei); +GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *); +GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *); +GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); +typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); +typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params); +typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params); +typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); +typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image); +typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); +typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); +#endif + +#ifndef GL_SGI_color_matrix +#define GL_SGI_color_matrix 1 +#endif + +#ifndef GL_SGI_color_table +#define GL_SGI_color_table 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); +GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *); +GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *); +GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei); +GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *); +GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); +typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); +typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table); +typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params); +#endif + +#ifndef GL_SGIX_pixel_texture +#define GL_SGIX_pixel_texture 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glPixelTexGenSGIX (GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode); +#endif + +#ifndef GL_SGIS_pixel_texture +#define GL_SGIS_pixel_texture 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint); +GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *); +GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat); +GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *); +GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *); +GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params); +#endif + +#ifndef GL_SGIS_texture4D +#define GL_SGIS_texture4D 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); +GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels); +typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels); +#endif + +#ifndef GL_SGI_texture_color_table +#define GL_SGI_texture_color_table 1 +#endif + +#ifndef GL_EXT_cmyka +#define GL_EXT_cmyka 1 +#endif + +#ifndef GL_EXT_texture_object +#define GL_EXT_texture_object 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *); +GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint); +GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *); +GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *); +GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint); +GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences); +typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture); +typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures); +typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures); +typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture); +typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities); +#endif + +#ifndef GL_SGIS_detail_texture +#define GL_SGIS_detail_texture 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *); +GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points); +typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points); +#endif + +#ifndef GL_SGIS_sharpen_texture +#define GL_SGIS_sharpen_texture 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *); +GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points); +typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points); +#endif + +#ifndef GL_EXT_packed_pixels +#define GL_EXT_packed_pixels 1 +#endif + +#ifndef GL_SGIS_texture_lod +#define GL_SGIS_texture_lod 1 +#endif + +#ifndef GL_SGIS_multisample +#define GL_SGIS_multisample 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean); +GLAPI void APIENTRY glSamplePatternSGIS (GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert); +typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern); +#endif + +#ifndef GL_EXT_rescale_normal +#define GL_EXT_rescale_normal 1 +#endif + +#ifndef GL_EXT_vertex_array +#define GL_EXT_vertex_array 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glArrayElementEXT (GLint); +GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *); +GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei); +GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *); +GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *); +GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *); +GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *); +GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *); +GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i); +typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); +typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count); +typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer); +typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params); +typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); +typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); +typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); +typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); +#endif + +#ifndef GL_EXT_misc_attribute +#define GL_EXT_misc_attribute 1 +#endif + +#ifndef GL_SGIS_generate_mipmap +#define GL_SGIS_generate_mipmap 1 +#endif + +#ifndef GL_SGIX_clipmap +#define GL_SGIX_clipmap 1 +#endif + +#ifndef GL_SGIX_shadow +#define GL_SGIX_shadow 1 +#endif + +#ifndef GL_SGIS_texture_edge_clamp +#define GL_SGIS_texture_edge_clamp 1 +#endif + +#ifndef GL_SGIS_texture_border_clamp +#define GL_SGIS_texture_border_clamp 1 +#endif + +#ifndef GL_EXT_blend_minmax +#define GL_EXT_blend_minmax 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBlendEquationEXT (GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode); +#endif + +#ifndef GL_EXT_blend_subtract +#define GL_EXT_blend_subtract 1 +#endif + +#ifndef GL_EXT_blend_logic_op +#define GL_EXT_blend_logic_op 1 +#endif + +#ifndef GL_SGIX_interlace +#define GL_SGIX_interlace 1 +#endif + +#ifndef GL_SGIX_pixel_tiles +#define GL_SGIX_pixel_tiles 1 +#endif + +#ifndef GL_SGIX_texture_select +#define GL_SGIX_texture_select 1 +#endif + +#ifndef GL_SGIX_sprite +#define GL_SGIX_sprite 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat); +GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *); +GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint); +GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params); +#endif + +#ifndef GL_SGIX_texture_multi_buffer +#define GL_SGIX_texture_multi_buffer 1 +#endif + +#ifndef GL_EXT_point_parameters +#define GL_EXT_point_parameters 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat); +GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params); +#endif + +#ifndef GL_SGIS_point_parameters +#define GL_SGIS_point_parameters 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat); +GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params); +#endif + +#ifndef GL_SGIX_instruments +#define GL_SGIX_instruments 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI GLint APIENTRY glGetInstrumentsSGIX (void); +GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *); +GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *); +GLAPI void APIENTRY glReadInstrumentsSGIX (GLint); +GLAPI void APIENTRY glStartInstrumentsSGIX (void); +GLAPI void APIENTRY glStopInstrumentsSGIX (GLint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void); +typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer); +typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p); +typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker); +typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void); +typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker); +#endif + +#ifndef GL_SGIX_texture_scale_bias +#define GL_SGIX_texture_scale_bias 1 +#endif + +#ifndef GL_SGIX_framezoom +#define GL_SGIX_framezoom 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFrameZoomSGIX (GLint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor); +#endif + +#ifndef GL_SGIX_tag_sample_buffer +#define GL_SGIX_tag_sample_buffer 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTagSampleBufferSGIX (void); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void); +#endif + +#ifndef GL_SGIX_polynomial_ffd +#define GL_SGIX_polynomial_ffd 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *); +GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *); +GLAPI void APIENTRY glDeformSGIX (GLbitfield); +GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points); +typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points); +typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask); +typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask); +#endif + +#ifndef GL_SGIX_reference_plane +#define GL_SGIX_reference_plane 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation); +#endif + +#ifndef GL_SGIX_flush_raster +#define GL_SGIX_flush_raster 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFlushRasterSGIX (void); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void); +#endif + +#ifndef GL_SGIX_depth_texture +#define GL_SGIX_depth_texture 1 +#endif + +#ifndef GL_SGIS_fog_function +#define GL_SGIS_fog_function 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *); +GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points); +typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points); +#endif + +#ifndef GL_SGIX_fog_offset +#define GL_SGIX_fog_offset 1 +#endif + +#ifndef GL_HP_image_transform +#define GL_HP_image_transform 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint); +GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat); +GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *); +GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *); +GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params); +#endif + +#ifndef GL_HP_convolution_border_modes +#define GL_HP_convolution_border_modes 1 +#endif + +#ifndef GL_SGIX_texture_add_env +#define GL_SGIX_texture_add_env 1 +#endif + +#ifndef GL_EXT_color_subtable +#define GL_EXT_color_subtable 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); +GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); +#endif + +#ifndef GL_PGI_vertex_hints +#define GL_PGI_vertex_hints 1 +#endif + +#ifndef GL_PGI_misc_hints +#define GL_PGI_misc_hints 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glHintPGI (GLenum, GLint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode); +#endif + +#ifndef GL_EXT_paletted_texture +#define GL_EXT_paletted_texture 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); +GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *); +GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); +typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data); +typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); +#endif + +#ifndef GL_EXT_clip_volume_hint +#define GL_EXT_clip_volume_hint 1 +#endif + +#ifndef GL_SGIX_list_priority +#define GL_SGIX_list_priority 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *); +GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat); +GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *); +GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint); +GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params); +#endif + +#ifndef GL_SGIX_ir_instrument1 +#define GL_SGIX_ir_instrument1 1 +#endif + +#ifndef GL_SGIX_calligraphic_fragment +#define GL_SGIX_calligraphic_fragment 1 +#endif + +#ifndef GL_SGIX_texture_lod_bias +#define GL_SGIX_texture_lod_bias 1 +#endif + +#ifndef GL_SGIX_shadow_ambient +#define GL_SGIX_shadow_ambient 1 +#endif + +#ifndef GL_EXT_index_texture +#define GL_EXT_index_texture 1 +#endif + +#ifndef GL_EXT_index_material +#define GL_EXT_index_material 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode); +#endif + +#ifndef GL_EXT_index_func +#define GL_EXT_index_func 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref); +#endif + +#ifndef GL_EXT_index_array_formats +#define GL_EXT_index_array_formats 1 +#endif + +#ifndef GL_EXT_compiled_vertex_array +#define GL_EXT_compiled_vertex_array 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei); +GLAPI void APIENTRY glUnlockArraysEXT (void); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count); +typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void); +#endif + +#ifndef GL_EXT_cull_vertex +#define GL_EXT_cull_vertex 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *); +GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params); +typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params); +#endif + +#ifndef GL_SGIX_ycrcb +#define GL_SGIX_ycrcb 1 +#endif + +#ifndef GL_SGIX_fragment_lighting +#define GL_SGIX_fragment_lighting 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum); +GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat); +GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *); +GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint); +GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *); +GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat); +GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *); +GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint); +GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *); +GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat); +GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *); +GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint); +GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *); +GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode); +typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param); +#endif + +#ifndef GL_IBM_rasterpos_clip +#define GL_IBM_rasterpos_clip 1 +#endif + +#ifndef GL_HP_texture_lighting +#define GL_HP_texture_lighting 1 +#endif + +#ifndef GL_EXT_draw_range_elements +#define GL_EXT_draw_range_elements 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); +#endif + +#ifndef GL_WIN_phong_shading +#define GL_WIN_phong_shading 1 +#endif + +#ifndef GL_WIN_specular_fog +#define GL_WIN_specular_fog 1 +#endif + +#ifndef GL_EXT_light_texture +#define GL_EXT_light_texture 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glApplyTextureEXT (GLenum); +GLAPI void APIENTRY glTextureLightEXT (GLenum); +GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode); +typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname); +typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode); +#endif + +#ifndef GL_SGIX_blend_alpha_minmax +#define GL_SGIX_blend_alpha_minmax 1 +#endif + +#ifndef GL_EXT_bgra +#define GL_EXT_bgra 1 +#endif + +#ifndef GL_SGIX_async +#define GL_SGIX_async 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint); +GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *); +GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *); +GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei); +GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei); +GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker); +typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp); +typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp); +typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range); +typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range); +typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker); +#endif + +#ifndef GL_SGIX_async_pixel +#define GL_SGIX_async_pixel 1 +#endif + +#ifndef GL_SGIX_async_histogram +#define GL_SGIX_async_histogram 1 +#endif + +#ifndef GL_INTEL_parallel_arrays +#define GL_INTEL_parallel_arrays 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *); +GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *); +GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *); +GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); +typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer); +typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); +typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); +#endif + +#ifndef GL_HP_occlusion_test +#define GL_HP_occlusion_test 1 +#endif + +#ifndef GL_EXT_pixel_transform +#define GL_EXT_pixel_transform 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint); +GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat); +GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *); +GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params); +#endif + +#ifndef GL_EXT_pixel_transform_color_table +#define GL_EXT_pixel_transform_color_table 1 +#endif + +#ifndef GL_EXT_shared_texture_palette +#define GL_EXT_shared_texture_palette 1 +#endif + +#ifndef GL_EXT_separate_specular_color +#define GL_EXT_separate_specular_color 1 +#endif + +#ifndef GL_EXT_secondary_color +#define GL_EXT_secondary_color 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte); +GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *); +GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *); +GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *); +GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint); +GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *); +GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort); +GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *); +GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte); +GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *); +GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint); +GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *); +GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort); +GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *); +GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v); +typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); +#endif + +#ifndef GL_EXT_texture_perturb_normal +#define GL_EXT_texture_perturb_normal 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTextureNormalEXT (GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode); +#endif + +#ifndef GL_EXT_multi_draw_arrays +#define GL_EXT_multi_draw_arrays 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei); +GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); +#endif + +#ifndef GL_EXT_fog_coord +#define GL_EXT_fog_coord 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFogCoordfEXT (GLfloat); +GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *); +GLAPI void APIENTRY glFogCoorddEXT (GLdouble); +GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *); +GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord); +typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord); +typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord); +typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord); +typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); +#endif + +#ifndef GL_REND_screen_coordinates +#define GL_REND_screen_coordinates 1 +#endif + +#ifndef GL_EXT_coordinate_frame +#define GL_EXT_coordinate_frame 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte); +GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *); +GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *); +GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *); +GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint); +GLAPI void APIENTRY glTangent3ivEXT (const GLint *); +GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort); +GLAPI void APIENTRY glTangent3svEXT (const GLshort *); +GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte); +GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *); +GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *); +GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *); +GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint); +GLAPI void APIENTRY glBinormal3ivEXT (const GLint *); +GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort); +GLAPI void APIENTRY glBinormal3svEXT (const GLshort *); +GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *); +GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz); +typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v); +typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz); +typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v); +typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz); +typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v); +typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz); +typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v); +typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz); +typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v); +typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz); +typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v); +typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz); +typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v); +typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz); +typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v); +typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz); +typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v); +typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz); +typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v); +typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); +typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); +#endif + +#ifndef GL_EXT_texture_env_combine +#define GL_EXT_texture_env_combine 1 +#endif + +#ifndef GL_APPLE_specular_vector +#define GL_APPLE_specular_vector 1 +#endif + +#ifndef GL_APPLE_transform_hint +#define GL_APPLE_transform_hint 1 +#endif + +#ifndef GL_SGIX_fog_scale +#define GL_SGIX_fog_scale 1 +#endif + +#ifndef GL_SUNX_constant_data +#define GL_SUNX_constant_data 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFinishTextureSUNX (void); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void); +#endif + +#ifndef GL_SUN_global_alpha +#define GL_SUN_global_alpha 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte); +GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort); +GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint); +GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat); +GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble); +GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte); +GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort); +GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor); +typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor); +typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor); +typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor); +typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor); +typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor); +typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor); +typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor); +#endif + +#ifndef GL_SUN_triangle_list +#define GL_SUN_triangle_list 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint); +GLAPI void APIENTRY glReplacementCodeusSUN (GLushort); +GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte); +GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *); +GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *); +GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *); +GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer); +#endif + +#ifndef GL_SUN_vertex +#define GL_SUN_vertex 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat); +GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *); +GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *); +GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *); +GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *); +GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *); +GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *); +GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *); +GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *); +GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *); +GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *); +GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *); +GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *); +GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *); +GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *); +GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *); +GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *); +GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *); +GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *); +GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *); +GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y); +typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v); +typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v); +typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v); +typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v); +typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v); +typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v); +typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v); +typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v); +typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v); +typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v); +typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); +typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); +#endif + +#ifndef GL_EXT_blend_func_separate +#define GL_EXT_blend_func_separate 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); +#endif + +#ifndef GL_INGR_blend_func_separate +#define GL_INGR_blend_func_separate 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); +#endif + +#ifndef GL_INGR_color_clamp +#define GL_INGR_color_clamp 1 +#endif + +#ifndef GL_INGR_interlace_read +#define GL_INGR_interlace_read 1 +#endif + +#ifndef GL_EXT_stencil_wrap +#define GL_EXT_stencil_wrap 1 +#endif + +#ifndef GL_EXT_422_pixels +#define GL_EXT_422_pixels 1 +#endif + +#ifndef GL_NV_texgen_reflection +#define GL_NV_texgen_reflection 1 +#endif + +#ifndef GL_SUN_convolution_border_modes +#define GL_SUN_convolution_border_modes 1 +#endif + +#ifndef GL_EXT_texture_env_add +#define GL_EXT_texture_env_add 1 +#endif + +#ifndef GL_EXT_texture_lod_bias +#define GL_EXT_texture_lod_bias 1 +#endif + +#ifndef GL_EXT_texture_filter_anisotropic +#define GL_EXT_texture_filter_anisotropic 1 +#endif + +#ifndef GL_EXT_vertex_weighting +#define GL_EXT_vertex_weighting 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glVertexWeightfEXT (GLfloat); +GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *); +GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight); +typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight); +typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer); +#endif + +#ifndef GL_NV_light_max_exponent +#define GL_NV_light_max_exponent 1 +#endif + +#ifndef GL_NV_vertex_array_range +#define GL_NV_vertex_array_range 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFlushVertexArrayRangeNV (void); +GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void); +typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer); +#endif + +#ifndef GL_NV_register_combiners +#define GL_NV_register_combiners 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *); +GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat); +GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *); +GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint); +GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum); +GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean); +GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum); +GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); +typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); +typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); +typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params); +#endif + +#ifndef GL_NV_fog_distance +#define GL_NV_fog_distance 1 +#endif + +#ifndef GL_NV_texgen_emboss +#define GL_NV_texgen_emboss 1 +#endif + +#ifndef GL_NV_blend_square +#define GL_NV_blend_square 1 +#endif + +#ifndef GL_NV_texture_env_combine4 +#define GL_NV_texture_env_combine4 1 +#endif + +#ifndef GL_MESA_resize_buffers +#define GL_MESA_resize_buffers 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glResizeBuffersMESA (void); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void); +#endif + +#ifndef GL_MESA_window_pos +#define GL_MESA_window_pos 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble); +GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *); +GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat); +GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *); +GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint); +GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *); +GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort); +GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *); +GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *); +GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *); +GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint); +GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *); +GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort); +GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *); +GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *); +GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *); +GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint); +GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *); +GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort); +GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y); +typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v); +typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y); +typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v); +typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y); +typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v); +typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y); +typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v); +typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z); +typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v); +typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v); +typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z); +typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v); +typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z); +typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v); +typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w); +typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v); +typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v); +typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w); +typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v); +typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w); +typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v); +#endif + +#ifndef GL_IBM_cull_vertex +#define GL_IBM_cull_vertex 1 +#endif + +#ifndef GL_IBM_multimode_draw_arrays +#define GL_IBM_multimode_draw_arrays 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint); +GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride); +typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride); +#endif + +#ifndef GL_IBM_vertex_array_lists +#define GL_IBM_vertex_array_lists 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint); +GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint); +GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint); +GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint); +GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint); +GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint); +GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint); +GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); +typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); +typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride); +typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); +typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); +typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); +typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); +typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); +#endif + +#ifndef GL_SGIX_subsample +#define GL_SGIX_subsample 1 +#endif + +#ifndef GL_SGIX_ycrcba +#define GL_SGIX_ycrcba 1 +#endif + +#ifndef GL_SGIX_ycrcb_subsample +#define GL_SGIX_ycrcb_subsample 1 +#endif + +#ifndef GL_SGIX_depth_pass_instrument +#define GL_SGIX_depth_pass_instrument 1 +#endif + +#ifndef GL_3DFX_texture_compression_FXT1 +#define GL_3DFX_texture_compression_FXT1 1 +#endif + +#ifndef GL_3DFX_multisample +#define GL_3DFX_multisample 1 +#endif + +#ifndef GL_3DFX_tbuffer +#define GL_3DFX_tbuffer 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTbufferMask3DFX (GLuint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask); +#endif + +#ifndef GL_EXT_multisample +#define GL_EXT_multisample 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean); +GLAPI void APIENTRY glSamplePatternEXT (GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert); +typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern); +#endif + +#ifndef GL_SGIX_vertex_preclip +#define GL_SGIX_vertex_preclip 1 +#endif + +#ifndef GL_SGIX_convolution_accuracy +#define GL_SGIX_convolution_accuracy 1 +#endif + +#ifndef GL_SGIX_resample +#define GL_SGIX_resample 1 +#endif + +#ifndef GL_SGIS_point_line_texgen +#define GL_SGIS_point_line_texgen 1 +#endif + +#ifndef GL_SGIS_texture_color_mask +#define GL_SGIS_texture_color_mask 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); +#endif + +#ifndef GL_SGIX_igloo_interface +#define GL_SGIX_igloo_interface 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params); +#endif + +#ifndef GL_EXT_texture_env_dot3 +#define GL_EXT_texture_env_dot3 1 +#endif + +#ifndef GL_ATI_texture_mirror_once +#define GL_ATI_texture_mirror_once 1 +#endif + +#ifndef GL_NV_fence +#define GL_NV_fence 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *); +GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *); +GLAPI GLboolean APIENTRY glIsFenceNV (GLuint); +GLAPI GLboolean APIENTRY glTestFenceNV (GLuint); +GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glFinishFenceNV (GLuint); +GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences); +typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences); +typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence); +typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence); +typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence); +typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); +#endif + +#ifndef GL_NV_evaluators +#define GL_NV_evaluators 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *); +GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *); +GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *); +GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *); +GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *); +GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); +typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points); +typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode); +#endif + +#ifndef GL_NV_packed_depth_stencil +#define GL_NV_packed_depth_stencil 1 +#endif + +#ifndef GL_NV_register_combiners2 +#define GL_NV_register_combiners2 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *); +GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params); +#endif + +#ifndef GL_NV_texture_compression_vtc +#define GL_NV_texture_compression_vtc 1 +#endif + +#ifndef GL_NV_texture_rectangle +#define GL_NV_texture_rectangle 1 +#endif + +#ifndef GL_NV_texture_shader +#define GL_NV_texture_shader 1 +#endif + +#ifndef GL_NV_texture_shader2 +#define GL_NV_texture_shader2 1 +#endif + +#ifndef GL_NV_vertex_array_range2 +#define GL_NV_vertex_array_range2 1 +#endif + +#ifndef GL_NV_vertex_program +#define GL_NV_vertex_program 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *); +GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint); +GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *); +GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *); +GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *); +GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *); +GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *); +GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *); +GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *); +GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *); +GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *); +GLAPI GLboolean APIENTRY glIsProgramNV (GLuint); +GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *); +GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *); +GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *); +GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *); +GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *); +GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *); +GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum); +GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *); +GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble); +GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *); +GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat); +GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *); +GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort); +GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble); +GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *); +GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat); +GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *); +GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort); +GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *); +GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *); +GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort); +GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *); +GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *); +GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort); +GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte); +GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *); +GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *); +GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *); +GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *); +GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *); +GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *); +GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *); +GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *); +GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *); +GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *); +GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *); +GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *); +GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *); +GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences); +typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id); +typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); +typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params); +typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs); +typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params); +typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program); +typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); +typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id); +typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program); +typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v); +typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v); +typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v); +typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v); +typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); +typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform); +typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v); +#endif + +#ifndef GL_SGIX_texture_coordinate_clamp +#define GL_SGIX_texture_coordinate_clamp 1 +#endif + +#ifndef GL_SGIX_scalebias_hint +#define GL_SGIX_scalebias_hint 1 +#endif + +#ifndef GL_OML_interlace +#define GL_OML_interlace 1 +#endif + +#ifndef GL_OML_subsample +#define GL_OML_subsample 1 +#endif + +#ifndef GL_OML_resample +#define GL_OML_resample 1 +#endif + +#ifndef GL_NV_copy_depth_to_color +#define GL_NV_copy_depth_to_color 1 +#endif + +#ifndef GL_ATI_envmap_bumpmap +#define GL_ATI_envmap_bumpmap 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *); +GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *); +GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *); +GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param); +typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param); +typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param); +typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param); +#endif + +#ifndef GL_ATI_fragment_shader +#define GL_ATI_fragment_shader 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint); +GLAPI void APIENTRY glBindFragmentShaderATI (GLuint); +GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint); +GLAPI void APIENTRY glBeginFragmentShaderATI (void); +GLAPI void APIENTRY glEndFragmentShaderATI (void); +GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum); +GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum); +GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); +GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); +GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); +GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint); +GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); +GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); +GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range); +typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id); +typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id); +typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void); +typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void); +typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle); +typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle); +typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); +typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); +typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); +typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); +typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); +typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); +typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value); +#endif + +#ifndef GL_ATI_pn_triangles +#define GL_ATI_pn_triangles 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint); +GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param); +#endif + +#ifndef GL_ATI_vertex_array_object +#define GL_ATI_vertex_array_object 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum); +GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint); +GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum); +GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *); +GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glFreeObjectBufferATI (GLuint); +GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint); +GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *); +GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint); +GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *); +GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage); +typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer); +typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve); +typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer); +typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); +typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); +typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params); +#endif + +#ifndef GL_EXT_vertex_shader +#define GL_EXT_vertex_shader 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBeginVertexShaderEXT (void); +GLAPI void APIENTRY glEndVertexShaderEXT (void); +GLAPI void APIENTRY glBindVertexShaderEXT (GLuint); +GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint); +GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint); +GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint); +GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint); +GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint); +GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum); +GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum); +GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint); +GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint); +GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint); +GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *); +GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *); +GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *); +GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *); +GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *); +GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *); +GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *); +GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *); +GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *); +GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *); +GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *); +GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint); +GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint); +GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum); +GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum); +GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum); +GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum); +GLAPI GLuint APIENTRY glBindParameterEXT (GLenum); +GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum); +GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *); +GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *); +GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *); +GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *); +GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *); +GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *); +GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void); +typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void); +typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id); +typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range); +typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id); +typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1); +typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2); +typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3); +typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); +typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); +typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); +typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); +typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components); +typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr); +typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr); +typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr); +typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr); +typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr); +typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr); +typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr); +typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr); +typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr); +typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr); +typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr); +typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); +typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); +typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value); +typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value); +typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value); +typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value); +typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value); +typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap); +typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); +typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); +typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); +typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data); +typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); +typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); +typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); +typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); +typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); +typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); +#endif + +#ifndef GL_ATI_vertex_streams +#define GL_ATI_vertex_streams 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort); +GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *); +GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint); +GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *); +GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat); +GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *); +GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble); +GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *); +GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort); +GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *); +GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint); +GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *); +GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat); +GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *); +GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble); +GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *); +GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort); +GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *); +GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint); +GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *); +GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *); +GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *); +GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort); +GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *); +GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint); +GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *); +GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *); +GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *); +GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte); +GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *); +GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort); +GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *); +GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint); +GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *); +GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *); +GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *); +GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum); +GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint); +GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x); +typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x); +typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x); +typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x); +typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y); +typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y); +typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y); +typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y); +typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z); +typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z); +typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z); +typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z); +typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w); +typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w); +typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords); +typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords); +typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz); +typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords); +typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz); +typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); +typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz); +typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); +typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz); +typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); +typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz); +typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); +typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream); +typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param); +#endif + +#ifndef GL_ATI_element_array +#define GL_ATI_element_array 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *); +GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei); +GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer); +typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count); +typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count); +#endif + +#ifndef GL_SUN_mesh_array +#define GL_SUN_mesh_array 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width); +#endif + +#ifndef GL_SUN_slice_accum +#define GL_SUN_slice_accum 1 +#endif + +#ifndef GL_NV_multisample_filter_hint +#define GL_NV_multisample_filter_hint 1 +#endif + +#ifndef GL_NV_depth_clamp +#define GL_NV_depth_clamp 1 +#endif + +#ifndef GL_NV_occlusion_query +#define GL_NV_occlusion_query 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *); +GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *); +GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint); +GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint); +GLAPI void APIENTRY glEndOcclusionQueryNV (void); +GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids); +typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids); +typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id); +typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id); +typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void); +typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params); +#endif + +#ifndef GL_NV_point_sprite +#define GL_NV_point_sprite 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint); +GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params); +#endif + +#ifndef GL_NV_texture_shader3 +#define GL_NV_texture_shader3 1 +#endif + +#ifndef GL_NV_vertex_program1_1 +#define GL_NV_vertex_program1_1 1 +#endif + +#ifndef GL_EXT_shadow_funcs +#define GL_EXT_shadow_funcs 1 +#endif + +#ifndef GL_EXT_stencil_two_side +#define GL_EXT_stencil_two_side 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face); +#endif + +#ifndef GL_ATI_text_fragment_shader +#define GL_ATI_text_fragment_shader 1 +#endif + +#ifndef GL_APPLE_client_storage +#define GL_APPLE_client_storage 1 +#endif + +#ifndef GL_APPLE_element_array +#define GL_APPLE_element_array 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *); +GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei); +GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei); +GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei); +GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer); +typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count); +typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count); +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); +typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount); +#endif + +#ifndef GL_APPLE_fence +#define GL_APPLE_fence 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *); +GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *); +GLAPI void APIENTRY glSetFenceAPPLE (GLuint); +GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint); +GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint); +GLAPI void APIENTRY glFinishFenceAPPLE (GLuint); +GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint); +GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences); +typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences); +typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence); +typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence); +typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence); +typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence); +typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name); +typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name); +#endif + +#ifndef GL_APPLE_vertex_array_object +#define GL_APPLE_vertex_array_object 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint); +GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *); +GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, GLuint *); +GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array); +typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays); +typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays); +typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array); +#endif + +#ifndef GL_APPLE_vertex_array_range +#define GL_APPLE_vertex_array_range 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *); +GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *); +GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer); +typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer); +typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param); +#endif + +#ifndef GL_APPLE_ycbcr_422 +#define GL_APPLE_ycbcr_422 1 +#endif + +#ifndef GL_S3_s3tc +#define GL_S3_s3tc 1 +#endif + +#ifndef GL_ATI_draw_buffers +#define GL_ATI_draw_buffers 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs); +#endif + +#ifndef GL_ATI_pixel_format_float +#define GL_ATI_pixel_format_float 1 +/* This is really a WGL extension, but defines some associated GL enums. + * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string. + */ +#endif + +#ifndef GL_ATI_texture_env_combine3 +#define GL_ATI_texture_env_combine3 1 +#endif + +#ifndef GL_ATI_texture_float +#define GL_ATI_texture_float 1 +#endif + +#ifndef GL_NV_float_buffer +#define GL_NV_float_buffer 1 +#endif + +#ifndef GL_NV_fragment_program +#define GL_NV_fragment_program 1 +/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */ +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat); +GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble); +GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *); +GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *); +GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *); +GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); +typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); +typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v); +typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v); +typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params); +typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params); +#endif + +#ifndef GL_NV_half_float +#define GL_NV_half_float 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *); +GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *); +GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *); +GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *); +GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *); +GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *); +GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV); +GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *); +GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *); +GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *); +GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *); +GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV); +GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *); +GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *); +GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *); +GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *); +GLAPI void APIENTRY glFogCoordhNV (GLhalfNV); +GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *); +GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *); +GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV); +GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *); +GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV); +GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *); +GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *); +GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *); +GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); +GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *); +GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *); +GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *); +GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *); +GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y); +typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z); +typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); +typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz); +typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); +typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha); +typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s); +typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t); +typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r); +typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); +typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v); +typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog); +typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); +typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v); +typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight); +typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x); +typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y); +typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z); +typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); +typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); +#endif + +#ifndef GL_NV_pixel_data_range +#define GL_NV_pixel_data_range 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *); +GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer); +typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target); +#endif + +#ifndef GL_NV_primitive_restart +#define GL_NV_primitive_restart 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glPrimitiveRestartNV (void); +GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void); +typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index); +#endif + +#ifndef GL_NV_texture_expand_normal +#define GL_NV_texture_expand_normal 1 +#endif + +#ifndef GL_NV_vertex_program2 +#define GL_NV_vertex_program2 1 +#endif + +#ifndef GL_ATI_map_object_buffer +#define GL_ATI_map_object_buffer 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint); +GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer); +typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer); +#endif + +#ifndef GL_ATI_separate_stencil +#define GL_ATI_separate_stencil 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum); +GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); +typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); +#endif + +#ifndef GL_ATI_vertex_attrib_array_object +#define GL_ATI_vertex_attrib_array_object 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint); +GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *); +GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params); +#endif + +#ifndef GL_OES_read_format +#define GL_OES_read_format 1 +#endif + +#ifndef GL_EXT_depth_bounds_test +#define GL_EXT_depth_bounds_test 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax); +#endif + +#ifndef GL_EXT_texture_mirror_clamp +#define GL_EXT_texture_mirror_clamp 1 +#endif + +#ifndef GL_EXT_blend_equation_separate +#define GL_EXT_blend_equation_separate 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha); +#endif + +#ifndef GL_MESA_pack_invert +#define GL_MESA_pack_invert 1 +#endif + +#ifndef GL_MESA_ycbcr_texture +#define GL_MESA_ycbcr_texture 1 +#endif + +#ifndef GL_EXT_pixel_buffer_object +#define GL_EXT_pixel_buffer_object 1 +#endif + +#ifndef GL_NV_fragment_program_option +#define GL_NV_fragment_program_option 1 +#endif + +#ifndef GL_NV_fragment_program2 +#define GL_NV_fragment_program2 1 +#endif + +#ifndef GL_NV_vertex_program2_option +#define GL_NV_vertex_program2_option 1 +#endif + +#ifndef GL_NV_vertex_program3 +#define GL_NV_vertex_program3 1 +#endif + +#ifndef GL_EXT_framebuffer_object +#define GL_EXT_framebuffer_object 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint); +GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint); +GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *); +GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *); +GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei); +GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *); +GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint); +GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint); +GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *); +GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *); +GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum); +GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint); +GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint); +GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint); +GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint); +GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGenerateMipmapEXT (GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer); +typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer); +typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers); +typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers); +typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); +typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer); +typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer); +typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers); +typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers); +typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target); +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); +typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); +typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target); +#endif + +#ifndef GL_GREMEDY_string_marker +#define GL_GREMEDY_string_marker 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string); +#endif + +#ifndef GL_EXT_packed_depth_stencil +#define GL_EXT_packed_depth_stencil 1 +#endif + +#ifndef GL_EXT_stencil_clear_tag +#define GL_EXT_stencil_clear_tag 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glStencilClearTagEXT (GLsizei, GLuint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag); +#endif + +#ifndef GL_EXT_texture_sRGB +#define GL_EXT_texture_sRGB 1 +#endif + +#ifndef GL_EXT_framebuffer_blit +#define GL_EXT_framebuffer_blit 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBlitFramebufferEXT (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +#endif + +#ifndef GL_EXT_framebuffer_multisample +#define GL_EXT_framebuffer_multisample 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +#endif + +#ifndef GL_MESAX_texture_stack +#define GL_MESAX_texture_stack 1 +#endif + +#ifndef GL_EXT_timer_query +#define GL_EXT_timer_query 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint, GLenum, GLint64EXT *); +GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint, GLenum, GLuint64EXT *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params); +typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params); +#endif + +#ifndef GL_EXT_gpu_program_parameters +#define GL_EXT_gpu_program_parameters 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *); +GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum, GLuint, GLsizei, const GLfloat *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params); +typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params); +#endif + +#ifndef GL_APPLE_flush_buffer_range +#define GL_APPLE_flush_buffer_range 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum, GLenum, GLint); +GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum, GLintptr, GLsizeiptr); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size); +#endif + +#ifndef GL_NV_gpu_program4 +#define GL_NV_gpu_program4 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint); +GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum, GLuint, const GLint *); +GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *); +GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint); +GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum, GLuint, const GLuint *); +GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *); +GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum, GLuint, GLint, GLint, GLint, GLint); +GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum, GLuint, const GLint *); +GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum, GLuint, GLsizei, const GLint *); +GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint); +GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum, GLuint, const GLuint *); +GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum, GLuint, GLsizei, const GLuint *); +GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum, GLuint, GLint *); +GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum, GLuint, GLuint *); +GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum, GLuint, GLint *); +GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum, GLuint, GLuint *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); +typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params); +typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params); +typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); +typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params); +typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params); +typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); +typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params); +typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params); +typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); +typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params); +typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params); +typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params); +typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params); +typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params); +typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params); +#endif + +#ifndef GL_NV_geometry_program4 +#define GL_NV_geometry_program4 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glProgramVertexLimitNV (GLenum, GLint); +GLAPI void APIENTRY glFramebufferTextureEXT (GLenum, GLenum, GLuint, GLint); +GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum, GLenum, GLuint, GLint, GLint); +GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum, GLenum, GLuint, GLint, GLenum); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit); +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); +typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); +#endif + +#ifndef GL_EXT_geometry_shader4 +#define GL_EXT_geometry_shader4 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glProgramParameteriEXT (GLuint, GLenum, GLint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value); +#endif + +#ifndef GL_NV_vertex_program4 +#define GL_NV_vertex_program4 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint, GLint); +GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint, GLint, GLint); +GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint, GLint, GLint, GLint); +GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint, GLint, GLint, GLint, GLint); +GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint, GLuint); +GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint, GLuint, GLuint); +GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint, GLuint, GLuint, GLuint); +GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint, GLuint, GLuint, GLuint, GLuint); +GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint, const GLint *); +GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint, const GLint *); +GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint, const GLint *); +GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint, const GLint *); +GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint, const GLuint *); +GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint, const GLuint *); +GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint, const GLuint *); +GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint, const GLuint *); +GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint, const GLbyte *); +GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint, const GLshort *); +GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint, const GLubyte *); +GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint, const GLushort *); +GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint, GLint, GLenum, GLsizei, const GLvoid *); +GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint, GLenum, GLint *); +GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint, GLenum, GLuint *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v); +typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params); +#endif + +#ifndef GL_EXT_gpu_shader4 +#define GL_EXT_gpu_shader4 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGetUniformuivEXT (GLuint, GLint, GLuint *); +GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint, GLuint, const GLchar *); +GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint, const GLchar *); +GLAPI void APIENTRY glUniform1uiEXT (GLint, GLuint); +GLAPI void APIENTRY glUniform2uiEXT (GLint, GLuint, GLuint); +GLAPI void APIENTRY glUniform3uiEXT (GLint, GLuint, GLuint, GLuint); +GLAPI void APIENTRY glUniform4uiEXT (GLint, GLuint, GLuint, GLuint, GLuint); +GLAPI void APIENTRY glUniform1uivEXT (GLint, GLsizei, const GLuint *); +GLAPI void APIENTRY glUniform2uivEXT (GLint, GLsizei, const GLuint *); +GLAPI void APIENTRY glUniform3uivEXT (GLint, GLsizei, const GLuint *); +GLAPI void APIENTRY glUniform4uivEXT (GLint, GLsizei, const GLuint *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params); +typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name); +typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name); +typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0); +typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1); +typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2); +typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); +typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); +typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); +typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); +typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); +#endif + +#ifndef GL_EXT_draw_instanced +#define GL_EXT_draw_instanced 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum, GLint, GLsizei, GLsizei); +GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum, GLsizei, GLenum, const GLvoid *, GLsizei); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount); +typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); +#endif + +#ifndef GL_EXT_packed_float +#define GL_EXT_packed_float 1 +#endif + +#ifndef GL_EXT_texture_array +#define GL_EXT_texture_array 1 +#endif + +#ifndef GL_EXT_texture_buffer_object +#define GL_EXT_texture_buffer_object 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTexBufferEXT (GLenum, GLenum, GLuint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer); +#endif + +#ifndef GL_EXT_texture_compression_latc +#define GL_EXT_texture_compression_latc 1 +#endif + +#ifndef GL_EXT_texture_compression_rgtc +#define GL_EXT_texture_compression_rgtc 1 +#endif + +#ifndef GL_EXT_texture_shared_exponent +#define GL_EXT_texture_shared_exponent 1 +#endif + +#ifndef GL_NV_depth_buffer_float +#define GL_NV_depth_buffer_float 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDepthRangedNV (GLdouble, GLdouble); +GLAPI void APIENTRY glClearDepthdNV (GLdouble); +GLAPI void APIENTRY glDepthBoundsdNV (GLdouble, GLdouble); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar); +typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth); +typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax); +#endif + +#ifndef GL_NV_fragment_program4 +#define GL_NV_fragment_program4 1 +#endif + +#ifndef GL_NV_framebuffer_multisample_coverage +#define GL_NV_framebuffer_multisample_coverage 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum, GLsizei, GLsizei, GLenum, GLsizei, GLsizei); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); +#endif + +#ifndef GL_EXT_framebuffer_sRGB +#define GL_EXT_framebuffer_sRGB 1 +#endif + +#ifndef GL_NV_geometry_shader4 +#define GL_NV_geometry_shader4 1 +#endif + +#ifndef GL_NV_parameter_buffer_object +#define GL_NV_parameter_buffer_object 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum, GLuint, GLuint, GLsizei, const GLfloat *); +GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum, GLuint, GLuint, GLsizei, const GLint *); +GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum, GLuint, GLuint, GLsizei, const GLuint *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params); +typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params); +typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params); +#endif + +#ifndef GL_EXT_draw_buffers2 +#define GL_EXT_draw_buffers2 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint, GLboolean, GLboolean, GLboolean, GLboolean); +GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum, GLuint, GLboolean *); +GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum, GLuint, GLint *); +GLAPI void APIENTRY glEnableIndexedEXT (GLenum, GLuint); +GLAPI void APIENTRY glDisableIndexedEXT (GLenum, GLuint); +GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum, GLuint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); +typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data); +typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data); +typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index); +typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index); +typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index); +#endif + +#ifndef GL_NV_transform_feedback +#define GL_NV_transform_feedback 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum); +GLAPI void APIENTRY glEndTransformFeedbackNV (void); +GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint, const GLint *, GLenum); +GLAPI void APIENTRY glBindBufferRangeNV (GLenum, GLuint, GLuint, GLintptr, GLsizeiptr); +GLAPI void APIENTRY glBindBufferOffsetNV (GLenum, GLuint, GLuint, GLintptr); +GLAPI void APIENTRY glBindBufferBaseNV (GLenum, GLuint, GLuint); +GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint, GLsizei, const GLint *, GLenum); +GLAPI void APIENTRY glActiveVaryingNV (GLuint, const GLchar *); +GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint, const GLchar *); +GLAPI void APIENTRY glGetActiveVaryingNV (GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *); +GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint, GLuint, GLint *); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode); +typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void); +typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode); +typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); +typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset); +typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer); +typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode); +typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name); +typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name); +typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); +typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location); +#endif + +#ifndef GL_EXT_bindable_uniform +#define GL_EXT_bindable_uniform 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glUniformBufferEXT (GLuint, GLint, GLuint); +GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint, GLint); +GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint, GLint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer); +typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location); +typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location); +#endif + +#ifndef GL_EXT_texture_integer +#define GL_EXT_texture_integer 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTexParameterIivEXT (GLenum, GLenum, const GLint *); +GLAPI void APIENTRY glTexParameterIuivEXT (GLenum, GLenum, const GLuint *); +GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum, GLenum, GLint *); +GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum, GLenum, GLuint *); +GLAPI void APIENTRY glClearColorIiEXT (GLint, GLint, GLint, GLint); +GLAPI void APIENTRY glClearColorIuiEXT (GLuint, GLuint, GLuint, GLuint); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params); +typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params); +typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha); +typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha); +#endif + + +#ifdef __cplusplus +} +#endif + +#endif diff -Nru opencpn-plugin-weatherfax-1.3.1/include/GL/gl.h opencpn-plugin-weatherfax-1.5001.0/include/GL/gl.h --- opencpn-plugin-weatherfax-1.3.1/include/GL/gl.h 1970-01-01 00:00:00.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/include/GL/gl.h 2016-02-25 19:25:30.000000000 +0000 @@ -0,0 +1,2252 @@ +/* + * Mesa 3-D graphics library + * Version: 7.0 + * + * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + + +#ifndef __gl_h_ +#define __gl_h_ + +#if defined(USE_MGL_NAMESPACE) +#include "gl_mangle.h" +#endif + + +/********************************************************************** + * Begin system-specific stuff. Do not do any of this when building + * for SciTech SNAP, as this is all done before this header file is + * included. + */ +#if !defined(__SCITECH_SNAP__) + +#if defined(__BEOS__) +#include /* to get some BeOS-isms */ +#endif + +#if !defined(OPENSTEP) && (defined(NeXT) || defined(NeXT_PDO)) +#define OPENSTEP +#endif + +#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) +#define __WIN32__ +#endif + +#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) +# if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ +# define GLAPI __declspec(dllexport) +# elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ +# define GLAPI __declspec(dllimport) +# else /* for use with static link lib build of Win32 edition only */ +# define GLAPI extern +# endif /* _STATIC_MESA support */ +# define GLAPIENTRY __stdcall +#elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */ +# define GLAPI extern +# define GLAPIENTRY __stdcall +#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303 +# define GLAPI __attribute__((visibility("default"))) +# define GLAPIENTRY +#endif /* WIN32 && !CYGWIN */ + +#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__) +# define PRAGMA_EXPORT_SUPPORTED 1 +#endif + +/* + * WINDOWS: Include windows.h here to define APIENTRY. + * It is also useful when applications include this file by + * including only glut.h, since glut.h depends on windows.h. + * Applications needing to include windows.h with parms other + * than "WIN32_LEAN_AND_MEAN" may include windows.h before + * glut.h or gl.h. + */ +#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) +#define WIN32_LEAN_AND_MEAN 1 +#include +#endif + +#if defined(_WIN32) && !defined(_WINGDI_) && !defined(_GNU_H_WINDOWS32_DEFINES) \ + && !defined(OPENSTEP) && !defined(__CYGWIN__) || defined(__MINGW32__) +#include +#endif + +#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED +#pragma import on +#endif + +#ifndef GLAPI +#define GLAPI extern +#endif + +#ifndef GLAPIENTRY +#define GLAPIENTRY +#endif + +#ifndef APIENTRY +#define APIENTRY GLAPIENTRY +#endif + +/* "P" suffix to be used for a pointer to a function */ +#ifndef APIENTRYP +#define APIENTRYP APIENTRY * +#endif + +#ifndef GLAPIENTRYP +#define GLAPIENTRYP GLAPIENTRY * +#endif + +#ifdef CENTERLINE_CLPP +#define signed +#endif + +#if defined(PRAGMA_EXPORT_SUPPORTED) +#pragma export on +#endif + +#endif /* !__SCITECH_SNAP__ */ +/* + * End system-specific stuff. + **********************************************************************/ + + + +#ifdef __cplusplus +extern "C" { +#endif + + + +#define GL_VERSION_1_1 1 +#define GL_VERSION_1_2 1 +#define GL_VERSION_1_3 1 +#define GL_ARB_imaging 1 + + +/* + * Datatypes + */ +typedef unsigned int GLenum; +typedef unsigned char GLboolean; +typedef unsigned int GLbitfield; +typedef void GLvoid; +typedef signed char GLbyte; /* 1-byte signed */ +typedef short GLshort; /* 2-byte signed */ +typedef int GLint; /* 4-byte signed */ +typedef unsigned char GLubyte; /* 1-byte unsigned */ +typedef unsigned short GLushort; /* 2-byte unsigned */ +typedef unsigned int GLuint; /* 4-byte unsigned */ +typedef int GLsizei; /* 4-byte signed */ +typedef float GLfloat; /* single precision float */ +typedef float GLclampf; /* single precision float in [0,1] */ +typedef double GLdouble; /* double precision float */ +typedef double GLclampd; /* double precision float in [0,1] */ + + + +/* + * Constants + */ + +/* Boolean values */ +#define GL_FALSE 0x0 +#define GL_TRUE 0x1 + +/* Data types */ +#define GL_BYTE 0x1400 +#define GL_UNSIGNED_BYTE 0x1401 +#define GL_SHORT 0x1402 +#define GL_UNSIGNED_SHORT 0x1403 +#define GL_INT 0x1404 +#define GL_UNSIGNED_INT 0x1405 +#define GL_FLOAT 0x1406 +#define GL_2_BYTES 0x1407 +#define GL_3_BYTES 0x1408 +#define GL_4_BYTES 0x1409 +#define GL_DOUBLE 0x140A + +/* Primitives */ +#define GL_POINTS 0x0000 +#define GL_LINES 0x0001 +#define GL_LINE_LOOP 0x0002 +#define GL_LINE_STRIP 0x0003 +#define GL_TRIANGLES 0x0004 +#define GL_TRIANGLE_STRIP 0x0005 +#define GL_TRIANGLE_FAN 0x0006 +#define GL_QUADS 0x0007 +#define GL_QUAD_STRIP 0x0008 +#define GL_POLYGON 0x0009 + +/* Vertex Arrays */ +#define GL_VERTEX_ARRAY 0x8074 +#define GL_NORMAL_ARRAY 0x8075 +#define GL_COLOR_ARRAY 0x8076 +#define GL_INDEX_ARRAY 0x8077 +#define GL_TEXTURE_COORD_ARRAY 0x8078 +#define GL_EDGE_FLAG_ARRAY 0x8079 +#define GL_VERTEX_ARRAY_SIZE 0x807A +#define GL_VERTEX_ARRAY_TYPE 0x807B +#define GL_VERTEX_ARRAY_STRIDE 0x807C +#define GL_NORMAL_ARRAY_TYPE 0x807E +#define GL_NORMAL_ARRAY_STRIDE 0x807F +#define GL_COLOR_ARRAY_SIZE 0x8081 +#define GL_COLOR_ARRAY_TYPE 0x8082 +#define GL_COLOR_ARRAY_STRIDE 0x8083 +#define GL_INDEX_ARRAY_TYPE 0x8085 +#define GL_INDEX_ARRAY_STRIDE 0x8086 +#define GL_TEXTURE_COORD_ARRAY_SIZE 0x8088 +#define GL_TEXTURE_COORD_ARRAY_TYPE 0x8089 +#define GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A +#define GL_EDGE_FLAG_ARRAY_STRIDE 0x808C +#define GL_VERTEX_ARRAY_POINTER 0x808E +#define GL_NORMAL_ARRAY_POINTER 0x808F +#define GL_COLOR_ARRAY_POINTER 0x8090 +#define GL_INDEX_ARRAY_POINTER 0x8091 +#define GL_TEXTURE_COORD_ARRAY_POINTER 0x8092 +#define GL_EDGE_FLAG_ARRAY_POINTER 0x8093 +#define GL_V2F 0x2A20 +#define GL_V3F 0x2A21 +#define GL_C4UB_V2F 0x2A22 +#define GL_C4UB_V3F 0x2A23 +#define GL_C3F_V3F 0x2A24 +#define GL_N3F_V3F 0x2A25 +#define GL_C4F_N3F_V3F 0x2A26 +#define GL_T2F_V3F 0x2A27 +#define GL_T4F_V4F 0x2A28 +#define GL_T2F_C4UB_V3F 0x2A29 +#define GL_T2F_C3F_V3F 0x2A2A +#define GL_T2F_N3F_V3F 0x2A2B +#define GL_T2F_C4F_N3F_V3F 0x2A2C +#define GL_T4F_C4F_N3F_V4F 0x2A2D + +/* Matrix Mode */ +#define GL_MATRIX_MODE 0x0BA0 +#define GL_MODELVIEW 0x1700 +#define GL_PROJECTION 0x1701 +#define GL_TEXTURE 0x1702 + +/* Points */ +#define GL_POINT_SMOOTH 0x0B10 +#define GL_POINT_SIZE 0x0B11 +#define GL_POINT_SIZE_GRANULARITY 0x0B13 +#define GL_POINT_SIZE_RANGE 0x0B12 + +/* Lines */ +#define GL_LINE_SMOOTH 0x0B20 +#define GL_LINE_STIPPLE 0x0B24 +#define GL_LINE_STIPPLE_PATTERN 0x0B25 +#define GL_LINE_STIPPLE_REPEAT 0x0B26 +#define GL_LINE_WIDTH 0x0B21 +#define GL_LINE_WIDTH_GRANULARITY 0x0B23 +#define GL_LINE_WIDTH_RANGE 0x0B22 + +/* Polygons */ +#define GL_POINT 0x1B00 +#define GL_LINE 0x1B01 +#define GL_FILL 0x1B02 +#define GL_CW 0x0900 +#define GL_CCW 0x0901 +#define GL_FRONT 0x0404 +#define GL_BACK 0x0405 +#define GL_POLYGON_MODE 0x0B40 +#define GL_POLYGON_SMOOTH 0x0B41 +#define GL_POLYGON_STIPPLE 0x0B42 +#define GL_EDGE_FLAG 0x0B43 +#define GL_CULL_FACE 0x0B44 +#define GL_CULL_FACE_MODE 0x0B45 +#define GL_FRONT_FACE 0x0B46 +#define GL_POLYGON_OFFSET_FACTOR 0x8038 +#define GL_POLYGON_OFFSET_UNITS 0x2A00 +#define GL_POLYGON_OFFSET_POINT 0x2A01 +#define GL_POLYGON_OFFSET_LINE 0x2A02 +#define GL_POLYGON_OFFSET_FILL 0x8037 + +/* Display Lists */ +#define GL_COMPILE 0x1300 +#define GL_COMPILE_AND_EXECUTE 0x1301 +#define GL_LIST_BASE 0x0B32 +#define GL_LIST_INDEX 0x0B33 +#define GL_LIST_MODE 0x0B30 + +/* Depth buffer */ +#define GL_NEVER 0x0200 +#define GL_LESS 0x0201 +#define GL_EQUAL 0x0202 +#define GL_LEQUAL 0x0203 +#define GL_GREATER 0x0204 +#define GL_NOTEQUAL 0x0205 +#define GL_GEQUAL 0x0206 +#define GL_ALWAYS 0x0207 +#define GL_DEPTH_TEST 0x0B71 +#define GL_DEPTH_BITS 0x0D56 +#define GL_DEPTH_CLEAR_VALUE 0x0B73 +#define GL_DEPTH_FUNC 0x0B74 +#define GL_DEPTH_RANGE 0x0B70 +#define GL_DEPTH_WRITEMASK 0x0B72 +#define GL_DEPTH_COMPONENT 0x1902 + +/* Lighting */ +#define GL_LIGHTING 0x0B50 +#define GL_LIGHT0 0x4000 +#define GL_LIGHT1 0x4001 +#define GL_LIGHT2 0x4002 +#define GL_LIGHT3 0x4003 +#define GL_LIGHT4 0x4004 +#define GL_LIGHT5 0x4005 +#define GL_LIGHT6 0x4006 +#define GL_LIGHT7 0x4007 +#define GL_SPOT_EXPONENT 0x1205 +#define GL_SPOT_CUTOFF 0x1206 +#define GL_CONSTANT_ATTENUATION 0x1207 +#define GL_LINEAR_ATTENUATION 0x1208 +#define GL_QUADRATIC_ATTENUATION 0x1209 +#define GL_AMBIENT 0x1200 +#define GL_DIFFUSE 0x1201 +#define GL_SPECULAR 0x1202 +#define GL_SHININESS 0x1601 +#define GL_EMISSION 0x1600 +#define GL_POSITION 0x1203 +#define GL_SPOT_DIRECTION 0x1204 +#define GL_AMBIENT_AND_DIFFUSE 0x1602 +#define GL_COLOR_INDEXES 0x1603 +#define GL_LIGHT_MODEL_TWO_SIDE 0x0B52 +#define GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51 +#define GL_LIGHT_MODEL_AMBIENT 0x0B53 +#define GL_FRONT_AND_BACK 0x0408 +#define GL_SHADE_MODEL 0x0B54 +#define GL_FLAT 0x1D00 +#define GL_SMOOTH 0x1D01 +#define GL_COLOR_MATERIAL 0x0B57 +#define GL_COLOR_MATERIAL_FACE 0x0B55 +#define GL_COLOR_MATERIAL_PARAMETER 0x0B56 +#define GL_NORMALIZE 0x0BA1 + +/* User clipping planes */ +#define GL_CLIP_PLANE0 0x3000 +#define GL_CLIP_PLANE1 0x3001 +#define GL_CLIP_PLANE2 0x3002 +#define GL_CLIP_PLANE3 0x3003 +#define GL_CLIP_PLANE4 0x3004 +#define GL_CLIP_PLANE5 0x3005 + +/* Accumulation buffer */ +#define GL_ACCUM_RED_BITS 0x0D58 +#define GL_ACCUM_GREEN_BITS 0x0D59 +#define GL_ACCUM_BLUE_BITS 0x0D5A +#define GL_ACCUM_ALPHA_BITS 0x0D5B +#define GL_ACCUM_CLEAR_VALUE 0x0B80 +#define GL_ACCUM 0x0100 +#define GL_ADD 0x0104 +#define GL_LOAD 0x0101 +#define GL_MULT 0x0103 +#define GL_RETURN 0x0102 + +/* Alpha testing */ +#define GL_ALPHA_TEST 0x0BC0 +#define GL_ALPHA_TEST_REF 0x0BC2 +#define GL_ALPHA_TEST_FUNC 0x0BC1 + +/* Blending */ +#define GL_BLEND 0x0BE2 +#define GL_BLEND_SRC 0x0BE1 +#define GL_BLEND_DST 0x0BE0 +#define GL_ZERO 0x0 +#define GL_ONE 0x1 +#define GL_SRC_COLOR 0x0300 +#define GL_ONE_MINUS_SRC_COLOR 0x0301 +#define GL_SRC_ALPHA 0x0302 +#define GL_ONE_MINUS_SRC_ALPHA 0x0303 +#define GL_DST_ALPHA 0x0304 +#define GL_ONE_MINUS_DST_ALPHA 0x0305 +#define GL_DST_COLOR 0x0306 +#define GL_ONE_MINUS_DST_COLOR 0x0307 +#define GL_SRC_ALPHA_SATURATE 0x0308 + +/* Render Mode */ +#define GL_FEEDBACK 0x1C01 +#define GL_RENDER 0x1C00 +#define GL_SELECT 0x1C02 + +/* Feedback */ +#define GL_2D 0x0600 +#define GL_3D 0x0601 +#define GL_3D_COLOR 0x0602 +#define GL_3D_COLOR_TEXTURE 0x0603 +#define GL_4D_COLOR_TEXTURE 0x0604 +#define GL_POINT_TOKEN 0x0701 +#define GL_LINE_TOKEN 0x0702 +#define GL_LINE_RESET_TOKEN 0x0707 +#define GL_POLYGON_TOKEN 0x0703 +#define GL_BITMAP_TOKEN 0x0704 +#define GL_DRAW_PIXEL_TOKEN 0x0705 +#define GL_COPY_PIXEL_TOKEN 0x0706 +#define GL_PASS_THROUGH_TOKEN 0x0700 +#define GL_FEEDBACK_BUFFER_POINTER 0x0DF0 +#define GL_FEEDBACK_BUFFER_SIZE 0x0DF1 +#define GL_FEEDBACK_BUFFER_TYPE 0x0DF2 + +/* Selection */ +#define GL_SELECTION_BUFFER_POINTER 0x0DF3 +#define GL_SELECTION_BUFFER_SIZE 0x0DF4 + +/* Fog */ +#define GL_FOG 0x0B60 +#define GL_FOG_MODE 0x0B65 +#define GL_FOG_DENSITY 0x0B62 +#define GL_FOG_COLOR 0x0B66 +#define GL_FOG_INDEX 0x0B61 +#define GL_FOG_START 0x0B63 +#define GL_FOG_END 0x0B64 +#define GL_LINEAR 0x2601 +#define GL_EXP 0x0800 +#define GL_EXP2 0x0801 + +/* Logic Ops */ +#define GL_LOGIC_OP 0x0BF1 +#define GL_INDEX_LOGIC_OP 0x0BF1 +#define GL_COLOR_LOGIC_OP 0x0BF2 +#define GL_LOGIC_OP_MODE 0x0BF0 +#define GL_CLEAR 0x1500 +#define GL_SET 0x150F +#define GL_COPY 0x1503 +#define GL_COPY_INVERTED 0x150C +#define GL_NOOP 0x1505 +#define GL_INVERT 0x150A +#define GL_AND 0x1501 +#define GL_NAND 0x150E +#define GL_OR 0x1507 +#define GL_NOR 0x1508 +#define GL_XOR 0x1506 +#define GL_EQUIV 0x1509 +#define GL_AND_REVERSE 0x1502 +#define GL_AND_INVERTED 0x1504 +#define GL_OR_REVERSE 0x150B +#define GL_OR_INVERTED 0x150D + +/* Stencil */ +#define GL_STENCIL_BITS 0x0D57 +#define GL_STENCIL_TEST 0x0B90 +#define GL_STENCIL_CLEAR_VALUE 0x0B91 +#define GL_STENCIL_FUNC 0x0B92 +#define GL_STENCIL_VALUE_MASK 0x0B93 +#define GL_STENCIL_FAIL 0x0B94 +#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95 +#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96 +#define GL_STENCIL_REF 0x0B97 +#define GL_STENCIL_WRITEMASK 0x0B98 +#define GL_STENCIL_INDEX 0x1901 +#define GL_KEEP 0x1E00 +#define GL_REPLACE 0x1E01 +#define GL_INCR 0x1E02 +#define GL_DECR 0x1E03 + +/* Buffers, Pixel Drawing/Reading */ +#define GL_NONE 0x0 +#define GL_LEFT 0x0406 +#define GL_RIGHT 0x0407 +/*GL_FRONT 0x0404 */ +/*GL_BACK 0x0405 */ +/*GL_FRONT_AND_BACK 0x0408 */ +#define GL_FRONT_LEFT 0x0400 +#define GL_FRONT_RIGHT 0x0401 +#define GL_BACK_LEFT 0x0402 +#define GL_BACK_RIGHT 0x0403 +#define GL_AUX0 0x0409 +#define GL_AUX1 0x040A +#define GL_AUX2 0x040B +#define GL_AUX3 0x040C +#define GL_COLOR_INDEX 0x1900 +#define GL_RED 0x1903 +#define GL_GREEN 0x1904 +#define GL_BLUE 0x1905 +#define GL_ALPHA 0x1906 +#define GL_LUMINANCE 0x1909 +#define GL_LUMINANCE_ALPHA 0x190A +#define GL_ALPHA_BITS 0x0D55 +#define GL_RED_BITS 0x0D52 +#define GL_GREEN_BITS 0x0D53 +#define GL_BLUE_BITS 0x0D54 +#define GL_INDEX_BITS 0x0D51 +#define GL_SUBPIXEL_BITS 0x0D50 +#define GL_AUX_BUFFERS 0x0C00 +#define GL_READ_BUFFER 0x0C02 +#define GL_DRAW_BUFFER 0x0C01 +#define GL_DOUBLEBUFFER 0x0C32 +#define GL_STEREO 0x0C33 +#define GL_BITMAP 0x1A00 +#define GL_COLOR 0x1800 +#define GL_DEPTH 0x1801 +#define GL_STENCIL 0x1802 +#define GL_DITHER 0x0BD0 +#define GL_RGB 0x1907 +#define GL_RGBA 0x1908 + +/* Implementation limits */ +#define GL_MAX_LIST_NESTING 0x0B31 +#define GL_MAX_EVAL_ORDER 0x0D30 +#define GL_MAX_LIGHTS 0x0D31 +#define GL_MAX_CLIP_PLANES 0x0D32 +#define GL_MAX_TEXTURE_SIZE 0x0D33 +#define GL_MAX_PIXEL_MAP_TABLE 0x0D34 +#define GL_MAX_ATTRIB_STACK_DEPTH 0x0D35 +#define GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36 +#define GL_MAX_NAME_STACK_DEPTH 0x0D37 +#define GL_MAX_PROJECTION_STACK_DEPTH 0x0D38 +#define GL_MAX_TEXTURE_STACK_DEPTH 0x0D39 +#define GL_MAX_VIEWPORT_DIMS 0x0D3A +#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B + +/* Gets */ +#define GL_ATTRIB_STACK_DEPTH 0x0BB0 +#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1 +#define GL_COLOR_CLEAR_VALUE 0x0C22 +#define GL_COLOR_WRITEMASK 0x0C23 +#define GL_CURRENT_INDEX 0x0B01 +#define GL_CURRENT_COLOR 0x0B00 +#define GL_CURRENT_NORMAL 0x0B02 +#define GL_CURRENT_RASTER_COLOR 0x0B04 +#define GL_CURRENT_RASTER_DISTANCE 0x0B09 +#define GL_CURRENT_RASTER_INDEX 0x0B05 +#define GL_CURRENT_RASTER_POSITION 0x0B07 +#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06 +#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08 +#define GL_CURRENT_TEXTURE_COORDS 0x0B03 +#define GL_INDEX_CLEAR_VALUE 0x0C20 +#define GL_INDEX_MODE 0x0C30 +#define GL_INDEX_WRITEMASK 0x0C21 +#define GL_MODELVIEW_MATRIX 0x0BA6 +#define GL_MODELVIEW_STACK_DEPTH 0x0BA3 +#define GL_NAME_STACK_DEPTH 0x0D70 +#define GL_PROJECTION_MATRIX 0x0BA7 +#define GL_PROJECTION_STACK_DEPTH 0x0BA4 +#define GL_RENDER_MODE 0x0C40 +#define GL_RGBA_MODE 0x0C31 +#define GL_TEXTURE_MATRIX 0x0BA8 +#define GL_TEXTURE_STACK_DEPTH 0x0BA5 +#define GL_VIEWPORT 0x0BA2 + +/* Evaluators */ +#define GL_AUTO_NORMAL 0x0D80 +#define GL_MAP1_COLOR_4 0x0D90 +#define GL_MAP1_INDEX 0x0D91 +#define GL_MAP1_NORMAL 0x0D92 +#define GL_MAP1_TEXTURE_COORD_1 0x0D93 +#define GL_MAP1_TEXTURE_COORD_2 0x0D94 +#define GL_MAP1_TEXTURE_COORD_3 0x0D95 +#define GL_MAP1_TEXTURE_COORD_4 0x0D96 +#define GL_MAP1_VERTEX_3 0x0D97 +#define GL_MAP1_VERTEX_4 0x0D98 +#define GL_MAP2_COLOR_4 0x0DB0 +#define GL_MAP2_INDEX 0x0DB1 +#define GL_MAP2_NORMAL 0x0DB2 +#define GL_MAP2_TEXTURE_COORD_1 0x0DB3 +#define GL_MAP2_TEXTURE_COORD_2 0x0DB4 +#define GL_MAP2_TEXTURE_COORD_3 0x0DB5 +#define GL_MAP2_TEXTURE_COORD_4 0x0DB6 +#define GL_MAP2_VERTEX_3 0x0DB7 +#define GL_MAP2_VERTEX_4 0x0DB8 +#define GL_MAP1_GRID_DOMAIN 0x0DD0 +#define GL_MAP1_GRID_SEGMENTS 0x0DD1 +#define GL_MAP2_GRID_DOMAIN 0x0DD2 +#define GL_MAP2_GRID_SEGMENTS 0x0DD3 +#define GL_COEFF 0x0A00 +#define GL_ORDER 0x0A01 +#define GL_DOMAIN 0x0A02 + +/* Hints */ +#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50 +#define GL_POINT_SMOOTH_HINT 0x0C51 +#define GL_LINE_SMOOTH_HINT 0x0C52 +#define GL_POLYGON_SMOOTH_HINT 0x0C53 +#define GL_FOG_HINT 0x0C54 +#define GL_DONT_CARE 0x1100 +#define GL_FASTEST 0x1101 +#define GL_NICEST 0x1102 + +/* Scissor box */ +#define GL_SCISSOR_BOX 0x0C10 +#define GL_SCISSOR_TEST 0x0C11 + +/* Pixel Mode / Transfer */ +#define GL_MAP_COLOR 0x0D10 +#define GL_MAP_STENCIL 0x0D11 +#define GL_INDEX_SHIFT 0x0D12 +#define GL_INDEX_OFFSET 0x0D13 +#define GL_RED_SCALE 0x0D14 +#define GL_RED_BIAS 0x0D15 +#define GL_GREEN_SCALE 0x0D18 +#define GL_GREEN_BIAS 0x0D19 +#define GL_BLUE_SCALE 0x0D1A +#define GL_BLUE_BIAS 0x0D1B +#define GL_ALPHA_SCALE 0x0D1C +#define GL_ALPHA_BIAS 0x0D1D +#define GL_DEPTH_SCALE 0x0D1E +#define GL_DEPTH_BIAS 0x0D1F +#define GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1 +#define GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0 +#define GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2 +#define GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3 +#define GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4 +#define GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5 +#define GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6 +#define GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7 +#define GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8 +#define GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9 +#define GL_PIXEL_MAP_S_TO_S 0x0C71 +#define GL_PIXEL_MAP_I_TO_I 0x0C70 +#define GL_PIXEL_MAP_I_TO_R 0x0C72 +#define GL_PIXEL_MAP_I_TO_G 0x0C73 +#define GL_PIXEL_MAP_I_TO_B 0x0C74 +#define GL_PIXEL_MAP_I_TO_A 0x0C75 +#define GL_PIXEL_MAP_R_TO_R 0x0C76 +#define GL_PIXEL_MAP_G_TO_G 0x0C77 +#define GL_PIXEL_MAP_B_TO_B 0x0C78 +#define GL_PIXEL_MAP_A_TO_A 0x0C79 +#define GL_PACK_ALIGNMENT 0x0D05 +#define GL_PACK_LSB_FIRST 0x0D01 +#define GL_PACK_ROW_LENGTH 0x0D02 +#define GL_PACK_SKIP_PIXELS 0x0D04 +#define GL_PACK_SKIP_ROWS 0x0D03 +#define GL_PACK_SWAP_BYTES 0x0D00 +#define GL_UNPACK_ALIGNMENT 0x0CF5 +#define GL_UNPACK_LSB_FIRST 0x0CF1 +#define GL_UNPACK_ROW_LENGTH 0x0CF2 +#define GL_UNPACK_SKIP_PIXELS 0x0CF4 +#define GL_UNPACK_SKIP_ROWS 0x0CF3 +#define GL_UNPACK_SWAP_BYTES 0x0CF0 +#define GL_ZOOM_X 0x0D16 +#define GL_ZOOM_Y 0x0D17 + +/* Texture mapping */ +#define GL_TEXTURE_ENV 0x2300 +#define GL_TEXTURE_ENV_MODE 0x2200 +#define GL_TEXTURE_1D 0x0DE0 +#define GL_TEXTURE_2D 0x0DE1 +#define GL_TEXTURE_WRAP_S 0x2802 +#define GL_TEXTURE_WRAP_T 0x2803 +#define GL_TEXTURE_MAG_FILTER 0x2800 +#define GL_TEXTURE_MIN_FILTER 0x2801 +#define GL_TEXTURE_ENV_COLOR 0x2201 +#define GL_TEXTURE_GEN_S 0x0C60 +#define GL_TEXTURE_GEN_T 0x0C61 +#define GL_TEXTURE_GEN_MODE 0x2500 +#define GL_TEXTURE_BORDER_COLOR 0x1004 +#define GL_TEXTURE_WIDTH 0x1000 +#define GL_TEXTURE_HEIGHT 0x1001 +#define GL_TEXTURE_BORDER 0x1005 +#define GL_TEXTURE_COMPONENTS 0x1003 +#define GL_TEXTURE_RED_SIZE 0x805C +#define GL_TEXTURE_GREEN_SIZE 0x805D +#define GL_TEXTURE_BLUE_SIZE 0x805E +#define GL_TEXTURE_ALPHA_SIZE 0x805F +#define GL_TEXTURE_LUMINANCE_SIZE 0x8060 +#define GL_TEXTURE_INTENSITY_SIZE 0x8061 +#define GL_NEAREST_MIPMAP_NEAREST 0x2700 +#define GL_NEAREST_MIPMAP_LINEAR 0x2702 +#define GL_LINEAR_MIPMAP_NEAREST 0x2701 +#define GL_LINEAR_MIPMAP_LINEAR 0x2703 +#define GL_OBJECT_LINEAR 0x2401 +#define GL_OBJECT_PLANE 0x2501 +#define GL_EYE_LINEAR 0x2400 +#define GL_EYE_PLANE 0x2502 +#define GL_SPHERE_MAP 0x2402 +#define GL_DECAL 0x2101 +#define GL_MODULATE 0x2100 +#define GL_NEAREST 0x2600 +#define GL_REPEAT 0x2901 +#define GL_CLAMP 0x2900 +#define GL_S 0x2000 +#define GL_T 0x2001 +#define GL_R 0x2002 +#define GL_Q 0x2003 +#define GL_TEXTURE_GEN_R 0x0C62 +#define GL_TEXTURE_GEN_Q 0x0C63 + +/* Utility */ +#define GL_VENDOR 0x1F00 +#define GL_RENDERER 0x1F01 +#define GL_VERSION 0x1F02 +#define GL_EXTENSIONS 0x1F03 + +/* Errors */ +#define GL_NO_ERROR 0x0 +#define GL_INVALID_ENUM 0x0500 +#define GL_INVALID_VALUE 0x0501 +#define GL_INVALID_OPERATION 0x0502 +#define GL_STACK_OVERFLOW 0x0503 +#define GL_STACK_UNDERFLOW 0x0504 +#define GL_OUT_OF_MEMORY 0x0505 + +/* glPush/PopAttrib bits */ +#define GL_CURRENT_BIT 0x00000001 +#define GL_POINT_BIT 0x00000002 +#define GL_LINE_BIT 0x00000004 +#define GL_POLYGON_BIT 0x00000008 +#define GL_POLYGON_STIPPLE_BIT 0x00000010 +#define GL_PIXEL_MODE_BIT 0x00000020 +#define GL_LIGHTING_BIT 0x00000040 +#define GL_FOG_BIT 0x00000080 +#define GL_DEPTH_BUFFER_BIT 0x00000100 +#define GL_ACCUM_BUFFER_BIT 0x00000200 +#define GL_STENCIL_BUFFER_BIT 0x00000400 +#define GL_VIEWPORT_BIT 0x00000800 +#define GL_TRANSFORM_BIT 0x00001000 +#define GL_ENABLE_BIT 0x00002000 +#define GL_COLOR_BUFFER_BIT 0x00004000 +#define GL_HINT_BIT 0x00008000 +#define GL_EVAL_BIT 0x00010000 +#define GL_LIST_BIT 0x00020000 +#define GL_TEXTURE_BIT 0x00040000 +#define GL_SCISSOR_BIT 0x00080000 +#define GL_ALL_ATTRIB_BITS 0x000FFFFF + + +/* OpenGL 1.1 */ +#define GL_PROXY_TEXTURE_1D 0x8063 +#define GL_PROXY_TEXTURE_2D 0x8064 +#define GL_TEXTURE_PRIORITY 0x8066 +#define GL_TEXTURE_RESIDENT 0x8067 +#define GL_TEXTURE_BINDING_1D 0x8068 +#define GL_TEXTURE_BINDING_2D 0x8069 +#define GL_TEXTURE_INTERNAL_FORMAT 0x1003 +#define GL_ALPHA4 0x803B +#define GL_ALPHA8 0x803C +#define GL_ALPHA12 0x803D +#define GL_ALPHA16 0x803E +#define GL_LUMINANCE4 0x803F +#define GL_LUMINANCE8 0x8040 +#define GL_LUMINANCE12 0x8041 +#define GL_LUMINANCE16 0x8042 +#define GL_LUMINANCE4_ALPHA4 0x8043 +#define GL_LUMINANCE6_ALPHA2 0x8044 +#define GL_LUMINANCE8_ALPHA8 0x8045 +#define GL_LUMINANCE12_ALPHA4 0x8046 +#define GL_LUMINANCE12_ALPHA12 0x8047 +#define GL_LUMINANCE16_ALPHA16 0x8048 +#define GL_INTENSITY 0x8049 +#define GL_INTENSITY4 0x804A +#define GL_INTENSITY8 0x804B +#define GL_INTENSITY12 0x804C +#define GL_INTENSITY16 0x804D +#define GL_R3_G3_B2 0x2A10 +#define GL_RGB4 0x804F +#define GL_RGB5 0x8050 +#define GL_RGB8 0x8051 +#define GL_RGB10 0x8052 +#define GL_RGB12 0x8053 +#define GL_RGB16 0x8054 +#define GL_RGBA2 0x8055 +#define GL_RGBA4 0x8056 +#define GL_RGB5_A1 0x8057 +#define GL_RGBA8 0x8058 +#define GL_RGB10_A2 0x8059 +#define GL_RGBA12 0x805A +#define GL_RGBA16 0x805B +#define GL_CLIENT_PIXEL_STORE_BIT 0x00000001 +#define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002 +#define GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFFF +#define GL_CLIENT_ALL_ATTRIB_BITS 0xFFFFFFFF + + + +/* + * Miscellaneous + */ + +GLAPI void GLAPIENTRY glClearIndex( GLfloat c ); + +GLAPI void GLAPIENTRY glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ); + +GLAPI void GLAPIENTRY glClear( GLbitfield mask ); + +GLAPI void GLAPIENTRY glIndexMask( GLuint mask ); + +GLAPI void GLAPIENTRY glColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ); + +GLAPI void GLAPIENTRY glAlphaFunc( GLenum func, GLclampf ref ); + +GLAPI void GLAPIENTRY glBlendFunc( GLenum sfactor, GLenum dfactor ); + +GLAPI void GLAPIENTRY glLogicOp( GLenum opcode ); + +GLAPI void GLAPIENTRY glCullFace( GLenum mode ); + +GLAPI void GLAPIENTRY glFrontFace( GLenum mode ); + +GLAPI void GLAPIENTRY glPointSize( GLfloat size ); + +GLAPI void GLAPIENTRY glLineWidth( GLfloat width ); + +GLAPI void GLAPIENTRY glLineStipple( GLint factor, GLushort pattern ); + +GLAPI void GLAPIENTRY glPolygonMode( GLenum face, GLenum mode ); + +GLAPI void GLAPIENTRY glPolygonOffset( GLfloat factor, GLfloat units ); + +GLAPI void GLAPIENTRY glPolygonStipple( const GLubyte *mask ); + +GLAPI void GLAPIENTRY glGetPolygonStipple( GLubyte *mask ); + +GLAPI void GLAPIENTRY glEdgeFlag( GLboolean flag ); + +GLAPI void GLAPIENTRY glEdgeFlagv( const GLboolean *flag ); + +GLAPI void GLAPIENTRY glScissor( GLint x, GLint y, GLsizei width, GLsizei height); + +GLAPI void GLAPIENTRY glClipPlane( GLenum plane, const GLdouble *equation ); + +GLAPI void GLAPIENTRY glGetClipPlane( GLenum plane, GLdouble *equation ); + +GLAPI void GLAPIENTRY glDrawBuffer( GLenum mode ); + +GLAPI void GLAPIENTRY glReadBuffer( GLenum mode ); + +GLAPI void GLAPIENTRY glEnable( GLenum cap ); + +GLAPI void GLAPIENTRY glDisable( GLenum cap ); + +GLAPI GLboolean GLAPIENTRY glIsEnabled( GLenum cap ); + + +GLAPI void GLAPIENTRY glEnableClientState( GLenum cap ); /* 1.1 */ + +GLAPI void GLAPIENTRY glDisableClientState( GLenum cap ); /* 1.1 */ + + +GLAPI void GLAPIENTRY glGetBooleanv( GLenum pname, GLboolean *params ); + +GLAPI void GLAPIENTRY glGetDoublev( GLenum pname, GLdouble *params ); + +GLAPI void GLAPIENTRY glGetFloatv( GLenum pname, GLfloat *params ); + +GLAPI void GLAPIENTRY glGetIntegerv( GLenum pname, GLint *params ); + + +GLAPI void GLAPIENTRY glPushAttrib( GLbitfield mask ); + +GLAPI void GLAPIENTRY glPopAttrib( void ); + + +GLAPI void GLAPIENTRY glPushClientAttrib( GLbitfield mask ); /* 1.1 */ + +GLAPI void GLAPIENTRY glPopClientAttrib( void ); /* 1.1 */ + + +GLAPI GLint GLAPIENTRY glRenderMode( GLenum mode ); + +GLAPI GLenum GLAPIENTRY glGetError( void ); + +GLAPI const GLubyte * GLAPIENTRY glGetString( GLenum name ); + +GLAPI void GLAPIENTRY glFinish( void ); + +GLAPI void GLAPIENTRY glFlush( void ); + +GLAPI void GLAPIENTRY glHint( GLenum target, GLenum mode ); + + +/* + * Depth Buffer + */ + +GLAPI void GLAPIENTRY glClearDepth( GLclampd depth ); + +GLAPI void GLAPIENTRY glDepthFunc( GLenum func ); + +GLAPI void GLAPIENTRY glDepthMask( GLboolean flag ); + +GLAPI void GLAPIENTRY glDepthRange( GLclampd near_val, GLclampd far_val ); + + +/* + * Accumulation Buffer + */ + +GLAPI void GLAPIENTRY glClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha ); + +GLAPI void GLAPIENTRY glAccum( GLenum op, GLfloat value ); + + +/* + * Transformation + */ + +GLAPI void GLAPIENTRY glMatrixMode( GLenum mode ); + +GLAPI void GLAPIENTRY glOrtho( GLdouble left, GLdouble right, + GLdouble bottom, GLdouble top, + GLdouble near_val, GLdouble far_val ); + +GLAPI void GLAPIENTRY glFrustum( GLdouble left, GLdouble right, + GLdouble bottom, GLdouble top, + GLdouble near_val, GLdouble far_val ); + +GLAPI void GLAPIENTRY glViewport( GLint x, GLint y, + GLsizei width, GLsizei height ); + +GLAPI void GLAPIENTRY glPushMatrix( void ); + +GLAPI void GLAPIENTRY glPopMatrix( void ); + +GLAPI void GLAPIENTRY glLoadIdentity( void ); + +GLAPI void GLAPIENTRY glLoadMatrixd( const GLdouble *m ); +GLAPI void GLAPIENTRY glLoadMatrixf( const GLfloat *m ); + +GLAPI void GLAPIENTRY glMultMatrixd( const GLdouble *m ); +GLAPI void GLAPIENTRY glMultMatrixf( const GLfloat *m ); + +GLAPI void GLAPIENTRY glRotated( GLdouble angle, + GLdouble x, GLdouble y, GLdouble z ); +GLAPI void GLAPIENTRY glRotatef( GLfloat angle, + GLfloat x, GLfloat y, GLfloat z ); + +GLAPI void GLAPIENTRY glScaled( GLdouble x, GLdouble y, GLdouble z ); +GLAPI void GLAPIENTRY glScalef( GLfloat x, GLfloat y, GLfloat z ); + +GLAPI void GLAPIENTRY glTranslated( GLdouble x, GLdouble y, GLdouble z ); +GLAPI void GLAPIENTRY glTranslatef( GLfloat x, GLfloat y, GLfloat z ); + + +/* + * Display Lists + */ + +GLAPI GLboolean GLAPIENTRY glIsList( GLuint list ); + +GLAPI void GLAPIENTRY glDeleteLists( GLuint list, GLsizei range ); + +GLAPI GLuint GLAPIENTRY glGenLists( GLsizei range ); + +GLAPI void GLAPIENTRY glNewList( GLuint list, GLenum mode ); + +GLAPI void GLAPIENTRY glEndList( void ); + +GLAPI void GLAPIENTRY glCallList( GLuint list ); + +GLAPI void GLAPIENTRY glCallLists( GLsizei n, GLenum type, + const GLvoid *lists ); + +GLAPI void GLAPIENTRY glListBase( GLuint base ); + + +/* + * Drawing Functions + */ + +GLAPI void GLAPIENTRY glBegin( GLenum mode ); + +GLAPI void GLAPIENTRY glEnd( void ); + + +GLAPI void GLAPIENTRY glVertex2d( GLdouble x, GLdouble y ); +GLAPI void GLAPIENTRY glVertex2f( GLfloat x, GLfloat y ); +GLAPI void GLAPIENTRY glVertex2i( GLint x, GLint y ); +GLAPI void GLAPIENTRY glVertex2s( GLshort x, GLshort y ); + +GLAPI void GLAPIENTRY glVertex3d( GLdouble x, GLdouble y, GLdouble z ); +GLAPI void GLAPIENTRY glVertex3f( GLfloat x, GLfloat y, GLfloat z ); +GLAPI void GLAPIENTRY glVertex3i( GLint x, GLint y, GLint z ); +GLAPI void GLAPIENTRY glVertex3s( GLshort x, GLshort y, GLshort z ); + +GLAPI void GLAPIENTRY glVertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ); +GLAPI void GLAPIENTRY glVertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ); +GLAPI void GLAPIENTRY glVertex4i( GLint x, GLint y, GLint z, GLint w ); +GLAPI void GLAPIENTRY glVertex4s( GLshort x, GLshort y, GLshort z, GLshort w ); + +GLAPI void GLAPIENTRY glVertex2dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glVertex2fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glVertex2iv( const GLint *v ); +GLAPI void GLAPIENTRY glVertex2sv( const GLshort *v ); + +GLAPI void GLAPIENTRY glVertex3dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glVertex3fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glVertex3iv( const GLint *v ); +GLAPI void GLAPIENTRY glVertex3sv( const GLshort *v ); + +GLAPI void GLAPIENTRY glVertex4dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glVertex4fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glVertex4iv( const GLint *v ); +GLAPI void GLAPIENTRY glVertex4sv( const GLshort *v ); + + +GLAPI void GLAPIENTRY glNormal3b( GLbyte nx, GLbyte ny, GLbyte nz ); +GLAPI void GLAPIENTRY glNormal3d( GLdouble nx, GLdouble ny, GLdouble nz ); +GLAPI void GLAPIENTRY glNormal3f( GLfloat nx, GLfloat ny, GLfloat nz ); +GLAPI void GLAPIENTRY glNormal3i( GLint nx, GLint ny, GLint nz ); +GLAPI void GLAPIENTRY glNormal3s( GLshort nx, GLshort ny, GLshort nz ); + +GLAPI void GLAPIENTRY glNormal3bv( const GLbyte *v ); +GLAPI void GLAPIENTRY glNormal3dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glNormal3fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glNormal3iv( const GLint *v ); +GLAPI void GLAPIENTRY glNormal3sv( const GLshort *v ); + + +GLAPI void GLAPIENTRY glIndexd( GLdouble c ); +GLAPI void GLAPIENTRY glIndexf( GLfloat c ); +GLAPI void GLAPIENTRY glIndexi( GLint c ); +GLAPI void GLAPIENTRY glIndexs( GLshort c ); +GLAPI void GLAPIENTRY glIndexub( GLubyte c ); /* 1.1 */ + +GLAPI void GLAPIENTRY glIndexdv( const GLdouble *c ); +GLAPI void GLAPIENTRY glIndexfv( const GLfloat *c ); +GLAPI void GLAPIENTRY glIndexiv( const GLint *c ); +GLAPI void GLAPIENTRY glIndexsv( const GLshort *c ); +GLAPI void GLAPIENTRY glIndexubv( const GLubyte *c ); /* 1.1 */ + +GLAPI void GLAPIENTRY glColor3b( GLbyte red, GLbyte green, GLbyte blue ); +GLAPI void GLAPIENTRY glColor3d( GLdouble red, GLdouble green, GLdouble blue ); +GLAPI void GLAPIENTRY glColor3f( GLfloat red, GLfloat green, GLfloat blue ); +GLAPI void GLAPIENTRY glColor3i( GLint red, GLint green, GLint blue ); +GLAPI void GLAPIENTRY glColor3s( GLshort red, GLshort green, GLshort blue ); +GLAPI void GLAPIENTRY glColor3ub( GLubyte red, GLubyte green, GLubyte blue ); +GLAPI void GLAPIENTRY glColor3ui( GLuint red, GLuint green, GLuint blue ); +GLAPI void GLAPIENTRY glColor3us( GLushort red, GLushort green, GLushort blue ); + +GLAPI void GLAPIENTRY glColor4b( GLbyte red, GLbyte green, + GLbyte blue, GLbyte alpha ); +GLAPI void GLAPIENTRY glColor4d( GLdouble red, GLdouble green, + GLdouble blue, GLdouble alpha ); +GLAPI void GLAPIENTRY glColor4f( GLfloat red, GLfloat green, + GLfloat blue, GLfloat alpha ); +GLAPI void GLAPIENTRY glColor4i( GLint red, GLint green, + GLint blue, GLint alpha ); +GLAPI void GLAPIENTRY glColor4s( GLshort red, GLshort green, + GLshort blue, GLshort alpha ); +GLAPI void GLAPIENTRY glColor4ub( GLubyte red, GLubyte green, + GLubyte blue, GLubyte alpha ); +GLAPI void GLAPIENTRY glColor4ui( GLuint red, GLuint green, + GLuint blue, GLuint alpha ); +GLAPI void GLAPIENTRY glColor4us( GLushort red, GLushort green, + GLushort blue, GLushort alpha ); + + +GLAPI void GLAPIENTRY glColor3bv( const GLbyte *v ); +GLAPI void GLAPIENTRY glColor3dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glColor3fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glColor3iv( const GLint *v ); +GLAPI void GLAPIENTRY glColor3sv( const GLshort *v ); +GLAPI void GLAPIENTRY glColor3ubv( const GLubyte *v ); +GLAPI void GLAPIENTRY glColor3uiv( const GLuint *v ); +GLAPI void GLAPIENTRY glColor3usv( const GLushort *v ); + +GLAPI void GLAPIENTRY glColor4bv( const GLbyte *v ); +GLAPI void GLAPIENTRY glColor4dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glColor4fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glColor4iv( const GLint *v ); +GLAPI void GLAPIENTRY glColor4sv( const GLshort *v ); +GLAPI void GLAPIENTRY glColor4ubv( const GLubyte *v ); +GLAPI void GLAPIENTRY glColor4uiv( const GLuint *v ); +GLAPI void GLAPIENTRY glColor4usv( const GLushort *v ); + + +GLAPI void GLAPIENTRY glTexCoord1d( GLdouble s ); +GLAPI void GLAPIENTRY glTexCoord1f( GLfloat s ); +GLAPI void GLAPIENTRY glTexCoord1i( GLint s ); +GLAPI void GLAPIENTRY glTexCoord1s( GLshort s ); + +GLAPI void GLAPIENTRY glTexCoord2d( GLdouble s, GLdouble t ); +GLAPI void GLAPIENTRY glTexCoord2f( GLfloat s, GLfloat t ); +GLAPI void GLAPIENTRY glTexCoord2i( GLint s, GLint t ); +GLAPI void GLAPIENTRY glTexCoord2s( GLshort s, GLshort t ); + +GLAPI void GLAPIENTRY glTexCoord3d( GLdouble s, GLdouble t, GLdouble r ); +GLAPI void GLAPIENTRY glTexCoord3f( GLfloat s, GLfloat t, GLfloat r ); +GLAPI void GLAPIENTRY glTexCoord3i( GLint s, GLint t, GLint r ); +GLAPI void GLAPIENTRY glTexCoord3s( GLshort s, GLshort t, GLshort r ); + +GLAPI void GLAPIENTRY glTexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ); +GLAPI void GLAPIENTRY glTexCoord4f( GLfloat s, GLfloat t, GLfloat r, GLfloat q ); +GLAPI void GLAPIENTRY glTexCoord4i( GLint s, GLint t, GLint r, GLint q ); +GLAPI void GLAPIENTRY glTexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ); + +GLAPI void GLAPIENTRY glTexCoord1dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glTexCoord1fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glTexCoord1iv( const GLint *v ); +GLAPI void GLAPIENTRY glTexCoord1sv( const GLshort *v ); + +GLAPI void GLAPIENTRY glTexCoord2dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glTexCoord2fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glTexCoord2iv( const GLint *v ); +GLAPI void GLAPIENTRY glTexCoord2sv( const GLshort *v ); + +GLAPI void GLAPIENTRY glTexCoord3dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glTexCoord3fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glTexCoord3iv( const GLint *v ); +GLAPI void GLAPIENTRY glTexCoord3sv( const GLshort *v ); + +GLAPI void GLAPIENTRY glTexCoord4dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glTexCoord4fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glTexCoord4iv( const GLint *v ); +GLAPI void GLAPIENTRY glTexCoord4sv( const GLshort *v ); + + +GLAPI void GLAPIENTRY glRasterPos2d( GLdouble x, GLdouble y ); +GLAPI void GLAPIENTRY glRasterPos2f( GLfloat x, GLfloat y ); +GLAPI void GLAPIENTRY glRasterPos2i( GLint x, GLint y ); +GLAPI void GLAPIENTRY glRasterPos2s( GLshort x, GLshort y ); + +GLAPI void GLAPIENTRY glRasterPos3d( GLdouble x, GLdouble y, GLdouble z ); +GLAPI void GLAPIENTRY glRasterPos3f( GLfloat x, GLfloat y, GLfloat z ); +GLAPI void GLAPIENTRY glRasterPos3i( GLint x, GLint y, GLint z ); +GLAPI void GLAPIENTRY glRasterPos3s( GLshort x, GLshort y, GLshort z ); + +GLAPI void GLAPIENTRY glRasterPos4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ); +GLAPI void GLAPIENTRY glRasterPos4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ); +GLAPI void GLAPIENTRY glRasterPos4i( GLint x, GLint y, GLint z, GLint w ); +GLAPI void GLAPIENTRY glRasterPos4s( GLshort x, GLshort y, GLshort z, GLshort w ); + +GLAPI void GLAPIENTRY glRasterPos2dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glRasterPos2fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glRasterPos2iv( const GLint *v ); +GLAPI void GLAPIENTRY glRasterPos2sv( const GLshort *v ); + +GLAPI void GLAPIENTRY glRasterPos3dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glRasterPos3fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glRasterPos3iv( const GLint *v ); +GLAPI void GLAPIENTRY glRasterPos3sv( const GLshort *v ); + +GLAPI void GLAPIENTRY glRasterPos4dv( const GLdouble *v ); +GLAPI void GLAPIENTRY glRasterPos4fv( const GLfloat *v ); +GLAPI void GLAPIENTRY glRasterPos4iv( const GLint *v ); +GLAPI void GLAPIENTRY glRasterPos4sv( const GLshort *v ); + + +GLAPI void GLAPIENTRY glRectd( GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 ); +GLAPI void GLAPIENTRY glRectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 ); +GLAPI void GLAPIENTRY glRecti( GLint x1, GLint y1, GLint x2, GLint y2 ); +GLAPI void GLAPIENTRY glRects( GLshort x1, GLshort y1, GLshort x2, GLshort y2 ); + + +GLAPI void GLAPIENTRY glRectdv( const GLdouble *v1, const GLdouble *v2 ); +GLAPI void GLAPIENTRY glRectfv( const GLfloat *v1, const GLfloat *v2 ); +GLAPI void GLAPIENTRY glRectiv( const GLint *v1, const GLint *v2 ); +GLAPI void GLAPIENTRY glRectsv( const GLshort *v1, const GLshort *v2 ); + + +/* + * Vertex Arrays (1.1) + */ + +GLAPI void GLAPIENTRY glVertexPointer( GLint size, GLenum type, + GLsizei stride, const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glNormalPointer( GLenum type, GLsizei stride, + const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glColorPointer( GLint size, GLenum type, + GLsizei stride, const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glIndexPointer( GLenum type, GLsizei stride, + const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glTexCoordPointer( GLint size, GLenum type, + GLsizei stride, const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glEdgeFlagPointer( GLsizei stride, const GLvoid *ptr ); + +GLAPI void GLAPIENTRY glGetPointerv( GLenum pname, GLvoid **params ); + +GLAPI void GLAPIENTRY glArrayElement( GLint i ); + +GLAPI void GLAPIENTRY glDrawArrays( GLenum mode, GLint first, GLsizei count ); + +GLAPI void GLAPIENTRY glDrawElements( GLenum mode, GLsizei count, + GLenum type, const GLvoid *indices ); + +GLAPI void GLAPIENTRY glInterleavedArrays( GLenum format, GLsizei stride, + const GLvoid *pointer ); + +/* + * Lighting + */ + +GLAPI void GLAPIENTRY glShadeModel( GLenum mode ); + +GLAPI void GLAPIENTRY glLightf( GLenum light, GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glLighti( GLenum light, GLenum pname, GLint param ); +GLAPI void GLAPIENTRY glLightfv( GLenum light, GLenum pname, + const GLfloat *params ); +GLAPI void GLAPIENTRY glLightiv( GLenum light, GLenum pname, + const GLint *params ); + +GLAPI void GLAPIENTRY glGetLightfv( GLenum light, GLenum pname, + GLfloat *params ); +GLAPI void GLAPIENTRY glGetLightiv( GLenum light, GLenum pname, + GLint *params ); + +GLAPI void GLAPIENTRY glLightModelf( GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glLightModeli( GLenum pname, GLint param ); +GLAPI void GLAPIENTRY glLightModelfv( GLenum pname, const GLfloat *params ); +GLAPI void GLAPIENTRY glLightModeliv( GLenum pname, const GLint *params ); + +GLAPI void GLAPIENTRY glMaterialf( GLenum face, GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glMateriali( GLenum face, GLenum pname, GLint param ); +GLAPI void GLAPIENTRY glMaterialfv( GLenum face, GLenum pname, const GLfloat *params ); +GLAPI void GLAPIENTRY glMaterialiv( GLenum face, GLenum pname, const GLint *params ); + +GLAPI void GLAPIENTRY glGetMaterialfv( GLenum face, GLenum pname, GLfloat *params ); +GLAPI void GLAPIENTRY glGetMaterialiv( GLenum face, GLenum pname, GLint *params ); + +GLAPI void GLAPIENTRY glColorMaterial( GLenum face, GLenum mode ); + + +/* + * Raster functions + */ + +GLAPI void GLAPIENTRY glPixelZoom( GLfloat xfactor, GLfloat yfactor ); + +GLAPI void GLAPIENTRY glPixelStoref( GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glPixelStorei( GLenum pname, GLint param ); + +GLAPI void GLAPIENTRY glPixelTransferf( GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glPixelTransferi( GLenum pname, GLint param ); + +GLAPI void GLAPIENTRY glPixelMapfv( GLenum map, GLsizei mapsize, + const GLfloat *values ); +GLAPI void GLAPIENTRY glPixelMapuiv( GLenum map, GLsizei mapsize, + const GLuint *values ); +GLAPI void GLAPIENTRY glPixelMapusv( GLenum map, GLsizei mapsize, + const GLushort *values ); + +GLAPI void GLAPIENTRY glGetPixelMapfv( GLenum map, GLfloat *values ); +GLAPI void GLAPIENTRY glGetPixelMapuiv( GLenum map, GLuint *values ); +GLAPI void GLAPIENTRY glGetPixelMapusv( GLenum map, GLushort *values ); + +GLAPI void GLAPIENTRY glBitmap( GLsizei width, GLsizei height, + GLfloat xorig, GLfloat yorig, + GLfloat xmove, GLfloat ymove, + const GLubyte *bitmap ); + +GLAPI void GLAPIENTRY glReadPixels( GLint x, GLint y, + GLsizei width, GLsizei height, + GLenum format, GLenum type, + GLvoid *pixels ); + +GLAPI void GLAPIENTRY glDrawPixels( GLsizei width, GLsizei height, + GLenum format, GLenum type, + const GLvoid *pixels ); + +GLAPI void GLAPIENTRY glCopyPixels( GLint x, GLint y, + GLsizei width, GLsizei height, + GLenum type ); + +/* + * Stenciling + */ + +GLAPI void GLAPIENTRY glStencilFunc( GLenum func, GLint ref, GLuint mask ); + +GLAPI void GLAPIENTRY glStencilMask( GLuint mask ); + +GLAPI void GLAPIENTRY glStencilOp( GLenum fail, GLenum zfail, GLenum zpass ); + +GLAPI void GLAPIENTRY glClearStencil( GLint s ); + + + +/* + * Texture mapping + */ + +GLAPI void GLAPIENTRY glTexGend( GLenum coord, GLenum pname, GLdouble param ); +GLAPI void GLAPIENTRY glTexGenf( GLenum coord, GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glTexGeni( GLenum coord, GLenum pname, GLint param ); + +GLAPI void GLAPIENTRY glTexGendv( GLenum coord, GLenum pname, const GLdouble *params ); +GLAPI void GLAPIENTRY glTexGenfv( GLenum coord, GLenum pname, const GLfloat *params ); +GLAPI void GLAPIENTRY glTexGeniv( GLenum coord, GLenum pname, const GLint *params ); + +GLAPI void GLAPIENTRY glGetTexGendv( GLenum coord, GLenum pname, GLdouble *params ); +GLAPI void GLAPIENTRY glGetTexGenfv( GLenum coord, GLenum pname, GLfloat *params ); +GLAPI void GLAPIENTRY glGetTexGeniv( GLenum coord, GLenum pname, GLint *params ); + + +GLAPI void GLAPIENTRY glTexEnvf( GLenum target, GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glTexEnvi( GLenum target, GLenum pname, GLint param ); + +GLAPI void GLAPIENTRY glTexEnvfv( GLenum target, GLenum pname, const GLfloat *params ); +GLAPI void GLAPIENTRY glTexEnviv( GLenum target, GLenum pname, const GLint *params ); + +GLAPI void GLAPIENTRY glGetTexEnvfv( GLenum target, GLenum pname, GLfloat *params ); +GLAPI void GLAPIENTRY glGetTexEnviv( GLenum target, GLenum pname, GLint *params ); + + +GLAPI void GLAPIENTRY glTexParameterf( GLenum target, GLenum pname, GLfloat param ); +GLAPI void GLAPIENTRY glTexParameteri( GLenum target, GLenum pname, GLint param ); + +GLAPI void GLAPIENTRY glTexParameterfv( GLenum target, GLenum pname, + const GLfloat *params ); +GLAPI void GLAPIENTRY glTexParameteriv( GLenum target, GLenum pname, + const GLint *params ); + +GLAPI void GLAPIENTRY glGetTexParameterfv( GLenum target, + GLenum pname, GLfloat *params); +GLAPI void GLAPIENTRY glGetTexParameteriv( GLenum target, + GLenum pname, GLint *params ); + +GLAPI void GLAPIENTRY glGetTexLevelParameterfv( GLenum target, GLint level, + GLenum pname, GLfloat *params ); +GLAPI void GLAPIENTRY glGetTexLevelParameteriv( GLenum target, GLint level, + GLenum pname, GLint *params ); + + +GLAPI void GLAPIENTRY glTexImage1D( GLenum target, GLint level, + GLint internalFormat, + GLsizei width, GLint border, + GLenum format, GLenum type, + const GLvoid *pixels ); + +GLAPI void GLAPIENTRY glTexImage2D( GLenum target, GLint level, + GLint internalFormat, + GLsizei width, GLsizei height, + GLint border, GLenum format, GLenum type, + const GLvoid *pixels ); + +GLAPI void GLAPIENTRY glGetTexImage( GLenum target, GLint level, + GLenum format, GLenum type, + GLvoid *pixels ); + + +/* 1.1 functions */ + +GLAPI void GLAPIENTRY glGenTextures( GLsizei n, GLuint *textures ); + +GLAPI void GLAPIENTRY glDeleteTextures( GLsizei n, const GLuint *textures); + +GLAPI void GLAPIENTRY glBindTexture( GLenum target, GLuint texture ); + +GLAPI void GLAPIENTRY glPrioritizeTextures( GLsizei n, + const GLuint *textures, + const GLclampf *priorities ); + +GLAPI GLboolean GLAPIENTRY glAreTexturesResident( GLsizei n, + const GLuint *textures, + GLboolean *residences ); + +GLAPI GLboolean GLAPIENTRY glIsTexture( GLuint texture ); + + +GLAPI void GLAPIENTRY glTexSubImage1D( GLenum target, GLint level, + GLint xoffset, + GLsizei width, GLenum format, + GLenum type, const GLvoid *pixels ); + + +GLAPI void GLAPIENTRY glTexSubImage2D( GLenum target, GLint level, + GLint xoffset, GLint yoffset, + GLsizei width, GLsizei height, + GLenum format, GLenum type, + const GLvoid *pixels ); + + +GLAPI void GLAPIENTRY glCopyTexImage1D( GLenum target, GLint level, + GLenum internalformat, + GLint x, GLint y, + GLsizei width, GLint border ); + + +GLAPI void GLAPIENTRY glCopyTexImage2D( GLenum target, GLint level, + GLenum internalformat, + GLint x, GLint y, + GLsizei width, GLsizei height, + GLint border ); + + +GLAPI void GLAPIENTRY glCopyTexSubImage1D( GLenum target, GLint level, + GLint xoffset, GLint x, GLint y, + GLsizei width ); + + +GLAPI void GLAPIENTRY glCopyTexSubImage2D( GLenum target, GLint level, + GLint xoffset, GLint yoffset, + GLint x, GLint y, + GLsizei width, GLsizei height ); + + +/* + * Evaluators + */ + +GLAPI void GLAPIENTRY glMap1d( GLenum target, GLdouble u1, GLdouble u2, + GLint stride, + GLint order, const GLdouble *points ); +GLAPI void GLAPIENTRY glMap1f( GLenum target, GLfloat u1, GLfloat u2, + GLint stride, + GLint order, const GLfloat *points ); + +GLAPI void GLAPIENTRY glMap2d( GLenum target, + GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, + GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, + const GLdouble *points ); +GLAPI void GLAPIENTRY glMap2f( GLenum target, + GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, + GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, + const GLfloat *points ); + +GLAPI void GLAPIENTRY glGetMapdv( GLenum target, GLenum query, GLdouble *v ); +GLAPI void GLAPIENTRY glGetMapfv( GLenum target, GLenum query, GLfloat *v ); +GLAPI void GLAPIENTRY glGetMapiv( GLenum target, GLenum query, GLint *v ); + +GLAPI void GLAPIENTRY glEvalCoord1d( GLdouble u ); +GLAPI void GLAPIENTRY glEvalCoord1f( GLfloat u ); + +GLAPI void GLAPIENTRY glEvalCoord1dv( const GLdouble *u ); +GLAPI void GLAPIENTRY glEvalCoord1fv( const GLfloat *u ); + +GLAPI void GLAPIENTRY glEvalCoord2d( GLdouble u, GLdouble v ); +GLAPI void GLAPIENTRY glEvalCoord2f( GLfloat u, GLfloat v ); + +GLAPI void GLAPIENTRY glEvalCoord2dv( const GLdouble *u ); +GLAPI void GLAPIENTRY glEvalCoord2fv( const GLfloat *u ); + +GLAPI void GLAPIENTRY glMapGrid1d( GLint un, GLdouble u1, GLdouble u2 ); +GLAPI void GLAPIENTRY glMapGrid1f( GLint un, GLfloat u1, GLfloat u2 ); + +GLAPI void GLAPIENTRY glMapGrid2d( GLint un, GLdouble u1, GLdouble u2, + GLint vn, GLdouble v1, GLdouble v2 ); +GLAPI void GLAPIENTRY glMapGrid2f( GLint un, GLfloat u1, GLfloat u2, + GLint vn, GLfloat v1, GLfloat v2 ); + +GLAPI void GLAPIENTRY glEvalPoint1( GLint i ); + +GLAPI void GLAPIENTRY glEvalPoint2( GLint i, GLint j ); + +GLAPI void GLAPIENTRY glEvalMesh1( GLenum mode, GLint i1, GLint i2 ); + +GLAPI void GLAPIENTRY glEvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 ); + + +/* + * Fog + */ + +GLAPI void GLAPIENTRY glFogf( GLenum pname, GLfloat param ); + +GLAPI void GLAPIENTRY glFogi( GLenum pname, GLint param ); + +GLAPI void GLAPIENTRY glFogfv( GLenum pname, const GLfloat *params ); + +GLAPI void GLAPIENTRY glFogiv( GLenum pname, const GLint *params ); + + +/* + * Selection and Feedback + */ + +GLAPI void GLAPIENTRY glFeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer ); + +GLAPI void GLAPIENTRY glPassThrough( GLfloat token ); + +GLAPI void GLAPIENTRY glSelectBuffer( GLsizei size, GLuint *buffer ); + +GLAPI void GLAPIENTRY glInitNames( void ); + +GLAPI void GLAPIENTRY glLoadName( GLuint name ); + +GLAPI void GLAPIENTRY glPushName( GLuint name ); + +GLAPI void GLAPIENTRY glPopName( void ); + + + +/* + * OpenGL 1.2 + */ + +#define GL_RESCALE_NORMAL 0x803A +#define GL_CLAMP_TO_EDGE 0x812F +#define GL_MAX_ELEMENTS_VERTICES 0x80E8 +#define GL_MAX_ELEMENTS_INDICES 0x80E9 +#define GL_BGR 0x80E0 +#define GL_BGRA 0x80E1 +#define GL_UNSIGNED_BYTE_3_3_2 0x8032 +#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 +#define GL_UNSIGNED_SHORT_5_6_5 0x8363 +#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 +#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 +#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 +#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 +#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 +#define GL_UNSIGNED_INT_8_8_8_8 0x8035 +#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 +#define GL_UNSIGNED_INT_10_10_10_2 0x8036 +#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 +#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 +#define GL_SINGLE_COLOR 0x81F9 +#define GL_SEPARATE_SPECULAR_COLOR 0x81FA +#define GL_TEXTURE_MIN_LOD 0x813A +#define GL_TEXTURE_MAX_LOD 0x813B +#define GL_TEXTURE_BASE_LEVEL 0x813C +#define GL_TEXTURE_MAX_LEVEL 0x813D +#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 +#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 +#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 +#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 +#define GL_ALIASED_POINT_SIZE_RANGE 0x846D +#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E +#define GL_PACK_SKIP_IMAGES 0x806B +#define GL_PACK_IMAGE_HEIGHT 0x806C +#define GL_UNPACK_SKIP_IMAGES 0x806D +#define GL_UNPACK_IMAGE_HEIGHT 0x806E +#define GL_TEXTURE_3D 0x806F +#define GL_PROXY_TEXTURE_3D 0x8070 +#define GL_TEXTURE_DEPTH 0x8071 +#define GL_TEXTURE_WRAP_R 0x8072 +#define GL_MAX_3D_TEXTURE_SIZE 0x8073 +#define GL_TEXTURE_BINDING_3D 0x806A + +GLAPI void GLAPIENTRY glDrawRangeElements( GLenum mode, GLuint start, + GLuint end, GLsizei count, GLenum type, const GLvoid *indices ); + +GLAPI void GLAPIENTRY glTexImage3D( GLenum target, GLint level, + GLint internalFormat, + GLsizei width, GLsizei height, + GLsizei depth, GLint border, + GLenum format, GLenum type, + const GLvoid *pixels ); + +GLAPI void GLAPIENTRY glTexSubImage3D( GLenum target, GLint level, + GLint xoffset, GLint yoffset, + GLint zoffset, GLsizei width, + GLsizei height, GLsizei depth, + GLenum format, + GLenum type, const GLvoid *pixels); + +GLAPI void GLAPIENTRY glCopyTexSubImage3D( GLenum target, GLint level, + GLint xoffset, GLint yoffset, + GLint zoffset, GLint x, + GLint y, GLsizei width, + GLsizei height ); + +typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); +typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); +typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); +typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); + + +/* + * GL_ARB_imaging + */ + +#define GL_CONSTANT_COLOR 0x8001 +#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 +#define GL_CONSTANT_ALPHA 0x8003 +#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 +#define GL_COLOR_TABLE 0x80D0 +#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 +#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 +#define GL_PROXY_COLOR_TABLE 0x80D3 +#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 +#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 +#define GL_COLOR_TABLE_SCALE 0x80D6 +#define GL_COLOR_TABLE_BIAS 0x80D7 +#define GL_COLOR_TABLE_FORMAT 0x80D8 +#define GL_COLOR_TABLE_WIDTH 0x80D9 +#define GL_COLOR_TABLE_RED_SIZE 0x80DA +#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB +#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC +#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD +#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE +#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF +#define GL_CONVOLUTION_1D 0x8010 +#define GL_CONVOLUTION_2D 0x8011 +#define GL_SEPARABLE_2D 0x8012 +#define GL_CONVOLUTION_BORDER_MODE 0x8013 +#define GL_CONVOLUTION_FILTER_SCALE 0x8014 +#define GL_CONVOLUTION_FILTER_BIAS 0x8015 +#define GL_REDUCE 0x8016 +#define GL_CONVOLUTION_FORMAT 0x8017 +#define GL_CONVOLUTION_WIDTH 0x8018 +#define GL_CONVOLUTION_HEIGHT 0x8019 +#define GL_MAX_CONVOLUTION_WIDTH 0x801A +#define GL_MAX_CONVOLUTION_HEIGHT 0x801B +#define GL_POST_CONVOLUTION_RED_SCALE 0x801C +#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D +#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E +#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F +#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 +#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 +#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 +#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 +#define GL_CONSTANT_BORDER 0x8151 +#define GL_REPLICATE_BORDER 0x8153 +#define GL_CONVOLUTION_BORDER_COLOR 0x8154 +#define GL_COLOR_MATRIX 0x80B1 +#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 +#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 +#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 +#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 +#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 +#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 +#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 +#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 +#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA +#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB +#define GL_HISTOGRAM 0x8024 +#define GL_PROXY_HISTOGRAM 0x8025 +#define GL_HISTOGRAM_WIDTH 0x8026 +#define GL_HISTOGRAM_FORMAT 0x8027 +#define GL_HISTOGRAM_RED_SIZE 0x8028 +#define GL_HISTOGRAM_GREEN_SIZE 0x8029 +#define GL_HISTOGRAM_BLUE_SIZE 0x802A +#define GL_HISTOGRAM_ALPHA_SIZE 0x802B +#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C +#define GL_HISTOGRAM_SINK 0x802D +#define GL_MINMAX 0x802E +#define GL_MINMAX_FORMAT 0x802F +#define GL_MINMAX_SINK 0x8030 +#define GL_TABLE_TOO_LARGE 0x8031 +#define GL_BLEND_EQUATION 0x8009 +#define GL_MIN 0x8007 +#define GL_MAX 0x8008 +#define GL_FUNC_ADD 0x8006 +#define GL_FUNC_SUBTRACT 0x800A +#define GL_FUNC_REVERSE_SUBTRACT 0x800B +#define GL_BLEND_COLOR 0x8005 + + +GLAPI void GLAPIENTRY glColorTable( GLenum target, GLenum internalformat, + GLsizei width, GLenum format, + GLenum type, const GLvoid *table ); + +GLAPI void GLAPIENTRY glColorSubTable( GLenum target, + GLsizei start, GLsizei count, + GLenum format, GLenum type, + const GLvoid *data ); + +GLAPI void GLAPIENTRY glColorTableParameteriv(GLenum target, GLenum pname, + const GLint *params); + +GLAPI void GLAPIENTRY glColorTableParameterfv(GLenum target, GLenum pname, + const GLfloat *params); + +GLAPI void GLAPIENTRY glCopyColorSubTable( GLenum target, GLsizei start, + GLint x, GLint y, GLsizei width ); + +GLAPI void GLAPIENTRY glCopyColorTable( GLenum target, GLenum internalformat, + GLint x, GLint y, GLsizei width ); + +GLAPI void GLAPIENTRY glGetColorTable( GLenum target, GLenum format, + GLenum type, GLvoid *table ); + +GLAPI void GLAPIENTRY glGetColorTableParameterfv( GLenum target, GLenum pname, + GLfloat *params ); + +GLAPI void GLAPIENTRY glGetColorTableParameteriv( GLenum target, GLenum pname, + GLint *params ); + +GLAPI void GLAPIENTRY glBlendEquation( GLenum mode ); + +GLAPI void GLAPIENTRY glBlendColor( GLclampf red, GLclampf green, + GLclampf blue, GLclampf alpha ); + +GLAPI void GLAPIENTRY glHistogram( GLenum target, GLsizei width, + GLenum internalformat, GLboolean sink ); + +GLAPI void GLAPIENTRY glResetHistogram( GLenum target ); + +GLAPI void GLAPIENTRY glGetHistogram( GLenum target, GLboolean reset, + GLenum format, GLenum type, + GLvoid *values ); + +GLAPI void GLAPIENTRY glGetHistogramParameterfv( GLenum target, GLenum pname, + GLfloat *params ); + +GLAPI void GLAPIENTRY glGetHistogramParameteriv( GLenum target, GLenum pname, + GLint *params ); + +GLAPI void GLAPIENTRY glMinmax( GLenum target, GLenum internalformat, + GLboolean sink ); + +GLAPI void GLAPIENTRY glResetMinmax( GLenum target ); + +GLAPI void GLAPIENTRY glGetMinmax( GLenum target, GLboolean reset, + GLenum format, GLenum types, + GLvoid *values ); + +GLAPI void GLAPIENTRY glGetMinmaxParameterfv( GLenum target, GLenum pname, + GLfloat *params ); + +GLAPI void GLAPIENTRY glGetMinmaxParameteriv( GLenum target, GLenum pname, + GLint *params ); + +GLAPI void GLAPIENTRY glConvolutionFilter1D( GLenum target, + GLenum internalformat, GLsizei width, GLenum format, GLenum type, + const GLvoid *image ); + +GLAPI void GLAPIENTRY glConvolutionFilter2D( GLenum target, + GLenum internalformat, GLsizei width, GLsizei height, GLenum format, + GLenum type, const GLvoid *image ); + +GLAPI void GLAPIENTRY glConvolutionParameterf( GLenum target, GLenum pname, + GLfloat params ); + +GLAPI void GLAPIENTRY glConvolutionParameterfv( GLenum target, GLenum pname, + const GLfloat *params ); + +GLAPI void GLAPIENTRY glConvolutionParameteri( GLenum target, GLenum pname, + GLint params ); + +GLAPI void GLAPIENTRY glConvolutionParameteriv( GLenum target, GLenum pname, + const GLint *params ); + +GLAPI void GLAPIENTRY glCopyConvolutionFilter1D( GLenum target, + GLenum internalformat, GLint x, GLint y, GLsizei width ); + +GLAPI void GLAPIENTRY glCopyConvolutionFilter2D( GLenum target, + GLenum internalformat, GLint x, GLint y, GLsizei width, + GLsizei height); + +GLAPI void GLAPIENTRY glGetConvolutionFilter( GLenum target, GLenum format, + GLenum type, GLvoid *image ); + +GLAPI void GLAPIENTRY glGetConvolutionParameterfv( GLenum target, GLenum pname, + GLfloat *params ); + +GLAPI void GLAPIENTRY glGetConvolutionParameteriv( GLenum target, GLenum pname, + GLint *params ); + +GLAPI void GLAPIENTRY glSeparableFilter2D( GLenum target, + GLenum internalformat, GLsizei width, GLsizei height, GLenum format, + GLenum type, const GLvoid *row, const GLvoid *column ); + +GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format, + GLenum type, GLvoid *row, GLvoid *column, GLvoid *span ); + +typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); +typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); +typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); +typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); +typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table); +typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); +typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); +typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); +typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params); +typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params); +typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); +typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); +typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); +typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image); +typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); +typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); +typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); +typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); +typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); +typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); +typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink); +typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target); +typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target); + + + +/* + * OpenGL 1.3 + */ + +/* multitexture */ +#define GL_TEXTURE0 0x84C0 +#define GL_TEXTURE1 0x84C1 +#define GL_TEXTURE2 0x84C2 +#define GL_TEXTURE3 0x84C3 +#define GL_TEXTURE4 0x84C4 +#define GL_TEXTURE5 0x84C5 +#define GL_TEXTURE6 0x84C6 +#define GL_TEXTURE7 0x84C7 +#define GL_TEXTURE8 0x84C8 +#define GL_TEXTURE9 0x84C9 +#define GL_TEXTURE10 0x84CA +#define GL_TEXTURE11 0x84CB +#define GL_TEXTURE12 0x84CC +#define GL_TEXTURE13 0x84CD +#define GL_TEXTURE14 0x84CE +#define GL_TEXTURE15 0x84CF +#define GL_TEXTURE16 0x84D0 +#define GL_TEXTURE17 0x84D1 +#define GL_TEXTURE18 0x84D2 +#define GL_TEXTURE19 0x84D3 +#define GL_TEXTURE20 0x84D4 +#define GL_TEXTURE21 0x84D5 +#define GL_TEXTURE22 0x84D6 +#define GL_TEXTURE23 0x84D7 +#define GL_TEXTURE24 0x84D8 +#define GL_TEXTURE25 0x84D9 +#define GL_TEXTURE26 0x84DA +#define GL_TEXTURE27 0x84DB +#define GL_TEXTURE28 0x84DC +#define GL_TEXTURE29 0x84DD +#define GL_TEXTURE30 0x84DE +#define GL_TEXTURE31 0x84DF +#define GL_ACTIVE_TEXTURE 0x84E0 +#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 +#define GL_MAX_TEXTURE_UNITS 0x84E2 +/* texture_cube_map */ +#define GL_NORMAL_MAP 0x8511 +#define GL_REFLECTION_MAP 0x8512 +#define GL_TEXTURE_CUBE_MAP 0x8513 +#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A +#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B +#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C +/* texture_compression */ +#define GL_COMPRESSED_ALPHA 0x84E9 +#define GL_COMPRESSED_LUMINANCE 0x84EA +#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB +#define GL_COMPRESSED_INTENSITY 0x84EC +#define GL_COMPRESSED_RGB 0x84ED +#define GL_COMPRESSED_RGBA 0x84EE +#define GL_TEXTURE_COMPRESSION_HINT 0x84EF +#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 +#define GL_TEXTURE_COMPRESSED 0x86A1 +#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 +#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 +/* multisample */ +#define GL_MULTISAMPLE 0x809D +#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E +#define GL_SAMPLE_ALPHA_TO_ONE 0x809F +#define GL_SAMPLE_COVERAGE 0x80A0 +#define GL_SAMPLE_BUFFERS 0x80A8 +#define GL_SAMPLES 0x80A9 +#define GL_SAMPLE_COVERAGE_VALUE 0x80AA +#define GL_SAMPLE_COVERAGE_INVERT 0x80AB +#define GL_MULTISAMPLE_BIT 0x20000000 +/* transpose_matrix */ +#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 +#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 +#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 +#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 +/* texture_env_combine */ +#define GL_COMBINE 0x8570 +#define GL_COMBINE_RGB 0x8571 +#define GL_COMBINE_ALPHA 0x8572 +#define GL_SOURCE0_RGB 0x8580 +#define GL_SOURCE1_RGB 0x8581 +#define GL_SOURCE2_RGB 0x8582 +#define GL_SOURCE0_ALPHA 0x8588 +#define GL_SOURCE1_ALPHA 0x8589 +#define GL_SOURCE2_ALPHA 0x858A +#define GL_OPERAND0_RGB 0x8590 +#define GL_OPERAND1_RGB 0x8591 +#define GL_OPERAND2_RGB 0x8592 +#define GL_OPERAND0_ALPHA 0x8598 +#define GL_OPERAND1_ALPHA 0x8599 +#define GL_OPERAND2_ALPHA 0x859A +#define GL_RGB_SCALE 0x8573 +#define GL_ADD_SIGNED 0x8574 +#define GL_INTERPOLATE 0x8575 +#define GL_SUBTRACT 0x84E7 +#define GL_CONSTANT 0x8576 +#define GL_PRIMARY_COLOR 0x8577 +#define GL_PREVIOUS 0x8578 +/* texture_env_dot3 */ +#define GL_DOT3_RGB 0x86AE +#define GL_DOT3_RGBA 0x86AF +/* texture_border_clamp */ +#define GL_CLAMP_TO_BORDER 0x812D + +GLAPI void GLAPIENTRY glActiveTexture( GLenum texture ); + +GLAPI void GLAPIENTRY glClientActiveTexture( GLenum texture ); + +GLAPI void GLAPIENTRY glCompressedTexImage1D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data ); + +GLAPI void GLAPIENTRY glCompressedTexImage2D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data ); + +GLAPI void GLAPIENTRY glCompressedTexImage3D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data ); + +GLAPI void GLAPIENTRY glCompressedTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data ); + +GLAPI void GLAPIENTRY glCompressedTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data ); + +GLAPI void GLAPIENTRY glCompressedTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data ); + +GLAPI void GLAPIENTRY glGetCompressedTexImage( GLenum target, GLint lod, GLvoid *img ); + +GLAPI void GLAPIENTRY glMultiTexCoord1d( GLenum target, GLdouble s ); + +GLAPI void GLAPIENTRY glMultiTexCoord1dv( GLenum target, const GLdouble *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord1f( GLenum target, GLfloat s ); + +GLAPI void GLAPIENTRY glMultiTexCoord1fv( GLenum target, const GLfloat *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord1i( GLenum target, GLint s ); + +GLAPI void GLAPIENTRY glMultiTexCoord1iv( GLenum target, const GLint *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord1s( GLenum target, GLshort s ); + +GLAPI void GLAPIENTRY glMultiTexCoord1sv( GLenum target, const GLshort *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord2d( GLenum target, GLdouble s, GLdouble t ); + +GLAPI void GLAPIENTRY glMultiTexCoord2dv( GLenum target, const GLdouble *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord2f( GLenum target, GLfloat s, GLfloat t ); + +GLAPI void GLAPIENTRY glMultiTexCoord2fv( GLenum target, const GLfloat *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord2i( GLenum target, GLint s, GLint t ); + +GLAPI void GLAPIENTRY glMultiTexCoord2iv( GLenum target, const GLint *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord2s( GLenum target, GLshort s, GLshort t ); + +GLAPI void GLAPIENTRY glMultiTexCoord2sv( GLenum target, const GLshort *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord3d( GLenum target, GLdouble s, GLdouble t, GLdouble r ); + +GLAPI void GLAPIENTRY glMultiTexCoord3dv( GLenum target, const GLdouble *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord3f( GLenum target, GLfloat s, GLfloat t, GLfloat r ); + +GLAPI void GLAPIENTRY glMultiTexCoord3fv( GLenum target, const GLfloat *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord3i( GLenum target, GLint s, GLint t, GLint r ); + +GLAPI void GLAPIENTRY glMultiTexCoord3iv( GLenum target, const GLint *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord3s( GLenum target, GLshort s, GLshort t, GLshort r ); + +GLAPI void GLAPIENTRY glMultiTexCoord3sv( GLenum target, const GLshort *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord4d( GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q ); + +GLAPI void GLAPIENTRY glMultiTexCoord4dv( GLenum target, const GLdouble *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord4f( GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q ); + +GLAPI void GLAPIENTRY glMultiTexCoord4fv( GLenum target, const GLfloat *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord4i( GLenum target, GLint s, GLint t, GLint r, GLint q ); + +GLAPI void GLAPIENTRY glMultiTexCoord4iv( GLenum target, const GLint *v ); + +GLAPI void GLAPIENTRY glMultiTexCoord4s( GLenum target, GLshort s, GLshort t, GLshort r, GLshort q ); + +GLAPI void GLAPIENTRY glMultiTexCoord4sv( GLenum target, const GLshort *v ); + + +GLAPI void GLAPIENTRY glLoadTransposeMatrixd( const GLdouble m[16] ); + +GLAPI void GLAPIENTRY glLoadTransposeMatrixf( const GLfloat m[16] ); + +GLAPI void GLAPIENTRY glMultTransposeMatrixd( const GLdouble m[16] ); + +GLAPI void GLAPIENTRY glMultTransposeMatrixf( const GLfloat m[16] ); + +GLAPI void GLAPIENTRY glSampleCoverage( GLclampf value, GLboolean invert ); + +typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture); +typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v); +typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m); +typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m); +typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m); +typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m); +typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, void *img); + + +/* + * GL_ARB_multitexture (ARB extension 1 and OpenGL 1.2.1) + */ +#ifndef GL_ARB_multitexture +#define GL_ARB_multitexture 1 + +#define GL_TEXTURE0_ARB 0x84C0 +#define GL_TEXTURE1_ARB 0x84C1 +#define GL_TEXTURE2_ARB 0x84C2 +#define GL_TEXTURE3_ARB 0x84C3 +#define GL_TEXTURE4_ARB 0x84C4 +#define GL_TEXTURE5_ARB 0x84C5 +#define GL_TEXTURE6_ARB 0x84C6 +#define GL_TEXTURE7_ARB 0x84C7 +#define GL_TEXTURE8_ARB 0x84C8 +#define GL_TEXTURE9_ARB 0x84C9 +#define GL_TEXTURE10_ARB 0x84CA +#define GL_TEXTURE11_ARB 0x84CB +#define GL_TEXTURE12_ARB 0x84CC +#define GL_TEXTURE13_ARB 0x84CD +#define GL_TEXTURE14_ARB 0x84CE +#define GL_TEXTURE15_ARB 0x84CF +#define GL_TEXTURE16_ARB 0x84D0 +#define GL_TEXTURE17_ARB 0x84D1 +#define GL_TEXTURE18_ARB 0x84D2 +#define GL_TEXTURE19_ARB 0x84D3 +#define GL_TEXTURE20_ARB 0x84D4 +#define GL_TEXTURE21_ARB 0x84D5 +#define GL_TEXTURE22_ARB 0x84D6 +#define GL_TEXTURE23_ARB 0x84D7 +#define GL_TEXTURE24_ARB 0x84D8 +#define GL_TEXTURE25_ARB 0x84D9 +#define GL_TEXTURE26_ARB 0x84DA +#define GL_TEXTURE27_ARB 0x84DB +#define GL_TEXTURE28_ARB 0x84DC +#define GL_TEXTURE29_ARB 0x84DD +#define GL_TEXTURE30_ARB 0x84DE +#define GL_TEXTURE31_ARB 0x84DF +#define GL_ACTIVE_TEXTURE_ARB 0x84E0 +#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 +#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 + +GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture); +GLAPI void GLAPIENTRY glClientActiveTextureARB(GLenum texture); +GLAPI void GLAPIENTRY glMultiTexCoord1dARB(GLenum target, GLdouble s); +GLAPI void GLAPIENTRY glMultiTexCoord1dvARB(GLenum target, const GLdouble *v); +GLAPI void GLAPIENTRY glMultiTexCoord1fARB(GLenum target, GLfloat s); +GLAPI void GLAPIENTRY glMultiTexCoord1fvARB(GLenum target, const GLfloat *v); +GLAPI void GLAPIENTRY glMultiTexCoord1iARB(GLenum target, GLint s); +GLAPI void GLAPIENTRY glMultiTexCoord1ivARB(GLenum target, const GLint *v); +GLAPI void GLAPIENTRY glMultiTexCoord1sARB(GLenum target, GLshort s); +GLAPI void GLAPIENTRY glMultiTexCoord1svARB(GLenum target, const GLshort *v); +GLAPI void GLAPIENTRY glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t); +GLAPI void GLAPIENTRY glMultiTexCoord2dvARB(GLenum target, const GLdouble *v); +GLAPI void GLAPIENTRY glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t); +GLAPI void GLAPIENTRY glMultiTexCoord2fvARB(GLenum target, const GLfloat *v); +GLAPI void GLAPIENTRY glMultiTexCoord2iARB(GLenum target, GLint s, GLint t); +GLAPI void GLAPIENTRY glMultiTexCoord2ivARB(GLenum target, const GLint *v); +GLAPI void GLAPIENTRY glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t); +GLAPI void GLAPIENTRY glMultiTexCoord2svARB(GLenum target, const GLshort *v); +GLAPI void GLAPIENTRY glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r); +GLAPI void GLAPIENTRY glMultiTexCoord3dvARB(GLenum target, const GLdouble *v); +GLAPI void GLAPIENTRY glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r); +GLAPI void GLAPIENTRY glMultiTexCoord3fvARB(GLenum target, const GLfloat *v); +GLAPI void GLAPIENTRY glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r); +GLAPI void GLAPIENTRY glMultiTexCoord3ivARB(GLenum target, const GLint *v); +GLAPI void GLAPIENTRY glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r); +GLAPI void GLAPIENTRY glMultiTexCoord3svARB(GLenum target, const GLshort *v); +GLAPI void GLAPIENTRY glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); +GLAPI void GLAPIENTRY glMultiTexCoord4dvARB(GLenum target, const GLdouble *v); +GLAPI void GLAPIENTRY glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); +GLAPI void GLAPIENTRY glMultiTexCoord4fvARB(GLenum target, const GLfloat *v); +GLAPI void GLAPIENTRY glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q); +GLAPI void GLAPIENTRY glMultiTexCoord4ivARB(GLenum target, const GLint *v); +GLAPI void GLAPIENTRY glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); +GLAPI void GLAPIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v); + +typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture); +typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v); + +#endif /* GL_ARB_multitexture */ + + + +/* + * Define this token if you want "old-style" header file behaviour (extensions + * defined in gl.h). Otherwise, extensions will be included from glext.h. + */ +#if defined(GL_GLEXT_LEGACY) + +/* All extensions that used to be here are now found in glext.h */ + +#else /* GL_GLEXT_LEGACY */ + +#include + +#endif /* GL_GLEXT_LEGACY */ + + + +#if GL_ARB_shader_objects + +#ifndef GL_MESA_shader_debug +#define GL_MESA_shader_debug 1 + +#define GL_DEBUG_OBJECT_MESA 0x8759 +#define GL_DEBUG_PRINT_MESA 0x875A +#define GL_DEBUG_ASSERT_MESA 0x875B + +GLAPI GLhandleARB GLAPIENTRY glCreateDebugObjectMESA (void); +GLAPI void GLAPIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType); +GLAPI void GLAPIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength, + GLsizei *length, GLcharARB *debugLog); +GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType); + +#endif /* GL_MESA_shader_debug */ + +#endif /* GL_ARB_shader_objects */ + + +/* + * ???. GL_MESA_packed_depth_stencil + * XXX obsolete + */ +#ifndef GL_MESA_packed_depth_stencil +#define GL_MESA_packed_depth_stencil 1 + +#define GL_DEPTH_STENCIL_MESA 0x8750 +#define GL_UNSIGNED_INT_24_8_MESA 0x8751 +#define GL_UNSIGNED_INT_8_24_REV_MESA 0x8752 +#define GL_UNSIGNED_SHORT_15_1_MESA 0x8753 +#define GL_UNSIGNED_SHORT_1_15_REV_MESA 0x8754 + +#endif /* GL_MESA_packed_depth_stencil */ + + +#ifndef GL_MESA_program_debug +#define GL_MESA_program_debug 1 + +#define GL_FRAGMENT_PROGRAM_POSITION_MESA 0x8bb0 +#define GL_FRAGMENT_PROGRAM_CALLBACK_MESA 0x8bb1 +#define GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA 0x8bb2 +#define GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA 0x8bb3 +#define GL_VERTEX_PROGRAM_POSITION_MESA 0x8bb4 +#define GL_VERTEX_PROGRAM_CALLBACK_MESA 0x8bb5 +#define GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA 0x8bb6 +#define GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA 0x8bb7 + +typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data); + +GLAPI void GLAPIENTRY glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback, GLvoid *data); + +GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, GLfloat *v); + +#endif /* GL_MESA_program_debug */ + + +#ifndef GL_ATI_blend_equation_separate +#define GL_ATI_blend_equation_separate 1 + +#define GL_ALPHA_BLEND_EQUATION_ATI 0x883D + +GLAPI void GLAPIENTRY glBlendEquationSeparateATI( GLenum modeRGB, GLenum modeA ); +typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLenum modeA); + +#endif /* GL_ATI_blend_equation_separate */ + + + +/** + ** NOTE!!!!! If you add new functions to this file, or update + ** glext.h be sure to regenerate the gl_mangle.h file. See comments + ** in that file for details. + **/ + + + +/********************************************************************** + * Begin system-specific stuff + */ +#if defined(PRAGMA_EXPORT_SUPPORTED) +#pragma export off +#endif + +#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED +#pragma import off +#endif +/* + * End system-specific stuff + **********************************************************************/ + + +#ifdef __cplusplus +} +#endif + +#endif /* __gl_h_ */ diff -Nru opencpn-plugin-weatherfax-1.3.1/include/GL/glu.h opencpn-plugin-weatherfax-1.5001.0/include/GL/glu.h --- opencpn-plugin-weatherfax-1.3.1/include/GL/glu.h 1970-01-01 00:00:00.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/include/GL/glu.h 2016-02-25 19:25:30.000000000 +0000 @@ -0,0 +1,348 @@ +/* +** License Applicability. Except to the extent portions of this file are +** made subject to an alternative license as permitted in the SGI Free +** Software License B, Version 1.1 (the "License"), the contents of this +** file are subject only to the provisions of the License. You may not use +** this file except in compliance with the License. You may obtain a copy +** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 +** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: +** +** http://oss.sgi.com/projects/FreeB +** +** Note that, as provided in the License, the Software is distributed on an +** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS +** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND +** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A +** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. +** +** Original Code. The Original Code is: OpenGL Sample Implementation, +** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, +** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. +** Copyright in any portions created by third parties is as indicated +** elsewhere herein. All Rights Reserved. +** +** Additional Notice Provisions: This software was created using the +** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has +** not been independently verified as being compliant with the OpenGL(R) +** version 1.2.1 Specification. +*/ + +#ifndef __glu_h__ +#define __glu_h__ + +#if defined(USE_MGL_NAMESPACE) +#include "glu_mangle.h" +#endif + +#include + +#ifndef GLAPIENTRY +#define GLAPIENTRY +#endif + +#ifndef GLAPIENTRYP +#define GLAPIENTRYP GLAPIENTRY * +#endif + +#if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GLU32) +# undef GLAPI +# define GLAPI __declspec(dllexport) +#elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) +/* tag specifying we're building for DLL runtime support */ +# undef GLAPI +# define GLAPI __declspec(dllimport) +#elif !defined(GLAPI) +/* for use with static link lib build of Win32 edition only */ +# define GLAPI extern +#endif /* _STATIC_MESA support */ + +#ifdef __cplusplus +extern "C" { +#endif + +/*************************************************************/ + +/* Extensions */ +#define GLU_EXT_object_space_tess 1 +#define GLU_EXT_nurbs_tessellator 1 + +/* Boolean */ +#define GLU_FALSE 0 +#define GLU_TRUE 1 + +/* Version */ +#define GLU_VERSION_1_1 1 +#define GLU_VERSION_1_2 1 +#define GLU_VERSION_1_3 1 + +/* StringName */ +#define GLU_VERSION 100800 +#define GLU_EXTENSIONS 100801 + +/* ErrorCode */ +#define GLU_INVALID_ENUM 100900 +#define GLU_INVALID_VALUE 100901 +#define GLU_OUT_OF_MEMORY 100902 +#define GLU_INCOMPATIBLE_GL_VERSION 100903 +#define GLU_INVALID_OPERATION 100904 + +/* NurbsDisplay */ +/* GLU_FILL */ +#define GLU_OUTLINE_POLYGON 100240 +#define GLU_OUTLINE_PATCH 100241 + +/* NurbsCallback */ +#define GLU_NURBS_ERROR 100103 +#define GLU_ERROR 100103 +#define GLU_NURBS_BEGIN 100164 +#define GLU_NURBS_BEGIN_EXT 100164 +#define GLU_NURBS_VERTEX 100165 +#define GLU_NURBS_VERTEX_EXT 100165 +#define GLU_NURBS_NORMAL 100166 +#define GLU_NURBS_NORMAL_EXT 100166 +#define GLU_NURBS_COLOR 100167 +#define GLU_NURBS_COLOR_EXT 100167 +#define GLU_NURBS_TEXTURE_COORD 100168 +#define GLU_NURBS_TEX_COORD_EXT 100168 +#define GLU_NURBS_END 100169 +#define GLU_NURBS_END_EXT 100169 +#define GLU_NURBS_BEGIN_DATA 100170 +#define GLU_NURBS_BEGIN_DATA_EXT 100170 +#define GLU_NURBS_VERTEX_DATA 100171 +#define GLU_NURBS_VERTEX_DATA_EXT 100171 +#define GLU_NURBS_NORMAL_DATA 100172 +#define GLU_NURBS_NORMAL_DATA_EXT 100172 +#define GLU_NURBS_COLOR_DATA 100173 +#define GLU_NURBS_COLOR_DATA_EXT 100173 +#define GLU_NURBS_TEXTURE_COORD_DATA 100174 +#define GLU_NURBS_TEX_COORD_DATA_EXT 100174 +#define GLU_NURBS_END_DATA 100175 +#define GLU_NURBS_END_DATA_EXT 100175 + +/* NurbsError */ +#define GLU_NURBS_ERROR1 100251 +#define GLU_NURBS_ERROR2 100252 +#define GLU_NURBS_ERROR3 100253 +#define GLU_NURBS_ERROR4 100254 +#define GLU_NURBS_ERROR5 100255 +#define GLU_NURBS_ERROR6 100256 +#define GLU_NURBS_ERROR7 100257 +#define GLU_NURBS_ERROR8 100258 +#define GLU_NURBS_ERROR9 100259 +#define GLU_NURBS_ERROR10 100260 +#define GLU_NURBS_ERROR11 100261 +#define GLU_NURBS_ERROR12 100262 +#define GLU_NURBS_ERROR13 100263 +#define GLU_NURBS_ERROR14 100264 +#define GLU_NURBS_ERROR15 100265 +#define GLU_NURBS_ERROR16 100266 +#define GLU_NURBS_ERROR17 100267 +#define GLU_NURBS_ERROR18 100268 +#define GLU_NURBS_ERROR19 100269 +#define GLU_NURBS_ERROR20 100270 +#define GLU_NURBS_ERROR21 100271 +#define GLU_NURBS_ERROR22 100272 +#define GLU_NURBS_ERROR23 100273 +#define GLU_NURBS_ERROR24 100274 +#define GLU_NURBS_ERROR25 100275 +#define GLU_NURBS_ERROR26 100276 +#define GLU_NURBS_ERROR27 100277 +#define GLU_NURBS_ERROR28 100278 +#define GLU_NURBS_ERROR29 100279 +#define GLU_NURBS_ERROR30 100280 +#define GLU_NURBS_ERROR31 100281 +#define GLU_NURBS_ERROR32 100282 +#define GLU_NURBS_ERROR33 100283 +#define GLU_NURBS_ERROR34 100284 +#define GLU_NURBS_ERROR35 100285 +#define GLU_NURBS_ERROR36 100286 +#define GLU_NURBS_ERROR37 100287 + +/* NurbsProperty */ +#define GLU_AUTO_LOAD_MATRIX 100200 +#define GLU_CULLING 100201 +#define GLU_SAMPLING_TOLERANCE 100203 +#define GLU_DISPLAY_MODE 100204 +#define GLU_PARAMETRIC_TOLERANCE 100202 +#define GLU_SAMPLING_METHOD 100205 +#define GLU_U_STEP 100206 +#define GLU_V_STEP 100207 +#define GLU_NURBS_MODE 100160 +#define GLU_NURBS_MODE_EXT 100160 +#define GLU_NURBS_TESSELLATOR 100161 +#define GLU_NURBS_TESSELLATOR_EXT 100161 +#define GLU_NURBS_RENDERER 100162 +#define GLU_NURBS_RENDERER_EXT 100162 + +/* NurbsSampling */ +#define GLU_OBJECT_PARAMETRIC_ERROR 100208 +#define GLU_OBJECT_PARAMETRIC_ERROR_EXT 100208 +#define GLU_OBJECT_PATH_LENGTH 100209 +#define GLU_OBJECT_PATH_LENGTH_EXT 100209 +#define GLU_PATH_LENGTH 100215 +#define GLU_PARAMETRIC_ERROR 100216 +#define GLU_DOMAIN_DISTANCE 100217 + +/* NurbsTrim */ +#define GLU_MAP1_TRIM_2 100210 +#define GLU_MAP1_TRIM_3 100211 + +/* QuadricDrawStyle */ +#define GLU_POINT 100010 +#define GLU_LINE 100011 +#define GLU_FILL 100012 +#define GLU_SILHOUETTE 100013 + +/* QuadricCallback */ +/* GLU_ERROR */ + +/* QuadricNormal */ +#define GLU_SMOOTH 100000 +#define GLU_FLAT 100001 +#define GLU_NONE 100002 + +/* QuadricOrientation */ +#define GLU_OUTSIDE 100020 +#define GLU_INSIDE 100021 + +/* TessCallback */ +#define GLU_TESS_BEGIN 100100 +#define GLU_BEGIN 100100 +#define GLU_TESS_VERTEX 100101 +#define GLU_VERTEX 100101 +#define GLU_TESS_END 100102 +#define GLU_END 100102 +#define GLU_TESS_ERROR 100103 +#define GLU_TESS_EDGE_FLAG 100104 +#define GLU_EDGE_FLAG 100104 +#define GLU_TESS_COMBINE 100105 +#define GLU_TESS_BEGIN_DATA 100106 +#define GLU_TESS_VERTEX_DATA 100107 +#define GLU_TESS_END_DATA 100108 +#define GLU_TESS_ERROR_DATA 100109 +#define GLU_TESS_EDGE_FLAG_DATA 100110 +#define GLU_TESS_COMBINE_DATA 100111 + +/* TessContour */ +#define GLU_CW 100120 +#define GLU_CCW 100121 +#define GLU_INTERIOR 100122 +#define GLU_EXTERIOR 100123 +#define GLU_UNKNOWN 100124 + +/* TessProperty */ +#define GLU_TESS_WINDING_RULE 100140 +#define GLU_TESS_BOUNDARY_ONLY 100141 +#define GLU_TESS_TOLERANCE 100142 + +/* TessError */ +#define GLU_TESS_ERROR1 100151 +#define GLU_TESS_ERROR2 100152 +#define GLU_TESS_ERROR3 100153 +#define GLU_TESS_ERROR4 100154 +#define GLU_TESS_ERROR5 100155 +#define GLU_TESS_ERROR6 100156 +#define GLU_TESS_ERROR7 100157 +#define GLU_TESS_ERROR8 100158 +#define GLU_TESS_MISSING_BEGIN_POLYGON 100151 +#define GLU_TESS_MISSING_BEGIN_CONTOUR 100152 +#define GLU_TESS_MISSING_END_POLYGON 100153 +#define GLU_TESS_MISSING_END_CONTOUR 100154 +#define GLU_TESS_COORD_TOO_LARGE 100155 +#define GLU_TESS_NEED_COMBINE_CALLBACK 100156 + +/* TessWinding */ +#define GLU_TESS_WINDING_ODD 100130 +#define GLU_TESS_WINDING_NONZERO 100131 +#define GLU_TESS_WINDING_POSITIVE 100132 +#define GLU_TESS_WINDING_NEGATIVE 100133 +#define GLU_TESS_WINDING_ABS_GEQ_TWO 100134 + +/*************************************************************/ + + +#ifdef __cplusplus +class GLUnurbs; +class GLUquadric; +class GLUtesselator; +#else +typedef struct GLUnurbs GLUnurbs; +typedef struct GLUquadric GLUquadric; +typedef struct GLUtesselator GLUtesselator; +#endif + +typedef GLUnurbs GLUnurbsObj; +typedef GLUquadric GLUquadricObj; +typedef GLUtesselator GLUtesselatorObj; +typedef GLUtesselator GLUtriangulatorObj; + +#define GLU_TESS_MAX_COORD 1.0e150 + +/* Internal convenience typedefs */ +typedef void (GLAPIENTRYP _GLUfuncptr)(); + +GLAPI void GLAPIENTRY gluBeginCurve (GLUnurbs* nurb); +GLAPI void GLAPIENTRY gluBeginPolygon (GLUtesselator* tess); +GLAPI void GLAPIENTRY gluBeginSurface (GLUnurbs* nurb); +GLAPI void GLAPIENTRY gluBeginTrim (GLUnurbs* nurb); +GLAPI GLint GLAPIENTRY gluBuild1DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data); +GLAPI GLint GLAPIENTRY gluBuild1DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data); +GLAPI GLint GLAPIENTRY gluBuild2DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data); +GLAPI GLint GLAPIENTRY gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data); +GLAPI GLint GLAPIENTRY gluBuild3DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data); +GLAPI GLint GLAPIENTRY gluBuild3DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data); +GLAPI GLboolean GLAPIENTRY gluCheckExtension (const GLubyte *extName, const GLubyte *extString); +GLAPI void GLAPIENTRY gluCylinder (GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks); +GLAPI void GLAPIENTRY gluDeleteNurbsRenderer (GLUnurbs* nurb); +GLAPI void GLAPIENTRY gluDeleteQuadric (GLUquadric* quad); +GLAPI void GLAPIENTRY gluDeleteTess (GLUtesselator* tess); +GLAPI void GLAPIENTRY gluDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops); +GLAPI void GLAPIENTRY gluEndCurve (GLUnurbs* nurb); +GLAPI void GLAPIENTRY gluEndPolygon (GLUtesselator* tess); +GLAPI void GLAPIENTRY gluEndSurface (GLUnurbs* nurb); +GLAPI void GLAPIENTRY gluEndTrim (GLUnurbs* nurb); +GLAPI const GLubyte * GLAPIENTRY gluErrorString (GLenum error); +GLAPI void GLAPIENTRY gluGetNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat* data); +GLAPI const GLubyte * GLAPIENTRY gluGetString (GLenum name); +GLAPI void GLAPIENTRY gluGetTessProperty (GLUtesselator* tess, GLenum which, GLdouble* data); +GLAPI void GLAPIENTRY gluLoadSamplingMatrices (GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view); +GLAPI void GLAPIENTRY gluLookAt (GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ); +GLAPI GLUnurbs* GLAPIENTRY gluNewNurbsRenderer (void); +GLAPI GLUquadric* GLAPIENTRY gluNewQuadric (void); +GLAPI GLUtesselator* GLAPIENTRY gluNewTess (void); +GLAPI void GLAPIENTRY gluNextContour (GLUtesselator* tess, GLenum type); +GLAPI void GLAPIENTRY gluNurbsCallback (GLUnurbs* nurb, GLenum which, _GLUfuncptr CallBackFunc); +GLAPI void GLAPIENTRY gluNurbsCallbackData (GLUnurbs* nurb, GLvoid* userData); +GLAPI void GLAPIENTRY gluNurbsCallbackDataEXT (GLUnurbs* nurb, GLvoid* userData); +GLAPI void GLAPIENTRY gluNurbsCurve (GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type); +GLAPI void GLAPIENTRY gluNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat value); +GLAPI void GLAPIENTRY gluNurbsSurface (GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type); +GLAPI void GLAPIENTRY gluOrtho2D (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top); +GLAPI void GLAPIENTRY gluPartialDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep); +GLAPI void GLAPIENTRY gluPerspective (GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar); +GLAPI void GLAPIENTRY gluPickMatrix (GLdouble x, GLdouble y, GLdouble delX, GLdouble delY, GLint *viewport); +GLAPI GLint GLAPIENTRY gluProject (GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* winX, GLdouble* winY, GLdouble* winZ); +GLAPI void GLAPIENTRY gluPwlCurve (GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type); +GLAPI void GLAPIENTRY gluQuadricCallback (GLUquadric* quad, GLenum which, _GLUfuncptr CallBackFunc); +GLAPI void GLAPIENTRY gluQuadricDrawStyle (GLUquadric* quad, GLenum draw); +GLAPI void GLAPIENTRY gluQuadricNormals (GLUquadric* quad, GLenum normal); +GLAPI void GLAPIENTRY gluQuadricOrientation (GLUquadric* quad, GLenum orientation); +GLAPI void GLAPIENTRY gluQuadricTexture (GLUquadric* quad, GLboolean texture); +GLAPI GLint GLAPIENTRY gluScaleImage (GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid* dataOut); +GLAPI void GLAPIENTRY gluSphere (GLUquadric* quad, GLdouble radius, GLint slices, GLint stacks); +GLAPI void GLAPIENTRY gluTessBeginContour (GLUtesselator* tess); +GLAPI void GLAPIENTRY gluTessBeginPolygon (GLUtesselator* tess, GLvoid* data); +GLAPI void GLAPIENTRY gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc); +GLAPI void GLAPIENTRY gluTessEndContour (GLUtesselator* tess); +GLAPI void GLAPIENTRY gluTessEndPolygon (GLUtesselator* tess); +GLAPI void GLAPIENTRY gluTessNormal (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ); +GLAPI void GLAPIENTRY gluTessProperty (GLUtesselator* tess, GLenum which, GLdouble data); +GLAPI void GLAPIENTRY gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvoid* data); +GLAPI GLint GLAPIENTRY gluUnProject (GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* objX, GLdouble* objY, GLdouble* objZ); +GLAPI GLint GLAPIENTRY gluUnProject4 (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble nearVal, GLdouble farVal, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW); + +#ifdef __cplusplus +} +#endif + +#endif /* __glu_h__ */ diff -Nru opencpn-plugin-weatherfax-1.3.1/po/ca.po opencpn-plugin-weatherfax-1.5001.0/po/ca.po --- opencpn-plugin-weatherfax-1.3.1/po/ca.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/ca.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:23-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2015-12-31 15:36-0500\n" "Last-Translator: nohal \n" "Language-Team: Catalan\n" "Language: ca_ES\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: ca\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "Fax Meteorològic" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "Preferències de WeatherFax" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "Opcions de decodificació del Fax" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "Sobre Weatherfax" @@ -67,7 +66,7 @@ #: src/WeatherFaxUI.cpp:74 msgid "Save &As" -msgstr "" +msgstr "Desa &com" #: src/WeatherFaxUI.cpp:77 msgid "&Edit" @@ -155,7 +154,7 @@ msgid "None" msgstr "Cap" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "Freqüència" @@ -181,7 +180,7 @@ #: src/WeatherFaxUI.cpp:350 msgid "Clear Captures" -msgstr "" +msgstr "Netejar Captures" #: src/WeatherFaxUI.cpp:360 src/WeatherFaxUI.cpp:830 src/WeatherFaxUI.cpp:1530 msgid "Filter" @@ -193,11 +192,11 @@ #: src/WeatherFaxUI.cpp:377 msgid "Sound" -msgstr "" +msgstr "So" #: src/WeatherFaxUI.cpp:380 msgid "Select a file" -msgstr "" +msgstr "Seleccioneu un fitxer" #: src/WeatherFaxUI.cpp:392 msgid "External Alarm" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "Cap acció" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "Captura d'àudio" @@ -236,11 +235,17 @@ msgstr "Opcions de captura" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." -msgstr "Seleccionar una imatge Fax clicant en la (primera) columna “Capturar”\n\nEls horaris es poden ordenar clicant a la capçalera de la columna\n\nEls horaris s’han de provar ja que l’autor només pot rebre d'algunes de les emissores possibles. Es poden realitzar correccions modificant el fitxer WeatherFaxSchedules.xml. Els canvis es poden presentar via github.\n\nUna ràdio BLU (Banda Lateral Única, trad. de l’anglès SSD radio) amb control automàtic és desitjable, així, no obstant això, l'autor només té una Tecsun pl-600. Si es pot fer dnació d’una ràdio adequada pot ser donada, s'implementarà el suport." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgstr "Seleccionar una imatge Fax clicant en la (primera) columna “Capturar”\n\n" +"Els horaris es poden ordenar clicant a la capçalera de la columna\n\n" +"Els horaris s’han de provar ja que l’autor només pot rebre d'algunes de les emissores possibles. Es poden realitzar correccions modificant el fitxer WeatherFaxSchedules.xml. Els canvis es poden presentar via github.\n\n" +"Una ràdio BLU (Banda Lateral Única, trad. de l’anglès SSD radio) amb control automàtic és desitjable, així, no obstant això, l'autor només té una Tecsun pl-600. Si es pot fer dnació d’una ràdio adequada pot ser donada, s'implementarà el suport." #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "Informació" @@ -248,13 +253,13 @@ msgid "Capture Status" msgstr "Estat de les captures" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "Tancar" #: src/WeatherFaxUI.cpp:621 msgid "Retrieve Scheduled" -msgstr "" +msgstr "Recuperar la programació" #: src/WeatherFaxUI.cpp:624 msgid "Retrieve Selected" @@ -272,8 +277,8 @@ msgid "Decoder" msgstr "Descodificador" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "Parar" @@ -299,7 +304,7 @@ #: src/WeatherFaxUI.cpp:834 msgid "Removal 3" -msgstr "" +msgstr "Eliminació 3" #: src/WeatherFaxUI.cpp:834 msgid "Value 1" @@ -357,15 +362,17 @@ #: src/WeatherFaxUI.cpp:931 msgid "Minutes" -msgstr "" +msgstr "Minuts" #: src/WeatherFaxUI.cpp:998 msgid "Show Lat/Lon Minutes" -msgstr "" +msgstr "Mostrar els minuts a Lat/Lon" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" -msgstr "+ Lat/Lon per a N/E\n-Lat/Lon per a S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" +msgstr "+ Lat/Lon per a N/E\n" +"-Lat/Lon per a S/W" #: src/WeatherFaxUI.cpp:1019 msgid "Coordinates Mapping Correction" @@ -403,8 +410,7 @@ msgid "Size" msgstr "Tamany" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "1" @@ -462,7 +468,7 @@ #: src/WeatherFaxUI.cpp:1408 msgid "Recommended 4, 16, 64, or 256" -msgstr "" +msgstr "Recomanat 4, 16, 64 o 256" #: src/WeatherFaxUI.cpp:1413 msgid "Depth" @@ -517,8 +523,10 @@ msgstr "Llindar de saturació" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" -msgstr "Saltar començament, aturada i \ndetecció de fase" +msgid "Skip start, stop and \n" +"phasing detection" +msgstr "Saltar començament, aturada i \n" +"detecció de fase" #: src/WeatherFaxUI.cpp:1553 msgid "Include header data in image" @@ -544,389 +552,430 @@ msgid "48000" msgstr "48000" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "Índex del dispositiu" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "Fet" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" -msgstr "Versió del complement WeatherFax" +msgstr "Versió del Connector WeatherFax" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." -msgstr "El Complement Weatherfax per a OpenCPN està dissenyat per reduir el nombre d’accions de l'usuari, en rebre un fax metereològic i la superposició opcional a la cartografia.\n\nAquest inclou un descodificador que converteix els ràdio audio fax en imatges.\n\nPer començar, obrir una imatge o un arxiu de gravació d'àudio wav, d'una transmissió de fax de ràdio SSB desada al menú Arxiu, o seleccioneu una opció del menú de recuperar.\n\nCodi Font:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMoltes gràcies als traductors i provadors." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." +msgstr "El Conector Weatherfax per a OpenCPN està dissenyat per reduir el nombre d’accions de l'usuari, en rebre un fax metereològic i la superposició opcional a la cartografia.\n\n" +"Aquest inclou un descodificador que converteix els ràdio audio fax en imatges.\n\n" +"Per començar, obrir una imatge o un arxiu de gravació d'àudio wav, d'una transmissió de fax de ràdio SSB desada al menú Arxiu, o seleccioneu una opció del menú de recuperar.\n\n" +"Codi Font:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Moltes gràcies als traductors i provadors." -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "Sobre l'autor" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "Programat" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "Servidor" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "Regió" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "Continguts" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "Mapa de l'àrea" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "No s'ha pogut carregar el fitxer: " -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "Fitxer xml no vàlid" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" msgstr "Recuperar WeatherFax d'internet" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "Carregant" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "Iterator no vàlid: " -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "Node xml desconegut: " -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "No ha pogut fer coincidir l'Àrea: " -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "La classificació aquests urls podria durar massa temps" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "weatherfax" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" -msgstr "Fax ja recuperat fa menys de 180 minuts.\nUsar arxiu existent?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" +msgstr "Fax ja recuperat fa menys de 180 minuts.\n" +"Usar arxiu existent?" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" +msgstr "Recuperar WeatherFax d'internet" + +#: src/InternetRetrievalDialog.cpp:584 msgid "Reading Headers: " msgstr "Llegint les capçaleres: " -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" -msgstr "" - -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " -msgstr "esgotat el temps d'espera dels encapçalaments per: " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " +msgstr "Error en la descàrrega: " -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "Verifiqueu que hi ha una connexió d'internet funcionant." -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "Si l'url és incorrecta, si us plau editeu el fitxer xml i/o envieu un informe d'error." -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "Cap fax seleccionat." -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr " Intenti fer clic a la columna seleccionada (primera)" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "Noves Coord" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "Començar" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" -msgstr "Impossible de cartografiar\nVerifiqueu els paràmetres de correcció de la cartografia" - -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" +msgstr "Impossible de cartografiar\n" +"Verifiqueu els paràmetres de correcció de la cartografia" + +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "Cartografiant" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "Avís, latituds en ambdós costats de l'Equador no es recomanen per l'ambigüitat del Pol nord o del Pol Sud" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" -msgstr "Càlcul de mapatge fracassat.\nPotser heu seleccionat el tipus d'assignació inadequada per a aquesta imatge, o les coordenades especificades no són correctes\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +msgstr "Càlcul de mapatge fracassat.\n" +"Potser heu seleccionat el tipus d'assignació inadequada per a aquesta imatge, o les coordenades especificades no són correctes\n" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "Els càlculs de cartografia encara no estan suportats.\n" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "El càlcul de l'Equador encara no està suportat.\n" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." -msgstr "La cartografia permet l'ampliació i conversió entre sistemes de coordenades\nLes latituds són +N -S, les longituds són + E -W\n\nPer al mode de cartografia polar:\nL’opció “Obtenir Cartografia” calcula la cartografia a partir de les coordenades donades, però el valor x de la primera coordenada (línia vermella vertical) s’han d'alinear amb el pol en el mode polar sobre el meridià\nUn cop que s'introdueixen les coordenades, el cartografiat ha de fer que les latituds blaves s’alineïn. Si estan lluny, comprovar les coordenades introduïdes.\nUn cop estan properes:\nPrimer ajustar el pol X per centrar les latituds. A continuació ajustar el valor del pol Y fins que la corba blava de latitud més propera al pol sigui correcta. Ara, si la segona latitud blava és massa ample, llavors la relació de l’amplada veritable necessita ser augmentada, en cas contrari ha de ser disminuïda. Repetir ajustant el pol Y i la relació d’amplada veritable fins a alinear-les. És més fàcil calibrar correctament si utilitzeu les latituds més allunyades disponibles.\nUn cop les latituds blaves s’alineen perfectament, cal tornar a calcular l'Equador per assegurar-se que la cartografia resultant és correcta. En aquest punt, es poden canviar les coordenades a millors ubicacions, si és necessari. Si l’amplada veritable és molt a prop 1.0 probablement hauria de ser exactament 1.0.\nTambé és possible anar al següent pas, ajustar les coordenades, després tornar a aquest pas i aconseguir de nou els paràmetres de cartografia per millorar l'estimació." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +msgstr "La cartografia permet l'ampliació i conversió entre sistemes de coordenades\n" +"Les latituds són +N -S, les longituds són + E -W\n\n" +"Per al mode de cartografia polar:\n" +"L’opció “Obtenir Cartografia” calcula la cartografia a partir de les coordenades donades, però el valor x de la primera coordenada (línia vermella vertical) s’han d'alinear amb el pol en el mode polar sobre el meridià\n" +"Un cop que s'introdueixen les coordenades, el cartografiat ha de fer que les latituds blaves s’alineïn. Si estan lluny, comprovar les coordenades introduïdes.\n" +"Un cop estan properes:\n" +"Primer ajustar el pol X per centrar les latituds. A continuació ajustar el valor del pol Y fins que la corba blava de latitud més propera al pol sigui correcta. Ara, si la segona latitud blava és massa ample, llavors la relació de l’amplada veritable necessita ser augmentada, en cas contrari ha de ser disminuïda. Repetir ajustant el pol Y i la relació d’amplada veritable fins a alinear-les. És més fàcil calibrar correctament si utilitzeu les latituds més allunyades disponibles.\n" +"Un cop les latituds blaves s’alineen perfectament, cal tornar a calcular l'Equador per assegurar-se que la cartografia resultant és correcta. En aquest punt, es poden canviar les coordenades a millors ubicacions, si és necessari. Si l’amplada veritable és molt a prop 1.0 probablement hauria de ser exactament 1.0.\n" +"També és possible anar al següent pas, ajustar les coordenades, després tornar a aquest pas i aconseguir de nou els paràmetres de cartografia per millorar l'estimació." -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "Ha fallat la descodificació del Fax: " -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "Error" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "DecodeImageLine demana un tamany específic de \"buffer\"" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "Desbordament de la capacitat del port d'àudio. Algunes dades s'han perdut!" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "no s'ha pogut obrir el fitxer d'entrada: " -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "El mostreig no és de 8 o 16 bits: " -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "Captura" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "Emissora" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "Hora (UTC)" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "Temps vàlid" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "Duració" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "Horaris WeatherFax" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "Node xml desconegut" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "No s'ha pogut trobar la durada per a: " -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "L'ordenació d'aquests horaris pot trigar massa" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "Omplint el llistat" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "Capturant fax: " -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr " Conflictes amb els faxos programats: " -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr " Voleu inhabilitar aquest fax? " -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "Horaris weatherfax" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "Cap conjunt de captura" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "començarà en" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "Segon(s)" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "Hora(/es)" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "minut(s)" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "Fax actual: " -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "Sintonia ràdio BLU per" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "rebre fax per a" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "L'horari dels Fax meteorològics comença aviat" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "Ja està capturant, no es pot capturar: " -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "Error en iniciar: " -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." -msgstr "" +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." +msgstr "Culpa del Connector del fax metereologia\n" +"En funcionament captura de fax meteorològic hf." -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "Obrir el fitxer d'entrada del fax meteorològic" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "Fitxers WAV (*.wav)|*.WAV;*.wav|Tots els arxius (*.*)|*.*" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "Fallada de la captura exterior" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "Fallada en carregar els conjunts de coordenades" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "Error al desar fitxer xml: " -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" -msgstr "" +msgstr "Proveu d'executar:" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "Error en carregar el fitxer d'entrada: " -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "Compatible amb fitxers|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*. wav|Tots els arxius (*. *)|*. *" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." -msgstr "" +msgstr "No es pot obrir l'audio del fax de meteorologia, ja està executant-se." -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" -msgstr "" +msgstr "Desar el Fax de Meteorologia com a imatge" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" -msgstr "" +msgstr "Arxius d'imatge|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffTots els arxius (*.*)|*.*" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " -msgstr "" +msgstr "No ha pogut desar el fitxer: " -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "Desar el Fax meteorològic en format KAP" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" -msgstr "" +msgstr "Arxius KAP|*.KAP;*.kap|Tots els arxius (*.*)|*.*" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "La imatge resultant té dimensións negatives, avortant\n" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "Error del cartografiat" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" -msgstr "Mida de la imatge resultant més gran que %dMB\nEscolliu un valor inferior. (menys de %.2f)\navortant\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" +msgstr "Mida de la imatge resultant més gran que %dMB\n" +"Escolliu un valor inferior. (menys de %.2f)\n" +"avortant\n" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "Cartografiant imatge de Fax metereològic" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "Cartografiador de Fax metereològic" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" -msgstr "" +msgstr "Maquinari de Gràfics no suportat (Desactiveu OpenGL)\n" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "WeatherFax" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "Connector Weather Fax per a OpenCPN" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" -msgstr "" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" +msgstr "El Connector de Fax Meteorològic per a OpenCPN\n" +"Podeu obrir els arxius d'imatge directament o convertir els faxos d'àudio a imatge.\n" +"Amb una simple calibració, la imatge resultant es superposa a la part superior de les cartes.\n" +"Converteix les imatges en mercator, polar, cònica i coordenades uniformes.\n" +"Pot convertir qualsevol imatge en una carta ràster.\n" +"Crea una base de dades interna per a les estacions de ràdio d'alta freqüència (HF) a través de fax SSB\n" +"Crea una base de dades interna per a la recuperació dels llocs d'internet meteorològics.\n" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "Preferències de WeatherFax" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/cs.po opencpn-plugin-weatherfax-1.5001.0/po/cs.po --- opencpn-plugin-weatherfax-1.3.1/po/cs.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/cs.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:23-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-02-25 08:03-0500\n" "Last-Translator: nohal \n" "Language-Team: Czech\n" "Language: cs_CZ\n" @@ -16,192 +16,191 @@ "X-Crowdin-Language: cs\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" -msgstr "" +msgstr "Weather Fax" #: src/WeatherFaxUI.h:165 msgid "HF Radio Schedules" -msgstr "" +msgstr "Rozvrhy HF vysílání" #: src/WeatherFaxUI.h:216 msgid "Internet Retrieval" -msgstr "" +msgstr "Stažení z Internetu" #: src/WeatherFaxUI.h:337 msgid "Weather Fax Image" -msgstr "" +msgstr "Obrázek Weatherfaxu" #: src/WeatherFaxUI.h:366 msgid "Weather Fax Preferences" -msgstr "" +msgstr "Nastavení Weatherfaxu" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" -msgstr "" +msgstr "Nastavení dekódování faxu" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" -msgstr "" +msgstr "O Weatherfaxu" #: src/WeatherFaxUI.cpp:23 msgid "Fax" -msgstr "" +msgstr "Fax" #: src/WeatherFaxUI.cpp:42 msgid "Transparency" -msgstr "" +msgstr "Průhlednost" #: src/WeatherFaxUI.cpp:58 msgid "Invert" -msgstr "" +msgstr "Invertovat" #: src/WeatherFaxUI.cpp:71 msgid "&Open" -msgstr "" +msgstr "&Otevřít" #: src/WeatherFaxUI.cpp:74 msgid "Save &As" -msgstr "" +msgstr "Uložit J&ako" #: src/WeatherFaxUI.cpp:77 msgid "&Edit" -msgstr "" +msgstr "&Upravit" #: src/WeatherFaxUI.cpp:80 msgid "&Goto" -msgstr "" +msgstr "&Jít na" #: src/WeatherFaxUI.cpp:83 msgid "E&xport" -msgstr "" +msgstr "E&xport" #: src/WeatherFaxUI.cpp:86 msgid "&Delete" -msgstr "" +msgstr "&Smazat" #: src/WeatherFaxUI.cpp:92 msgid "&Preferences" -msgstr "" +msgstr "&Předvolby" #: src/WeatherFaxUI.cpp:98 msgid "&Close" -msgstr "" +msgstr "&Zavřít" #: src/WeatherFaxUI.cpp:101 msgid "&File" -msgstr "" +msgstr "&Soubor" #: src/WeatherFaxUI.cpp:104 msgid "&Audio Capture" -msgstr "" +msgstr "Z&achycení zvuku" #: src/WeatherFaxUI.cpp:108 msgid "&HF Radio Schedules" -msgstr "" +msgstr "Rozvrhy &HF vysílání" #: src/WeatherFaxUI.cpp:112 msgid "&Internet" -msgstr "" +msgstr "&Internet" #: src/WeatherFaxUI.cpp:115 msgid "&Retrieve" -msgstr "" +msgstr "S&táhnout" #: src/WeatherFaxUI.cpp:119 msgid "&About" -msgstr "" +msgstr "O &aplikaci" #: src/WeatherFaxUI.cpp:122 msgid "&Help" -msgstr "" +msgstr "&Pomoc" #: src/WeatherFaxUI.cpp:229 src/WeatherFaxUI.cpp:583 msgid "Contains" -msgstr "" +msgstr "Obsahuje" #: src/WeatherFaxUI.cpp:236 src/WeatherFaxUI.cpp:590 msgid "Lat" -msgstr "" +msgstr "Zem. šířka" #: src/WeatherFaxUI.cpp:243 src/WeatherFaxUI.cpp:597 msgid "Lon" -msgstr "" +msgstr "Zem. délka" #: src/WeatherFaxUI.cpp:250 src/WeatherFaxUI.cpp:604 msgid "Boat Position" -msgstr "" +msgstr "Pozice lodě" #: src/WeatherFaxUI.cpp:253 src/WeatherFaxUI.cpp:607 msgid "Reset" -msgstr "" +msgstr "Reset" #: src/WeatherFaxUI.cpp:263 msgid "Stations" -msgstr "" +msgstr "Stanice" #: src/WeatherFaxUI.cpp:279 src/WeatherFaxUI.cpp:316 src/WeatherFaxUI.cpp:651 #: src/WeatherFaxUI.cpp:684 msgid "All" -msgstr "" +msgstr "Vše" #: src/WeatherFaxUI.cpp:282 src/WeatherFaxUI.cpp:654 src/WeatherFaxUI.cpp:687 #: src/WeatherFaxUI.cpp:851 msgid "None" -msgstr "" +msgstr "Nic" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" -msgstr "" +msgstr "Frekvence" #: src/WeatherFaxUI.cpp:305 msgid "khz min" -msgstr "" +msgstr "kHz min" #: src/WeatherFaxUI.cpp:312 msgid "khz max" -msgstr "" +msgstr "kHz max" #: src/WeatherFaxUI.cpp:331 msgid "Constraints" -msgstr "" +msgstr "Omezení" #: src/WeatherFaxUI.cpp:338 msgid "Has Area" -msgstr "" +msgstr "Má oblast" #: src/WeatherFaxUI.cpp:341 msgid "Has Valid Time" -msgstr "" +msgstr "Má platný čas" #: src/WeatherFaxUI.cpp:350 msgid "Clear Captures" -msgstr "" +msgstr "Odstranit zachycené" #: src/WeatherFaxUI.cpp:360 src/WeatherFaxUI.cpp:830 src/WeatherFaxUI.cpp:1530 msgid "Filter" -msgstr "" +msgstr "Filtr" #: src/WeatherFaxUI.cpp:368 msgid "Message Box" -msgstr "" +msgstr "Okno se zprávou" #: src/WeatherFaxUI.cpp:377 msgid "Sound" -msgstr "" +msgstr "Zvuk" #: src/WeatherFaxUI.cpp:380 msgid "Select a file" -msgstr "" +msgstr "Vyber soubor" #: src/WeatherFaxUI.cpp:392 msgid "External Alarm" -msgstr "" +msgstr "Externí Alarm" #: src/WeatherFaxUI.cpp:395 msgid "aplay /usr/local/share/opencpn/sounds/2bells.wav" @@ -209,19 +208,19 @@ #: src/WeatherFaxUI.cpp:405 msgid "1 minute alarm" -msgstr "" +msgstr "1 minutový alarm" #: src/WeatherFaxUI.cpp:413 msgid "No Action" -msgstr "" +msgstr "Žádná akce" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" -msgstr "" +msgstr "Zachycení zvuku" #: src/WeatherFaxUI.cpp:427 msgid "External Command" -msgstr "" +msgstr "Vnější příkaz" #: src/WeatherFaxUI.cpp:430 msgid "arecord -f S16_LE" @@ -229,105 +228,111 @@ #: src/WeatherFaxUI.cpp:436 msgid "Manual Capture (with external program) automatic Open File" -msgstr "" +msgstr "Ruční zachycení (externím programem) automatické otevření souboru" #: src/WeatherFaxUI.cpp:443 msgid "Capture Options" -msgstr "" +msgstr "Možnosti zachycení" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." -msgstr "" +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgstr "Vyberte obrázky faxů kliknutím v digitalizařním (prvním) sloupci\n\n" +"Rozvrhy lze seřadit kliknutím na záhlaví sloupce\n\n" +"Rozvrhy je třebaotestovat, mohu přijímat jen z několika ze všech možných stanic. Opravy lze provést úpravou souboru WeatherFaxSchedules.xml. Opravy mohou být zaslány prostřednictvím githubu.\n\n" +"Automatické ovládání ssb rádia je též žádoucí, nicméně autor má k dispozici pouze tecsun pl-600. Pokud někdo věnuje vhodné rádio, podpora bude realizována." #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" -msgstr "" +msgstr "Informace" #: src/WeatherFaxUI.cpp:463 msgid "Capture Status" -msgstr "" +msgstr "Stav zachycení" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" -msgstr "" +msgstr "Zavřít" #: src/WeatherFaxUI.cpp:621 msgid "Retrieve Scheduled" -msgstr "" +msgstr "Plánované zachycení" #: src/WeatherFaxUI.cpp:624 msgid "Retrieve Selected" -msgstr "" +msgstr "Načíst vybrané" #: src/WeatherFaxUI.cpp:634 msgid "Servers" -msgstr "" +msgstr "Servery" #: src/WeatherFaxUI.cpp:667 msgid "Regions" -msgstr "" +msgstr "Regiony" #: src/WeatherFaxUI.cpp:784 msgid "Decoder" -msgstr "" +msgstr "Dekodér" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" -msgstr "" +msgstr "Konec" #: src/WeatherFaxUI.cpp:803 msgid "Options" -msgstr "" +msgstr "Nastavení" #: src/WeatherFaxUI.cpp:822 msgid "Image Correction" -msgstr "" +msgstr "Korekce obrazu" #: src/WeatherFaxUI.cpp:834 msgid "No Filter" -msgstr "" +msgstr "Žádný filtr" #: src/WeatherFaxUI.cpp:834 msgid "Removal 1" -msgstr "" +msgstr "Odstranění 1" #: src/WeatherFaxUI.cpp:834 msgid "Removal 2" -msgstr "" +msgstr "Odstranění 2" #: src/WeatherFaxUI.cpp:834 msgid "Removal 3" -msgstr "" +msgstr "Odstranění 3" #: src/WeatherFaxUI.cpp:834 msgid "Value 1" -msgstr "" +msgstr "Hodnota 1" #: src/WeatherFaxUI.cpp:834 msgid "Value 2" -msgstr "" +msgstr "Hodnota 2" #: src/WeatherFaxUI.cpp:834 msgid "Value 3" -msgstr "" +msgstr "Hodnota 3" #: src/WeatherFaxUI.cpp:840 msgid "Phasing" -msgstr "" +msgstr "Fázování" #: src/WeatherFaxUI.cpp:847 msgid "Rotation" -msgstr "" +msgstr "Rotace" #: src/WeatherFaxUI.cpp:851 msgid "CCW" -msgstr "" +msgstr "DOLEVA" #: src/WeatherFaxUI.cpp:851 msgid "CW" -msgstr "" +msgstr "DOPRAVA" #: src/WeatherFaxUI.cpp:851 msgid "180" @@ -335,20 +340,20 @@ #: src/WeatherFaxUI.cpp:857 msgid "Skew" -msgstr "" +msgstr "Zkosení" #: src/WeatherFaxUI.cpp:895 src/WeatherFaxUI.cpp:1142 msgid "Image Coordinates" -msgstr "" +msgstr "Souřadnice obrazu" #: src/WeatherFaxUI.cpp:909 msgid "Remove" -msgstr "" +msgstr "Odebrat" #: src/WeatherFaxUI.cpp:920 src/WeatherFaxUI.cpp:959 src/WeatherFaxUI.cpp:1154 #: src/WeatherFaxUI.cpp:1177 msgid "Coord Y/X" -msgstr "" +msgstr "Koord Y/X" #: src/WeatherFaxUI.cpp:925 src/WeatherFaxUI.cpp:964 src/WeatherFaxUI.cpp:1159 #: src/WeatherFaxUI.cpp:1182 @@ -357,23 +362,25 @@ #: src/WeatherFaxUI.cpp:931 msgid "Minutes" -msgstr "" +msgstr "Minuty" #: src/WeatherFaxUI.cpp:998 msgid "Show Lat/Lon Minutes" -msgstr "" +msgstr "Zobraz Lat/Lon minuty" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" -msgstr "" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" +msgstr "+ Lat/Lon pro N/E\n" +"-Lat/Lon pro S/W" #: src/WeatherFaxUI.cpp:1019 msgid "Coordinates Mapping Correction" -msgstr "" +msgstr "Korekce mapování souřadnic" #: src/WeatherFaxUI.cpp:1031 msgid "Input Type" -msgstr "" +msgstr "Typ vstupu" #: src/WeatherFaxUI.cpp:1035 msgid "mercator" @@ -393,7 +400,7 @@ #: src/WeatherFaxUI.cpp:1041 msgid "Output Type" -msgstr "" +msgstr "Typ výstupu" #: src/WeatherFaxUI.cpp:1045 msgid "Mercator" @@ -401,136 +408,137 @@ #: src/WeatherFaxUI.cpp:1049 msgid "Size" -msgstr "" +msgstr "Velikost" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "" #: src/WeatherFaxUI.cpp:1056 msgid "W/H" -msgstr "" +msgstr "Š/V" #: src/WeatherFaxUI.cpp:1063 msgid "True Width Ratio" -msgstr "" +msgstr "Poměr skutečné šířky" #: src/WeatherFaxUI.cpp:1078 msgid "Pole X" -msgstr "" +msgstr "Pól X" #: src/WeatherFaxUI.cpp:1085 msgid "Pole Y" -msgstr "" +msgstr "Pól Y" #: src/WeatherFaxUI.cpp:1092 msgid "Equator Y" -msgstr "" +msgstr "Rovník Y" #: src/WeatherFaxUI.cpp:1099 msgid "Get Mapping " -msgstr "" +msgstr "Získat mapování " #: src/WeatherFaxUI.cpp:1102 msgid "Get Equator" -msgstr "" +msgstr "Získat rovník" #: src/WeatherFaxUI.cpp:1105 msgid "GetAspectRatio" -msgstr "" +msgstr "Získat poměr stran" #: src/WeatherFaxUI.cpp:1365 msgid "HF Schedules" -msgstr "" +msgstr "HF rozvrhy" #: src/WeatherFaxUI.cpp:1372 msgid "Load Schedules at Startup" -msgstr "" +msgstr "Nahrát rozvrhy při startu" #: src/WeatherFaxUI.cpp:1382 msgid "Export" -msgstr "" +msgstr "Exportovat" #: src/WeatherFaxUI.cpp:1394 msgid "Reduce to" -msgstr "" +msgstr "Omezit na" #: src/WeatherFaxUI.cpp:1401 msgid "Colors" -msgstr "" +msgstr "Barvy" #: src/WeatherFaxUI.cpp:1408 msgid "Recommended 4, 16, 64, or 256" -msgstr "" +msgstr "Doporučeno 4, 16, 64 nebo 256" #: src/WeatherFaxUI.cpp:1413 msgid "Depth" -msgstr "" +msgstr "Hloubka" #: src/WeatherFaxUI.cpp:1420 msgid "Meters" -msgstr "" +msgstr "Metry" #: src/WeatherFaxUI.cpp:1423 msgid "Fathoms" -msgstr "" +msgstr "Fathomy (Sáhy)" #: src/WeatherFaxUI.cpp:1437 msgid "fix sounding datum" -msgstr "" +msgstr "Opravit datum hloubek" #: src/WeatherFaxUI.cpp:1490 msgid "Audio Decoding Options" -msgstr "" +msgstr "Možnosti dekódování zvuku" #: src/WeatherFaxUI.cpp:1502 msgid "Image Width" -msgstr "" +msgstr "Šířka obrázku" #: src/WeatherFaxUI.cpp:1509 msgid "Bits per Pixel" -msgstr "" +msgstr "Bitů na Pixel" #: src/WeatherFaxUI.cpp:1516 msgid "Carrier" -msgstr "" +msgstr "Operátor" #: src/WeatherFaxUI.cpp:1523 msgid "Deviation" -msgstr "" +msgstr "Odchylka" #: src/WeatherFaxUI.cpp:1534 msgid "narrow" -msgstr "" +msgstr "úzké" #: src/WeatherFaxUI.cpp:1534 msgid "middle" -msgstr "" +msgstr "střední" #: src/WeatherFaxUI.cpp:1534 msgid "wide" -msgstr "" +msgstr "široké" #: src/WeatherFaxUI.cpp:1540 msgid "Saturation Threshold" -msgstr "" +msgstr "Práh nasycení" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" -msgstr "" +msgid "Skip start, stop and \n" +"phasing detection" +msgstr "Přeskočit start, stop a \n" +"detekci fázování" #: src/WeatherFaxUI.cpp:1553 msgid "Include header data in image" -msgstr "" +msgstr "Zahrnout data hlavičky do obrázku" #: src/WeatherFaxUI.cpp:1569 msgid "Audio Capture Options" -msgstr "" +msgstr "Možnosti zachytávání zvuku" #: src/WeatherFaxUI.cpp:1576 msgid "Sample Rate" -msgstr "" +msgstr "Vzorkovací frekvence" #: src/WeatherFaxUI.cpp:1580 msgid "8000" @@ -544,389 +552,417 @@ msgid "48000" msgstr "" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "Index zařízení" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" -msgstr "" +msgstr "Hotovo" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" -msgstr "" +msgstr "Verze doplňku Weatherfax" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." msgstr "" -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" -msgstr "" +msgstr "O autorovi" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" -msgstr "" +msgstr "Naplánováno" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" -msgstr "" +msgstr "Server" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" -msgstr "" +msgstr "Region" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" -msgstr "" +msgstr "Obsah" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" -msgstr "" +msgstr "Oblast mapy" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " -msgstr "" +msgstr "Nepodařilo se načíst soubor: " -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" -msgstr "" +msgstr "Neplatný xml soubor" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" -msgstr "" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" +msgstr "WeatherFax načítání z Internetu" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" -msgstr "" +msgstr "Načítání" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " -msgstr "" +msgstr "Neplatný iterátor: " -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " -msgstr "" +msgstr "Nerozpoznaný xml uzel: " -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " -msgstr "" +msgstr "Nezdařilo se vyhodnotit oblast: " -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" -msgstr "" +msgstr "Třídění zobrazovaných adres URL může trvat příliš dlouho" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" -msgstr "" +msgstr "weatherfax" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" -msgstr "" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" +msgstr "Fax již stažen před méně než 180 minutami. \n" +"Použít stávající soubor?" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 -msgid "Reading Headers: " -msgstr "" +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" +msgstr "WeatherFax načítání z Internetu" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" -msgstr "" +#: src/InternetRetrievalDialog.cpp:584 +msgid "Reading Headers: " +msgstr "Čtení hlaviček: " -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " -msgstr "" +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " +msgstr "Nepodařilo se stáhnout: " -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." -msgstr "" +msgstr "Ověřte, zda je funkční připojení k Internetu." -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" +msgstr "Je-li adresa URL nesprávná, uprav XML a/nebo odešli hlášení o chybě." -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." -msgstr "" +msgstr "Nevybrány žádné faxy." -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" -msgstr "" +msgstr " Zkus kliknout na vybraný sloupec (první)" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" -msgstr "" +msgstr "Nové souřadnice" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" -msgstr "" +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" +msgstr "Nepodařilo se použít mapování\n" +"Zkontroluj parametry korekce mapování" -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" -msgstr "" +msgstr "Mapování" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" -msgstr "" +msgstr "Varování, zeměpisné šířky na různých stranách rovníku nedoporučujeme vzhledem k nejednoznačnosti severního či jižního pólu" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" -msgstr "" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +msgstr "Výpočet mapování neúspěšný. \n" +"Možná jste zvolili nesprávné mapování pro tento obrázek nebo určené souřadnice nejsou správné\n" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" -msgstr "" +msgstr "Výpočet mapování zatím Nepodporován. \n" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" -msgstr "" +msgstr "Výpočet rovníku zatím Nepodporován. \n" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " -msgstr "" +msgstr "Chyba při dekódování faxu: " -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" -msgstr "" +msgstr "Nezdařilo se" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" -msgstr "" +msgstr "DecodeImageLine vyžaduje konkrétní velikost vyrovnávací paměti" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" -msgstr "" +msgstr "Port audio přetečení na vstupu, některá data se ztratila!" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " -msgstr "" +msgstr "nelze otevřít vstupní soubor: " -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " -msgstr "" +msgstr "vzorek není velikosti 8 nebo 16 bitů: " -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" -msgstr "" +msgstr "Snímat" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" -msgstr "" +msgstr "Stanice" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" -msgstr "" +msgstr "Čas (UTC)" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" -msgstr "" +msgstr "Platný čas" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" -msgstr "" +msgstr "Doba trvání" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" -msgstr "" +msgstr "WeatherFax rozvrhy" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" -msgstr "" +msgstr "Nerozpoznaný xml uzel" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " -msgstr "" +msgstr "Nepodařilo se najít dobu trvání pro: " -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" -msgstr "" +msgstr "Třídění tolika rozvrhů může trvat příliš dlouho" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" -msgstr "" +msgstr "Vyplnění seznamu" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " -msgstr "" +msgstr "Zachycení faxu: " -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " -msgstr "" +msgstr " Je v konfliktu s již naplánovaným faxem: " -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " -msgstr "" +msgstr " zakázat tento fax? " -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" -msgstr "" +msgstr "weatherfax rozvrhy" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" -msgstr "" +msgstr "Není nastaveno zachytávání" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" -msgstr "" +msgstr "začíná za" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" -msgstr "" +msgstr "sekund" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" -msgstr "" +msgstr "hodin" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" -msgstr "" +msgstr "minut" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " -msgstr "" +msgstr "Aktuální fax: " -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" -msgstr "" +msgstr "Naladit rádio SSB na" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" -msgstr "" +msgstr "chcete-li přijmout fax pro" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" -msgstr "" +msgstr "Pravidelné vysíláni weatherfaxu brzy začne" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " -msgstr "" +msgstr "Už zachycováno, nelze zachytit: " -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " -msgstr "" +msgstr "Nepodařilo se spustit: " -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." -msgstr "" +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." +msgstr "Chyba v doplňku Weatherfax\n" +"Právě zachycovaný hf weatherfax." -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" -msgstr "" +msgstr "Otevřít vstupní soubor Weatherfax" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" -msgstr "" +msgstr "WAV Soubory (*.wav)|*.WAV;*.wav|Všechny soubory (*.*)|*.*" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" -msgstr "" +msgstr "Spuštění externího zachytávání selhalo" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" -msgstr "" +msgstr "Nepodařilo se načíst sady souřadnic" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " -msgstr "" +msgstr "Uložení souboru xml se nezdařilo: " -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" -msgstr "" +msgstr "pokuste se provést:" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " -msgstr "" +msgstr "Nepodařilo se načíst vstupní soubor: " -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" -msgstr "" +msgstr "Podporované soubory| *. BMP; *.bmp; *. XBM; *.xbm; *. XPM; HTML; *. TIF; *.tif; *. TIFF; *.tiff; *. GIF; *.gif; *. JPEG; *.jpeg; *. JPG; *.jpg; *. PNM; soubory; *. PNG; *.png; *. PCX; *.pcx; *. PICT; *.pict; *. TGA; *.tga; *. WAV; *. wav| Všechny soubory (*. *) | *. *" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." -msgstr "" +msgstr "Nelze otevřít zvuk, weatherfax již probíhá." -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" -msgstr "" +msgstr "Uložit weatherfax jako obrázek" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" -msgstr "" +msgstr "Soubory obrázků| *. BMP; *. bmp| *. PNG; *. gif| *. TIFF; *.tiff | Všechny soubory (*. *) | *. *" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " -msgstr "" +msgstr "Uložení souboru se nezdařilo: " -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" -msgstr "" +msgstr "Uložení weatherfaxu do KAP" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" -msgstr "" +msgstr "KAP soubory| *. KAP; *. kap| Všechny soubory (*. *) | *. *" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" -msgstr "" +msgstr "Výsledný obraz má negativní rozměry, končím\n" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" -msgstr "" +msgstr "Mapování selhalo" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" -msgstr "" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" +msgstr "Výsledný obraz větší než %dMB\n" +"Zkus změnit parametr velikosti na menší hodnotu. (což je méně než %.2f) \n" +"končím\n" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" -msgstr "" +msgstr "Mapování weatherfax obrázku" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" -msgstr "" +msgstr "Mapovač weatherfaxu" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" -msgstr "" +msgstr "Grafický hardware není podporován (zakázáno OpenGL) \n" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" -msgstr "" +msgstr "WeatherFax" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" -msgstr "" +msgstr "Weatherfax modul pro OpenCPN" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" -msgstr "" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" +msgstr "Doplněk Weatherfax pro OpenCPN\n" +"Umí přímo otevřít soubory obrázků nebo dekódovat audio faxů na obrázky.\n" +"Po jednoduché kalibraci je výsledný obraz zobrazen přes mapu.\n" +"Konvertuje obrázky v mercator, polární, kónické a uniformní projekci.\n" +"Umí převést jakýkoliv obrázek na rastrovou mapu KAP.\n" +"Obsahuje databázi rozvrhů HF weatherfax stanic přes SSB.\n" +"Obsahuje databázi pro stahování z meteorologických serverů na internetu.\n" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" -msgstr "" +msgstr "Nastavení Weatherfaxu" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/da.po opencpn-plugin-weatherfax-1.5001.0/po/da.po --- opencpn-plugin-weatherfax-1.3.1/po/da.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/da.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:23-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-01-16 20:59-0500\n" "Last-Translator: nohal \n" "Language-Team: Danish\n" "Language: da_DK\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: da\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "Weather Fax" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "Weather Fax præferencer" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "Fax Decoding Optioner" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "Om Weatherfax" @@ -155,7 +154,7 @@ msgid "None" msgstr "Ingen" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "Frevens" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "Ingen handling" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "Audio Capture" @@ -236,11 +235,17 @@ msgstr "Hentingsindstillinger" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." -msgstr "Vælg fax billeder ved at klikke i capture (første) søjle\n\nPlaner kan sorteres ved at klikke på header-søjlen\n\nPlanerne skal testes da jeg kun kan modtage fra et par af de mulige stationer. Korrektioner kan foretages ved at redigere filen WeatherFaxSchedules.xml. Patches kan sendes via github.\n\nAutomatisk kontrol af en ssb-radio er ønskeligt, men forfatteren har kun en tecsun pl-600. Hvis en egnet radio kan doneres, vil støtte blive gennemført." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgstr "Vælg fax billeder ved at klikke i capture (første) søjle\n\n" +"Planer kan sorteres ved at klikke på header-søjlen\n\n" +"Planerne skal testes da jeg kun kan modtage fra et par af de mulige stationer. Korrektioner kan foretages ved at redigere filen WeatherFaxSchedules.xml. Patches kan sendes via github.\n\n" +"Automatisk kontrol af en ssb-radio er ønskeligt, men forfatteren har kun en tecsun pl-600. Hvis en egnet radio kan doneres, vil støtte blive gennemført." #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "Information" @@ -248,7 +253,7 @@ msgid "Capture Status" msgstr "Status for hentning" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "Luk" @@ -272,8 +277,8 @@ msgid "Decoder" msgstr "Dekoder" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "Stop" @@ -364,8 +369,10 @@ msgstr "" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" -msgstr "+ Lat/Lon for N/E\n- Lat/Lon for S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" +msgstr "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" #: src/WeatherFaxUI.cpp:1019 msgid "Coordinates Mapping Correction" @@ -403,8 +410,7 @@ msgid "Size" msgstr "Størelse" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "1" @@ -517,8 +523,10 @@ msgstr "Mætningstærskel" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" -msgstr "Spring over start, stop og \nphasing" +msgid "Skip start, stop and \n" +"phasing detection" +msgstr "Spring over start, stop og \n" +"phasing" #: src/WeatherFaxUI.cpp:1553 msgid "Include header data in image" @@ -544,389 +552,422 @@ msgid "48000" msgstr "48000" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "Udført" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "Weather Fax Plugin Version" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." -msgstr "Fax plugin for opencpn er beregnet til at reducere mængden af brugerinteraktion til faxmodtagelse vejr og eventuelt overlay dem direkte på charts.\n\nThis omfatter en fax decoder, som konverterer radio fax lyd i images.\n\nTo komme i gang, åbne et billede eller optaget .wav lydfil i en ssb radio faxtransmission fra menuen filer, eller Vælg en indstilling fra hente-menuen.\n\nSource kode: \\ nhttps://github.com/seandepagnier/weatherfax_pi \n\nMange oversættere og testere." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." +msgstr "Fax plugin for opencpn er beregnet til at reducere mængden af brugerinteraktion til faxmodtagelse vejr og eventuelt overlay dem direkte på charts.\n\n" +"This omfatter en fax decoder, som konverterer radio fax lyd i images.\n\n" +"To komme i gang, åbne et billede eller optaget .wav lydfil i en ssb radio faxtransmission fra menuen filer, eller Vælg en indstilling fra hente-menuen.\n\n" +"Source kode: \\ nhttps://github.com/seandepagnier/weatherfax_pi \n\n" +"Mange oversættere og testere." -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "Om forfatteren" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "Planlagt" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "Server" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "Region" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "Contents" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "Kort område" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "Kunne ikke indlæse filen: " -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "Ugyldig XML-fil" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" -msgstr "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" +msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "Indlæser" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "Ugyldig iterator: " -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "Ukendt XML-node: " -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "Kunne ikke matche område: " -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "Sortering af så mange webadresser kan tage for lang tid" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "weatherfax" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" -msgstr "Fax er allerede hentet for mindre end 180 minutter siden. \nBrug eksisterende fil?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" +msgstr "Fax er allerede hentet for mindre end 180 minutter siden. \n" +"Brug eksisterende fil?" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" +msgstr "WeatherFax InternetRetrieval" + +#: src/InternetRetrievalDialog.cpp:584 msgid "Reading Headers: " msgstr "Læser overskrifter: " -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " msgstr "" -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " -msgstr "Timeout for overskrifter for: " - -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "Kontroller, der er en fungerende internetforbindelse." -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "Hvis URL-adressen er forkert kan du redigere xml og/eller sende en fejlrapport." -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "Ingen faxer valgt." -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr " Prøv at klikke på den valgte (første) kolonne" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "Nye koord" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "Start" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" -msgstr "Programmet kunne ikke anvende mapping\nCheck kortlægnings-korrektionsparametre" - -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" +msgstr "Programmet kunne ikke anvende mapping\n" +"Check kortlægnings-korrektionsparametre" + +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "Kortlægning" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "Advarsel, breddegrader på forskellige sider af ækvator ikke anbefales på grund af uklarheden for nord eller syd pol" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" -msgstr "Beregning af kortlægning mislykkedes. \nMåske du har valgt den forkerte mapping type for dette billede eller angivne koordinater er ikke korrekte\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +msgstr "Beregning af kortlægning mislykkedes. \n" +"Måske du har valgt den forkerte mapping type for dette billede eller angivne koordinater er ikke korrekte\n" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "Beregning af kortlægning endnu ikke understøttet. \n" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "Beregning af ækvator endnu ikke understøttet. \n" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." -msgstr "Kortlægning giver mulighed for skalering, og konvertering mellem koordinatsystemer\nBreddegrader er + N -S, længdegrader + E-W\n\nFor polar kortlægning mode: \nGet kortlægning parametre beregner kortlægning fra de givne koordinater, men den første koordinats X-værdi (lodret rød linje) skal samstemme med polen i polar-tilstand på den lodrette meridian\nNår koordinaterne er indtastet, bør gøre de blå breddegrader tilpassede. Hvis de er langt væk, check input koordinaterne. \nNår de er tæt: \nFørst juster pole X til at centrere breddegrader. Dernæst justeres Pole Y-værdi, indtil den blå breddekurve nærmest polen er korrekte. Nu, hvis den anden blå bredde er for bred, så det sande breddeforhold skal øges, ellers det bør være nedsat. Gentag justering af Pole Y og sande bredde forholdet indtil begge passer. Det er nemmest at kalibrere korrekt, hvis du bruger de længst afstand breddegrader tilgængelig. \nOnce de blå breddegrader justeres perfekt, Gendan ækvator så den resulterende tilknytning er korrekt. På dette tidspunkt kan koordinaterne ændres til bedre placeringer, hvis det er nødvendigt. Hvis sande bredde er meget tæt på 1,0 det sandsynligvis være præcis 1.0.\nDet er også muligt at gå til det næste trin, justere koordinaterne, derefter vende tilbage til dette trin og få parametrene kortlægning igen at forbedre estimatet." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +msgstr "Kortlægning giver mulighed for skalering, og konvertering mellem koordinatsystemer\n" +"Breddegrader er + N -S, længdegrader + E-W\n\n" +"For polar kortlægning mode: \n" +"Get kortlægning parametre beregner kortlægning fra de givne koordinater, men den første koordinats X-værdi (lodret rød linje) skal samstemme med polen i polar-tilstand på den lodrette meridian\n" +"Når koordinaterne er indtastet, bør gøre de blå breddegrader tilpassede. Hvis de er langt væk, check input koordinaterne. \n" +"Når de er tæt: \n" +"Først juster pole X til at centrere breddegrader. Dernæst justeres Pole Y-værdi, indtil den blå breddekurve nærmest polen er korrekte. Nu, hvis den anden blå bredde er for bred, så det sande breddeforhold skal øges, ellers det bør være nedsat. Gentag justering af Pole Y og sande bredde forholdet indtil begge passer. Det er nemmest at kalibrere korrekt, hvis du bruger de længst afstand breddegrader tilgængelig. \n" +"Once de blå breddegrader justeres perfekt, Gendan ækvator så den resulterende tilknytning er korrekt. På dette tidspunkt kan koordinaterne ændres til bedre placeringer, hvis det er nødvendigt. Hvis sande bredde er meget tæt på 1,0 det sandsynligvis være præcis 1.0.\n" +"Det er også muligt at gå til det næste trin, justere koordinaterne, derefter vende tilbage til dette trin og få parametrene kortlægning igen at forbedre estimatet." -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "Fejl under afkodning af Fax: " -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "Mislykkedes" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "DecodeImageLine kræver særlig bufferlængde" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "Port audio overflow på input, nogle data tabt!" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "kunne ikke åbne inputfilen: " -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "sample størrelse ikke 8 eller 16 bit: " -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "Hentning" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "Station" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "Tid (UTC)" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "Gyldig tid" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "Varighed" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "WeatherFax Schedules" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "Ukendt XML-node" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "Mislykkedes at finde varighed for: " -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "Sortering af så mange tidsplaner kan tage for lang tid" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "Udfylder liste" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "Henter fax: " -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr " Konflikter med allerede planlagt fax: " -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr " deaktivere denne fax? " -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "weatherfax schedules" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "No Capture Set" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "starter om" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "Sekund(er)" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "Time(r)" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "Minut(ter)" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "Aktuelle fax: " -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "Indstil ssb radio til" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "at modtage fax til" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "Weather Fax Schedule begynder snart" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "Henter allerede, kan ikke hente: " -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "Start mislykkedes: " -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." msgstr "" -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "Åbn Weather Fax Input Fil" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "WAV filer (*.wav)|*.WAV;*.wav|Alle filer (*.*)|*.*" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "Udførelse af eksterne hentning mislykkedes" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "Kunne ikke indlæse koordinat datasæt" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "Kunne ikke gemme XML-filen: " -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" msgstr "" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "Det lykkedes ikke at indlæse input-filen: " -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "Understøttede Filer|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|Alle filer (*.*)|*.*" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." msgstr "" -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" msgstr "" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " msgstr "" -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "Gemme WeatherFax til KAP" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" msgstr "" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "Resulterende billede har negative dimensioner, aborting\n" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "Kortlægning mislykkedes" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" -msgstr "Resulterende billede større end %dMB\nPrøv at ændre størrelsesparameter til en mindre værdi. (mindre end %.2f) \naborting\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" +msgstr "Resulterende billede større end %dMB\n" +"Prøv at ændre størrelsesparameter til en mindre værdi. (mindre end %.2f) \n" +"aborting\n" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "Mapping Weather Fax Billede" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "Weather Fax Mapper" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" msgstr "" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "WeatherFax" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "Weather Fax PlugIn for OpenCPN" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" msgstr "" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "Weather Fax præferencer" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/de.po opencpn-plugin-weatherfax-1.5001.0/po/de.po --- opencpn-plugin-weatherfax-1.3.1/po/de.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/de.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:23-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-02-24 14:27-0500\n" "Last-Translator: nohal \n" "Language-Team: German\n" "Language: de_DE\n" @@ -16,22 +16,21 @@ "X-Crowdin-Language: de\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "WetterFax" #: src/WeatherFaxUI.h:165 msgid "HF Radio Schedules" -msgstr "" +msgstr "HF Radio Programmpläne" #: src/WeatherFaxUI.h:216 msgid "Internet Retrieval" -msgstr "" +msgstr "Internetabruf" #: src/WeatherFaxUI.h:337 msgid "Weather Fax Image" @@ -41,17 +40,17 @@ msgid "Weather Fax Preferences" msgstr "WetterFax Einstellungen" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" -msgstr "Audio Dekodier-Optionen" +msgstr "Fax Dekodier-Optionen" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" -msgstr "WetterFax" +msgstr "Über WetterFax" #: src/WeatherFaxUI.cpp:23 msgid "Fax" -msgstr "" +msgstr "Fax" #: src/WeatherFaxUI.cpp:42 msgid "Transparency" @@ -67,7 +66,7 @@ #: src/WeatherFaxUI.cpp:74 msgid "Save &As" -msgstr "" +msgstr "Sichere als" #: src/WeatherFaxUI.cpp:77 msgid "&Edit" @@ -75,11 +74,11 @@ #: src/WeatherFaxUI.cpp:80 msgid "&Goto" -msgstr "" +msgstr "Gehe zu" #: src/WeatherFaxUI.cpp:83 msgid "E&xport" -msgstr "" +msgstr "Export" #: src/WeatherFaxUI.cpp:86 msgid "&Delete" @@ -87,199 +86,205 @@ #: src/WeatherFaxUI.cpp:92 msgid "&Preferences" -msgstr "WetterFax Einstellungen" +msgstr "Einstellungen" #: src/WeatherFaxUI.cpp:98 msgid "&Close" -msgstr "" +msgstr "Schließen" #: src/WeatherFaxUI.cpp:101 msgid "&File" -msgstr "" +msgstr "Datei" #: src/WeatherFaxUI.cpp:104 msgid "&Audio Capture" -msgstr "Empfangen" +msgstr "Audio Empfang" #: src/WeatherFaxUI.cpp:108 msgid "&HF Radio Schedules" -msgstr "WetterFax Einstellungen" +msgstr "HF Radio Zeitpläne" #: src/WeatherFaxUI.cpp:112 msgid "&Internet" -msgstr "" +msgstr "Internet" #: src/WeatherFaxUI.cpp:115 msgid "&Retrieve" -msgstr "" +msgstr "Suche" #: src/WeatherFaxUI.cpp:119 msgid "&About" -msgstr "" +msgstr "Über" #: src/WeatherFaxUI.cpp:122 msgid "&Help" -msgstr "" +msgstr "Hilfe" #: src/WeatherFaxUI.cpp:229 src/WeatherFaxUI.cpp:583 msgid "Contains" -msgstr "" +msgstr "Enthält" #: src/WeatherFaxUI.cpp:236 src/WeatherFaxUI.cpp:590 msgid "Lat" -msgstr "Sat" +msgstr "Breite" #: src/WeatherFaxUI.cpp:243 src/WeatherFaxUI.cpp:597 msgid "Lon" -msgstr "Lat/Lon" +msgstr "Länge" #: src/WeatherFaxUI.cpp:250 src/WeatherFaxUI.cpp:604 msgid "Boat Position" -msgstr "" +msgstr "Boot Position" #: src/WeatherFaxUI.cpp:253 src/WeatherFaxUI.cpp:607 msgid "Reset" -msgstr "" +msgstr "Zurücksetzen" #: src/WeatherFaxUI.cpp:263 msgid "Stations" -msgstr "Rotation" +msgstr "Stationen" #: src/WeatherFaxUI.cpp:279 src/WeatherFaxUI.cpp:316 src/WeatherFaxUI.cpp:651 #: src/WeatherFaxUI.cpp:684 msgid "All" -msgstr "" +msgstr "Alle" #: src/WeatherFaxUI.cpp:282 src/WeatherFaxUI.cpp:654 src/WeatherFaxUI.cpp:687 #: src/WeatherFaxUI.cpp:851 msgid "None" msgstr "Kein" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" -msgstr "" +msgstr "Frequenz" #: src/WeatherFaxUI.cpp:305 msgid "khz min" -msgstr "" +msgstr "kHz min" #: src/WeatherFaxUI.cpp:312 msgid "khz max" -msgstr "" +msgstr "kHz max" #: src/WeatherFaxUI.cpp:331 msgid "Constraints" -msgstr "" +msgstr "Grenzen" #: src/WeatherFaxUI.cpp:338 msgid "Has Area" -msgstr "" +msgstr "Hat Gebiet" #: src/WeatherFaxUI.cpp:341 msgid "Has Valid Time" -msgstr "" +msgstr "Hat gültige Zeit" #: src/WeatherFaxUI.cpp:350 msgid "Clear Captures" -msgstr "" +msgstr "Lösche Empfang" #: src/WeatherFaxUI.cpp:360 src/WeatherFaxUI.cpp:830 src/WeatherFaxUI.cpp:1530 msgid "Filter" -msgstr "" +msgstr "Filter" #: src/WeatherFaxUI.cpp:368 msgid "Message Box" -msgstr "" +msgstr "Nachrichten-Box" #: src/WeatherFaxUI.cpp:377 msgid "Sound" -msgstr "" +msgstr "Ton" #: src/WeatherFaxUI.cpp:380 msgid "Select a file" -msgstr "" +msgstr "Wähle Datei" #: src/WeatherFaxUI.cpp:392 msgid "External Alarm" -msgstr "" +msgstr "Externer Alarm" #: src/WeatherFaxUI.cpp:395 msgid "aplay /usr/local/share/opencpn/sounds/2bells.wav" -msgstr "" +msgstr "aplay /usr/local/share/opencpn/sounds/2bells.wav" #: src/WeatherFaxUI.cpp:405 msgid "1 minute alarm" -msgstr "" +msgstr "1 Minute Alarm" #: src/WeatherFaxUI.cpp:413 msgid "No Action" -msgstr "" +msgstr "Keine Aktion" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" -msgstr "Empfangen" +msgstr "Audio Empfang" #: src/WeatherFaxUI.cpp:427 msgid "External Command" -msgstr "" +msgstr "Externer Befehl" #: src/WeatherFaxUI.cpp:430 msgid "arecord -f S16_LE" -msgstr "" +msgstr "arecord -f S16_LE" #: src/WeatherFaxUI.cpp:436 msgid "Manual Capture (with external program) automatic Open File" -msgstr "" +msgstr "Manuelles Empfangen (mit externem Programm) automatisches Datei-Öffnen" #: src/WeatherFaxUI.cpp:443 msgid "Capture Options" -msgstr "Empfangen" +msgstr "Empfang Optionen" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." -msgstr "" +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgstr "Wähle Fax Bild mit Klick in die (erste) Empfangs-Spalte\n\n" +"Zeitpläne können mit Klick auf die Kopfzeilen-Spalte sortiert werden\n\n" +"Die Zeitpläne müssen getestet werden, da ich nur einige der möglichen Stationen empfangen kann. Korrekturen kann man in der Datei WeatherFaxSchedules.xml machen. Änderungen können mit Github mitgeteilt werden.\n\n" +"Automatische Kontrolle eines SSB Radios ist wünschenswert, jedoch hat der Autor nur ein tecsun pl-600. Wird ein entsprechendes Radio gespendet, können Ergänzungen vorgenommen werden." #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" -msgstr "" +msgstr "Information" #: src/WeatherFaxUI.cpp:463 msgid "Capture Status" -msgstr "Empfangen" +msgstr "Empfang Status" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" -msgstr "" +msgstr "Schließen" #: src/WeatherFaxUI.cpp:621 msgid "Retrieve Scheduled" -msgstr "" +msgstr "Suche Zeitplan" #: src/WeatherFaxUI.cpp:624 msgid "Retrieve Selected" -msgstr "" +msgstr "Suche Gewähltes" #: src/WeatherFaxUI.cpp:634 msgid "Servers" -msgstr "" +msgstr "Server" #: src/WeatherFaxUI.cpp:667 msgid "Regions" -msgstr "" +msgstr "Regionen" #: src/WeatherFaxUI.cpp:784 msgid "Decoder" msgstr "Dekoder" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" -msgstr "" +msgstr "Beenden" #: src/WeatherFaxUI.cpp:803 msgid "Options" -msgstr "Rotation" +msgstr "Optionen" #: src/WeatherFaxUI.cpp:822 msgid "Image Correction" @@ -299,7 +304,7 @@ #: src/WeatherFaxUI.cpp:834 msgid "Removal 3" -msgstr "" +msgstr "Entfernt 3" #: src/WeatherFaxUI.cpp:834 msgid "Value 1" @@ -319,15 +324,15 @@ #: src/WeatherFaxUI.cpp:847 msgid "Rotation" -msgstr "" +msgstr "Rotation" #: src/WeatherFaxUI.cpp:851 msgid "CCW" -msgstr "" +msgstr "CCW" #: src/WeatherFaxUI.cpp:851 msgid "CW" -msgstr "" +msgstr "CW" #: src/WeatherFaxUI.cpp:851 msgid "180" @@ -353,19 +358,21 @@ #: src/WeatherFaxUI.cpp:925 src/WeatherFaxUI.cpp:964 src/WeatherFaxUI.cpp:1159 #: src/WeatherFaxUI.cpp:1182 msgid "Lat/Lon" -msgstr "" +msgstr "Lat/Lon" #: src/WeatherFaxUI.cpp:931 msgid "Minutes" -msgstr "" +msgstr "Minute(n)" #: src/WeatherFaxUI.cpp:998 msgid "Show Lat/Lon Minutes" -msgstr "" +msgstr "Zeige Lat/Lon Minuten" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" -msgstr "" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" +msgstr "+ Lat/Lon für N/O\n" +"- Lat/Lon für S/W" #: src/WeatherFaxUI.cpp:1019 msgid "Coordinates Mapping Correction" @@ -377,19 +384,19 @@ #: src/WeatherFaxUI.cpp:1035 msgid "mercator" -msgstr "" +msgstr "Mercator" #: src/WeatherFaxUI.cpp:1035 msgid "polar" -msgstr "" +msgstr "Polar" #: src/WeatherFaxUI.cpp:1035 msgid "conic" -msgstr "" +msgstr "Kegelschnitt" #: src/WeatherFaxUI.cpp:1035 msgid "fixed-flat" -msgstr "" +msgstr "Fest-flach" #: src/WeatherFaxUI.cpp:1041 msgid "Output Type" @@ -397,20 +404,19 @@ #: src/WeatherFaxUI.cpp:1045 msgid "Mercator" -msgstr "" +msgstr "Mercator-Projektion" #: src/WeatherFaxUI.cpp:1049 msgid "Size" msgstr "Größe" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "" #: src/WeatherFaxUI.cpp:1056 msgid "W/H" -msgstr "" +msgstr "B/H" #: src/WeatherFaxUI.cpp:1063 msgid "True Width Ratio" @@ -438,47 +444,47 @@ #: src/WeatherFaxUI.cpp:1105 msgid "GetAspectRatio" -msgstr "" +msgstr "GetSeitenVerhältnis" #: src/WeatherFaxUI.cpp:1365 msgid "HF Schedules" -msgstr "" +msgstr "HF Zeitpläne" #: src/WeatherFaxUI.cpp:1372 msgid "Load Schedules at Startup" -msgstr "" +msgstr "Lade Zeitpläne beim Start" #: src/WeatherFaxUI.cpp:1382 msgid "Export" -msgstr "" +msgstr "Exportieren" #: src/WeatherFaxUI.cpp:1394 msgid "Reduce to" -msgstr "" +msgstr "Vermindere um" #: src/WeatherFaxUI.cpp:1401 msgid "Colors" -msgstr "" +msgstr "Farben" #: src/WeatherFaxUI.cpp:1408 msgid "Recommended 4, 16, 64, or 256" -msgstr "" +msgstr "Empfohlen 4, 16, 64, oder 256" #: src/WeatherFaxUI.cpp:1413 msgid "Depth" -msgstr "" +msgstr "Tiefe" #: src/WeatherFaxUI.cpp:1420 msgid "Meters" -msgstr "" +msgstr "Meter" #: src/WeatherFaxUI.cpp:1423 msgid "Fathoms" -msgstr "" +msgstr "Faden" #: src/WeatherFaxUI.cpp:1437 msgid "fix sounding datum" -msgstr "" +msgstr "Festes Tiefen-Datum" #: src/WeatherFaxUI.cpp:1490 msgid "Audio Decoding Options" @@ -494,11 +500,11 @@ #: src/WeatherFaxUI.cpp:1516 msgid "Carrier" -msgstr "" +msgstr "Träger" #: src/WeatherFaxUI.cpp:1523 msgid "Deviation" -msgstr "" +msgstr "Abweichungen" #: src/WeatherFaxUI.cpp:1534 msgid "narrow" @@ -514,11 +520,13 @@ #: src/WeatherFaxUI.cpp:1540 msgid "Saturation Threshold" -msgstr "" +msgstr "Sättigungsschwelle" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" -msgstr "Überspringe Start, Stop und \nPhasen-Prüfung" +msgid "Skip start, stop and \n" +"phasing detection" +msgstr "Überspringe Start, Stop und \n" +"Phasen-Prüfung" #: src/WeatherFaxUI.cpp:1553 msgid "Include header data in image" @@ -526,11 +534,11 @@ #: src/WeatherFaxUI.cpp:1569 msgid "Audio Capture Options" -msgstr "Empfangen" +msgstr "Audio-Empfang Optionen" #: src/WeatherFaxUI.cpp:1576 msgid "Sample Rate" -msgstr "" +msgstr "Abtastrate" #: src/WeatherFaxUI.cpp:1580 msgid "8000" @@ -544,389 +552,433 @@ msgid "48000" msgstr "" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "Geräteindex" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" -msgstr "" +msgstr "Erledigt" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" -msgstr "WetterFax PlugIn für OpenCPN" +msgstr "WetterFax PlugIn Version" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." -msgstr "" +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." +msgstr "Das Wetterfax Plugin für OpenCPN soll den Wetterfax-Empfang vereinfachen und sie direkt auf der Karte anzeigen.\n\n" +"Enthält Fax-Decoder, der Radio-Fax-Töne in Bilder konvertiert.\n" +"Zu Beginn öffnen Sie entweder ein Bild oder eine vom SSB Radio aufgenommene WAV Datei mit dem Datei-Menü oder wählen Sie eine Option vom Suche-Menü.\n\n" +"Lizenz: GPLv3+\n\n" +"Quell-Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Author:\n" +"Sean D'Epagnier\n\n" +"Vielen Dank an alle Übersetzer und Tester." -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" -msgstr "" +msgstr "Über den Autor" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" -msgstr "" +msgstr "Zeitplan" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" -msgstr "" +msgstr "Server" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" -msgstr "" +msgstr "Region" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" -msgstr "" +msgstr "Inhalt" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" -msgstr "" +msgstr "Karten-Gebiet" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " -msgstr "Fehler bei Laden Eingangsdatei: " +msgstr "Fehler bei Laden Datei: " -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" -msgstr "" +msgstr "Ungültige XML Datei" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" -msgstr "WetterFax Einstellungen" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" +msgstr "WetterFax Internetabruf" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" -msgstr "" +msgstr "Lade" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " -msgstr "" +msgstr "Ungültiger Zähler: " -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " -msgstr "" +msgstr "Nicht erkannter XML Knoten: " -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " -msgstr "Fehler bei Laden Eingangsdatei: " +msgstr "Fehler bei Gebietsdaten: " -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" -msgstr "" +msgstr "Sortierung derart vieler URLs kann lange dauern" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "WetterFax" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" -msgstr "" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" +msgstr "Fax schon vor weniger als 3 Stunden empfangen.\n" +"Existierende Datei nehmen?" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 -msgid "Reading Headers: " -msgstr "" +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" +msgstr "WetterFax Internetsuche" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" -msgstr "" +#: src/InternetRetrievalDialog.cpp:584 +msgid "Reading Headers: " +msgstr "Lese Header: " -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " -msgstr "" +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " +msgstr "Fehler bei Download: " -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" +msgstr "Prüfe auf funktionierende Internet-Verbindung." -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." -msgstr "" +msgstr "Ist die URL falsch, editiere die xml und/oder schreibe Fehlerbericht." -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." -msgstr "" +msgstr "Keine Faxe gewählt." -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" -msgstr "" +msgstr "Versuche gewählte (erste) Spalte zu klicken" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "Neue Koord" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" -msgstr "" +msgstr "Start" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" -msgstr "" +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" +msgstr "Fehler beim Kartieren\n" +"Prüfe Karten-Korrektur Parameter" -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "Zeichnen" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "Warnung, Breiten auf beiden Seiten des Äquators nicht empfohlen wegen Unklarheit von Nord- oder Südpol" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" -msgstr "Berechnung der Zeichnung fehlgeschlagen.\nVielleicht wurde falscher Zeichnungstyp für dies Bild gewählt oder angegebene Koordinaten sind nicht korrekt\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +msgstr "Berechnung der Zeichnung fehlgeschlagen.\n" +"Vielleicht wurde falscher Zeichnungstyp für dies Bild gewählt oder angegebene Koordinaten sind nicht korrekt\n" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "Berechnung der Zeichnung noch nicht unterstützt.\n" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "Berechnung Äquator noch nicht unterstützt.\n" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." -msgstr "Zeichnung erlaubt für Skalierung und Umwandlung zwischen Koordinaten Systemen\nBreiten sind +N -S, Längen +E -W\n\nFür Polar Zeichnungs Modus:\nZeichnungs-Parameter berechnen die Zeichnung mit den angegebenen Koordinaten, aber der X-Wert (vertikale rote Linie) der ersten Koordinate muß innerhalb der Pole im Polar Modus im vertikalen Meridian liegen\nSind die Koordinaten eingegeben, soll die Zeichnung mit den blauen Breiten übereinstimmen. Sind sie weit entfernt, überprüfen Sie die Eingangs-Koordinaten.\nSind sie nahe:\nJustieren Sie erst Pol X zur Zentrierung der Breiten. Dann justieren Sie den Pol Y-Wert, bis die blaue Breitenkurve am nächsten zum Pol korrekt ist. Ist die zweite blaue Breite zu weit, dann muß das echte Breitenverhältnis erhöht werden, sonst muß es erniedrigt werden. Wiederholen Sie die Justierung des Pols Y und des echten Breitenverhältnisses, bis beide übereinstimmen. Am Einfachsten ist eine korrekte Kalibrierung, wenn die verfügbare weitest entfernte Breite benutzt wird.\nStimmen die blauen Breiten perfekt überein, berechnen Sie den Äquator erneut, um eine korrekte Zeichnung zu erhalten. An diesem Punkt können die Koordinaten erforderlichenfalls auf einen besseren Ort gesetzt werden. Ist die echte Breite nahe bei 1.0, sollte es vermutlich exakt 1.0 sein.\nMan kann auch zum nächsten Schritt gehen, die Koordinaten justieren und dann zu diesem Schritt zurück gehen, um die Zeichnungs-Parameter erneut zu optimieren." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +msgstr "Zeichnung erlaubt die Skalierung und Umwandlung zwischen Koordinaten Systemen\n" +"Breiten sind +N -S, Längen +O -W\n\n" +"Für Polar Zeichnungs Modus:\n" +"Zeichnungs-Parameter berechnen die Zeichnung mit den angegebenen Koordinaten, aber der X-Wert (vertikale rote Linie) der ersten Koordinate muß innerhalb der Pole im Polar Modus im vertikalen Meridian liegen\n" +"Sind die Koordinaten eingegeben, soll die Zeichnung mit den blauen Breiten übereinstimmen. Sind sie weit entfernt, überprüfen Sie die Eingangs-Koordinaten.\n" +"Sind sie nahe:\n" +"Justieren Sie erst Pol X zur Zentrierung der Breiten. Dann justieren Sie den Pol Y-Wert, bis die blaue Breitenkurve am nächsten zum Pol korrekt ist. Ist die zweite blaue Breite zu weit, dann muß das echte Breitenverhältnis erhöht werden, sonst muß es erniedrigt werden. Wiederholen Sie die Justierung des Pols Y und des echten Breitenverhältnisses, bis beide übereinstimmen. Am Einfachsten ist eine korrekte Kalibrierung, wenn die verfügbare weitest entfernte Breite benutzt wird.\n" +"Stimmen die blauen Breiten perfekt überein, berechnen Sie den Äquator erneut, um eine korrekte Zeichnung zu erhalten. An diesem Punkt können die Koordinaten erforderlichenfalls auf einen besseren Ort gesetzt werden. Ist die echte Breite nahe bei 1.0, sollte es vermutlich exakt 1.0 sein.\n" +"Man kann auch zum nächsten Schritt gehen, die Koordinaten justieren und dann zu diesem Schritt zurück gehen, um die Zeichnungs-Parameter erneut zu optimieren." -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " -msgstr "Fehler Fax-Dekodierung: " +msgstr "Fehler Fax Dekoder: " -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "Fehler" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "fax_decode_image_line erfordert spezifische Speichergröße" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" -msgstr "" +msgstr "Audio-Port Eingang Überlauf, einige Daten verloren!" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "Kann Eingangsdatei nicht öffnen: " -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " -msgstr "Samplegröße ist nicht 16 Bit" +msgstr "Samplegröße ist nicht 8 oder 16 Bit: " -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "Empfangen" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "Rotation" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" -msgstr "" +msgstr "Zeit (UTC)" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" -msgstr "" +msgstr "Gültige Zeit" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" -msgstr "Deviation" +msgstr "Dauer" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" -msgstr "WetterFax Einstellungen" +msgstr "WetterFax Zeitplan" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" -msgstr "" +msgstr "Nicht erkannter XML Knoten" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " -msgstr "Fehler bei Laden Eingangsdatei: " +msgstr "Fehler beim Finder der Dauer für: " -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" -msgstr "" +msgstr "Sortierung derart vieler Zeitpläne kann lange dauern" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" -msgstr "" +msgstr "Fülle Liste" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " -msgstr "" +msgstr "Empfange Fax: " -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " -msgstr "" +msgstr " Konflikte mit schon eingeplantem Fax: " -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " -msgstr "" +msgstr " verwerfe dies Fax? " -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" -msgstr "" +msgstr "Wetterfax Zeitpläne" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" -msgstr "Empfangen" +msgstr "Kein Empfang gesetzt" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" -msgstr "" +msgstr "starte in" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" -msgstr "" +msgstr "Sekunde(n)" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" -msgstr "" +msgstr "Stunden(n)" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" -msgstr "" +msgstr "Minute(n)" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " -msgstr "" +msgstr "Aktuelles Fax: " -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" -msgstr "" +msgstr "SSB Radio einstellen auf" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" -msgstr "" +msgstr "zum Faxempfang von" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" -msgstr "" +msgstr "Wetterfax Zeitplan beginnt bald" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " -msgstr "" +msgstr "Schon empfangen, kann nicht empfangen: " -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " -msgstr "Fehler bei Laden Eingangsdatei: " +msgstr "Fehler bei Starten: " -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." -msgstr "" +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." +msgstr "Fehler in Wetter Fax Plugin\n" +"Empfange gerade HF Wetter Fax." -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "Öffne WetterFax Eingangsdatei" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" -msgstr "" +msgstr "WAV Dateien (*.wav)|*.WAV;*.wav|Alle Dateien (*.*)|*.*" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" -msgstr "" +msgstr "Externer Empfangs-Befehl fehlgeschlagen" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" -msgstr "Fehler bei Laden Eingangsdatei: " +msgstr "Fehler bei Laden Koordinaten: " -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " -msgstr "Fehler bei Laden Eingangsdatei: " +msgstr "Fehler bei Sichern xml-Datei: " -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" -msgstr "" +msgstr "Ausführversuch:" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "Fehler bei Laden Eingangsdatei: " -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" -msgstr "Unterstützte Bild-Dateien|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga|WAV Dateien (*.wav)|*.WAV;*.wav|Alle Dateien (*.*)|*.*" +msgstr "Unterstützte Dateien|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga|WAV Dateien (*.wav)|*.WAV;*.wav|Alle Dateien (*.*)|*.*" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." -msgstr "" +msgstr "Kann schon bearbeitetes Audio WetterFax nicht öffnen." -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" -msgstr "" +msgstr "WetterFax als Bild sichern" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" -msgstr "" +msgstr "Bild Dateien|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAlle Dateien (*.*)|*.*" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " -msgstr "" +msgstr "Fehler bei Sichern Datei: " -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" -msgstr "WetterFax" +msgstr "WetterFax als KAP sichern" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" -msgstr "" +msgstr "KAP Dateien|*.KAP;*.kap|Alle Dateien (*.*)|*.*" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "Resultierendes Bild hat negative Dimensionen, Abbruch\n" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "Zeichnen fehlgeschlagen" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" -msgstr "" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" +msgstr "Resultierendes Bild größer als %dMB\n" +"Ändere Größen-Parameter auf kleineren Wert (weniger als %.2f).\n" +"Abbruch\n" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "Zeichne WetterFax Bild" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "WetterFax Zeichner" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" -msgstr "" +msgstr "Grafik Hardware nicht unterstützt (OpenGL deaktiviert)\n" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "WetterFax" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "WetterFax PlugIn für OpenCPN" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" -msgstr "" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" +msgstr "Wetter Fax PlugIn für OpenCPN\n" +"Kann Bild-Dateien direkt öffnen oder Audio-Faxe als Bild dekodieren.\n" +"Mit einfacher Kalibrierung, resultierendes Bild wird der Karte überlagert.\n" +"Konvertiert Bilder in Mercator, Polar, Konic und einfache Koordinaten.\n" +"Kann jedes Bild in eine Raster-Karte konvertieren.\n" +"Eingebaute Datenbank für HF Radio Fax Stationen über SSB.\n" +"Eingebaute Datenbank für Internet Suche von meterologischen Seiten.\n" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "WetterFax Einstellungen" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/el.po opencpn-plugin-weatherfax-1.5001.0/po/el.po --- opencpn-plugin-weatherfax-1.3.1/po/el.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/el.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:23-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-02-18 16:08-0500\n" "Last-Translator: nohal \n" "Language-Team: Greek\n" "Language: el_GR\n" @@ -16,22 +16,21 @@ "X-Crowdin-Language: el\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "" #: src/WeatherFaxUI.h:165 msgid "HF Radio Schedules" -msgstr "" +msgstr "Προγράμματα ραδιοφώνου HF" #: src/WeatherFaxUI.h:216 msgid "Internet Retrieval" -msgstr "" +msgstr "Ανάκτηση από το Internet" #: src/WeatherFaxUI.h:337 msgid "Weather Fax Image" @@ -41,13 +40,13 @@ msgid "Weather Fax Preferences" msgstr "" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" -msgstr "" +msgstr "Σχετικά με Weatherfax" #: src/WeatherFaxUI.cpp:23 msgid "Fax" @@ -55,109 +54,109 @@ #: src/WeatherFaxUI.cpp:42 msgid "Transparency" -msgstr "" +msgstr "Διαφάνεια" #: src/WeatherFaxUI.cpp:58 msgid "Invert" -msgstr "" +msgstr "Αντιστροφή" #: src/WeatherFaxUI.cpp:71 msgid "&Open" -msgstr "" +msgstr "&Άνοιγμα" #: src/WeatherFaxUI.cpp:74 msgid "Save &As" -msgstr "" +msgstr "Αποθήκευση &ως" #: src/WeatherFaxUI.cpp:77 msgid "&Edit" -msgstr "" +msgstr "&Επεξεργασία" #: src/WeatherFaxUI.cpp:80 msgid "&Goto" -msgstr "" +msgstr "&Goto" #: src/WeatherFaxUI.cpp:83 msgid "E&xport" -msgstr "" +msgstr "E&ξαγωγή" #: src/WeatherFaxUI.cpp:86 msgid "&Delete" -msgstr "" +msgstr "&Διαγραφή" #: src/WeatherFaxUI.cpp:92 msgid "&Preferences" -msgstr "" +msgstr "&Προτιμήσεις" #: src/WeatherFaxUI.cpp:98 msgid "&Close" -msgstr "" +msgstr "&Κλείσιμο" #: src/WeatherFaxUI.cpp:101 msgid "&File" -msgstr "" +msgstr "&Αρχείο" #: src/WeatherFaxUI.cpp:104 msgid "&Audio Capture" -msgstr "" +msgstr "&Καταγραφή ήχου" #: src/WeatherFaxUI.cpp:108 msgid "&HF Radio Schedules" -msgstr "" +msgstr "Προγράμματα ραδιοφώνου &HF" #: src/WeatherFaxUI.cpp:112 msgid "&Internet" -msgstr "" +msgstr "&Διαδίκτυο" #: src/WeatherFaxUI.cpp:115 msgid "&Retrieve" -msgstr "" +msgstr "&Ανάκτηση" #: src/WeatherFaxUI.cpp:119 msgid "&About" -msgstr "" +msgstr "&Περί" #: src/WeatherFaxUI.cpp:122 msgid "&Help" -msgstr "" +msgstr "&Βοήθεια" #: src/WeatherFaxUI.cpp:229 src/WeatherFaxUI.cpp:583 msgid "Contains" -msgstr "" +msgstr "Περιέχει" #: src/WeatherFaxUI.cpp:236 src/WeatherFaxUI.cpp:590 msgid "Lat" -msgstr "" +msgstr "Πλάτος" #: src/WeatherFaxUI.cpp:243 src/WeatherFaxUI.cpp:597 msgid "Lon" -msgstr "" +msgstr "Μήκος" #: src/WeatherFaxUI.cpp:250 src/WeatherFaxUI.cpp:604 msgid "Boat Position" -msgstr "" +msgstr "Θέση πλοίου" #: src/WeatherFaxUI.cpp:253 src/WeatherFaxUI.cpp:607 msgid "Reset" -msgstr "" +msgstr "Επαναφορά" #: src/WeatherFaxUI.cpp:263 msgid "Stations" -msgstr "" +msgstr "Σταθμοί" #: src/WeatherFaxUI.cpp:279 src/WeatherFaxUI.cpp:316 src/WeatherFaxUI.cpp:651 #: src/WeatherFaxUI.cpp:684 msgid "All" -msgstr "" +msgstr "Όλα" #: src/WeatherFaxUI.cpp:282 src/WeatherFaxUI.cpp:654 src/WeatherFaxUI.cpp:687 #: src/WeatherFaxUI.cpp:851 msgid "None" -msgstr "" +msgstr "Καμία" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" -msgstr "" +msgstr "Συχνότητα" #: src/WeatherFaxUI.cpp:305 msgid "khz min" @@ -169,7 +168,7 @@ #: src/WeatherFaxUI.cpp:331 msgid "Constraints" -msgstr "" +msgstr "Περιορισμοί" #: src/WeatherFaxUI.cpp:338 msgid "Has Area" @@ -185,43 +184,43 @@ #: src/WeatherFaxUI.cpp:360 src/WeatherFaxUI.cpp:830 src/WeatherFaxUI.cpp:1530 msgid "Filter" -msgstr "" +msgstr "Φίλτρο" #: src/WeatherFaxUI.cpp:368 msgid "Message Box" -msgstr "" +msgstr "Πλαίσιο μηνύματος" #: src/WeatherFaxUI.cpp:377 msgid "Sound" -msgstr "" +msgstr "Ήχος" #: src/WeatherFaxUI.cpp:380 msgid "Select a file" -msgstr "" +msgstr "Επιλέξτε ένα αρχείο" #: src/WeatherFaxUI.cpp:392 msgid "External Alarm" -msgstr "" +msgstr "Εξωτερικός συναγερμός" #: src/WeatherFaxUI.cpp:395 msgid "aplay /usr/local/share/opencpn/sounds/2bells.wav" -msgstr "" +msgstr "/usr/local/share/opencpn/sounds/2bells.wav" #: src/WeatherFaxUI.cpp:405 msgid "1 minute alarm" -msgstr "" +msgstr "Συναγερμός 1 λεπτού" #: src/WeatherFaxUI.cpp:413 msgid "No Action" -msgstr "" +msgstr "Καμία ενέργεια" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" -msgstr "" +msgstr "Καταγραφή ήχου" #: src/WeatherFaxUI.cpp:427 msgid "External Command" -msgstr "" +msgstr "Εξωτερική εντολή" #: src/WeatherFaxUI.cpp:430 msgid "arecord -f S16_LE" @@ -236,11 +235,14 @@ msgstr "" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." msgstr "" #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "" @@ -248,7 +250,7 @@ msgid "Capture Status" msgstr "" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "" @@ -272,8 +274,8 @@ msgid "Decoder" msgstr "" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "" @@ -364,7 +366,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" msgstr "" #: src/WeatherFaxUI.cpp:1019 @@ -397,14 +400,13 @@ #: src/WeatherFaxUI.cpp:1045 msgid "Mercator" -msgstr "" +msgstr "Μερκατορική" #: src/WeatherFaxUI.cpp:1049 msgid "Size" -msgstr "" +msgstr "Μέγεθος" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "" @@ -414,27 +416,27 @@ #: src/WeatherFaxUI.cpp:1063 msgid "True Width Ratio" -msgstr "" +msgstr "Λόγος αληθινού πλάτους" #: src/WeatherFaxUI.cpp:1078 msgid "Pole X" -msgstr "" +msgstr "Πόλος X" #: src/WeatherFaxUI.cpp:1085 msgid "Pole Y" -msgstr "" +msgstr "Πόλος Y" #: src/WeatherFaxUI.cpp:1092 msgid "Equator Y" -msgstr "" +msgstr "Ισημερινός Y" #: src/WeatherFaxUI.cpp:1099 msgid "Get Mapping " -msgstr "" +msgstr "Πάρετε χαρτογράφηση " #: src/WeatherFaxUI.cpp:1102 msgid "Get Equator" -msgstr "" +msgstr "Πάρτε Ισημερινό" #: src/WeatherFaxUI.cpp:1105 msgid "GetAspectRatio" @@ -450,31 +452,31 @@ #: src/WeatherFaxUI.cpp:1382 msgid "Export" -msgstr "" +msgstr "Εξαγωγή" #: src/WeatherFaxUI.cpp:1394 msgid "Reduce to" -msgstr "" +msgstr "Μείωση σε" #: src/WeatherFaxUI.cpp:1401 msgid "Colors" -msgstr "" +msgstr "Χρώματα" #: src/WeatherFaxUI.cpp:1408 msgid "Recommended 4, 16, 64, or 256" -msgstr "" +msgstr "Συνιστάται 4, 16, 64 ή 256" #: src/WeatherFaxUI.cpp:1413 msgid "Depth" -msgstr "" +msgstr "Βάθος" #: src/WeatherFaxUI.cpp:1420 msgid "Meters" -msgstr "" +msgstr "Μέτρα" #: src/WeatherFaxUI.cpp:1423 msgid "Fathoms" -msgstr "" +msgstr "Οργιές" #: src/WeatherFaxUI.cpp:1437 msgid "fix sounding datum" @@ -482,43 +484,45 @@ #: src/WeatherFaxUI.cpp:1490 msgid "Audio Decoding Options" -msgstr "" +msgstr "Επιλογές αποκωδικοποίησης ήχου" #: src/WeatherFaxUI.cpp:1502 msgid "Image Width" -msgstr "" +msgstr "Πλάτος εικόνας" #: src/WeatherFaxUI.cpp:1509 msgid "Bits per Pixel" -msgstr "" +msgstr "Bit ανά Pixel" #: src/WeatherFaxUI.cpp:1516 msgid "Carrier" -msgstr "" +msgstr "Φορέας" #: src/WeatherFaxUI.cpp:1523 msgid "Deviation" -msgstr "" +msgstr "Απόκλιση" #: src/WeatherFaxUI.cpp:1534 msgid "narrow" -msgstr "" +msgstr "στενό" #: src/WeatherFaxUI.cpp:1534 msgid "middle" -msgstr "" +msgstr "μέσο" #: src/WeatherFaxUI.cpp:1534 msgid "wide" -msgstr "" +msgstr "ευρύ" #: src/WeatherFaxUI.cpp:1540 msgid "Saturation Threshold" -msgstr "" +msgstr "Όριο κορεσμού" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" -msgstr "" +msgid "Skip start, stop and \n" +"phasing detection" +msgstr "Παράλειψη ανίχνευσης αρχής, σταματήματος\n" +" και φάσης" #: src/WeatherFaxUI.cpp:1553 msgid "Include header data in image" @@ -526,11 +530,11 @@ #: src/WeatherFaxUI.cpp:1569 msgid "Audio Capture Options" -msgstr "" +msgstr "Επιλογές καταγραφής ήχου" #: src/WeatherFaxUI.cpp:1576 msgid "Sample Rate" -msgstr "" +msgstr "Ρυθμός Δειγματοληψίας" #: src/WeatherFaxUI.cpp:1580 msgid "8000" @@ -544,389 +548,416 @@ msgid "48000" msgstr "" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "Δείκτης συσκευής" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" -msgstr "" +msgstr "Έγινε" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." -msgstr "" +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." +msgstr "Το πρόσθετο weatherfax για το OpenCPN έχει ως στόχο να μειώσει τον φόρτο του χρήστη για να παίρνει τα φαξ του καιρού και, προαιρετικά να τα απεικονίζει απευθείας πάνω στους χάρτες.\n\n" +"Περιλαμβάνει ένα αποκωδικοποιητή φάξ, ο οποίος μετατρέπει τα ραδιοφωνικά ηχητικά φαξ σε εικόνες.\n\n" +"Για να ξεκινήσετε, ανοίξτε είτε μια εικόνα ή ένα ηχογραφημένο αρχείο wav μιας ραδιοφωνικής μετάδοσης ssb φαξ από το μενού «file», ή ενεργοποιήστε μια επιλογή από τo μενού «retrieve».\n\n" +"Το πρόγραμμα είναι στο:\n" +" https://github.com/seandepagnier/weatherfax_pi \n\n" +"Ευχαριστίες στους μεταφραστές και στους δοκιμαστές." -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" -msgstr "" +msgstr "Σχετικά με τον συγγραφέα" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" -msgstr "" +msgstr "Προγραμματισμένο" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" -msgstr "" +msgstr "Διακομιστής" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" -msgstr "" +msgstr "Περιοχή" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" -msgstr "" +msgstr "Περιεχόμενα" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" -msgstr "" +msgstr "Περιοχή χάρτη" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " -msgstr "" +msgstr "Απέτυχε η φόρτωση του αρχείου: " -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "" -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "" -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "" -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" msgstr "" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 -msgid "Reading Headers: " +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" +#: src/InternetRetrievalDialog.cpp:584 +msgid "Reading Headers: " msgstr "" -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " msgstr "" -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "" -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "" -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "" -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr "" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" msgstr "" -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" msgstr "" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "" -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "" -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "" -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "" -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr "" -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr "" -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "" -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "" -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "" -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." msgstr "" -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "" -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" msgstr "" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "" -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." msgstr "" -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" msgstr "" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " msgstr "" -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" msgstr "" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" msgstr "" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" -msgstr "" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" +msgstr "Πρόσθετο Weather Fax για το OpenCPN\n" +"Ανοίγει αρχεία εικόνας απευθείας, ή αποκωδικοποιεί φαξ ήχου σε εικόνα.\n" +"Με απλή βαθμονόμηση η εικόνα που προκύπτει υπερτίθεται πάνω στον χάρτη.\n" +"Μετατρέπει εικόνες σε μερκατορικές, πολικές, κωνικές και ομοιόμορφες συντεταγμένες. \n" +"Μετατρέπει οποιαδήποτε εικόνα σε χάρτη raster.\n" +"Περιέχει βάση δεδομένων με ραδιοφωνικούς σταθμούς φαξ HF μέσω SSB\n" +"και για ανάκτηση μετεωρολογικών δεδομένων μέσω του internet.\n" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/es.po opencpn-plugin-weatherfax-1.5001.0/po/es.po --- opencpn-plugin-weatherfax-1.3.1/po/es.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/es.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:23-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-02-18 16:08-0500\n" "Last-Translator: nohal \n" "Language-Team: Spanish\n" "Language: es_ES\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "Weather Fax" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "Preferencias de weather fax" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "Opciones de decodificación de fax" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "Sobre Weatherfax" @@ -67,7 +66,7 @@ #: src/WeatherFaxUI.cpp:74 msgid "Save &As" -msgstr "" +msgstr "Guardar &Como" #: src/WeatherFaxUI.cpp:77 msgid "&Edit" @@ -155,7 +154,7 @@ msgid "None" msgstr "Ninguna" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "Frecuencia" @@ -181,7 +180,7 @@ #: src/WeatherFaxUI.cpp:350 msgid "Clear Captures" -msgstr "" +msgstr "Limpiar capturas" #: src/WeatherFaxUI.cpp:360 src/WeatherFaxUI.cpp:830 src/WeatherFaxUI.cpp:1530 msgid "Filter" @@ -193,11 +192,11 @@ #: src/WeatherFaxUI.cpp:377 msgid "Sound" -msgstr "" +msgstr "Sonido" #: src/WeatherFaxUI.cpp:380 msgid "Select a file" -msgstr "" +msgstr "Seleccionar un archivo" #: src/WeatherFaxUI.cpp:392 msgid "External Alarm" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "No hacer nada" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "Captura de audio" @@ -236,11 +235,17 @@ msgstr "Opciones de captura" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." -msgstr "Seleccionar imágenes fax en la primera columna \"Capturar\"\n\nLas emisiones pueden ordenarse haciendo clic en la cabecera de las columnas\n\nLas emisiones deben comprobarse ya que el autor solo puede recibir desde unas pocas de todas las posibles estaciones. Pueden hacerse correcciones modificando el archivo WeatherFaxSchedules.xml. Los cambios pueden ser sugeridos a través de github.\n\nSería deseable un control automático de la radio BLU pero el autor solo dispone de una tecsun pl-600. Esta posibilidad sería implementada si se recibiera una donación de alguna radio más adecuada." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgstr "Seleccionar imágenes fax en la primera columna \"Capturar\"\n\n" +"Las emisiones pueden ordenarse haciendo clic en la cabecera de las columnas\n\n" +"Las emisiones deben comprobarse ya que el autor solo puede recibir desde unas pocas de todas las posibles estaciones. Pueden hacerse correcciones modificando el archivo WeatherFaxSchedules.xml. Los cambios pueden ser sugeridos a través de github.\n\n" +"Sería deseable un control automático de la radio BLU pero el autor solo dispone de una tecsun pl-600. Esta posibilidad sería implementada si se recibiera una donación de alguna radio más adecuada." #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "Información" @@ -248,13 +253,13 @@ msgid "Capture Status" msgstr "Estado de las capturas" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "Cerrar" #: src/WeatherFaxUI.cpp:621 msgid "Retrieve Scheduled" -msgstr "" +msgstr "Descarga programada" #: src/WeatherFaxUI.cpp:624 msgid "Retrieve Selected" @@ -272,8 +277,8 @@ msgid "Decoder" msgstr "Decodificador" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "Parar" @@ -299,7 +304,7 @@ #: src/WeatherFaxUI.cpp:834 msgid "Removal 3" -msgstr "" +msgstr "Eliminar 3" #: src/WeatherFaxUI.cpp:834 msgid "Value 1" @@ -357,15 +362,17 @@ #: src/WeatherFaxUI.cpp:931 msgid "Minutes" -msgstr "" +msgstr "Minutos" #: src/WeatherFaxUI.cpp:998 msgid "Show Lat/Lon Minutes" -msgstr "" +msgstr "Mostrar Lat/Lon minutos" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" -msgstr "+ Lat/Lon para N/E\n- Lat/Lon para S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" +msgstr "+ Lat/Lon para N/E\n" +"- Lat/Lon para S/W" #: src/WeatherFaxUI.cpp:1019 msgid "Coordinates Mapping Correction" @@ -403,8 +410,7 @@ msgid "Size" msgstr "Tamaño" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "1" @@ -462,7 +468,7 @@ #: src/WeatherFaxUI.cpp:1408 msgid "Recommended 4, 16, 64, or 256" -msgstr "" +msgstr "Recomendado 4, 16, 64 o 256" #: src/WeatherFaxUI.cpp:1413 msgid "Depth" @@ -517,8 +523,10 @@ msgstr "Umbral de saturación" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" -msgstr "Saltar inicio, parar y\ndetección de fase" +msgid "Skip start, stop and \n" +"phasing detection" +msgstr "Saltar inicio, parar y\n" +"detección de fase" #: src/WeatherFaxUI.cpp:1553 msgid "Include header data in image" @@ -544,389 +552,430 @@ msgid "48000" msgstr "48000" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "Índice de dispositivo" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "Hecho" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "Versión del plugin Weather Fax" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." -msgstr "El objetivo de Weatherfax para OpenCPN es el de reducir la cantidad de acciones a realizar cuando se reciben faxes meteorológicos. También ofrece laposibilidad de superponerlos a la carta.\n\nIncluye un decodificador que convierte audio faxes en imágenes.\n\nPara empezar puedes abrir algún archivo de imagen o algún archivo de audio de alguna trasmisión de fax via radio BLU desde el menu \"Archivo\". Luego prueba seleccionando alguna opción del menú \"Captura\".\n\nCódigo fuente:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMuchas gracias a traductores y testers." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." +msgstr "El objetivo de Weatherfax para OpenCPN es el de reducir la cantidad de acciones a realizar cuando se reciben faxes meteorológicos. También ofrece laposibilidad de superponerlos a la carta.\n\n" +"Incluye un decodificador que convierte audio faxes en imágenes.\n\n" +"Para empezar puedes abrir algún archivo de imagen o algún archivo de audio de alguna trasmisión de fax via radio BLU desde el menu \"Archivo\". Luego prueba seleccionando alguna opción del menú \"Captura\".\n\n" +"Código fuente:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Muchas gracias a traductores y testers." -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "Sobre el autor" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "Varias" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "Servidor" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "Zona" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "Contenido" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "Area" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "Error cargando archivo: " -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "Archivo xml no valido" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" -msgstr "Descarga Internet Weatherfax" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" +msgstr "Descarga Weatherfax por Internet" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "Cargando" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "Iterador no valido: " -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "Nodo xml desconocido: " -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "Error buscando Area: " -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "Ordenar tantas URLs puede llevar demasiado tiempo" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "weatherfax" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" -msgstr "El fax ha sido descargado hace menos de 180 minutos.\n¿Usar el archivo existente?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" +msgstr "El fax ha sido descargado hace menos de 180 minutos.\n" +"¿Usar el archivo existente?" + +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" +msgstr "Descarga Internet Weatherfax" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 +#: src/InternetRetrievalDialog.cpp:584 msgid "Reading Headers: " msgstr "Leyendo cabeceras:" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" -msgstr "" - -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " -msgstr "Tiempo de espera de cabeceras excedido para: " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " +msgstr "Error en la descarga: " -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "Verifique que tiene conexión a Internet." -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "Si la URL es incorrecta, por favor edite el archivo xml y/o reporte el error." -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "No hay faxes seleccionados." -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr " Intente haciendo clic en la primera columna" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "Nuevas coordenadas" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "Iniciar" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" -msgstr "Error aplicando trazado\nComprobar los parámetros de corrección de coordenadas de trazado." - -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" +msgstr "Error aplicando trazado\n" +"Comprobar los parámetros de corrección de coordenadas de trazado." + +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "Trazando" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "Atención, latitudes en diferentes lados del ecuador no recomendado debido a la ambigüedad del polo norte o sur." -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" -msgstr "Error calculando trazado.\nPuede que haya elegido el tipo de trazado equivocado para esta imagen o que las coordenadas especificadas no sean las correctas\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +msgstr "Error calculando trazado.\n" +"Puede que haya elegido el tipo de trazado equivocado para esta imagen o que las coordenadas especificadas no sean las correctas\n" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "Cálculo de trazado aun no implementado.\n" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "Cálculo de ecuador aun no implementado\n" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." -msgstr "El trazado permite el escalado y la conversión entre sistemas de coordenadas.\nLatitudes son +N -S, Longitudes +E -W\n\nPara modo de trazado polar:\nLa opción \"obtener trazado\" calcula el trazado a partir de las coordenadas dadas, pero el valor de la primera coordenada X (linea roja vertical) debe estar alineado con el meridiano del polo.\nUna vez las coordenadas han sido introducidas, el trazado debería alinear las latitudes en azul. Si resultan muy alejadas revisar las coordenadas introducidas.\nUna vez estén cercanas:\nPrimero ajustar el valor polo X para centrar las latitudes. A continuación ajustar el valor polo Y hasta que la curva azul de latitudes más cercana al polo se muestre correctamente. Si la segunda linea azul de latitud es demasiado ancha, entonces el valor Relación de ancho verdadero debe ser aumentado, en caso contrario debe disminuirse. Repetir ajustando polo Y y Relación de ancho verdadero hasta que ambas lineas de latitud azul estén alineadas con la imagen. Es más fácil conseguir un trazado correcto si se usan las latitudes más alejadas disponibles.\nUna vez que las latitudes azules estén perfectamente alineadas, obtener el ecuador para asegurarse que el trazado resultante es correcto. En este momento, las coordenadas pueden ser cambiadas a una mejor localización si es necesario. Si el valor Relación de ancho verdadero está muy cercano a 1.0, probablemente deba ser exactamente 1.0.\nTambién es posible ir al siguiente paso, ajustar las coordenadas y volver a este paso para obtener el trazado de nuevo y mejorar la estimación." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +msgstr "El trazado permite el escalado y la conversión entre sistemas de coordenadas.\n" +"Latitudes son +N -S, Longitudes +E -W\n\n" +"Para modo de trazado polar:\n" +"La opción \"obtener trazado\" calcula el trazado a partir de las coordenadas dadas, pero el valor de la primera coordenada X (linea roja vertical) debe estar alineado con el meridiano del polo.\n" +"Una vez las coordenadas han sido introducidas, el trazado debería alinear las latitudes en azul. Si resultan muy alejadas revisar las coordenadas introducidas.\n" +"Una vez estén cercanas:\n" +"Primero ajustar el valor polo X para centrar las latitudes. A continuación ajustar el valor polo Y hasta que la curva azul de latitudes más cercana al polo se muestre correctamente. Si la segunda linea azul de latitud es demasiado ancha, entonces el valor Relación de ancho verdadero debe ser aumentado, en caso contrario debe disminuirse. Repetir ajustando polo Y y Relación de ancho verdadero hasta que ambas lineas de latitud azul estén alineadas con la imagen. Es más fácil conseguir un trazado correcto si se usan las latitudes más alejadas disponibles.\n" +"Una vez que las latitudes azules estén perfectamente alineadas, obtener el ecuador para asegurarse que el trazado resultante es correcto. En este momento, las coordenadas pueden ser cambiadas a una mejor localización si es necesario. Si el valor Relación de ancho verdadero está muy cercano a 1.0, probablemente deba ser exactamente 1.0.\n" +"También es posible ir al siguiente paso, ajustar las coordenadas y volver a este paso para obtener el trazado de nuevo y mejorar la estimación." -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "Error decodificando fax: " -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "Fallo" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "DecodeImageLine requiere de un tamaño de buffer específico" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "¡Puerto de audio sobrecargado, algunos datos se han perdido!" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "No se pudo abrir el archivo de entrada: " -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "Muestreo no es 8 o 16 bit: " -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "Capturar" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "Estación" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "Hora (UTC)" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "Tiempo validez" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "Duración" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "Horarios de emisión de WeatherFax" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "Nodo xml desconocido" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "Error buscando duración de: " -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "Ordenar tantas emisiones puede llevar demasiado tiempo" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "Creando listado" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "Capturando fax: " -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr "Conflictos con la emisión ya programada: " -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr "¿Desactivar este fax? " -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "horarios de emisión de WeatherFax" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "Sin conjunto de capturas" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "Empezará en" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "segundo(s)" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "hora(s)" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "minuto(s)" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "Fax actual:" -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "Sintonizar radio BLU en " -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "recibir fax para" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "La emisión de weather fax comenzará pronto" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "Ya se está capturando, no se puede capturar: " -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "Error ejecutando: " -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." -msgstr "" +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." +msgstr "Fallo en plugin weather fax\n" +"Actualmente capturando hf weather fax." -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "Abrir archivo Weather Fax" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "archivos WAV (*.wav)|*.WAV;*.wav|Todos (*.*)|*.*" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "Error capturando externamente" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "Error en la carga del conjunto de coordenadas" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "Error guardando archivo xml: " -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" -msgstr "" +msgstr "prueba a ejecutar:" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "Error cargando archivo de entrada: " -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "Archivos permitidos|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." -msgstr "" +msgstr "No se puede abrir audionweather fax ya en progreso." -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" -msgstr "" +msgstr "Guardar Weather Fax a una Imagen" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" -msgstr "" +msgstr "Archivos de imágen|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffTodos los archivos (*.*)|*.*" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " -msgstr "" +msgstr "Error al guardar archivo: " -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "Guardar weather fax como KAP" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" -msgstr "" +msgstr "Archivos KAP|*.KAP;*.kap|Todos los srchivos (*.*)|*.*" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "La imagen resultante tiene dimensiones negativas, abortando\n" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "Error de trazado" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" -msgstr "Imagen resultante mayor de %dMB\nIntenta cambiando el tamaño a un valor menor. (menor de %.2f)\nabortando\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" +msgstr "Imagen resultante mayor de %dMB\n" +"Intenta cambiando el tamaño a un valor menor. (menor de %.2f)\n" +"abortando\n" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "Trazando imagen de weather fax" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "Trazador de weather fax" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" -msgstr "" +msgstr "Hardware gráfico no soportado (desactivar OpenGL) \n" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "WeatherFax" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "PlugIn Weather Fax para OpenCPN" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" -msgstr "" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" +msgstr "PlugIn Weather Fax para OpenCPN\n" +"Puede abrir directamente los archivos de imagen, o decodificar audio faxes a una imagen. \n" +"Con una sencilla calibración, la imagen resultante se superpondrá encima de la cartografía. \n" +"Convierte imágenes a mercator, polar, cónica y unifica coordenadas. \n" +"Puede convertir cualquier imagen en una carta raster. \n" +"Base de datos incorporada para estaciones de radiofaxes HF vía SSB.\n" +"Base de datos incorporada para la consulta por internet a sitios con datos meteorológicos. \n" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "Preferencias de WeatherFax" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/et.po opencpn-plugin-weatherfax-1.5001.0/po/et.po --- opencpn-plugin-weatherfax-1.3.1/po/et.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/et.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:24-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-02-25 08:05-0500\n" "Last-Translator: nohal \n" "Language-Team: Estonian\n" "Language: et_EE\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: et\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "" @@ -155,7 +154,7 @@ msgid "None" msgstr "" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "" @@ -236,11 +235,14 @@ msgstr "" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." msgstr "" #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "" @@ -248,7 +250,7 @@ msgid "Capture Status" msgstr "" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "" @@ -272,8 +274,8 @@ msgid "Decoder" msgstr "" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "" @@ -364,7 +366,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" msgstr "" #: src/WeatherFaxUI.cpp:1019 @@ -403,8 +406,7 @@ msgid "Size" msgstr "" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "" @@ -517,7 +519,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" +msgid "Skip start, stop and \n" +"phasing detection" msgstr "" #: src/WeatherFaxUI.cpp:1553 @@ -544,389 +547,405 @@ msgid "48000" msgstr "" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." msgstr "" -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "" -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "" -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "" -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "" -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" msgstr "" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 -msgid "Reading Headers: " +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" +#: src/InternetRetrievalDialog.cpp:584 +msgid "Reading Headers: " msgstr "" -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " msgstr "" -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "" -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "" -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "" -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr "" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" msgstr "" -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" msgstr "" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "" -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "" -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "" -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "" -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr "" -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr "" -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "" -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "" -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "" -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." msgstr "" -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "" -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" msgstr "" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "" -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." msgstr "" -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" msgstr "" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " msgstr "" -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" msgstr "" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" msgstr "" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" msgstr "" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/fi.po opencpn-plugin-weatherfax-1.5001.0/po/fi.po --- opencpn-plugin-weatherfax-1.3.1/po/fi.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/fi.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:23-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-02-25 14:14-0500\n" "Last-Translator: nohal \n" "Language-Team: Finnish\n" "Language: fi_FI\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: fi\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "Sää Faksi" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "Sääfaksin asetukset" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "Faksin asettelu asetukset" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "Tietoja sääfaksista" @@ -67,7 +66,7 @@ #: src/WeatherFaxUI.cpp:74 msgid "Save &As" -msgstr "" +msgstr "Tallenna &Nimellä" #: src/WeatherFaxUI.cpp:77 msgid "&Edit" @@ -155,7 +154,7 @@ msgid "None" msgstr "Ei yhtään" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "Taajuus" @@ -181,7 +180,7 @@ #: src/WeatherFaxUI.cpp:350 msgid "Clear Captures" -msgstr "" +msgstr "Poista kaappaukset" #: src/WeatherFaxUI.cpp:360 src/WeatherFaxUI.cpp:830 src/WeatherFaxUI.cpp:1530 msgid "Filter" @@ -193,11 +192,11 @@ #: src/WeatherFaxUI.cpp:377 msgid "Sound" -msgstr "" +msgstr "Ääni" #: src/WeatherFaxUI.cpp:380 msgid "Select a file" -msgstr "" +msgstr "Valitse tiedosto" #: src/WeatherFaxUI.cpp:392 msgid "External Alarm" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "Ei toimintaa" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "&Äänitallennus" @@ -236,11 +235,17 @@ msgstr "Tallennus asetukset" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." -msgstr "Valitse Faksi kuvia klikkaamalla tallenteen (ensimmäistää) saraketta\n\nTaulukkoja voidaan lajitella napsauttamalla otsikon saraketta\n\nTaulukot tarvitsevat testejä, koska voin vastaanottaa vain muutamalta mahdolliselta asemalta. Korjaukset voidaan tehdä muuttamalla WeatherFaxSchedules.xml tiedostoa. Paikkaukset voidaan välittää github:n kautta.\n\nAutomaattinen ssb-radion ohjaus on toivottavaa, mutta Tekijällä on vain tecsun pl-600. Jos sopivan radion hankintaa voidaan avustaa, tuki toteutetaan." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgstr "Valitse Faksi kuvia klikkaamalla tallenteen (ensimmäistää) saraketta\n\n" +"Taulukkoja voidaan lajitella napsauttamalla otsikon saraketta\n\n" +"Taulukot tarvitsevat testejä, koska voin vastaanottaa vain muutamalta mahdolliselta asemalta. Korjaukset voidaan tehdä muuttamalla WeatherFaxSchedules.xml tiedostoa. Paikkaukset voidaan välittää github:n kautta.\n\n" +"Automaattinen ssb-radion ohjaus on toivottavaa, mutta Tekijällä on vain tecsun pl-600. Jos sopivan radion hankintaa voidaan avustaa, tuki toteutetaan." #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "Informaatiota" @@ -248,13 +253,13 @@ msgid "Capture Status" msgstr "Talletuksen tila" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "Sulje" #: src/WeatherFaxUI.cpp:621 msgid "Retrieve Scheduled" -msgstr "" +msgstr "Nouda valitut" #: src/WeatherFaxUI.cpp:624 msgid "Retrieve Selected" @@ -272,8 +277,8 @@ msgid "Decoder" msgstr "Dekooderi" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "Lopeta" @@ -299,7 +304,7 @@ #: src/WeatherFaxUI.cpp:834 msgid "Removal 3" -msgstr "" +msgstr "Poisto 3" #: src/WeatherFaxUI.cpp:834 msgid "Value 1" @@ -357,15 +362,17 @@ #: src/WeatherFaxUI.cpp:931 msgid "Minutes" -msgstr "" +msgstr "Minuuttia" #: src/WeatherFaxUI.cpp:998 msgid "Show Lat/Lon Minutes" -msgstr "" +msgstr "Näytä Lat/Lon minuutit" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" -msgstr "+ Lat/Lon N/E:lle\n-Lat/Lon S/W:lle" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" +msgstr "+ Lat/Lon N/E:lle\n" +"-Lat/Lon S/W:lle" #: src/WeatherFaxUI.cpp:1019 msgid "Coordinates Mapping Correction" @@ -403,8 +410,7 @@ msgid "Size" msgstr "Koko" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "1" @@ -462,7 +468,7 @@ #: src/WeatherFaxUI.cpp:1408 msgid "Recommended 4, 16, 64, or 256" -msgstr "" +msgstr "Suositellut 4, 16, 64 tai 256" #: src/WeatherFaxUI.cpp:1413 msgid "Depth" @@ -517,8 +523,10 @@ msgstr "Kylläisyys kynnys" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" -msgstr "Ohita käynnistys, pysäytä ja \ntahdista tunnistus" +msgid "Skip start, stop and \n" +"phasing detection" +msgstr "Ohita käynnistys, pysäytä ja \n" +"tahdista tunnistus" #: src/WeatherFaxUI.cpp:1553 msgid "Include header data in image" @@ -544,390 +552,431 @@ msgid "48000" msgstr "48000" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "Laitteindeksi" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "Tehty" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "Weather Fax lisäosanversio" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." -msgstr "Opencpn:n weatherfaxlisäosan käytöllä pyritään ensisijaisesti vähentämään sääfaksien hakutiheyttä ja asettelemaan ne suoraan kartoille.\n\nTämä sisältää faxin koodaimen joka muuntaa faksin äänen kuvaksi.\n\nAloittaaksesi, avaa joko kuva tai talletettu wav-äänitiedosto, joka on saatu ssb-radion välityksellä tiedostovalikosta, tai valitse vaihtoehto hakuvalikosta.\n\nLähdekoodi:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nSuurkiitokset kääntäjille ja testaajille." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." +msgstr "Opencpn:n weatherfaxlisäosan käytöllä pyritään ensisijaisesti vähentämään sääfaksien hakutiheyttä ja asettelemaan ne suoraan kartoille.\n\n" +"Tämä sisältää faxin koodaimen joka muuntaa faksin äänen kuvaksi.\n\n" +"Aloittaaksesi, avaa joko kuva tai talletettu wav-äänitiedosto, joka on saatu ssb-radion välityksellä tiedostovalikosta, tai valitse vaihtoehto hakuvalikosta.\n\n" +"Lähdekoodi:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Suurkiitokset kääntäjille ja testaajille." -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "Tietoa Tekijästä" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "Ajoitettu" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "Palvelin" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "Alue" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "Sisällöt" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "Kartta-alue" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "Tiedoston lataus epäonnistui: " -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "Virheellinen xml-tiedosto" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" msgstr "WeatherFax Internethaku" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "Ladataan" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "Virheellinen toistaja: " -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "Tuntematon xml-haara: " -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "Ei sopinut alueesen: " -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "Näin monen urlin lajittelu saattaa kestää liian kauan" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "weatherfax" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" -msgstr "Fax on haettu enintään 180 minuttia sitten.\nKäyttäisitkö olemassaolevaa tiedostoa?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" +msgstr "Fax on haettu enintään 180 minuttia sitten.\n" +"Käyttäisitkö olemassaolevaa tiedostoa?" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" +msgstr "WeatherFax Internethaku" + +#: src/InternetRetrievalDialog.cpp:584 msgid "Reading Headers: " msgstr "Luetaan otsakkeita: " -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" -msgstr "" - -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " -msgstr "Aikakatkaisu odotettaessa otsikkoa: " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " +msgstr "Lataus epäonnistui: " -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "Tarkista, internet-yhteyden toiminta." -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "Jos osoite on virheellinen muokaa xml ja/tai lähetä virheraportti." -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "Fakseja ei valittu." -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr " Yritä klikata valikosta (ensimmäistä) saraketta" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "Uusi Koord" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "Aloita" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" -msgstr "Mapping:ia ei onnituttu lisäämään\nTarkista kartoituksen korjausparametrit" - -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" +msgstr "Mapping:ia ei onnituttu lisäämään\n" +"Tarkista kartoituksen korjausparametrit" + +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "Mapping" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "Varoitus, leveysasteita päiväntasaajan eri puolilla ei suositella Pohjoisen +merkin ja etelänavan -merkin vuoksi" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" -msgstr "Mapping laskenta epäonnistui.\nEhkä olet valinnut väärän karttatyypin tästä kuvasta tai koordinaatit eivät ole sopivia\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +msgstr "Mapping laskenta epäonnistui.\n" +"Ehkä olet valinnut väärän karttatyypin tästä kuvasta tai koordinaatit eivät ole sopivia\n" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "Lasketaan Mapping:ia, jota ei vielä tueta.\n" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "Päiväntasaajalaskentaa ei vielä tueta. \n" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." -msgstr "Mapping mahdollistaa skaalauksen ja muuntamiseen koordinaattisystemien kesken\nLeveysasteet ovat + N -S, pituusasteet + E -W\n\nNapapiirimapping tila: \nGet Mapping parametrit laskee annetuista koordinaateista kartan , mutta ensimmäinen koordinaattin X arvo (punainen pystyviiva) on oltava suhteessa napaan napa tilassa pystysuorassa meridianissa\nKun koordinaatit on syötetty, mappingin pitäisi tehdä sinisten leveysasteiden sijoitus. Jos ne ovat kaukana, tarkista syötetyt koordinaatit. \nKun ne ovat lähellä: \nEnsin säädä pole Xää keskittääksesi leveysasteita. Seuraavaksi säätää Pole Y arvoa kunnes sininen latitude käyrä lähimpänä napa on oikein. Nyt, jos toinen sininen latitude on liian leveä, niin tosileveyden suhdelukua on lisättävä, muuten sitä olisi vähennettävä. Toista Pole Y:n säätöä ja tosileveyden suhdetta kunnes molemmat ovat kohdallaan. On helpointa kalibroida oikein, jos käytät suurimpia käytettävissä olevia tasaleveysasteita.\nKun siniset leveysasteet sijoittuvat täydellisesti, laske päiväntasaajaa uudelleen, niin lopullinen kartoitus on oikein. Koordinaatit voi tässä vaiheessa muuttaa paremmin paikkoihin, tarvittaessa. Jos todellinen leveys on hyvin lähellä 1.0 se luultavasti olisi juuri 1.0.\nOn myös mahdollista mennä seuraavaan vaiheeseen, säätää koordinaatit, palata takaisin tähän vaiheeseen ja saada parempia likiarvoja." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +msgstr "Mapping mahdollistaa skaalauksen ja muuntamiseen koordinaattisystemien kesken\n" +"Leveysasteet ovat + N -S, pituusasteet + E -W\n\n" +"Napapiirimapping tila: \n" +"Get Mapping parametrit laskee annetuista koordinaateista kartan , mutta ensimmäinen koordinaattin X arvo (punainen pystyviiva) on oltava suhteessa napaan napa tilassa pystysuorassa meridianissa\n" +"Kun koordinaatit on syötetty, mappingin pitäisi tehdä sinisten leveysasteiden sijoitus. Jos ne ovat kaukana, tarkista syötetyt koordinaatit. \n" +"Kun ne ovat lähellä: \n" +"Ensin säädä pole Xää keskittääksesi leveysasteita. Seuraavaksi säätää Pole Y arvoa kunnes sininen latitude käyrä lähimpänä napa on oikein. Nyt, jos toinen sininen latitude on liian leveä, niin tosileveyden suhdelukua on lisättävä, muuten sitä olisi vähennettävä. Toista Pole Y:n säätöä ja tosileveyden suhdetta kunnes molemmat ovat kohdallaan. On helpointa kalibroida oikein, jos käytät suurimpia käytettävissä olevia tasaleveysasteita.\n" +"Kun siniset leveysasteet sijoittuvat täydellisesti, laske päiväntasaajaa uudelleen, niin lopullinen kartoitus on oikein. Koordinaatit voi tässä vaiheessa muuttaa paremmin paikkoihin, tarvittaessa. Jos todellinen leveys on hyvin lähellä 1.0 se luultavasti olisi juuri 1.0.\n" +"On myös mahdollista mennä seuraavaan vaiheeseen, säätää koordinaatit, palata takaisin tähän vaiheeseen ja saada parempia likiarvoja." -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "Virhe Faksin koodinpurussa: " -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "Hylätty" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "DecodeImageLine edellyttää tiettyä puskurin pituutta" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "Audioportin syötössä ylivuoto, joitakin tietoja on menetetty!" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "syöttötiedostoa ei voitu avata: " -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "näytteen koko ei ole 8 tai 16 bittinen: " -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "Talteenotto" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "Asema" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "Aika (UTC)" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "Oikea aika" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "Kesto" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "WeatherFax taulukko" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "Tuntematon xml-haara" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "Ei löytynyt kestoa: " -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "Näin monen taulukon lajittelu saattaa kestää liian kauan" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "Lisätään luettelon tiedot" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "Tallennetaan faxia: " -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr " Ristiriidassa jo taulukoidun Faksin kanssa: " -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr " poista tämä faksi? " -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "weatherFax taulukot" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "Talletusta ei ole asetettu" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "alkaen" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "sekunnit" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "tunnit" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "minuutti(a)" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "Nykyinen fax: " -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "Viritä ssb radio" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "faksin vastaanottoon" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "Weather Fax taulukointi alkaa pian" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "Talletus meneillään, ei voi tallentaa: " -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "Käynnistäminen epäonnistui: " -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." -msgstr "" +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." +msgstr "Vika sääfaksi lisäosassa\n" +"Nyt tavoitetaan hf sääfaksia." -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "Avaa Weather Fax syöttötiedosto" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "WAV-tiedostot (*.wav) | *.WAV; *. wav|Kaikki tiedostot (*. *) | *. *" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "Ulkoisen tallennuksen suorittaminen epäonnistui" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "Ei voitu ladata koordinaattisarjoja" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "Tiedostoa ei voi tallentaa xml-muodossa: " -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" -msgstr "" +msgstr "yritä suorittaa:" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "Ei voitu ladata syöttötiedostoa: " -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "Tuetut \n" "tiedostot|*.BMP; *.bmp; *.XBM; *.xbm; *.XPM; *.xpm; *.TIF; *.tif; *.TIFF; *.tiff; *.GIF; *.gif; *.JPEG; *.jpeg; *.JPG, *.jpg; *.PNM; *.pnm; *.PNG; *.png; *.PCX; *.pcx; *.PICT; *.pict; *.TGA; *.tga; *.WAV; *. wav|Kaikki tiedostot (*.*)| *. *" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." -msgstr "" +msgstr "Ei voi avata ääni sääfaksia, se on jo käynnissä." -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" -msgstr "" +msgstr "Tallenna sääfaksi kuvaksi" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" -msgstr "" +msgstr "Kuva tiedostot|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffkaikki tiedostot (*.*)|*.*" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " -msgstr "" +msgstr "Tiedostoa ei voitu tallentaa: " -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "Tallenna Weather Fax KAP-muotoon" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" -msgstr "" +msgstr "KAP tiedostot|*.KAP;*.kap|Kaikki tiedostot (*.*) |*.*" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "Saadussa kuvassa on negatiivisia mittoja, hylätään\n" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "Mapping epäonnistui" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" -msgstr "Saatu kuva on suurempi kuin %dMB\nYritä muuttaa kokoparametriä pienemmäksi. (alle %.2f)\nhylätään\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" +msgstr "Saatu kuva on suurempi kuin %dMB\n" +"Yritä muuttaa kokoparametriä pienemmäksi. (alle %.2f)\n" +"hylätään\n" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "Muutetaan Weather Fax kuva kartaksi" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "Weather Fax:n kartoittaja" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" -msgstr "" +msgstr "Grafiikkalaitteistoa ei tueta (Älä käytä OpenGL:ää)\n" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "WeatherFax" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "OpenCPN:n Weather Fax lisäosa" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" -msgstr "" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" +msgstr "Sää Faksi lisäosa OpenCPN:ään\n" +"Voi avata kuvatiedostoja suoraan tai purkaa audiofakseja kuviksi.\n" +"Yksinkertaisella kalibroinnilla tuloksena on kuva kartan päälle.\n" +"Muuntaa kuvia mercator, polar, kartio ja yhtenäiskoordinaateista. \n" +"Voi muuntaa minkä tahansa kuvan rasterikartaksi. \n" +"Sisäisessä tietokannassa HF Faksi radioasemia SSB:n kautta.\n" +"Sisäisessä tietokannassa internet haku meterologisilta sivustoilta.\n" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "Sääfaksin asetukset" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/fr.po opencpn-plugin-weatherfax-1.5001.0/po/fr.po --- opencpn-plugin-weatherfax-1.3.1/po/fr.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/fr.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:23-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-02-25 08:03-0500\n" "Last-Translator: nohal \n" "Language-Team: French\n" "Language: fr_FR\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: fr\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "Fax météo" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "Préférences du WeatherFax" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "Options de décodage audio" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "Au sujet de WeatherFax" @@ -67,7 +66,7 @@ #: src/WeatherFaxUI.cpp:74 msgid "Save &As" -msgstr "" +msgstr "Sauver comme" #: src/WeatherFaxUI.cpp:77 msgid "&Edit" @@ -155,7 +154,7 @@ msgid "None" msgstr "Aucun" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "Fréquence" @@ -181,7 +180,7 @@ #: src/WeatherFaxUI.cpp:350 msgid "Clear Captures" -msgstr "" +msgstr "Effacer les captures" #: src/WeatherFaxUI.cpp:360 src/WeatherFaxUI.cpp:830 src/WeatherFaxUI.cpp:1530 msgid "Filter" @@ -193,11 +192,11 @@ #: src/WeatherFaxUI.cpp:377 msgid "Sound" -msgstr "" +msgstr "Son" #: src/WeatherFaxUI.cpp:380 msgid "Select a file" -msgstr "" +msgstr "Sélectionner un fichier" #: src/WeatherFaxUI.cpp:392 msgid "External Alarm" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "Pas d'action" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "Réception audio" @@ -236,11 +235,17 @@ msgstr "Options de capture" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." -msgstr "Sélectionner une image fax en cliquant dans la (première) colonne \"capture\" \n\nLes horaires peuvent être triés en cliquant en tête de la colonne\n\nLes horaires doivent être testés car je ne peux recevoir que quelques stations. Les corrections peuvent être apportées en modifiant le fichier WeatherFaxSchedules.xml. Les patch peuvent être soumis par l'intermédiaire du github.\n\nUne radio BLU à contrôle automatique est souhaitable. Mais l'auteur ne dispose que d'une radio Tecsun PL-600. En cas de don d'une radio appropriée, une aide sera accordée." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgstr "Sélectionner une image fax en cliquant dans la (première) colonne \"capture\" \n\n" +"Les horaires peuvent être triés en cliquant en tête de la colonne\n\n" +"Les horaires doivent être testés car je ne peux recevoir que quelques stations. Les corrections peuvent être apportées en modifiant le fichier WeatherFaxSchedules.xml. Les patch peuvent être soumis par l'intermédiaire du github.\n\n" +"Une radio BLU à contrôle automatique est souhaitable. Mais l'auteur ne dispose que d'une radio Tecsun PL-600. En cas de don d'une radio appropriée, une aide sera accordée." #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "Information" @@ -248,13 +253,13 @@ msgid "Capture Status" msgstr "Etat de capture" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "Fermer" #: src/WeatherFaxUI.cpp:621 msgid "Retrieve Scheduled" -msgstr "" +msgstr "Récupérer à la demande" #: src/WeatherFaxUI.cpp:624 msgid "Retrieve Selected" @@ -272,8 +277,8 @@ msgid "Decoder" msgstr "Décodeur" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "Arrêter" @@ -299,7 +304,7 @@ #: src/WeatherFaxUI.cpp:834 msgid "Removal 3" -msgstr "" +msgstr "Retrait 3" #: src/WeatherFaxUI.cpp:834 msgid "Value 1" @@ -357,15 +362,17 @@ #: src/WeatherFaxUI.cpp:931 msgid "Minutes" -msgstr "" +msgstr "Minutes" #: src/WeatherFaxUI.cpp:998 msgid "Show Lat/Lon Minutes" -msgstr "" +msgstr "Monter les minutes des Lat/long" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" -msgstr "+ Lat/Lon pour N/E\n- Lat/Lon pour S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" +msgstr "+ Lat/Lon pour N/E\n" +"- Lat/Lon pour S/W" #: src/WeatherFaxUI.cpp:1019 msgid "Coordinates Mapping Correction" @@ -403,8 +410,7 @@ msgid "Size" msgstr "Taille" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "1" @@ -462,7 +468,7 @@ #: src/WeatherFaxUI.cpp:1408 msgid "Recommended 4, 16, 64, or 256" -msgstr "" +msgstr "Recommandé 4, 16, 64 ou 256" #: src/WeatherFaxUI.cpp:1413 msgid "Depth" @@ -517,8 +523,10 @@ msgstr "Seuil de saturation" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" -msgstr "Sauter le démarrage, stop et \nle calage de la phase" +msgid "Skip start, stop and \n" +"phasing detection" +msgstr "Sauter le démarrage, stop et \n" +"le calage de la phase" #: src/WeatherFaxUI.cpp:1553 msgid "Include header data in image" @@ -544,389 +552,430 @@ msgid "48000" msgstr "48000" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "Index de l'appareil" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "Terminer" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "Version du complément WeatherFax " -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." -msgstr "Le complément WeatherFax pour OpenCPN est destiné à réduire le nombre d'interventions de l'utilisateur lors de la reception d'un fax météo et de sa superposition optionnelle sur les cartes.\n\nCeci nécessite un décodeur de fax qui convertit les fax météo radio en images.\n\nPour commencer, ouvrez soit une image soit un fichier audio wav enregistré avec une récepteur BLU de fax.\n\nCode source :\nhttps://github.com/seandepagnier/weatherfax_pi\n\nRemerciements aux traducteurs et aux testeurs." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." +msgstr "Le complément WeatherFax pour OpenCPN est destiné à réduire le nombre d'interventions de l'utilisateur lors de la reception d'un fax météo et de sa superposition optionnelle sur les cartes.\n\n" +"Ceci nécessite un décodeur de fax qui convertit les fax météo radio en images.\n\n" +"Pour commencer, ouvrez soit une image soit un fichier audio wav enregistré avec une récepteur BLU de fax.\n\n" +"Code source :\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Remerciements aux traducteurs et aux testeurs." -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "Au sujet de l'auteur" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "Horaires des HF" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "Serveur" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "Région" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "Contenus" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "Aire de la carte" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "Impossible de charger le fichier :" -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "Fichier xml invalide" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" msgstr "Récupération sur internet d'un fax météo" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "Chargement en cours" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "Itération non valide : " -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "Node xml non reconnu" -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "Impossible de faire correspondre la région :" -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "Trier ces nombreuses URL risque de prendre un temps trop long" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "fax météo" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" -msgstr "Fax récupéré il y a moins de 180 minutes.\nUtilisez le fichier existant ?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" +msgstr "Fax récupéré il y a moins de 180 minutes.\n" +"Utilisez le fichier existant ?" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" +msgstr "Récupération sur internet d'un fax météo" + +#: src/InternetRetrievalDialog.cpp:584 msgid "Reading Headers: " msgstr "Lecture des en-têtes : " -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" -msgstr "" - -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " -msgstr "Délai imparti pour les en-têtes pour : " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " +msgstr "Echec du téléchargement : " -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "Vérifiez qu'il ait une connexion internet." -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "S'il vous plait, si l'url est incorrecte, éditez le fichier xml et/ou postez un rapport de bug." -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "Aucun fax sélectionné." -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr " Essayer de cliquer la (première) colonne sélectionnée" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "Nouvelles coord" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "Démarrer" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" -msgstr "Impossible de cartographier\nVérifiez les paramètres de correction de la cartographie" - -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" +msgstr "Impossible de cartographier\n" +"Vérifiez les paramètres de correction de la cartographie" + +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "Cartographie" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "Attention, les latitudes de part et d'autre de l'équateur ne sont pas recommandées en raison de l'ambiguïté entre pôle nord et pôle sud" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" -msgstr "Echec de la réalisation de la carte.\nPeut être avez vous choisi un type erroné de carte pour cette image, à moins que les coordonnées spécifiées soient incorrectes\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +msgstr "Echec de la réalisation de la carte.\n" +"Peut être avez vous choisi un type erroné de carte pour cette image, à moins que les coordonnées spécifiées soient incorrectes\n" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "Les calculs de cartographie ne sont pas encore pris en charge.\n" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "Calcul au niveau de l'équateur non encore supporté.\n" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." -msgstr "Cette cartographie permet la mise à l'échelle et la conversion entre les systèmes de coordonnées \nPour les latitudes, mettre + pour N et - pour S. pour les longitudes, mettre + pour E et - pour O \n\nPour le mode de cartographie polaire: \nObtenir les paramètres de cartographie calcule la cartographie à partir des coordonnées données, mais la valeur X de la première coordonnée (ligne verticale rouge) doit s'aligner avec le pôle en mode polaire sur la verticale méridienne \nUne fois les coordonnées introduites, la cartographie doit aligner les latitudes bleues. Si elles sont loins, vérifier les coordonnées d'entrée. \nUne fois qu'ils sont à proximité: \nRégler d'abord pôles X pour centrer les latitudes. Puis ajuster la valeur de Y à jusqu'à ce que la latitude bleue la plus proche du pôle soit correcte. Maintenant, si le second latitude bleu est trop grande, la vraie largeur doit être augmentée, sinon elle doit être diminuée. Répétez le réglage du Pôle Y et le vrai rapport de largeur jusqu'à ce que les deux soient alignés. Il est plus facile de calibrer correctement si vous utilisez les latitudes les plus éloignées disponibles. \nUne fois les latitudes bleues parfaitement alignées, recalculer l'équateur pour assurer que la cartographie résultante est correcte. À ce stade, les coordonnées peuvent être modifiées si nécessaire. Si cela est correct la largeur est très proche de 1.0. Il devrait probablement être exactement 1,0. \nIl est également possible de passer à l'étape suivante, d'ajuster les coordonnées, puis de revenir à cette étape et d'obtenir de nouveau les paramètres de mappage pour améliorer l'estimation." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +msgstr "Cette cartographie permet la mise à l'échelle et la conversion entre les systèmes de coordonnées \n" +"Pour les latitudes, mettre + pour N et - pour S. pour les longitudes, mettre + pour E et - pour O \n\n" +"Pour le mode de cartographie polaire: \n" +"Obtenir les paramètres de cartographie calcule la cartographie à partir des coordonnées données, mais la valeur X de la première coordonnée (ligne verticale rouge) doit s'aligner avec le pôle en mode polaire sur la verticale méridienne \n" +"Une fois les coordonnées introduites, la cartographie doit aligner les latitudes bleues. Si elles sont loins, vérifier les coordonnées d'entrée. \n" +"Une fois qu'ils sont à proximité: \n" +"Régler d'abord pôles X pour centrer les latitudes. Puis ajuster la valeur de Y à jusqu'à ce que la latitude bleue la plus proche du pôle soit correcte. Maintenant, si le second latitude bleu est trop grande, la vraie largeur doit être augmentée, sinon elle doit être diminuée. Répétez le réglage du Pôle Y et le vrai rapport de largeur jusqu'à ce que les deux soient alignés. Il est plus facile de calibrer correctement si vous utilisez les latitudes les plus éloignées disponibles. \n" +"Une fois les latitudes bleues parfaitement alignées, recalculer l'équateur pour assurer que la cartographie résultante est correcte. À ce stade, les coordonnées peuvent être modifiées si nécessaire. Si cela est correct la largeur est très proche de 1.0. Il devrait probablement être exactement 1,0. \n" +"Il est également possible de passer à l'étape suivante, d'ajuster les coordonnées, puis de revenir à cette étape et d'obtenir de nouveau les paramètres de mappage pour améliorer l'estimation." -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "Echec du décodage du fax : " -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "Echec" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "DecodeImageLine nécessite une longueur de buffer définie" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "Dépassement de capacité du port audio. Certaines données sont perdues !" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "Impossible d'ouvrir le fichier en entrée" -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "L'échantillonnage n'est pas 8 ou 16 bit :" -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "Capturer" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "Station" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "Temps (UTC)" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "Horaire valide" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "Durée" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "Horaires des fax météo" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "Node xml non reconnu" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "Impossible de trouver la durée pour :" -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "Trier ces nombreux horaires risque de prendre un temps trop long" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "Liste à remplir" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "Capture de fax :" -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr "Conflit avec fax déjà programmé :" -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr "désactiver ce fax ?" -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "Horaires des météo fax" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "Pas de capture réalisée" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "commencement à" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "seconde(s)" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "Heure(s)" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "minute(s)" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "Fax courant :" -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "Accorder le récepteur BLU sur" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "pour recevoir un fax de" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "Horaire des fax météo commençant bientôt" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "Réception déjà en cours, ne peut recevoir :" -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "Impossible de lancer :" -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." -msgstr "" +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." +msgstr "Faute de météo fax plugin\n" +"Currently capture fax météo hf." -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "Ouvrir le fichier d'entrée du fax météo" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "Fichiers WAV (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "Echec de l'exécution d'une capture extérieure" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "Impossible de charger l'ensemble des coordonnées" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "Impossible de sauvegarder le fichier xml :" -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" -msgstr "" +msgstr "Essayer d'exécuter :" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "Impossible de charger le fichier en entrée :" -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "Fichiers supportés|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." -msgstr "" +msgstr "Impossible d'ouvrir les fax météo audio déjà en cours." -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" -msgstr "" +msgstr "Enregistrer le Fax météo comme une Image" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" -msgstr "" +msgstr "Types de fichier d'image|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " -msgstr "" +msgstr "Echec de la sauvegarde du fichier : " -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "Sauvegarder le fax météo au format KAP" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" -msgstr "" +msgstr "Fichiers KAP|*.KAP;*.kap|All files (*.*)|*.*" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "L'image résultante a des dimensions négatives. Abandon\n" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "Echec de la cartographie" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" -msgstr "Taille de l'image résultante supérieure à %dMB\nEssayez de réduire la taille dans les paramètres. (moins que %.2f)\nAbandon\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" +msgstr "Taille de l'image résultante supérieure à %dMB\n" +"Essayez de réduire la taille dans les paramètres. (moins que %.2f)\n" +"Abandon\n" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "Cartographie de l'image d'un fax météo" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "Cartographe de météo fax" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" -msgstr "" +msgstr "Carte graphique non supportée. (Désactiver OpenGL)\n" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "Fax météo" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "Complément Weather Fax pour OpenCPN" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" -msgstr "" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" +msgstr "Le complément Weather Fax (Fax météo) pour OpenCPN\n" +" Ouvre des fichiers image directement et décode des audio fax en une image.\n" +"Avec une simple calibration, l'image résultante est superposée sur la zone de carte.\n" +"Convertit une image en mercator, polaire, conique et coordonnées uniformes.\n" +"Peut convertir n'imporete quelle image en une carte raster.\n" +"Construit une base de données pour les fréquence HF via SSB.\n" +"Construit une base de données des sites web pour la récupération des données météorologiques.\n" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "Préférences du fax météo" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/gl.po opencpn-plugin-weatherfax-1.5001.0/po/gl.po --- opencpn-plugin-weatherfax-1.3.1/po/gl.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/gl.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:24-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2015-12-31 15:39-0500\n" "Last-Translator: nohal \n" "Language-Team: Galician\n" "Language: gl_ES\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: gl\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "" @@ -155,7 +154,7 @@ msgid "None" msgstr "" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "" @@ -236,11 +235,14 @@ msgstr "" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." msgstr "" #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "" @@ -248,7 +250,7 @@ msgid "Capture Status" msgstr "" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "" @@ -272,8 +274,8 @@ msgid "Decoder" msgstr "" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "" @@ -364,7 +366,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" msgstr "" #: src/WeatherFaxUI.cpp:1019 @@ -403,8 +406,7 @@ msgid "Size" msgstr "" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "" @@ -517,7 +519,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" +msgid "Skip start, stop and \n" +"phasing detection" msgstr "" #: src/WeatherFaxUI.cpp:1553 @@ -544,389 +547,405 @@ msgid "48000" msgstr "" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." msgstr "" -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "" -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "" -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "" -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "" -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" msgstr "" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 -msgid "Reading Headers: " +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" +#: src/InternetRetrievalDialog.cpp:584 +msgid "Reading Headers: " msgstr "" -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " msgstr "" -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "" -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "" -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "" -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr "" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" msgstr "" -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" msgstr "" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "" -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "" -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "" -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "" -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr "" -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr "" -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "" -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "" -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "" -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." msgstr "" -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "" -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" msgstr "" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "" -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." msgstr "" -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" msgstr "" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " msgstr "" -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" msgstr "" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" msgstr "" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" msgstr "" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/hu.po opencpn-plugin-weatherfax-1.5001.0/po/hu.po --- opencpn-plugin-weatherfax-1.3.1/po/hu.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/hu.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:23-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2015-11-01 14:56-0500\n" "Last-Translator: nohal \n" "Language-Team: Hungarian\n" "Language: hu_HU\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: hu\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "" @@ -155,7 +154,7 @@ msgid "None" msgstr "" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "" @@ -236,11 +235,14 @@ msgstr "" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." msgstr "" #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "" @@ -248,7 +250,7 @@ msgid "Capture Status" msgstr "" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "" @@ -272,8 +274,8 @@ msgid "Decoder" msgstr "" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "" @@ -364,7 +366,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" msgstr "" #: src/WeatherFaxUI.cpp:1019 @@ -403,8 +406,7 @@ msgid "Size" msgstr "" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "" @@ -517,7 +519,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" +msgid "Skip start, stop and \n" +"phasing detection" msgstr "" #: src/WeatherFaxUI.cpp:1553 @@ -544,389 +547,405 @@ msgid "48000" msgstr "" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." msgstr "" -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "" -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "" -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "" -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "" -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" msgstr "" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 -msgid "Reading Headers: " +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" +#: src/InternetRetrievalDialog.cpp:584 +msgid "Reading Headers: " msgstr "" -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " msgstr "" -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "" -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "" -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "" -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr "" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" msgstr "" -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" msgstr "" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "" -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "" -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "" -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "" -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr "" -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr "" -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "" -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "" -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "" -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." msgstr "" -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "" -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" msgstr "" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "" -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." msgstr "" -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" msgstr "" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " msgstr "" -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" msgstr "" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" msgstr "" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" msgstr "" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/it.po opencpn-plugin-weatherfax-1.5001.0/po/it.po --- opencpn-plugin-weatherfax-1.3.1/po/it.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/it.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:23-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-02-24 14:27-0500\n" "Last-Translator: nohal \n" "Language-Team: Italian\n" "Language: it_IT\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: it\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "Meteo Fax" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "Impostazioni Meteo Fax" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "Opzioni di decodifica" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "Circa Meteo Fax" @@ -155,7 +154,7 @@ msgid "None" msgstr "Nessuno" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "Frequenza" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "Nessuna Azione" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "" @@ -236,11 +235,17 @@ msgstr "Opzioni di Acquisizione" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." -msgstr "Seleziona immagini fax facendo click sulla (prima) colonna di acquisizione\n\nGli orari possono essere ordinati facendo click sull'intestazione della colonna\n\nGli orari vanno verificati, in quanto io posso solo ricevere alcune delle possibili stazioni. Le correzioni possono essere verificate modificando il file WeatherFaxSchedules.xml. Le patch possono essere rese disponibili via Github.\n\nIl controllo automatico della radio BLU sarebbe auspicabile, tuttavia l'autore dispone solamente di un Tecsun pl-600. Qualora qualcuno volesse donare un'altro tipo di radio, implementerò il supporto per quel modello." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgstr "Seleziona immagini fax facendo click sulla (prima) colonna di acquisizione\n\n" +"Gli orari possono essere ordinati facendo click sull'intestazione della colonna\n\n" +"Gli orari vanno verificati, in quanto io posso solo ricevere alcune delle possibili stazioni. Le correzioni possono essere verificate modificando il file WeatherFaxSchedules.xml. Le patch possono essere rese disponibili via Github.\n\n" +"Il controllo automatico della radio BLU sarebbe auspicabile, tuttavia l'autore dispone solamente di un Tecsun pl-600. Qualora qualcuno volesse donare un'altro tipo di radio, implementerò il supporto per quel modello." #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "Informazioni" @@ -248,7 +253,7 @@ msgid "Capture Status" msgstr "Stato di Acquisizione" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "Chiudi" @@ -272,8 +277,8 @@ msgid "Decoder" msgstr "Decodificatore" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "Stop" @@ -364,8 +369,10 @@ msgstr "" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" -msgstr "+ Lat/Lon per N/E\n-Lat/Lon per S/O" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" +msgstr "+ Lat/Lon per N/E\n" +"-Lat/Lon per S/O" #: src/WeatherFaxUI.cpp:1019 msgid "Coordinates Mapping Correction" @@ -403,8 +410,7 @@ msgid "Size" msgstr "" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "" @@ -517,7 +523,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" +msgid "Skip start, stop and \n" +"phasing detection" msgstr "" #: src/WeatherFaxUI.cpp:1553 @@ -544,389 +551,415 @@ msgid "48000" msgstr "" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." msgstr "" -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "" -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "Caricamento in corso" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "" -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "Modalità XML non identificata" -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "impossibile trovare area corrispondente:" -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "Ordinare così tante URL potrebbe richiedere troppo tempo" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "meteofax" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" -msgstr "Fax già ricevuto meno di 180 minuti fa. \nUsa file esistente?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" +msgstr "Fax già ricevuto meno di 180 minuti fa. \n" +"Usa file esistente?" + +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" +msgstr "" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 +#: src/InternetRetrievalDialog.cpp:584 msgid "Reading Headers: " msgstr "Intestazioni di lettura:" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " msgstr "" -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " -msgstr "Raggiunto tempo massimo di attesa per intestazioni" - -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "Verificare la presenza di collegamento a Internet" -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "Se l'url non è corretto si prega modificare il file xml o inviare una segnalazione di bug." -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "Nessun fax selezionato." -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr "Fai click sulla (prima) colonna selezionata" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "Nuove coord." -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "Inizia" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" -msgstr "Impossibile applicare mappatura\nVerifica parametri di correzione mappatura" - -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" +msgstr "Impossibile applicare mappatura\n" +"Verifica parametri di correzione mappatura" + +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "Mappatura" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "Avviso, latitudini su lati diversi dell'equatore non raccomandata a causa dell'ambiguità fra polo Nord/Sud" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" -msgstr "Calcolo mappatura non riuscito.\nHai possibilmente selezionato il tipo di mappatura sbagliata per questa immagine, o le coordinate specificate non sono corrette\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +msgstr "Calcolo mappatura non riuscito.\n" +"Hai possibilmente selezionato il tipo di mappatura sbagliata per questa immagine, o le coordinate specificate non sono corrette\n" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "Calcolo mappatura non ancora supportato\n" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "Calcolo dell'equatore non ancora supportato\n" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." -msgstr "La mappatura consente il ridimensionamento e conversione tra sistemi di coordinate\nLe latitudini sono del tipo + N -S, le longitudini + E -O\n\nPer modalità polare: \nI parametri di Get Mapping calcola la mappatura partendo dalle coordinate fornite, tuttavia l'ascissa della prima coordinata (la linea rossa verticale) deve essere allineata con il polo sul meridiano.Una volta inserite le coordinate, la mappatura dovrebbe allineare le latitudini blu. Se queste si scostano eccessivamente, verifica le coordinate inserite.\nUna volta raggiunto l'allineamento:\nRegola il polo X in modo da centrare le latitudini. Successivamente, regola il valore del Polo Y fino la curva di latitudine blu più prossima al polo è corretta. A questo punto, se la seconda latitudine blu è troppo larga il rapporto di ampiezza vera (true width) deve essere aumentato, in caso contrario diminuito. Ripetere il procedimento regolando il Polo Y e il rapporto di ampiezza vera fino a quando sono entrambe allineate. E' più semplice calibrare correttamente se si latitudini maggiormente distanziate fra quelle disponibili.\nUna volta perfettamente allineate le latitudini, ricalcolare l'equatore per assicurarsi che la mappatura risultante sia corretta. A questo punto le coordinate possono essere modificate a piacimento, se necessario. Se l'ampiezza vera é molto prossima a 1.0, dovrebbe probabilmente essere esattamente 1.0.\nE' anche possibile procedere al passo successivo, regolare le coordinate, e ritornare a questo passo e ottenere i parametri di mappatura per migliorare la stima. " +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +msgstr "La mappatura consente il ridimensionamento e conversione tra sistemi di coordinate\n" +"Le latitudini sono del tipo + N -S, le longitudini + E -O\n\n" +"Per modalità polare: \n" +"I parametri di Get Mapping calcola la mappatura partendo dalle coordinate fornite, tuttavia l'ascissa della prima coordinata (la linea rossa verticale) deve essere allineata con il polo sul meridiano.Una volta inserite le coordinate, la mappatura dovrebbe allineare le latitudini blu. Se queste si scostano eccessivamente, verifica le coordinate inserite.\n" +"Una volta raggiunto l'allineamento:\n" +"Regola il polo X in modo da centrare le latitudini. Successivamente, regola il valore del Polo Y fino la curva di latitudine blu più prossima al polo è corretta. A questo punto, se la seconda latitudine blu è troppo larga il rapporto di ampiezza vera (true width) deve essere aumentato, in caso contrario diminuito. Ripetere il procedimento regolando il Polo Y e il rapporto di ampiezza vera fino a quando sono entrambe allineate. E' più semplice calibrare correttamente se si latitudini maggiormente distanziate fra quelle disponibili.\n" +"Una volta perfettamente allineate le latitudini, ricalcolare l'equatore per assicurarsi che la mappatura risultante sia corretta. A questo punto le coordinate possono essere modificate a piacimento, se necessario. Se l'ampiezza vera é molto prossima a 1.0, dovrebbe probabilmente essere esattamente 1.0.\n" +"E' anche possibile procedere al passo successivo, regolare le coordinate, e ritornare a questo passo e ottenere i parametri di mappatura per migliorare la stima. " -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "Errore decodifica Fax: " -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "Non riuscito" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "DecodeImageLine richiede la lunghezza del buffer specifico" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "Overflow del buffer audio in ingresso: alcuni dati persi!" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "Impossibile aprire il file di input: " -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "Campionatura non a 8 o 16 bit:" -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "Stazione" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "Ora (UTC)" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "Ora valida" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "Durata" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "Orari FaxMeteo" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "Modalità XML non riconosciuta" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "Impossibile trovare la durata per: " -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "L'ordinamento di cosi tanti orari potrebbe richiedere troppo tempo" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "Compilazione elenco" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "" -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr "Orario coincide con altro fax programmato:" -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr " disabilitare questo fax? " -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "orari MeteoFax" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "inizia tra" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "secondo(i)" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "ora(e)" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "minuto(i)" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "Fax in corso:" -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "Sintonizzare la radio BLU (SSB) su" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "per ricevere fax per" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "MeteoFax in programma tra breve:" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "" -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "" -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." msgstr "" -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "Apri meteo Fax File di Input" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "" -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" msgstr "" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "" -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." msgstr "" -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" msgstr "" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " msgstr "" -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" msgstr "" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" msgstr "" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" msgstr "" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/nb.po opencpn-plugin-weatherfax-1.5001.0/po/nb.po --- opencpn-plugin-weatherfax-1.3.1/po/nb.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/nb.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:24-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-02-25 08:05-0500\n" "Last-Translator: nohal \n" "Language-Team: Norwegian Bokmal\n" "Language: nb_NO\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: nb\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "Værfaks" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "Værfaks alternativer" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "Alternativer for faksdekoding" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "Om Weatherfax" @@ -155,7 +154,7 @@ msgid "None" msgstr "Ingen" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "Frekvens" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "Ingen handling" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "Lydlagring" @@ -236,11 +235,14 @@ msgstr "Lagrings alternativer" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." msgstr "" #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "Informasjon" @@ -248,7 +250,7 @@ msgid "Capture Status" msgstr "Lagringsstatus" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "Lukk" @@ -272,8 +274,8 @@ msgid "Decoder" msgstr "Dekoder" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "Stopp" @@ -364,8 +366,10 @@ msgstr "" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" -msgstr "+ B.grad/L.grad for N/Ø\n- B.grad/L.grad for S/V" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" +msgstr "+ B.grad/L.grad for N/Ø\n" +"- B.grad/L.grad for S/V" #: src/WeatherFaxUI.cpp:1019 msgid "Coordinates Mapping Correction" @@ -403,8 +407,7 @@ msgid "Size" msgstr "Størrelse" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "1" @@ -517,8 +520,10 @@ msgstr "Metningsterskel" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" -msgstr "Hopp over start, stopp og \nfasedeteksjon" +msgid "Skip start, stop and \n" +"phasing detection" +msgstr "Hopp over start, stopp og \n" +"fasedeteksjon" #: src/WeatherFaxUI.cpp:1553 msgid "Include header data in image" @@ -544,389 +549,410 @@ msgid "48000" msgstr "48000" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "Ferdig" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "Værfaks Plugin versjon" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." msgstr "" -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "Om opphavet" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "Planlagt" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "Server" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "Region" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "Innhold" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "Kartområde" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "Kunne ikke laste fil: " -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "Ugyldig xml fil" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" -msgstr "Værfax internett mottak" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" +msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "Laster" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "Ugyldig iterator: " -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "Ukjent xml node: " -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "Kunne ikke sammenligne område: " -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "Sortering av så mange URL'er kan ta for lang tid" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "værfaks" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" -msgstr "Faks allerede Hentet mindre enn 180 minutter siden. \nBruk eksisterende fil?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" +msgstr "Faks allerede Hentet mindre enn 180 minutter siden. \n" +"Bruk eksisterende fil?" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" +msgstr "Værfax internett mottak" + +#: src/InternetRetrievalDialog.cpp:584 msgid "Reading Headers: " msgstr "Leserdatahoder: " -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " msgstr "" -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " -msgstr "Tidsavbrudd i påvente av datahoder for: " - -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "Kontroller om det finnes en fungerende internett forbindelse." -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "Hvis URL-adressen er feil, vennligst rediger XML og/eller post en feilrapport." -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "Ingen faks er valgt." -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr " Forsøk å klikke på valgt (første) kolonne" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "Nytt koordinat" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "Start" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" -msgstr "Kunne ikke legge til kartlegging\nSjekk kartleggings parametre" - -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" +msgstr "Kunne ikke legge til kartlegging\n" +"Sjekk kartleggings parametre" + +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "Kartlegging" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "Advarsel, breddegrader på forskjellige sider av ekvator er ikke anbefalt på grunn av tvetydighet av nord- og sør-pol" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" -msgstr "Kalkulering av kartlegging feilet.\nKanskje du har valgt feil kartleggings metode for dette bildet, eller er så er koordinatene feil\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +msgstr "Kalkulering av kartlegging feilet.\n" +"Kanskje du har valgt feil kartleggings metode for dette bildet, eller er så er koordinatene feil\n" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "Kalkulering av kartlegging er ikke støttet enda.\n" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "Kalkulering av Ekvator er ikke støttet enda.\n" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "Feil ved dekoding av faks: " -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "Feilet" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "DekodeBildeLinje krever en bestemt bufferlengde" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "Portaudio overflyt på inngang, noen data er tapt!" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "kunne ikke åpne inndata-fil: " -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "sample størrelse er ikke 8 eller 16 bit: " -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "Opptak" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "Stasjon" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "Tid (UTC)" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "Gyldig tid" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "Varighet" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "Værfaks tidsplaner" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "Ukjent xml node" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "Kunne ikke finne varighet for: " -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "Sortering av så mange tidsplaner kan ta for lang tid" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "Fyller liste" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "Lagrer faks: " -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr " Sammenfaller med allerede planlagt fax: " -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr " deaktivere denne faks? " -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "værfaks tidsplaner" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "Ingen opptak satt" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "starter om" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "sekund(er)" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "Time(r)" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "minutt(er)" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "Gjeldende faks: " -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "Still SSB-radioen til" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "for å motta faks for" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "Planlagt værfaks starter snart" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "Opptak er startet, kan ikke starte opptak: " -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "Kunne ikke starte: " -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." msgstr "" -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "Åpne værfaks inndatafil" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "WAV filer (*.wav)|*.WAV;*.wav|Alle filer (*.*)|*.*" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "Ekstern opptaksutførelse feilet" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "Kunne ikke laste koordinatsett" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "Kunne ikke lagre xml fil: " -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" msgstr "" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "Kunne ikke laste inndatafil: " -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "Støttede filer|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|Alle filer (*.*)|*.*" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." msgstr "" -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" msgstr "" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " msgstr "" -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "Lagre værfaks til KAP" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" msgstr "" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "Det resulterende bildet har negative dimensjoner, avbryter\n" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "Kartlegging feilet" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" -msgstr "Det resulterende bildet er større enn %dMB\nForsøk å endre størrelsesparametre til en lavere verdi. (lavere enn %.2f) \navbryter\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" +msgstr "Det resulterende bildet er større enn %dMB\n" +"Forsøk å endre størrelsesparametre til en lavere verdi. (lavere enn %.2f) \n" +"avbryter\n" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "Kartlegger værfaksbildet" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "Værfaks kartlegging" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" msgstr "" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "Værfaks" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "Værfaks utvidelse for OpenCPN" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" msgstr "" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "Værfaks innstillinger" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/nl.po opencpn-plugin-weatherfax-1.5001.0/po/nl.po --- opencpn-plugin-weatherfax-1.3.1/po/nl.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/nl.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:23-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-02-25 14:14-0500\n" "Last-Translator: nohal \n" "Language-Team: Dutch\n" "Language: nl_NL\n" @@ -16,18 +16,17 @@ "X-Crowdin-Language: nl\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "Weerfax" #: src/WeatherFaxUI.h:165 msgid "HF Radio Schedules" -msgstr "HF-radio schema 's" +msgstr "HF-radio zendschema 's" #: src/WeatherFaxUI.h:216 msgid "Internet Retrieval" @@ -39,15 +38,15 @@ #: src/WeatherFaxUI.h:366 msgid "Weather Fax Preferences" -msgstr "WeerFax voorkeuren" +msgstr "Voorkeuren Weerfax" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "Opties faxdecodering" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" -msgstr "Over WeerFax" +msgstr "Over Weerfax" #: src/WeatherFaxUI.cpp:23 msgid "Fax" @@ -63,11 +62,11 @@ #: src/WeatherFaxUI.cpp:71 msgid "&Open" -msgstr "&Open" +msgstr "&Openen" #: src/WeatherFaxUI.cpp:74 msgid "Save &As" -msgstr "" +msgstr "Opslaan &als" #: src/WeatherFaxUI.cpp:77 msgid "&Edit" @@ -103,7 +102,7 @@ #: src/WeatherFaxUI.cpp:108 msgid "&HF Radio Schedules" -msgstr "&HF-radio uitzendschema's" +msgstr "&HF-radio zendschema's" #: src/WeatherFaxUI.cpp:112 msgid "&Internet" @@ -139,7 +138,7 @@ #: src/WeatherFaxUI.cpp:253 src/WeatherFaxUI.cpp:607 msgid "Reset" -msgstr "Reset" +msgstr "Terugstellen" #: src/WeatherFaxUI.cpp:263 msgid "Stations" @@ -155,7 +154,7 @@ msgid "None" msgstr "Geen" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "Frequentie" @@ -181,7 +180,7 @@ #: src/WeatherFaxUI.cpp:350 msgid "Clear Captures" -msgstr "" +msgstr "Vastgelegde data opschonen" #: src/WeatherFaxUI.cpp:360 src/WeatherFaxUI.cpp:830 src/WeatherFaxUI.cpp:1530 msgid "Filter" @@ -193,11 +192,11 @@ #: src/WeatherFaxUI.cpp:377 msgid "Sound" -msgstr "" +msgstr "Geluid" #: src/WeatherFaxUI.cpp:380 msgid "Select a file" -msgstr "" +msgstr "Selecteer een bestand" #: src/WeatherFaxUI.cpp:392 msgid "External Alarm" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "Geen actie" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "Audio vastleggen" @@ -229,18 +228,24 @@ #: src/WeatherFaxUI.cpp:436 msgid "Manual Capture (with external program) automatic Open File" -msgstr "Handmatig vastleggen (met extern programma) opent bestand automatisch" +msgstr "Handmatig vastleggen (met extern programma), automatisch bestand openen" #: src/WeatherFaxUI.cpp:443 msgid "Capture Options" msgstr "Vastlegopties" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." -msgstr "Selecteer faxafbeeldingen door te klikken in de opnamekolom (de eerste). \n\nTijdschema's kunt u sorteren door te klikken op de kolomkop.\n\nDe tijdschema's moeten wel getest worden (dit is door de ontwikkelaar slechts gebeurd voor enkele van de te ontvangen stations). Aanpassingen kunt u maken in het bestand WeatherFaxSchedules.xml. Patches kunnen worden ingediend via github.\n\nAutomatisch beheer van een SSB-radio is ook wenselijk (de ontwikkelaar heeft echter alleen een tecsun pl-600). Als iemand een geschikte radio kan doneren, zal daarvoor ondersteuning geboden." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgstr "Selecteer faxafbeeldingen door te klikken in de opnamekolom (de eerste). \n\n" +"Tijdschema's kunt u sorteren door te klikken op de kolomkop.\n\n" +"De tijdschema's moeten wel getest worden (dit is door de ontwikkelaar slechts gebeurd voor enkele van de te ontvangen stations). Aanpassingen kunt u maken in het bestand WeatherFaxSchedules.xml. Patches kunnen worden ingediend via github.\n\n" +"Automatisch beheer van een SSB-radio is ook wenselijk (de ontwikkelaar heeft echter alleen een Tecsun pl-600). Als iemand een geschikte radio kan doneren, zal daarvoor ondersteuning geboden worden." #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "Informatie" @@ -248,17 +253,17 @@ msgid "Capture Status" msgstr "Vastlegstatus" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "Sluiten" #: src/WeatherFaxUI.cpp:621 msgid "Retrieve Scheduled" -msgstr "" +msgstr "Ophalen geplande data" #: src/WeatherFaxUI.cpp:624 msgid "Retrieve Selected" -msgstr "Ophalen geselecteerd" +msgstr "Ophalen geselecteerde data" #: src/WeatherFaxUI.cpp:634 msgid "Servers" @@ -272,8 +277,8 @@ msgid "Decoder" msgstr "Decoder" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "Stoppen" @@ -299,7 +304,7 @@ #: src/WeatherFaxUI.cpp:834 msgid "Removal 3" -msgstr "" +msgstr "Verwijdering 3" #: src/WeatherFaxUI.cpp:834 msgid "Value 1" @@ -323,11 +328,11 @@ #: src/WeatherFaxUI.cpp:851 msgid "CCW" -msgstr "CCW" +msgstr "Linksom" #: src/WeatherFaxUI.cpp:851 msgid "CW" -msgstr "CW" +msgstr "Rechtsom" #: src/WeatherFaxUI.cpp:851 msgid "180" @@ -357,19 +362,21 @@ #: src/WeatherFaxUI.cpp:931 msgid "Minutes" -msgstr "" +msgstr "Minuten" #: src/WeatherFaxUI.cpp:998 msgid "Show Lat/Lon Minutes" -msgstr "" +msgstr "Breedte-/Lengteminuten weergeven" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" -msgstr "+ Br/Le voor N/O\n- Br/Le voor Z/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" +msgstr "+ Br/Le voor N/O\n" +"- Br/Le voor Z/W" #: src/WeatherFaxUI.cpp:1019 msgid "Coordinates Mapping Correction" -msgstr "Geografische locatie correctie" +msgstr "Geografische locatiecorrectie" #: src/WeatherFaxUI.cpp:1031 msgid "Input Type" @@ -403,8 +410,7 @@ msgid "Size" msgstr "Grootte" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "1" @@ -442,7 +448,7 @@ #: src/WeatherFaxUI.cpp:1365 msgid "HF Schedules" -msgstr "HF-uitzendschema's" +msgstr "HF-zendschema's" #: src/WeatherFaxUI.cpp:1372 msgid "Load Schedules at Startup" @@ -462,7 +468,7 @@ #: src/WeatherFaxUI.cpp:1408 msgid "Recommended 4, 16, 64, or 256" -msgstr "" +msgstr "Aanbevolen 4, 16, 64 of 256" #: src/WeatherFaxUI.cpp:1413 msgid "Depth" @@ -517,8 +523,10 @@ msgstr "Verzadigingsdrempel" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" -msgstr "Voorkom start-, stop- en\nfasedetectie" +msgid "Skip start, stop and \n" +"phasing detection" +msgstr "Voorkom start-, stop- en\n" +"fasedetectie" #: src/WeatherFaxUI.cpp:1553 msgid "Include header data in image" @@ -534,400 +542,438 @@ #: src/WeatherFaxUI.cpp:1580 msgid "8000" -msgstr "8000" +msgstr "8.000" #: src/WeatherFaxUI.cpp:1580 msgid "16000" -msgstr "16000" +msgstr "16.000" #: src/WeatherFaxUI.cpp:1580 msgid "48000" -msgstr "48000" +msgstr "48.000" + +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "Apparaatindex" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "Klaar" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" -msgstr "Versie WeerFax PlugIn" +msgstr "Versie Weerfax PlugIn" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." -msgstr "De weerfax plugin voor OpenCPN is bedoeld om het ontvangen van weerfaxen eenvoudiger te maken en ze optioneel over de kaart te projecteren.\n\nHet bevat een fax-decoder die audiobestanden omzet naar weerkaarten.\n\nBegin door een afbeelding of een opgenomen .wav audio-bestand van een faxbericht te openen vanuit het bestandsmenu, of selecteer een optie in het ophaal menu.\n\n\n" -"Source Code: \nhttps://github.com/seandepagnier/weatherfax_pi \n\n Veel dank aan de vertalers en testers." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." +msgstr "De Weerfax PlugIn voor OpenCPN is bedoeld om het ontvangen van weerfaxen eenvoudiger te maken en om de gegevens optioneel op de kaart te projecteren. \n\n" +"De PlugIn bevat een fax-decoder die audiobestanden omzet naar weerkaarten. \n\n" +"Begin door een afbeelding of een opgenomen *.WAV audiobestand van een faxbericht te openen vanuit het bestandsmenu, of selecteer een optie in het ophaalmenu.\n\n" +"\n" +"Broncode: \n" +"https://github.com/seandepagnier/weatherfax_pi \n\n" +" Veel dank aan de vertalers en testers." -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "Over de auteur" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "Gepland" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "Server" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "Regio" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "Inhoud" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "Kaartgebied" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "Kon bestand niet laden: " -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "Ongeldig XML-bestand" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" -msgstr "WeerFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" +msgstr "Weerfax ophalen van internet" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "Laden" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "Ongeldige iterator: " -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "Niet-herkend XML-knooppunt: " -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "Kon geen gebied koppelen:" -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "Zoveel URL's sorteren kan te lang duren" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "weerfax" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" -msgstr "Fax minder dan 180 minuten geleden opgehaald. \nBestaand bestand gebruiken?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" +msgstr "Fax minder dan 180 minuten geleden opgehaald. \n" +"Bestaand bestand gebruiken?" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" +msgstr "Weerfax InternetRetrieval" + +#: src/InternetRetrievalDialog.cpp:584 msgid "Reading Headers: " msgstr "Lezen van koppen:" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" -msgstr "" - -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " -msgstr "Wacht op koppen voor:" +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " +msgstr "Downloaden mislukt: " -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "Controleer of er een werkende internetverbinding is." -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "Als de URL onjuist is het XML-bestand bewerken en/of een bug-rapport posten." -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "Geen faxen geselecteerd." -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr "Probeer te klikken op de geselecteerde (eerste) kolom" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "Nieuwe coörd'n" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" -msgstr "Start" +msgstr "Starten" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" -msgstr "Kon kartering niet uitvoeren\nControleer correctieparameters kartering" - -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" +msgstr "Kon kartering niet uitvoeren\n" +"Controleer correctieparameters kartering" + +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "Maken van kaart" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" -msgstr "Waarschuwing: breedtes aan verschillende kanten van de evenaar niet aanbevolen (dubbelzinnigheid van N- of Z-pool)." +msgstr "Waarschuwing: breedtes aan beide kanten van de equator niet aanbevolen (dubbelzinnigheid van N- of Z-pool)." -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" -msgstr "Berekening kartering mislukt.\nMogelijk heeft u het verkeerde karteringstype voor dit beeld gekozen of zijn de gespecificeerde coördinaten niet correct.\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +msgstr "Berekening kartering mislukt.\n" +"Mogelijk heeft u het verkeerde karteringstype voor dit beeld gekozen of zijn de gespecificeerde coördinaten niet correct.\n" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "Berekening kartering nog niet ondersteund.\n" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "Berekening equator nog niet ondersteund.\n" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." -msgstr "De weergave kan geschaald worden en kan conversies tussen coördinaatsystemen aan.\nNoordelijke breedtes en oostelijke lengtes zijn positief, zuidelijke breedtes en westelijke lengtes zijn negatief.\n\nVoor polaire modus geldt: de weergave wordt berekend met 'Get Mapping Parameters' maar de x-waarde van de eerste coördinaat (verticale rode lijn) moet opgelijnd zijn met met de pool op de verticale meridiaan.\nNa het invoeren van de coördinaten zullen in de weergave de blauw gekleurde breedtes moeten zijn opgelijnd. Als dit onvoldoende het geval is, dient u de invoercoördinaten te controleren.\nZodra de oplijning voldoende is, moet de x-waarde van de pool bijgesteld worden om de breedtes te centreren. vervolgens dient de y-waarde van de pool bijgesteld te worden, tot de blauwe breedtecurve die het dichtst bij de pool ligt, correct wordt weergegeven. Als nu de tweede blauwe breedtecurve te breed is, moet de 'width ratio' vergroot worden. Herhaal dit voor de y-waarde van de pool en voor de 'width ratio', tot beide zijn opgelijnd.Een goede calibratie is het makkelijkst als u breedtes gebruikt die zoveel mogelijk in afstand verschillen.\n Als de blauw gekleurde breedtes exact zijn opgelijnd, moet de equator herberekend worden. " +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +msgstr "De weergave kan geschaald worden en kan conversies tussen coördinaatsystemen aan.\n" +"Noordelijke breedtes en oostelijke lengtes zijn positief, zuidelijke breedtes en westelijke lengtes zijn negatief.\n\n" +"Voor polaire modus geldt: de weergave wordt berekend met 'Get Mapping Parameters' maar de x-waarde van de eerste coördinaat (verticale rode lijn) moet opgelijnd zijn met met de pool op de verticale meridiaan.\n" +"Na het invoeren van de coördinaten zullen in de weergave de blauw gekleurde breedtes moeten zijn opgelijnd. Als dit onvoldoende het geval is, dient u de invoercoördinaten te controleren.\n" +"Zodra de oplijning voldoende is, moet de x-waarde van de pool bijgesteld worden om de breedtes te centreren. vervolgens dient de y-waarde van de pool bijgesteld te worden, tot de blauwe breedtecurve die het dichtst bij de pool ligt, correct wordt weergegeven. Als nu de tweede blauwe breedtecurve te breed is, moet de 'width ratio' vergroot worden. Herhaal dit voor de y-waarde van de pool en voor de 'width ratio', tot beide zijn opgelijnd.Een goede calibratie is het makkelijkst als u breedtes gebruikt die zoveel mogelijk in afstand verschillen.\n" +" Als de blauw gekleurde breedtes exact zijn opgelijnd, moet de equator herberekend worden. " -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "Fout bij decoderen fax:" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "Mislukt" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "DecodeImageLine vereist een specifieke bufferlengte" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "Audiopoort invoeroverflow, gegevens deels kwijt" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "kon invoerbestand niet openen: " -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "monstergrootte niet 8 of 16 bits:" -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "Vastleggen" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "Zender" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "Tijd (UT)" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "Geldige tijd" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "Duur" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" -msgstr "WeerFax schema's" +msgstr "Weerfaxschema's" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "Niet-herkend XML-knooppunt" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "Kon duur niet vinden voor:" -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "Sorteren van zoveel schema's kan te lang duren" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "Vullen van de lijst" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "Vastleggen van fax: " -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " -msgstr " Conflicteerd met reeds geplande fax: " +msgstr " Conflicteert met reeds geplande fax: " -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr " deze fax uitschakelen? " -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" -msgstr "WeerFax schema's" +msgstr "Weerfaxschema's" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "Vastleggen niet ingesteld" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "beginnen bij" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "seconden" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "uren" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "minuten" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "Huidige fax: " -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "Stem SSB-radio af op" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "om fax te ontvangen voor" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" -msgstr "WeerFax schema start spoedig" +msgstr "Weerfaxschema start spoedig" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "Al bezig met vastleggen; kan niet vastleggen:" -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "Kon niet starten: " -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." -msgstr "" +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." +msgstr "Fout in Weerfax PlugIn\n" +"Bezig met vastleggenHF weerfax." -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" -msgstr "Open invoerbestand WeerFax" +msgstr "Open invoerbestand Weerfax" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "WAV-bestanden (*.wav) | *.WAV; *. wav|Alle bestanden (*. *) | *. *" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "Uitvoering extern vastleggen mislukt" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "Kon coördinaten niet laden" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "Kon XML-bestand niet opslaan:" -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" -msgstr "" +msgstr "Probeer uit te voeren:" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "Kon invoerbestand niet laden:" -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "Ondersteunde bestanden| *.BMP; *.bmp; *.XBM; *.xbm; *.XPM; *.xpm; *.TIF; *.tif; *.TIFF-; *.tiff; *.GIF; *.gif; *.JPEG; *.jpeg; *.JPG; *.jpg; *.PNM; *.pnm; *.PNG; *.png; *.PCX; *.pcx; *.PICT-; *.pict; *.TGA;.tga; *.WAV; *. wav|Alle bestanden (*. *) | *. *" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." -msgstr "" +msgstr "Kan geen audioweerfax openen die al bezig is." -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" -msgstr "" +msgstr "Weerfax opslaan als beeldbestand" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" -msgstr "" +msgstr "Beeldbestanden|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " -msgstr "" +msgstr "Opslaan van bestand mislukt: " -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "Weerfax opslaan als KAP-bestand" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" -msgstr "" +msgstr "KAP bestanden| *. KAP; *. kap| Alle bestanden (*. *) | *. *" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "Resulterende afbeelding heeft negatieve afmetingen; afbreken\n" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "Maken van kaart is mislukt" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" -msgstr "Resulterende afbeelding groter dan %dMB\nStel grootteparameter in op een kleinere waarde (minder dan %.2f)\nstoppen\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" +msgstr "Resulterende afbeelding groter dan %dMB\n" +"Stel grootteparameter in op een kleinere waarde (minder dan %.2f)\n" +"stoppen\n" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "Kaart maken van weerfaxbeeld" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" -msgstr "WeerFax kaartmaker" +msgstr "Weerfax kaartmaker" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" -msgstr "" +msgstr "Grafische hardware niet ondersteund (schakel OpenGL uit)\n" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" -msgstr "WeerFax" +msgstr "Weerfax" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" -msgstr "WeerFax PlugIn voor OpenCPN" +msgstr "Weerfax PlugIn voor OpenCPN" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" -msgstr "" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" +msgstr "Weerfax PlugIn voor OpenCPN \n" +"Kan beeldbestanden rechtstreeks openen, en audiobestanden decoderen naar een afbeelding. \n" +"Met een simpele ijking kunnen beelden over de kaart gelegd worden.\n" +"Converteert beelden met Mercator, polaire en kegel projecties. \n" +"Kan elke afbeelding converteren naar een rasterkaart. \n" +"Ingebouwde database voor HF-radiozenders via SSB.\n" +"Ingebouwde database voor ophalen van gegevens van meteorologische internetsites. \n" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" -msgstr "WeerFax voorkeuren" +msgstr "Voorkeuren Weerfax" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/pl.po opencpn-plugin-weatherfax-1.5001.0/po/pl.po --- opencpn-plugin-weatherfax-1.3.1/po/pl.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/pl.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:23-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-02-18 16:09-0500\n" "Last-Translator: nohal \n" "Language-Team: Polish\n" "Language: pl_PL\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: pl\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "" @@ -155,7 +154,7 @@ msgid "None" msgstr "" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "" @@ -236,11 +235,14 @@ msgstr "" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." msgstr "" #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "" @@ -248,7 +250,7 @@ msgid "Capture Status" msgstr "" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "" @@ -272,8 +274,8 @@ msgid "Decoder" msgstr "" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "" @@ -364,7 +366,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" msgstr "" #: src/WeatherFaxUI.cpp:1019 @@ -403,8 +406,7 @@ msgid "Size" msgstr "" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "" @@ -517,7 +519,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" +msgid "Skip start, stop and \n" +"phasing detection" msgstr "" #: src/WeatherFaxUI.cpp:1553 @@ -544,389 +547,405 @@ msgid "48000" msgstr "" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." msgstr "" -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "" -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "" -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "" -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "" -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" msgstr "" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 -msgid "Reading Headers: " +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" +#: src/InternetRetrievalDialog.cpp:584 +msgid "Reading Headers: " msgstr "" -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " msgstr "" -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "" -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "" -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "" -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr "" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" msgstr "" -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" msgstr "" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "" -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "" -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "" -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "" -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr "" -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr "" -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "" -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "" -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "" -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." msgstr "" -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "" -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" msgstr "" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "" -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." msgstr "" -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" msgstr "" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " msgstr "" -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" msgstr "" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" msgstr "" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" msgstr "" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/pt.po opencpn-plugin-weatherfax-1.5001.0/po/pt.po --- opencpn-plugin-weatherfax-1.3.1/po/pt.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/pt.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:24-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-02-25 08:05-0500\n" "Last-Translator: nohal \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "Fax meteorológico" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "Preferências de Fax meteorológicos" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "Opções de decodificação de fax" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "Sobre Weatherfax" @@ -67,7 +66,7 @@ #: src/WeatherFaxUI.cpp:74 msgid "Save &As" -msgstr "" +msgstr "Salvar &Como" #: src/WeatherFaxUI.cpp:77 msgid "&Edit" @@ -155,7 +154,7 @@ msgid "None" msgstr "Nenhum" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "Frequência" @@ -181,7 +180,7 @@ #: src/WeatherFaxUI.cpp:350 msgid "Clear Captures" -msgstr "" +msgstr "Limpar Capturas" #: src/WeatherFaxUI.cpp:360 src/WeatherFaxUI.cpp:830 src/WeatherFaxUI.cpp:1530 msgid "Filter" @@ -193,11 +192,11 @@ #: src/WeatherFaxUI.cpp:377 msgid "Sound" -msgstr "" +msgstr "Som" #: src/WeatherFaxUI.cpp:380 msgid "Select a file" -msgstr "" +msgstr "Selecione um arquivo" #: src/WeatherFaxUI.cpp:392 msgid "External Alarm" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "Nenhuma ação" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "Captura de áudio" @@ -236,11 +235,17 @@ msgstr "Opções de captura" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." -msgstr "Selecione imagens do fax clicando na coluna captura(primeira)\n\nHorários podem ser classificados clicando nos títulos das colunas\n\nOs Horários precisam de testes, como eu posso sómente receber de algumas das estações possíveis. Correções podem ser feitas, modificando o arquivo WeatherFaxSchedules.xml. Patches podem ser apresentadas via github.\n\nControle Automatico de rádio ssb é desejável, no entanto, o autor tem apenas um tecsun pl-600. Se um rádio apropriado pode ser doado, suporte será implementado." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgstr "Selecione imagens do fax clicando na coluna captura(primeira)\n\n" +"Horários podem ser classificados clicando nos títulos das colunas\n\n" +"Os Horários precisam de testes, como eu posso sómente receber de algumas das estações possíveis. Correções podem ser feitas, modificando o arquivo WeatherFaxSchedules.xml. Patches podem ser apresentadas via github.\n\n" +"Controle Automatico de rádio ssb é desejável, no entanto, o autor tem apenas um tecsun pl-600. Se um rádio apropriado pode ser doado, suporte será implementado." #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "Informação" @@ -248,13 +253,13 @@ msgid "Capture Status" msgstr "Capturar o Status" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "Fechar" #: src/WeatherFaxUI.cpp:621 msgid "Retrieve Scheduled" -msgstr "" +msgstr "Recuperar programado" #: src/WeatherFaxUI.cpp:624 msgid "Retrieve Selected" @@ -272,8 +277,8 @@ msgid "Decoder" msgstr "Decodificador" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "Parar" @@ -299,7 +304,7 @@ #: src/WeatherFaxUI.cpp:834 msgid "Removal 3" -msgstr "" +msgstr "Remoção 3" #: src/WeatherFaxUI.cpp:834 msgid "Value 1" @@ -357,15 +362,17 @@ #: src/WeatherFaxUI.cpp:931 msgid "Minutes" -msgstr "" +msgstr "Minutos" #: src/WeatherFaxUI.cpp:998 msgid "Show Lat/Lon Minutes" -msgstr "" +msgstr "Mostrar Minutos Lat/Lon" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" -msgstr "+ Lat/Lon para N/E\n-Lat/Lon para S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" +msgstr "+ Lat/Lon para N/E\n" +"-Lat/Lon para S/W" #: src/WeatherFaxUI.cpp:1019 msgid "Coordinates Mapping Correction" @@ -403,8 +410,7 @@ msgid "Size" msgstr "Tamanho" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "1" @@ -462,7 +468,7 @@ #: src/WeatherFaxUI.cpp:1408 msgid "Recommended 4, 16, 64, or 256" -msgstr "" +msgstr "Recomendado 4, 16, 64 ou 256" #: src/WeatherFaxUI.cpp:1413 msgid "Depth" @@ -517,8 +523,10 @@ msgstr "Limiar de saturação" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" -msgstr "Ignorar iniciar, parar e \ndetecção progressiva" +msgid "Skip start, stop and \n" +"phasing detection" +msgstr "Ignorar iniciar, parar e \n" +"detecção progressiva" #: src/WeatherFaxUI.cpp:1553 msgid "Include header data in image" @@ -544,389 +552,430 @@ msgid "48000" msgstr "48000" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "Índice do dispositivo" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "Feito" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "Versão do plugin Weather Fax " -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." -msgstr "O plugin weatherfax para opencpn destina-se a reduzir a quantidade de interação do usuário para receber faxes de tempo e, opcionalmente, sobrepô-las diretamente em cartas.\n\nEste inclui um decodificador de fax, que converte fax de audio de rádio em images.\n\nPara começar, abrir uma imagem ou arquivo de áudio wav gravado de uma transmissão de fax de rádio ssb do menu arquivo, ou selecione uma opção de recuperar menu.\n\nFonte de código: \nhttps://github.com/seandepagnier/weatherfax_pi \n\nMuitas graças a tradutores e testadores." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." +msgstr "O plugin weatherfax para opencpn destina-se a reduzir a quantidade de interação do usuário para receber faxes de tempo e, opcionalmente, sobrepô-las diretamente em cartas.\n\n" +"Este inclui um decodificador de fax, que converte fax de audio de rádio em images.\n\n" +"Para começar, abrir uma imagem ou arquivo de áudio wav gravado de uma transmissão de fax de rádio ssb do menu arquivo, ou selecione uma opção de recuperar menu.\n\n" +"Fonte de código: \n" +"https://github.com/seandepagnier/weatherfax_pi \n\n" +"Muitas graças a tradutores e testadores." -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "Sobre o autor" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "Programado" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "Servidor" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "Região" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "Conteúdo" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "Área do mapa" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "Falha ao carregar arquivo: " -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "Arquivo xml inválido" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" -msgstr "WeatherFax RecuperaçãoInternet" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" +msgstr "WeatherFax Recuperação Internet" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "Carregando" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "Iterador inválido: " -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "não reconhecido xml node: " -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "Falha a combinar área: " -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "Classificação tantas urls pode levar muito tempo" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "weatherfax" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" -msgstr "Fax já obtida há menos de 180 minutos. \nUsar arquivo existente?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" +msgstr "Fax já obtida há menos de 180 minutos. \n" +"Usar arquivo existente?" + +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" +msgstr "WeatherFax RecuperaçãoInternet" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 +#: src/InternetRetrievalDialog.cpp:584 msgid "Reading Headers: " msgstr "Leitura de cabeçalhos: " -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" -msgstr "" - -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " -msgstr "Tempo limite de espera para cabeçalhos para: " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " +msgstr "Falha ao baixar: " -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "Verifique se há uma conexão com a internet trabalhando." -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "Se a url está incorreta, por favor edite o xml e/ou postar um relatório de bug." -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "Sem Faxes selecionados." -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr " Tente clicar coluna selecionada (primeiro)" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "Nova Coord" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "Início" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" -msgstr "Falha ao aplicar mapeamento\nVerifique parâmetros de correção de mapeamento" - -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" +msgstr "Falha ao aplicar mapeamento\n" +"Verifique parâmetros de correção de mapeamento" + +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "Mapeamento" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "Aviso, latitudes em lados diferentes do Equador não recomendado devido à ambigüidade do Polo Norte ou do Pólo Sul" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" -msgstr "Cálculo de mapeamento Falhou. \nTalvez você selecionou o tipo de mapeamento errado para esta imagem, ou coordenadas especificadas não estão corretas\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +msgstr "Cálculo de mapeamento Falhou. \n" +"Talvez você selecionou o tipo de mapeamento errado para esta imagem, ou coordenadas especificadas não estão corretas\n" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "Cálculo de mapeamento ainda não suportado. \n" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "Calculando o Equador ainda não suportado. \n" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." -msgstr "O mapeamento permite dimensionamento e conversão entre sistemas de coordenadas\nLatitudes são + N -S, Longitudes + E-W\n\nPara modo polar de mapeamento: \nObter parâmetros de mapeamento calcular o mapeamento das coordenadas dadas, mas o valor da primeira coordenada X (linha vertical vermelha) deve ficar alinhados com o polo no modo polar sobre o meridiano vertical \nUma vez que as coordenadas são inseridas, o mapeamento deve fazer o alinhamento das latitudes azuis. Se elas estão longe, verifique as entradas das coordenadas. \nUma vez perto: \nPrimeiro ajuste o polo X para centralizar as latitudes. Em seguida, ajuste o valor do polo Y até a curva de latitude azul mais próxima ao polo que está correto. Agora, se a segunda latitude azul é muito larga, então a relação largura real precisa ser aumentada, caso contrário ela deve ser diminuída. Repita o ajuste do polo Y e a relação real da largura até que ambos se alinhem. É mais fácil de calibrar corretamente se você usar as mais distante e espaçadas latitudes disponíveis. \nUma vez que as latitudes azuis alinham-se perfeitamente, recalcular o equador para garantir que o mapeamento resultante esta correto. Neste ponto, as coordenadas podem ser alteradas para locais melhores, se necessário. Se a largura real está muito perto de 1.0 provavelmente deve ser exatamente 1.0.\n também é possível ir para a próxima etapa, ajustar as coordenadas, então volte para esta etapa e obter os parâmetros de mapeamento novamente para melhorar a estimativa." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +msgstr "O mapeamento permite dimensionamento e conversão entre sistemas de coordenadas\n" +"Latitudes são + N -S, Longitudes + E-W\n\n" +"Para modo polar de mapeamento: \n" +"Obter parâmetros de mapeamento calcular o mapeamento das coordenadas dadas, mas o valor da primeira coordenada X (linha vertical vermelha) deve ficar alinhados com o polo no modo polar sobre o meridiano vertical \n" +"Uma vez que as coordenadas são inseridas, o mapeamento deve fazer o alinhamento das latitudes azuis. Se elas estão longe, verifique as entradas das coordenadas. \n" +"Uma vez perto: \n" +"Primeiro ajuste o polo X para centralizar as latitudes. Em seguida, ajuste o valor do polo Y até a curva de latitude azul mais próxima ao polo que está correto. Agora, se a segunda latitude azul é muito larga, então a relação largura real precisa ser aumentada, caso contrário ela deve ser diminuída. Repita o ajuste do polo Y e a relação real da largura até que ambos se alinhem. É mais fácil de calibrar corretamente se você usar as mais distante e espaçadas latitudes disponíveis. \n" +"Uma vez que as latitudes azuis alinham-se perfeitamente, recalcular o equador para garantir que o mapeamento resultante esta correto. Neste ponto, as coordenadas podem ser alteradas para locais melhores, se necessário. Se a largura real está muito perto de 1.0 provavelmente deve ser exatamente 1.0.\n" +" também é possível ir para a próxima etapa, ajustar as coordenadas, então volte para esta etapa e obter os parâmetros de mapeamento novamente para melhorar a estimativa." -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "Falha decodificando Fax: " -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "Falhou" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "Linha de Imagen Decodificada requer comprimento do buffer específico" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "Porta de áudio estourou na entrada, alguns dados perdidos!" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "Não foi possível abrir o arquivo de entrada: " -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "tamanho da amostra não 8 ou 16 bit: " -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "Captura" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "Estação" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "Hora (UTC)" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "Tempo válido" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "Duração" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "Horários de WeatherFax" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "não reconhecido xml node" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "Falha para encontrar a duração para: " -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "Classificação de tantas programações pode levar muito tempo" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "Preenchimento de lista" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "Captura de fax: " -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr " Conflitos com fax já agendado: " -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr " desativar este fax? " -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "programações de weatherfax" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "Nenhum conjunto de captura" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "Iniciando em" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "segundo(s)" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "hora (s)" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "minuto(s)" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "Fax Atual: " -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "Sintonize rádio ssb para" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "para receber fax para" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "Weather Fax agendar começando em breve" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "Já capturando, não pode capturar: " -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "Falha ao iniciar: " -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." -msgstr "" +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." +msgstr "Falha no plugin weather fax\n" +"Atualmente capturando fax meteorológico de hf." -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "Aberto Arquivo de entrada de Weather Fax" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "Arquivos WAV (*. wav) | *.WAV; *. wav |Todos os arquivos (*. *) | *. *" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "Falha na execução de captura externa" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "Falha ao carregar conjuntos de coordenadas" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "Falha ao salvar arquivo xml: " -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" -msgstr "" +msgstr "Tente executar:" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "Falha ao carregar arquivo de entrada: " -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "Suporte para imagens | *.BMP; *. bmp; *.XBM; *.xbm; *.XPM; *.xpm; *.TIF; *. tif; *.TIFF; *.tiff; *.GIF; *. gif; *.JPEG; *. jpeg; *.JPG; *. jpg; *.PNM; *.pnm; *.PNG; *. png; *.PCX; *.pcx; *.PICT; *.pict; *.TGA; *.tga; *.WAV; *. wav |Todos os arquivos (*. *) | *. *" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." -msgstr "" +msgstr "Não é possível abrir áudio de fax meteorológico já em andamento." -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" -msgstr "" +msgstr "Salve Fax meteorológico como imagem" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" -msgstr "" +msgstr "Arquivos de imagens | *. BMP; *. bmp | *. PNG; *. png| *. TIFF; *.tiffAll arquivos (*. *) | *. *" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " -msgstr "" +msgstr "Falha ao salvar o arquivo: " -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "Salvar o Weather Fax em KAP" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" -msgstr "" +msgstr "Arquivos KAP| *. KAP; *. kap| Todos os arquivos (*. *) | *. *" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "Imagem resultante tem dimensões negativas, abortando\n" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "Mapeamento falhou" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" -msgstr "Imagem resultante maior do que %dMB\ntente mudar tamanho do parâmetro para um valor menor. (menos de %.2f)\nabortando\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" +msgstr "Imagem resultante maior do que %dMB\n" +"tente mudar tamanho do parâmetro para um valor menor. (menos de %.2f)\n" +"abortando\n" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "Mapeamento Weather Fax imagem" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "Weather Fax Mapeador" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" -msgstr "" +msgstr "Gráficos hardware não suportado (desativar o OpenGL)\n" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "WeatherFax" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "Weather Fax PlugIn para OpenCPN" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" -msgstr "" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" +msgstr "Weather Fax PlugIn para OpenCPN\n" +"pode abrir arquivos de imagem diretamente, ou decodificar áudio faxes para uma imagen.\n" +"Com uma calibração simples da imagem, o resultado é sobreposto em cima de imagens de gráficos.\n" +"Converte imagens mercator, polar, cônica e uniforme coordenadas. \n" +"Pode converter qualquer imagem para uma carta Raster.\n" +"Construido em Banco de Dados para estações de fax de rádio HF via SSB.\n" +"Construido em banco de dados para recuperação de internet de meteorológicas locais. \n" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "Preferências de WeatherFax" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/ru.po opencpn-plugin-weatherfax-1.5001.0/po/ru.po --- opencpn-plugin-weatherfax-1.3.1/po/ru.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/ru.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:24-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-01-25 19:58-0500\n" "Last-Translator: nohal \n" "Language-Team: Russian\n" "Language: ru_RU\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: ru\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "" @@ -155,7 +154,7 @@ msgid "None" msgstr "" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "" @@ -236,11 +235,14 @@ msgstr "" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." msgstr "" #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "" @@ -248,7 +250,7 @@ msgid "Capture Status" msgstr "" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "" @@ -272,8 +274,8 @@ msgid "Decoder" msgstr "" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "" @@ -364,7 +366,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" msgstr "" #: src/WeatherFaxUI.cpp:1019 @@ -403,8 +406,7 @@ msgid "Size" msgstr "" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "" @@ -517,7 +519,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" +msgid "Skip start, stop and \n" +"phasing detection" msgstr "" #: src/WeatherFaxUI.cpp:1553 @@ -544,389 +547,405 @@ msgid "48000" msgstr "" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." msgstr "" -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "" -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "" -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "" -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "" -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" msgstr "" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 -msgid "Reading Headers: " +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" +#: src/InternetRetrievalDialog.cpp:584 +msgid "Reading Headers: " msgstr "" -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " msgstr "" -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "" -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "" -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "" -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr "" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" msgstr "" -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" msgstr "" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "" -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "" -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "" -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "" -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr "" -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr "" -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "" -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "" -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "" -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." msgstr "" -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "" -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" msgstr "" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "" -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." msgstr "" -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" msgstr "" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " msgstr "" -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" msgstr "" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" msgstr "" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" msgstr "" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/sv.po opencpn-plugin-weatherfax-1.5001.0/po/sv.po --- opencpn-plugin-weatherfax-1.3.1/po/sv.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/sv.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:24-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-02-18 16:09-0500\n" "Last-Translator: nohal \n" "Language-Team: Swedish\n" "Language: sv_SE\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: sv-SE\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "Väderfax" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "Väderfax-inställningar" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "FaxInställningar" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "Om Väderfax" @@ -155,7 +154,7 @@ msgid "None" msgstr "" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "" @@ -236,11 +235,14 @@ msgstr "" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." msgstr "" #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "" @@ -248,7 +250,7 @@ msgid "Capture Status" msgstr "" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "" @@ -272,8 +274,8 @@ msgid "Decoder" msgstr "" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "" @@ -364,7 +366,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" msgstr "" #: src/WeatherFaxUI.cpp:1019 @@ -403,8 +406,7 @@ msgid "Size" msgstr "" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "" @@ -517,7 +519,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" +msgid "Skip start, stop and \n" +"phasing detection" msgstr "" #: src/WeatherFaxUI.cpp:1553 @@ -544,389 +547,405 @@ msgid "48000" msgstr "" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." msgstr "" -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "" -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "" -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "" -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "" -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" msgstr "" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 -msgid "Reading Headers: " +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" +#: src/InternetRetrievalDialog.cpp:584 +msgid "Reading Headers: " msgstr "" -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " msgstr "" -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "" -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "" -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "" -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr "" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" msgstr "" -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" msgstr "" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "" -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "" -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "" -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "" -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr "" -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr "" -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "" -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "" -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "" -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." msgstr "" -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "" -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" msgstr "" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "" -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." msgstr "" -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" msgstr "" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " msgstr "" -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" msgstr "" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" msgstr "" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" msgstr "" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/tr.po opencpn-plugin-weatherfax-1.5001.0/po/tr.po --- opencpn-plugin-weatherfax-1.3.1/po/tr.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/tr.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:24-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2015-12-31 15:38-0500\n" "Last-Translator: nohal \n" "Language-Team: Turkish\n" "Language: tr_TR\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: tr\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "" @@ -155,7 +154,7 @@ msgid "None" msgstr "" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "" @@ -236,11 +235,14 @@ msgstr "" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." msgstr "" #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "" @@ -248,7 +250,7 @@ msgid "Capture Status" msgstr "" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "" @@ -272,8 +274,8 @@ msgid "Decoder" msgstr "" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "" @@ -364,7 +366,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" msgstr "" #: src/WeatherFaxUI.cpp:1019 @@ -403,8 +406,7 @@ msgid "Size" msgstr "" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "" @@ -517,7 +519,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" +msgid "Skip start, stop and \n" +"phasing detection" msgstr "" #: src/WeatherFaxUI.cpp:1553 @@ -544,389 +547,405 @@ msgid "48000" msgstr "" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." msgstr "" -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "" -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "" -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "" -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "" -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" msgstr "" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 -msgid "Reading Headers: " +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" +#: src/InternetRetrievalDialog.cpp:584 +msgid "Reading Headers: " msgstr "" -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " msgstr "" -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "" -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "" -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "" -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr "" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" msgstr "" -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" msgstr "" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "" -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "" -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "" -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "" -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr "" -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr "" -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "" -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "" -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "" -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." msgstr "" -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "" -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" msgstr "" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "" -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." msgstr "" -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" msgstr "" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " msgstr "" -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" msgstr "" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" msgstr "" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" msgstr "" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/vi.po opencpn-plugin-weatherfax-1.5001.0/po/vi.po --- opencpn-plugin-weatherfax-1.3.1/po/vi.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/vi.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:24-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2016-02-25 14:15-0500\n" "Last-Translator: nohal \n" "Language-Team: Vietnamese\n" "Language: vi_VN\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: vi\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "" @@ -155,7 +154,7 @@ msgid "None" msgstr "" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "" @@ -236,11 +235,14 @@ msgstr "" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." msgstr "" #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "" @@ -248,7 +250,7 @@ msgid "Capture Status" msgstr "" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "" @@ -272,8 +274,8 @@ msgid "Decoder" msgstr "" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "" @@ -364,7 +366,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" msgstr "" #: src/WeatherFaxUI.cpp:1019 @@ -403,8 +406,7 @@ msgid "Size" msgstr "" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "" @@ -517,7 +519,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" +msgid "Skip start, stop and \n" +"phasing detection" msgstr "" #: src/WeatherFaxUI.cpp:1553 @@ -544,389 +547,405 @@ msgid "48000" msgstr "" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." msgstr "" -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "" -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "" -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "" -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "" -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" msgstr "" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 -msgid "Reading Headers: " +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" +#: src/InternetRetrievalDialog.cpp:584 +msgid "Reading Headers: " msgstr "" -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " msgstr "" -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "" -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "" -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "" -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr "" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" msgstr "" -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" msgstr "" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "" -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "" -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "" -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "" -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr "" -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr "" -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "" -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "" -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "" -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." msgstr "" -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "" -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" msgstr "" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "" -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." msgstr "" -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" msgstr "" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " msgstr "" -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" msgstr "" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" msgstr "" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" msgstr "" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/weatherfax_pi.pot opencpn-plugin-weatherfax-1.5001.0/po/weatherfax_pi.pot --- opencpn-plugin-weatherfax-1.3.1/po/weatherfax_pi.pot 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/weatherfax_pi.pot 2016-02-25 19:25:30.000000000 +0000 @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the weatherfax_pi package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: weatherfax_pi 1.3\n" +"Project-Id-Version: weatherfax_pi 1.5001\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,12 +17,11 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "" @@ -42,11 +41,11 @@ msgid "Weather Fax Preferences" msgstr "" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "" @@ -156,7 +155,7 @@ msgid "None" msgstr "" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "" @@ -216,7 +215,7 @@ msgid "No Action" msgstr "" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "" @@ -252,7 +251,7 @@ msgstr "" #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "" @@ -260,7 +259,7 @@ msgid "Capture Status" msgstr "" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "" @@ -284,8 +283,8 @@ msgid "Decoder" msgstr "" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "" @@ -417,8 +416,7 @@ msgid "Size" msgstr "" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "" @@ -560,15 +558,19 @@ msgid "48000" msgstr "" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "" -#: src/WeatherFaxUI.cpp:1659 +#: src/WeatherFaxUI.cpp:1666 msgid "" "The weatherfax plugin for opencpn is intended to reduce the amount of user " "interaction to receive weather faxes and optionally overlay them directly " @@ -586,160 +588,147 @@ "Many thanks to translators and testers." msgstr "" -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "" -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "" -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "" -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "" -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "" -#: src/InternetRetrievalDialog.cpp:571 +#: src/InternetRetrievalDialog.cpp:569 msgid "" "Fax already retrieved less than 180 minutes ago.\n" "Use existing file?" msgstr "" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 -msgid "Reading Headers: " +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" msgstr "" -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" +#: src/InternetRetrievalDialog.cpp:584 +msgid "Reading Headers: " msgstr "" -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " msgstr "" -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "" -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "" -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "" -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr "" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "" -#: src/WeatherFaxWizard.cpp:296 +#: src/WeatherFaxWizard.cpp:295 msgid "" "Failed to apply mapping\n" "Check Mapping Correction Parameters" msgstr "" -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "" "Warning, latitudes on different sides of equator not recommended because of " "ambiguity of north or south pole" msgstr "" -#: src/WeatherFaxWizard.cpp:571 +#: src/WeatherFaxWizard.cpp:570 msgid "" "Calculating Mapping Failed.\n" "Perhaps you have chosen the wrong mapping type for this image, or the " "coordinates specified are not correct\n" msgstr "" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:849 +#: src/WeatherFaxWizard.cpp:848 msgid "" "Mapping allows for scaling, and conversion between coordinate systems\n" "Latitudes are +N -S, Longitudes +E -W\n" @@ -766,205 +755,205 @@ "estimate." msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "" -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "" -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "" -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "" -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr "" -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr "" -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "" -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "" -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "" -#: src/SchedulesDialog.cpp:799 +#: src/SchedulesDialog.cpp:798 msgid "" "Fault in weather fax plugin\n" "Currently capturing hf weather fax." msgstr "" -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "" -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" msgstr "" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "" -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "" "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;" "*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*." "PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." msgstr "" -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" msgstr "" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " msgstr "" -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" msgstr "" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format msgid "" "Resulting image larger than %dMB\n" @@ -972,27 +961,27 @@ "aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" msgstr "" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "" -#: src/weatherfax_pi.cpp:153 +#: src/weatherfax_pi.cpp:156 msgid "" "Weather Fax PlugIn for OpenCPN\n" "Can open image files directly, or decode audio faxes to an image.\n" @@ -1003,6 +992,6 @@ "Builtin database for internet retrieval from meterological sites.\n" msgstr "" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "" diff -Nru opencpn-plugin-weatherfax-1.3.1/po/zh.po opencpn-plugin-weatherfax-1.5001.0/po/zh.po --- opencpn-plugin-weatherfax-1.3.1/po/zh.po 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/po/zh.po 2016-02-25 19:25:30.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: opencpn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-23 10:22-0500\n" -"PO-Revision-Date: 2015-04-23 11:24-0400\n" +"POT-Creation-Date: 2015-11-01 13:52-0600\n" +"PO-Revision-Date: 2015-11-08 22:35-0500\n" "Last-Translator: nohal \n" "Language-Team: Chinese Traditional\n" "Language: zh_TW\n" @@ -16,12 +16,11 @@ "X-Crowdin-Language: zh-TW\n" "X-Crowdin-File: /plugins/weatherfax_pi/po/weatherfax_pi.pot\n" -#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:349 -#: src/InternetRetrievalDialog.cpp:572 src/InternetRetrievalDialog.cpp:619 -#: src/InternetRetrievalDialog.cpp:624 src/InternetRetrievalDialog.cpp:644 -#: src/InternetRetrievalDialog.cpp:664 src/SchedulesDialog.cpp:394 -#: src/WeatherFax.cpp:198 src/WeatherFax.cpp:280 src/WeatherFax.cpp:410 -#: src/WeatherFax.cpp:492 src/WeatherFax.cpp:523 src/WeatherFaxImage.cpp:596 +#: src/WeatherFaxUI.h:97 src/InternetRetrievalDialog.cpp:347 +#: src/InternetRetrievalDialog.cpp:570 src/InternetRetrievalDialog.cpp:597 +#: src/InternetRetrievalDialog.cpp:616 src/SchedulesDialog.cpp:393 +#: src/WeatherFax.cpp:197 src/WeatherFax.cpp:279 src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:491 src/WeatherFax.cpp:522 src/WeatherFaxImage.cpp:597 msgid "Weather Fax" msgstr "氣象傳真" @@ -41,11 +40,11 @@ msgid "Weather Fax Preferences" msgstr "氣象傳真選項" -#: src/WeatherFaxUI.h:406 +#: src/WeatherFaxUI.h:408 msgid "Fax Decoding Options" msgstr "傳真解碼選項" -#: src/WeatherFaxUI.h:432 +#: src/WeatherFaxUI.h:434 msgid "About Weatherfax" msgstr "關於 Weatherfax" @@ -155,7 +154,7 @@ msgid "None" msgstr "無" -#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:121 +#: src/WeatherFaxUI.cpp:295 src/SchedulesDialog.cpp:120 msgid "Frequency" msgstr "頻率" @@ -215,7 +214,7 @@ msgid "No Action" msgstr "不採取行動" -#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:376 +#: src/WeatherFaxUI.cpp:416 src/WeatherFax.cpp:375 msgid "Audio Capture" msgstr "" @@ -236,11 +235,17 @@ msgstr "擷取選項" #: src/WeatherFaxUI.cpp:450 -msgid "Select fax images by clicking in the capture (first) column\n\nSchedules can be sorted by clicking the header column\n\nThe schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\nAutomatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." -msgstr "按下擷取(第一個)欄位選擇傳真圖像\n\n時程可以透過按下標頭欄位來排序n\n\n各站台時程需要進一步測試驗證。可透過編輯 WeatherFaxSchedules.xml 檔案來修正資料. 修補程式可透過 github 來提交.\n\n雖然想要做到 ssb 無線電的自動控制，但是作者僅有 tecsun pl-600 型設備。 若有捐助設備，將可進行功能實作." +msgid "Select fax images by clicking in the capture (first) column\n\n" +"Schedules can be sorted by clicking the header column\n\n" +"The schedules need testing as I can only receive from a few of the possible stations. Corrections can be made by modifying the WeatherFaxSchedules.xml file. Patches can be submitted via github.\n\n" +"Automatic control of a ssb radio is desireable as well, however the author only has a tecsun pl-600. If a suitable radio can be donated, support will be implemented." +msgstr "按下擷取(第一個)欄位選擇傳真圖像\n\n" +"時程可以透過按下標頭欄位來排序n\n\n" +"各站台時程需要進一步測試驗證。可透過編輯 WeatherFaxSchedules.xml 檔案來修正資料. 修補程式可透過 github 來提交.\n\n" +"雖然想要做到 ssb 無線電的自動控制，但是作者僅有 tecsun pl-600 型設備。 若有捐助設備，將可進行功能實作." #: src/WeatherFaxUI.cpp:458 src/WeatherFaxUI.cpp:1108 -#: src/WeatherFaxWizard.cpp:874 +#: src/WeatherFaxWizard.cpp:873 msgid "Information" msgstr "" @@ -248,7 +253,7 @@ msgid "Capture Status" msgstr "" -#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1671 +#: src/WeatherFaxUI.cpp:479 src/WeatherFaxUI.cpp:1678 msgid "Close" msgstr "" @@ -272,8 +277,8 @@ msgid "Decoder" msgstr "" -#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:113 -#: src/WeatherFaxWizard.cpp:209 +#: src/WeatherFaxUI.cpp:800 src/WeatherFaxWizard.cpp:112 +#: src/WeatherFaxWizard.cpp:208 msgid "Stop" msgstr "" @@ -364,7 +369,8 @@ msgstr "" #: src/WeatherFaxUI.cpp:1001 -msgid "+ Lat/Lon for N/E\n- Lat/Lon for S/W" +msgid "+ Lat/Lon for N/E\n" +"- Lat/Lon for S/W" msgstr "" #: src/WeatherFaxUI.cpp:1019 @@ -403,8 +409,7 @@ msgid "Size" msgstr "" -#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 -#: src/WeatherFaxUI.cpp:1067 +#: src/WeatherFaxUI.cpp:1053 src/WeatherFaxUI.cpp:1060 src/WeatherFaxUI.cpp:1067 msgid "1" msgstr "" @@ -517,8 +522,10 @@ msgstr "Saturation Threshold" #: src/WeatherFaxUI.cpp:1550 -msgid "Skip start, stop and \nphasing detection" -msgstr "跳過啟動、 停止和 \nphasing 的檢測" +msgid "Skip start, stop and \n" +"phasing detection" +msgstr "跳過啟動、 停止和 \n" +"phasing 的檢測" #: src/WeatherFaxUI.cpp:1553 msgid "Include header data in image" @@ -544,389 +551,406 @@ msgid "48000" msgstr "48000" -#: src/WeatherFaxUI.cpp:1592 +#: src/WeatherFaxUI.cpp:1586 +msgid "Device Index" +msgstr "" + +#: src/WeatherFaxUI.cpp:1599 msgid "Done" msgstr "完成" -#: src/WeatherFaxUI.cpp:1648 +#: src/WeatherFaxUI.cpp:1655 msgid "Weather Fax Plugin Version" msgstr "氣象傳真插件版本" -#: src/WeatherFaxUI.cpp:1659 -msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\nThis includes a fax decoder, which converts radio fax audio into images.\n\nTo get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\nSource Code:\nhttps://github.com/seandepagnier/weatherfax_pi\n\nMany thanks to translators and testers." +#: src/WeatherFaxUI.cpp:1666 +msgid "The weatherfax plugin for opencpn is intended to reduce the amount of user interaction to receive weather faxes and optionally overlay them directly onto charts.\n\n" +"This includes a fax decoder, which converts radio fax audio into images.\n\n" +"To get started, open either an image or recorded wav audio file of a ssb radio fax transmission from the file menu, or select an option from the retrieve menu.\n\n" +"Source Code:\n" +"https://github.com/seandepagnier/weatherfax_pi\n\n" +"Many thanks to translators and testers." msgstr "" -#: src/WeatherFaxUI.cpp:1668 +#: src/WeatherFaxUI.cpp:1675 msgid "About the Author" msgstr "關於作者" -#: src/InternetRetrievalDialog.cpp:98 +#: src/InternetRetrievalDialog.cpp:96 msgid "Scheduled" msgstr "已排程" -#: src/InternetRetrievalDialog.cpp:99 +#: src/InternetRetrievalDialog.cpp:97 msgid "Server" msgstr "伺服器" -#: src/InternetRetrievalDialog.cpp:100 +#: src/InternetRetrievalDialog.cpp:98 msgid "Region" msgstr "區域" -#: src/InternetRetrievalDialog.cpp:101 src/SchedulesDialog.cpp:123 +#: src/InternetRetrievalDialog.cpp:99 src/SchedulesDialog.cpp:122 msgid "Contents" msgstr "內容" -#: src/InternetRetrievalDialog.cpp:102 src/SchedulesDialog.cpp:126 +#: src/InternetRetrievalDialog.cpp:100 src/SchedulesDialog.cpp:125 msgid "Map Area" msgstr "地圖區域" -#: src/InternetRetrievalDialog.cpp:206 src/SchedulesDialog.cpp:276 +#: src/InternetRetrievalDialog.cpp:204 src/SchedulesDialog.cpp:275 msgid "Failed to load file: " msgstr "無法載入檔案: " -#: src/InternetRetrievalDialog.cpp:210 src/SchedulesDialog.cpp:280 -#: src/WeatherFax.cpp:153 +#: src/InternetRetrievalDialog.cpp:208 src/SchedulesDialog.cpp:279 +#: src/WeatherFax.cpp:152 msgid "Invalid xml file" msgstr "不正確 xml 檔" -#: src/InternetRetrievalDialog.cpp:225 src/InternetRetrievalDialog.cpp:585 -#: src/InternetRetrievalDialog.cpp:631 -msgid "WeatherFax InternetRetrieval" -msgstr "氣象傳真 網際網路檢索" +#: src/InternetRetrievalDialog.cpp:223 +msgid "WeatherFax Internet Retrieval" +msgstr "" -#: src/InternetRetrievalDialog.cpp:225 src/SchedulesDialog.cpp:295 +#: src/InternetRetrievalDialog.cpp:223 src/SchedulesDialog.cpp:294 msgid "Loading" msgstr "載入" -#: src/InternetRetrievalDialog.cpp:265 +#: src/InternetRetrievalDialog.cpp:263 msgid "Invalid iterator: " msgstr "Invalid iterator: " -#: src/InternetRetrievalDialog.cpp:291 src/InternetRetrievalDialog.cpp:317 -#: src/InternetRetrievalDialog.cpp:336 src/InternetRetrievalDialog.cpp:339 -#: src/WeatherFax.cpp:194 +#: src/InternetRetrievalDialog.cpp:289 src/InternetRetrievalDialog.cpp:315 +#: src/InternetRetrievalDialog.cpp:334 src/InternetRetrievalDialog.cpp:337 +#: src/WeatherFax.cpp:193 msgid "Unrecognized xml node: " msgstr "無法識別的 xml 節點: " -#: src/InternetRetrievalDialog.cpp:329 src/SchedulesDialog.cpp:377 +#: src/InternetRetrievalDialog.cpp:327 src/SchedulesDialog.cpp:376 msgid "Failed to match Area: " msgstr "未能與區域匹配: " -#: src/InternetRetrievalDialog.cpp:431 +#: src/InternetRetrievalDialog.cpp:429 msgid "Sorting this many urls might take too long" msgstr "排序這許多的 url 可能會花很長時間" -#: src/InternetRetrievalDialog.cpp:432 src/SchedulesDialog.cpp:481 -#: src/SchedulesDialog.cpp:780 src/SchedulesDialog.cpp:793 -#: src/SchedulesDialog.cpp:800 src/SchedulesDialog.cpp:864 +#: src/InternetRetrievalDialog.cpp:430 src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:779 src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:799 src/SchedulesDialog.cpp:863 msgid "weatherfax" msgstr "氣象傳真" -#: src/InternetRetrievalDialog.cpp:571 -msgid "Fax already retrieved less than 180 minutes ago.\nUse existing file?" -msgstr "已檢索到少於 180 分鐘前的傳真。 \n使用既有檔案嗎？" +#: src/InternetRetrievalDialog.cpp:569 +msgid "Fax already retrieved less than 180 minutes ago.\n" +"Use existing file?" +msgstr "已檢索到少於 180 分鐘前的傳真。 \n" +"使用既有檔案嗎？" -#: src/InternetRetrievalDialog.cpp:586 src/InternetRetrievalDialog.cpp:632 +#: src/InternetRetrievalDialog.cpp:583 +msgid "WeatherFax InternetRetrieval" +msgstr "氣象傳真 網際網路檢索" + +#: src/InternetRetrievalDialog.cpp:584 msgid "Reading Headers: " msgstr "讀取標頭: " -#: src/InternetRetrievalDialog.cpp:597 -msgid "Reading" +#: src/InternetRetrievalDialog.cpp:592 +msgid "Failed to Download: " msgstr "" -#: src/InternetRetrievalDialog.cpp:614 -msgid "Timed out waiting for headers for: " -msgstr "Timed out waiting for headers for: " - -#: src/InternetRetrievalDialog.cpp:616 src/InternetRetrievalDialog.cpp:642 +#: src/InternetRetrievalDialog.cpp:595 msgid "Verify there is a working internet connection." msgstr "" -#: src/InternetRetrievalDialog.cpp:617 -msgid "Possibly the server is down temporarily." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:618 src/InternetRetrievalDialog.cpp:643 +#: src/InternetRetrievalDialog.cpp:596 msgid "If the url is incorrect please edit the xml and/or post a bug report." msgstr "" -#: src/InternetRetrievalDialog.cpp:623 -msgid "Failed to read file size aborting." -msgstr "" - -#: src/InternetRetrievalDialog.cpp:639 -msgid "Failed to Download: " -msgstr "" - -#: src/InternetRetrievalDialog.cpp:661 +#: src/InternetRetrievalDialog.cpp:613 msgid "No Faxes selected." msgstr "" -#: src/InternetRetrievalDialog.cpp:663 +#: src/InternetRetrievalDialog.cpp:615 msgid " Try clicking the selected (first) column" msgstr "" -#: src/WeatherFaxWizard.cpp:46 +#: src/WeatherFaxWizard.cpp:45 msgid "New Coord" msgstr "" -#: src/WeatherFaxWizard.cpp:206 +#: src/WeatherFaxWizard.cpp:205 msgid "Start" msgstr "" -#: src/WeatherFaxWizard.cpp:296 -msgid "Failed to apply mapping\nCheck Mapping Correction Parameters" +#: src/WeatherFaxWizard.cpp:295 +msgid "Failed to apply mapping\n" +"Check Mapping Correction Parameters" msgstr "" -#: src/WeatherFaxWizard.cpp:297 src/WeatherFaxWizard.cpp:430 -#: src/WeatherFaxWizard.cpp:574 src/WeatherFaxWizard.cpp:663 -#: src/WeatherFaxWizard.cpp:679 +#: src/WeatherFaxWizard.cpp:296 src/WeatherFaxWizard.cpp:429 +#: src/WeatherFaxWizard.cpp:573 src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:678 msgid "Mapping" msgstr "" -#: src/WeatherFaxWizard.cpp:428 +#: src/WeatherFaxWizard.cpp:427 msgid "Warning, latitudes on different sides of equator not recommended because of ambiguity of north or south pole" msgstr "" -#: src/WeatherFaxWizard.cpp:571 -msgid "Calculating Mapping Failed.\nPerhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" +#: src/WeatherFaxWizard.cpp:570 +msgid "Calculating Mapping Failed.\n" +"Perhaps you have chosen the wrong mapping type for this image, or the coordinates specified are not correct\n" msgstr "" -#: src/WeatherFaxWizard.cpp:662 +#: src/WeatherFaxWizard.cpp:661 msgid "Calculating Mapping not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:678 +#: src/WeatherFaxWizard.cpp:677 msgid "Calculating Equator not yet supported.\n" msgstr "" -#: src/WeatherFaxWizard.cpp:849 -msgid "Mapping allows for scaling, and conversion between coordinate systems\nLatitudes are +N -S, Longitudes +E -W\n\nFor polar mapping mode:\nGet Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\nOnce the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\nOnce they are close:\nFirst adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\nOnce the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\nIt is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." +#: src/WeatherFaxWizard.cpp:848 +msgid "Mapping allows for scaling, and conversion between coordinate systems\n" +"Latitudes are +N -S, Longitudes +E -W\n\n" +"For polar mapping mode:\n" +"Get Mapping parameters calculates the mapping from the coordinates given, but the first coordinate's X value (vertical red line) must align with the pole in polar mode on the vertical meridian\n" +"Once the coordinates are entered, the mapping should make the the blue latitudes align. If they are far off, check the input coordinates.\n" +"Once they are close:\n" +"First adjust pole X to center the latitudes. Next adjust the Pole Y value until the blue latitude curve closest to the pole is correct. Now, if the second blue latitude is too wide, then the true width ratio needs to be increased, otherwise it should be decreased. Repeat adjusting the Pole Y and true width ratio until both align. It is easiest to calibrate correctly if you use the farthest spaced latitudes available.\n" +"Once the blue latitudes align perfectly, recompute the equator to ensure the resulting mapping is correct. At this point, the coordinates can be changed to better locations if needed. If true width is very close to 1.0 it probably should be exactly 1.0.\n" +"It is also possible to go to the next step, adjust the coordinates, then come back to this step and get the mapping parameters again to improve the estimate." msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failure Decoding Fax: " msgstr "" -#: src/FaxDecoder.cpp:110 +#: src/FaxDecoder.cpp:118 msgid "Failed" msgstr "" -#: src/FaxDecoder.cpp:259 +#: src/FaxDecoder.cpp:267 msgid "DecodeImageLine requires specific buffer length" msgstr "" -#: src/FaxDecoder.cpp:363 +#: src/FaxDecoder.cpp:370 msgid "Port audio overflow on input, some data lost!" msgstr "" -#: src/FaxDecoder.cpp:475 +#: src/FaxDecoder.cpp:482 msgid "could not open input file: " msgstr "" -#: src/FaxDecoder.cpp:479 +#: src/FaxDecoder.cpp:486 msgid "sample size not 8 or 16 bit: " msgstr "" -#: src/SchedulesDialog.cpp:119 +#: src/SchedulesDialog.cpp:118 msgid "Capture" msgstr "" -#: src/SchedulesDialog.cpp:120 +#: src/SchedulesDialog.cpp:119 msgid "Station" msgstr "" -#: src/SchedulesDialog.cpp:122 +#: src/SchedulesDialog.cpp:121 msgid "Time (UTC)" msgstr "" -#: src/SchedulesDialog.cpp:124 +#: src/SchedulesDialog.cpp:123 msgid "Valid Time" msgstr "" -#: src/SchedulesDialog.cpp:125 +#: src/SchedulesDialog.cpp:124 msgid "Duration" msgstr "" -#: src/SchedulesDialog.cpp:295 src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:294 src/SchedulesDialog.cpp:596 msgid "WeatherFax Schedules" msgstr "" -#: src/SchedulesDialog.cpp:348 src/SchedulesDialog.cpp:363 -#: src/SchedulesDialog.cpp:384 +#: src/SchedulesDialog.cpp:347 src/SchedulesDialog.cpp:362 +#: src/SchedulesDialog.cpp:383 msgid "Unrecognized xml node" msgstr "" -#: src/SchedulesDialog.cpp:369 +#: src/SchedulesDialog.cpp:368 msgid "Failed to find Duration for: " msgstr "" -#: src/SchedulesDialog.cpp:480 +#: src/SchedulesDialog.cpp:479 msgid "Sorting this many schedules might take too long" msgstr "" -#: src/SchedulesDialog.cpp:597 +#: src/SchedulesDialog.cpp:596 msgid "Populating List" msgstr "" -#: src/SchedulesDialog.cpp:647 +#: src/SchedulesDialog.cpp:646 msgid "Capturing fax: " msgstr "" -#: src/SchedulesDialog.cpp:648 +#: src/SchedulesDialog.cpp:647 msgid " Conflicts with already scheduled fax: " msgstr "" -#: src/SchedulesDialog.cpp:649 +#: src/SchedulesDialog.cpp:648 msgid " disable this fax? " msgstr "" -#: src/SchedulesDialog.cpp:650 +#: src/SchedulesDialog.cpp:649 msgid "weatherfax schedules" msgstr "" -#: src/SchedulesDialog.cpp:710 +#: src/SchedulesDialog.cpp:709 msgid "No Capture Set" msgstr "" -#: src/SchedulesDialog.cpp:713 +#: src/SchedulesDialog.cpp:712 msgid "starting in" msgstr "" -#: src/SchedulesDialog.cpp:716 +#: src/SchedulesDialog.cpp:715 msgid "second(s)" msgstr "" -#: src/SchedulesDialog.cpp:720 +#: src/SchedulesDialog.cpp:719 msgid "hour(s)" msgstr "" -#: src/SchedulesDialog.cpp:723 +#: src/SchedulesDialog.cpp:722 msgid "minute(s)" msgstr "" -#: src/SchedulesDialog.cpp:728 +#: src/SchedulesDialog.cpp:727 msgid "Current fax: " msgstr "" -#: src/SchedulesDialog.cpp:750 +#: src/SchedulesDialog.cpp:749 msgid "Tune ssb radio to" msgstr "" -#: src/SchedulesDialog.cpp:752 +#: src/SchedulesDialog.cpp:751 msgid "to receive fax for" msgstr "" -#: src/SchedulesDialog.cpp:753 +#: src/SchedulesDialog.cpp:752 msgid "Weather Fax Schedule Beginning Soon" msgstr "" -#: src/SchedulesDialog.cpp:779 +#: src/SchedulesDialog.cpp:778 msgid "Already capturing, cannot capture: " msgstr "" -#: src/SchedulesDialog.cpp:792 +#: src/SchedulesDialog.cpp:791 msgid "Failed to launch: " msgstr "" -#: src/SchedulesDialog.cpp:799 -msgid "Fault in weather fax plugin\nCurrently capturing hf weather fax." +#: src/SchedulesDialog.cpp:798 +msgid "Fault in weather fax plugin\n" +"Currently capturing hf weather fax." msgstr "" -#: src/SchedulesDialog.cpp:829 src/WeatherFax.cpp:477 +#: src/SchedulesDialog.cpp:828 src/WeatherFax.cpp:476 msgid "Open Weather Fax Input File" msgstr "" -#: src/SchedulesDialog.cpp:831 +#: src/SchedulesDialog.cpp:830 msgid "WAV files (*.wav)|*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/SchedulesDialog.cpp:863 +#: src/SchedulesDialog.cpp:862 msgid "External Capture Execution failed" msgstr "" -#: src/WeatherFax.cpp:148 +#: src/WeatherFax.cpp:147 msgid "Failed to load coordinate sets" msgstr "" -#: src/WeatherFax.cpp:280 +#: src/WeatherFax.cpp:279 msgid "Failed to save xml file: " msgstr "" -#: src/WeatherFax.cpp:405 +#: src/WeatherFax.cpp:404 msgid "try to execute :" msgstr "" -#: src/WeatherFax.cpp:409 +#: src/WeatherFax.cpp:408 msgid "Failed to load input file: " msgstr "" -#: src/WeatherFax.cpp:479 +#: src/WeatherFax.cpp:478 msgid "Supported Files|*.BMP;*.bmp;*.XBM;*.xbm;*.XPM;*.xpm;*.TIF;*.tif;*.TIFF;*.tiff;*.GIF;*.gif;*.JPEG;*.jpeg;*.JPG;*.jpg;*.PNM;*.pnm;*.PNG;*.png;*.PCX;*.pcx;*.PICT;*.pict;*.TGA;*.tga;*.WAV;*.wav|All files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:491 +#: src/WeatherFax.cpp:490 msgid "Cannot open audio weather fax already in progress." msgstr "" -#: src/WeatherFax.cpp:511 +#: src/WeatherFax.cpp:510 msgid "Save Weather Fax To Image" msgstr "" -#: src/WeatherFax.cpp:513 +#: src/WeatherFax.cpp:512 msgid "Image Files|*.BMP;*.bmp|*.PNG;*.png|*.TIFF;*.tiffAll files (*.*)|*.*" msgstr "" -#: src/WeatherFax.cpp:522 +#: src/WeatherFax.cpp:521 msgid "Failed to save file: " msgstr "" -#: src/WeatherFax.cpp:579 +#: src/WeatherFax.cpp:578 msgid "Save Weather Fax To KAP" msgstr "" -#: src/WeatherFax.cpp:581 +#: src/WeatherFax.cpp:580 msgid "KAP Files|*.KAP;*.kap|All files (*.*)|*.*" msgstr "" -#: src/WeatherFaxImage.cpp:439 +#: src/WeatherFaxImage.cpp:440 msgid "Resulting image has negative dimensions, aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:440 src/WeatherFaxImage.cpp:454 +#: src/WeatherFaxImage.cpp:441 src/WeatherFaxImage.cpp:455 msgid "Mapping Failed" msgstr "" -#: src/WeatherFaxImage.cpp:451 +#: src/WeatherFaxImage.cpp:452 #, c-format -msgid "Resulting image larger than %dMB\nTry changing size parameter to a smaller value. (less than %.2f)\naborting\n" +msgid "Resulting image larger than %dMB\n" +"Try changing size parameter to a smaller value. (less than %.2f)\n" +"aborting\n" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Mapping Weather Fax Image" msgstr "" -#: src/WeatherFaxImage.cpp:462 +#: src/WeatherFaxImage.cpp:463 msgid "Weather Fax Mapper" msgstr "" -#: src/WeatherFaxImage.cpp:595 +#: src/WeatherFaxImage.cpp:596 msgid "Graphics hardware not supported (Disable OpenGL)\n" msgstr "" -#: src/weatherfax_pi.cpp:85 src/weatherfax_pi.cpp:143 +#: src/weatherfax_pi.cpp:84 src/weatherfax_pi.cpp:146 msgid "WeatherFax" msgstr "" -#: src/weatherfax_pi.cpp:148 +#: src/weatherfax_pi.cpp:151 msgid "Weather Fax PlugIn for OpenCPN" msgstr "" -#: src/weatherfax_pi.cpp:153 -msgid "Weather Fax PlugIn for OpenCPN\nCan open image files directly, or decode audio faxes to an image.\nWith simple calibration, resulting image is overlaid on top of charts.\nConverts images in mercator, polar, conic and uniform coordinates.\nCan convert any image into a raster chart.\nBuiltin database for HF radio fax stations via SSB.\nBuiltin database for internet retrieval from meterological sites.\n" +#: src/weatherfax_pi.cpp:156 +msgid "Weather Fax PlugIn for OpenCPN\n" +"Can open image files directly, or decode audio faxes to an image.\n" +"With simple calibration, resulting image is overlaid on top of charts.\n" +"Converts images in mercator, polar, conic and uniform coordinates.\n" +"Can convert any image into a raster chart.\n" +"Builtin database for HF radio fax stations via SSB.\n" +"Builtin database for internet retrieval from meterological sites.\n" msgstr "" -#: src/weatherfax_pi.cpp:318 +#: src/weatherfax_pi.cpp:324 msgid "WeatherFax Preferences" msgstr "" diff -Nru opencpn-plugin-weatherfax-1.3.1/README opencpn-plugin-weatherfax-1.5001.0/README --- opencpn-plugin-weatherfax-1.3.1/README 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/README 2016-02-25 19:25:30.000000000 +0000 @@ -5,7 +5,6 @@ Compiling ========= -Normally the libcurl4-dev (libcurl4-gnutls-dev) package should be installed, for Windows operating system, see below * git clone git://github.com/seandepagnier/weatherfax_pi.git @@ -14,7 +13,7 @@ * cd .. * cd build -* cmake .. +* cmake .. # To produce a binary compatible with Windows XP, you must set the respective toolset - use 'cmake -T v120_xp ..' * make * make install @@ -25,10 +24,19 @@ Under windows, you must find the file "opencpn.lib" (Visual Studio) or "libopencpn.dll.a" (mingw) which is built in the build directory after compiling opencpn. This file must be copied to the plugin directory. There are also some libraries and an external program needed: -http://sourceforge.net/projects/opencpnplugins/files/weatherfax_pi/wf_depends.7z/download +http://sourceforge.net/projects/opencpnplugins/files/opencpn_packaging_data/portaudio-vc12.7z/download +http://sourceforge.net/projects/opencpnplugins/files/opencpn_packaging_data/PVW32Con.exe/download (not an archive, this one just copy to buildwin) and unpack all these files into the buildwin directory as the compile is dependent on these. -For Mingw, only a single file "libcurl.dll" is needed for libcurl, for visual studio, several files. +OSX Specific Libraries +========================== +The OS X compilation is dependent on these files + +Under OS X the port audio library is needed. Install it using ```brew install portaudio``` +There is a zip file containing header and library files: +http://sourceforge.net/projects/opencpnplugins/files/weatherfax_pi/OSXportaudiofiles.zip/download +Download this file and unzip it in the /usr/local directory as the compile is dependent on these. +The make create-pkg command will include the library in the package. License ======= diff -Nru opencpn-plugin-weatherfax-1.3.1/src/DecoderOptionsDialog.cpp opencpn-plugin-weatherfax-1.5001.0/src/DecoderOptionsDialog.cpp --- opencpn-plugin-weatherfax-1.3.1/src/DecoderOptionsDialog.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/DecoderOptionsDialog.cpp 2016-02-25 19:25:30.000000000 +0000 @@ -5,8 +5,7 @@ * Author: Sean D'Epagnier * *************************************************************************** - * Copyright (C) 2014 by Sean D'Epagnier * - * sean at depagnier dot com * + * Copyright (C) 2015 by Sean D'Epagnier * * * * 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 * @@ -50,12 +49,19 @@ origwidth = m_sImageWidth->GetValue(); + FaxDecoder &decoder = m_wizard.m_decoder; + + if(decoder.m_Filename.empty()) + m_sDeviceIndex->SetValue(pConf->Read ( _T ( "CaptureDeviceIndex" ), -1L )); + ConfigureDecoder(true); - FaxDecoder &decoder = m_wizard.m_decoder; bool capture = decoder.m_inputtype != FaxDecoder::FILENAME; m_cSampleRate->Enable(capture); + m_sDeviceIndex->Enable(capture); + m_sDeviceIndex->SetRange(0, decoder.DeviceCount() - 1); + if(!capture) { m_cSampleRate->Insert(wxString::Format(_T("%d"), decoder.m_SampleRate), 0); m_cSampleRate->SetSelection(0); @@ -83,11 +89,17 @@ pConf->Write ( _T ( "SkipHeaderDetection" ), m_cbSkip->GetValue()); pConf->Write ( _T ( "IncludeHeadersInImage" ), m_cbInclude->GetValue()); + FaxDecoder &decoder = m_wizard.m_decoder; + bool capture = decoder.m_inputtype != FaxDecoder::FILENAME; + if(capture) + pConf->Write ( _T ( "CaptureDeviceIndex" ), m_sDeviceIndex->GetValue()); + Hide(); + EndModal(wxID_OK); - FaxDecoder &decoder = m_wizard.m_decoder; if(origwidth != m_sImageWidth->GetValue() || - (decoder.m_inputtype == FaxDecoder::FILENAME && spin_options_changed)) { + decoder.m_DeviceIndex != m_sDeviceIndex->GetValue() || + (!capture && spin_options_changed)) { origwidth = m_sImageWidth->GetValue(); ResetDecoder(); } @@ -121,9 +133,11 @@ (enum FaxDecoder::firfilter::Bandwidth)m_cFilter->GetSelection(), (double)-m_sMinusSaturationThreshold->GetValue()/10 - 1, m_cbSkip->GetValue(), m_cbInclude->GetValue(), - samplerate, reset)) { + samplerate, m_sDeviceIndex->GetValue(), reset)) { wxMessageDialog w( NULL, _("Failed to configure capture."), _("Failure"), wxOK | wxICON_ERROR ); w.ShowModal(); } + + m_sDeviceIndex->SetValue(decoder.m_DeviceIndex); } diff -Nru opencpn-plugin-weatherfax-1.3.1/src/DecoderOptionsDialog.h opencpn-plugin-weatherfax-1.5001.0/src/DecoderOptionsDialog.h --- opencpn-plugin-weatherfax-1.3.1/src/DecoderOptionsDialog.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/DecoderOptionsDialog.h 2016-02-25 19:25:30.000000000 +0000 @@ -5,8 +5,7 @@ * Author: Sean D'Epagnier * *************************************************************************** - * Copyright (C) 2014 by Sean D'Epagnier * - * sean at depagnier dot com * + * Copyright (C) 2015 by Sean D'Epagnier * * * * 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 * diff -Nru opencpn-plugin-weatherfax-1.3.1/src/FaxDecoder.cpp opencpn-plugin-weatherfax-1.5001.0/src/FaxDecoder.cpp --- opencpn-plugin-weatherfax-1.3.1/src/FaxDecoder.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/FaxDecoder.cpp 2016-02-25 19:25:30.000000000 +0000 @@ -5,8 +5,7 @@ * Author: Sean D'Epagnier * *************************************************************************** - * Copyright (C) 2014 by Sean D'Epagnier * - * sean at depagnier dot com * + * Copyright (C) 2015 by Sean D'Epagnier * * * * 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 * @@ -39,7 +38,7 @@ int deviation, enum firfilter::Bandwidth bandwidth, double minus_saturation_threshold, bool bSkipHeaderDetection, bool bIncludeHeadersInImages, - int SampleRate, bool reset) + int SampleRate, int DeviceIndex, bool reset) { /* pause decoder */ m_DecoderStopMutex.Lock(); @@ -69,9 +68,10 @@ m_minus_saturation_threshold = minus_saturation_threshold; bool ret = true; - if(m_SampleRate != SampleRate || reset) { + if(m_SampleRate != SampleRate || m_DeviceIndex != DeviceIndex || reset) { CleanUpBuffers(); m_SampleRate = SampleRate; + m_DeviceIndex = DeviceIndex; m_DecoderReloadMutex.Lock(); CloseInput(); @@ -101,10 +101,18 @@ return ret; } -/* Note: the decoding algorithms are adapted from yahfax (on sourceforge) - which was an improved adaptation of hamfax. -*/ +int FaxDecoder::DeviceCount() +{ + switch(m_inputtype) { +#ifdef OCPN_USE_PORTAUDIO + case PORTAUDIO: return Pa_GetDeviceCount(); +#endif + default: return 1; + } +} +/* Note: the decoding algorithms are adapted from yahfax (on sourceforge) + which was an improved adaptation of hamfax. */ bool FaxDecoder::Error(wxString error) { wxMessageDialog w( &m_parent, _("Failure Decoding Fax: ") + error, _("Failed"), @@ -199,7 +207,7 @@ retr += buffer[n]*cos(k*n); reti += buffer[n]*sin(k*n); } - return hypot(retr, reti); + return sqrt(retr*retr + reti*reti); } /* see if the fourier transform at the start and stop frequencies reveils header */ @@ -312,7 +320,6 @@ #ifdef OCPN_USE_PORTAUDIO case PORTAUDIO: Pa_CloseStream( pa_stream ); -// delete [] pa_data; break; #endif default:; @@ -493,7 +500,7 @@ #ifdef OCPN_USE_PORTAUDIO PaError err = Pa_Initialize(); if( err != paNoError ) { - printf( "PortAudio CTOR error: %s\n", Pa_GetErrorText( err ) ); + printf( "PortAudio Initialize() error: %s\n", Pa_GetErrorText( err ) ); return false; } @@ -503,36 +510,49 @@ case 1: sampleformat = paInt8; break; case 2: sampleformat = paInt16; break; default: - printf( "invalid sample size: %d\n", m_SampleSize); + printf( "invalid sample size for capture: %d\n", m_SampleSize); return false; } - err = Pa_OpenDefaultStream( &pa_stream, - 1, /* mono input */ - 0, /* no output channels */ - sampleformat, - m_SampleRate, - m_blocksize, - 0, 0); - if( err != paNoError ) { - printf( "PortAudio Create() error: %s\n", Pa_GetErrorText( err ) ); - return false; - } + if(m_DeviceIndex == -1) + m_DeviceIndex = Pa_GetDefaultInputDevice(); - err = Pa_StartStream( pa_stream ); - if( err != paNoError ) { - Pa_CloseStream( pa_stream ); - printf( "PortAudio Start() error: %s\n", Pa_GetErrorText( err ) ); - return false; - } + while(m_DeviceIndex < Pa_GetDeviceCount()) { + PaStreamParameters inputParameters; + inputParameters.device = m_DeviceIndex; + inputParameters.channelCount = 1; /* mono input */ + inputParameters.sampleFormat = sampleformat; + inputParameters.suggestedLatency = 0; + inputParameters.hostApiSpecificStreamInfo = NULL; + + err = Pa_OpenStream( &pa_stream, + &inputParameters, + NULL, /* no output channels */ + m_SampleRate, + m_blocksize, + paNoFlag, + NULL, NULL); + + if( err == paNoError ) { + err = Pa_StartStream( pa_stream ); + if( err != paNoError ) { + Pa_CloseStream( pa_stream ); + printf( "PortAudio StartStream() error: %s\n", Pa_GetErrorText( err ) ); + return false; + } - m_inputtype = PORTAUDIO; - size = 0; + m_inputtype = PORTAUDIO; + size = 0; - return true; -#else - return false; + return true; + } + + m_DeviceIndex++; // try next device + } + + printf( "PortAudio OpenStream() error: %s\n", Pa_GetErrorText( err ) ); #endif + return false; } bool FaxDecoder::DecodeFaxFromDSP() diff -Nru opencpn-plugin-weatherfax-1.3.1/src/FaxDecoder.h opencpn-plugin-weatherfax-1.5001.0/src/FaxDecoder.h --- opencpn-plugin-weatherfax-1.3.1/src/FaxDecoder.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/FaxDecoder.h 2016-02-25 19:25:30.000000000 +0000 @@ -5,8 +5,7 @@ * Author: Sean D'Epagnier * *************************************************************************** - * Copyright (C) 2014 by Sean D'Epagnier * - * sean at depagnier dot com * + * Copyright (C) 2015 by Sean D'Epagnier * * * * 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 * @@ -54,15 +53,16 @@ FaxDecoder(wxWindow &parent, wxString filename) : m_imgdata(NULL), m_imagewidth(-1), m_inputtype(NONE), datadouble(NULL), - m_SampleRate(0), m_parent(parent), - m_Filename(filename), sample(NULL), data(NULL), phasingPos(NULL) {} + m_SampleRate(0), m_DeviceIndex(0), m_Filename(filename), + m_parent(parent), sample(NULL), data(NULL), phasingPos(NULL) {} ~FaxDecoder() { FreeImage(); CleanUpBuffers(); } bool Configure(int imagewidth, int BitsPerPixel, int carrier, int deviation, enum firfilter::Bandwidth bandwidth, double minus_saturation_threshold, bool bSkipHeaderDetection, bool bIncludeHeadersInImages, - int SampleRate, bool reset); + int SampleRate, int DeviceIndex, bool reset); + int DeviceCount(); bool DecodeFaxFromFilename(wxString filename); bool DecodeFaxFromDSP(); @@ -89,7 +89,9 @@ double m_minus_saturation_threshold; enum InputType {NONE, FILENAME, DSP, PORTAUDIO} m_inputtype; double *datadouble; - int m_SampleRate; + int m_SampleRate, m_DeviceIndex; + + wxString m_Filename; private: wxWindow &m_parent; @@ -103,7 +105,6 @@ #ifdef OCPN_USE_PORTAUDIO PaStream *pa_stream; -// int16_t *pa_data; #endif enum Header {IMAGE, START, STOP}; @@ -128,8 +129,6 @@ int m_StartLength, m_StopLength; int m_phasingLines; - wxString m_Filename; - /* internal state machine */ wxInt16 *sample; wxUint8 *data; diff -Nru opencpn-plugin-weatherfax-1.3.1/src/InternetRetrievalDialog.cpp opencpn-plugin-weatherfax-1.5001.0/src/InternetRetrievalDialog.cpp --- opencpn-plugin-weatherfax-1.3.1/src/InternetRetrievalDialog.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/InternetRetrievalDialog.cpp 2016-02-25 19:25:30.000000000 +0000 @@ -6,7 +6,6 @@ * *************************************************************************** * Copyright (C) 2014 by Sean D'Epagnier * - * sean at depagnier dot com * * * * 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 * @@ -33,7 +32,6 @@ #include -#include "wx/curl/dialog.h" #include "tinyxml/tinyxml.h" #include "weatherfax_pi.h" @@ -222,7 +220,7 @@ wxDateTime now = wxDateTime::UNow(); if((now-start).GetMilliseconds() > 500 && i < count/3) { progressdialog = new wxProgressDialog( - _("WeatherFax InternetRetrieval"), _("Loading"), count, this, + _("WeatherFax Internet Retrieval"), _("Loading"), count, this, wxPD_CAN_ABORT | wxPD_ELAPSED_TIME | wxPD_REMAINING_TIME); } } @@ -581,60 +579,15 @@ } { -#if 0 - wxProgressDialog progressdialog(_("WeatherFax InternetRetrieval"), - _("Reading Headers: ") + faxurl->Contents, 1000, this, - wxPD_CAN_ABORT | wxPD_ELAPSED_TIME | wxPD_REMAINING_TIME); - progressdialog.Update(0); - - DownloadThread *dl = new DownloadThread(faxurl->Url, filename); - dl->Run(); - - while(dl->IsRunning()) { - bool ok; - if(dl->size) - ok = progressdialog.Update(1000*dl->position / dl->size, - _("Reading") + wxString(_T(": ")) - + faxurl->Contents); - else - ok = progressdialog.Update(0); - if(!ok) { - dl->please_quit = true; - return; - } - wxThread::Sleep(250); - } - - dl->please_quit = true; - switch(dl->exitcode) { - case 1: - case 2: - { - wxMessageDialog mdlg(this, _("Timed out waiting for headers for: ") + - faxurl->Contents + _T("\n") + faxurl->Url + _T("\n") + - _("Verify there is a working internet connection.") + _T("\n") + - _("Possibly the server is down temporarily.") + _T("\n") + - _("If the url is incorrect please edit the xml and/or post a bug report."), - _("Weather Fax"), wxOK | wxICON_ERROR); - mdlg.ShowModal(); - } return; - case 3: - { wxMessageDialog mdlg(this, _("Failed to read file size aborting."), - _("Weather Fax"), wxOK | wxICON_INFORMATION); - mdlg.ShowModal(); - } return; - } -#else + _OCPN_DLStatus res = OCPN_downloadFile( faxurl->Url, filename, _("WeatherFax InternetRetrieval"), + _("Reading Headers: ") + faxurl->Contents, wxNullBitmap, this, + OCPN_DLDS_CAN_PAUSE|OCPN_DLDS_CAN_ABORT|OCPN_DLDS_SHOW_ALL|OCPN_DLDS_AUTO_CLOSE, 10 ); - wxFileOutputStream output(filename); - wxCurlDownloadDialog ddlg(faxurl->Url, &output, _("WeatherFax InternetRetrieval"), - _("Reading Headers: ") + faxurl->Contents, wxNullBitmap, this, - wxCTDS_CAN_PAUSE|wxCTDS_CAN_ABORT|wxCTDS_SHOW_ALL|wxCTDS_AUTO_CLOSE); - - switch(ddlg.RunModal()) { - case wxCDRF_SUCCESS: break; - case wxCDRF_FAILED: + switch( res ) + { + case OCPN_DL_NO_ERROR: break; + case OCPN_DL_FAILED: { wxMessageDialog mdlg(this, _("Failed to Download: ") + faxurl->Contents + _T("\n") + @@ -645,9 +598,8 @@ mdlg.ShowModal(); wxRemoveFile( filename ); } - case wxCDRF_USER_ABORTED: return; + case OCPN_DL_ABORTED: return; } -#endif } loadimage: diff -Nru opencpn-plugin-weatherfax-1.3.1/src/InternetRetrievalDialog.h opencpn-plugin-weatherfax-1.5001.0/src/InternetRetrievalDialog.h --- opencpn-plugin-weatherfax-1.3.1/src/InternetRetrievalDialog.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/InternetRetrievalDialog.h 2016-02-25 19:25:30.000000000 +0000 @@ -6,7 +6,6 @@ * *************************************************************************** * Copyright (C) 2014 by Sean D'Epagnier * - * sean at depagnier dot com * * * * 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 * diff -Nru opencpn-plugin-weatherfax-1.3.1/src/libaudiofile/modules/IMA.cpp opencpn-plugin-weatherfax-1.5001.0/src/libaudiofile/modules/IMA.cpp --- opencpn-plugin-weatherfax-1.3.1/src/libaudiofile/modules/IMA.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/libaudiofile/modules/IMA.cpp 2016-02-25 19:25:30.000000000 +0000 @@ -38,6 +38,7 @@ #include "byteorder.h" #include "util.h" #include "../pcm.h" +#include struct adpcmState { diff -Nru opencpn-plugin-weatherfax-1.3.1/src/libaudiofile/modules/MSADPCM.cpp opencpn-plugin-weatherfax-1.5001.0/src/libaudiofile/modules/MSADPCM.cpp --- opencpn-plugin-weatherfax-1.3.1/src/libaudiofile/modules/MSADPCM.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/libaudiofile/modules/MSADPCM.cpp 2016-02-25 19:25:30.000000000 +0000 @@ -40,6 +40,7 @@ #include "byteorder.h" #include "util.h" #include "../pcm.h" +#include struct ms_adpcm_state { diff -Nru opencpn-plugin-weatherfax-1.3.1/src/ocpn_plugin.h opencpn-plugin-weatherfax-1.5001.0/src/ocpn_plugin.h --- opencpn-plugin-weatherfax-1.3.1/src/ocpn_plugin.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/ocpn_plugin.h 2016-02-25 19:25:30.000000000 +0000 @@ -1,11 +1,11 @@ -/****************************************************************************** +/*************************************************************************** * * Project: OpenCPN * Purpose: PlugIn Object Definition/API * Author: David Register * *************************************************************************** - * Copyright (C) 2010 by David S. Register * + * Copyright (C) 2010 by David S. Register * * * * 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 * @@ -20,43 +20,40 @@ * 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. * - *************************************************************************** - * - */ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + **************************************************************************/ + #ifndef _PLUGIN_H_ #define _PLUGIN_H_ - #ifndef DECL_EXP #ifdef __WXMSW__ # define DECL_EXP __declspec(dllexport) #else -# define DECL_EXP +# ifdef __GNUC__ +# define DECL_EXP __attribute__((visibility("default"))) +# endif #endif #endif -#ifdef __GNUC__ -#undef DECL_EXP -#define DECL_EXP __attribute__((visibility("default"))) -#endif - #include -#include + +class wxGLContext; // This is the most modern API Version number // It is expected that the API will remain downward compatible, meaning that // PlugIns conforming to API Version less then the most modern will also // be correctly supported. #define API_VERSION_MAJOR 1 -#define API_VERSION_MINOR 9 +#define API_VERSION_MINOR 13 // Fwd Definitions class wxFileConfig; class wxNotebook; class wxFont; class wxAuiManager; +class wxScrolledWindow; //--------------------------------------------------------------------------------------------------------- // @@ -80,6 +77,11 @@ #define WANTS_PLUGIN_MESSAGING 0x00004000 #define WANTS_OPENGL_OVERLAY_CALLBACK 0x00008000 #define WANTS_DYNAMIC_OPENGL_OVERLAY_CALLBACK 0x00010000 +#define WANTS_LATE_INIT 0x00020000 +#define INSTALLS_PLUGIN_CHART_GL 0x00040000 +#define WANTS_MOUSE_EVENTS 0x00080000 +#define WANTS_VECTOR_CHART_OBJECT_INFO 0x00100000 +#define WANTS_KEYBOARD_EVENTS 0x00200000 //---------------------------------------------------------------------------------------------------------- // Some PlugIn API interface object class definitions @@ -299,7 +301,8 @@ virtual int GetSize_X(); virtual int GetSize_Y(); virtual void latlong_to_chartpix(double lat, double lon, double &pixx, double &pixy); - + virtual void chartpix_to_latlong(double pixx, double pixy, double *plat, double *plon); + protected: ChartTypeEnumPI m_ChartType; ChartFamilyEnumPI m_ChartFamily; @@ -408,7 +411,6 @@ virtual void UpdateAuiStatus(void); virtual wxArrayString GetDynamicChartClassNameArray(void); - }; @@ -464,6 +466,119 @@ virtual void OnSetupOptions(void); }; +class DECL_EXP opencpn_plugin_110 : public opencpn_plugin_19 +{ + public: + opencpn_plugin_110(void *pmgr); + virtual ~opencpn_plugin_110(); + + virtual void LateInit(void); // If WANTS_LATE_INIT is returned by Init() +}; + +class DECL_EXP opencpn_plugin_111 : public opencpn_plugin_110 +{ +public: + opencpn_plugin_111(void *pmgr); + virtual ~opencpn_plugin_111(); + +}; + +class DECL_EXP opencpn_plugin_112 : public opencpn_plugin_111 +{ +public: + opencpn_plugin_112(void *pmgr); + virtual ~opencpn_plugin_112(); + + virtual bool MouseEventHook( wxMouseEvent &event ); + virtual void SendVectorChartObjectInfo(wxString &chart, wxString &feature, wxString &objname, double lat, double lon, double scale, int nativescale); + +}; + +class DECL_EXP opencpn_plugin_113 : public opencpn_plugin_112 +{ +public: + opencpn_plugin_113(void *pmgr); + virtual ~opencpn_plugin_113(); + + virtual bool KeyboardEventHook( wxKeyEvent &event ); + virtual void OnToolbarToolDownCallback(int id); + virtual void OnToolbarToolUpCallback(int id); +}; + +//------------------------------------------------------------------ +// Route and Waypoint PlugIn support +// +//------------------------------------------------------------------ + +class DECL_EXP Plugin_Hyperlink +{ +public: + wxString DescrText; + wxString Link; + wxString Type; +}; + +WX_DECLARE_LIST(Plugin_Hyperlink, Plugin_HyperlinkList); + + + +class DECL_EXP PlugIn_Waypoint +{ +public: + PlugIn_Waypoint(); + PlugIn_Waypoint(double lat, double lon, + const wxString& icon_ident, const wxString& wp_name, + const wxString& GUID = _T("") ); + ~PlugIn_Waypoint(); + + double m_lat; + double m_lon; + + wxString m_GUID; + + wxString m_MarkName; + wxString m_MarkDescription; + wxDateTime m_CreateTime; + bool m_IsVisible; + + wxString m_IconName; + + Plugin_HyperlinkList *m_HyperlinkList; + +}; + +WX_DECLARE_LIST(PlugIn_Waypoint, Plugin_WaypointList); + +class DECL_EXP PlugIn_Route +{ +public: + PlugIn_Route(void); + ~PlugIn_Route(void); + + wxString m_NameString; + wxString m_StartString; + wxString m_EndString; + wxString m_GUID; + + Plugin_WaypointList *pWaypointList; +}; + +class DECL_EXP PlugIn_Track +{ +public: + PlugIn_Track(void); + ~PlugIn_Track(void); + + wxString m_NameString; + wxString m_StartString; + wxString m_EndString; + wxString m_GUID; + + Plugin_WaypointList *pWaypointList; +}; + + + //---------------------------------------------------------------------------------------------------------- // The PlugIn CallBack API Definition // @@ -522,20 +637,24 @@ extern "C" DECL_EXP void JumpToPosition(double lat, double lon, double scale); -/* API 1.9 adds some common cartographic fucntions to avoid unnecessary code duplication */ +/* API 1.9 adds some common cartographic functions to avoid unnecessary code duplication */ /* Study the original OpenCPN source (georef.c) for functional definitions */ -extern "C" void DistanceBearingMercator(double lat0, double lon0, double lat1, double lon1, double *brg, double *dist); -extern "C" double DistGreatCircle(double slat, double slon, double dlat, double dlon); - -extern "C" void toTM(float lat, float lon, float lat0, float lon0, double *x, double *y); -extern "C" void fromTM(double x, double y, double lat0, double lon0, double *lat, double *lon); -extern "C" void toSM(double lat, double lon, double lat0, double lon0, double *x, double *y); -extern "C" void fromSM(double x, double y, double lat0, double lon0, double *lat, double *lon); -extern "C" void toSM_ECC(double lat, double lon, double lat0, double lon0, double *x, double *y); -extern "C" void fromSM_ECC(double x, double y, double lat0, double lon0, double *lat, double *lon); +extern "C" DECL_EXP void PositionBearingDistanceMercator_Plugin(double lat, double lon, double brg, double dist, double *dlat, double *dlon); +extern "C" DECL_EXP void DistanceBearingMercator_Plugin(double lat0, double lon0, double lat1, double lon1, double *brg, double *dist); +extern "C" DECL_EXP double DistGreatCircle_Plugin(double slat, double slon, double dlat, double dlon); + +extern "C" DECL_EXP void toTM_Plugin(float lat, float lon, float lat0, float lon0, double *x, double *y); +extern "C" DECL_EXP void fromTM_Plugin(double x, double y, double lat0, double lon0, double *lat, double *lon); +extern "C" DECL_EXP void toSM_Plugin(double lat, double lon, double lat0, double lon0, double *x, double *y); +extern "C" DECL_EXP void fromSM_Plugin(double x, double y, double lat0, double lon0, double *lat, double *lon); +extern "C" DECL_EXP void toSM_ECC_Plugin(double lat, double lon, double lat0, double lon0, double *x, double *y); +extern "C" DECL_EXP void fromSM_ECC_Plugin(double x, double y, double lat0, double lon0, double *lat, double *lon); extern "C" DECL_EXP bool DecodeSingleVDOMessage( const wxString& str, PlugIn_Position_Fix_Ex *pos, wxString *acc ); +extern "C" DECL_EXP int GetChartbarHeight( void ); +extern "C" DECL_EXP bool GetActiveRoutepointGPX( char *buffer, unsigned int buffer_length ); + /* API 1.9 */ @@ -548,11 +667,472 @@ PI_OPTIONS_PARENT_UI, PI_OPTIONS_PARENT_PLUGINS }_OptionsParentPI; -extern DECL_EXP wxScrolledWindow *AddOptionsPage( OptionsParentPI parent, wxString title ); +extern DECL_EXP wxScrolledWindow *AddOptionsPage( OptionsParentPI parent, wxString title ); extern DECL_EXP bool DeleteOptionsPage( wxScrolledWindow* page ); -extern "C" DECL_EXP int GetChartbarHeight( void ); -extern "C" DECL_EXP bool GetActiveRoutepointGPX( char *buffer, unsigned int buffer_length ); -#endif // _PLUGIN_H_ +/* API 1.10 */ + +/* API 1.10 adds some common functions to avoid unnecessary code duplication */ +/* Study the original OpenCPN source for functional definitions */ +extern "C" DECL_EXP double toUsrDistance_Plugin( double nm_distance, int unit = -1 ); +extern "C" DECL_EXP double fromUsrDistance_Plugin( double usr_distance, int unit = -1 ); +extern "C" DECL_EXP double toUsrSpeed_Plugin( double kts_speed, int unit = -1 ); +extern "C" DECL_EXP double fromUsrSpeed_Plugin( double usr_speed, int unit = -1 ); +extern DECL_EXP wxString getUsrDistanceUnit_Plugin( int unit = -1 ); +extern DECL_EXP wxString getUsrSpeedUnit_Plugin( int unit = -1 ); +extern DECL_EXP wxString GetNewGUID(); +extern "C" DECL_EXP bool PlugIn_GSHHS_CrossesLand(double lat1, double lon1, double lat2, double lon2); +extern DECL_EXP void PlugInPlaySound( wxString &sound_file ); + + + + +// API 1.10 Route and Waypoint Support +extern DECL_EXP wxBitmap *FindSystemWaypointIcon( wxString& icon_name ); +extern DECL_EXP bool AddCustomWaypointIcon( wxBitmap *pimage, wxString key, wxString description ); + +extern DECL_EXP bool AddSingleWaypoint( PlugIn_Waypoint *pwaypoint, bool b_permanent = true); +extern DECL_EXP bool DeleteSingleWaypoint( wxString &GUID ); +extern DECL_EXP bool UpdateSingleWaypoint( PlugIn_Waypoint *pwaypoint ); + +extern DECL_EXP bool AddPlugInRoute( PlugIn_Route *proute, bool b_permanent = true ); +extern DECL_EXP bool DeletePlugInRoute( wxString& GUID ); +extern DECL_EXP bool UpdatePlugInRoute ( PlugIn_Route *proute ); + +extern DECL_EXP bool AddPlugInTrack( PlugIn_Track *ptrack, bool b_permanent = true ); +extern DECL_EXP bool DeletePlugInTrack( wxString& GUID ); +extern DECL_EXP bool UpdatePlugInTrack ( PlugIn_Track *ptrack ); + +/* API 1.11 */ + +/* API 1.11 adds some more common functions to avoid unnecessary code duplication */ +wxColour DECL_EXP GetBaseGlobalColor(wxString colorName); +int DECL_EXP OCPNMessageBox_PlugIn(wxWindow *parent, + const wxString& message, + const wxString& caption = _T("Message"), + int style = wxOK, int x = -1, int y = -1); + +extern DECL_EXP wxString toSDMM_PlugIn(int NEflag, double a, bool hi_precision = true); + +extern "C" DECL_EXP wxString *GetpPrivateApplicationDataLocation(); +extern DECL_EXP wxString GetOCPN_ExePath( void ); +extern "C" DECL_EXP wxString *GetpPlugInLocation(); +extern DECL_EXP wxString GetPlugInPath(opencpn_plugin *pplugin); + +extern "C" DECL_EXP int AddChartToDBInPlace( wxString &full_path, bool b_RefreshCanvas ); +extern "C" DECL_EXP int RemoveChartFromDBInPlace( wxString &full_path ); + + +// API 1.11 adds access to S52 Presentation library +//Types + +// A flag field that defines the object capabilities passed by a chart to the S52 PLIB + +#define PLIB_CAPS_LINE_VBO 1 +#define PLIB_CAPS_LINE_BUFFER 1 << 1 +#define PLIB_CAPS_SINGLEGEO_BUFFER 1 << 2 +#define PLIB_CAPS_OBJSEGLIST 1 << 3 +#define PLIB_CAPS_OBJCATMUTATE 1 << 4 + + +class PI_S57Obj; + +WX_DECLARE_LIST(PI_S57Obj, ListOfPI_S57Obj); + +// ---------------------------------------------------------------------------- +// PlugInChartBaseGL +// Derived from PlugInChartBase, add OpenGL Vector chart support +// ---------------------------------------------------------------------------- + +class DECL_EXP PlugInChartBaseGL : public PlugInChartBase +{ +public: + PlugInChartBaseGL(); + virtual ~PlugInChartBaseGL(); + + virtual int RenderRegionViewOnGL( const wxGLContext &glc, const PlugIn_ViewPort& VPoint, + const wxRegion &Region, bool b_use_stencil ); + + virtual ListOfPI_S57Obj *GetObjRuleListAtLatLon(float lat, float lon, float select_radius, PlugIn_ViewPort *VPoint); + virtual wxString CreateObjDescriptions( ListOfPI_S57Obj* obj_list ); + + virtual int GetNoCOVREntries(); + virtual int GetNoCOVRTablePoints(int iTable); + virtual int GetNoCOVRTablenPoints(int iTable); + virtual float *GetNoCOVRTableHead(int iTable); + +}; + + + + + + + +class wxArrayOfS57attVal; + +// name of the addressed look up table set (fifth letter) +typedef enum _PI_LUPname{ + PI_SIMPLIFIED = 'L', // points + PI_PAPER_CHART = 'R', // points + PI_LINES = 'S', // lines + PI_PLAIN_BOUNDARIES = 'N', // areas + PI_SYMBOLIZED_BOUNDARIES = 'O', // areas + PI_LUPNAME_NUM = 5 +}PI_LUPname; + +// display category type +typedef enum _PI_DisCat{ + PI_DISPLAYBASE = 'D', // + PI_STANDARD = 'S', // + PI_OTHER = 'O', // O for OTHER + PI_MARINERS_STANDARD = 'M', // Mariner specified + PI_MARINERS_OTHER, // value not defined + PI_DISP_CAT_NUM, // value not defined +}PI_DisCat; + +// Display Priority +typedef enum _PI_DisPrio{ + PI_PRIO_NODATA = '0', // no data fill area pattern + PI_PRIO_GROUP1 = '1', // S57 group 1 filled areas + PI_PRIO_AREA_1 = '2', // superimposed areas + PI_PRIO_AREA_2 = '3', // superimposed areas also water features + PI_PRIO_SYMB_POINT = '4', // point symbol also land features + PI_PRIO_SYMB_LINE = '5', // line symbol also restricted areas + PI_PRIO_SYMB_AREA = '6', // area symbol also traffic areas + PI_PRIO_ROUTEING = '7', // routeing lines + PI_PRIO_HAZARDS = '8', // hazards + PI_PRIO_MARINERS = '9', // VRM, EBL, own ship + PI_PRIO_NUM = 10 // number of priority levels + +}PI_DisPrio; + +typedef enum PI_InitReturn +{ + PI_INIT_OK = 0, + PI_INIT_FAIL_RETRY, // Init failed, retry suggested + PI_INIT_FAIL_REMOVE, // Init failed, suggest remove from further use + PI_INIT_FAIL_NOERROR // Init failed, request no explicit error message +}_PI_InitReturn; + +class PI_line_segment_element +{ +public: + size_t vbo_offset; + size_t n_points; + int priority; + float lat_max; // segment bounding box + float lat_min; + float lon_max; + float lon_min; + void *private0; + int type; + + PI_line_segment_element *next; +}; + + +class DECL_EXP PI_S57Obj +{ +public: + + // Public Methods + PI_S57Obj(); + ~PI_S57Obj(); + +public: + // Instance Data + char FeatureName[8]; + int Primitive_type; + + char *att_array; + wxArrayOfS57attVal *attVal; + int n_attr; + + int iOBJL; + int Index; + + double x; // for POINT + double y; + double z; + int npt; // number of points as needed by arrays + void *geoPt; // for LINE & AREA not described by PolyTessGeo + double *geoPtz; // an array[3] for MultiPoint, SM with Z, i.e. depth + double *geoPtMulti; // an array[2] for MultiPoint, lat/lon to make bbox + // of decomposed points + + void *pPolyTessGeo; + + double m_lat; // The lat/lon of the object's "reference" point + double m_lon; + + double chart_ref_lat; + double chart_ref_lon; + + double lat_min; + double lat_max; + double lon_min; + double lon_max; + + int Scamin; // SCAMIN attribute decoded during load + + bool bIsClone; + int nRef; // Reference counter, to signal OK for deletion + + bool bIsAton; // This object is an aid-to-navigation + bool bIsAssociable; // This object is DRGARE or DEPARE + + int m_n_lsindex; + int *m_lsindex_array; + int m_n_edge_max_points; + void *m_chart_context; + + PI_DisCat m_DisplayCat; + + void * S52_Context; + PI_S57Obj *child; // child list, used only for MultiPoint Soundings + + PI_S57Obj *next; // List linkage + + // This transform converts from object geometry + // to SM coordinates. + double x_rate; // These auxiliary transform coefficients are + double y_rate; // to be used in GetPointPix() and friends + double x_origin; // on a per-object basis if necessary + double y_origin; + + int auxParm0; // some per-object auxiliary parameters, used for OpenGL + int auxParm1; + int auxParm2; + int auxParm3; + + PI_line_segment_element *m_ls_list; + bool m_bcategory_mutable; + int m_DPRI; +}; + + + +wxString DECL_EXP PI_GetPLIBColorScheme(); +int DECL_EXP PI_GetPLIBDepthUnitInt(); +int DECL_EXP PI_GetPLIBSymbolStyle(); +int DECL_EXP PI_GetPLIBBoundaryStyle(); +int DECL_EXP PI_GetPLIBStateHash(); +double DECL_EXP PI_GetPLIBMarinerSafetyContour(); +bool DECL_EXP PI_GetObjectRenderBox( PI_S57Obj *pObj, double *lat_min, double *lat_max, double *lon_min, double *lon_max); +void DECL_EXP PI_UpdateContext(PI_S57Obj *pObj); + +bool DECL_EXP PI_PLIBObjectRenderCheck( PI_S57Obj *pObj, PlugIn_ViewPort *vp ); +PI_LUPname DECL_EXP PI_GetObjectLUPName( PI_S57Obj *pObj ); +PI_DisPrio DECL_EXP PI_GetObjectDisplayPriority( PI_S57Obj *pObj ); +PI_DisCat DECL_EXP PI_GetObjectDisplayCategory( PI_S57Obj *pObj ); +void DECL_EXP PI_PLIBSetLineFeaturePriority( PI_S57Obj *pObj, int prio ); +void DECL_EXP PI_PLIBPrepareForNewRender(void); +void DECL_EXP PI_PLIBFreeContext( void *pContext ); +void DECL_EXP PI_PLIBSetRenderCaps( unsigned int flags ); + +bool DECL_EXP PI_PLIBSetContext( PI_S57Obj *pObj ); + +int DECL_EXP PI_PLIBRenderObjectToDC( wxDC *pdc, PI_S57Obj *pObj, PlugIn_ViewPort *vp ); +int DECL_EXP PI_PLIBRenderAreaToDC( wxDC *pdc, PI_S57Obj *pObj, PlugIn_ViewPort *vp, wxRect rect, unsigned char *pixbuf ); + + +int DECL_EXP PI_PLIBRenderAreaToGL( const wxGLContext &glcc, PI_S57Obj *pObj, + PlugIn_ViewPort *vp, wxRect &render_rect ); + +int DECL_EXP PI_PLIBRenderObjectToGL( const wxGLContext &glcc, PI_S57Obj *pObj, + PlugIn_ViewPort *vp, wxRect &render_rect ); + +/* API 1.11 OpenGL Display List and vertex buffer object routines + + Effectively these two routines cancel each other so all + of the translation, scaling and rotation can be done by opengl. + + Display lists need only be built infrequently, but used in each frame + greatly accelerates the speed of rendering. This avoids costly calculations, + and also allows the vertexes to be stored in graphics memory. + + static int dl = 0; + glPushMatrix(); + PlugInMultMatrixViewport(current_viewport); + if(dl) + glCallList(dl); + else { + dl = glGenLists(1); + PlugInViewPort norm_viewport = current_viewport; + NormalizeViewPort(norm_viewport); + glNewList(dl, GL_COMPILE_AND_EXECUTE); + ... // use norm_viewport with GetCanvasLLPix here + glEndList(); + } + glPopMatrix(); + ... // use current_viewport with GetCanvasLLPix again +*/ + +extern DECL_EXP bool PlugInHasNormalizedViewPort ( PlugIn_ViewPort *vp ); +extern DECL_EXP void PlugInMultMatrixViewport ( PlugIn_ViewPort *vp, float lat=0, float lon=0 ); +extern DECL_EXP void PlugInNormalizeViewport ( PlugIn_ViewPort *vp, float lat=0, float lon=0 ); + +class wxPoint2DDouble; +extern "C" DECL_EXP void GetDoubleCanvasPixLL(PlugIn_ViewPort *vp, wxPoint2DDouble *pp, double lat, double lon); + +/* API 1.13 */ +/* API 1.13 adds some more common functions to avoid unnecessary code duplication */ + + +extern DECL_EXP double fromDMM_Plugin( wxString sdms ); +extern DECL_EXP void SetCanvasRotation(double rotation); +extern DECL_EXP bool GetSingleWaypoint( wxString GUID, PlugIn_Waypoint *pwaypoint ); +extern DECL_EXP bool CheckEdgePan_PlugIn( int x, int y, bool dragging, int margin, int delta ); +extern DECL_EXP wxBitmap GetIcon_PlugIn(const wxString & name); +extern DECL_EXP void SetCursor_PlugIn( wxCursor *pPlugin_Cursor = NULL ); + +/* API 1.13 */ +extern DECL_EXP bool PlugInPlaySoundEx( wxString &sound_file, int deviceIndex=-1 ); +extern DECL_EXP void AddChartDirectory( wxString &path ); +extern DECL_EXP void ForceChartDBUpdate(); + +extern DECL_EXP wxString GetWritableDocumentsDir( void ); +extern DECL_EXP wxDialog *GetActiveOptionsDialog(); +extern DECL_EXP wxArrayString GetWaypointGUIDArray( void ); + + +/* Platform optimized File/Dir selector dialogs */ +extern DECL_EXP int PlatformDirSelectorDialog( wxWindow *parent, wxString *file_spec, wxString Title, wxString initDir); + +extern DECL_EXP int PlatformFileSelectorDialog( wxWindow *parent, wxString *file_spec, wxString Title, wxString initDir, + wxString suggestedName, wxString wildcard); + + +/* OpenCPN HTTP File Download PlugIn Interface */ + +/* Various method Return Codes, etc */ +typedef enum _OCPN_DLStatus{ + OCPN_DL_UNKNOWN =-1, + OCPN_DL_NO_ERROR = 0, + OCPN_DL_FAILED = 1, + OCPN_DL_ABORTED = 2, + OCPN_DL_USER_TIMEOUT = 4, + OCPN_DL_STARTED = 8 +}OCPN_DLStatus; + + +typedef enum _OCPN_DLCondition{ + OCPN_DL_EVENT_TYPE_UNKNOWN = -1, + OCPN_DL_EVENT_TYPE_START = 80, + OCPN_DL_EVENT_TYPE_PROGRESS = 81, + OCPN_DL_EVENT_TYPE_END = 82 +}OCPN_DLCondition; + +// Style definitions for Synchronous file download modal dialogs, if desired. +// Abstracted from wxCURL package +enum OCPN_DLDialogStyle +{ + OCPN_DLDS_ELAPSED_TIME = 0x0001, //!< The dialog shows the elapsed time. + OCPN_DLDS_ESTIMATED_TIME = 0x0002, //!< The dialog shows the estimated total time. + OCPN_DLDS_REMAINING_TIME = 0x0004, //!< The dialog shows the remaining time. + OCPN_DLDS_SPEED = 0x0008, //!< The dialog shows the transfer speed. + OCPN_DLDS_SIZE = 0x0010, //!< The dialog shows the size of the resource to download/upload. + OCPN_DLDS_URL = 0x0020, //!< The dialog shows the URL involved in the transfer. + + // styles related to the use of wxCurlConnectionSettingsDialog: + + OCPN_DLDS_CONN_SETTINGS_AUTH = 0x0040, //!< The dialog allows the user to change the authentication settings. + OCPN_DLDS_CONN_SETTINGS_PORT = 0x0080, //!< The dialog allows the user to change the port for the transfer. + OCPN_DLDS_CONN_SETTINGS_PROXY = 0x0100, //!< The dialog allows the user to change the proxy settings. + + OCPN_DLDS_CONN_SETTINGS_ALL = OCPN_DLDS_CONN_SETTINGS_AUTH|OCPN_DLDS_CONN_SETTINGS_PORT|OCPN_DLDS_CONN_SETTINGS_PROXY, + + OCPN_DLDS_SHOW_ALL =OCPN_DLDS_ELAPSED_TIME|OCPN_DLDS_ESTIMATED_TIME|OCPN_DLDS_REMAINING_TIME| + OCPN_DLDS_SPEED|OCPN_DLDS_SIZE|OCPN_DLDS_URL|OCPN_DLDS_CONN_SETTINGS_ALL, + + OCPN_DLDS_CAN_ABORT = 0x0200, //!< The transfer can be aborted by the user. + OCPN_DLDS_CAN_START = 0x0400, //!< The transfer won't start automatically. The user needs to start it. + OCPN_DLDS_CAN_PAUSE = 0x0800, //!< The transfer can be paused. + + OCPN_DLDS_AUTO_CLOSE = 0x1000, //!< The dialog auto closes when transfer is complete. + + // by default all available features are enabled: + OCPN_DLDS_DEFAULT_STYLE = OCPN_DLDS_CAN_START|OCPN_DLDS_CAN_PAUSE|OCPN_DLDS_CAN_ABORT|OCPN_DLDS_SHOW_ALL|OCPN_DLDS_AUTO_CLOSE +}; + +#define ONLINE_CHECK_RETRY 30 // Recheck the Internet connection availability every ONLINE_CHECK_RETRY s + +/* Synchronous (Blocking) download of a single file */ + +extern DECL_EXP _OCPN_DLStatus OCPN_downloadFile( const wxString& url, const wxString &outputFile, + const wxString &title, const wxString &message, + const wxBitmap& bitmap, + wxWindow *parent, long style, int timeout_secs); + + +/* Asynchronous (Background) download of a single file */ + +extern DECL_EXP _OCPN_DLStatus OCPN_downloadFileBackground( const wxString& url, const wxString &outputFile, + wxEvtHandler *handler, long *handle); + +extern DECL_EXP void OCPN_cancelDownloadFileBackground( long handle ); + +/* Synchronous (Blocking) HTTP POST operation for small amounts of data */ + +extern DECL_EXP _OCPN_DLStatus OCPN_postDataHttp( const wxString& url, const wxString& parameters, wxString& result, int timeout_secs ); + +/* Check whether connection to the Internet is working */ + +extern DECL_EXP bool OCPN_isOnline(); + +/* Supporting Event for Background downloading */ +/* OCPN_downloadEvent Definition */ + +/* PlugIn should be ready/able to handle this event after initiating a background file transfer + * + * The event as received should be parsed primarily by the getDLEventCondition() method. + * This will allow identification of download start, progress, and end states. + * + * Other accessor methods contain status, byte counts, etc. + * + * A PlugIn may safely destroy its EvtHandler after receipt of an OCPN_downloadEvent with + * getDLEventCondition == OCPN_DL_EVENT_TYPE_END + */ + +class DECL_EXP OCPN_downloadEvent: public wxEvent +{ +public: + OCPN_downloadEvent( wxEventType commandType = wxEVT_NULL, int id = 0 ); + ~OCPN_downloadEvent( ); + + // accessors + _OCPN_DLStatus getDLEventStatus(){ return m_stat; } + OCPN_DLCondition getDLEventCondition(){ return m_condition; } + + void setDLEventStatus( _OCPN_DLStatus stat ){ m_stat = stat; } + void setDLEventCondition( OCPN_DLCondition cond ){ m_condition = cond; } + + void setTotal( long bytes ){m_totalBytes = bytes; } + void setTransferred( long bytes ){m_sofarBytes = bytes; } + long getTotal(){ return m_totalBytes; } + long getTransferred(){ return m_sofarBytes; } + + void setComplete(bool b_complete){ m_b_complete = b_complete; } + bool getComplete(){ return m_b_complete; } + + + // required for sending with wxPostEvent() + wxEvent *Clone() const; + +private: + OCPN_DLStatus m_stat; + OCPN_DLCondition m_condition; + + long m_totalBytes; + long m_sofarBytes; + bool m_b_complete; +}; + +//DECLARE_EVENT_TYPE(wxEVT_DOWNLOAD_EVENT, -1) +//extern const wxEventType DECL_EXP wxEVT_DOWNLOAD_EVENT; + +extern WXDLLIMPEXP_CORE const wxEventType wxEVT_DOWNLOAD_EVENT; +#endif //_PLUGIN_H_ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/SchedulesDialog.cpp opencpn-plugin-weatherfax-1.5001.0/src/SchedulesDialog.cpp --- opencpn-plugin-weatherfax-1.3.1/src/SchedulesDialog.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/SchedulesDialog.cpp 2016-02-25 19:25:30.000000000 +0000 @@ -6,7 +6,6 @@ * *************************************************************************** * Copyright (C) 2014 by Sean D'Epagnier * - * sean at depagnier dot com * * * * 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 * diff -Nru opencpn-plugin-weatherfax-1.3.1/src/SchedulesDialog.h opencpn-plugin-weatherfax-1.5001.0/src/SchedulesDialog.h --- opencpn-plugin-weatherfax-1.3.1/src/SchedulesDialog.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/SchedulesDialog.h 2016-02-25 19:25:30.000000000 +0000 @@ -6,7 +6,6 @@ * *************************************************************************** * Copyright (C) 2013 by Sean D'Epagnier * - * sean at depagnier dot com * * * * 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 * diff -Nru opencpn-plugin-weatherfax-1.3.1/src/WeatherFax.cpp opencpn-plugin-weatherfax-1.5001.0/src/WeatherFax.cpp --- opencpn-plugin-weatherfax-1.3.1/src/WeatherFax.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/WeatherFax.cpp 2016-02-25 19:25:30.000000000 +0000 @@ -6,7 +6,6 @@ * *************************************************************************** * Copyright (C) 2014 by Sean D'Epagnier * - * sean at depagnier dot com * * * * 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 * diff -Nru opencpn-plugin-weatherfax-1.3.1/src/WeatherFax.h opencpn-plugin-weatherfax-1.5001.0/src/WeatherFax.h --- opencpn-plugin-weatherfax-1.3.1/src/WeatherFax.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/WeatherFax.h 2016-02-25 19:25:30.000000000 +0000 @@ -6,7 +6,6 @@ * *************************************************************************** * Copyright (C) 2014 by Sean D'Epagnier * - * sean at depagnier dot com * * * * 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 * diff -Nru opencpn-plugin-weatherfax-1.3.1/src/WeatherFaxImage.cpp opencpn-plugin-weatherfax-1.5001.0/src/WeatherFaxImage.cpp --- opencpn-plugin-weatherfax-1.3.1/src/WeatherFaxImage.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/WeatherFaxImage.cpp 2016-02-25 19:25:30.000000000 +0000 @@ -6,7 +6,6 @@ * *************************************************************************** * Copyright (C) 2014 by Sean D'Epagnier * - * sean at depagnier dot com * * * * 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 * @@ -30,6 +29,8 @@ #include "defs.h" #include "WeatherFaxImage.h" +#include + WX_DEFINE_LIST(WeatherFaxImageCoordinateList); #if !defined(GL_CLAMP_TO_EDGE) @@ -298,7 +299,7 @@ theta = atan2(dx, fabs(dy)); x = theta*m_phasedimg.GetWidth(); - double z = hypot(dx, dy) / inputheight; + double z = sqrt(dx*dx + dy*dy) / inputheight; double q = 4/M_PI*atan(z); pp = q + (inputheight > 0 ? -1 : 1); /* inputheight < 0 for south polar */ } break; diff -Nru opencpn-plugin-weatherfax-1.3.1/src/WeatherFaxImage.h opencpn-plugin-weatherfax-1.5001.0/src/WeatherFaxImage.h --- opencpn-plugin-weatherfax-1.3.1/src/WeatherFaxImage.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/WeatherFaxImage.h 2016-02-25 19:25:30.000000000 +0000 @@ -6,7 +6,6 @@ * *************************************************************************** * Copyright (C) 2013 by Sean D'Epagnier * - * sean at depagnier dot com * * * * 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 * diff -Nru opencpn-plugin-weatherfax-1.3.1/src/weatherfax_pi.cpp opencpn-plugin-weatherfax-1.5001.0/src/weatherfax_pi.cpp --- opencpn-plugin-weatherfax-1.3.1/src/weatherfax_pi.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/weatherfax_pi.cpp 2016-02-25 19:25:30.000000000 +0000 @@ -1,345 +1,351 @@ -/****************************************************************************** - * - * Project: OpenCPN - * Purpose: weather fax Plugin - * Author: Sean D'Epagnier - * - *************************************************************************** - * Copyright (C) 2014 by Sean D'Epagnier * - * sean at depagnier dot com * - * * - * 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. * - *************************************************************************** - */ - -#include "weatherfax_pi.h" -#include "WeatherFaxImage.h" -#include "WeatherFax.h" -#include "icons.h" - -// the class factories, used to create and destroy instances of the PlugIn - -extern "C" DECL_EXP opencpn_plugin* create_pi(void *ppimgr) -{ - return new weatherfax_pi(ppimgr); -} - -extern "C" DECL_EXP void destroy_pi(opencpn_plugin* p) -{ - delete p; -} - -//--------------------------------------------------------------------------------------------------------- -// -// WeatherFax PlugIn Implementation -// -//--------------------------------------------------------------------------------------------------------- - -weatherfax_pi::weatherfax_pi(void *ppimgr) - : opencpn_plugin_18(ppimgr) -{ - // Create the PlugIn icons - initialize_images(); -} - -//--------------------------------------------------------------------------------------------------------- -// -// PlugIn initialization and de-init -// -//--------------------------------------------------------------------------------------------------------- - -int weatherfax_pi::Init(void) -{ - AddLocaleCatalog( _T("opencpn-weatherfax_pi") ); - - // Set some default private member parameters - m_weatherfax_dialog_x = 0; - m_weatherfax_dialog_y = 0; - - ::wxDisplaySize(&m_display_width, &m_display_height); - - // Get a pointer to the opencpn display canvas, to use as a parent for the POI Manager dialog - m_parent_window = GetOCPNCanvasWindow(); - - // Get a pointer to the opencpn configuration object - m_pconfig = GetOCPNConfigObject(); - - // And load the configuration items - LoadConfig(); - - m_leftclick_tool_id = InsertPlugInTool(_T(""), _img_weatherfax, - _img_weatherfax, wxITEM_NORMAL, - _("WeatherFax"), _T(""), NULL, - WEATHERFAX_TOOL_POSITION, 0, this); - - m_pWeatherFax = new WeatherFax(*this, m_parent_window); - m_pWeatherFax->Move(wxPoint(m_weatherfax_dialog_x, m_weatherfax_dialog_y)); - - return (WANTS_OVERLAY_CALLBACK | - WANTS_OPENGL_OVERLAY_CALLBACK | - WANTS_TOOLBAR_CALLBACK | - INSTALLS_TOOLBAR_TOOL | - WANTS_NMEA_EVENTS | - WANTS_PREFERENCES | - WANTS_CONFIG - ); -} - -bool weatherfax_pi::DeInit(void) -{ - // Record the dialog position - wxPoint p = m_pWeatherFax->GetPosition(); - SetWeatherFaxX(p.x); - SetWeatherFaxY(p.y); - - m_pWeatherFax->Close(); - - SaveConfig(); - - RemovePlugInTool(m_leftclick_tool_id); - return true; -} - -int weatherfax_pi::GetAPIVersionMajor() -{ - return MY_API_VERSION_MAJOR; -} - -int weatherfax_pi::GetAPIVersionMinor() -{ - return MY_API_VERSION_MINOR; -} - -int weatherfax_pi::GetPlugInVersionMajor() -{ - return PLUGIN_VERSION_MAJOR; -} - -int weatherfax_pi::GetPlugInVersionMinor() -{ - return PLUGIN_VERSION_MINOR; -} - -wxBitmap *weatherfax_pi::GetPlugInBitmap() -{ - return new wxBitmap(_img_weatherfax->ConvertToImage().Copy()); -} - -wxString weatherfax_pi::GetCommonName() -{ - return _("WeatherFax"); -} - -wxString weatherfax_pi::GetShortDescription() -{ - return _("Weather Fax PlugIn for OpenCPN"); -} - -wxString weatherfax_pi::GetLongDescription() -{ - return _("Weather Fax PlugIn for OpenCPN\n\ -Can open image files directly, or decode audio faxes to an image.\n\ -With simple calibration, resulting image is overlaid on top of charts.\n\ -Converts images in mercator, polar, conic and uniform coordinates.\n\ -Can convert any image into a raster chart.\n\ -Builtin database for HF radio fax stations via SSB.\n\ -Builtin database for internet retrieval from meterological sites.\n\ -"); -} - -int weatherfax_pi::GetToolbarToolCount(void) -{ - return 1; -} - -void weatherfax_pi::SetColorScheme(PI_ColorScheme cs) -{ - if (NULL == m_pWeatherFax) - return; - DimeWindow(m_pWeatherFax); -} - -void weatherfax_pi::RearrangeWindow() -{ - if (NULL == m_pWeatherFax) - return; - - SetColorScheme(PI_ColorScheme()); - - m_pWeatherFax->Fit(); -} - -void weatherfax_pi::OnToolbarToolCallback(int id) -{ - m_pWeatherFax->Show(!m_pWeatherFax->IsShown()); - - if(!m_pWeatherFax->IsShown()) { - m_pWeatherFax->m_SchedulesDialog.Hide(); - m_pWeatherFax->m_InternetRetrievalDialog.Hide(); - } - - RearrangeWindow(); - - wxPoint p = m_pWeatherFax->GetPosition(); - m_pWeatherFax->Move(0,0); // workaround for gtk autocentre dialog behavior - m_pWeatherFax->Move(p); -} - -bool weatherfax_pi::RenderOverlay(wxDC &dc, PlugIn_ViewPort *vp) -{ - if(!m_pWeatherFax || !m_pWeatherFax->IsShown()) - return true; - - for(unsigned int i=0; im_lFaxes->GetCount(); i++) - if(m_pWeatherFax->m_lFaxes->IsSelected(i)) - m_pWeatherFax->m_Faxes[i]->RenderImage(dc, vp); - - return true; -} - -bool weatherfax_pi::RenderGLOverlay(wxGLContext *pcontext, PlugIn_ViewPort *vp) -{ - if(!m_pWeatherFax || !m_pWeatherFax->IsShown()) - return true; - - for(unsigned int i=0; im_lFaxes->GetCount(); i++) - if(m_pWeatherFax->m_lFaxes->IsSelected(i)) - m_pWeatherFax->m_Faxes[i]->RenderImageGL(vp); - - return true; -} - -wxString weatherfax_pi::StandardPath() -{ - wxStandardPathsBase& std_path = wxStandardPathsBase::Get(); -#ifdef __WXMSW__ - wxString stdPath = std_path.GetConfigDir(); -#endif -#ifdef __WXGTK__ - wxString stdPath = std_path.GetUserDataDir(); -#endif -#ifdef __WXOSX__ - wxString stdPath = std_path.GetUserConfigDir(); // should be ~/Library/Preferences -#endif - - wxString s = wxFileName::GetPathSeparator(), path = stdPath + s + _T("plugins") + s; - - wxFileName dir(path); - if(!dir.DirExists()) - dir.Mkdir(); - - path += _T("weatherfax") + s; - wxFileName dir2(path); - if(!dir2.DirExists()) - dir2.Mkdir(); - - return path; -} - -bool weatherfax_pi::LoadConfig(void) -{ - wxFileConfig *pConf = m_pconfig; - - if(pConf) - { - pConf->SetPath ( _T( "/Settings/WeatherFax" ) ); - pConf->Read ( _T( "Path" ), &m_path, _T ( "" ) ); - pConf->Read ( _T( "ExportPath" ), &m_export_path, _T ( "" ) ); - - m_weatherfax_dialog_x = pConf->Read ( _T ( "DialogPosX" ), 20L ); - m_weatherfax_dialog_y = pConf->Read ( _T ( "DialogPosY" ), 20L ); - - pConf->SetPath ( _T ( "/Settings/WeatherFax/Schedules" ) ); - pConf->Read ( _T ( "LoadAtStart" ), &m_bLoadSchedulesStart, 0 ); - - pConf->SetPath ( _T ( "/Settings/WeatherFax/Export" ) ); - pConf->Read ( _T ( "Colors" ), &m_iExportColors, 64 ); - pConf->Read ( _T ( "DepthMeters" ), &m_bExportDepthMeters, true ); - pConf->Read ( _T ( "SoundingDatum" ), &m_sExportSoundingDatum, _T("LOWEST LOW WATER")); - - pConf->SetPath ( _T ( "/Directories" ) ); - wxString def; - def = ::wxGetCwd() + _T("/plugins"); - pConf->Read ( _T ( "WeatherFaxDataLocation" ), &m_weatherfax_dir, def); - return true; - } else - return false; -} - -bool weatherfax_pi::SaveConfig(void) -{ - wxFileConfig *pConf = m_pconfig; - - if(!pConf) - return false; - - pConf->SetPath ( _T ( "/Settings/WeatherFax" ) ); - pConf->Write ( _T ( "Path" ), m_path ); - pConf->Write ( _T ( "ExportPath" ), m_export_path ); - - pConf->Write ( _T ( "DialogPosX" ), m_weatherfax_dialog_x ); - pConf->Write ( _T ( "DialogPosY" ), m_weatherfax_dialog_y ); - - pConf->SetPath ( _T ( "/Settings/WeatherFax/Schedules" ) ); - pConf->Write ( _T ( "LoadAtStart" ), m_bLoadSchedulesStart ); - - pConf->SetPath ( _T ( "/Settings/WeatherFax/Export" ) ); - pConf->Write ( _T ( "Colors" ), m_iExportColors ); - pConf->Write ( _T ( "DepthMeters" ), m_bExportDepthMeters ); - pConf->Write ( _T ( "SoundingDatum" ), m_sExportSoundingDatum ); - - pConf->SetPath ( _T ( "/Directories" ) ); - pConf->Write ( _T ( "WeatherFaxDataLocation" ), m_weatherfax_dir ); - - return true; -} - -void weatherfax_pi::SetPositionFixEx(PlugIn_Position_Fix_Ex &pfix) -{ - m_lastfix = pfix; -} - -void weatherfax_pi::ShowPreferencesDialog( wxWindow* parent ) -{ - WeatherFaxPrefsDialog *dialog = - new WeatherFaxPrefsDialog( parent, wxID_ANY, _("WeatherFax Preferences"), - wxPoint( m_weatherfax_dialog_x, m_weatherfax_dialog_y), - wxDefaultSize, wxDEFAULT_DIALOG_STYLE ); - - dialog->m_cbLoadSchedulesStart->SetValue(m_bLoadSchedulesStart); - - dialog->m_sExportColors->SetValue(m_iExportColors); - dialog->m_rbExportDepthMeters->SetValue(m_bExportDepthMeters); - dialog->m_tExportSoundingDatum->SetValue(m_sExportSoundingDatum); - - dialog->Fit(); - wxColour cl; - GetGlobalColor(_T("DILG1"), &cl); - dialog->SetBackgroundColour(cl); - - if(dialog->ShowModal() == wxID_OK) - { - m_bLoadSchedulesStart = dialog->m_cbLoadSchedulesStart->GetValue(); - - m_iExportColors = dialog->m_sExportColors->GetValue(); - m_bExportDepthMeters = dialog->m_rbExportDepthMeters->GetValue(); - m_sExportSoundingDatum = dialog->m_tExportSoundingDatum->GetValue(); - - SaveConfig(); - } - delete dialog; -} - +/****************************************************************************** + * + * Project: OpenCPN + * Purpose: weather fax Plugin + * Author: Sean D'Epagnier + * + *************************************************************************** + * Copyright (C) 2014 by Sean D'Epagnier * + * * + * 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. * + *************************************************************************** + */ + +#include "weatherfax_pi.h" +#include "WeatherFaxImage.h" +#include "WeatherFax.h" +#include "icons.h" + +// the class factories, used to create and destroy instances of the PlugIn + +extern "C" DECL_EXP opencpn_plugin* create_pi(void *ppimgr) +{ + return new weatherfax_pi(ppimgr); +} + +extern "C" DECL_EXP void destroy_pi(opencpn_plugin* p) +{ + delete p; +} + +//--------------------------------------------------------------------------------------------------------- +// +// WeatherFax PlugIn Implementation +// +//--------------------------------------------------------------------------------------------------------- + +weatherfax_pi::weatherfax_pi(void *ppimgr) + : opencpn_plugin_113(ppimgr) +{ + // Create the PlugIn icons + initialize_images(); +} + +//--------------------------------------------------------------------------------------------------------- +// +// PlugIn initialization and de-init +// +//--------------------------------------------------------------------------------------------------------- + +int weatherfax_pi::Init(void) +{ + AddLocaleCatalog( _T("opencpn-weatherfax_pi") ); + + // Set some default private member parameters + m_weatherfax_dialog_x = 0; + m_weatherfax_dialog_y = 0; + + ::wxDisplaySize(&m_display_width, &m_display_height); + + // Get a pointer to the opencpn display canvas, to use as a parent for the POI Manager dialog + m_parent_window = GetOCPNCanvasWindow(); + + // Get a pointer to the opencpn configuration object + m_pconfig = GetOCPNConfigObject(); + + // And load the configuration items + LoadConfig(); + + m_leftclick_tool_id = InsertPlugInTool(_T(""), _img_weatherfax, + _img_weatherfax, wxITEM_NORMAL, + _("WeatherFax"), _T(""), NULL, + WEATHERFAX_TOOL_POSITION, 0, this); + + m_pWeatherFax = new WeatherFax(*this, m_parent_window); + m_pWeatherFax->Move(wxPoint(m_weatherfax_dialog_x, m_weatherfax_dialog_y)); + + return (WANTS_OVERLAY_CALLBACK | + WANTS_OPENGL_OVERLAY_CALLBACK | + WANTS_TOOLBAR_CALLBACK | + INSTALLS_TOOLBAR_TOOL | + WANTS_NMEA_EVENTS | + WANTS_PREFERENCES | + WANTS_CONFIG + ); +} + +bool weatherfax_pi::DeInit(void) +{ + // Record the dialog position + wxPoint p = m_pWeatherFax->GetPosition(); + SetWeatherFaxX(p.x); + SetWeatherFaxY(p.y); + + m_pWeatherFax->m_SchedulesDialog.Close(); + m_pWeatherFax->m_InternetRetrievalDialog.Close(); + m_pWeatherFax->Close(); + delete m_pWeatherFax; + m_pWeatherFax = NULL; + + SaveConfig(); + + RemovePlugInTool(m_leftclick_tool_id); + return true; +} + +int weatherfax_pi::GetAPIVersionMajor() +{ + return MY_API_VERSION_MAJOR; +} + +int weatherfax_pi::GetAPIVersionMinor() +{ + return MY_API_VERSION_MINOR; +} + +int weatherfax_pi::GetPlugInVersionMajor() +{ + return PLUGIN_VERSION_MAJOR; +} + +int weatherfax_pi::GetPlugInVersionMinor() +{ + return PLUGIN_VERSION_MINOR; +} + +wxBitmap *weatherfax_pi::GetPlugInBitmap() +{ + return new wxBitmap(_img_weatherfax->ConvertToImage().Copy()); +} + +wxString weatherfax_pi::GetCommonName() +{ + return _("WeatherFax"); +} + +wxString weatherfax_pi::GetShortDescription() +{ + return _("Weather Fax PlugIn for OpenCPN"); +} + +wxString weatherfax_pi::GetLongDescription() +{ + return _("Weather Fax PlugIn for OpenCPN\n\ +Can open image files directly, or decode audio faxes to an image.\n\ +With simple calibration, resulting image is overlaid on top of charts.\n\ +Converts images in mercator, polar, conic and uniform coordinates.\n\ +Can convert any image into a raster chart.\n\ +Builtin database for HF radio fax stations via SSB.\n\ +Builtin database for internet retrieval from meterological sites.\n\ +"); +} + +int weatherfax_pi::GetToolbarToolCount(void) +{ + return 1; +} + +void weatherfax_pi::SetColorScheme(PI_ColorScheme cs) +{ + if (NULL == m_pWeatherFax) + return; + DimeWindow(m_pWeatherFax); +} + +void weatherfax_pi::RearrangeWindow() +{ + if (NULL == m_pWeatherFax) + return; + + SetColorScheme(PI_ColorScheme()); + + m_pWeatherFax->Fit(); +} + +void weatherfax_pi::OnToolbarToolCallback(int id) +{ + m_pWeatherFax->Show(!m_pWeatherFax->IsShown()); + + if(!m_pWeatherFax->IsShown()) { + m_pWeatherFax->m_SchedulesDialog.Hide(); + m_pWeatherFax->m_InternetRetrievalDialog.Hide(); + } + + RearrangeWindow(); + + wxPoint p = m_pWeatherFax->GetPosition(); + m_pWeatherFax->Move(0,0); // workaround for gtk autocentre dialog behavior + m_pWeatherFax->Move(p); +} + +bool weatherfax_pi::RenderOverlay(wxDC &dc, PlugIn_ViewPort *vp) +{ + if(!m_pWeatherFax || !m_pWeatherFax->IsShown()) + return true; + + for(unsigned int i=0; im_lFaxes->GetCount(); i++) + if(m_pWeatherFax->m_lFaxes->IsSelected(i)) + m_pWeatherFax->m_Faxes[i]->RenderImage(dc, vp); + + return true; +} + +bool weatherfax_pi::RenderGLOverlay(wxGLContext *pcontext, PlugIn_ViewPort *vp) +{ + if(!m_pWeatherFax || !m_pWeatherFax->IsShown()) + return true; + + for(unsigned int i=0; im_lFaxes->GetCount(); i++) + if(m_pWeatherFax->m_lFaxes->IsSelected(i)) + m_pWeatherFax->m_Faxes[i]->RenderImageGL(vp); + + return true; +} + +wxString weatherfax_pi::StandardPath() +{ + wxStandardPathsBase& std_path = wxStandardPathsBase::Get(); + wxString s = wxFileName::GetPathSeparator(); + +#ifdef __WXMSW__ + wxString stdPath = std_path.GetConfigDir(); +#endif +#ifdef __WXGTK__ + wxString stdPath = std_path.GetUserDataDir(); +#endif +#ifdef __WXOSX__ + wxString stdPath = (std_path.GetUserConfigDir() + s + _T("opencpn")); +#endif + + stdPath += s + _T("plugins"); + if (!wxDirExists(stdPath)) + wxMkdir(stdPath); + + stdPath += s + _T("weatherfax"); + +#ifdef __WXOSX__ + // Compatibility with pre-OCPN-4.2; move config dir to + // ~/Library/Preferences/opencpn if it exists + wxString oldPath = (std_path.GetUserConfigDir() + s + _T("plugins") + s + _T("weatherfax")); + if (wxDirExists(oldPath) && !wxDirExists(stdPath)) { + wxLogMessage("weatherfax_pi: moving config dir %s to %s", oldPath, stdPath); + wxRenameFile(oldPath, stdPath); + } +#endif + + if (!wxDirExists(stdPath)) + wxMkdir(stdPath); + + stdPath += s; // is this necessary? + return stdPath; +} + +bool weatherfax_pi::LoadConfig(void) +{ + wxFileConfig *pConf = m_pconfig; + + if(!pConf) + return false; + + pConf->SetPath ( _T( "/Settings/WeatherFax" ) ); + pConf->Read ( _T( "Path" ), &m_path, _T ( "" ) ); + pConf->Read ( _T( "ExportPath" ), &m_export_path, _T ( "" ) ); + + m_weatherfax_dialog_x = pConf->Read ( _T ( "DialogPosX" ), 20L ); + m_weatherfax_dialog_y = pConf->Read ( _T ( "DialogPosY" ), 20L ); + + pConf->SetPath ( _T ( "/Settings/WeatherFax/Schedules" ) ); + pConf->Read ( _T ( "LoadAtStart" ), &m_bLoadSchedulesStart, 0 ); + + pConf->SetPath ( _T ( "/Settings/WeatherFax/Export" ) ); + pConf->Read ( _T ( "Colors" ), &m_iExportColors, 64 ); + pConf->Read ( _T ( "DepthMeters" ), &m_bExportDepthMeters, true ); + pConf->Read ( _T ( "SoundingDatum" ), &m_sExportSoundingDatum, _T("LOWEST LOW WATER")); + + return true; +} + +bool weatherfax_pi::SaveConfig(void) +{ + wxFileConfig *pConf = m_pconfig; + + if(!pConf) + return false; + + pConf->SetPath ( _T ( "/Settings/WeatherFax" ) ); + pConf->Write ( _T ( "Path" ), m_path ); + pConf->Write ( _T ( "ExportPath" ), m_export_path ); + + pConf->Write ( _T ( "DialogPosX" ), m_weatherfax_dialog_x ); + pConf->Write ( _T ( "DialogPosY" ), m_weatherfax_dialog_y ); + + pConf->SetPath ( _T ( "/Settings/WeatherFax/Schedules" ) ); + pConf->Write ( _T ( "LoadAtStart" ), m_bLoadSchedulesStart ); + + pConf->SetPath ( _T ( "/Settings/WeatherFax/Export" ) ); + pConf->Write ( _T ( "Colors" ), m_iExportColors ); + pConf->Write ( _T ( "DepthMeters" ), m_bExportDepthMeters ); + pConf->Write ( _T ( "SoundingDatum" ), m_sExportSoundingDatum ); + + return true; +} + +void weatherfax_pi::SetPositionFixEx(PlugIn_Position_Fix_Ex &pfix) +{ + m_lastfix = pfix; +} + +void weatherfax_pi::ShowPreferencesDialog( wxWindow* parent ) +{ + WeatherFaxPrefsDialog *dialog = + new WeatherFaxPrefsDialog( parent, wxID_ANY, _("WeatherFax Preferences"), + wxPoint( m_weatherfax_dialog_x, m_weatherfax_dialog_y), + wxDefaultSize, wxDEFAULT_DIALOG_STYLE ); + + dialog->m_cbLoadSchedulesStart->SetValue(m_bLoadSchedulesStart); + + dialog->m_sExportColors->SetValue(m_iExportColors); + dialog->m_rbExportDepthMeters->SetValue(m_bExportDepthMeters); + dialog->m_tExportSoundingDatum->SetValue(m_sExportSoundingDatum); + + dialog->Fit(); + wxColour cl; + GetGlobalColor(_T("DILG1"), &cl); + dialog->SetBackgroundColour(cl); + + if(dialog->ShowModal() == wxID_OK) + { + m_bLoadSchedulesStart = dialog->m_cbLoadSchedulesStart->GetValue(); + + m_iExportColors = dialog->m_sExportColors->GetValue(); + m_bExportDepthMeters = dialog->m_rbExportDepthMeters->GetValue(); + m_sExportSoundingDatum = dialog->m_tExportSoundingDatum->GetValue(); + + SaveConfig(); + } + delete dialog; +} + diff -Nru opencpn-plugin-weatherfax-1.3.1/src/weatherfax_pi.h opencpn-plugin-weatherfax-1.5001.0/src/weatherfax_pi.h --- opencpn-plugin-weatherfax-1.3.1/src/weatherfax_pi.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/weatherfax_pi.h 2016-02-25 19:25:30.000000000 +0000 @@ -6,7 +6,6 @@ * *************************************************************************** * Copyright (C) 2014 by Sean D'Epagnier * - * sean at depagnier dot com * * * * 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 * @@ -35,7 +34,7 @@ #include "version.h" #define MY_API_VERSION_MAJOR 1 -#define MY_API_VERSION_MINOR 8 +#define MY_API_VERSION_MINOR 13 #define ABOUT_AUTHOR_URL "http://seandepagnier.users.sourceforge.net" @@ -52,7 +51,7 @@ class WeatherFaxImage; class WeatherFax; -class weatherfax_pi : public opencpn_plugin_18 +class weatherfax_pi : public opencpn_plugin_113 { public: weatherfax_pi(void *ppimgr); @@ -121,7 +120,6 @@ int m_leftclick_tool_id; void RearrangeWindow(); - wxString m_weatherfax_dir; }; #endif diff -Nru opencpn-plugin-weatherfax-1.3.1/src/WeatherFaxUI.cpp opencpn-plugin-weatherfax-1.5001.0/src/WeatherFaxUI.cpp --- opencpn-plugin-weatherfax-1.3.1/src/WeatherFaxUI.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/WeatherFaxUI.cpp 2016-02-25 19:25:30.000000000 +0000 @@ -1583,6 +1583,13 @@ m_cSampleRate->SetSelection( 0 ); fgSizer58->Add( m_cSampleRate, 0, wxALL, 5 ); + m_staticText42 = new wxStaticText( this, wxID_ANY, _("Device Index"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText42->Wrap( -1 ); + fgSizer58->Add( m_staticText42, 0, wxALL, 5 ); + + m_sDeviceIndex = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, -1, 10, 0 ); + fgSizer58->Add( m_sDeviceIndex, 0, wxALL, 5 ); + sbSizer19->Add( fgSizer58, 1, wxEXPAND, 5 ); diff -Nru opencpn-plugin-weatherfax-1.3.1/src/WeatherFaxUI.h opencpn-plugin-weatherfax-1.5001.0/src/WeatherFaxUI.h --- opencpn-plugin-weatherfax-1.3.1/src/WeatherFaxUI.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/WeatherFaxUI.h 2016-02-25 19:25:30.000000000 +0000 @@ -384,6 +384,8 @@ wxStaticText* m_staticText41; wxStaticText* m_staticText39; wxChoice* m_cSampleRate; + wxStaticText* m_staticText42; + wxSpinCtrl* m_sDeviceIndex; wxButton* m_bDone; // Virtual event handlers, overide them in your derived class diff -Nru opencpn-plugin-weatherfax-1.3.1/src/WeatherFaxWizard.cpp opencpn-plugin-weatherfax-1.5001.0/src/WeatherFaxWizard.cpp --- opencpn-plugin-weatherfax-1.3.1/src/WeatherFaxWizard.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/WeatherFaxWizard.cpp 2016-02-25 19:25:30.000000000 +0000 @@ -6,7 +6,6 @@ * *************************************************************************** * Copyright (C) 2014 by Sean D'Epagnier * - * sean at depagnier dot com * * * * 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 * diff -Nru opencpn-plugin-weatherfax-1.3.1/src/WeatherFaxWizard.h opencpn-plugin-weatherfax-1.5001.0/src/WeatherFaxWizard.h --- opencpn-plugin-weatherfax-1.3.1/src/WeatherFaxWizard.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/WeatherFaxWizard.h 2016-02-25 19:25:30.000000000 +0000 @@ -6,7 +6,6 @@ * *************************************************************************** * Copyright (C) 2014 by Sean D'Epagnier * - * sean at depagnier dot com * * * * 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 * diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/base.cpp opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/base.cpp --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/base.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/base.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,948 +0,0 @@ -/* -* base.cpp -* wxCURL -* -* Created by Casey O'Donnell on Tue Jun 29 2004. -* Copyright (c) 2004 Casey O'Donnell. All rights reserved. -* -* -* Licence: wxWidgets Licence -*/ - -////////////////////////////////////////////////////////////////////// -// Headers -////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif - -#ifdef __WXMSW__ - #include // useful to catch memory leaks when compiling under MSVC -#endif - -#include -#include - -#include -#include - - -////////////////////////////////////////////////////////////////////// -// Constants -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// C Functions for LibCURL -////////////////////////////////////////////////////////////////////// - -extern "C" -{ - int wxcurl_evt_progress_func(void* ptr, double rDlTotal, double rDlNow, - double rUlTotal, double rUlNow) - { - wxCurlBase *curl = wx_static_cast(wxCurlBase*, ptr); - if(curl) - { - if (rUlTotal == 0 || rUlNow == 0) - { - /* should be a download event */ - wxCurlDownloadEvent evt(curl->GetId(), curl, rDlTotal, rDlNow, curl->GetURL()); - wxPostEvent(curl->GetEvtHandler(), evt); - } - - if (rDlTotal == 0 || rDlNow == 0) - { - /* should be an upload event */ - wxCurlDownloadEvent evt(curl->GetId(), curl, rUlTotal, rUlNow, curl->GetURL()); - wxPostEvent(curl->GetEvtHandler(), evt); - } - } - - return 0; - } - - int wxcurl_verbose_stream_write(CURL * crlptr, curl_infotype info, - char * cStrMessage, size_t msgSize, void * buffer) - { - wxString szMessage((const char*)cStrMessage, wxConvLibc, msgSize); - wxStringOutputStream* pBuf = (wxStringOutputStream*)buffer; - wxString szVerboseMessage; - - switch (info) - { - case CURLINFO_TEXT: - szVerboseMessage = wxString(wxS("Text: ")) + szMessage + wxS("\n"); - break; - case CURLINFO_HEADER_IN: - szVerboseMessage = wxString(wxS("Header in: ")) + szMessage + wxS("\n"); - break; - case CURLINFO_HEADER_OUT: - szVerboseMessage = wxString(wxS("Header out: ")) + szMessage + wxS("\n"); - break; - case CURLINFO_DATA_IN: - szVerboseMessage = wxString(wxS("Data in: ")) + szMessage + wxS("\n"); - break; - case CURLINFO_DATA_OUT: - szVerboseMessage = wxString(wxS("Data out: ")) + szMessage + wxS("\n"); - break; - case CURLINFO_END: - szVerboseMessage = wxString(wxS("End: ")) + szMessage + wxS("\n"); - break; - case CURLINFO_SSL_DATA_IN: - szVerboseMessage = wxString(wxS("SSL Data in: ")) + szMessage + wxS("\n"); - break; - case CURLINFO_SSL_DATA_OUT: - szVerboseMessage = wxString(wxS("SSL Data out: ")) + szMessage + wxS("\n"); - break; - } - - // here wxChar usage is correct as szVerboseMessage string is used: - pBuf->Write((const wxChar*)szVerboseMessage, szVerboseMessage.Len() * sizeof(wxChar)); - - return 0; - } - - size_t wxcurl_header_func(void *ptr, size_t size, size_t nmemb, void *stream) - { - size_t iRealSize = size * nmemb; - wxCharBuffer* pStr = (wxCharBuffer*) stream; - - if(pStr) - { - wxString str = wxCURL_BUF2STRING(*pStr) + wxString((const char*)ptr, wxConvLibc); - *pStr = wxCURL_STRING2BUF(str); - } - - return iRealSize; - } - - /* writes to a string */ - size_t wxcurl_string_write(void* ptr, size_t size, size_t nmemb, void* pcharbuf) - { - size_t iRealSize = size * nmemb; - wxCharBuffer* pStr = (wxCharBuffer*) pcharbuf; - - if(pStr) - { - wxString str = wxCURL_BUF2STRING(*pStr) + wxString((const char*)ptr, wxConvLibc); - *pStr = wxCURL_STRING2BUF(str); - } - - return iRealSize; - } - - /* writes to a stream */ - size_t wxcurl_stream_write(void* ptr, size_t size, size_t nmemb, void* stream) - { - size_t iRealSize = size * nmemb; - - wxOutputStream* pBuf = (wxOutputStream*)stream; - - if(pBuf) - { - pBuf->Write(ptr, iRealSize); - - return pBuf->LastWrite(); - } - - return 0; - } - - /* reads from a string */ - size_t wxcurl_string_read(void* ptr, size_t size, size_t nmemb, void* pcharbuf) - { - size_t iRealSize = size * nmemb; - size_t iRetVal = 0; - - wxCharBuffer* pStr = (wxCharBuffer*) pcharbuf; - size_t len = strlen(*pStr); - - if(pStr) - { - if(len >= iRealSize) - { - strncpy((char*)ptr, (const char*)(*pStr), iRealSize); - iRetVal = iRealSize; - } - else - { - strncpy((char*)ptr, (const char*)(*pStr), len); - iRetVal = len; - } - - wxString remaining = wxCURL_BUF2STRING(pStr).Right(len - iRetVal); - *pStr = wxCURL_STRING2BUF(remaining); - } - - return iRetVal; - } - - /* reads from a stream */ - size_t wxcurl_stream_read(void* ptr, size_t size, size_t nmemb, void* stream) - { - size_t iRealSize = size * nmemb; - - wxInputStream* pBuf = (wxInputStream*)stream; - - if(pBuf) - { - pBuf->Read(ptr, iRealSize); - - return pBuf->LastRead(); - } - - return 0; - } -} - - -// base.cpp: implementation of the wxCurlProgressBaseEvent class. -// -////////////////////////////////////////////////////////////////////// - -wxTimeSpan wxCurlProgressBaseEvent::GetElapsedTime() const -{ - // NOTE: we cannot trust libCURL's CURLINFO_TOTAL_TIME as the transfer may have - // been paused in one of libCURL's callbacks (and thus libCURL ignores it - // and won't remove the paused span from the return value). - wxTimeSpan elapsed = m_dt - m_pCURL->GetBeginTransferSpan(); - - // the elapsed time offset takes in count eventually-existing previous time spans - // where the transfer took place ( - return elapsed + m_pCURL->GetElapsedTimeOffset(); -} - -wxTimeSpan wxCurlProgressBaseEvent::GetEstimatedTime() const -{ - double nBytesPerSec = GetSpeed(); - if (nBytesPerSec == 0 || wxIsNaN(nBytesPerSec)) - return wxTimeSpan(0); // avoid division by zero - - // compute remaining seconds; here we assume that the current - // download speed will be constant also in future - double secs = GetTotalBytes() / nBytesPerSec; - - return wxTimeSpan(int(secs/3600.0), // hours - int(secs/60) % 60, // minutes - int(secs) % 60, // seconds - 0); // milliseconds -} - -wxTimeSpan wxCurlProgressBaseEvent::GetEstimatedRemainingTime() const -{ - wxTimeSpan est = GetEstimatedTime(), - elapsed = GetElapsedTime(); - - if (est.IsLongerThan(elapsed)) - return est - elapsed; - return wxTimeSpan(0); // probably est==0 because GetTotalBytes()==0 -} - -wxString wxCurlProgressBaseEvent::GetHumanReadableSpeed(const wxString &invalid, int precision) const -{ - double speed = GetSpeed(); - if (speed == 0 || wxIsNaN(speed)) - return invalid; - - wxULongLong ull((wxULongLong_t)speed); - return wxFileName::GetHumanReadableSize(ull, invalid, precision) + wxS("/s"); -} - - -// base.cpp: implementation of the wxCurlDownloadEvent class. -// -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -DEFINE_EVENT_TYPE(wxCURL_DOWNLOAD_EVENT); - -IMPLEMENT_DYNAMIC_CLASS(wxCurlDownloadEvent, wxEvent); - -wxCurlDownloadEvent::wxCurlDownloadEvent() -: wxCurlProgressBaseEvent(-1, wxCURL_DOWNLOAD_EVENT), - m_rDownloadTotal(0.0), m_rDownloadNow(0.0) -{ -} - -wxCurlDownloadEvent::wxCurlDownloadEvent(int id, wxCurlBase *originator, - const double& rDownloadTotal, const double& rDownloadNow, - const wxString& szURL /*= wxEmptyString*/) -: wxCurlProgressBaseEvent(id, wxCURL_DOWNLOAD_EVENT, originator, szURL), -m_rDownloadTotal(rDownloadTotal), m_rDownloadNow(rDownloadNow) -{ -} - -wxCurlDownloadEvent::wxCurlDownloadEvent(const wxCurlDownloadEvent& event) -: wxCurlProgressBaseEvent(event) -{ - m_rDownloadNow = event.m_rDownloadNow; - m_rDownloadTotal = event.m_rDownloadTotal; -} - - - -// base.cpp: implementation of the wxCurlUploadEvent class. -// -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -DEFINE_EVENT_TYPE(wxCURL_UPLOAD_EVENT); - -IMPLEMENT_DYNAMIC_CLASS(wxCurlUploadEvent, wxEvent); - -wxCurlUploadEvent::wxCurlUploadEvent() -: wxCurlProgressBaseEvent(-1, wxCURL_UPLOAD_EVENT), - m_rUploadTotal(0.0), m_rUploadNow(0.0) -{ -} - -wxCurlUploadEvent::wxCurlUploadEvent(int id, wxCurlBase *originator, - const double& rUploadTotal, const double& rUploadNow, - const wxString& szURL /*= wxEmptyString*/) -: wxCurlProgressBaseEvent(id, wxCURL_UPLOAD_EVENT, originator, szURL), -m_rUploadTotal(rUploadTotal), m_rUploadNow(rUploadNow) -{ -} - -wxCurlUploadEvent::wxCurlUploadEvent(const wxCurlUploadEvent& event) -: wxCurlProgressBaseEvent(event) -{ - m_rUploadNow = event.m_rUploadNow; - m_rUploadTotal = event.m_rUploadTotal; -} - - - -// wxCurlBase.cpp: implementation of the wxCurlBeginPerformEvent class. -// -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -DEFINE_EVENT_TYPE(wxCURL_BEGIN_PERFORM_EVENT); - -IMPLEMENT_DYNAMIC_CLASS(wxCurlBeginPerformEvent, wxEvent); - -wxCurlBeginPerformEvent::wxCurlBeginPerformEvent() -: wxEvent(-1, wxCURL_BEGIN_PERFORM_EVENT) -{ -} - -wxCurlBeginPerformEvent::wxCurlBeginPerformEvent(int id, const wxString& szURL) -: wxEvent(id, wxCURL_BEGIN_PERFORM_EVENT), -m_szURL(szURL) -{ -} - -wxCurlBeginPerformEvent::wxCurlBeginPerformEvent(const wxCurlBeginPerformEvent& event) -: wxEvent(event) -{ - m_szURL = event.m_szURL; -} - -// wxCurlBase.cpp: implementation of the wxCurlEndPerformEvent class. -// -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -DEFINE_EVENT_TYPE(wxCURL_END_PERFORM_EVENT); - -IMPLEMENT_DYNAMIC_CLASS(wxCurlEndPerformEvent, wxEvent); - -wxCurlEndPerformEvent::wxCurlEndPerformEvent() -: wxEvent(-1, wxCURL_END_PERFORM_EVENT), -m_iResponseCode(0) -{ -} - -wxCurlEndPerformEvent::wxCurlEndPerformEvent(int id, const wxString& szURL, const long& iResponseCode) -: wxEvent(id, wxCURL_END_PERFORM_EVENT), -m_szURL(szURL), -m_iResponseCode(iResponseCode) -{ -} - -wxCurlEndPerformEvent::wxCurlEndPerformEvent(const wxCurlEndPerformEvent& event) -: wxEvent(event) -{ - m_szURL = event.m_szURL; - m_iResponseCode = event.m_iResponseCode; -} - -// wxCurlBase.cpp: implementation of the wxCurlBase class. -// -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -wxCurlBase::wxCurlBase(const wxString& szURL /*= wxEmptyString*/, - const wxString& szUserName /*= wxEmptyString*/, - const wxString& szPassword /*= wxEmptyString*/, - wxEvtHandler* pEvtHandler /*= NULL*/, - int id /*= wxID_ANY*/, - long flags /*=wxCURL_DEFAULT_FLAGS*/) - : m_pCURL(NULL), -m_szBaseURL(wxCURL_STRING2BUF(szURL)), -m_szCurrFullURL(wxCURL_STRING2BUF(szURL)), -m_szUsername(wxCURL_STRING2BUF(szUserName)), -m_szPassword(wxCURL_STRING2BUF(szPassword)), -m_iHostPort(-1), -m_iResponseCode(-1), -m_pHeaders(NULL), -m_bUseProxy(false), m_iProxyPort(-1), -m_bVerbose(false), -m_pEvtHandler(pEvtHandler), m_nId(id), -m_nFlags(flags) -{ - m_szDetailedErrorBuffer[0] = '\0'; - m_progressCallback = wxcurl_evt_progress_func; - m_progressData = this; - - InitHandle(); -} - -wxCurlBase::~wxCurlBase() -{ - CleanupHandle(); - ResetHeaders(); -} - -////////////////////////////////////////////////////////////////////// -// LibCURL Abstraction Methods -////////////////////////////////////////////////////////////////////// - -typedef int (*func_T)(void); -bool wxCurlBase::SetOpt(CURLoption option, ...) -{ - va_list arg; - - func_T param_func = (func_T)0; - long param_long = 0; - void *param_obj = NULL; - curl_off_t param_offset = 0; - - va_start(arg, option); - - CURLcode res = CURLE_OK; - - // This code stolen from easy.c from LibCURL - It is needed to ensure that - // types are maintained. - if(option < CURLOPTTYPE_OBJECTPOINT) { - /* This is a LONG type */ - param_long = va_arg(arg, long); - res = curl_easy_setopt(m_pCURL, option, param_long); - } - else if(option < CURLOPTTYPE_FUNCTIONPOINT) { - /* This is a object pointer type */ - param_obj = va_arg(arg, void *); - res = curl_easy_setopt(m_pCURL, option, param_obj); - } - else if(option < CURLOPTTYPE_OFF_T) { - /* This is a function pointer type */ - param_func = va_arg(arg, func_T ); - res = curl_easy_setopt(m_pCURL, option, param_func); - } else { - /* This is a curl_off_t type */ - param_offset = va_arg(arg, curl_off_t); - res = curl_easy_setopt(m_pCURL, option, param_offset); - } - - va_end(arg); - - DumpErrorIfNeed(res); - return (res == CURLE_OK); -} - -bool wxCurlBase::SetStringOpt(CURLoption option, const wxCharBuffer &str) -{ - // VERY IMPORTANT: the caller must ensure given wxCharBuffer is valid - // for all the time it's owned by libCURL - - /* FIXME: converting to plain ASCII is not always the Best Thing. E.g. - for CURLOPT_USERPWD, we'd need to consult RFC2616 (HTTP) or - another RFC depending on the authentication system in use, etc etc - For now we convert to pure ASCII which in 99% of the cases will - Just Do the Work - */ - - return SetOpt(option, (const char*)str); -} - -bool wxCurlBase::GetInfo(CURLINFO info, ...) const -{ - va_list arg; - void* pParam; - - va_start(arg, info); - pParam = va_arg(arg, void*); - - CURLcode res = CURLE_OK; - - res = curl_easy_getinfo(m_pCURL, info, pParam); - - DumpErrorIfNeed(res); - return (res == CURLE_OK); -} - -bool wxCurlBase::Perform() -{ - CURLcode res = CURLE_OK; - - if((m_nFlags & wxCURL_SEND_BEGINEND_EVENTS) && m_pEvtHandler) - { - wxCurlBeginPerformEvent bgnEvent(m_nId, wxCURL_BUF2STRING(m_szCurrFullURL)); - wxPostEvent(m_pEvtHandler, bgnEvent); - } - - // reset time-related vars: - m_tsElapsedOffset = 0; - m_dtBeginTransferSpan = wxDateTime::Now(); - - // perform the operation: - res = curl_easy_perform(m_pCURL); - - // get the response code of the server - GetInfo(CURLINFO_RESPONSE_CODE, &m_iResponseCode); - - if((m_nFlags & wxCURL_SEND_BEGINEND_EVENTS) && m_pEvtHandler) - { - wxCurlEndPerformEvent endEvent(m_nId, wxCURL_BUF2STRING(m_szCurrFullURL), m_iResponseCode); - wxPostEvent(m_pEvtHandler, endEvent); - } - - DumpErrorIfNeed(res); - return (res == CURLE_OK); -} - -bool wxCurlBase::InitHandle() -{ - if(m_pCURL) - return false; - - m_pCURL = curl_easy_init(); - - return (m_pCURL != NULL); -} - -bool wxCurlBase::ReInitHandle() -{ - CleanupHandle(); - return InitHandle(); -} - -bool wxCurlBase::CleanupHandle() -{ - if(m_pCURL) - { - curl_easy_cleanup(m_pCURL); - m_pCURL = NULL; - } - - return true; -} - -bool wxCurlBase::ResetHandle() -{ - curl_easy_reset(m_pCURL); - - return true; -} - -void wxCurlBase::DumpErrorIfNeed(CURLcode error) const -{ - // save the error description: - wx_const_cast(wxCurlBase*, this)->m_szLastError = curl_easy_strerror(error); - - if (m_bVerbose && error != CURLE_OK) - { - // dump the error if needed: - wxLogDebug(wxS("[wxCURL] %hs"), (const char*)m_szLastError); - } -} - -////////////////////////////////////////////////////////////////////// -// Member Data Access Methods -////////////////////////////////////////////////////////////////////// - -bool wxCurlBase::SetEvtHandler(wxEvtHandler* pEvtHandler, int id) -{ - m_pEvtHandler = pEvtHandler; - m_nId = id; - - return true; -} - -wxEvtHandler* wxCurlBase::GetEvtHandler() const -{ - return m_pEvtHandler; -} - -int wxCurlBase::GetId() const -{ - return m_nId; -} - -void wxCurlBase::SetFlags(long flags) -{ - m_nFlags = flags; -} - -long wxCurlBase::GetFlags() const -{ - return m_nFlags; -} - -void wxCurlBase::SetBaseURL(const wxString& szBaseURL) -{ - m_szBaseURL = wxCURL_STRING2BUF(szBaseURL); -} - -wxString wxCurlBase::GetBaseURL() const -{ - return wxCURL_BUF2STRING(m_szBaseURL); -} - -void wxCurlBase::SetURL(const wxString& szRelativeURL) -{ - wxString str = wxCURL_BUF2STRING(m_szCurrFullURL) + szRelativeURL; - m_szCurrFullURL = wxCURL_STRING2BUF(str); -} - -wxString wxCurlBase::GetURL() const -{ - return wxCURL_BUF2STRING(m_szCurrFullURL); -} - -void wxCurlBase::SetPort(const long& iPort) -{ - m_iHostPort = iPort; -} - -long wxCurlBase::GetPort() const -{ - return m_iHostPort; -} - -void wxCurlBase::SetUsername(const wxString& szUsername) -{ - m_szUsername = wxCURL_STRING2BUF(szUsername); -} - -wxString wxCurlBase::GetUsername() const -{ - return wxCURL_BUF2STRING(m_szUsername); -} - -void wxCurlBase::SetPassword(const wxString& szPassword) -{ - m_szPassword = wxCURL_STRING2BUF(szPassword); -} - -wxString wxCurlBase::GetPassword() const -{ - return wxCURL_BUF2STRING(m_szPassword); -} - -wxString wxCurlBase::GetResponseHeader() const -{ - return wxCURL_BUF2STRING(m_szResponseHeader); -} - -wxString wxCurlBase::GetResponseBody() const -{ - return wxCURL_BUF2STRING(m_szResponseBody); -} - -long wxCurlBase::GetResponseCode() const -{ - return m_iResponseCode; -} - -wxString wxCurlBase::GetDetailedErrorString() const -{ - return wxString((const char*)m_szDetailedErrorBuffer, wxConvLibc); -} - -wxString wxCurlBase::GetErrorString() const -{ - return wxCURL_BUF2STRING(m_szLastError); -} - -void wxCurlBase::UseProxy(const bool& bUseProxy) -{ - m_bUseProxy = bUseProxy; -} - -bool wxCurlBase::UseProxy() const -{ - return m_bUseProxy; -} - -void wxCurlBase::SetProxyHost(const wxString& szProxyHost) -{ - m_szProxyHost = wxCURL_STRING2BUF(szProxyHost); -} - -wxString wxCurlBase::GetProxyHost() const -{ - return wxCURL_BUF2STRING(m_szProxyHost); -} - -void wxCurlBase::SetProxyUsername(const wxString& szProxyUsername) -{ - m_szProxyUsername = wxCURL_STRING2BUF(szProxyUsername); -} - -wxString wxCurlBase::GetProxyUsername() const -{ - return wxCURL_BUF2STRING(m_szProxyUsername); -} - -void wxCurlBase::SetProxyPassword(const wxString& szProxyPassword) -{ - m_szProxyPassword = wxCURL_STRING2BUF(szProxyPassword); -} - -wxString wxCurlBase::GetProxyPassword() const -{ - return wxCURL_BUF2STRING(m_szProxyPassword); -} - -void wxCurlBase::SetProxyPort(const long& iProxyPort) -{ - m_iProxyPort = iProxyPort; -} - -long wxCurlBase::GetProxyPort() const -{ - return m_iProxyPort; -} - -void wxCurlBase::SetVerbose(const bool& bVerbose) -{ - m_bVerbose = bVerbose; -} - -bool wxCurlBase::IsVerbose() const -{ - return m_bVerbose; -} - -bool wxCurlBase::GetVerboseStream(wxOutputStream& destStream) const -{ - if(m_bVerbose) - { - if(m_mosVerbose.IsOk()) - { - size_t sz = m_mosVerbose.GetSize(); - wxString buffer = m_mosVerbose.GetString(); - - destStream.Write(buffer.c_str(), sz); - return destStream.IsOk(); - } - } - - return false; -} - -bool wxCurlBase::GetVerboseString(wxString& szStream) const -{ - if(m_bVerbose) - { - szStream.Append(m_mosVerbose.GetString()); - return true; - } - - return false; -} - -////////////////////////////////////////////////////////////////////// -// Helper Methods -////////////////////////////////////////////////////////////////////// - -void wxCurlBase::SetCurlHandleToDefaults(const wxString& relativeURL) -{ - if (!relativeURL.empty()) - SetURL(relativeURL); // update the m_szCurrFullURL string - - if(m_pCURL && ResetHandle()) - { - ResetResponseVars(); - - SetStringOpt(CURLOPT_URL, m_szCurrFullURL); - - SetOpt(CURLOPT_HEADERFUNCTION, wxcurl_header_func); - SetOpt(CURLOPT_WRITEHEADER, &m_szResponseHeader); - SetOpt(CURLOPT_ERRORBUFFER, m_szDetailedErrorBuffer); - - if(m_pEvtHandler && (m_nFlags & wxCURL_SEND_PROGRESS_EVENTS)) - { - SetOpt(CURLOPT_NOPROGRESS, FALSE); - SetOpt(CURLOPT_PROGRESSFUNCTION, m_progressCallback); - SetOpt(CURLOPT_PROGRESSDATA, m_progressData); - } - - if(!wxCURL_BUF_ISEMPTY(m_szUsername) || !wxCURL_BUF_ISEMPTY(m_szPassword)) - { - wxString str = wxCURL_BUF2STRING(m_szUsername) + wxS(":") + wxCURL_BUF2STRING(m_szPassword); - - m_szUserPass = wxCURL_STRING2BUF(str); - SetStringOpt(CURLOPT_USERPWD, m_szUserPass); - - SetOpt(CURLOPT_HTTPAUTH, CURLAUTH_ANY); - } - - if(m_iHostPort != -1) - { - SetOpt(CURLOPT_PORT, m_iHostPort); - } - - if(m_bUseProxy && !wxCURL_BUF_ISEMPTY(m_szProxyHost)) - { - SetStringOpt(CURLOPT_PROXY, m_szProxyHost); - } - - if(m_bUseProxy && (m_iProxyPort != -1)) - { - SetOpt(CURLOPT_PROXYPORT, m_iProxyPort); - } - - if(m_bUseProxy && (!wxCURL_BUF_ISEMPTY(m_szProxyUsername) || !wxCURL_BUF_ISEMPTY(m_szProxyPassword))) - { - wxString str = wxCURL_BUF2STRING(m_szProxyUsername) + wxS(":") + wxCURL_BUF2STRING(m_szProxyPassword); - - m_szProxyUserPass = wxCURL_STRING2BUF(str); - SetStringOpt(CURLOPT_PROXYUSERPWD, m_szProxyUserPass); - } - - if(m_bVerbose) - { - SetOpt(CURLOPT_VERBOSE, TRUE); - SetOpt(CURLOPT_DEBUGFUNCTION, wxcurl_verbose_stream_write); - SetOpt(CURLOPT_DEBUGDATA, (void*) &m_mosVerbose); - } - } -} - -void wxCurlBase::SetHeaders() -{ - if(!m_arrHeaders.IsEmpty()) - { - if(m_pHeaders) - { - curl_slist_free_all(m_pHeaders); - - m_pHeaders = NULL; - - SetOpt(CURLOPT_HTTPHEADER, NULL); - } - - for(unsigned int i = 0; i < m_arrHeaders.Count(); i++) - { - m_pHeaders = curl_slist_append(m_pHeaders, wxCURL_STRING2BUF(m_arrHeaders[i])); - } - - SetOpt(CURLOPT_HTTPHEADER, m_pHeaders); - } -} - -void wxCurlBase::ResetHeaders() -{ - m_arrHeaders.Clear(); - - if(m_pHeaders) - { - curl_slist_free_all(m_pHeaders); - - m_pHeaders = NULL; - - SetOpt(CURLOPT_HTTPHEADER, NULL); - } -} - -void wxCurlBase::ResetResponseVars() -{ - m_szResponseHeader = ""; - m_szResponseBody = ""; - m_iResponseCode = -1; -} - -////////////////////////////////////////////////////////////////////// -// Static Initialization and Shutdown Methods -////////////////////////////////////////////////////////////////////// - -void wxCurlBase::Init() -{ - // Initialize LibCURL - curl_global_init(CURL_GLOBAL_ALL); -} - -void wxCurlBase::Shutdown() -{ - // Shutdown CurlLib - curl_global_cleanup(); -} - -////////////////////////////////////////////////////////////////////// -// Static Utility Methods -////////////////////////////////////////////////////////////////////// - -wxDateTime wxCurlBase::GetDateFromString(const wxString& szDate) -{ - time_t now = wxDateTime::Now().GetTicks(); - - return wxDateTime(curl_getdate((const char*)(szDate.c_str()), &now)); -} - -wxString wxCurlBase::GetURLEncodedString(const wxString& szData) -{ - char* pszRetVal = curl_escape((const char*)(szData.c_str()), szData.Len()); - - if(pszRetVal) - { - wxString szRetVal((const char*)pszRetVal, wxConvLibc); - - curl_free(pszRetVal); - - return szRetVal; - } - - return wxEmptyString; -} - -wxString wxCurlBase::GetStringFromURLEncoded(const wxString& szData) -{ - char* pszRetVal = curl_unescape((const char*)(szData.c_str()), szData.Len()); - - if(pszRetVal) - { - wxString szRetVal = (wxChar*)pszRetVal; - - curl_free(pszRetVal); - - return szRetVal; - } - - return wxEmptyString; -} - -wxString wxCurlBase::GetCURLVersion() -{ - return wxString(curl_version(), wxConvUTF8); -} diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/dav.cpp opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/dav.cpp --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/dav.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/dav.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,287 +0,0 @@ -/* - * dav.cpp - * wxCURL - * - * Created by Casey O'Donnell on Wed Jun 02 2004. - * Copyright (c) 2004 Casey O'Donnell. All rights reserved. - * - * - * Licence: wxWidgets Licence - */ - -// dav.cpp: implementation of the wxCurlDAV class. -// -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Headers -////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif - -#ifdef __WXMSW__ - #include // useful to catch memory leaks when compiling under MSVC -#endif - -#include - -#include - -////////////////////////////////////////////////////////////////////// -// Constants -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -wxCurlDAV::wxCurlDAV(const wxString& szURL /*= wxEmptyString*/, - const wxString& szUserName /*= wxEmptyString*/, - const wxString& szPassword /*= wxEmptyString*/, - wxEvtHandler* pEvtHandler /*= NULL*/, - long flags /*=wxCURL_DEFAULT_FLAGS*/) -: wxCurlHTTP(szURL, szUserName, szPassword, pEvtHandler, flags) -{ -} - -wxCurlDAV::~wxCurlDAV() -{ -} - -////////////////////////////////////////////////////////////////////// -// Member Data Access Methods -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Action Methods -////////////////////////////////////////////////////////////////////// - -bool wxCurlDAV::Mkcol(const wxString& szRemoteCol /*= wxEmptyString*/) -{ - if(m_pCURL) - { - SetCurlHandleToDefaults(szRemoteCol); - - SetOpt(CURLOPT_CUSTOMREQUEST, "MKCOL"); - SetStringWriteFunction(m_szResponseBody); - - if(Perform()) - { - return ((m_iResponseCode > 199) && (m_iResponseCode < 300)); - } - } - - return false; -} - -bool wxCurlDAV::Propfind(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - return Propfind(NULL, 0, szRemoteLoc); -} - -bool wxCurlDAV::Propfind(const wxArrayString& arrTags, const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxString szXml = ConstructPropfindXml(arrTags); - - return Propfind((const char*)(szXml.c_str()), szXml.Len(), szRemoteLoc); -} - -bool wxCurlDAV::Propfind(const char* buffer, size_t size, const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxMemoryInputStream inStream(buffer, size); - - return Propfind(inStream, szRemoteLoc); -} - -bool wxCurlDAV::Propfind(wxInputStream& buffer, const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - curl_off_t iSize = buffer.GetSize(); - - if(m_pCURL && buffer.IsOk()) - { - if(iSize == (~(ssize_t)0)) // wxCurlDAV does not know how to upload unknown length streams. - return false; - - SetCurlHandleToDefaults(szRemoteLoc); - - m_arrHeaders.Add(wxS("Depth: 1")); - m_arrHeaders.Add(wxS("Content-Type: text/xml; charset=\"utf-8\"")); - - SetHeaders(); - - if(iSize > 0) - { - SetOpt(CURLOPT_UPLOAD, TRUE); - SetOpt(CURLOPT_INFILESIZE_LARGE, iSize); - SetStreamReadFunction(buffer); - } - - SetOpt(CURLOPT_CUSTOMREQUEST, "PROPFIND"); - SetStringWriteFunction(m_szResponseBody); - - if(Perform()) - { - ResetHeaders(); - - return ((m_iResponseCode > 199) && (m_iResponseCode < 300)); - } - - ResetHeaders(); - } - - return false; -} - -bool wxCurlDAV::Proppatch(const char* buffer, size_t size, const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxMemoryInputStream inStream(buffer, size); - - return Proppatch(inStream, szRemoteLoc); -} - -bool wxCurlDAV::Proppatch(wxInputStream& buffer, const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - curl_off_t iSize = buffer.GetSize(); - - if(m_pCURL && buffer.IsOk()) - { - if(iSize == (~(ssize_t)0)) // wxCurlDAV does not know how to upload unknown length streams. - return false; - - SetCurlHandleToDefaults(szRemoteLoc); - - m_arrHeaders.Add(wxS("Content-Type: text/xml; charset=\"utf-8\"")); - - SetHeaders(); - - if(iSize > 0) - { - SetOpt(CURLOPT_UPLOAD, TRUE); - SetOpt(CURLOPT_INFILESIZE_LARGE, iSize); - SetStreamReadFunction(buffer); - } - - SetOpt(CURLOPT_CUSTOMREQUEST, "PROPPATCH"); - SetStringWriteFunction(m_szResponseBody); - - if(Perform()) - { - ResetHeaders(); - - return ((m_iResponseCode > 199) && (m_iResponseCode < 300)); - } - - ResetHeaders(); - } - - return false; -} - -bool wxCurlDAV::Copy(const wxString& szRemoteLocDest, const bool& bOverwrite /*= true*/, - const wxString& szRemoteLocSrc /*= wxEmptyString*/) -{ - if(m_pCURL) - { - SetCurlHandleToDefaults(szRemoteLocSrc); - - m_arrHeaders.Add(wxS("Destination: ") + szRemoteLocDest); - - if(!bOverwrite) - m_arrHeaders.Add(wxS("Overwrite: F")); - - SetHeaders(); - - SetOpt(CURLOPT_CUSTOMREQUEST, "COPY"); - SetStringWriteFunction(m_szResponseBody); - - if(Perform()) - { - ResetHeaders(); - - return ((m_iResponseCode > 199) && (m_iResponseCode < 300)); - } - - ResetHeaders(); - } - - return false; -} - -bool wxCurlDAV::Move(const wxString& szRemoteLocDest, const bool& bOverwrite /*= true*/, - const wxString& szRemoteLocSrc /*= wxEmptyString*/) -{ - if(m_pCURL) - { - SetCurlHandleToDefaults(szRemoteLocSrc); - - m_arrHeaders.Add(wxS("Destination: ") + szRemoteLocDest); - - if(!bOverwrite) - m_arrHeaders.Add(wxS("Overwrite: F")); - - SetHeaders(); - - SetOpt(CURLOPT_CUSTOMREQUEST, "MOVE"); - SetStringWriteFunction(m_szResponseBody); - - if(Perform()) - { - ResetHeaders(); - - return ((m_iResponseCode > 199) && (m_iResponseCode < 300)); - } - - ResetHeaders(); - } - - return false; -} - -bool wxCurlDAV::Lock(const wxString& WXUNUSED(szRemoteLoc /*=wxEmptyString*/)) -{ - return false; -} - -bool wxCurlDAV::Unlock(const wxString& WXUNUSED(szRemoteLoc /*=wxEmptyString*/)) -{ - return false; -} - -////////////////////////////////////////////////////////////////////// -// Helper Methods -////////////////////////////////////////////////////////////////////// - -wxString wxCurlDAV::ConstructPropfindXml(const wxArrayString& arrTags) -{ - wxString szXml; - - szXml += wxS("") wxS("\n"); - szXml += wxS("") wxS("\n"); - - if(arrTags.Count() > 0) - { - szXml += wxS("\t") wxS("") wxS("\n"); - - for(unsigned int i = 0; i < arrTags.Count(); i++) - { - szXml += wxS("\t\t") wxS("") wxS("\n"); - } - - szXml += wxS("\t") wxS("") wxS("\n"); - } - else - { - szXml += wxS("\t") wxS("") wxS("\n"); - } - - szXml += wxS("") wxS("\n"); - - return szXml; -} - diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/davtool.cpp opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/davtool.cpp --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/davtool.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/davtool.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,431 +0,0 @@ -/* - * davtool.cpp - * wxCURL - * - * Created by Casey O'Donnell on Thu Jul 15 2004. - * Copyright (c) 2004 Casey O'Donnell. All rights reserved. - * - * - * Licence: wxWidgets Licence - */ - -// davtool.cpp -// -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Headers -////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif - -#ifdef __WXMSW__ - #include // useful to catch memory leaks when compiling under MSVC -#endif - - -#include -#include -#include - -#include - -////////////////////////////////////////////////////////////////////// -// Constants -////////////////////////////////////////////////////////////////////// - -// davtool.cpp: implementation of the wxCurlDAVFs class. -// -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -wxCurlDAVFs::wxCurlDAVFs() -: m_iContentLength(0) -{ -} - -wxCurlDAVFs::wxCurlDAVFs(const wxString& szHREF , - const wxString& szStatus , - const wxString& szCreationDate , - const wxString& szLastModified , - const long& iContentLength , - const wxString& szContentType ) -: m_szHREF(szHREF), m_szStatus(szStatus), -m_iContentLength(iContentLength), m_szContentType(szContentType) -{ - m_dtCreationDate = wxCurlBase::GetDateFromString(szCreationDate); - m_dtLastModified = wxCurlBase::GetDateFromString(szLastModified); -} - -wxCurlDAVFs::~wxCurlDAVFs() -{ -} - -// davtool.cpp: implementation of the wxCurlDAVTool class. -// -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -wxCurlDAVTool::wxCurlDAVTool(const wxString& szURL /*= wxEmptyString*/, - const wxString& szUserName /*= wxEmptyString*/, - const wxString& szPassword /*= wxEmptyString*/, - wxEvtHandler* pEvtHandler /*= NULL*/, - long flags/*= wxCURL_DEFAULT_FLAGS*/) -: wxCurlDAV(szURL, szUserName, szPassword, pEvtHandler, flags) -{ -} - -wxCurlDAVTool::~wxCurlDAVTool() -{ -} - -////////////////////////////////////////////////////////////////////// -// Member Data Access Methods -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Action Methods -////////////////////////////////////////////////////////////////////// - -bool wxCurlDAVTool::GetDAVFs(wxArrayDAVFs& fs, const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxArrayString arrProps; - - arrProps.Add(wxS("creationdate")); - arrProps.Add(wxS("getlastmodified")); - arrProps.Add(wxS("getcontentlength")); - arrProps.Add(wxS("getcontenttype")); - - if(Propfind(arrProps, szRemoteLoc)) - { - // Construct Input Source... - wxStringInputStream inStream(wxCURL_BUF2STRING(m_szResponseBody)); - - if(inStream.IsOk()) - { - // Construct XML Parser - wxXmlDocument xmlPropfind(inStream); - - if(xmlPropfind.IsOk()) - { - // Process XML! - wxXmlNode* pNode = xmlPropfind.GetRoot(); - - // Strip Past First "Multistatus" tag... - while(pNode) - { - if(pNode->GetName().Find(wxS("multistatus")) != -1) - { - pNode = pNode->GetChildren(); - break; - } - else - pNode = pNode->GetNext(); - } - - // Process "Response" tags... - while(pNode) - { - wxCurlDAVFs fsItem; - - wxString szName = pNode->GetName(); - - if(pNode->GetName().Find(wxS("response")) != -1) - { - if(ParseResponseXml(fsItem, pNode)) - fs.Add(fsItem); - } - - pNode = pNode->GetNext(); - } - - return true; - } - } - } - - return false; -} - -bool wxCurlDAVTool::Exists(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxArrayDAVFs arrFs; - - if(GetDAVFs(arrFs, szRemoteLoc)) - { - return true; - } - - return false; -} - -bool wxCurlDAVTool::IsDirectory(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxArrayDAVFs arrFs; - - if(GetDAVFs(arrFs, szRemoteLoc)) - { - return arrFs.Last().IsDirectory(); - } - - return false; -} - -bool wxCurlDAVTool::IsOk(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxArrayDAVFs arrFs; - - if(GetDAVFs(arrFs, szRemoteLoc)) - { - return arrFs.Last().IsOK(); - } - - return false; -} - -wxDateTime wxCurlDAVTool::GetLastModified(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxArrayDAVFs arrFs; - - if(GetDAVFs(arrFs, szRemoteLoc)) - { - return arrFs.Last().GetLastModified(); - } - - return wxDateTime(); -} - -wxDateTime wxCurlDAVTool::GetCreationDate(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxArrayDAVFs arrFs; - - if(GetDAVFs(arrFs, szRemoteLoc)) - { - return arrFs.Last().GetCreationDate(); - } - - return wxDateTime(); -} - -long wxCurlDAVTool::GetContentLength(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxArrayDAVFs arrFs; - - if(GetDAVFs(arrFs, szRemoteLoc)) - { - return arrFs.Last().GetContentLength(); - } - - return -1; -} - -wxString wxCurlDAVTool::GetContentType(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxArrayDAVFs arrFs; - - if(GetDAVFs(arrFs, szRemoteLoc)) - { - return arrFs.Last().GetContentType(); - } - - return wxEmptyString; -} - -////////////////////////////////////////////////////////////////////// -// Helper Methods -////////////////////////////////////////////////////////////////////// - -bool wxCurlDAVTool::ParseResponseXml(wxCurlDAVFs& fsItem, wxXmlNode* pNode) -{ - if(pNode->GetName().Find(wxS("response")) != -1) - { - wxXmlNode* pChild = pNode->GetChildren(); - - bool bFoundHref = false; - bool bParsedPropstat = false; - - while(pChild) - { - if(pChild->GetName().Find(wxS("href")) != -1) - { - wxXmlNode* pText = pChild->GetChildren(); - - while(pText) - { - if(pText->GetType() == wxXML_TEXT_NODE) - { - fsItem.m_szHREF = pText->GetContent(); - bFoundHref = true; - } - - pText = pText->GetNext(); - } - } - - if(!bParsedPropstat) - { - if(pChild->GetName().Find(wxS("propstat")) != -1) - { - bParsedPropstat = ParsePropstatXml(fsItem, pChild); - } - } - - pChild = pChild->GetNext(); - } - - return bFoundHref && bParsedPropstat; - } - - return false; -} - -bool wxCurlDAVTool::ParsePropstatXml(wxCurlDAVFs& fsItem, wxXmlNode* pNode) -{ - if(pNode->GetName().Find(wxS("propstat")) != -1) - { - wxXmlNode* pChild = pNode->GetChildren(); - - bool bFoundStatus = false; - bool bParsedProps = false; - - while(pChild) - { - if(pChild->GetName().Find(wxS("status")) != -1) - { - wxXmlNode* pText = pChild->GetChildren(); - - while(pText) - { - if(pText->GetType() == wxXML_TEXT_NODE) - { - if(fsItem.m_szStatus.IsEmpty()) - fsItem.m_szStatus = pText->GetContent(); - - bFoundStatus = true; - } - - pText = pText->GetNext(); - } - } - - if(pChild->GetName().Find(wxS("prop")) != -1) - { - bParsedProps = ParsePropsXml(fsItem, pChild); - } - - pChild = pChild->GetNext(); - } - - return bFoundStatus && bParsedProps; - } - - return false; -} - -bool wxCurlDAVTool::ParsePropsXml(wxCurlDAVFs& fsItem, wxXmlNode* pNode) -{ - if(pNode->GetName().Find(wxS("prop")) != -1) - { - wxXmlNode* pChild = pNode->GetChildren(); - - bool bFoundCreationDate = false; - bool bFoundLastModified = false; -// bool bFoundGetContentLength = false; -// bool bFoundGetContentType = false; - - while(pChild) - { - if(pChild->GetName().Find(wxS("creationdate")) != -1) - { - wxXmlNode* pText = pChild->GetChildren(); - - while(pText) - { - if(pText->GetType() == wxXML_TEXT_NODE) - { - wxString szVal = pText->GetContent(); - - fsItem.m_dtCreationDate.ParseFormat(szVal, wxS("%Y-%m-%dT%H:%M:%S")); - bFoundCreationDate = true; - } - - pText = pText->GetNext(); - } - } - - if(pChild->GetName().Find(wxS("getlastmodified")) != -1) - { - wxXmlNode* pText = pChild->GetChildren(); - - while(pText) - { - if(pText->GetType() == wxXML_TEXT_NODE) - { - wxString szVal = pText->GetContent(); - - fsItem.m_dtLastModified.ParseRfc822Date(szVal); - bFoundLastModified = true; - } - - pText = pText->GetNext(); - } - } -#if 0 - if(pChild->GetName().Find(wxS("getcontentlength")) != -1) - { - wxXmlNode* pText = pChild->GetChildren(); - - while(pText) - { - if(pText->GetType() == wxXML_TEXT_NODE) - { - wxString szVal = pText->GetContent(); - - if(szVal.ToLong(&fsItem.m_iContentLength)) - ;// bFoundGetContentLength = true; - } - - pText = pText->GetNext(); - } - } -#endif - if(pChild->GetName().Find(wxS("getcontenttype")) != -1) - { - wxXmlNode* pText = pChild->GetChildren(); - - while(pText) - { - if(pText->GetType() == wxXML_TEXT_NODE) - { - fsItem.m_szContentType = pText->GetContent(); - //bFoundGetContentType = true; - } - - pText = pText->GetNext(); - } - } - - pChild = pChild->GetNext(); - } - - return bFoundCreationDate && bFoundLastModified; - } - - return false; -} - -////////////////////////////////////////////////////////////////////// -// wxArrayDAVFs Implementation -////////////////////////////////////////////////////////////////////// -#include // this is a magic incantation which must be done! -WX_DEFINE_USER_EXPORTED_OBJARRAY(wxArrayDAVFs); diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/dialog.cpp opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/dialog.cpp --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/dialog.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/dialog.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,646 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: dialog.cpp -// Purpose: wxCurlDownloadDialog, wxCurlUploadDialog -// Author: Francesco Montorsi -// Created: 2007/04/14 -// RCS-ID: $Id: dialog.cpp 1240 2010-03-10 23:54:25Z frm $ -// Copyright: (c) 2007 Francesco Montorsi -// Licence: wxWidgets licence -///////////////////////////////////////////////////////////////////////////// - - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -// includes -#ifndef WX_PRECOMP - #include - #include // for _() support - #include // for wxMilliSleep - - #if wxUSE_GUI - #include - #include - #include - #include - #include - #include - #include - #include - #endif -#endif - -#ifdef __WXMSW__ - #include // useful to catch memory leaks when compiling under MSVC -#endif - -#include -#include -#include - -//class WXDLLIMPEXP_CORE wxTextCtrl; -class WXDLLIMPEXP_CORE wxCheckBox; -#include "wx/curl/dialog.h" - - -// ---------------------------------------------------------------------------- -// wxCurlTransferDialog -// ---------------------------------------------------------------------------- - -enum -{ - AbortButtonId = wxID_HIGHEST+1, - PauseResumeButtonId, - StartButtonId, - ConnSettingsButtonId, - - ThreadId -}; - -BEGIN_EVENT_TABLE( wxCurlTransferDialog, wxDialog ) - - // network events - EVT_CURL_END_PERFORM( ThreadId, wxCurlTransferDialog::OnEndPerform ) - - // user events - EVT_BUTTON( AbortButtonId, wxCurlTransferDialog::OnAbort ) - EVT_BUTTON( ConnSettingsButtonId, wxCurlTransferDialog::OnConnSettings ) - EVT_BUTTON( PauseResumeButtonId, wxCurlTransferDialog::OnPauseResume ) - EVT_BUTTON( StartButtonId, wxCurlTransferDialog::OnStart ) - - // update UI - EVT_UPDATE_UI( AbortButtonId, wxCurlTransferDialog::OnAbortUpdateUI ) - EVT_UPDATE_UI( ConnSettingsButtonId, wxCurlTransferDialog::OnConnSettingsUpdateUI ) - EVT_UPDATE_UI( PauseResumeButtonId, wxCurlTransferDialog::OnPauseResumeUpdateUI ) - EVT_UPDATE_UI( StartButtonId, wxCurlTransferDialog::OnStartUpdateUI ) - - // misc - EVT_CLOSE( wxCurlTransferDialog::OnClose ) - -END_EVENT_TABLE() - -bool wxCurlTransferDialog::Create(const wxString &url, const wxString& title, const wxString& message, - const wxString &sizeLabel, const wxBitmap& bitmap, wxWindow *parent, long style) -{ - if (!wxDialog::Create(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, - (wxDEFAULT_DIALOG_STYLE |wxRESIZE_BORDER))) - return false; - - // save&check our style - m_nStyle = style; - wxASSERT_MSG(HasFlag(wxCTDS_AUTO_CLOSE) || HasFlag(wxCTDS_CAN_ABORT), - wxS("If both these flags are missing the user will be unable to close the dialog window!")); - - // do we need to use wxCurlConnectionSettingsDialog? - wxASSERT_MSG(!(HasFlag(wxCTDS_CONN_SETTINGS_AUTH) || - HasFlag(wxCTDS_CONN_SETTINGS_PORT) || - HasFlag(wxCTDS_CONN_SETTINGS_PROXY)) || HasFlag(wxCTDS_CAN_START), - wxS("the connection settings may only be changed before the transfer starts; if wxCTDS_CAN_START ") - wxS("is missing the user will be unable to use the connection settings button!")); - - // set up our controls - CreateControls(url, message, sizeLabel, bitmap); - - return true; -} - -wxCurlDialogReturnFlag wxCurlTransferDialog::RunModal() -{ - m_pThread->GetCurlSession()->SetVerbose(m_bVerbose); - - if (!HasFlag(wxCTDS_CAN_START)) - { - wxCommandEvent fake; - OnStart(fake); // start immediately - } - - CenterOnScreen(); - - return (wxCurlDialogReturnFlag)wxDialog::ShowModal(); -} - -#define OUTER_BORDER 12 -#define BORDER 5 -#define MINWIDTH 300 - -wxStaticText *wxCurlTransferDialog::AddSizerRow(wxSizer *sz, const wxString &name) -{ - // the static text - wxStaticText *st = new wxStaticText( this, wxID_STATIC, name, wxDefaultPosition, wxDefaultSize ); - st->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, wxS(""))); - - // the value - wxStaticText *ret = new wxStaticText( this, wxID_STATIC, _("Not available"), - wxDefaultPosition, wxDefaultSize, - wxALIGN_LEFT|wxST_NO_AUTORESIZE ); - - wxBoxSizer* time = new wxBoxSizer(wxHORIZONTAL); - time->Add(st, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5); - time->Add(ret, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5); - - sz->Add(time, 0, wxGROW|wxLEFT|wxRIGHT, OUTER_BORDER); - - return ret; -} - -void wxCurlTransferDialog::CreateControls(const wxString &url, const wxString &msg, - const wxString &sizeLabel, const wxBitmap &bitmap) -{ - wxBoxSizer* main = new wxBoxSizer(wxVERTICAL); - - // message row - if (!msg.IsEmpty()) - { - wxStaticText *st = new wxStaticText( this, wxID_STATIC, msg ); - st->SetMinSize(wxSize(MINWIDTH, -1)); - main->Add(st, 0, wxLEFT|wxTOP|wxRIGHT|wxBOTTOM|wxGROW, OUTER_BORDER); - } - - // URL row - if (HasFlag(wxCTDS_URL)) - { - wxBoxSizer* downloading = new wxBoxSizer(wxHORIZONTAL); - - wxStaticText *st = new wxStaticText( this, wxID_STATIC, _("URL:") ); - wxFont boldFont(st->GetFont()); - boldFont.SetWeight(wxFONTWEIGHT_BOLD); - st->SetFont(boldFont); - downloading->Add(st, 0, wxRIGHT|wxTOP|wxALIGN_CENTER_VERTICAL, BORDER); - - m_pURL = new wxStaticText( this, wxID_STATIC, url, wxDefaultPosition, - wxSize(MINWIDTH, -1));//, wxST_ELLIPSIZE_MIDDLE); - downloading->Add(m_pURL, 1, wxALIGN_CENTER_VERTICAL|wxTOP, BORDER); - - main->Add(downloading, 0, wxGROW|wxLEFT|wxRIGHT, OUTER_BORDER); - main->AddSpacer(5); - } - - - wxSizer *leftcolumn = new wxBoxSizer(wxVERTICAL); - - // speed & size row - if (HasFlag(wxCTDS_SPEED)) - m_pSpeed = AddSizerRow(leftcolumn, wxS("Speed:")); - if (HasFlag(wxCTDS_SIZE)) - m_pSize = AddSizerRow(leftcolumn, sizeLabel); - - // a spacer - leftcolumn->AddSpacer(5); - - // the time rows - if (HasFlag(wxCTDS_ELAPSED_TIME)) - m_pElapsedTime = AddSizerRow(leftcolumn, wxS("Elapsed time:")); - if (HasFlag(wxCTDS_ESTIMATED_TIME)) - m_pEstimatedTime = AddSizerRow(leftcolumn, wxS("Estimated total time:")); - if (HasFlag(wxCTDS_REMAINING_TIME)) - m_pRemainingTime = AddSizerRow(leftcolumn, wxS("Estimated remaining time:")); - - if (bitmap.IsOk()) - { - wxSizer *rightcolumn = new wxBoxSizer(wxVERTICAL); - rightcolumn->Add( new wxStaticBitmap(this, wxID_ANY, bitmap), - 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, BORDER); - - wxSizer *both = new wxBoxSizer(wxHORIZONTAL); - both->Add(leftcolumn); - both->Add(rightcolumn, 1, wxGROW); - main->Add(both, 0, wxGROW); - } - else - main->Add(leftcolumn); - - - // the gauge - // VERY IMPORTANT: we set as range 101 so that when, because of some approximation, - // the update event handler will SetValue(100), while the transfer - // is not yet complete, the gauge will not appear completely filled. - m_pGauge = new wxGauge( this, wxID_ANY, 101 ); - - main->AddSpacer(5); - main->Add(m_pGauge, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, OUTER_BORDER); - - // do we need to use wxCurlConnectionSettingsDialog? - bool needsConnSettings = HasFlag(wxCTDS_CONN_SETTINGS_AUTH) || - HasFlag(wxCTDS_CONN_SETTINGS_PORT) || - HasFlag(wxCTDS_CONN_SETTINGS_PROXY); - - // an horizontal line of buttons - if (HasFlag(wxCTDS_CAN_ABORT) || HasFlag(wxCTDS_CAN_PAUSE) || HasFlag(wxCTDS_CAN_START) || - needsConnSettings) - { - main->AddStretchSpacer(1); - main->AddSpacer(BORDER*2); - main->Add( new wxStaticLine(this), 0, wxGROW|wxLEFT|wxRIGHT, OUTER_BORDER); - - // the button row - wxBoxSizer *btn = new wxBoxSizer(wxHORIZONTAL); - - if (HasFlag(wxCTDS_CAN_ABORT)) - btn->Add(new wxButton( this, AbortButtonId, _("Abort") ), 0, wxRIGHT, BORDER); - if (needsConnSettings) - btn->Add(new wxButton( this, ConnSettingsButtonId, _("Settings") ), 0); - - btn->AddStretchSpacer(1); - - if (HasFlag(wxCTDS_CAN_PAUSE)) - btn->Add(new wxButton( this, PauseResumeButtonId, _("Pause") ), 0); - if (HasFlag(wxCTDS_CAN_START)) - btn->Add(new wxButton( this, StartButtonId, _("Start") ), 0, wxLEFT, BORDER); - - main->Add(btn, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP|wxBOTTOM, OUTER_BORDER); - } - - this->SetSizerAndFit(main); - main->SetSizeHints(this); -} - -void wxCurlTransferDialog::EndModal(wxCurlDialogReturnFlag retCode) -{ - wxDialog::EndModal(retCode); - - // before dying we must be sure our thread has completed, too - // otherwise it will try to send events to a non-existent handler - // NB: this must be done *after* calling wxDialog::EndModal - // so that while we wait we are hidden - if (m_pThread->IsAlive()) - HandleCurlThreadError(m_pThread->Wait(), m_pThread); -} - -void wxCurlTransferDialog::UpdateLabels(wxCurlProgressBaseEvent *ev) -{ - // ignore this update if the thread has been paused - // since this event was generated... - if (m_pThread->IsPaused()) - return; - - // NOTE: we need instead to process this update if the thread has completed - // but that's for another reason: see m_pLastEvent stuff - - double fraction = ev->GetPercent(); - if (fraction != 0) - { - m_pGauge->SetValue((int)fraction); - } - else - { - // we don't know how much we progressed... - m_pGauge->Pulse(); - } - - if (m_pElapsedTime) - m_pElapsedTime->SetLabel(ev->GetElapsedTime().Format()); - if (m_pRemainingTime) - m_pRemainingTime->SetLabel(ev->GetEstimatedRemainingTime().Format()); - if (m_pEstimatedTime) - m_pEstimatedTime->SetLabel(ev->GetEstimatedTime().Format()); - - if (m_pSize) - { - wxString currsize = ev->GetHumanReadableTransferredBytes(), - totalsize = ev->GetHumanReadableTotalBytes(); - m_pSize->SetLabel( - wxString::Format(wxS("%s / %s (%0.1f%%)"), - currsize.c_str(), totalsize.c_str(), ev->GetPercent())); - } - - if (m_pSpeed) - m_pSpeed->SetLabel(ev->GetHumanReadableSpeed()); -} - -bool wxCurlTransferDialog::HandleCurlThreadError(wxCurlThreadError err, wxCurlBaseThread *p, const wxString &url) -{ - switch (err) - { - case wxCTE_NO_ERROR: - return true; // ignore this - - case wxCTE_NO_RESOURCE: - wxLogError(wxS("Insufficient resources for correct execution of the program.")); - break; - - case wxCTE_ALREADY_RUNNING: - wxFAIL; // should never happen! - break; - - case wxCTE_INVALID_PROTOCOL: - wxLogError(wxS("The URL '%s' uses an unsupported protocol."), url.c_str()); - break; - - case wxCTE_NO_VALID_STREAM: - wxFAIL; // should never happen - the user streams should always be valid! - break; - - case wxCTE_ABORTED: - return true; // ignore this - - case wxCTE_CURL_ERROR: - { - wxString err = wxS("unknown"); - if (p->GetCurlSession()) - err = p->GetCurlSession()->GetErrorString(); - wxLogError(wxS("Network error: %s"), err.c_str()); - } - break; - } - - // stop the thread - if (p->IsAlive()) p->Abort(); - - // this is an unrecoverable error: - return false; -} - - -// ---------------------------------------------------------------------------- -// wxCurlTransferDialog - button events -// ---------------------------------------------------------------------------- - -void wxCurlTransferDialog::OnClose(wxCloseEvent &WXUNUSED(ev)) -{ - wxCommandEvent fake; - OnAbort(fake); -} - -void wxCurlTransferDialog::OnAbort(wxCommandEvent &WXUNUSED(ev)) -{ - // NOTE: the wxCTDS_ABORT flag may be absent if the user wxASSERT(HasFlag(wxCTDS_CAN_ABORT)); - - if (m_pThread->IsAlive()) - { - m_pThread->Abort(); - EndModal(wxCDRF_USER_ABORTED); - } - else - { - wxASSERT(HasFlag(wxCTDS_CAN_START) || !HasFlag(wxCTDS_AUTO_CLOSE)); - // thread is not alive: means the user has not - // clicked on Start button yet or the download is complete - // and the dialog does not auto close - - // if the transfer has been completed, then the OnEndPerform event handler - // has already set the return code to a valid value: - EndModal(m_bTransferComplete ? GetReturnCode() : wxCDRF_USER_ABORTED); - } -} - -void wxCurlTransferDialog::OnAbortUpdateUI(wxUpdateUIEvent &ev) -{ - ev.SetText(m_pThread->IsAlive() ? wxS("Abort") : wxS("Close")); -} - -void wxCurlTransferDialog::OnPauseResume(wxCommandEvent &WXUNUSED(ev)) -{ - wxASSERT(HasFlag(wxCTDS_CAN_PAUSE)); - - if (m_pThread->IsRunning()) - { - if (HandleCurlThreadError(m_pThread->Pause(), m_pThread)) - { - FindWindowById(PauseResumeButtonId)->SetLabel(wxS("Resume")); - - if (m_pSpeed) - m_pSpeed->SetLabel(wxS("0 (transfer paused)")); - } - } - else - { - if (HandleCurlThreadError(m_pThread->Resume(), m_pThread)) - { - FindWindowById(PauseResumeButtonId)->SetLabel(wxS("Pause")); - } - } -} - -void wxCurlTransferDialog::OnPauseResumeUpdateUI(wxUpdateUIEvent &ev) -{ - ev.Enable(m_pThread->IsAlive()); -} - -void wxCurlTransferDialog::OnStart(wxCommandEvent &WXUNUSED(ev)) -{ - //wxASSERT(HasFlag(wxCTDS_CAN_START)); // OnStart() must be usable also from RunModal() when !HasFlag(wxCTDS_CAN_START) - - wxCurlThreadError err = m_pThread->StartTransfer(); - if (err != wxCTE_NO_ERROR) - { - HandleCurlThreadError(err, m_pThread); // shows a message to the user - m_pThread->Abort(); - EndModal(wxCDRF_FAILED); - } -} - -void wxCurlTransferDialog::OnStartUpdateUI(wxUpdateUIEvent &ev) -{ - ev.Enable(!m_pThread->IsAlive() && !m_bTransferComplete); -} - -void wxCurlTransferDialog::OnConnSettings(wxCommandEvent &WXUNUSED(ev)) -{ - long style = 0; - - // convert our style into wxCurlConnectionSettingsDialog style: - if (HasFlag(wxCTDS_CONN_SETTINGS_AUTH)) - style |= wxCCSP_AUTHENTICATION_OPTIONS; - if (HasFlag(wxCTDS_CONN_SETTINGS_PORT)) - style |= wxCCSP_PORT_OPTION; - if (HasFlag(wxCTDS_CONN_SETTINGS_PROXY)) - style |= wxCCSP_PROXY_OPTIONS; - - wxCurlConnectionSettingsDialog - dlg(_("Connection settings"), _("Connection settings used for the transfer:"), - this, style); - - dlg.RunModal(m_pThread->GetCurlSession()); -} - -void wxCurlTransferDialog::OnConnSettingsUpdateUI(wxUpdateUIEvent &ev) -{ - ev.Enable(!m_pThread->IsAlive() && !m_bTransferComplete); -} - - -// ---------------------------------------------------------------------------- -// wxCurlTransferDialog - network events -// ---------------------------------------------------------------------------- - -void wxCurlTransferDialog::OnEndPerform(wxCurlEndPerformEvent &ev) -{ - wxLogDebug(wxS("wxCurlTransferDialog::OnEndPerform")); - - // in case the very last transfer update event was skipped because - // of our anti-flickering label update policy, force the update with - // that event now (otherwise the dialog may remain open showing data - // related not to the end of the download!) - if (m_pLastEvent) - UpdateLabels(m_pLastEvent); - //else: we may have transferred a file of zero size and thus have never received any progress event... - - // now we're sure the transfer has completed: make the gauge - // completely "filled" - m_pGauge->SetValue(101); - - // this flag is used for updating labels etc: - m_bTransferComplete = true; - - // transfer has completed... - wxCurlDialogReturnFlag retCode = ev.IsSuccessful() ? wxCDRF_SUCCESS : wxCDRF_FAILED; -#if 0 // below is bugged because m_pThread->GetCurlSession() is NULL at this point... - if (retCode == wxCDRF_FAILED) - { - // show the user a message... - wxLogError(wxS("The transfer failed: %s (%s)"), - m_pThread->GetCurlSession()->GetErrorString().c_str(), - m_pThread->GetCurlSession()->GetDetailedErrorString().c_str()); - } -#endif - - // do we need to close this window? - if (HasFlag(wxCTDS_AUTO_CLOSE)) - EndModal(retCode); - else - { - SetReturnCode(retCode); // will exit later in OnAbort() - - if (m_pSpeed) - m_pSpeed->SetLabel(wxS("0 (transfer completed)")); - } -} - - - - -// ---------------------------------------------------------------------------- -// wxCurlDownloadDialog -// ---------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS( wxCurlDownloadDialog, wxCurlTransferDialog ) -BEGIN_EVENT_TABLE( wxCurlDownloadDialog, wxCurlTransferDialog ) - EVT_CURL_DOWNLOAD( ThreadId, wxCurlDownloadDialog::OnDownload ) -END_EVENT_TABLE() - -bool wxCurlDownloadDialog::Create(const wxString &url, wxOutputStream *out, - const wxString& title, const wxString& message, - const wxBitmap& bitmap, - wxWindow *parent, long style) -{ - if (!wxCurlTransferDialog::Create(url, title, message, wxS("Downloaded:"), bitmap, parent, style)) - return false; - - // register as the thread's event handler - wxCurlDownloadThread *thread = new wxCurlDownloadThread(this, ThreadId); - - m_pThread = thread; // downcast our pointer for usage by wxCurlTransferDialog - - if (!HandleCurlThreadError(thread->SetURL(url), thread, url)) - return false; - if (!HandleCurlThreadError(thread->SetOutputStream(out), thread)) - return false; - - return true; -} - -void wxCurlDownloadDialog::OnDownload(wxCurlDownloadEvent &ev) -{ - static wxDateTime lastLabelUpdate(0, 0, 0, 0); // zero is to force always at least an update - if ((wxDateTime::Now() - lastLabelUpdate).GetMilliseconds() > 200) // avoid flickering - { - UpdateLabels(&ev); - - lastLabelUpdate = wxDateTime::Now(); - } - - // see OnEndPerform for more info. - if (m_pLastEvent) - delete m_pLastEvent; - m_pLastEvent = wx_static_cast(wxCurlProgressBaseEvent*, ev.Clone()); -} - - - -// ---------------------------------------------------------------------------- -// wxCurlUploadDialog -// ---------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS( wxCurlUploadDialog, wxCurlTransferDialog ) -BEGIN_EVENT_TABLE( wxCurlUploadDialog, wxCurlTransferDialog ) - EVT_CURL_UPLOAD( ThreadId, wxCurlUploadDialog::OnUpload ) -END_EVENT_TABLE() - -bool wxCurlUploadDialog::Create(const wxString &url, wxInputStream *in, - const wxString& title, const wxString& message, - const wxBitmap& bitmap, - wxWindow *parent, long style) -{ - if (!wxCurlTransferDialog::Create(url, title, message, wxS("Uploaded:"), bitmap, parent, style)) - return false; - - // register as the thread's event handler - wxCurlUploadThread *thread = new wxCurlUploadThread(this, ThreadId); - - m_pThread = thread; // downcast our pointer for usage by wxCurlTransferDialog - - if (!HandleCurlThreadError(thread->SetURL(url), thread, url)) - return false; - if (!HandleCurlThreadError(thread->SetInputStream(in), thread)) - return false; - - return true; -} - -void wxCurlUploadDialog::OnUpload(wxCurlUploadEvent &ev) -{ - static wxDateTime lastLabelUpdate(0, 0, 0, 0); // zero is to force always at least an update - if ((wxDateTime::Now() - lastLabelUpdate).GetMilliseconds() > 200) // avoid flickering - { - UpdateLabels(&ev); - - lastLabelUpdate = wxDateTime::Now(); - } - - // see OnEndPerform for more info. - if (m_pLastEvent) - delete m_pLastEvent; - m_pLastEvent = wx_static_cast(wxCurlProgressBaseEvent*, ev.Clone()); -} - - - -// ---------------------------------------------------------------------------- -// wxCurlConnectionSettingsDialog -// ---------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS( wxCurlConnectionSettingsDialog, wxDialog ) - -bool wxCurlConnectionSettingsDialog::Create(const wxString& title, - const wxString& message, - wxWindow *parent, - long style) -{ - if (!wxDialog::Create(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)) - return false; - - m_pPanel = new wxCurlConnectionSettingsPanel(this, wxID_ANY, message, wxDefaultPosition, - wxDefaultSize, style); - - wxSizer *main = new wxBoxSizer(wxVERTICAL); - wxSizer *buttons = CreateSeparatedButtonSizer(wxOK|wxCANCEL); - - main->Add(m_pPanel, 1, wxGROW|wxALL, 10); - main->Add(buttons, 0, wxGROW|wxALL, 10); - - SetSizerAndFit(main); - - return true; -} - -void wxCurlConnectionSettingsDialog::RunModal(wxCurlBase *pCURL) -{ - if (ShowModal() == wxID_OK) - m_pPanel->SetCURLOptions(pCURL); -} - diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/ftp.cpp opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/ftp.cpp --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/ftp.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/ftp.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,602 +0,0 @@ -/* - * ftp.cpp - * wxCURL - * - * Created by Casey O'Donnell on Tue Jun 29 2004. - * Copyright (c) 2004 Casey O'Donnell. All rights reserved. - * - * - * Licence: wxWidgets Licence - */ - -// ftp.cpp: implementation of the wxCurlFTP class. -// -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Headers -////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif - -#ifdef __WXMSW__ - #include // useful to catch memory leaks when compiling under MSVC -#endif - -#include -#include - -#include - -////////////////////////////////////////////////////////////////////// -// C Functions for LibCURL -////////////////////////////////////////////////////////////////////// -extern "C" -{ -} - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -wxCurlFTP::wxCurlFTP(const wxString& szURL /*= wxEmptyString*/, - const wxString& szUserName /*= wxEmptyString*/, - const wxString& szPassword /*= wxEmptyString*/, - wxEvtHandler* pEvtHandler /*= NULL*/, - int id /*= wxID_ANY*/, - long flags /*= wxCURL_DEFAULT_FLAGS*/) -: wxCurlBase(szURL, szUserName, szPassword, pEvtHandler, id, flags), - m_pQuote(NULL), m_pPreQuote(NULL), m_pPostQuote(NULL), - m_bCreateMissingDirs(true), m_bAppend(false), m_bUsePortOption(false), - m_tmMode(kASCII), m_bUseEPRT(false), m_bUseEPSV(false), - m_szPortParam("-") -{ -} - -wxCurlFTP::~wxCurlFTP() -{ - ResetAllQuoteLists(); -} - -////////////////////////////////////////////////////////////////////// -// Member Data Access Methods -////////////////////////////////////////////////////////////////////// - -void wxCurlFTP::SetTransferMode(const TransferMode& tmMode) -{ - m_tmMode = tmMode; -} - -wxCurlFTP::TransferMode wxCurlFTP::GetTransferMode() const -{ - return m_tmMode; -} - -void wxCurlFTP::SetToBinary() -{ - SetTransferMode(kBINARY); -} - -void wxCurlFTP::SetToAscii() -{ - SetTransferMode(kASCII); -} - -bool wxCurlFTP::IsAscii() const -{ - return m_tmMode == kASCII; -} - -bool wxCurlFTP::IsBinary() const -{ - return m_tmMode == kBINARY; -} - -void wxCurlFTP::UsePortOption(const bool& bUsePort) -{ - m_bUsePortOption = bUsePort; -} - -bool wxCurlFTP::UsePortOption() const -{ - return m_bUsePortOption; -} - -void wxCurlFTP::SetPortParam(const wxString& szParam /*= wxS("-")*/) -{ - m_szPortParam = wxCURL_STRING2BUF(szParam); -} - -wxString wxCurlFTP::GetPortParam() const -{ - return wxCURL_BUF2STRING(m_szPortParam); -} - -void wxCurlFTP::UseEPRT(const bool& bUseEPRT) -{ - m_bUseEPRT = bUseEPRT; -} - -bool wxCurlFTP::UseEPRT() const -{ - return m_bUseEPRT; -} - -void wxCurlFTP::UseEPSV(const bool& bUseEPSV) -{ - m_bUseEPSV = bUseEPSV; -} - -bool wxCurlFTP::UseEPSV() const -{ - return m_bUseEPSV; -} - -void wxCurlFTP::AppendOnUpload(const bool& bAppend) -{ - m_bAppend = bAppend; -} - -bool wxCurlFTP::AppendOnUpload() const -{ - return m_bAppend; -} - -void wxCurlFTP::CreateMissingDirs(const bool& bCreateMissing) -{ - m_bCreateMissingDirs = bCreateMissing; -} - -bool wxCurlFTP::CreateMissingDirs() const -{ - return m_bCreateMissingDirs; -} - -bool wxCurlFTP::SetQuoteList(const wxArrayString& arrQuote) -{ - ResetQuoteList(); - - for(unsigned int i = 0; i < arrQuote.Count(); i++) - { - m_pQuote = curl_slist_append(m_pQuote, (const char*)(arrQuote[i].c_str())); - } - - return (m_pQuote != NULL); -} - -bool wxCurlFTP::AppendQuote(const wxString& szQuote, const bool& bClear /*= false*/) -{ - if(bClear) - ResetQuoteList(); - - m_pQuote = curl_slist_append(m_pQuote, (const char*)(szQuote.c_str())); - - return (m_pQuote != NULL); -} - -bool wxCurlFTP::SetPreQuoteList(const wxArrayString& arrQuote) -{ - ResetPreQuoteList(); - - for(unsigned int i = 0; i < arrQuote.Count(); i++) - { - m_pPreQuote = curl_slist_append(m_pPreQuote, (const char*)(arrQuote[i].c_str())); - } - - return (m_pPreQuote != NULL); -} - -bool wxCurlFTP::AppendPreQuote(const wxString& szQuote, const bool& bClear /*= false*/) -{ - if(bClear) - ResetPreQuoteList(); - - m_pPreQuote = curl_slist_append(m_pPreQuote, (const char*)(szQuote.c_str())); - - return (m_pPreQuote != NULL); -} - -bool wxCurlFTP::SetPostQuoteList(const wxArrayString& arrQuote) -{ - ResetPostQuoteList(); - - for(unsigned int i = 0; i < arrQuote.Count(); i++) - { - m_pPostQuote = curl_slist_append(m_pPostQuote, (const char*)(arrQuote[i].c_str())); - } - - return (m_pPostQuote != NULL); -} - -bool wxCurlFTP::AppendPostQuote(const wxString& szQuote, const bool& bClear /*= false*/) -{ - if(bClear) - ResetPostQuoteList(); - - m_pPostQuote = curl_slist_append(m_pPostQuote, (const char*)(szQuote.c_str())); - - return (m_pPostQuote != NULL); -} - -////////////////////////////////////////////////////////////////////// -// Action Methods -////////////////////////////////////////////////////////////////////// - -bool wxCurlFTP::Get(const wxString& szFilePath, const wxString& szRemoteFile /*= wxEmptyString*/) -{ - wxFFileOutputStream outStream(szFilePath); - - return Get(outStream, szRemoteFile); -} - -size_t wxCurlFTP::Get(char*& buffer, const wxString& szRemoteFile /*= wxEmptyString*/) -{ - wxMemoryOutputStream outStream; - - buffer = NULL; - size_t iRetVal = 0; - - if(Get(outStream, szRemoteFile)) - { - iRetVal = outStream.GetSize(); - - buffer = (char*)malloc(iRetVal + 1); - - if(buffer) - { - outStream.CopyTo(buffer, outStream.GetSize()); - buffer[iRetVal] = '\0'; - return iRetVal; - } - - free(buffer); - buffer = NULL; - } - - return 0; -} - -bool wxCurlFTP::Get(wxOutputStream& buffer, const wxString& szRemoteFile /*= wxEmptyString*/) -{ - if(m_pCURL && buffer.IsOk()) - { - SetCurlHandleToDefaults(szRemoteFile); - - SetStreamWriteFunction(buffer); - - if(Perform()) - { - return ((m_iResponseCode > 199) && (m_iResponseCode < 299)); - } - } - - return false; -} - -bool wxCurlFTP::Put(const wxString& szFilePath, const wxString& szRemoteFile /*= wxEmptyString*/) -{ - wxFFileInputStream inStream(szFilePath); - - return Put(inStream, szRemoteFile); -} - -bool wxCurlFTP::Put(const char* buffer, size_t size, const wxString& szRemoteFile /*= wxEmptyString*/) -{ - wxMemoryInputStream inStream(buffer, size); - - return Put(inStream, szRemoteFile); -} - -bool wxCurlFTP::Put(wxInputStream& buffer, const wxString& szRemoteFile /*= wxEmptyString*/) -{ - curl_off_t iSize = 0; - - if(m_pCURL && buffer.IsOk()) - { - SetCurlHandleToDefaults(szRemoteFile); - - iSize = buffer.GetSize(); - - if(iSize == (~(ssize_t)0)) - return false; - - SetOpt(CURLOPT_UPLOAD, TRUE); - SetStreamReadFunction(buffer); - SetOpt(CURLOPT_INFILESIZE_LARGE, iSize); - - if(Perform()) - { - return ((m_iResponseCode > 199) && (m_iResponseCode < 300)); - } - } - - return false; -} - -bool wxCurlFTP::MkDir(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - if(m_pCURL) - { - wxString str(szRemoteLoc); - if(str.Last() != '/') - str += wxS("/"); - - SetCurlHandleToDefaults(str); - - SetOpt(CURLOPT_FTP_CREATE_MISSING_DIRS, TRUE); - SetOpt(CURLOPT_NOBODY, TRUE); - - if(Perform()) - { - return ((m_iResponseCode > 199) && (m_iResponseCode < 300)); - } - } - - return false; -} - -bool wxCurlFTP::RmDir(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - if(m_pCURL) - { - wxString str(szRemoteLoc); - if(str.Last() != wxS('/')) - str += wxS("/"); - SetCurlHandleToDefaults(str); - - wxString url(GetURL()); - m_szCurrFullPath = url.Left(url.Len() - 1).BeforeLast(wxS('/')); - m_szCurrFullPath += wxS("/"); - m_szCurrFilename = url.Left(url.Len() - 1).AfterLast(wxS('/')); - - if(m_szCurrFilename.IsEmpty()) - return false; - - AppendPostQuote(wxS("RMD ") + m_szCurrFilename, true); - - SetCurlHandleQuoteOpts(); - SetOpt(CURLOPT_NOBODY, TRUE); - - if(Perform()) - { - ResetAllQuoteLists(); - - return ((m_iResponseCode > 199) && (m_iResponseCode < 300)); - } - - ResetAllQuoteLists(); - } - - return false; -} - -bool wxCurlFTP::Delete(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - if(m_pCURL) - { - SetCurlHandleToDefaults(szRemoteLoc); - - wxString url(GetURL()); - m_szCurrFullPath = url.BeforeLast('/'); - m_szCurrFullPath += wxS("/"); - m_szCurrFilename = url.AfterLast('/'); - - if(m_szCurrFilename.IsEmpty()) - return RmDir(szRemoteLoc); - - AppendPostQuote(wxS("DELE ") + m_szCurrFilename, true); - - SetCurlHandleQuoteOpts(); - SetOpt(CURLOPT_NOBODY, TRUE); - - if(Perform()) - { - ResetAllQuoteLists(); - - return ((m_iResponseCode > 199) && (m_iResponseCode < 300)); - } - - ResetAllQuoteLists(); - } - - return false; -} - -bool wxCurlFTP::Rename(const wxString& szRemoteLocName, - const wxString& szRemoteFile /*= wxEmptyString*/) -{ - if(m_pCURL) - { - SetCurlHandleToDefaults(szRemoteFile); - - wxString url(GetURL()); - m_szCurrFullPath = url.BeforeLast('/'); - m_szCurrFullPath += wxS("/"); - m_szCurrFilename = url.AfterLast('/'); - - if(m_szCurrFilename.IsEmpty()) - return false; - - AppendPostQuote(wxS("RNFR ") + m_szCurrFilename, true); - AppendPostQuote(wxS("RNTO ") + szRemoteLocName); - - SetCurlHandleQuoteOpts(); - SetOpt(CURLOPT_NOBODY, TRUE); - - if(Perform()) - { - ResetAllQuoteLists(); - - return ((m_iResponseCode > 199) && (m_iResponseCode < 300)); - } - - ResetAllQuoteLists(); - } - - return false; -} - -bool wxCurlFTP::List(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - if(m_pCURL) - { - SetCurlHandleToDefaults(szRemoteLoc); - - SetOpt(CURLOPT_CUSTOMREQUEST, "LIST"); - SetStringWriteFunction(m_szResponseBody); - - if(Perform()) - { - return ((m_iResponseCode > 199) && (m_iResponseCode < 300)); - } - } - - return false; -} - -bool wxCurlFTP::Nlst(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - if(m_pCURL) - { - SetCurlHandleToDefaults(szRemoteLoc); - - SetOpt(CURLOPT_CUSTOMREQUEST, "NLST"); - SetStringWriteFunction(m_szResponseBody); - - if(Perform()) - { - return ((m_iResponseCode > 199) && (m_iResponseCode < 300)); - } - } - - return false; -} - -bool wxCurlFTP::Info(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - if(m_pCURL) - { - SetCurlHandleToDefaults(szRemoteLoc); - - SetOpt(CURLOPT_HEADER, TRUE); - SetOpt(CURLOPT_NOBODY, TRUE); - SetStringWriteFunction(m_szResponseBody); - - if(Perform()) - { - return ((m_iResponseCode > 199) && (m_iResponseCode < 299)); - } - } - - return false; -} - -////////////////////////////////////////////////////////////////////// -// Helper Methods -////////////////////////////////////////////////////////////////////// - -void wxCurlFTP::SetCurlHandleToDefaults(const wxString& relativeURL) -{ - wxCurlBase::SetCurlHandleToDefaults(relativeURL); - - m_szCurrFilename = wxEmptyString; - m_szCurrFullPath = wxEmptyString; - - if(m_bUsePortOption) - { - SetStringOpt(CURLOPT_FTPPORT, m_szPortParam); - } - - if(m_bUseEPRT) - { - SetOpt(CURLOPT_FTP_USE_EPRT, TRUE); - } - - if(m_bUseEPSV) - { - SetOpt(CURLOPT_FTP_USE_EPSV, TRUE); - } - - if(m_bCreateMissingDirs) - { - SetOpt(CURLOPT_FTP_CREATE_MISSING_DIRS, TRUE); - } - - if(m_bAppend) - { - SetOpt(CURLOPT_FTPAPPEND, TRUE); - } - - if(m_tmMode == kASCII) - { - SetOpt(CURLOPT_TRANSFERTEXT, TRUE); - } -} - -void wxCurlFTP::SetCurlHandleQuoteOpts() -{ - if(m_pQuote) - { - SetOpt(CURLOPT_QUOTE, m_pQuote); - } - - if(m_pPreQuote) - { - SetOpt(CURLOPT_PREQUOTE, m_pPreQuote); - } - - if(m_pPostQuote) - { - SetOpt(CURLOPT_POSTQUOTE, m_pPostQuote); - } -} - -void wxCurlFTP::ResetAllQuoteLists() -{ - ResetQuoteList(); - ResetPreQuoteList(); - ResetPostQuoteList(); -} - -void wxCurlFTP::ResetQuoteList() -{ - if(m_pQuote) - { - curl_slist_free_all(m_pQuote); - - m_pQuote = NULL; - - SetOpt(CURLOPT_QUOTE, NULL); - } -} - -void wxCurlFTP::ResetPreQuoteList() -{ - if(m_pPreQuote) - { - curl_slist_free_all(m_pPreQuote); - - m_pPreQuote = NULL; - - SetOpt(CURLOPT_PREQUOTE, NULL); - } -} - -void wxCurlFTP::ResetPostQuoteList() -{ - if(m_pPostQuote) - { - curl_slist_free_all(m_pPostQuote); - - m_pPostQuote = NULL; - - SetOpt(CURLOPT_POSTQUOTE, NULL); - } -} - - - diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/ftpparse.cpp opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/ftpparse.cpp --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/ftpparse.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/ftpparse.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,459 +0,0 @@ -/* ftpparse.c, ftpparse.h: library for parsing FTP LIST responses -20001223 -D. J. Bernstein, djb@cr.yp.to -http://cr.yp.to/ftpparse.html - -Commercial use is fine, if you let me know what programs you're using this in. - -Currently covered formats: -EPLF. -UNIX ls, with or without gid. -Microsoft FTP Service. -Windows NT FTP Server. -VMS. -WFTPD. -NetPresenz (Mac). -NetWare. -MSDOS. - -Definitely not covered: -Long VMS filenames, with information split across two lines. -NCSA Telnet FTP server. Has LIST = NLST (and bad NLST for directories). -*/ - -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif - -#ifdef __WXMSW__ - #include // useful to catch memory leaks when compiling under MSVC -#endif - -#include -#include "ftpparse.h" - -static long totai(long year,long month,long mday) -{ - long result; - if (month >= 2) month -= 2; - else { month += 10; --year; } - result = (mday - 1) * 10 + 5 + 306 * month; - result /= 10; - if (result == 365) { year -= 3; result = 1460; } - else result += 365 * (year % 4); - year /= 4; - result += 1461 * (year % 25); - year /= 25; - if (result == 36524) { year -= 3; result = 146096; } - else { result += 36524 * (year % 4); } - year /= 4; - result += 146097 * (year - 5); - result += 11017; - return result * 86400; -} - -static int flagneedbase = 1; -static time_t base; /* time() value on this OS at the beginning of 1970 TAI */ -static long now; /* current time */ -static int flagneedcurrentyear = 1; -static long currentyear; /* approximation to current year */ - -static void initbase(void) -{ - struct tm *t; - if (!flagneedbase) return; - - base = 0; - t = gmtime(&base); - base = -(totai(t->tm_year + 1900,t->tm_mon,t->tm_mday) + t->tm_hour * 3600 + t->tm_min * 60 + t->tm_sec); - /* assumes the right time_t, counting seconds. */ - /* base may be slightly off if time_t counts non-leap seconds. */ - flagneedbase = 0; -} - -static void initnow(void) -{ - long day; - long year; - - initbase(); - now = time((time_t *) 0) - base; - - if (flagneedcurrentyear) { - day = now / 86400; - if ((now % 86400) < 0) --day; - day -= 11017; - year = 5 + day / 146097; - day = day % 146097; - if (day < 0) { day += 146097; --year; } - year *= 4; - if (day == 146096) { year += 3; day = 36524; } - else { year += day / 36524; day %= 36524; } - year *= 25; - year += day / 1461; - day %= 1461; - year *= 4; - if (day == 1460) { year += 3; day = 365; } - else { year += day / 365; day %= 365; } - day *= 10; - if ((day + 5) / 306 >= 10) ++year; - currentyear = year; - flagneedcurrentyear = 0; - } -} - -/* UNIX ls does not show the year for dates in the last six months. */ -/* So we have to guess the year. */ -/* Apparently NetWare uses ``twelve months'' instead of ``six months''; ugh. */ -/* Some versions of ls also fail to show the year for future dates. */ -static long guesstai(long month,long mday) -{ - long year; - long t; - - initnow(); - - for (year = currentyear - 1;year < currentyear + 100;++year) { - t = totai(year,month,mday); - if (now - t < 350 * 86400) - return t; - } - - return 0; -} - -static int check(char *buf,const char *monthname) -{ - if ((buf[0] != monthname[0]) && (buf[0] != monthname[0] - 32)) return 0; - if ((buf[1] != monthname[1]) && (buf[1] != monthname[1] - 32)) return 0; - if ((buf[2] != monthname[2]) && (buf[2] != monthname[2] - 32)) return 0; - return 1; -} - -static const char *months[12] = { - "jan","feb","mar","apr","may","jun","jul","aug","sep","oct","nov","dec" -} ; - -static int getmonth(char *buf,int len) -{ - int i; - if (len == 3) - for (i = 0;i < 12;++i) - if (check(buf,months[i])) return i; - return -1; -} - -static long getlong(char *buf,int len) -{ - long u = 0; - while (len-- > 0) - u = u * 10 + (*buf++ - '0'); - return u; -} - -int ftpparse(struct ftpparse *fp,char *buf,int len) -{ - int i = 0; - int j = 0; - int state = 0; - long size = 0; - long year = 0; - long month = 0; - long mday = 0; - long hour = 0; - long minute = 0; - - fp->name = 0; - fp->namelen = 0; - fp->flagtrycwd = 0; - fp->flagtryretr = 0; - fp->sizetype = FTPPARSE_SIZE_UNKNOWN; - fp->size = 0; - fp->mtimetype = FTPPARSE_MTIME_UNKNOWN; - fp->mtime = 0; - fp->idtype = FTPPARSE_ID_UNKNOWN; - fp->id = 0; - fp->idlen = 0; - - if (len < 2) /* an empty name in EPLF, with no info, could be 2 chars */ - return 0; - - switch(*buf) { - /* see http://pobox.com/~djb/proto/eplf.txt */ - /* "+i8388621.29609,m824255902,/,\tdev" */ - /* "+i8388621.44468,m839956783,r,s10376,\tRFCEPLF" */ - case '+': - i = 1; - for (j = 1;j < len;++j) { - if (buf[j] == 9) { - fp->name = buf + j + 1; - fp->namelen = len - j - 1; - return 1; - } - if (buf[j] == ',') { - switch(buf[i]) { - case '/': - fp->flagtrycwd = 1; - break; - case 'r': - fp->flagtryretr = 1; - break; - case 's': - fp->sizetype = FTPPARSE_SIZE_BINARY; - fp->size = getlong(buf + i + 1,j - i - 1); - break; - case 'm': - fp->mtimetype = FTPPARSE_MTIME_LOCAL; - initbase(); - fp->mtime = base + getlong(buf + i + 1,j - i - 1); - break; - case 'i': - fp->idtype = FTPPARSE_ID_FULL; - fp->id = buf + i + 1; - fp->idlen = j - i - 1; - } - i = j + 1; - } - } - return 0; - - /* UNIX-style listing, without inum and without blocks */ - /* "-rw-r--r-- 1 root other 531 Jan 29 03:26 README" */ - /* "dr-xr-xr-x 2 root other 512 Apr 8 1994 etc" */ - /* "dr-xr-xr-x 2 root 512 Apr 8 1994 etc" */ - /* "lrwxrwxrwx 1 root other 7 Jan 25 00:17 bin -> usr/bin" */ - /* Also produced by Microsoft's FTP servers for Windows: */ - /* "---------- 1 owner group 1803128 Jul 10 10:18 ls-lR.Z" */ - /* "d--------- 1 owner group 0 May 9 19:45 Softlib" */ - /* Also WFTPD for MSDOS: */ - /* "-rwxrwxrwx 1 noone nogroup 322 Aug 19 1996 message.ftp" */ - /* Also NetWare: */ - /* "d [R----F--] supervisor 512 Jan 16 18:53 login" */ - /* "- [R----F--] rhesus 214059 Oct 20 15:27 cx.exe" */ - /* Also NetPresenz for the Mac: */ - /* "-------r-- 326 1391972 1392298 Nov 22 1995 MegaPhone.sit" */ - /* "drwxrwxr-x folder 2 May 10 1996 network" */ - case 'b': - case 'c': - case 'd': - case 'l': - case 'p': - case 's': - case '-': - - if (*buf == 'd') fp->flagtrycwd = 1; - if (*buf == '-') fp->flagtryretr = 1; - if (*buf == 'l') fp->flagtrycwd = fp->flagtryretr = 1; - - state = 1; - i = 0; - for (j = 1;j < len;++j) - if ((buf[j] == ' ') && (buf[j - 1] != ' ')) { - switch(state) { - case 1: /* skipping perm */ - state = 2; - break; - case 2: /* skipping nlink */ - state = 3; - if ((j - i == 6) && (buf[i] == 'f')) /* for NetPresenz */ - state = 4; - break; - case 3: /* skipping uid */ - state = 4; - break; - case 4: /* getting tentative size */ - size = getlong(buf + i,j - i); - state = 5; - break; - case 5: /* searching for month, otherwise getting tentative size */ - month = getmonth(buf + i,j - i); - if (month >= 0) - state = 6; - else - size = getlong(buf + i,j - i); - break; - case 6: /* have size and month */ - mday = getlong(buf + i,j - i); - state = 7; - break; - case 7: /* have size, month, mday */ - if ((j - i == 4) && (buf[i + 1] == ':')) { - hour = getlong(buf + i,1); - minute = getlong(buf + i + 2,2); - fp->mtimetype = FTPPARSE_MTIME_REMOTEMINUTE; - initbase(); - fp->mtime = base + guesstai(month,mday) + hour * 3600 + minute * 60; - } else if ((j - i == 5) && (buf[i + 2] == ':')) { - hour = getlong(buf + i,2); - minute = getlong(buf + i + 3,2); - fp->mtimetype = FTPPARSE_MTIME_REMOTEMINUTE; - initbase(); - fp->mtime = base + guesstai(month,mday) + hour * 3600 + minute * 60; - } - else if (j - i >= 4) { - year = getlong(buf + i,j - i); - fp->mtimetype = FTPPARSE_MTIME_REMOTEDAY; - initbase(); - fp->mtime = base + totai(year,month,mday); - } - else - return 0; - fp->name = buf + j + 1; - fp->namelen = len - j - 1; - state = 8; - break; - case 8: /* twiddling thumbs */ - break; - } - i = j + 1; - while ((i < len) && (buf[i] == ' ')) ++i; - } - - if (state != 8) - return 0; - - fp->size = size; - fp->sizetype = FTPPARSE_SIZE_BINARY; - - if (*buf == 'l') - for (i = 0;i + 3 < fp->namelen;++i) - if (fp->name[i] == ' ') - if (fp->name[i + 1] == '-') - if (fp->name[i + 2] == '>') - if (fp->name[i + 3] == ' ') { - fp->namelen = i; - break; - } - - /* eliminate extra NetWare spaces */ - if ((buf[1] == ' ') || (buf[1] == '[')) - if (fp->namelen > 3) - if (fp->name[0] == ' ') - if (fp->name[1] == ' ') - if (fp->name[2] == ' ') { - fp->name += 3; - fp->namelen -= 3; - } - - return 1; - } - - /* MultiNet (some spaces removed from examples) */ - /* "00README.TXT;1 2 30-DEC-1996 17:44 [SYSTEM] (RWED,RWED,RE,RE)" */ - /* "CORE.DIR;1 1 8-SEP-1996 16:09 [SYSTEM] (RWE,RWE,RE,RE)" */ - /* and non-MutliNet VMS: */ - /* "CII-MANUAL.TEX;1 213/216 29-JAN-1996 03:33:12 [ANONYMOU,ANONYMOUS] (RWED,RWED,,)" */ - for (i = 0;i < len;++i) - if (buf[i] == ';') - break; - if (i < len) { - fp->name = buf; - fp->namelen = i; - if (i > 4) - if (buf[i - 4] == '.') - if (buf[i - 3] == 'D') - if (buf[i - 2] == 'I') - if (buf[i - 1] == 'R') { - fp->namelen -= 4; - fp->flagtrycwd = 1; - } - if (!fp->flagtrycwd) - fp->flagtryretr = 1; - while (buf[i] != ' ') if (++i == len) return 0; - while (buf[i] == ' ') if (++i == len) return 0; - while (buf[i] != ' ') if (++i == len) return 0; - while (buf[i] == ' ') if (++i == len) return 0; - j = i; - while (buf[j] != '-') if (++j == len) return 0; - mday = getlong(buf + i,j - i); - while (buf[j] == '-') if (++j == len) return 0; - i = j; - while (buf[j] != '-') if (++j == len) return 0; - month = getmonth(buf + i,j - i); - if (month < 0) return 0; - while (buf[j] == '-') if (++j == len) return 0; - i = j; - while (buf[j] != ' ') if (++j == len) return 0; - year = getlong(buf + i,j - i); - while (buf[j] == ' ') if (++j == len) return 0; - i = j; - while (buf[j] != ':') if (++j == len) return 0; - hour = getlong(buf + i,j - i); - while (buf[j] == ':') if (++j == len) return 0; - i = j; - while ((buf[j] != ':') && (buf[j] != ' ')) if (++j == len) return 0; - minute = getlong(buf + i,j - i); - - fp->mtimetype = FTPPARSE_MTIME_REMOTEMINUTE; - initbase(); - fp->mtime = base + totai(year,month,mday) + hour * 3600 + minute * 60; - - return 1; - } - - /* MSDOS format */ - /* 04-27-00 09:09PM licensed */ - /* 07-18-00 10:16AM pub */ - /* 04-14-00 03:47PM 589 readme.htm */ - if ((*buf >= '0') && (*buf <= '9')) { - i = 0; - j = 0; - while (buf[j] != '-') if (++j == len) return 0; - month = getlong(buf + i,j - i) - 1; - while (buf[j] == '-') if (++j == len) return 0; - i = j; - while (buf[j] != '-') if (++j == len) return 0; - mday = getlong(buf + i,j - i); - while (buf[j] == '-') if (++j == len) return 0; - i = j; - while (buf[j] != ' ') if (++j == len) return 0; - year = getlong(buf + i,j - i); - if (year < 50) year += 2000; - if (year < 1000) year += 1900; - while (buf[j] == ' ') if (++j == len) return 0; - i = j; - while (buf[j] != ':') if (++j == len) return 0; - hour = getlong(buf + i,j - i); - while (buf[j] == ':') if (++j == len) return 0; - i = j; - while ((buf[j] != 'A') && (buf[j] != 'P')) if (++j == len) return 0; - minute = getlong(buf + i,j - i); - if (hour == 12) hour = 0; - if (buf[j] == 'A') if (++j == len) return 0; - if (buf[j] == 'P') { hour += 12; if (++j == len) return 0; } - if (buf[j] == 'M') if (++j == len) return 0; - - while (buf[j] == ' ') if (++j == len) return 0; - if (buf[j] == '<') { - fp->flagtrycwd = 1; - while (buf[j] != ' ') if (++j == len) return 0; - } - else { - i = j; - while (buf[j] != ' ') if (++j == len) return 0; - fp->size = getlong(buf + i,j - i); - fp->sizetype = FTPPARSE_SIZE_BINARY; - fp->flagtryretr = 1; - } - while (buf[j] == ' ') if (++j == len) return 0; - - fp->name = buf + j; - fp->namelen = len - j; - - fp->mtimetype = FTPPARSE_MTIME_REMOTEMINUTE; - initbase(); - fp->mtime = base + totai(year,month,mday) + hour * 3600 + minute * 60; - - return 1; - } - - /* Some useless lines, safely ignored: */ - /* "Total of 11 Files, 10966 Blocks." (VMS) */ - /* "total 14786" (UNIX) */ - /* "DISK$ANONFTP:[ANONYMOUS]" (VMS) */ - /* "Directory DISK$PCSA:[ANONYM]" (VMS) */ - - return 0; -} diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/ftpparse.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/ftpparse.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/ftpparse.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/ftpparse.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -#ifndef FTPPARSE_H -#define FTPPARSE_H - -/* -ftpparse(&fp,buf,len) tries to parse one line of LIST output. - -The line is an array of len characters stored in buf. -It should not include the terminating CR LF; so buf[len] is typically CR. - -If ftpparse() can't find a filename, it returns 0. - -If ftpparse() can find a filename, it fills in fp and returns 1. -fp is a struct ftpparse, defined below. -The name is an array of fp.namelen characters stored in fp.name; -fp.name points somewhere within buf. -*/ - -struct ftpparse { - char *name; /* not necessarily 0-terminated */ - int namelen; - int flagtrycwd; /* 0 if cwd is definitely pointless, 1 otherwise */ - int flagtryretr; /* 0 if retr is definitely pointless, 1 otherwise */ - int sizetype; - long size; /* number of octets */ - int mtimetype; - time_t mtime; /* modification time */ - int idtype; - char *id; /* not necessarily 0-terminated */ - int idlen; -} ; - -#define FTPPARSE_SIZE_UNKNOWN 0 -#define FTPPARSE_SIZE_BINARY 1 /* size is the number of octets in TYPE I */ -#define FTPPARSE_SIZE_ASCII 2 /* size is the number of octets in TYPE A */ - -#define FTPPARSE_MTIME_UNKNOWN 0 -#define FTPPARSE_MTIME_LOCAL 1 /* time is correct */ -#define FTPPARSE_MTIME_REMOTEMINUTE 2 /* time zone and secs are unknown */ -#define FTPPARSE_MTIME_REMOTEDAY 3 /* time zone and time of day are unknown */ -/* -When a time zone is unknown, it is assumed to be GMT. You may want -to use localtime() for LOCAL times, along with an indication that the -time is correct in the local time zone, and gmtime() for REMOTE* times. -*/ - -#define FTPPARSE_ID_UNKNOWN 0 -#define FTPPARSE_ID_FULL 1 /* unique identifier for files on this FTP server */ - -int ftpparse(struct ftpparse *,char *,int); - -#endif diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/ftptool.cpp opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/ftptool.cpp --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/ftptool.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/ftptool.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,211 +0,0 @@ -/* - * ftptool.cpp - * wxCURL - * - * Created by Casey O'Donnell on Fri Aug 13 2004. - * Copyright (c) 2004 Casey O'Donnell. All rights reserved. - * - * wxCurlFTPTool makes use of ftpparse, a set of C functions - * created by D. J. Bernstein (djb@cr.yp.to). The original - * site for these functions can be found at: - * http://cr.yp.to/ftpparse.html - * - * Licence: wxWidgets Licence - */ - -////////////////////////////////////////////////////////////////////// -// Headers -////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif - -#ifdef __WXMSW__ - #include // useful to catch memory leaks when compiling under MSVC -#endif - -#include - -#include -#include -#include - -#include "ftpparse.h" - -////////////////////////////////////////////////////////////////////// -// C Functions for LibCURL -////////////////////////////////////////////////////////////////////// -extern "C" -{ -} - -// davtool.cpp: implementation of the wxCurlFTPFs class. -// -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -wxCurlFTPFs::wxCurlFTPFs() -: m_iContentLength(0) -{ -} - -wxCurlFTPFs::wxCurlFTPFs(const wxString& szName , - const bool& bIsDir , - const bool& bIsFile , - const time_t& tLastModified , - const long& iContentLength ) -: m_szName(szName), m_bIsDir(bIsDir), m_bIsFile(bIsFile), -m_dtLastModified(tLastModified), m_iContentLength(iContentLength) -{ -} - -wxCurlFTPFs::~wxCurlFTPFs() -{ -} - -// ftptool.cpp: implementation of the wxCurlFTPTool class. -// -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -wxCurlFTPTool::wxCurlFTPTool(const wxString& szURL /*= wxEmptyString*/, - const wxString& szUserName /*= wxEmptyString*/, - const wxString& szPassword /*= wxEmptyString*/, - wxEvtHandler* pEvtHandler /*= NULL*/, - int id /*= wxID_ANY*/, - long flags/*= wxCURL_DEFAULT_FLAGS*/) -: wxCurlFTP(szURL, szUserName, szPassword, pEvtHandler, id, flags) -{ -} - -wxCurlFTPTool::~wxCurlFTPTool() -{ -} - -////////////////////////////////////////////////////////////////////// -// Member Data Access Methods -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Action Methods -////////////////////////////////////////////////////////////////////// - -bool wxCurlFTPTool::GetFTPFs(wxArrayFTPFs& fs, const wxString& szRemoteLoc /*= wxEmptyString*/) - -{ - if(List(szRemoteLoc)) - { - wxString str = wxCURL_BUF2STRING(m_szResponseBody); - wxStringInputStream inStream(str); - - if(inStream.IsOk()) - { - wxTextInputStream txtInStream(inStream); - for(;;) - { - wxString szCurrentLine = txtInStream.ReadLine(); - if(szCurrentLine.empty()) - break; - - wxCharBuffer buf(szCurrentLine.mb_str()); - - struct ftpparse ftppItem; - if(ftpparse(&ftppItem, buf.data(), strlen(buf)) != 0) - { - fs.Add(wxCurlFTPFs(wxString(ftppItem.name, wxConvLibc), - (ftppItem.flagtrycwd == 1),(ftppItem.flagtryretr == 1), - ftppItem.mtime,ftppItem.size)); - } - } - - return true; - } - } - - return false; -} - -bool wxCurlFTPTool::Exists(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxArrayFTPFs arrFs; - - if(GetFTPFs(arrFs, szRemoteLoc)) - { - return true; - } - - return false; -} - -bool wxCurlFTPTool::IsDirectory(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxArrayFTPFs arrFs; - - if(GetFTPFs(arrFs, szRemoteLoc)) - { - if(arrFs.Count() > 1) - return true; - } - - return false; -} - -wxDateTime wxCurlFTPTool::GetLastModified(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxArrayFTPFs arrFs; - - if(GetFTPFs(arrFs, szRemoteLoc)) - { - return arrFs.Last().GetLastModified(); - } - - return wxDateTime(); -} - -long wxCurlFTPTool::GetContentLength(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxArrayFTPFs arrFs; - - if(GetFTPFs(arrFs, szRemoteLoc)) - { - return arrFs.Last().GetContentLength(); - } - - return -1; -} - -wxString wxCurlFTPTool::GetFileSuffix(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - wxArrayFTPFs arrFs; - - if(GetFTPFs(arrFs, szRemoteLoc)) - { - return arrFs.Last().GetFileSuffix(); - } - - return wxEmptyString; -} - -////////////////////////////////////////////////////////////////////// -// Helper Methods -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// wxArrayDAVFs Implementation -////////////////////////////////////////////////////////////////////// -#include // this is a magic incantation which must be done! -WX_DEFINE_USER_EXPORTED_OBJARRAY(wxArrayFTPFs); - - - - - diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/http.cpp opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/http.cpp --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/http.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/http.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,396 +0,0 @@ -/* -* http.cpp -* wxCURL -* -* Created by Casey O'Donnell on Tue Jun 29 2004. -* Copyright (c) 2004 Casey O'Donnell. All rights reserved. -* -* -* Licence: wxWidgets Licence -*/ - -// http.cpp: implementation of the wxCurlHTTP class. -// -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Headers -////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif - -#ifdef __WXMSW__ - #include // useful to catch memory leaks when compiling under MSVC -#endif - -#include -#include - -#include - -////////////////////////////////////////////////////////////////////// -// C Functions for LibCURL -////////////////////////////////////////////////////////////////////// -extern "C" -{ -} - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -wxCurlHTTP::wxCurlHTTP(const wxString& szURL /*= wxEmptyString*/, - const wxString& szUserName /*= wxEmptyString*/, - const wxString& szPassword /*= wxEmptyString*/, - wxEvtHandler* pEvtHandler /*= NULL*/, - int id /*= wxID_ANY*/, - long flags /*= wxCURL_DEFAULT_FLAGS*/) -: wxCurlBase(szURL, szUserName, szPassword, pEvtHandler, id, flags), -m_pPostHead(NULL), m_pPostTail(NULL), m_bUseCookies(false), m_szCookieFile("-"), -m_pszPostFieldsData(NULL), m_iPostDataSize(0) -{ -} - -wxCurlHTTP::~wxCurlHTTP() -{ - ResetPostData(); -} - -bool wxCurlHTTP::IsResponseOk() const -{ - return ((m_iResponseCode > 199) && (m_iResponseCode < 300)); -} - -////////////////////////////////////////////////////////////////////// -// Member Data Access Methods -////////////////////////////////////////////////////////////////////// - -void wxCurlHTTP::UseCookies(const bool& bUseCookies) -{ - m_bUseCookies = bUseCookies; -} - -bool wxCurlHTTP::UseCookies() const -{ - return m_bUseCookies; -} - -void wxCurlHTTP::SetCookieFile(const wxString& szFilePath) -{ - m_szCookieFile = wxCURL_STRING2BUF(szFilePath); -} - -wxString wxCurlHTTP::GetCookieFile() const -{ - return wxCURL_BUF2STRING(m_szCookieFile); -} - -////////////////////////////////////////////////////////////////////// -// Post Data Methods -////////////////////////////////////////////////////////////////////// - -bool wxCurlHTTP::AddForm(const bool& bClear, const wxString& szName, - struct curl_forms* pForms, CURLFORMcode* outErr) -{ - if(bClear) - ResetPostData(); - - CURLFORMcode res = CURL_FORMADD_OK; - - res = curl_formadd(&m_pPostHead, &m_pPostTail, CURLFORM_COPYNAME, - (const char*)szName.ToAscii(), - CURLFORM_ARRAY, pForms, CURLFORM_END); - - if (outErr != NULL) - *outErr = res; // sometimes you want to/need to see what's going on - - return (res == CURL_FORMADD_OK); -} - -bool wxCurlHTTP::AddBufferToForm(const bool& bClear, const wxString& szName, - char* buffer, size_t len, CURLFORMcode* outErr) -{ - if(bClear) - ResetPostData(); - - CURLFORMcode res = CURL_FORMADD_OK; - - res = curl_formadd(&m_pPostHead, &m_pPostTail, CURLFORM_COPYNAME, - (const char*)szName.ToAscii(), - CURLFORM_COPYCONTENTS, buffer, CURLFORM_CONTENTSLENGTH, - len, CURLFORM_END); - - if (outErr != NULL) - *outErr = res; // sometimes you want to/need to see what's going on - - return (res == CURL_FORMADD_OK); - - -} - -////////////////////////////////////////////////////////////////////// -// Action Methods -////////////////////////////////////////////////////////////////////// - -bool wxCurlHTTP::Options(const wxString& szRemoteFile /*= wxEmptyString*/) -{ - if(m_pCURL) - { - SetCurlHandleToDefaults(szRemoteFile); - - SetOpt(CURLOPT_CUSTOMREQUEST, "OPTIONS"); - SetStringWriteFunction(m_szResponseBody); - - if(Perform()) - { - return IsResponseOk(); - } - } - - return false; -} - -bool wxCurlHTTP::Head(const wxString& szRemoteFile /*= wxEmptyString*/) -{ - if(m_pCURL) - { - SetCurlHandleToDefaults(szRemoteFile); - - SetOpt(CURLOPT_HTTPGET, TRUE); - SetOpt(CURLOPT_NOBODY, TRUE); - - if(Perform()) - { - return IsResponseOk(); - } - } - - return false; -} - -bool wxCurlHTTP::Post(const char* buffer, size_t size, const wxString& szRemoteFile /*= wxEmptyString*/) -{ - wxMemoryInputStream inStream(buffer, size); - - return Post(inStream, szRemoteFile); -} - -bool wxCurlHTTP::Post(wxInputStream& buffer, const wxString& szRemoteFile /*= wxEmptyString*/) -{ - curl_off_t iSize = 0; - - if(m_pCURL && buffer.IsOk()) - { - SetCurlHandleToDefaults(szRemoteFile); - - SetHeaders(); - iSize = buffer.GetSize(); - - if(iSize == (~(ssize_t)0)) // wxCurlHTTP does not know how to upload unknown length streams. - return false; - - SetOpt(CURLOPT_POST, TRUE); - SetOpt(CURLOPT_POSTFIELDSIZE_LARGE, iSize); - SetStreamReadFunction(buffer); - SetStringWriteFunction(m_szResponseBody); - - if(Perform()) - { - ResetHeaders(); - return IsResponseOk(); - } - } - - return false; -} - -bool wxCurlHTTP::Post(const wxString& szRemoteFile /*= wxEmptyString*/) -{ - if(m_pCURL && m_pPostHead && m_pPostTail) - { - SetCurlHandleToDefaults(szRemoteFile); - - SetOpt(CURLOPT_POST, TRUE); - SetOpt(CURLOPT_HTTPPOST, m_pPostHead); - SetStringWriteFunction(m_szResponseBody); - - if(Perform()) - { - return IsResponseOk(); - } - } - - return false; -} - -bool wxCurlHTTP::Trace(const wxString& szRemoteFile /*= wxEmptyString*/) -{ - if(m_pCURL) - { - SetCurlHandleToDefaults(szRemoteFile); - - m_arrHeaders.Add(wxS("Content-type: message/http")); - - SetHeaders(); - - SetOpt(CURLOPT_CUSTOMREQUEST, "TRACE"); - SetStringWriteFunction(m_szResponseBody); - - if(Perform()) - { - ResetHeaders(); - - return IsResponseOk(); - } - - ResetHeaders(); - } - - return false; -} - -bool wxCurlHTTP::Get(const wxString& szFilePath, const wxString& szRemoteFile /*= wxEmptyString*/) -{ - wxFFileOutputStream outStream(szFilePath); - - return Get(outStream, szRemoteFile); -} - -size_t wxCurlHTTP::Get(char*& buffer, const wxString& szRemoteFile /*= wxEmptyString*/) -{ - wxMemoryOutputStream outStream; - - buffer = NULL; - size_t iRetVal = 0; - - if(Get(outStream, szRemoteFile)) - { - iRetVal = outStream.GetSize(); - buffer = (char*)malloc(iRetVal + 1); - - if(buffer) - { - outStream.CopyTo(buffer, outStream.GetSize()); - buffer[iRetVal] = '\0'; - return iRetVal; - } - - free(buffer); - buffer = NULL; - } - - return 0; -} - -bool wxCurlHTTP::Get(wxOutputStream& buffer, const wxString& szRemoteFile /*=wxEmptyString*/) -{ - if(m_pCURL && buffer.IsOk()) - { - SetCurlHandleToDefaults(szRemoteFile); - - SetHeaders(); - SetOpt(CURLOPT_HTTPGET, TRUE); - SetStreamWriteFunction(buffer); - - if(Perform()) - { - ResetHeaders(); - return IsResponseOk(); - } - } - - return false; -} - -bool wxCurlHTTP::Put(const wxString& szFilePath, const wxString& szRemoteFile /*= wxEmptyString*/) -{ - wxFFileInputStream inStream(szFilePath); - - return Put(inStream, szRemoteFile); -} - -bool wxCurlHTTP::Put(const char* buffer, size_t size, const wxString& szRemoteFile /*= wxEmptyString*/) -{ - wxMemoryInputStream inStream(buffer, size); - - return Put(inStream, szRemoteFile); -} - -bool wxCurlHTTP::Put(wxInputStream& buffer, const wxString& szRemoteFile /*= wxEmptyString*/) -{ - curl_off_t iSize = 0; - - if(m_pCURL && buffer.IsOk()) - { - SetCurlHandleToDefaults(szRemoteFile); - - iSize = buffer.GetSize(); - - if(iSize == (~(ssize_t)0)) // wxCurlHTTP does not know how to upload unknown length streams. - return false; - - SetOpt(CURLOPT_UPLOAD, TRUE); - SetOpt(CURLOPT_PUT, TRUE); - SetStreamReadFunction(buffer); - SetOpt(CURLOPT_INFILESIZE_LARGE, (curl_off_t)iSize); - SetStringWriteFunction(m_szResponseBody); - - if(Perform()) - { - return IsResponseOk(); - } - } - - return false; -} - -bool wxCurlHTTP::Delete(const wxString& szRemoteLoc /*= wxEmptyString*/) -{ - if(m_pCURL) - { - SetCurlHandleToDefaults(szRemoteLoc); - - SetOpt(CURLOPT_CUSTOMREQUEST, "DELETE"); - SetStringWriteFunction(m_szResponseBody); - - if(Perform()) - { - return IsResponseOk(); - } - } - - return false; -} - -////////////////////////////////////////////////////////////////////// -// Helper Methods -////////////////////////////////////////////////////////////////////// - -void wxCurlHTTP::ResetPostData() -{ - m_pszPostFieldsData = NULL; - m_iPostDataSize = 0; - - if(m_pPostHead && m_pPostTail) - { - curl_formfree(m_pPostHead); - - m_pPostHead = NULL; - m_pPostTail = NULL; - } -} - -void wxCurlHTTP::SetCurlHandleToDefaults(const wxString& relativeURL) -{ - wxCurlBase::SetCurlHandleToDefaults(relativeURL); - - if(m_bUseCookies) - { - SetStringOpt(CURLOPT_COOKIEJAR, m_szCookieFile); - } -} - diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/curlbuild.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/curlbuild.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/curlbuild.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/curlbuild.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,585 +0,0 @@ -#ifndef __CURL_CURLBUILD_H -#define __CURL_CURLBUILD_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ - -/* ================================================================ */ -/* NOTES FOR CONFIGURE CAPABLE SYSTEMS */ -/* ================================================================ */ - -/* - * NOTE 1: - * ------- - * - * See file include/curl/curlbuild.h.in, run configure, and forget - * that this file exists it is only used for non-configure systems. - * But you can keep reading if you want ;-) - * - */ - -/* ================================================================ */ -/* NOTES FOR NON-CONFIGURE SYSTEMS */ -/* ================================================================ */ - -/* - * NOTE 1: - * ------- - * - * Nothing in this file is intended to be modified or adjusted by the - * curl library user nor by the curl library builder. - * - * If you think that something actually needs to be changed, adjusted - * or fixed in this file, then, report it on the libcurl development - * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/ - * - * Try to keep one section per platform, compiler and architecture, - * otherwise, if an existing section is reused for a different one and - * later on the original is adjusted, probably the piggybacking one can - * be adversely changed. - * - * In order to differentiate between platforms/compilers/architectures - * use only compiler built in predefined preprocessor symbols. - * - * This header file shall only export symbols which are 'curl' or 'CURL' - * prefixed, otherwise public name space would be polluted. - * - * NOTE 2: - * ------- - * - * For any given platform/compiler curl_off_t must be typedef'ed to a - * 64-bit wide signed integral data type. The width of this data type - * must remain constant and independent of any possible large file - * support settings. - * - * As an exception to the above, curl_off_t shall be typedef'ed to a - * 32-bit wide signed integral data type if there is no 64-bit type. - * - * As a general rule, curl_off_t shall not be mapped to off_t. This - * rule shall only be violated if off_t is the only 64-bit data type - * available and the size of off_t is independent of large file support - * settings. Keep your build on the safe side avoiding an off_t gating. - * If you have a 64-bit off_t then take for sure that another 64-bit - * data type exists, dig deeper and you will find it. - * - * NOTE 3: - * ------- - * - * Right now you might be staring at file include/curl/curlbuild.h.dist or - * at file include/curl/curlbuild.h, this is due to the following reason: - * file include/curl/curlbuild.h.dist is renamed to include/curl/curlbuild.h - * when the libcurl source code distribution archive file is created. - * - * File include/curl/curlbuild.h.dist is not included in the distribution - * archive. File include/curl/curlbuild.h is not present in the git tree. - * - * The distributed include/curl/curlbuild.h file is only intended to be used - * on systems which can not run the also distributed configure script. - * - * On systems capable of running the configure script, the configure process - * will overwrite the distributed include/curl/curlbuild.h file with one that - * is suitable and specific to the library being configured and built, which - * is generated from the include/curl/curlbuild.h.in template file. - * - * If you check out from git on a non-configure platform, you must run the - * appropriate buildconf* script to set up curlbuild.h and other local files. - * - */ - -/* ================================================================ */ -/* DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE */ -/* ================================================================ */ - -#ifdef CURL_SIZEOF_LONG -# error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined -#endif - -#ifdef CURL_TYPEOF_CURL_SOCKLEN_T -# error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined -#endif - -#ifdef CURL_SIZEOF_CURL_SOCKLEN_T -# error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined -#endif - -#ifdef CURL_TYPEOF_CURL_OFF_T -# error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined -#endif - -#ifdef CURL_FORMAT_CURL_OFF_T -# error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined -#endif - -#ifdef CURL_FORMAT_CURL_OFF_TU -# error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined -#endif - -#ifdef CURL_FORMAT_OFF_T -# error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined -#endif - -#ifdef CURL_SIZEOF_CURL_OFF_T -# error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined -#endif - -#ifdef CURL_SUFFIX_CURL_OFF_T -# error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined -#endif - -#ifdef CURL_SUFFIX_CURL_OFF_TU -# error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined -#endif - -/* ================================================================ */ -/* EXTERNAL INTERFACE SETTINGS FOR NON-CONFIGURE SYSTEMS ONLY */ -/* ================================================================ */ - -#if defined(__DJGPP__) || defined(__GO32__) -# if defined(__DJGPP__) && (__DJGPP__ > 1) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long long -# define CURL_FORMAT_CURL_OFF_T "lld" -# define CURL_FORMAT_CURL_OFF_TU "llu" -# define CURL_FORMAT_OFF_T "%lld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T LL -# define CURL_SUFFIX_CURL_OFF_TU ULL -# else -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 4 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# endif -# define CURL_TYPEOF_CURL_SOCKLEN_T int -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - -#elif defined(__SALFORDC__) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 4 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# define CURL_TYPEOF_CURL_SOCKLEN_T int -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - -#elif defined(__BORLANDC__) -# if (__BORLANDC__ < 0x520) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 4 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# else -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T __int64 -# define CURL_FORMAT_CURL_OFF_T "I64d" -# define CURL_FORMAT_CURL_OFF_TU "I64u" -# define CURL_FORMAT_OFF_T "%I64d" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T i64 -# define CURL_SUFFIX_CURL_OFF_TU ui64 -# endif -# define CURL_TYPEOF_CURL_SOCKLEN_T int -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - -#elif defined(__TURBOC__) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 4 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# define CURL_TYPEOF_CURL_SOCKLEN_T int -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - -#elif defined(__WATCOMC__) -# if defined(__386__) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T __int64 -# define CURL_FORMAT_CURL_OFF_T "I64d" -# define CURL_FORMAT_CURL_OFF_TU "I64u" -# define CURL_FORMAT_OFF_T "%I64d" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T i64 -# define CURL_SUFFIX_CURL_OFF_TU ui64 -# else -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 4 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# endif -# define CURL_TYPEOF_CURL_SOCKLEN_T int -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - -#elif defined(__POCC__) -# if (__POCC__ < 280) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 4 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# elif defined(_MSC_VER) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T __int64 -# define CURL_FORMAT_CURL_OFF_T "I64d" -# define CURL_FORMAT_CURL_OFF_TU "I64u" -# define CURL_FORMAT_OFF_T "%I64d" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T i64 -# define CURL_SUFFIX_CURL_OFF_TU ui64 -# else -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long long -# define CURL_FORMAT_CURL_OFF_T "lld" -# define CURL_FORMAT_CURL_OFF_TU "llu" -# define CURL_FORMAT_OFF_T "%lld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T LL -# define CURL_SUFFIX_CURL_OFF_TU ULL -# endif -# define CURL_TYPEOF_CURL_SOCKLEN_T int -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - -#elif defined(__LCC__) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 4 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# define CURL_TYPEOF_CURL_SOCKLEN_T int -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - -#elif defined(__SYMBIAN32__) -# if defined(__EABI__) /* Treat all ARM compilers equally */ -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long long -# define CURL_FORMAT_CURL_OFF_T "lld" -# define CURL_FORMAT_CURL_OFF_TU "llu" -# define CURL_FORMAT_OFF_T "%lld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T LL -# define CURL_SUFFIX_CURL_OFF_TU ULL -# elif defined(__CW32__) -# pragma longlong on -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long long -# define CURL_FORMAT_CURL_OFF_T "lld" -# define CURL_FORMAT_CURL_OFF_TU "llu" -# define CURL_FORMAT_OFF_T "%lld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T LL -# define CURL_SUFFIX_CURL_OFF_TU ULL -# elif defined(__VC32__) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T __int64 -# define CURL_FORMAT_CURL_OFF_T "lld" -# define CURL_FORMAT_CURL_OFF_TU "llu" -# define CURL_FORMAT_OFF_T "%lld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T LL -# define CURL_SUFFIX_CURL_OFF_TU ULL -# endif -# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - -#elif defined(__MWERKS__) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long long -# define CURL_FORMAT_CURL_OFF_T "lld" -# define CURL_FORMAT_CURL_OFF_TU "llu" -# define CURL_FORMAT_OFF_T "%lld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T LL -# define CURL_SUFFIX_CURL_OFF_TU ULL -# define CURL_TYPEOF_CURL_SOCKLEN_T int -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - -#elif defined(_WIN32_WCE) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T __int64 -# define CURL_FORMAT_CURL_OFF_T "I64d" -# define CURL_FORMAT_CURL_OFF_TU "I64u" -# define CURL_FORMAT_OFF_T "%I64d" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T i64 -# define CURL_SUFFIX_CURL_OFF_TU ui64 -# define CURL_TYPEOF_CURL_SOCKLEN_T int -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - -#elif defined(__MINGW32__) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long long -# define CURL_FORMAT_CURL_OFF_T "I64d" -# define CURL_FORMAT_CURL_OFF_TU "I64u" -# define CURL_FORMAT_OFF_T "%I64d" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T LL -# define CURL_SUFFIX_CURL_OFF_TU ULL -# define CURL_TYPEOF_CURL_SOCKLEN_T int -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - -#elif defined(__VMS) -# if defined(__VAX) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 4 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# else -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long long -# define CURL_FORMAT_CURL_OFF_T "lld" -# define CURL_FORMAT_CURL_OFF_TU "llu" -# define CURL_FORMAT_OFF_T "%lld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T LL -# define CURL_SUFFIX_CURL_OFF_TU ULL -# endif -# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - -#elif defined(__OS400__) -# if defined(__ILEC400__) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long long -# define CURL_FORMAT_CURL_OFF_T "lld" -# define CURL_FORMAT_CURL_OFF_TU "llu" -# define CURL_FORMAT_OFF_T "%lld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T LL -# define CURL_SUFFIX_CURL_OFF_TU ULL -# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -# define CURL_PULL_SYS_TYPES_H 1 -# define CURL_PULL_SYS_SOCKET_H 1 -# endif - -#elif defined(__MVS__) -# if defined(__IBMC__) || defined(__IBMCPP__) -# if defined(_ILP32) -# define CURL_SIZEOF_LONG 4 -# elif defined(_LP64) -# define CURL_SIZEOF_LONG 8 -# endif -# if defined(_LONG_LONG) -# define CURL_TYPEOF_CURL_OFF_T long long -# define CURL_FORMAT_CURL_OFF_T "lld" -# define CURL_FORMAT_CURL_OFF_TU "llu" -# define CURL_FORMAT_OFF_T "%lld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T LL -# define CURL_SUFFIX_CURL_OFF_TU ULL -# elif defined(_LP64) -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# else -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 4 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# endif -# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -# define CURL_PULL_SYS_TYPES_H 1 -# define CURL_PULL_SYS_SOCKET_H 1 -# endif - -#elif defined(__370__) -# if defined(__IBMC__) || defined(__IBMCPP__) -# if defined(_ILP32) -# define CURL_SIZEOF_LONG 4 -# elif defined(_LP64) -# define CURL_SIZEOF_LONG 8 -# endif -# if defined(_LONG_LONG) -# define CURL_TYPEOF_CURL_OFF_T long long -# define CURL_FORMAT_CURL_OFF_T "lld" -# define CURL_FORMAT_CURL_OFF_TU "llu" -# define CURL_FORMAT_OFF_T "%lld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T LL -# define CURL_SUFFIX_CURL_OFF_TU ULL -# elif defined(_LP64) -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# else -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 4 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# endif -# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -# define CURL_PULL_SYS_TYPES_H 1 -# define CURL_PULL_SYS_SOCKET_H 1 -# endif - -#elif defined(TPF) -# define CURL_SIZEOF_LONG 8 -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# define CURL_TYPEOF_CURL_SOCKLEN_T int -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - -/* ===================================== */ -/* KEEP MSVC THE PENULTIMATE ENTRY */ -/* ===================================== */ - -#elif defined(_MSC_VER) -# if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T __int64 -# define CURL_FORMAT_CURL_OFF_T "I64d" -# define CURL_FORMAT_CURL_OFF_TU "I64u" -# define CURL_FORMAT_OFF_T "%I64d" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T i64 -# define CURL_SUFFIX_CURL_OFF_TU ui64 -# else -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 4 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# endif -# define CURL_TYPEOF_CURL_SOCKLEN_T int -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 - -/* ===================================== */ -/* KEEP GENERIC GCC THE LAST ENTRY */ -/* ===================================== */ - -#elif defined(__GNUC__) -# if defined(__ILP32__) || \ - defined(__i386__) || defined(__ppc__) || defined(__arm__) -# define CURL_SIZEOF_LONG 4 -# define CURL_TYPEOF_CURL_OFF_T long long -# define CURL_FORMAT_CURL_OFF_T "lld" -# define CURL_FORMAT_CURL_OFF_TU "llu" -# define CURL_FORMAT_OFF_T "%lld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T LL -# define CURL_SUFFIX_CURL_OFF_TU ULL -# elif defined(__LP64__) || \ - defined(__x86_64__) || defined(__ppc64__) -# define CURL_SIZEOF_LONG 8 -# define CURL_TYPEOF_CURL_OFF_T long -# define CURL_FORMAT_CURL_OFF_T "ld" -# define CURL_FORMAT_CURL_OFF_TU "lu" -# define CURL_FORMAT_OFF_T "%ld" -# define CURL_SIZEOF_CURL_OFF_T 8 -# define CURL_SUFFIX_CURL_OFF_T L -# define CURL_SUFFIX_CURL_OFF_TU UL -# endif -# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t -# define CURL_SIZEOF_CURL_SOCKLEN_T 4 -# define CURL_PULL_SYS_TYPES_H 1 -# define CURL_PULL_SYS_SOCKET_H 1 - -#else -# error "Unknown non-configure build target!" - Error Compilation_aborted_Unknown_non_configure_build_target -#endif - -/* CURL_PULL_SYS_TYPES_H is defined above when inclusion of header file */ -/* sys/types.h is required here to properly make type definitions below. */ -#ifdef CURL_PULL_SYS_TYPES_H -# include -#endif - -/* CURL_PULL_SYS_SOCKET_H is defined above when inclusion of header file */ -/* sys/socket.h is required here to properly make type definitions below. */ -#ifdef CURL_PULL_SYS_SOCKET_H -# include -#endif - -/* Data type definition of curl_socklen_t. */ - -#ifdef CURL_TYPEOF_CURL_SOCKLEN_T - typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; -#endif - -/* Data type definition of curl_off_t. */ - -#ifdef CURL_TYPEOF_CURL_OFF_T - typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; -#endif - -#endif /* __CURL_CURLBUILD_H */ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/curlbuild.h.cmake opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/curlbuild.h.cmake --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/curlbuild.h.cmake 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/curlbuild.h.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,197 +0,0 @@ -#ifndef __CURL_CURLBUILD_H -#define __CURL_CURLBUILD_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ - -/* ================================================================ */ -/* NOTES FOR CONFIGURE CAPABLE SYSTEMS */ -/* ================================================================ */ - -/* - * NOTE 1: - * ------- - * - * Nothing in this file is intended to be modified or adjusted by the - * curl library user nor by the curl library builder. - * - * If you think that something actually needs to be changed, adjusted - * or fixed in this file, then, report it on the libcurl development - * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/ - * - * This header file shall only export symbols which are 'curl' or 'CURL' - * prefixed, otherwise public name space would be polluted. - * - * NOTE 2: - * ------- - * - * Right now you might be staring at file include/curl/curlbuild.h.in or - * at file include/curl/curlbuild.h, this is due to the following reason: - * - * On systems capable of running the configure script, the configure process - * will overwrite the distributed include/curl/curlbuild.h file with one that - * is suitable and specific to the library being configured and built, which - * is generated from the include/curl/curlbuild.h.in template file. - * - */ - -/* ================================================================ */ -/* DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE */ -/* ================================================================ */ - -#ifdef CURL_SIZEOF_LONG -#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined -#endif - -#ifdef CURL_TYPEOF_CURL_SOCKLEN_T -#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined -#endif - -#ifdef CURL_SIZEOF_CURL_SOCKLEN_T -#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined -#endif - -#ifdef CURL_TYPEOF_CURL_OFF_T -#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined -#endif - -#ifdef CURL_FORMAT_CURL_OFF_T -#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined -#endif - -#ifdef CURL_FORMAT_CURL_OFF_TU -#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined -#endif - -#ifdef CURL_FORMAT_OFF_T -#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined -#endif - -#ifdef CURL_SIZEOF_CURL_OFF_T -#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined -#endif - -#ifdef CURL_SUFFIX_CURL_OFF_T -#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined -#endif - -#ifdef CURL_SUFFIX_CURL_OFF_TU -#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined -#endif - -/* ================================================================ */ -/* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */ -/* ================================================================ */ - -/* Configure process defines this to 1 when it finds out that system */ -/* header file ws2tcpip.h must be included by the external interface. */ -#cmakedefine CURL_PULL_WS2TCPIP_H -#ifdef CURL_PULL_WS2TCPIP_H -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -# endif -# include -# include -# include -#endif - -/* Configure process defines this to 1 when it finds out that system */ -/* header file sys/types.h must be included by the external interface. */ -#cmakedefine CURL_PULL_SYS_TYPES_H -#ifdef CURL_PULL_SYS_TYPES_H -# include -#endif - -/* Configure process defines this to 1 when it finds out that system */ -/* header file stdint.h must be included by the external interface. */ -#cmakedefine CURL_PULL_STDINT_H -#ifdef CURL_PULL_STDINT_H -# include -#endif - -/* Configure process defines this to 1 when it finds out that system */ -/* header file inttypes.h must be included by the external interface. */ -#cmakedefine CURL_PULL_INTTYPES_H -#ifdef CURL_PULL_INTTYPES_H -# include -#endif - -/* Configure process defines this to 1 when it finds out that system */ -/* header file sys/socket.h must be included by the external interface. */ -#cmakedefine CURL_PULL_SYS_SOCKET_H -#ifdef CURL_PULL_SYS_SOCKET_H -# include -#endif - -/* Configure process defines this to 1 when it finds out that system */ -/* header file sys/poll.h must be included by the external interface. */ -#cmakedefine CURL_PULL_SYS_POLL_H -#ifdef CURL_PULL_SYS_POLL_H -# include -#endif - -/* The size of `long', as computed by sizeof. */ -#define CURL_SIZEOF_LONG ${CURL_SIZEOF_LONG} - -/* Integral data type used for curl_socklen_t. */ -#define CURL_TYPEOF_CURL_SOCKLEN_T ${CURL_TYPEOF_CURL_SOCKLEN_T} - -/* The size of `curl_socklen_t', as computed by sizeof. */ -#define CURL_SIZEOF_CURL_SOCKLEN_T ${CURL_SIZEOF_CURL_SOCKLEN_T} - -/* Data type definition of curl_socklen_t. */ -typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; - -/* Signed integral data type used for curl_off_t. */ -#define CURL_TYPEOF_CURL_OFF_T ${CURL_TYPEOF_CURL_OFF_T} - -/* Data type definition of curl_off_t. */ -typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; - -/* curl_off_t formatting string directive without "%" conversion specifier. */ -#define CURL_FORMAT_CURL_OFF_T "${CURL_FORMAT_CURL_OFF_T}" - -/* unsigned curl_off_t formatting string without "%" conversion specifier. */ -#define CURL_FORMAT_CURL_OFF_TU "${CURL_FORMAT_CURL_OFF_TU}" - -/* curl_off_t formatting string directive with "%" conversion specifier. */ -#define CURL_FORMAT_OFF_T "${CURL_FORMAT_OFF_T}" - -/* The size of `curl_off_t', as computed by sizeof. */ -#define CURL_SIZEOF_CURL_OFF_T ${CURL_SIZEOF_CURL_OFF_T} - -/* curl_off_t constant suffix. */ -#define CURL_SUFFIX_CURL_OFF_T ${CURL_SUFFIX_CURL_OFF_T} - -/* unsigned curl_off_t constant suffix. */ -#define CURL_SUFFIX_CURL_OFF_TU ${CURL_SUFFIX_CURL_OFF_TU} - -#endif /* __CURL_CURLBUILD_H */ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/curlbuild.h.in opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/curlbuild.h.in --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/curlbuild.h.in 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/curlbuild.h.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,197 +0,0 @@ -#ifndef __CURL_CURLBUILD_H -#define __CURL_CURLBUILD_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ - -/* ================================================================ */ -/* NOTES FOR CONFIGURE CAPABLE SYSTEMS */ -/* ================================================================ */ - -/* - * NOTE 1: - * ------- - * - * Nothing in this file is intended to be modified or adjusted by the - * curl library user nor by the curl library builder. - * - * If you think that something actually needs to be changed, adjusted - * or fixed in this file, then, report it on the libcurl development - * mailing list: http://cool.haxx.se/mailman/listinfo/curl-library/ - * - * This header file shall only export symbols which are 'curl' or 'CURL' - * prefixed, otherwise public name space would be polluted. - * - * NOTE 2: - * ------- - * - * Right now you might be staring at file include/curl/curlbuild.h.in or - * at file include/curl/curlbuild.h, this is due to the following reason: - * - * On systems capable of running the configure script, the configure process - * will overwrite the distributed include/curl/curlbuild.h file with one that - * is suitable and specific to the library being configured and built, which - * is generated from the include/curl/curlbuild.h.in template file. - * - */ - -/* ================================================================ */ -/* DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE */ -/* ================================================================ */ - -#ifdef CURL_SIZEOF_LONG -#error "CURL_SIZEOF_LONG shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SIZEOF_LONG_already_defined -#endif - -#ifdef CURL_TYPEOF_CURL_SOCKLEN_T -#error "CURL_TYPEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_already_defined -#endif - -#ifdef CURL_SIZEOF_CURL_SOCKLEN_T -#error "CURL_SIZEOF_CURL_SOCKLEN_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_already_defined -#endif - -#ifdef CURL_TYPEOF_CURL_OFF_T -#error "CURL_TYPEOF_CURL_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_already_defined -#endif - -#ifdef CURL_FORMAT_CURL_OFF_T -#error "CURL_FORMAT_CURL_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_already_defined -#endif - -#ifdef CURL_FORMAT_CURL_OFF_TU -#error "CURL_FORMAT_CURL_OFF_TU shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_already_defined -#endif - -#ifdef CURL_FORMAT_OFF_T -#error "CURL_FORMAT_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_FORMAT_OFF_T_already_defined -#endif - -#ifdef CURL_SIZEOF_CURL_OFF_T -#error "CURL_SIZEOF_CURL_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_already_defined -#endif - -#ifdef CURL_SUFFIX_CURL_OFF_T -#error "CURL_SUFFIX_CURL_OFF_T shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_already_defined -#endif - -#ifdef CURL_SUFFIX_CURL_OFF_TU -#error "CURL_SUFFIX_CURL_OFF_TU shall not be defined except in curlbuild.h" - Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_already_defined -#endif - -/* ================================================================ */ -/* EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY */ -/* ================================================================ */ - -/* Configure process defines this to 1 when it finds out that system */ -/* header file ws2tcpip.h must be included by the external interface. */ -#undef CURL_PULL_WS2TCPIP_H -#ifdef CURL_PULL_WS2TCPIP_H -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -# endif -# include -# include -# include -#endif - -/* Configure process defines this to 1 when it finds out that system */ -/* header file sys/types.h must be included by the external interface. */ -#undef CURL_PULL_SYS_TYPES_H -#ifdef CURL_PULL_SYS_TYPES_H -# include -#endif - -/* Configure process defines this to 1 when it finds out that system */ -/* header file stdint.h must be included by the external interface. */ -#undef CURL_PULL_STDINT_H -#ifdef CURL_PULL_STDINT_H -# include -#endif - -/* Configure process defines this to 1 when it finds out that system */ -/* header file inttypes.h must be included by the external interface. */ -#undef CURL_PULL_INTTYPES_H -#ifdef CURL_PULL_INTTYPES_H -# include -#endif - -/* Configure process defines this to 1 when it finds out that system */ -/* header file sys/socket.h must be included by the external interface. */ -#undef CURL_PULL_SYS_SOCKET_H -#ifdef CURL_PULL_SYS_SOCKET_H -# include -#endif - -/* Configure process defines this to 1 when it finds out that system */ -/* header file sys/poll.h must be included by the external interface. */ -#undef CURL_PULL_SYS_POLL_H -#ifdef CURL_PULL_SYS_POLL_H -# include -#endif - -/* The size of `long', as computed by sizeof. */ -#undef CURL_SIZEOF_LONG - -/* Integral data type used for curl_socklen_t. */ -#undef CURL_TYPEOF_CURL_SOCKLEN_T - -/* The size of `curl_socklen_t', as computed by sizeof. */ -#undef CURL_SIZEOF_CURL_SOCKLEN_T - -/* Data type definition of curl_socklen_t. */ -typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t; - -/* Signed integral data type used for curl_off_t. */ -#undef CURL_TYPEOF_CURL_OFF_T - -/* Data type definition of curl_off_t. */ -typedef CURL_TYPEOF_CURL_OFF_T curl_off_t; - -/* curl_off_t formatting string directive without "%" conversion specifier. */ -#undef CURL_FORMAT_CURL_OFF_T - -/* unsigned curl_off_t formatting string without "%" conversion specifier. */ -#undef CURL_FORMAT_CURL_OFF_TU - -/* curl_off_t formatting string directive with "%" conversion specifier. */ -#undef CURL_FORMAT_OFF_T - -/* The size of `curl_off_t', as computed by sizeof. */ -#undef CURL_SIZEOF_CURL_OFF_T - -/* curl_off_t constant suffix. */ -#undef CURL_SUFFIX_CURL_OFF_T - -/* unsigned curl_off_t constant suffix. */ -#undef CURL_SUFFIX_CURL_OFF_TU - -#endif /* __CURL_CURLBUILD_H */ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/curl.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/curl.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/curl.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/curl.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,2318 +0,0 @@ -#ifndef __CURL_CURL_H -#define __CURL_CURL_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2014, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ - -/* - * If you have libcurl problems, all docs and details are found here: - * http://curl.haxx.se/libcurl/ - * - * curl-library mailing list subscription and unsubscription web interface: - * http://cool.haxx.se/mailman/listinfo/curl-library/ - */ - -#include "curlver.h" /* libcurl version defines */ -#include "curlbuild.h" /* libcurl build definitions */ -#include "curlrules.h" /* libcurl rules enforcement */ - -/* - * Define WIN32 when build target is Win32 API - */ - -#if (defined(_WIN32) || defined(__WIN32__)) && \ - !defined(WIN32) && !defined(__SYMBIAN32__) -#define WIN32 -#endif - -#include -#include - -#if defined(__FreeBSD__) && (__FreeBSD__ >= 2) -/* Needed for __FreeBSD_version symbol definition */ -#include -#endif - -/* The include stuff here below is mainly for time_t! */ -#include -#include - -#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) -#if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H) || defined(__LWIP_OPT_H__)) -/* The check above prevents the winsock2 inclusion if winsock.h already was - included, since they can't co-exist without problems */ -#include -#include -#endif -#endif - -/* HP-UX systems version 9, 10 and 11 lack sys/select.h and so does oldish - libc5-based Linux systems. Only include it on systems that are known to - require it! */ -#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \ - defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \ - defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \ - (defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) -#include -#endif - -#if !defined(WIN32) && !defined(_WIN32_WCE) -#include -#endif - -#if !defined(WIN32) && !defined(__WATCOMC__) && !defined(__VXWORKS__) -#include -#endif - -#ifdef __BEOS__ -#include -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -typedef void CURL; - -/* - * libcurl external API function linkage decorations. - */ - -#ifdef CURL_STATICLIB -# define CURL_EXTERN -#elif defined(WIN32) || defined(_WIN32) || defined(__SYMBIAN32__) -# if defined(BUILDING_LIBCURL) -# define CURL_EXTERN __declspec(dllexport) -# else -# define CURL_EXTERN __declspec(dllimport) -# endif -#elif defined(BUILDING_LIBCURL) && defined(CURL_HIDDEN_SYMBOLS) -# define CURL_EXTERN CURL_EXTERN_SYMBOL -#else -# define CURL_EXTERN -#endif - -#ifndef curl_socket_typedef -/* socket typedef */ -#if defined(WIN32) && !defined(__LWIP_OPT_H__) -typedef SOCKET curl_socket_t; -#define CURL_SOCKET_BAD INVALID_SOCKET -#else -typedef int curl_socket_t; -#define CURL_SOCKET_BAD -1 -#endif -#define curl_socket_typedef -#endif /* curl_socket_typedef */ - -struct curl_httppost { - struct curl_httppost *next; /* next entry in the list */ - char *name; /* pointer to allocated name */ - long namelength; /* length of name length */ - char *contents; /* pointer to allocated data contents */ - long contentslength; /* length of contents field */ - char *buffer; /* pointer to allocated buffer contents */ - long bufferlength; /* length of buffer field */ - char *contenttype; /* Content-Type */ - struct curl_slist* contentheader; /* list of extra headers for this form */ - struct curl_httppost *more; /* if one field name has more than one - file, this link should link to following - files */ - long flags; /* as defined below */ -#define HTTPPOST_FILENAME (1<<0) /* specified content is a file name */ -#define HTTPPOST_READFILE (1<<1) /* specified content is a file name */ -#define HTTPPOST_PTRNAME (1<<2) /* name is only stored pointer - do not free in formfree */ -#define HTTPPOST_PTRCONTENTS (1<<3) /* contents is only stored pointer - do not free in formfree */ -#define HTTPPOST_BUFFER (1<<4) /* upload file from buffer */ -#define HTTPPOST_PTRBUFFER (1<<5) /* upload file from pointer contents */ -#define HTTPPOST_CALLBACK (1<<6) /* upload file contents by using the - regular read callback to get the data - and pass the given pointer as custom - pointer */ - - char *showfilename; /* The file name to show. If not set, the - actual file name will be used (if this - is a file part) */ - void *userp; /* custom pointer used for - HTTPPOST_CALLBACK posts */ -}; - -/* This is the CURLOPT_PROGRESSFUNCTION callback proto. It is now considered - deprecated but was the only choice up until 7.31.0 */ -typedef int (*curl_progress_callback)(void *clientp, - double dltotal, - double dlnow, - double ultotal, - double ulnow); - -/* This is the CURLOPT_XFERINFOFUNCTION callback proto. It was introduced in - 7.32.0, it avoids floating point and provides more detailed information. */ -typedef int (*curl_xferinfo_callback)(void *clientp, - curl_off_t dltotal, - curl_off_t dlnow, - curl_off_t ultotal, - curl_off_t ulnow); - -#ifndef CURL_MAX_WRITE_SIZE - /* Tests have proven that 20K is a very bad buffer size for uploads on - Windows, while 16K for some odd reason performed a lot better. - We do the ifndef check to allow this value to easier be changed at build - time for those who feel adventurous. The practical minimum is about - 400 bytes since libcurl uses a buffer of this size as a scratch area - (unrelated to network send operations). */ -#define CURL_MAX_WRITE_SIZE 16384 -#endif - -#ifndef CURL_MAX_HTTP_HEADER -/* The only reason to have a max limit for this is to avoid the risk of a bad - server feeding libcurl with a never-ending header that will cause reallocs - infinitely */ -#define CURL_MAX_HTTP_HEADER (100*1024) -#endif - -/* This is a magic return code for the write callback that, when returned, - will signal libcurl to pause receiving on the current transfer. */ -#define CURL_WRITEFUNC_PAUSE 0x10000001 - -typedef size_t (*curl_write_callback)(char *buffer, - size_t size, - size_t nitems, - void *outstream); - - - -/* enumeration of file types */ -typedef enum { - CURLFILETYPE_FILE = 0, - CURLFILETYPE_DIRECTORY, - CURLFILETYPE_SYMLINK, - CURLFILETYPE_DEVICE_BLOCK, - CURLFILETYPE_DEVICE_CHAR, - CURLFILETYPE_NAMEDPIPE, - CURLFILETYPE_SOCKET, - CURLFILETYPE_DOOR, /* is possible only on Sun Solaris now */ - - CURLFILETYPE_UNKNOWN /* should never occur */ -} curlfiletype; - -#define CURLFINFOFLAG_KNOWN_FILENAME (1<<0) -#define CURLFINFOFLAG_KNOWN_FILETYPE (1<<1) -#define CURLFINFOFLAG_KNOWN_TIME (1<<2) -#define CURLFINFOFLAG_KNOWN_PERM (1<<3) -#define CURLFINFOFLAG_KNOWN_UID (1<<4) -#define CURLFINFOFLAG_KNOWN_GID (1<<5) -#define CURLFINFOFLAG_KNOWN_SIZE (1<<6) -#define CURLFINFOFLAG_KNOWN_HLINKCOUNT (1<<7) - -/* Content of this structure depends on information which is known and is - achievable (e.g. by FTP LIST parsing). Please see the url_easy_setopt(3) man - page for callbacks returning this structure -- some fields are mandatory, - some others are optional. The FLAG field has special meaning. */ -struct curl_fileinfo { - char *filename; - curlfiletype filetype; - time_t time; - unsigned int perm; - int uid; - int gid; - curl_off_t size; - long int hardlinks; - - struct { - /* If some of these fields is not NULL, it is a pointer to b_data. */ - char *time; - char *perm; - char *user; - char *group; - char *target; /* pointer to the target filename of a symlink */ - } strings; - - unsigned int flags; - - /* used internally */ - char * b_data; - size_t b_size; - size_t b_used; -}; - -/* return codes for CURLOPT_CHUNK_BGN_FUNCTION */ -#define CURL_CHUNK_BGN_FUNC_OK 0 -#define CURL_CHUNK_BGN_FUNC_FAIL 1 /* tell the lib to end the task */ -#define CURL_CHUNK_BGN_FUNC_SKIP 2 /* skip this chunk over */ - -/* if splitting of data transfer is enabled, this callback is called before - download of an individual chunk started. Note that parameter "remains" works - only for FTP wildcard downloading (for now), otherwise is not used */ -typedef long (*curl_chunk_bgn_callback)(const void *transfer_info, - void *ptr, - int remains); - -/* return codes for CURLOPT_CHUNK_END_FUNCTION */ -#define CURL_CHUNK_END_FUNC_OK 0 -#define CURL_CHUNK_END_FUNC_FAIL 1 /* tell the lib to end the task */ - -/* If splitting of data transfer is enabled this callback is called after - download of an individual chunk finished. - Note! After this callback was set then it have to be called FOR ALL chunks. - Even if downloading of this chunk was skipped in CHUNK_BGN_FUNC. - This is the reason why we don't need "transfer_info" parameter in this - callback and we are not interested in "remains" parameter too. */ -typedef long (*curl_chunk_end_callback)(void *ptr); - -/* return codes for FNMATCHFUNCTION */ -#define CURL_FNMATCHFUNC_MATCH 0 /* string corresponds to the pattern */ -#define CURL_FNMATCHFUNC_NOMATCH 1 /* pattern doesn't match the string */ -#define CURL_FNMATCHFUNC_FAIL 2 /* an error occurred */ - -/* callback type for wildcard downloading pattern matching. If the - string matches the pattern, return CURL_FNMATCHFUNC_MATCH value, etc. */ -typedef int (*curl_fnmatch_callback)(void *ptr, - const char *pattern, - const char *string); - -/* These are the return codes for the seek callbacks */ -#define CURL_SEEKFUNC_OK 0 -#define CURL_SEEKFUNC_FAIL 1 /* fail the entire transfer */ -#define CURL_SEEKFUNC_CANTSEEK 2 /* tell libcurl seeking can't be done, so - libcurl might try other means instead */ -typedef int (*curl_seek_callback)(void *instream, - curl_off_t offset, - int origin); /* 'whence' */ - -/* This is a return code for the read callback that, when returned, will - signal libcurl to immediately abort the current transfer. */ -#define CURL_READFUNC_ABORT 0x10000000 -/* This is a return code for the read callback that, when returned, will - signal libcurl to pause sending data on the current transfer. */ -#define CURL_READFUNC_PAUSE 0x10000001 - -typedef size_t (*curl_read_callback)(char *buffer, - size_t size, - size_t nitems, - void *instream); - -typedef enum { - CURLSOCKTYPE_IPCXN, /* socket created for a specific IP connection */ - CURLSOCKTYPE_ACCEPT, /* socket created by accept() call */ - CURLSOCKTYPE_LAST /* never use */ -} curlsocktype; - -/* The return code from the sockopt_callback can signal information back - to libcurl: */ -#define CURL_SOCKOPT_OK 0 -#define CURL_SOCKOPT_ERROR 1 /* causes libcurl to abort and return - CURLE_ABORTED_BY_CALLBACK */ -#define CURL_SOCKOPT_ALREADY_CONNECTED 2 - -typedef int (*curl_sockopt_callback)(void *clientp, - curl_socket_t curlfd, - curlsocktype purpose); - -struct curl_sockaddr { - int family; - int socktype; - int protocol; - unsigned int addrlen; /* addrlen was a socklen_t type before 7.18.0 but it - turned really ugly and painful on the systems that - lack this type */ - struct sockaddr addr; -}; - -typedef curl_socket_t -(*curl_opensocket_callback)(void *clientp, - curlsocktype purpose, - struct curl_sockaddr *address); - -typedef int -(*curl_closesocket_callback)(void *clientp, curl_socket_t item); - -typedef enum { - CURLIOE_OK, /* I/O operation successful */ - CURLIOE_UNKNOWNCMD, /* command was unknown to callback */ - CURLIOE_FAILRESTART, /* failed to restart the read */ - CURLIOE_LAST /* never use */ -} curlioerr; - -typedef enum { - CURLIOCMD_NOP, /* no operation */ - CURLIOCMD_RESTARTREAD, /* restart the read stream from start */ - CURLIOCMD_LAST /* never use */ -} curliocmd; - -typedef curlioerr (*curl_ioctl_callback)(CURL *handle, - int cmd, - void *clientp); - -/* - * The following typedef's are signatures of malloc, free, realloc, strdup and - * calloc respectively. Function pointers of these types can be passed to the - * curl_global_init_mem() function to set user defined memory management - * callback routines. - */ -typedef void *(*curl_malloc_callback)(size_t size); -typedef void (*curl_free_callback)(void *ptr); -typedef void *(*curl_realloc_callback)(void *ptr, size_t size); -typedef char *(*curl_strdup_callback)(const char *str); -typedef void *(*curl_calloc_callback)(size_t nmemb, size_t size); - -/* the kind of data that is passed to information_callback*/ -typedef enum { - CURLINFO_TEXT = 0, - CURLINFO_HEADER_IN, /* 1 */ - CURLINFO_HEADER_OUT, /* 2 */ - CURLINFO_DATA_IN, /* 3 */ - CURLINFO_DATA_OUT, /* 4 */ - CURLINFO_SSL_DATA_IN, /* 5 */ - CURLINFO_SSL_DATA_OUT, /* 6 */ - CURLINFO_END -} curl_infotype; - -typedef int (*curl_debug_callback) - (CURL *handle, /* the handle/transfer this concerns */ - curl_infotype type, /* what kind of data */ - char *data, /* points to the data */ - size_t size, /* size of the data pointed to */ - void *userptr); /* whatever the user please */ - -/* All possible error codes from all sorts of curl functions. Future versions - may return other values, stay prepared. - - Always add new return codes last. Never *EVER* remove any. The return - codes must remain the same! - */ - -typedef enum { - CURLE_OK = 0, - CURLE_UNSUPPORTED_PROTOCOL, /* 1 */ - CURLE_FAILED_INIT, /* 2 */ - CURLE_URL_MALFORMAT, /* 3 */ - CURLE_NOT_BUILT_IN, /* 4 - [was obsoleted in August 2007 for - 7.17.0, reused in April 2011 for 7.21.5] */ - CURLE_COULDNT_RESOLVE_PROXY, /* 5 */ - CURLE_COULDNT_RESOLVE_HOST, /* 6 */ - CURLE_COULDNT_CONNECT, /* 7 */ - CURLE_FTP_WEIRD_SERVER_REPLY, /* 8 */ - CURLE_REMOTE_ACCESS_DENIED, /* 9 a service was denied by the server - due to lack of access - when login fails - this is not returned. */ - CURLE_FTP_ACCEPT_FAILED, /* 10 - [was obsoleted in April 2006 for - 7.15.4, reused in Dec 2011 for 7.24.0]*/ - CURLE_FTP_WEIRD_PASS_REPLY, /* 11 */ - CURLE_FTP_ACCEPT_TIMEOUT, /* 12 - timeout occurred accepting server - [was obsoleted in August 2007 for 7.17.0, - reused in Dec 2011 for 7.24.0]*/ - CURLE_FTP_WEIRD_PASV_REPLY, /* 13 */ - CURLE_FTP_WEIRD_227_FORMAT, /* 14 */ - CURLE_FTP_CANT_GET_HOST, /* 15 */ - CURLE_OBSOLETE16, /* 16 - NOT USED */ - CURLE_FTP_COULDNT_SET_TYPE, /* 17 */ - CURLE_PARTIAL_FILE, /* 18 */ - CURLE_FTP_COULDNT_RETR_FILE, /* 19 */ - CURLE_OBSOLETE20, /* 20 - NOT USED */ - CURLE_QUOTE_ERROR, /* 21 - quote command failure */ - CURLE_HTTP_RETURNED_ERROR, /* 22 */ - CURLE_WRITE_ERROR, /* 23 */ - CURLE_OBSOLETE24, /* 24 - NOT USED */ - CURLE_UPLOAD_FAILED, /* 25 - failed upload "command" */ - CURLE_READ_ERROR, /* 26 - couldn't open/read from file */ - CURLE_OUT_OF_MEMORY, /* 27 */ - /* Note: CURLE_OUT_OF_MEMORY may sometimes indicate a conversion error - instead of a memory allocation error if CURL_DOES_CONVERSIONS - is defined - */ - CURLE_OPERATION_TIMEDOUT, /* 28 - the timeout time was reached */ - CURLE_OBSOLETE29, /* 29 - NOT USED */ - CURLE_FTP_PORT_FAILED, /* 30 - FTP PORT operation failed */ - CURLE_FTP_COULDNT_USE_REST, /* 31 - the REST command failed */ - CURLE_OBSOLETE32, /* 32 - NOT USED */ - CURLE_RANGE_ERROR, /* 33 - RANGE "command" didn't work */ - CURLE_HTTP_POST_ERROR, /* 34 */ - CURLE_SSL_CONNECT_ERROR, /* 35 - wrong when connecting with SSL */ - CURLE_BAD_DOWNLOAD_RESUME, /* 36 - couldn't resume download */ - CURLE_FILE_COULDNT_READ_FILE, /* 37 */ - CURLE_LDAP_CANNOT_BIND, /* 38 */ - CURLE_LDAP_SEARCH_FAILED, /* 39 */ - CURLE_OBSOLETE40, /* 40 - NOT USED */ - CURLE_FUNCTION_NOT_FOUND, /* 41 */ - CURLE_ABORTED_BY_CALLBACK, /* 42 */ - CURLE_BAD_FUNCTION_ARGUMENT, /* 43 */ - CURLE_OBSOLETE44, /* 44 - NOT USED */ - CURLE_INTERFACE_FAILED, /* 45 - CURLOPT_INTERFACE failed */ - CURLE_OBSOLETE46, /* 46 - NOT USED */ - CURLE_TOO_MANY_REDIRECTS , /* 47 - catch endless re-direct loops */ - CURLE_UNKNOWN_OPTION, /* 48 - User specified an unknown option */ - CURLE_TELNET_OPTION_SYNTAX , /* 49 - Malformed telnet option */ - CURLE_OBSOLETE50, /* 50 - NOT USED */ - CURLE_PEER_FAILED_VERIFICATION, /* 51 - peer's certificate or fingerprint - wasn't verified fine */ - CURLE_GOT_NOTHING, /* 52 - when this is a specific error */ - CURLE_SSL_ENGINE_NOTFOUND, /* 53 - SSL crypto engine not found */ - CURLE_SSL_ENGINE_SETFAILED, /* 54 - can not set SSL crypto engine as - default */ - CURLE_SEND_ERROR, /* 55 - failed sending network data */ - CURLE_RECV_ERROR, /* 56 - failure in receiving network data */ - CURLE_OBSOLETE57, /* 57 - NOT IN USE */ - CURLE_SSL_CERTPROBLEM, /* 58 - problem with the local certificate */ - CURLE_SSL_CIPHER, /* 59 - couldn't use specified cipher */ - CURLE_SSL_CACERT, /* 60 - problem with the CA cert (path?) */ - CURLE_BAD_CONTENT_ENCODING, /* 61 - Unrecognized/bad encoding */ - CURLE_LDAP_INVALID_URL, /* 62 - Invalid LDAP URL */ - CURLE_FILESIZE_EXCEEDED, /* 63 - Maximum file size exceeded */ - CURLE_USE_SSL_FAILED, /* 64 - Requested FTP SSL level failed */ - CURLE_SEND_FAIL_REWIND, /* 65 - Sending the data requires a rewind - that failed */ - CURLE_SSL_ENGINE_INITFAILED, /* 66 - failed to initialise ENGINE */ - CURLE_LOGIN_DENIED, /* 67 - user, password or similar was not - accepted and we failed to login */ - CURLE_TFTP_NOTFOUND, /* 68 - file not found on server */ - CURLE_TFTP_PERM, /* 69 - permission problem on server */ - CURLE_REMOTE_DISK_FULL, /* 70 - out of disk space on server */ - CURLE_TFTP_ILLEGAL, /* 71 - Illegal TFTP operation */ - CURLE_TFTP_UNKNOWNID, /* 72 - Unknown transfer ID */ - CURLE_REMOTE_FILE_EXISTS, /* 73 - File already exists */ - CURLE_TFTP_NOSUCHUSER, /* 74 - No such user */ - CURLE_CONV_FAILED, /* 75 - conversion failed */ - CURLE_CONV_REQD, /* 76 - caller must register conversion - callbacks using curl_easy_setopt options - CURLOPT_CONV_FROM_NETWORK_FUNCTION, - CURLOPT_CONV_TO_NETWORK_FUNCTION, and - CURLOPT_CONV_FROM_UTF8_FUNCTION */ - CURLE_SSL_CACERT_BADFILE, /* 77 - could not load CACERT file, missing - or wrong format */ - CURLE_REMOTE_FILE_NOT_FOUND, /* 78 - remote file not found */ - CURLE_SSH, /* 79 - error from the SSH layer, somewhat - generic so the error message will be of - interest when this has happened */ - - CURLE_SSL_SHUTDOWN_FAILED, /* 80 - Failed to shut down the SSL - connection */ - CURLE_AGAIN, /* 81 - socket is not ready for send/recv, - wait till it's ready and try again (Added - in 7.18.2) */ - CURLE_SSL_CRL_BADFILE, /* 82 - could not load CRL file, missing or - wrong format (Added in 7.19.0) */ - CURLE_SSL_ISSUER_ERROR, /* 83 - Issuer check failed. (Added in - 7.19.0) */ - CURLE_FTP_PRET_FAILED, /* 84 - a PRET command failed */ - CURLE_RTSP_CSEQ_ERROR, /* 85 - mismatch of RTSP CSeq numbers */ - CURLE_RTSP_SESSION_ERROR, /* 86 - mismatch of RTSP Session Ids */ - CURLE_FTP_BAD_FILE_LIST, /* 87 - unable to parse FTP file list */ - CURLE_CHUNK_FAILED, /* 88 - chunk callback reported error */ - CURLE_NO_CONNECTION_AVAILABLE, /* 89 - No connection available, the - session will be queued */ - CURL_LAST /* never use! */ -} CURLcode; - -#ifndef CURL_NO_OLDIES /* define this to test if your app builds with all - the obsolete stuff removed! */ - -/* Previously obsoletes error codes re-used in 7.24.0 */ -#define CURLE_OBSOLETE10 CURLE_FTP_ACCEPT_FAILED -#define CURLE_OBSOLETE12 CURLE_FTP_ACCEPT_TIMEOUT - -/* compatibility with older names */ -#define CURLOPT_ENCODING CURLOPT_ACCEPT_ENCODING - -/* The following were added in 7.21.5, April 2011 */ -#define CURLE_UNKNOWN_TELNET_OPTION CURLE_UNKNOWN_OPTION - -/* The following were added in 7.17.1 */ -/* These are scheduled to disappear by 2009 */ -#define CURLE_SSL_PEER_CERTIFICATE CURLE_PEER_FAILED_VERIFICATION - -/* The following were added in 7.17.0 */ -/* These are scheduled to disappear by 2009 */ -#define CURLE_OBSOLETE CURLE_OBSOLETE50 /* no one should be using this! */ -#define CURLE_BAD_PASSWORD_ENTERED CURLE_OBSOLETE46 -#define CURLE_BAD_CALLING_ORDER CURLE_OBSOLETE44 -#define CURLE_FTP_USER_PASSWORD_INCORRECT CURLE_OBSOLETE10 -#define CURLE_FTP_CANT_RECONNECT CURLE_OBSOLETE16 -#define CURLE_FTP_COULDNT_GET_SIZE CURLE_OBSOLETE32 -#define CURLE_FTP_COULDNT_SET_ASCII CURLE_OBSOLETE29 -#define CURLE_FTP_WEIRD_USER_REPLY CURLE_OBSOLETE12 -#define CURLE_FTP_WRITE_ERROR CURLE_OBSOLETE20 -#define CURLE_LIBRARY_NOT_FOUND CURLE_OBSOLETE40 -#define CURLE_MALFORMAT_USER CURLE_OBSOLETE24 -#define CURLE_SHARE_IN_USE CURLE_OBSOLETE57 -#define CURLE_URL_MALFORMAT_USER CURLE_NOT_BUILT_IN - -#define CURLE_FTP_ACCESS_DENIED CURLE_REMOTE_ACCESS_DENIED -#define CURLE_FTP_COULDNT_SET_BINARY CURLE_FTP_COULDNT_SET_TYPE -#define CURLE_FTP_QUOTE_ERROR CURLE_QUOTE_ERROR -#define CURLE_TFTP_DISKFULL CURLE_REMOTE_DISK_FULL -#define CURLE_TFTP_EXISTS CURLE_REMOTE_FILE_EXISTS -#define CURLE_HTTP_RANGE_ERROR CURLE_RANGE_ERROR -#define CURLE_FTP_SSL_FAILED CURLE_USE_SSL_FAILED - -/* The following were added earlier */ - -#define CURLE_OPERATION_TIMEOUTED CURLE_OPERATION_TIMEDOUT - -#define CURLE_HTTP_NOT_FOUND CURLE_HTTP_RETURNED_ERROR -#define CURLE_HTTP_PORT_FAILED CURLE_INTERFACE_FAILED -#define CURLE_FTP_COULDNT_STOR_FILE CURLE_UPLOAD_FAILED - -#define CURLE_FTP_PARTIAL_FILE CURLE_PARTIAL_FILE -#define CURLE_FTP_BAD_DOWNLOAD_RESUME CURLE_BAD_DOWNLOAD_RESUME - -/* This was the error code 50 in 7.7.3 and a few earlier versions, this - is no longer used by libcurl but is instead #defined here only to not - make programs break */ -#define CURLE_ALREADY_COMPLETE 99999 - -#endif /*!CURL_NO_OLDIES*/ - -/* This prototype applies to all conversion callbacks */ -typedef CURLcode (*curl_conv_callback)(char *buffer, size_t length); - -typedef CURLcode (*curl_ssl_ctx_callback)(CURL *curl, /* easy handle */ - void *ssl_ctx, /* actually an - OpenSSL SSL_CTX */ - void *userptr); - -typedef enum { - CURLPROXY_HTTP = 0, /* added in 7.10, new in 7.19.4 default is to use - CONNECT HTTP/1.1 */ - CURLPROXY_HTTP_1_0 = 1, /* added in 7.19.4, force to use CONNECT - HTTP/1.0 */ - CURLPROXY_SOCKS4 = 4, /* support added in 7.15.2, enum existed already - in 7.10 */ - CURLPROXY_SOCKS5 = 5, /* added in 7.10 */ - CURLPROXY_SOCKS4A = 6, /* added in 7.18.0 */ - CURLPROXY_SOCKS5_HOSTNAME = 7 /* Use the SOCKS5 protocol but pass along the - host name rather than the IP address. added - in 7.18.0 */ -} curl_proxytype; /* this enum was added in 7.10 */ - -/* - * Bitmasks for CURLOPT_HTTPAUTH and CURLOPT_PROXYAUTH options: - * - * CURLAUTH_NONE - No HTTP authentication - * CURLAUTH_BASIC - HTTP Basic authentication (default) - * CURLAUTH_DIGEST - HTTP Digest authentication - * CURLAUTH_GSSNEGOTIATE - HTTP GSS-Negotiate authentication - * CURLAUTH_NTLM - HTTP NTLM authentication - * CURLAUTH_DIGEST_IE - HTTP Digest authentication with IE flavour - * CURLAUTH_NTLM_WB - HTTP NTLM authentication delegated to winbind helper - * CURLAUTH_ONLY - Use together with a single other type to force no - * authentication or just that single type - * CURLAUTH_ANY - All fine types set - * CURLAUTH_ANYSAFE - All fine types except Basic - */ - -#define CURLAUTH_NONE ((unsigned long)0) -#define CURLAUTH_BASIC (((unsigned long)1)<<0) -#define CURLAUTH_DIGEST (((unsigned long)1)<<1) -#define CURLAUTH_GSSNEGOTIATE (((unsigned long)1)<<2) -#define CURLAUTH_NTLM (((unsigned long)1)<<3) -#define CURLAUTH_DIGEST_IE (((unsigned long)1)<<4) -#define CURLAUTH_NTLM_WB (((unsigned long)1)<<5) -#define CURLAUTH_ONLY (((unsigned long)1)<<31) -#define CURLAUTH_ANY (~CURLAUTH_DIGEST_IE) -#define CURLAUTH_ANYSAFE (~(CURLAUTH_BASIC|CURLAUTH_DIGEST_IE)) - -#define CURLSSH_AUTH_ANY ~0 /* all types supported by the server */ -#define CURLSSH_AUTH_NONE 0 /* none allowed, silly but complete */ -#define CURLSSH_AUTH_PUBLICKEY (1<<0) /* public/private key files */ -#define CURLSSH_AUTH_PASSWORD (1<<1) /* password */ -#define CURLSSH_AUTH_HOST (1<<2) /* host key files */ -#define CURLSSH_AUTH_KEYBOARD (1<<3) /* keyboard interactive */ -#define CURLSSH_AUTH_AGENT (1<<4) /* agent (ssh-agent, pageant...) */ -#define CURLSSH_AUTH_DEFAULT CURLSSH_AUTH_ANY - -#define CURLGSSAPI_DELEGATION_NONE 0 /* no delegation (default) */ -#define CURLGSSAPI_DELEGATION_POLICY_FLAG (1<<0) /* if permitted by policy */ -#define CURLGSSAPI_DELEGATION_FLAG (1<<1) /* delegate always */ - -#define CURL_ERROR_SIZE 256 - -enum curl_khtype { - CURLKHTYPE_UNKNOWN, - CURLKHTYPE_RSA1, - CURLKHTYPE_RSA, - CURLKHTYPE_DSS -}; - -struct curl_khkey { - const char *key; /* points to a zero-terminated string encoded with base64 - if len is zero, otherwise to the "raw" data */ - size_t len; - enum curl_khtype keytype; -}; - -/* this is the set of return values expected from the curl_sshkeycallback - callback */ -enum curl_khstat { - CURLKHSTAT_FINE_ADD_TO_FILE, - CURLKHSTAT_FINE, - CURLKHSTAT_REJECT, /* reject the connection, return an error */ - CURLKHSTAT_DEFER, /* do not accept it, but we can't answer right now so - this causes a CURLE_DEFER error but otherwise the - connection will be left intact etc */ - CURLKHSTAT_LAST /* not for use, only a marker for last-in-list */ -}; - -/* this is the set of status codes pass in to the callback */ -enum curl_khmatch { - CURLKHMATCH_OK, /* match */ - CURLKHMATCH_MISMATCH, /* host found, key mismatch! */ - CURLKHMATCH_MISSING, /* no matching host/key found */ - CURLKHMATCH_LAST /* not for use, only a marker for last-in-list */ -}; - -typedef int - (*curl_sshkeycallback) (CURL *easy, /* easy handle */ - const struct curl_khkey *knownkey, /* known */ - const struct curl_khkey *foundkey, /* found */ - enum curl_khmatch, /* libcurl's view on the keys */ - void *clientp); /* custom pointer passed from app */ - -/* parameter for the CURLOPT_USE_SSL option */ -typedef enum { - CURLUSESSL_NONE, /* do not attempt to use SSL */ - CURLUSESSL_TRY, /* try using SSL, proceed anyway otherwise */ - CURLUSESSL_CONTROL, /* SSL for the control connection or fail */ - CURLUSESSL_ALL, /* SSL for all communication or fail */ - CURLUSESSL_LAST /* not an option, never use */ -} curl_usessl; - -/* Definition of bits for the CURLOPT_SSL_OPTIONS argument: */ - -/* - ALLOW_BEAST tells libcurl to allow the BEAST SSL vulnerability in the - name of improving interoperability with older servers. Some SSL libraries - have introduced work-arounds for this flaw but those work-arounds sometimes - make the SSL communication fail. To regain functionality with those broken - servers, a user can this way allow the vulnerability back. */ -#define CURLSSLOPT_ALLOW_BEAST (1<<0) - -#ifndef CURL_NO_OLDIES /* define this to test if your app builds with all - the obsolete stuff removed! */ - -/* Backwards compatibility with older names */ -/* These are scheduled to disappear by 2009 */ - -#define CURLFTPSSL_NONE CURLUSESSL_NONE -#define CURLFTPSSL_TRY CURLUSESSL_TRY -#define CURLFTPSSL_CONTROL CURLUSESSL_CONTROL -#define CURLFTPSSL_ALL CURLUSESSL_ALL -#define CURLFTPSSL_LAST CURLUSESSL_LAST -#define curl_ftpssl curl_usessl -#endif /*!CURL_NO_OLDIES*/ - -/* parameter for the CURLOPT_FTP_SSL_CCC option */ -typedef enum { - CURLFTPSSL_CCC_NONE, /* do not send CCC */ - CURLFTPSSL_CCC_PASSIVE, /* Let the server initiate the shutdown */ - CURLFTPSSL_CCC_ACTIVE, /* Initiate the shutdown */ - CURLFTPSSL_CCC_LAST /* not an option, never use */ -} curl_ftpccc; - -/* parameter for the CURLOPT_FTPSSLAUTH option */ -typedef enum { - CURLFTPAUTH_DEFAULT, /* let libcurl decide */ - CURLFTPAUTH_SSL, /* use "AUTH SSL" */ - CURLFTPAUTH_TLS, /* use "AUTH TLS" */ - CURLFTPAUTH_LAST /* not an option, never use */ -} curl_ftpauth; - -/* parameter for the CURLOPT_FTP_CREATE_MISSING_DIRS option */ -typedef enum { - CURLFTP_CREATE_DIR_NONE, /* do NOT create missing dirs! */ - CURLFTP_CREATE_DIR, /* (FTP/SFTP) if CWD fails, try MKD and then CWD - again if MKD succeeded, for SFTP this does - similar magic */ - CURLFTP_CREATE_DIR_RETRY, /* (FTP only) if CWD fails, try MKD and then CWD - again even if MKD failed! */ - CURLFTP_CREATE_DIR_LAST /* not an option, never use */ -} curl_ftpcreatedir; - -/* parameter for the CURLOPT_FTP_FILEMETHOD option */ -typedef enum { - CURLFTPMETHOD_DEFAULT, /* let libcurl pick */ - CURLFTPMETHOD_MULTICWD, /* single CWD operation for each path part */ - CURLFTPMETHOD_NOCWD, /* no CWD at all */ - CURLFTPMETHOD_SINGLECWD, /* one CWD to full dir, then work on file */ - CURLFTPMETHOD_LAST /* not an option, never use */ -} curl_ftpmethod; - -/* bitmask defines for CURLOPT_HEADEROPT */ -#define CURLHEADER_UNIFIED 0 -#define CURLHEADER_SEPARATE (1<<0) - -/* CURLPROTO_ defines are for the CURLOPT_*PROTOCOLS options */ -#define CURLPROTO_HTTP (1<<0) -#define CURLPROTO_HTTPS (1<<1) -#define CURLPROTO_FTP (1<<2) -#define CURLPROTO_FTPS (1<<3) -#define CURLPROTO_SCP (1<<4) -#define CURLPROTO_SFTP (1<<5) -#define CURLPROTO_TELNET (1<<6) -#define CURLPROTO_LDAP (1<<7) -#define CURLPROTO_LDAPS (1<<8) -#define CURLPROTO_DICT (1<<9) -#define CURLPROTO_FILE (1<<10) -#define CURLPROTO_TFTP (1<<11) -#define CURLPROTO_IMAP (1<<12) -#define CURLPROTO_IMAPS (1<<13) -#define CURLPROTO_POP3 (1<<14) -#define CURLPROTO_POP3S (1<<15) -#define CURLPROTO_SMTP (1<<16) -#define CURLPROTO_SMTPS (1<<17) -#define CURLPROTO_RTSP (1<<18) -#define CURLPROTO_RTMP (1<<19) -#define CURLPROTO_RTMPT (1<<20) -#define CURLPROTO_RTMPE (1<<21) -#define CURLPROTO_RTMPTE (1<<22) -#define CURLPROTO_RTMPS (1<<23) -#define CURLPROTO_RTMPTS (1<<24) -#define CURLPROTO_GOPHER (1<<25) -#define CURLPROTO_ALL (~0) /* enable everything */ - -/* long may be 32 or 64 bits, but we should never depend on anything else - but 32 */ -#define CURLOPTTYPE_LONG 0 -#define CURLOPTTYPE_OBJECTPOINT 10000 -#define CURLOPTTYPE_FUNCTIONPOINT 20000 -#define CURLOPTTYPE_OFF_T 30000 - -/* name is uppercase CURLOPT_, - type is one of the defined CURLOPTTYPE_ - number is unique identifier */ -#ifdef CINIT -#undef CINIT -#endif - -#ifdef CURL_ISOCPP -#define CINIT(na,t,nu) CURLOPT_ ## na = CURLOPTTYPE_ ## t + nu -#else -/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */ -#define LONG CURLOPTTYPE_LONG -#define OBJECTPOINT CURLOPTTYPE_OBJECTPOINT -#define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT -#define OFF_T CURLOPTTYPE_OFF_T -#define CINIT(name,type,number) CURLOPT_/**/name = type + number -#endif - -/* - * This macro-mania below setups the CURLOPT_[what] enum, to be used with - * curl_easy_setopt(). The first argument in the CINIT() macro is the [what] - * word. - */ - -typedef enum { - /* This is the FILE * or void * the regular output should be written to. */ - CINIT(FILE, OBJECTPOINT, 1), - - /* The full URL to get/put */ - CINIT(URL, OBJECTPOINT, 2), - - /* Port number to connect to, if other than default. */ - CINIT(PORT, LONG, 3), - - /* Name of proxy to use. */ - CINIT(PROXY, OBJECTPOINT, 4), - - /* "user:password;options" to use when fetching. */ - CINIT(USERPWD, OBJECTPOINT, 5), - - /* "user:password" to use with proxy. */ - CINIT(PROXYUSERPWD, OBJECTPOINT, 6), - - /* Range to get, specified as an ASCII string. */ - CINIT(RANGE, OBJECTPOINT, 7), - - /* not used */ - - /* Specified file stream to upload from (use as input): */ - CINIT(INFILE, OBJECTPOINT, 9), - - /* Buffer to receive error messages in, must be at least CURL_ERROR_SIZE - * bytes big. If this is not used, error messages go to stderr instead: */ - CINIT(ERRORBUFFER, OBJECTPOINT, 10), - - /* Function that will be called to store the output (instead of fwrite). The - * parameters will use fwrite() syntax, make sure to follow them. */ - CINIT(WRITEFUNCTION, FUNCTIONPOINT, 11), - - /* Function that will be called to read the input (instead of fread). The - * parameters will use fread() syntax, make sure to follow them. */ - CINIT(READFUNCTION, FUNCTIONPOINT, 12), - - /* Time-out the read operation after this amount of seconds */ - CINIT(TIMEOUT, LONG, 13), - - /* If the CURLOPT_INFILE is used, this can be used to inform libcurl about - * how large the file being sent really is. That allows better error - * checking and better verifies that the upload was successful. -1 means - * unknown size. - * - * For large file support, there is also a _LARGE version of the key - * which takes an off_t type, allowing platforms with larger off_t - * sizes to handle larger files. See below for INFILESIZE_LARGE. - */ - CINIT(INFILESIZE, LONG, 14), - - /* POST static input fields. */ - CINIT(POSTFIELDS, OBJECTPOINT, 15), - - /* Set the referrer page (needed by some CGIs) */ - CINIT(REFERER, OBJECTPOINT, 16), - - /* Set the FTP PORT string (interface name, named or numerical IP address) - Use i.e '-' to use default address. */ - CINIT(FTPPORT, OBJECTPOINT, 17), - - /* Set the User-Agent string (examined by some CGIs) */ - CINIT(USERAGENT, OBJECTPOINT, 18), - - /* If the download receives less than "low speed limit" bytes/second - * during "low speed time" seconds, the operations is aborted. - * You could i.e if you have a pretty high speed connection, abort if - * it is less than 2000 bytes/sec during 20 seconds. - */ - - /* Set the "low speed limit" */ - CINIT(LOW_SPEED_LIMIT, LONG, 19), - - /* Set the "low speed time" */ - CINIT(LOW_SPEED_TIME, LONG, 20), - - /* Set the continuation offset. - * - * Note there is also a _LARGE version of this key which uses - * off_t types, allowing for large file offsets on platforms which - * use larger-than-32-bit off_t's. Look below for RESUME_FROM_LARGE. - */ - CINIT(RESUME_FROM, LONG, 21), - - /* Set cookie in request: */ - CINIT(COOKIE, OBJECTPOINT, 22), - - /* This points to a linked list of headers, struct curl_slist kind. This - list is also used for RTSP (in spite of its name) */ - CINIT(HTTPHEADER, OBJECTPOINT, 23), - - /* This points to a linked list of post entries, struct curl_httppost */ - CINIT(HTTPPOST, OBJECTPOINT, 24), - - /* name of the file keeping your private SSL-certificate */ - CINIT(SSLCERT, OBJECTPOINT, 25), - - /* password for the SSL or SSH private key */ - CINIT(KEYPASSWD, OBJECTPOINT, 26), - - /* send TYPE parameter? */ - CINIT(CRLF, LONG, 27), - - /* send linked-list of QUOTE commands */ - CINIT(QUOTE, OBJECTPOINT, 28), - - /* send FILE * or void * to store headers to, if you use a callback it - is simply passed to the callback unmodified */ - CINIT(WRITEHEADER, OBJECTPOINT, 29), - - /* point to a file to read the initial cookies from, also enables - "cookie awareness" */ - CINIT(COOKIEFILE, OBJECTPOINT, 31), - - /* What version to specifically try to use. - See CURL_SSLVERSION defines below. */ - CINIT(SSLVERSION, LONG, 32), - - /* What kind of HTTP time condition to use, see defines */ - CINIT(TIMECONDITION, LONG, 33), - - /* Time to use with the above condition. Specified in number of seconds - since 1 Jan 1970 */ - CINIT(TIMEVALUE, LONG, 34), - - /* 35 = OBSOLETE */ - - /* Custom request, for customizing the get command like - HTTP: DELETE, TRACE and others - FTP: to use a different list command - */ - CINIT(CUSTOMREQUEST, OBJECTPOINT, 36), - - /* HTTP request, for odd commands like DELETE, TRACE and others */ - CINIT(STDERR, OBJECTPOINT, 37), - - /* 38 is not used */ - - /* send linked-list of post-transfer QUOTE commands */ - CINIT(POSTQUOTE, OBJECTPOINT, 39), - - CINIT(WRITEINFO, OBJECTPOINT, 40), /* DEPRECATED, do not use! */ - - CINIT(VERBOSE, LONG, 41), /* talk a lot */ - CINIT(HEADER, LONG, 42), /* throw the header out too */ - CINIT(NOPROGRESS, LONG, 43), /* shut off the progress meter */ - CINIT(NOBODY, LONG, 44), /* use HEAD to get http document */ - CINIT(FAILONERROR, LONG, 45), /* no output on http error codes >= 300 */ - CINIT(UPLOAD, LONG, 46), /* this is an upload */ - CINIT(POST, LONG, 47), /* HTTP POST method */ - CINIT(DIRLISTONLY, LONG, 48), /* bare names when listing directories */ - - CINIT(APPEND, LONG, 50), /* Append instead of overwrite on upload! */ - - /* Specify whether to read the user+password from the .netrc or the URL. - * This must be one of the CURL_NETRC_* enums below. */ - CINIT(NETRC, LONG, 51), - - CINIT(FOLLOWLOCATION, LONG, 52), /* use Location: Luke! */ - - CINIT(TRANSFERTEXT, LONG, 53), /* transfer data in text/ASCII format */ - CINIT(PUT, LONG, 54), /* HTTP PUT */ - - /* 55 = OBSOLETE */ - - /* DEPRECATED - * Function that will be called instead of the internal progress display - * function. This function should be defined as the curl_progress_callback - * prototype defines. */ - CINIT(PROGRESSFUNCTION, FUNCTIONPOINT, 56), - - /* Data passed to the CURLOPT_PROGRESSFUNCTION and CURLOPT_XFERINFOFUNCTION - callbacks */ - CINIT(PROGRESSDATA, OBJECTPOINT, 57), -#define CURLOPT_XFERINFODATA CURLOPT_PROGRESSDATA - - /* We want the referrer field set automatically when following locations */ - CINIT(AUTOREFERER, LONG, 58), - - /* Port of the proxy, can be set in the proxy string as well with: - "[host]:[port]" */ - CINIT(PROXYPORT, LONG, 59), - - /* size of the POST input data, if strlen() is not good to use */ - CINIT(POSTFIELDSIZE, LONG, 60), - - /* tunnel non-http operations through a HTTP proxy */ - CINIT(HTTPPROXYTUNNEL, LONG, 61), - - /* Set the interface string to use as outgoing network interface */ - CINIT(INTERFACE, OBJECTPOINT, 62), - - /* Set the krb4/5 security level, this also enables krb4/5 awareness. This - * is a string, 'clear', 'safe', 'confidential' or 'private'. If the string - * is set but doesn't match one of these, 'private' will be used. */ - CINIT(KRBLEVEL, OBJECTPOINT, 63), - - /* Set if we should verify the peer in ssl handshake, set 1 to verify. */ - CINIT(SSL_VERIFYPEER, LONG, 64), - - /* The CApath or CAfile used to validate the peer certificate - this option is used only if SSL_VERIFYPEER is true */ - CINIT(CAINFO, OBJECTPOINT, 65), - - /* 66 = OBSOLETE */ - /* 67 = OBSOLETE */ - - /* Maximum number of http redirects to follow */ - CINIT(MAXREDIRS, LONG, 68), - - /* Pass a long set to 1 to get the date of the requested document (if - possible)! Pass a zero to shut it off. */ - CINIT(FILETIME, LONG, 69), - - /* This points to a linked list of telnet options */ - CINIT(TELNETOPTIONS, OBJECTPOINT, 70), - - /* Max amount of cached alive connections */ - CINIT(MAXCONNECTS, LONG, 71), - - CINIT(CLOSEPOLICY, LONG, 72), /* DEPRECATED, do not use! */ - - /* 73 = OBSOLETE */ - - /* Set to explicitly use a new connection for the upcoming transfer. - Do not use this unless you're absolutely sure of this, as it makes the - operation slower and is less friendly for the network. */ - CINIT(FRESH_CONNECT, LONG, 74), - - /* Set to explicitly forbid the upcoming transfer's connection to be re-used - when done. Do not use this unless you're absolutely sure of this, as it - makes the operation slower and is less friendly for the network. */ - CINIT(FORBID_REUSE, LONG, 75), - - /* Set to a file name that contains random data for libcurl to use to - seed the random engine when doing SSL connects. */ - CINIT(RANDOM_FILE, OBJECTPOINT, 76), - - /* Set to the Entropy Gathering Daemon socket pathname */ - CINIT(EGDSOCKET, OBJECTPOINT, 77), - - /* Time-out connect operations after this amount of seconds, if connects are - OK within this time, then fine... This only aborts the connect phase. */ - CINIT(CONNECTTIMEOUT, LONG, 78), - - /* Function that will be called to store headers (instead of fwrite). The - * parameters will use fwrite() syntax, make sure to follow them. */ - CINIT(HEADERFUNCTION, FUNCTIONPOINT, 79), - - /* Set this to force the HTTP request to get back to GET. Only really usable - if POST, PUT or a custom request have been used first. - */ - CINIT(HTTPGET, LONG, 80), - - /* Set if we should verify the Common name from the peer certificate in ssl - * handshake, set 1 to check existence, 2 to ensure that it matches the - * provided hostname. */ - CINIT(SSL_VERIFYHOST, LONG, 81), - - /* Specify which file name to write all known cookies in after completed - operation. Set file name to "-" (dash) to make it go to stdout. */ - CINIT(COOKIEJAR, OBJECTPOINT, 82), - - /* Specify which SSL ciphers to use */ - CINIT(SSL_CIPHER_LIST, OBJECTPOINT, 83), - - /* Specify which HTTP version to use! This must be set to one of the - CURL_HTTP_VERSION* enums set below. */ - CINIT(HTTP_VERSION, LONG, 84), - - /* Specifically switch on or off the FTP engine's use of the EPSV command. By - default, that one will always be attempted before the more traditional - PASV command. */ - CINIT(FTP_USE_EPSV, LONG, 85), - - /* type of the file keeping your SSL-certificate ("DER", "PEM", "ENG") */ - CINIT(SSLCERTTYPE, OBJECTPOINT, 86), - - /* name of the file keeping your private SSL-key */ - CINIT(SSLKEY, OBJECTPOINT, 87), - - /* type of the file keeping your private SSL-key ("DER", "PEM", "ENG") */ - CINIT(SSLKEYTYPE, OBJECTPOINT, 88), - - /* crypto engine for the SSL-sub system */ - CINIT(SSLENGINE, OBJECTPOINT, 89), - - /* set the crypto engine for the SSL-sub system as default - the param has no meaning... - */ - CINIT(SSLENGINE_DEFAULT, LONG, 90), - - /* Non-zero value means to use the global dns cache */ - CINIT(DNS_USE_GLOBAL_CACHE, LONG, 91), /* DEPRECATED, do not use! */ - - /* DNS cache timeout */ - CINIT(DNS_CACHE_TIMEOUT, LONG, 92), - - /* send linked-list of pre-transfer QUOTE commands */ - CINIT(PREQUOTE, OBJECTPOINT, 93), - - /* set the debug function */ - CINIT(DEBUGFUNCTION, FUNCTIONPOINT, 94), - - /* set the data for the debug function */ - CINIT(DEBUGDATA, OBJECTPOINT, 95), - - /* mark this as start of a cookie session */ - CINIT(COOKIESESSION, LONG, 96), - - /* The CApath directory used to validate the peer certificate - this option is used only if SSL_VERIFYPEER is true */ - CINIT(CAPATH, OBJECTPOINT, 97), - - /* Instruct libcurl to use a smaller receive buffer */ - CINIT(BUFFERSIZE, LONG, 98), - - /* Instruct libcurl to not use any signal/alarm handlers, even when using - timeouts. This option is useful for multi-threaded applications. - See libcurl-the-guide for more background information. */ - CINIT(NOSIGNAL, LONG, 99), - - /* Provide a CURLShare for mutexing non-ts data */ - CINIT(SHARE, OBJECTPOINT, 100), - - /* indicates type of proxy. accepted values are CURLPROXY_HTTP (default), - CURLPROXY_SOCKS4, CURLPROXY_SOCKS4A and CURLPROXY_SOCKS5. */ - CINIT(PROXYTYPE, LONG, 101), - - /* Set the Accept-Encoding string. Use this to tell a server you would like - the response to be compressed. Before 7.21.6, this was known as - CURLOPT_ENCODING */ - CINIT(ACCEPT_ENCODING, OBJECTPOINT, 102), - - /* Set pointer to private data */ - CINIT(PRIVATE, OBJECTPOINT, 103), - - /* Set aliases for HTTP 200 in the HTTP Response header */ - CINIT(HTTP200ALIASES, OBJECTPOINT, 104), - - /* Continue to send authentication (user+password) when following locations, - even when hostname changed. This can potentially send off the name - and password to whatever host the server decides. */ - CINIT(UNRESTRICTED_AUTH, LONG, 105), - - /* Specifically switch on or off the FTP engine's use of the EPRT command ( - it also disables the LPRT attempt). By default, those ones will always be - attempted before the good old traditional PORT command. */ - CINIT(FTP_USE_EPRT, LONG, 106), - - /* Set this to a bitmask value to enable the particular authentications - methods you like. Use this in combination with CURLOPT_USERPWD. - Note that setting multiple bits may cause extra network round-trips. */ - CINIT(HTTPAUTH, LONG, 107), - - /* Set the ssl context callback function, currently only for OpenSSL ssl_ctx - in second argument. The function must be matching the - curl_ssl_ctx_callback proto. */ - CINIT(SSL_CTX_FUNCTION, FUNCTIONPOINT, 108), - - /* Set the userdata for the ssl context callback function's third - argument */ - CINIT(SSL_CTX_DATA, OBJECTPOINT, 109), - - /* FTP Option that causes missing dirs to be created on the remote server. - In 7.19.4 we introduced the convenience enums for this option using the - CURLFTP_CREATE_DIR prefix. - */ - CINIT(FTP_CREATE_MISSING_DIRS, LONG, 110), - - /* Set this to a bitmask value to enable the particular authentications - methods you like. Use this in combination with CURLOPT_PROXYUSERPWD. - Note that setting multiple bits may cause extra network round-trips. */ - CINIT(PROXYAUTH, LONG, 111), - - /* FTP option that changes the timeout, in seconds, associated with - getting a response. This is different from transfer timeout time and - essentially places a demand on the FTP server to acknowledge commands - in a timely manner. */ - CINIT(FTP_RESPONSE_TIMEOUT, LONG, 112), -#define CURLOPT_SERVER_RESPONSE_TIMEOUT CURLOPT_FTP_RESPONSE_TIMEOUT - - /* Set this option to one of the CURL_IPRESOLVE_* defines (see below) to - tell libcurl to resolve names to those IP versions only. This only has - affect on systems with support for more than one, i.e IPv4 _and_ IPv6. */ - CINIT(IPRESOLVE, LONG, 113), - - /* Set this option to limit the size of a file that will be downloaded from - an HTTP or FTP server. - - Note there is also _LARGE version which adds large file support for - platforms which have larger off_t sizes. See MAXFILESIZE_LARGE below. */ - CINIT(MAXFILESIZE, LONG, 114), - - /* See the comment for INFILESIZE above, but in short, specifies - * the size of the file being uploaded. -1 means unknown. - */ - CINIT(INFILESIZE_LARGE, OFF_T, 115), - - /* Sets the continuation offset. There is also a LONG version of this; - * look above for RESUME_FROM. - */ - CINIT(RESUME_FROM_LARGE, OFF_T, 116), - - /* Sets the maximum size of data that will be downloaded from - * an HTTP or FTP server. See MAXFILESIZE above for the LONG version. - */ - CINIT(MAXFILESIZE_LARGE, OFF_T, 117), - - /* Set this option to the file name of your .netrc file you want libcurl - to parse (using the CURLOPT_NETRC option). If not set, libcurl will do - a poor attempt to find the user's home directory and check for a .netrc - file in there. */ - CINIT(NETRC_FILE, OBJECTPOINT, 118), - - /* Enable SSL/TLS for FTP, pick one of: - CURLUSESSL_TRY - try using SSL, proceed anyway otherwise - CURLUSESSL_CONTROL - SSL for the control connection or fail - CURLUSESSL_ALL - SSL for all communication or fail - */ - CINIT(USE_SSL, LONG, 119), - - /* The _LARGE version of the standard POSTFIELDSIZE option */ - CINIT(POSTFIELDSIZE_LARGE, OFF_T, 120), - - /* Enable/disable the TCP Nagle algorithm */ - CINIT(TCP_NODELAY, LONG, 121), - - /* 122 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */ - /* 123 OBSOLETE. Gone in 7.16.0 */ - /* 124 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */ - /* 125 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */ - /* 126 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */ - /* 127 OBSOLETE. Gone in 7.16.0 */ - /* 128 OBSOLETE. Gone in 7.16.0 */ - - /* When FTP over SSL/TLS is selected (with CURLOPT_USE_SSL), this option - can be used to change libcurl's default action which is to first try - "AUTH SSL" and then "AUTH TLS" in this order, and proceed when a OK - response has been received. - - Available parameters are: - CURLFTPAUTH_DEFAULT - let libcurl decide - CURLFTPAUTH_SSL - try "AUTH SSL" first, then TLS - CURLFTPAUTH_TLS - try "AUTH TLS" first, then SSL - */ - CINIT(FTPSSLAUTH, LONG, 129), - - CINIT(IOCTLFUNCTION, FUNCTIONPOINT, 130), - CINIT(IOCTLDATA, OBJECTPOINT, 131), - - /* 132 OBSOLETE. Gone in 7.16.0 */ - /* 133 OBSOLETE. Gone in 7.16.0 */ - - /* zero terminated string for pass on to the FTP server when asked for - "account" info */ - CINIT(FTP_ACCOUNT, OBJECTPOINT, 134), - - /* feed cookies into cookie engine */ - CINIT(COOKIELIST, OBJECTPOINT, 135), - - /* ignore Content-Length */ - CINIT(IGNORE_CONTENT_LENGTH, LONG, 136), - - /* Set to non-zero to skip the IP address received in a 227 PASV FTP server - response. Typically used for FTP-SSL purposes but is not restricted to - that. libcurl will then instead use the same IP address it used for the - control connection. */ - CINIT(FTP_SKIP_PASV_IP, LONG, 137), - - /* Select "file method" to use when doing FTP, see the curl_ftpmethod - above. */ - CINIT(FTP_FILEMETHOD, LONG, 138), - - /* Local port number to bind the socket to */ - CINIT(LOCALPORT, LONG, 139), - - /* Number of ports to try, including the first one set with LOCALPORT. - Thus, setting it to 1 will make no additional attempts but the first. - */ - CINIT(LOCALPORTRANGE, LONG, 140), - - /* no transfer, set up connection and let application use the socket by - extracting it with CURLINFO_LASTSOCKET */ - CINIT(CONNECT_ONLY, LONG, 141), - - /* Function that will be called to convert from the - network encoding (instead of using the iconv calls in libcurl) */ - CINIT(CONV_FROM_NETWORK_FUNCTION, FUNCTIONPOINT, 142), - - /* Function that will be called to convert to the - network encoding (instead of using the iconv calls in libcurl) */ - CINIT(CONV_TO_NETWORK_FUNCTION, FUNCTIONPOINT, 143), - - /* Function that will be called to convert from UTF8 - (instead of using the iconv calls in libcurl) - Note that this is used only for SSL certificate processing */ - CINIT(CONV_FROM_UTF8_FUNCTION, FUNCTIONPOINT, 144), - - /* if the connection proceeds too quickly then need to slow it down */ - /* limit-rate: maximum number of bytes per second to send or receive */ - CINIT(MAX_SEND_SPEED_LARGE, OFF_T, 145), - CINIT(MAX_RECV_SPEED_LARGE, OFF_T, 146), - - /* Pointer to command string to send if USER/PASS fails. */ - CINIT(FTP_ALTERNATIVE_TO_USER, OBJECTPOINT, 147), - - /* callback function for setting socket options */ - CINIT(SOCKOPTFUNCTION, FUNCTIONPOINT, 148), - CINIT(SOCKOPTDATA, OBJECTPOINT, 149), - - /* set to 0 to disable session ID re-use for this transfer, default is - enabled (== 1) */ - CINIT(SSL_SESSIONID_CACHE, LONG, 150), - - /* allowed SSH authentication methods */ - CINIT(SSH_AUTH_TYPES, LONG, 151), - - /* Used by scp/sftp to do public/private key authentication */ - CINIT(SSH_PUBLIC_KEYFILE, OBJECTPOINT, 152), - CINIT(SSH_PRIVATE_KEYFILE, OBJECTPOINT, 153), - - /* Send CCC (Clear Command Channel) after authentication */ - CINIT(FTP_SSL_CCC, LONG, 154), - - /* Same as TIMEOUT and CONNECTTIMEOUT, but with ms resolution */ - CINIT(TIMEOUT_MS, LONG, 155), - CINIT(CONNECTTIMEOUT_MS, LONG, 156), - - /* set to zero to disable the libcurl's decoding and thus pass the raw body - data to the application even when it is encoded/compressed */ - CINIT(HTTP_TRANSFER_DECODING, LONG, 157), - CINIT(HTTP_CONTENT_DECODING, LONG, 158), - - /* Permission used when creating new files and directories on the remote - server for protocols that support it, SFTP/SCP/FILE */ - CINIT(NEW_FILE_PERMS, LONG, 159), - CINIT(NEW_DIRECTORY_PERMS, LONG, 160), - - /* Set the behaviour of POST when redirecting. Values must be set to one - of CURL_REDIR* defines below. This used to be called CURLOPT_POST301 */ - CINIT(POSTREDIR, LONG, 161), - - /* used by scp/sftp to verify the host's public key */ - CINIT(SSH_HOST_PUBLIC_KEY_MD5, OBJECTPOINT, 162), - - /* Callback function for opening socket (instead of socket(2)). Optionally, - callback is able change the address or refuse to connect returning - CURL_SOCKET_BAD. The callback should have type - curl_opensocket_callback */ - CINIT(OPENSOCKETFUNCTION, FUNCTIONPOINT, 163), - CINIT(OPENSOCKETDATA, OBJECTPOINT, 164), - - /* POST volatile input fields. */ - CINIT(COPYPOSTFIELDS, OBJECTPOINT, 165), - - /* set transfer mode (;type=) when doing FTP via an HTTP proxy */ - CINIT(PROXY_TRANSFER_MODE, LONG, 166), - - /* Callback function for seeking in the input stream */ - CINIT(SEEKFUNCTION, FUNCTIONPOINT, 167), - CINIT(SEEKDATA, OBJECTPOINT, 168), - - /* CRL file */ - CINIT(CRLFILE, OBJECTPOINT, 169), - - /* Issuer certificate */ - CINIT(ISSUERCERT, OBJECTPOINT, 170), - - /* (IPv6) Address scope */ - CINIT(ADDRESS_SCOPE, LONG, 171), - - /* Collect certificate chain info and allow it to get retrievable with - CURLINFO_CERTINFO after the transfer is complete. */ - CINIT(CERTINFO, LONG, 172), - - /* "name" and "pwd" to use when fetching. */ - CINIT(USERNAME, OBJECTPOINT, 173), - CINIT(PASSWORD, OBJECTPOINT, 174), - - /* "name" and "pwd" to use with Proxy when fetching. */ - CINIT(PROXYUSERNAME, OBJECTPOINT, 175), - CINIT(PROXYPASSWORD, OBJECTPOINT, 176), - - /* Comma separated list of hostnames defining no-proxy zones. These should - match both hostnames directly, and hostnames within a domain. For - example, local.com will match local.com and www.local.com, but NOT - notlocal.com or www.notlocal.com. For compatibility with other - implementations of this, .local.com will be considered to be the same as - local.com. A single * is the only valid wildcard, and effectively - disables the use of proxy. */ - CINIT(NOPROXY, OBJECTPOINT, 177), - - /* block size for TFTP transfers */ - CINIT(TFTP_BLKSIZE, LONG, 178), - - /* Socks Service */ - CINIT(SOCKS5_GSSAPI_SERVICE, OBJECTPOINT, 179), - - /* Socks Service */ - CINIT(SOCKS5_GSSAPI_NEC, LONG, 180), - - /* set the bitmask for the protocols that are allowed to be used for the - transfer, which thus helps the app which takes URLs from users or other - external inputs and want to restrict what protocol(s) to deal - with. Defaults to CURLPROTO_ALL. */ - CINIT(PROTOCOLS, LONG, 181), - - /* set the bitmask for the protocols that libcurl is allowed to follow to, - as a subset of the CURLOPT_PROTOCOLS ones. That means the protocol needs - to be set in both bitmasks to be allowed to get redirected to. Defaults - to all protocols except FILE and SCP. */ - CINIT(REDIR_PROTOCOLS, LONG, 182), - - /* set the SSH knownhost file name to use */ - CINIT(SSH_KNOWNHOSTS, OBJECTPOINT, 183), - - /* set the SSH host key callback, must point to a curl_sshkeycallback - function */ - CINIT(SSH_KEYFUNCTION, FUNCTIONPOINT, 184), - - /* set the SSH host key callback custom pointer */ - CINIT(SSH_KEYDATA, OBJECTPOINT, 185), - - /* set the SMTP mail originator */ - CINIT(MAIL_FROM, OBJECTPOINT, 186), - - /* set the SMTP mail receiver(s) */ - CINIT(MAIL_RCPT, OBJECTPOINT, 187), - - /* FTP: send PRET before PASV */ - CINIT(FTP_USE_PRET, LONG, 188), - - /* RTSP request method (OPTIONS, SETUP, PLAY, etc...) */ - CINIT(RTSP_REQUEST, LONG, 189), - - /* The RTSP session identifier */ - CINIT(RTSP_SESSION_ID, OBJECTPOINT, 190), - - /* The RTSP stream URI */ - CINIT(RTSP_STREAM_URI, OBJECTPOINT, 191), - - /* The Transport: header to use in RTSP requests */ - CINIT(RTSP_TRANSPORT, OBJECTPOINT, 192), - - /* Manually initialize the client RTSP CSeq for this handle */ - CINIT(RTSP_CLIENT_CSEQ, LONG, 193), - - /* Manually initialize the server RTSP CSeq for this handle */ - CINIT(RTSP_SERVER_CSEQ, LONG, 194), - - /* The stream to pass to INTERLEAVEFUNCTION. */ - CINIT(INTERLEAVEDATA, OBJECTPOINT, 195), - - /* Let the application define a custom write method for RTP data */ - CINIT(INTERLEAVEFUNCTION, FUNCTIONPOINT, 196), - - /* Turn on wildcard matching */ - CINIT(WILDCARDMATCH, LONG, 197), - - /* Directory matching callback called before downloading of an - individual file (chunk) started */ - CINIT(CHUNK_BGN_FUNCTION, FUNCTIONPOINT, 198), - - /* Directory matching callback called after the file (chunk) - was downloaded, or skipped */ - CINIT(CHUNK_END_FUNCTION, FUNCTIONPOINT, 199), - - /* Change match (fnmatch-like) callback for wildcard matching */ - CINIT(FNMATCH_FUNCTION, FUNCTIONPOINT, 200), - - /* Let the application define custom chunk data pointer */ - CINIT(CHUNK_DATA, OBJECTPOINT, 201), - - /* FNMATCH_FUNCTION user pointer */ - CINIT(FNMATCH_DATA, OBJECTPOINT, 202), - - /* send linked-list of name:port:address sets */ - CINIT(RESOLVE, OBJECTPOINT, 203), - - /* Set a username for authenticated TLS */ - CINIT(TLSAUTH_USERNAME, OBJECTPOINT, 204), - - /* Set a password for authenticated TLS */ - CINIT(TLSAUTH_PASSWORD, OBJECTPOINT, 205), - - /* Set authentication type for authenticated TLS */ - CINIT(TLSAUTH_TYPE, OBJECTPOINT, 206), - - /* Set to 1 to enable the "TE:" header in HTTP requests to ask for - compressed transfer-encoded responses. Set to 0 to disable the use of TE: - in outgoing requests. The current default is 0, but it might change in a - future libcurl release. - - libcurl will ask for the compressed methods it knows of, and if that - isn't any, it will not ask for transfer-encoding at all even if this - option is set to 1. - - */ - CINIT(TRANSFER_ENCODING, LONG, 207), - - /* Callback function for closing socket (instead of close(2)). The callback - should have type curl_closesocket_callback */ - CINIT(CLOSESOCKETFUNCTION, FUNCTIONPOINT, 208), - CINIT(CLOSESOCKETDATA, OBJECTPOINT, 209), - - /* allow GSSAPI credential delegation */ - CINIT(GSSAPI_DELEGATION, LONG, 210), - - /* Set the name servers to use for DNS resolution */ - CINIT(DNS_SERVERS, OBJECTPOINT, 211), - - /* Time-out accept operations (currently for FTP only) after this amount - of miliseconds. */ - CINIT(ACCEPTTIMEOUT_MS, LONG, 212), - - /* Set TCP keepalive */ - CINIT(TCP_KEEPALIVE, LONG, 213), - - /* non-universal keepalive knobs (Linux, AIX, HP-UX, more) */ - CINIT(TCP_KEEPIDLE, LONG, 214), - CINIT(TCP_KEEPINTVL, LONG, 215), - - /* Enable/disable specific SSL features with a bitmask, see CURLSSLOPT_* */ - CINIT(SSL_OPTIONS, LONG, 216), - - /* Set the SMTP auth originator */ - CINIT(MAIL_AUTH, OBJECTPOINT, 217), - - /* Enable/disable SASL initial response */ - CINIT(SASL_IR, LONG, 218), - - /* Function that will be called instead of the internal progress display - * function. This function should be defined as the curl_xferinfo_callback - * prototype defines. (Deprecates CURLOPT_PROGRESSFUNCTION) */ - CINIT(XFERINFOFUNCTION, FUNCTIONPOINT, 219), - - /* The XOAUTH2 bearer token */ - CINIT(XOAUTH2_BEARER, OBJECTPOINT, 220), - - /* Set the interface string to use as outgoing network - * interface for DNS requests. - * Only supported by the c-ares DNS backend */ - CINIT(DNS_INTERFACE, OBJECTPOINT, 221), - - /* Set the local IPv4 address to use for outgoing DNS requests. - * Only supported by the c-ares DNS backend */ - CINIT(DNS_LOCAL_IP4, OBJECTPOINT, 222), - - /* Set the local IPv4 address to use for outgoing DNS requests. - * Only supported by the c-ares DNS backend */ - CINIT(DNS_LOCAL_IP6, OBJECTPOINT, 223), - - /* Set authentication options directly */ - CINIT(LOGIN_OPTIONS, OBJECTPOINT, 224), - - /* Enable/disable TLS NPN extension (http2 over ssl might fail without) */ - CINIT(SSL_ENABLE_NPN, LONG, 225), - - /* Enable/disable TLS ALPN extension (http2 over ssl might fail without) */ - CINIT(SSL_ENABLE_ALPN, LONG, 226), - - /* Time to wait for a response to a HTTP request containing an - * Expect: 100-continue header before sending the data anyway. */ - CINIT(EXPECT_100_TIMEOUT_MS, LONG, 227), - - /* This points to a linked list of headers used for proxy requests only, - struct curl_slist kind */ - CINIT(PROXYHEADER, OBJECTPOINT, 228), - - /* Pass in a bitmask of "header options" */ - CINIT(HEADEROPT, LONG, 229), - - CURLOPT_LASTENTRY /* the last unused */ -} CURLoption; - -#ifndef CURL_NO_OLDIES /* define this to test if your app builds with all - the obsolete stuff removed! */ - -/* Backwards compatibility with older names */ -/* These are scheduled to disappear by 2011 */ - -/* This was added in version 7.19.1 */ -#define CURLOPT_POST301 CURLOPT_POSTREDIR - -/* These are scheduled to disappear by 2009 */ - -/* The following were added in 7.17.0 */ -#define CURLOPT_SSLKEYPASSWD CURLOPT_KEYPASSWD -#define CURLOPT_FTPAPPEND CURLOPT_APPEND -#define CURLOPT_FTPLISTONLY CURLOPT_DIRLISTONLY -#define CURLOPT_FTP_SSL CURLOPT_USE_SSL - -/* The following were added earlier */ - -#define CURLOPT_SSLCERTPASSWD CURLOPT_KEYPASSWD -#define CURLOPT_KRB4LEVEL CURLOPT_KRBLEVEL - -#else -/* This is set if CURL_NO_OLDIES is defined at compile-time */ -#undef CURLOPT_DNS_USE_GLOBAL_CACHE /* soon obsolete */ -#endif - - - /* Below here follows defines for the CURLOPT_IPRESOLVE option. If a host - name resolves addresses using more than one IP protocol version, this - option might be handy to force libcurl to use a specific IP version. */ -#define CURL_IPRESOLVE_WHATEVER 0 /* default, resolves addresses to all IP - versions that your system allows */ -#define CURL_IPRESOLVE_V4 1 /* resolve to ipv4 addresses */ -#define CURL_IPRESOLVE_V6 2 /* resolve to ipv6 addresses */ - - /* three convenient "aliases" that follow the name scheme better */ -#define CURLOPT_WRITEDATA CURLOPT_FILE -#define CURLOPT_READDATA CURLOPT_INFILE -#define CURLOPT_HEADERDATA CURLOPT_WRITEHEADER -#define CURLOPT_RTSPHEADER CURLOPT_HTTPHEADER - - /* These enums are for use with the CURLOPT_HTTP_VERSION option. */ -enum { - CURL_HTTP_VERSION_NONE, /* setting this means we don't care, and that we'd - like the library to choose the best possible - for us! */ - CURL_HTTP_VERSION_1_0, /* please use HTTP 1.0 in the request */ - CURL_HTTP_VERSION_1_1, /* please use HTTP 1.1 in the request */ - CURL_HTTP_VERSION_2_0, /* please use HTTP 2.0 in the request */ - - CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */ -}; - -/* - * Public API enums for RTSP requests - */ -enum { - CURL_RTSPREQ_NONE, /* first in list */ - CURL_RTSPREQ_OPTIONS, - CURL_RTSPREQ_DESCRIBE, - CURL_RTSPREQ_ANNOUNCE, - CURL_RTSPREQ_SETUP, - CURL_RTSPREQ_PLAY, - CURL_RTSPREQ_PAUSE, - CURL_RTSPREQ_TEARDOWN, - CURL_RTSPREQ_GET_PARAMETER, - CURL_RTSPREQ_SET_PARAMETER, - CURL_RTSPREQ_RECORD, - CURL_RTSPREQ_RECEIVE, - CURL_RTSPREQ_LAST /* last in list */ -}; - - /* These enums are for use with the CURLOPT_NETRC option. */ -enum CURL_NETRC_OPTION { - CURL_NETRC_IGNORED, /* The .netrc will never be read. - * This is the default. */ - CURL_NETRC_OPTIONAL, /* A user:password in the URL will be preferred - * to one in the .netrc. */ - CURL_NETRC_REQUIRED, /* A user:password in the URL will be ignored. - * Unless one is set programmatically, the .netrc - * will be queried. */ - CURL_NETRC_LAST -}; - -enum { - CURL_SSLVERSION_DEFAULT, - CURL_SSLVERSION_TLSv1, /* TLS 1.x */ - CURL_SSLVERSION_SSLv2, - CURL_SSLVERSION_SSLv3, - CURL_SSLVERSION_TLSv1_0, - CURL_SSLVERSION_TLSv1_1, - CURL_SSLVERSION_TLSv1_2, - - CURL_SSLVERSION_LAST /* never use, keep last */ -}; - -enum CURL_TLSAUTH { - CURL_TLSAUTH_NONE, - CURL_TLSAUTH_SRP, - CURL_TLSAUTH_LAST /* never use, keep last */ -}; - -/* symbols to use with CURLOPT_POSTREDIR. - CURL_REDIR_POST_301, CURL_REDIR_POST_302 and CURL_REDIR_POST_303 - can be bitwise ORed so that CURL_REDIR_POST_301 | CURL_REDIR_POST_302 - | CURL_REDIR_POST_303 == CURL_REDIR_POST_ALL */ - -#define CURL_REDIR_GET_ALL 0 -#define CURL_REDIR_POST_301 1 -#define CURL_REDIR_POST_302 2 -#define CURL_REDIR_POST_303 4 -#define CURL_REDIR_POST_ALL \ - (CURL_REDIR_POST_301|CURL_REDIR_POST_302|CURL_REDIR_POST_303) - -typedef enum { - CURL_TIMECOND_NONE, - - CURL_TIMECOND_IFMODSINCE, - CURL_TIMECOND_IFUNMODSINCE, - CURL_TIMECOND_LASTMOD, - - CURL_TIMECOND_LAST -} curl_TimeCond; - - -/* curl_strequal() and curl_strnequal() are subject for removal in a future - libcurl, see lib/README.curlx for details */ -CURL_EXTERN int (curl_strequal)(const char *s1, const char *s2); -CURL_EXTERN int (curl_strnequal)(const char *s1, const char *s2, size_t n); - -/* name is uppercase CURLFORM_ */ -#ifdef CFINIT -#undef CFINIT -#endif - -#ifdef CURL_ISOCPP -#define CFINIT(name) CURLFORM_ ## name -#else -/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */ -#define CFINIT(name) CURLFORM_/**/name -#endif - -typedef enum { - CFINIT(NOTHING), /********* the first one is unused ************/ - - /* */ - CFINIT(COPYNAME), - CFINIT(PTRNAME), - CFINIT(NAMELENGTH), - CFINIT(COPYCONTENTS), - CFINIT(PTRCONTENTS), - CFINIT(CONTENTSLENGTH), - CFINIT(FILECONTENT), - CFINIT(ARRAY), - CFINIT(OBSOLETE), - CFINIT(FILE), - - CFINIT(BUFFER), - CFINIT(BUFFERPTR), - CFINIT(BUFFERLENGTH), - - CFINIT(CONTENTTYPE), - CFINIT(CONTENTHEADER), - CFINIT(FILENAME), - CFINIT(END), - CFINIT(OBSOLETE2), - - CFINIT(STREAM), - - CURLFORM_LASTENTRY /* the last unused */ -} CURLformoption; - -#undef CFINIT /* done */ - -/* structure to be used as parameter for CURLFORM_ARRAY */ -struct curl_forms { - CURLformoption option; - const char *value; -}; - -/* use this for multipart formpost building */ -/* Returns code for curl_formadd() - * - * Returns: - * CURL_FORMADD_OK on success - * CURL_FORMADD_MEMORY if the FormInfo allocation fails - * CURL_FORMADD_OPTION_TWICE if one option is given twice for one Form - * CURL_FORMADD_NULL if a null pointer was given for a char - * CURL_FORMADD_MEMORY if the allocation of a FormInfo struct failed - * CURL_FORMADD_UNKNOWN_OPTION if an unknown option was used - * CURL_FORMADD_INCOMPLETE if the some FormInfo is not complete (or error) - * CURL_FORMADD_MEMORY if a curl_httppost struct cannot be allocated - * CURL_FORMADD_MEMORY if some allocation for string copying failed. - * CURL_FORMADD_ILLEGAL_ARRAY if an illegal option is used in an array - * - ***************************************************************************/ -typedef enum { - CURL_FORMADD_OK, /* first, no error */ - - CURL_FORMADD_MEMORY, - CURL_FORMADD_OPTION_TWICE, - CURL_FORMADD_NULL, - CURL_FORMADD_UNKNOWN_OPTION, - CURL_FORMADD_INCOMPLETE, - CURL_FORMADD_ILLEGAL_ARRAY, - CURL_FORMADD_DISABLED, /* libcurl was built with this disabled */ - - CURL_FORMADD_LAST /* last */ -} CURLFORMcode; - -/* - * NAME curl_formadd() - * - * DESCRIPTION - * - * Pretty advanced function for building multi-part formposts. Each invoke - * adds one part that together construct a full post. Then use - * CURLOPT_HTTPPOST to send it off to libcurl. - */ -CURL_EXTERN CURLFORMcode curl_formadd(struct curl_httppost **httppost, - struct curl_httppost **last_post, - ...); - -/* - * callback function for curl_formget() - * The void *arg pointer will be the one passed as second argument to - * curl_formget(). - * The character buffer passed to it must not be freed. - * Should return the buffer length passed to it as the argument "len" on - * success. - */ -typedef size_t (*curl_formget_callback)(void *arg, const char *buf, - size_t len); - -/* - * NAME curl_formget() - * - * DESCRIPTION - * - * Serialize a curl_httppost struct built with curl_formadd(). - * Accepts a void pointer as second argument which will be passed to - * the curl_formget_callback function. - * Returns 0 on success. - */ -CURL_EXTERN int curl_formget(struct curl_httppost *form, void *arg, - curl_formget_callback append); -/* - * NAME curl_formfree() - * - * DESCRIPTION - * - * Free a multipart formpost previously built with curl_formadd(). - */ -CURL_EXTERN void curl_formfree(struct curl_httppost *form); - -/* - * NAME curl_getenv() - * - * DESCRIPTION - * - * Returns a malloc()'ed string that MUST be curl_free()ed after usage is - * complete. DEPRECATED - see lib/README.curlx - */ -CURL_EXTERN char *curl_getenv(const char *variable); - -/* - * NAME curl_version() - * - * DESCRIPTION - * - * Returns a static ascii string of the libcurl version. - */ -CURL_EXTERN char *curl_version(void); - -/* - * NAME curl_easy_escape() - * - * DESCRIPTION - * - * Escapes URL strings (converts all letters consider illegal in URLs to their - * %XX versions). This function returns a new allocated string or NULL if an - * error occurred. - */ -CURL_EXTERN char *curl_easy_escape(CURL *handle, - const char *string, - int length); - -/* the previous version: */ -CURL_EXTERN char *curl_escape(const char *string, - int length); - - -/* - * NAME curl_easy_unescape() - * - * DESCRIPTION - * - * Unescapes URL encoding in strings (converts all %XX codes to their 8bit - * versions). This function returns a new allocated string or NULL if an error - * occurred. - * Conversion Note: On non-ASCII platforms the ASCII %XX codes are - * converted into the host encoding. - */ -CURL_EXTERN char *curl_easy_unescape(CURL *handle, - const char *string, - int length, - int *outlength); - -/* the previous version */ -CURL_EXTERN char *curl_unescape(const char *string, - int length); - -/* - * NAME curl_free() - * - * DESCRIPTION - * - * Provided for de-allocation in the same translation unit that did the - * allocation. Added in libcurl 7.10 - */ -CURL_EXTERN void curl_free(void *p); - -/* - * NAME curl_global_init() - * - * DESCRIPTION - * - * curl_global_init() should be invoked exactly once for each application that - * uses libcurl and before any call of other libcurl functions. - * - * This function is not thread-safe! - */ -CURL_EXTERN CURLcode curl_global_init(long flags); - -/* - * NAME curl_global_init_mem() - * - * DESCRIPTION - * - * curl_global_init() or curl_global_init_mem() should be invoked exactly once - * for each application that uses libcurl. This function can be used to - * initialize libcurl and set user defined memory management callback - * functions. Users can implement memory management routines to check for - * memory leaks, check for mis-use of the curl library etc. User registered - * callback routines with be invoked by this library instead of the system - * memory management routines like malloc, free etc. - */ -CURL_EXTERN CURLcode curl_global_init_mem(long flags, - curl_malloc_callback m, - curl_free_callback f, - curl_realloc_callback r, - curl_strdup_callback s, - curl_calloc_callback c); - -/* - * NAME curl_global_cleanup() - * - * DESCRIPTION - * - * curl_global_cleanup() should be invoked exactly once for each application - * that uses libcurl - */ -CURL_EXTERN void curl_global_cleanup(void); - -/* linked-list structure for the CURLOPT_QUOTE option (and other) */ -struct curl_slist { - char *data; - struct curl_slist *next; -}; - -/* - * NAME curl_slist_append() - * - * DESCRIPTION - * - * Appends a string to a linked list. If no list exists, it will be created - * first. Returns the new list, after appending. - */ -CURL_EXTERN struct curl_slist *curl_slist_append(struct curl_slist *, - const char *); - -/* - * NAME curl_slist_free_all() - * - * DESCRIPTION - * - * free a previously built curl_slist. - */ -CURL_EXTERN void curl_slist_free_all(struct curl_slist *); - -/* - * NAME curl_getdate() - * - * DESCRIPTION - * - * Returns the time, in seconds since 1 Jan 1970 of the time string given in - * the first argument. The time argument in the second parameter is unused - * and should be set to NULL. - */ -CURL_EXTERN time_t curl_getdate(const char *p, const time_t *unused); - -/* info about the certificate chain, only for OpenSSL builds. Asked - for with CURLOPT_CERTINFO / CURLINFO_CERTINFO */ -struct curl_certinfo { - int num_of_certs; /* number of certificates with information */ - struct curl_slist **certinfo; /* for each index in this array, there's a - linked list with textual information in the - format "name: value" */ -}; - -/* enum for the different supported SSL backends */ -typedef enum { - CURLSSLBACKEND_NONE = 0, - CURLSSLBACKEND_OPENSSL = 1, - CURLSSLBACKEND_GNUTLS = 2, - CURLSSLBACKEND_NSS = 3, - CURLSSLBACKEND_QSOSSL = 4, - CURLSSLBACKEND_GSKIT = 5, - CURLSSLBACKEND_POLARSSL = 6, - CURLSSLBACKEND_CYASSL = 7, - CURLSSLBACKEND_SCHANNEL = 8, - CURLSSLBACKEND_DARWINSSL = 9 -} curl_sslbackend; - -/* Information about the SSL library used and the respective internal SSL - handle, which can be used to obtain further information regarding the - connection. Asked for with CURLINFO_TLS_SESSION. */ -struct curl_tlssessioninfo { - curl_sslbackend backend; - void *internals; -}; - -#define CURLINFO_STRING 0x100000 -#define CURLINFO_LONG 0x200000 -#define CURLINFO_DOUBLE 0x300000 -#define CURLINFO_SLIST 0x400000 -#define CURLINFO_MASK 0x0fffff -#define CURLINFO_TYPEMASK 0xf00000 - -typedef enum { - CURLINFO_NONE, /* first, never use this */ - CURLINFO_EFFECTIVE_URL = CURLINFO_STRING + 1, - CURLINFO_RESPONSE_CODE = CURLINFO_LONG + 2, - CURLINFO_TOTAL_TIME = CURLINFO_DOUBLE + 3, - CURLINFO_NAMELOOKUP_TIME = CURLINFO_DOUBLE + 4, - CURLINFO_CONNECT_TIME = CURLINFO_DOUBLE + 5, - CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE + 6, - CURLINFO_SIZE_UPLOAD = CURLINFO_DOUBLE + 7, - CURLINFO_SIZE_DOWNLOAD = CURLINFO_DOUBLE + 8, - CURLINFO_SPEED_DOWNLOAD = CURLINFO_DOUBLE + 9, - CURLINFO_SPEED_UPLOAD = CURLINFO_DOUBLE + 10, - CURLINFO_HEADER_SIZE = CURLINFO_LONG + 11, - CURLINFO_REQUEST_SIZE = CURLINFO_LONG + 12, - CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG + 13, - CURLINFO_FILETIME = CURLINFO_LONG + 14, - CURLINFO_CONTENT_LENGTH_DOWNLOAD = CURLINFO_DOUBLE + 15, - CURLINFO_CONTENT_LENGTH_UPLOAD = CURLINFO_DOUBLE + 16, - CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE + 17, - CURLINFO_CONTENT_TYPE = CURLINFO_STRING + 18, - CURLINFO_REDIRECT_TIME = CURLINFO_DOUBLE + 19, - CURLINFO_REDIRECT_COUNT = CURLINFO_LONG + 20, - CURLINFO_PRIVATE = CURLINFO_STRING + 21, - CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG + 22, - CURLINFO_HTTPAUTH_AVAIL = CURLINFO_LONG + 23, - CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG + 24, - CURLINFO_OS_ERRNO = CURLINFO_LONG + 25, - CURLINFO_NUM_CONNECTS = CURLINFO_LONG + 26, - CURLINFO_SSL_ENGINES = CURLINFO_SLIST + 27, - CURLINFO_COOKIELIST = CURLINFO_SLIST + 28, - CURLINFO_LASTSOCKET = CURLINFO_LONG + 29, - CURLINFO_FTP_ENTRY_PATH = CURLINFO_STRING + 30, - CURLINFO_REDIRECT_URL = CURLINFO_STRING + 31, - CURLINFO_PRIMARY_IP = CURLINFO_STRING + 32, - CURLINFO_APPCONNECT_TIME = CURLINFO_DOUBLE + 33, - CURLINFO_CERTINFO = CURLINFO_SLIST + 34, - CURLINFO_CONDITION_UNMET = CURLINFO_LONG + 35, - CURLINFO_RTSP_SESSION_ID = CURLINFO_STRING + 36, - CURLINFO_RTSP_CLIENT_CSEQ = CURLINFO_LONG + 37, - CURLINFO_RTSP_SERVER_CSEQ = CURLINFO_LONG + 38, - CURLINFO_RTSP_CSEQ_RECV = CURLINFO_LONG + 39, - CURLINFO_PRIMARY_PORT = CURLINFO_LONG + 40, - CURLINFO_LOCAL_IP = CURLINFO_STRING + 41, - CURLINFO_LOCAL_PORT = CURLINFO_LONG + 42, - CURLINFO_TLS_SESSION = CURLINFO_SLIST + 43, - /* Fill in new entries below here! */ - - CURLINFO_LASTONE = 43 -} CURLINFO; - -/* CURLINFO_RESPONSE_CODE is the new name for the option previously known as - CURLINFO_HTTP_CODE */ -#define CURLINFO_HTTP_CODE CURLINFO_RESPONSE_CODE - -typedef enum { - CURLCLOSEPOLICY_NONE, /* first, never use this */ - - CURLCLOSEPOLICY_OLDEST, - CURLCLOSEPOLICY_LEAST_RECENTLY_USED, - CURLCLOSEPOLICY_LEAST_TRAFFIC, - CURLCLOSEPOLICY_SLOWEST, - CURLCLOSEPOLICY_CALLBACK, - - CURLCLOSEPOLICY_LAST /* last, never use this */ -} curl_closepolicy; - -#define CURL_GLOBAL_SSL (1<<0) -#define CURL_GLOBAL_WIN32 (1<<1) -#define CURL_GLOBAL_ALL (CURL_GLOBAL_SSL|CURL_GLOBAL_WIN32) -#define CURL_GLOBAL_NOTHING 0 -#define CURL_GLOBAL_DEFAULT CURL_GLOBAL_ALL -#define CURL_GLOBAL_ACK_EINTR (1<<2) - - -/***************************************************************************** - * Setup defines, protos etc for the sharing stuff. - */ - -/* Different data locks for a single share */ -typedef enum { - CURL_LOCK_DATA_NONE = 0, - /* CURL_LOCK_DATA_SHARE is used internally to say that - * the locking is just made to change the internal state of the share - * itself. - */ - CURL_LOCK_DATA_SHARE, - CURL_LOCK_DATA_COOKIE, - CURL_LOCK_DATA_DNS, - CURL_LOCK_DATA_SSL_SESSION, - CURL_LOCK_DATA_CONNECT, - CURL_LOCK_DATA_LAST -} curl_lock_data; - -/* Different lock access types */ -typedef enum { - CURL_LOCK_ACCESS_NONE = 0, /* unspecified action */ - CURL_LOCK_ACCESS_SHARED = 1, /* for read perhaps */ - CURL_LOCK_ACCESS_SINGLE = 2, /* for write perhaps */ - CURL_LOCK_ACCESS_LAST /* never use */ -} curl_lock_access; - -typedef void (*curl_lock_function)(CURL *handle, - curl_lock_data data, - curl_lock_access locktype, - void *userptr); -typedef void (*curl_unlock_function)(CURL *handle, - curl_lock_data data, - void *userptr); - -typedef void CURLSH; - -typedef enum { - CURLSHE_OK, /* all is fine */ - CURLSHE_BAD_OPTION, /* 1 */ - CURLSHE_IN_USE, /* 2 */ - CURLSHE_INVALID, /* 3 */ - CURLSHE_NOMEM, /* 4 out of memory */ - CURLSHE_NOT_BUILT_IN, /* 5 feature not present in lib */ - CURLSHE_LAST /* never use */ -} CURLSHcode; - -typedef enum { - CURLSHOPT_NONE, /* don't use */ - CURLSHOPT_SHARE, /* specify a data type to share */ - CURLSHOPT_UNSHARE, /* specify which data type to stop sharing */ - CURLSHOPT_LOCKFUNC, /* pass in a 'curl_lock_function' pointer */ - CURLSHOPT_UNLOCKFUNC, /* pass in a 'curl_unlock_function' pointer */ - CURLSHOPT_USERDATA, /* pass in a user data pointer used in the lock/unlock - callback functions */ - CURLSHOPT_LAST /* never use */ -} CURLSHoption; - -CURL_EXTERN CURLSH *curl_share_init(void); -CURL_EXTERN CURLSHcode curl_share_setopt(CURLSH *, CURLSHoption option, ...); -CURL_EXTERN CURLSHcode curl_share_cleanup(CURLSH *); - -/**************************************************************************** - * Structures for querying information about the curl library at runtime. - */ - -typedef enum { - CURLVERSION_FIRST, - CURLVERSION_SECOND, - CURLVERSION_THIRD, - CURLVERSION_FOURTH, - CURLVERSION_LAST /* never actually use this */ -} CURLversion; - -/* The 'CURLVERSION_NOW' is the symbolic name meant to be used by - basically all programs ever that want to get version information. It is - meant to be a built-in version number for what kind of struct the caller - expects. If the struct ever changes, we redefine the NOW to another enum - from above. */ -#define CURLVERSION_NOW CURLVERSION_FOURTH - -typedef struct { - CURLversion age; /* age of the returned struct */ - const char *version; /* LIBCURL_VERSION */ - unsigned int version_num; /* LIBCURL_VERSION_NUM */ - const char *host; /* OS/host/cpu/machine when configured */ - int features; /* bitmask, see defines below */ - const char *ssl_version; /* human readable string */ - long ssl_version_num; /* not used anymore, always 0 */ - const char *libz_version; /* human readable string */ - /* protocols is terminated by an entry with a NULL protoname */ - const char * const *protocols; - - /* The fields below this were added in CURLVERSION_SECOND */ - const char *ares; - int ares_num; - - /* This field was added in CURLVERSION_THIRD */ - const char *libidn; - - /* These field were added in CURLVERSION_FOURTH */ - - /* Same as '_libiconv_version' if built with HAVE_ICONV */ - int iconv_ver_num; - - const char *libssh_version; /* human readable string */ - -} curl_version_info_data; - -#define CURL_VERSION_IPV6 (1<<0) /* IPv6-enabled */ -#define CURL_VERSION_KERBEROS4 (1<<1) /* kerberos auth is supported */ -#define CURL_VERSION_SSL (1<<2) /* SSL options are present */ -#define CURL_VERSION_LIBZ (1<<3) /* libz features are present */ -#define CURL_VERSION_NTLM (1<<4) /* NTLM auth is supported */ -#define CURL_VERSION_GSSNEGOTIATE (1<<5) /* Negotiate auth support */ -#define CURL_VERSION_DEBUG (1<<6) /* built with debug capabilities */ -#define CURL_VERSION_ASYNCHDNS (1<<7) /* asynchronous dns resolves */ -#define CURL_VERSION_SPNEGO (1<<8) /* SPNEGO auth */ -#define CURL_VERSION_LARGEFILE (1<<9) /* supports files bigger than 2GB */ -#define CURL_VERSION_IDN (1<<10) /* International Domain Names support */ -#define CURL_VERSION_SSPI (1<<11) /* SSPI is supported */ -#define CURL_VERSION_CONV (1<<12) /* character conversions supported */ -#define CURL_VERSION_CURLDEBUG (1<<13) /* debug memory tracking supported */ -#define CURL_VERSION_TLSAUTH_SRP (1<<14) /* TLS-SRP auth is supported */ -#define CURL_VERSION_NTLM_WB (1<<15) /* NTLM delegating to winbind helper */ -#define CURL_VERSION_HTTP2 (1<<16) /* HTTP2 support built-in */ - - /* - * NAME curl_version_info() - * - * DESCRIPTION - * - * This function returns a pointer to a static copy of the version info - * struct. See above. - */ -CURL_EXTERN curl_version_info_data *curl_version_info(CURLversion); - -/* - * NAME curl_easy_strerror() - * - * DESCRIPTION - * - * The curl_easy_strerror function may be used to turn a CURLcode value - * into the equivalent human readable error string. This is useful - * for printing meaningful error messages. - */ -CURL_EXTERN const char *curl_easy_strerror(CURLcode); - -/* - * NAME curl_share_strerror() - * - * DESCRIPTION - * - * The curl_share_strerror function may be used to turn a CURLSHcode value - * into the equivalent human readable error string. This is useful - * for printing meaningful error messages. - */ -CURL_EXTERN const char *curl_share_strerror(CURLSHcode); - -/* - * NAME curl_easy_pause() - * - * DESCRIPTION - * - * The curl_easy_pause function pauses or unpauses transfers. Select the new - * state by setting the bitmask, use the convenience defines below. - * - */ -CURL_EXTERN CURLcode curl_easy_pause(CURL *handle, int bitmask); - -#define CURLPAUSE_RECV (1<<0) -#define CURLPAUSE_RECV_CONT (0) - -#define CURLPAUSE_SEND (1<<2) -#define CURLPAUSE_SEND_CONT (0) - -#define CURLPAUSE_ALL (CURLPAUSE_RECV|CURLPAUSE_SEND) -#define CURLPAUSE_CONT (CURLPAUSE_RECV_CONT|CURLPAUSE_SEND_CONT) - -#ifdef __cplusplus -} -#endif - -/* unfortunately, the easy.h and multi.h include files need options and info - stuff before they can be included! */ -#include "easy.h" /* nothing in curl is fun without the easy stuff */ -#include "multi.h" - -/* the typechecker doesn't work in C++ (yet) */ -#if defined(__GNUC__) && defined(__GNUC_MINOR__) && \ - ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && \ - !defined(__cplusplus) && !defined(CURL_DISABLE_TYPECHECK) -#include "typecheck-gcc.h" -#else -#if defined(__STDC__) && (__STDC__ >= 1) -/* This preprocessor magic that replaces a call with the exact same call is - only done to make sure application authors pass exactly three arguments - to these functions. */ -#define curl_easy_setopt(handle,opt,param) curl_easy_setopt(handle,opt,param) -#define curl_easy_getinfo(handle,info,arg) curl_easy_getinfo(handle,info,arg) -#define curl_share_setopt(share,opt,param) curl_share_setopt(share,opt,param) -#define curl_multi_setopt(handle,opt,param) curl_multi_setopt(handle,opt,param) -#endif /* __STDC__ >= 1 */ -#endif /* gcc >= 4.3 && !__cplusplus */ - -#endif /* __CURL_CURL_H */ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/curlrules.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/curlrules.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/curlrules.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/curlrules.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,262 +0,0 @@ -#ifndef __CURL_CURLRULES_H -#define __CURL_CURLRULES_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ - -/* ================================================================ */ -/* COMPILE TIME SANITY CHECKS */ -/* ================================================================ */ - -/* - * NOTE 1: - * ------- - * - * All checks done in this file are intentionally placed in a public - * header file which is pulled by curl/curl.h when an application is - * being built using an already built libcurl library. Additionally - * this file is also included and used when building the library. - * - * If compilation fails on this file it is certainly sure that the - * problem is elsewhere. It could be a problem in the curlbuild.h - * header file, or simply that you are using different compilation - * settings than those used to build the library. - * - * Nothing in this file is intended to be modified or adjusted by the - * curl library user nor by the curl library builder. - * - * Do not deactivate any check, these are done to make sure that the - * library is properly built and used. - * - * You can find further help on the libcurl development mailing list: - * http://cool.haxx.se/mailman/listinfo/curl-library/ - * - * NOTE 2 - * ------ - * - * Some of the following compile time checks are based on the fact - * that the dimension of a constant array can not be a negative one. - * In this way if the compile time verification fails, the compilation - * will fail issuing an error. The error description wording is compiler - * dependent but it will be quite similar to one of the following: - * - * "negative subscript or subscript is too large" - * "array must have at least one element" - * "-1 is an illegal array size" - * "size of array is negative" - * - * If you are building an application which tries to use an already - * built libcurl library and you are getting this kind of errors on - * this file, it is a clear indication that there is a mismatch between - * how the library was built and how you are trying to use it for your - * application. Your already compiled or binary library provider is the - * only one who can give you the details you need to properly use it. - */ - -/* - * Verify that some macros are actually defined. - */ - -#ifndef CURL_SIZEOF_LONG -# error "CURL_SIZEOF_LONG definition is missing!" - Error Compilation_aborted_CURL_SIZEOF_LONG_is_missing -#endif - -#ifndef CURL_TYPEOF_CURL_SOCKLEN_T -# error "CURL_TYPEOF_CURL_SOCKLEN_T definition is missing!" - Error Compilation_aborted_CURL_TYPEOF_CURL_SOCKLEN_T_is_missing -#endif - -#ifndef CURL_SIZEOF_CURL_SOCKLEN_T -# error "CURL_SIZEOF_CURL_SOCKLEN_T definition is missing!" - Error Compilation_aborted_CURL_SIZEOF_CURL_SOCKLEN_T_is_missing -#endif - -#ifndef CURL_TYPEOF_CURL_OFF_T -# error "CURL_TYPEOF_CURL_OFF_T definition is missing!" - Error Compilation_aborted_CURL_TYPEOF_CURL_OFF_T_is_missing -#endif - -#ifndef CURL_FORMAT_CURL_OFF_T -# error "CURL_FORMAT_CURL_OFF_T definition is missing!" - Error Compilation_aborted_CURL_FORMAT_CURL_OFF_T_is_missing -#endif - -#ifndef CURL_FORMAT_CURL_OFF_TU -# error "CURL_FORMAT_CURL_OFF_TU definition is missing!" - Error Compilation_aborted_CURL_FORMAT_CURL_OFF_TU_is_missing -#endif - -#ifndef CURL_FORMAT_OFF_T -# error "CURL_FORMAT_OFF_T definition is missing!" - Error Compilation_aborted_CURL_FORMAT_OFF_T_is_missing -#endif - -#ifndef CURL_SIZEOF_CURL_OFF_T -# error "CURL_SIZEOF_CURL_OFF_T definition is missing!" - Error Compilation_aborted_CURL_SIZEOF_CURL_OFF_T_is_missing -#endif - -#ifndef CURL_SUFFIX_CURL_OFF_T -# error "CURL_SUFFIX_CURL_OFF_T definition is missing!" - Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_T_is_missing -#endif - -#ifndef CURL_SUFFIX_CURL_OFF_TU -# error "CURL_SUFFIX_CURL_OFF_TU definition is missing!" - Error Compilation_aborted_CURL_SUFFIX_CURL_OFF_TU_is_missing -#endif - -/* - * Macros private to this header file. - */ - -#define CurlchkszEQ(t, s) sizeof(t) == s ? 1 : -1 - -#define CurlchkszGE(t1, t2) sizeof(t1) >= sizeof(t2) ? 1 : -1 - -/* - * Verify that the size previously defined and expected for long - * is the same as the one reported by sizeof() at compile time. - */ - -typedef char - __curl_rule_01__ - [CurlchkszEQ(long, CURL_SIZEOF_LONG)]; - -/* - * Verify that the size previously defined and expected for - * curl_off_t is actually the the same as the one reported - * by sizeof() at compile time. - */ - -typedef char - __curl_rule_02__ - [CurlchkszEQ(curl_off_t, CURL_SIZEOF_CURL_OFF_T)]; - -/* - * Verify at compile time that the size of curl_off_t as reported - * by sizeof() is greater or equal than the one reported for long - * for the current compilation. - */ - -typedef char - __curl_rule_03__ - [CurlchkszGE(curl_off_t, long)]; - -/* - * Verify that the size previously defined and expected for - * curl_socklen_t is actually the the same as the one reported - * by sizeof() at compile time. - */ - -typedef char - __curl_rule_04__ - [CurlchkszEQ(curl_socklen_t, CURL_SIZEOF_CURL_SOCKLEN_T)]; - -/* - * Verify at compile time that the size of curl_socklen_t as reported - * by sizeof() is greater or equal than the one reported for int for - * the current compilation. - */ - -typedef char - __curl_rule_05__ - [CurlchkszGE(curl_socklen_t, int)]; - -/* ================================================================ */ -/* EXTERNALLY AND INTERNALLY VISIBLE DEFINITIONS */ -/* ================================================================ */ - -/* - * CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow - * these to be visible and exported by the external libcurl interface API, - * while also making them visible to the library internals, simply including - * curl_setup.h, without actually needing to include curl.h internally. - * If some day this section would grow big enough, all this should be moved - * to its own header file. - */ - -/* - * Figure out if we can use the ## preprocessor operator, which is supported - * by ISO/ANSI C and C++. Some compilers support it without setting __STDC__ - * or __cplusplus so we need to carefully check for them too. - */ - -#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \ - defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \ - defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \ - defined(__ILEC400__) - /* This compiler is believed to have an ISO compatible preprocessor */ -#define CURL_ISOCPP -#else - /* This compiler is believed NOT to have an ISO compatible preprocessor */ -#undef CURL_ISOCPP -#endif - -/* - * Macros for minimum-width signed and unsigned curl_off_t integer constants. - */ - -#if defined(__BORLANDC__) && (__BORLANDC__ == 0x0551) -# define __CURL_OFF_T_C_HLPR2(x) x -# define __CURL_OFF_T_C_HLPR1(x) __CURL_OFF_T_C_HLPR2(x) -# define CURL_OFF_T_C(Val) __CURL_OFF_T_C_HLPR1(Val) ## \ - __CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_T) -# define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val) ## \ - __CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_TU) -#else -# ifdef CURL_ISOCPP -# define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val ## Suffix -# else -# define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val/**/Suffix -# endif -# define __CURL_OFF_T_C_HLPR1(Val,Suffix) __CURL_OFF_T_C_HLPR2(Val,Suffix) -# define CURL_OFF_T_C(Val) __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_T) -# define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_TU) -#endif - -/* - * Get rid of macros private to this header file. - */ - -#undef CurlchkszEQ -#undef CurlchkszGE - -/* - * Get rid of macros not intended to exist beyond this point. - */ - -#undef CURL_PULL_WS2TCPIP_H -#undef CURL_PULL_SYS_TYPES_H -#undef CURL_PULL_SYS_SOCKET_H -#undef CURL_PULL_SYS_POLL_H -#undef CURL_PULL_STDINT_H -#undef CURL_PULL_INTTYPES_H - -#undef CURL_TYPEOF_CURL_SOCKLEN_T -#undef CURL_TYPEOF_CURL_OFF_T - -#ifdef CURL_NO_OLDIES -#undef CURL_FORMAT_OFF_T /* not required since 7.19.0 - obsoleted in 7.20.0 */ -#endif - -#endif /* __CURL_CURLRULES_H */ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/curlver.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/curlver.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/curlver.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/curlver.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -#ifndef __CURL_CURLVER_H -#define __CURL_CURLVER_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2014, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ - -/* This header file contains nothing but libcurl version info, generated by - a script at release-time. This was made its own header file in 7.11.2 */ - -/* This is the global package copyright */ -#define LIBCURL_COPYRIGHT "1996 - 2014 Daniel Stenberg, ." - -/* This is the version number of the libcurl package from which this header - file origins: */ -#define LIBCURL_VERSION "7.37.0" - -/* The numeric version number is also available "in parts" by using these - defines: */ -#define LIBCURL_VERSION_MAJOR 7 -#define LIBCURL_VERSION_MINOR 37 -#define LIBCURL_VERSION_PATCH 0 - -/* This is the numeric version of the libcurl version number, meant for easier - parsing and comparions by programs. The LIBCURL_VERSION_NUM define will - always follow this syntax: - - 0xXXYYZZ - - Where XX, YY and ZZ are the main version, release and patch numbers in - hexadecimal (using 8 bits each). All three numbers are always represented - using two digits. 1.2 would appear as "0x010200" while version 9.11.7 - appears as "0x090b07". - - This 6-digit (24 bits) hexadecimal number does not show pre-release number, - and it is always a greater number in a more recent release. It makes - comparisons with greater than and less than work. -*/ -#define LIBCURL_VERSION_NUM 0x072500 - -/* - * This is the date and time when the full source package was created. The - * timestamp is not stored in git, as the timestamp is properly set in the - * tarballs by the maketgz script. - * - * The format of the date should follow this template: - * - * "Mon Feb 12 11:35:33 UTC 2007" - */ -#define LIBCURL_TIMESTAMP "Wed May 21 05:58:26 UTC 2014" - -#endif /* __CURL_CURLVER_H */ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/easy.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/easy.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/easy.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/easy.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,102 +0,0 @@ -#ifndef __CURL_EASY_H -#define __CURL_EASY_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ -#ifdef __cplusplus -extern "C" { -#endif - -CURL_EXTERN CURL *curl_easy_init(void); -CURL_EXTERN CURLcode curl_easy_setopt(CURL *curl, CURLoption option, ...); -CURL_EXTERN CURLcode curl_easy_perform(CURL *curl); -CURL_EXTERN void curl_easy_cleanup(CURL *curl); - -/* - * NAME curl_easy_getinfo() - * - * DESCRIPTION - * - * Request internal information from the curl session with this function. The - * third argument MUST be a pointer to a long, a pointer to a char * or a - * pointer to a double (as the documentation describes elsewhere). The data - * pointed to will be filled in accordingly and can be relied upon only if the - * function returns CURLE_OK. This function is intended to get used *AFTER* a - * performed transfer, all results from this function are undefined until the - * transfer is completed. - */ -CURL_EXTERN CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...); - - -/* - * NAME curl_easy_duphandle() - * - * DESCRIPTION - * - * Creates a new curl session handle with the same options set for the handle - * passed in. Duplicating a handle could only be a matter of cloning data and - * options, internal state info and things like persistent connections cannot - * be transferred. It is useful in multithreaded applications when you can run - * curl_easy_duphandle() for each new thread to avoid a series of identical - * curl_easy_setopt() invokes in every thread. - */ -CURL_EXTERN CURL* curl_easy_duphandle(CURL *curl); - -/* - * NAME curl_easy_reset() - * - * DESCRIPTION - * - * Re-initializes a CURL handle to the default values. This puts back the - * handle to the same state as it was in when it was just created. - * - * It does keep: live connections, the Session ID cache, the DNS cache and the - * cookies. - */ -CURL_EXTERN void curl_easy_reset(CURL *curl); - -/* - * NAME curl_easy_recv() - * - * DESCRIPTION - * - * Receives data from the connected socket. Use after successful - * curl_easy_perform() with CURLOPT_CONNECT_ONLY option. - */ -CURL_EXTERN CURLcode curl_easy_recv(CURL *curl, void *buffer, size_t buflen, - size_t *n); - -/* - * NAME curl_easy_send() - * - * DESCRIPTION - * - * Sends data over the connected socket. Use after successful - * curl_easy_perform() with CURLOPT_CONNECT_ONLY option. - */ -CURL_EXTERN CURLcode curl_easy_send(CURL *curl, const void *buffer, - size_t buflen, size_t *n); - -#ifdef __cplusplus -} -#endif - -#endif diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/Makefile.am opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/Makefile.am --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/Makefile.am 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at http://curl.haxx.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -########################################################################### -pkginclude_HEADERS = \ - curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \ - typecheck-gcc.h curlbuild.h curlrules.h - -pkgincludedir= $(includedir)/curl - -# curlbuild.h does not exist in the git tree. When the original libcurl -# source code distribution archive file is created, curlbuild.h.dist is -# renamed to curlbuild.h and included in the tarball so that it can be -# used directly on non-configure systems. -# -# The distributed curlbuild.h will be overwritten on configure systems -# when the configure script runs, with one that is suitable and specific -# to the library being configured and built. -# -# curlbuild.h.in is the distributed template file from which the configure -# script creates curlbuild.h at library configuration time, overwiting the -# one included in the distribution archive. -# -# curlbuild.h.dist is not included in the source code distribution archive. - -EXTRA_DIST = curlbuild.h.in - -DISTCLEANFILES = curlbuild.h - -checksrc: - @@PERL@ $(top_srcdir)/lib/checksrc.pl -Wcurlbuild.h -D$(top_srcdir)/include/curl $(pkginclude_HEADERS) $(EXTRA_DIST) - -if CURLDEBUG -# for debug builds, we scan the sources on all regular make invokes -all-local: checksrc -endif diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/Makefile.in opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/Makefile.in --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/Makefile.in 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,689 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = include/curl -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/curlbuild.h.in $(top_srcdir)/mkinstalldirs \ - $(pkginclude_HEADERS) -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/curl-compilers.m4 \ - $(top_srcdir)/m4/curl-confopts.m4 \ - $(top_srcdir)/m4/curl-functions.m4 \ - $(top_srcdir)/m4/curl-openssl.m4 \ - $(top_srcdir)/m4/curl-override.m4 \ - $(top_srcdir)/m4/curl-reentrant.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/xc-am-iface.m4 \ - $(top_srcdir)/m4/xc-cc-check.m4 \ - $(top_srcdir)/m4/xc-lt-iface.m4 \ - $(top_srcdir)/m4/xc-translit.m4 \ - $(top_srcdir)/m4/xc-val-flgs.m4 \ - $(top_srcdir)/m4/zz40-xc-ovr.m4 \ - $(top_srcdir)/m4/zz50-xc-ovr.m4 \ - $(top_srcdir)/m4/zz60-xc-ovr.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/lib/curl_config.h curlbuild.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(pkgincludedir)" -HEADERS = $(pkginclude_HEADERS) -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)curlbuild.h.in -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkgincludedir = $(includedir)/curl -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BLANK_AT_MAKETIME = @BLANK_AT_MAKETIME@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@ -CONFIGURE_OPTIONS = @CONFIGURE_OPTIONS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPFLAG_CURL_STATICLIB = @CPPFLAG_CURL_STATICLIB@ -CURLVERSION = @CURLVERSION@ -CURL_CA_BUNDLE = @CURL_CA_BUNDLE@ -CURL_CFLAG_EXTRAS = @CURL_CFLAG_EXTRAS@ -CURL_DISABLE_DICT = @CURL_DISABLE_DICT@ -CURL_DISABLE_FILE = @CURL_DISABLE_FILE@ -CURL_DISABLE_FTP = @CURL_DISABLE_FTP@ -CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@ -CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@ -CURL_DISABLE_IMAP = @CURL_DISABLE_IMAP@ -CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@ -CURL_DISABLE_LDAPS = @CURL_DISABLE_LDAPS@ -CURL_DISABLE_POP3 = @CURL_DISABLE_POP3@ -CURL_DISABLE_PROXY = @CURL_DISABLE_PROXY@ -CURL_DISABLE_RTSP = @CURL_DISABLE_RTSP@ -CURL_DISABLE_SMTP = @CURL_DISABLE_SMTP@ -CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@ -CURL_DISABLE_TFTP = @CURL_DISABLE_TFTP@ -CURL_LT_SHLIB_VERSIONED_FLAVOUR = @CURL_LT_SHLIB_VERSIONED_FLAVOUR@ -CURL_NETWORK_AND_TIME_LIBS = @CURL_NETWORK_AND_TIME_LIBS@ -CURL_NETWORK_LIBS = @CURL_NETWORK_LIBS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_SHARED = @ENABLE_SHARED@ -ENABLE_STATIC = @ENABLE_STATIC@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -HAVE_GNUTLS_SRP = @HAVE_GNUTLS_SRP@ -HAVE_LDAP_SSL = @HAVE_LDAP_SSL@ -HAVE_LIBZ = @HAVE_LIBZ@ -HAVE_SSLEAY_SRP = @HAVE_SSLEAY_SRP@ -IDN_ENABLED = @IDN_ENABLED@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -IPV6_ENABLED = @IPV6_ENABLED@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL_LIBS = @LIBCURL_LIBS@ -LIBMETALINK_CPPFLAGS = @LIBMETALINK_CPPFLAGS@ -LIBMETALINK_LDFLAGS = @LIBMETALINK_LDFLAGS@ -LIBMETALINK_LIBS = @LIBMETALINK_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MANOPT = @MANOPT@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -NROFF = @NROFF@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PKGADD_NAME = @PKGADD_NAME@ -PKGADD_PKG = @PKGADD_PKG@ -PKGADD_VENDOR = @PKGADD_VENDOR@ -PKGCONFIG = @PKGCONFIG@ -RANDOM_FILE = @RANDOM_FILE@ -RANLIB = @RANLIB@ -REQUIRE_LIB_DEPS = @REQUIRE_LIB_DEPS@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SSL_ENABLED = @SSL_ENABLED@ -STRIP = @STRIP@ -SUPPORT_FEATURES = @SUPPORT_FEATURES@ -SUPPORT_PROTOCOLS = @SUPPORT_PROTOCOLS@ -USE_ARES = @USE_ARES@ -USE_AXTLS = @USE_AXTLS@ -USE_CYASSL = @USE_CYASSL@ -USE_DARWINSSL = @USE_DARWINSSL@ -USE_GNUTLS = @USE_GNUTLS@ -USE_GNUTLS_NETTLE = @USE_GNUTLS_NETTLE@ -USE_LIBRTMP = @USE_LIBRTMP@ -USE_LIBSSH2 = @USE_LIBSSH2@ -USE_NGHTTP2 = @USE_NGHTTP2@ -USE_NSS = @USE_NSS@ -USE_OPENLDAP = @USE_OPENLDAP@ -USE_POLARSSL = @USE_POLARSSL@ -USE_SCHANNEL = @USE_SCHANNEL@ -USE_SSLEAY = @USE_SSLEAY@ -USE_WINDOWS_SSPI = @USE_WINDOWS_SSPI@ -VERSION = @VERSION@ -VERSIONNUM = @VERSIONNUM@ -ZLIB_LIBS = @ZLIB_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -libext = @libext@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ - -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) 1998 - 2011, Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at http://curl.haxx.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -########################################################################### -pkginclude_HEADERS = \ - curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \ - typecheck-gcc.h curlbuild.h curlrules.h - - -# curlbuild.h does not exist in the git tree. When the original libcurl -# source code distribution archive file is created, curlbuild.h.dist is -# renamed to curlbuild.h and included in the tarball so that it can be -# used directly on non-configure systems. -# -# The distributed curlbuild.h will be overwritten on configure systems -# when the configure script runs, with one that is suitable and specific -# to the library being configured and built. -# -# curlbuild.h.in is the distributed template file from which the configure -# script creates curlbuild.h at library configuration time, overwiting the -# one included in the distribution archive. -# -# curlbuild.h.dist is not included in the source code distribution archive. -EXTRA_DIST = curlbuild.h.in -DISTCLEANFILES = curlbuild.h -all: curlbuild.h - $(MAKE) $(AM_MAKEFLAGS) all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/curl/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign include/curl/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -curlbuild.h: stamp-h2 - @test -f $@ || rm -f stamp-h2 - @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2 - -stamp-h2: $(srcdir)/curlbuild.h.in $(top_builddir)/config.status - @rm -f stamp-h2 - cd $(top_builddir) && $(SHELL) ./config.status include/curl/curlbuild.h - -distclean-hdr: - -rm -f curlbuild.h stamp-h2 - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-pkgincludeHEADERS: $(pkginclude_HEADERS) - @$(NORMAL_INSTALL) - @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \ - done - -uninstall-pkgincludeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir) - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -@CURLDEBUG_FALSE@all-local: -all-am: Makefile $(HEADERS) curlbuild.h all-local -installdirs: - for dir in "$(DESTDIR)$(pkgincludedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-hdr distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-pkgincludeHEADERS - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pkgincludeHEADERS - -.MAKE: all install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \ - clean-generic clean-libtool cscopelist-am ctags ctags-am \ - distclean distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgincludeHEADERS \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-pkgincludeHEADERS - - -checksrc: - @@PERL@ $(top_srcdir)/lib/checksrc.pl -Wcurlbuild.h -D$(top_srcdir)/include/curl $(pkginclude_HEADERS) $(EXTRA_DIST) - -# for debug builds, we scan the sources on all regular make invokes -@CURLDEBUG_TRUE@all-local: checksrc - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/mprintf.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/mprintf.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/mprintf.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/mprintf.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -#ifndef __CURL_MPRINTF_H -#define __CURL_MPRINTF_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ - -#include -#include /* needed for FILE */ - -#include "curl.h" - -#ifdef __cplusplus -extern "C" { -#endif - -CURL_EXTERN int curl_mprintf(const char *format, ...); -CURL_EXTERN int curl_mfprintf(FILE *fd, const char *format, ...); -CURL_EXTERN int curl_msprintf(char *buffer, const char *format, ...); -CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength, - const char *format, ...); -CURL_EXTERN int curl_mvprintf(const char *format, va_list args); -CURL_EXTERN int curl_mvfprintf(FILE *fd, const char *format, va_list args); -CURL_EXTERN int curl_mvsprintf(char *buffer, const char *format, va_list args); -CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength, - const char *format, va_list args); -CURL_EXTERN char *curl_maprintf(const char *format, ...); -CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args); - -#ifdef _MPRINTF_REPLACE -# undef printf -# undef fprintf -# undef sprintf -# undef vsprintf -# undef snprintf -# undef vprintf -# undef vfprintf -# undef vsnprintf -# undef aprintf -# undef vaprintf -# define printf curl_mprintf -# define fprintf curl_mfprintf -#ifdef CURLDEBUG -/* When built with CURLDEBUG we define away the sprintf functions since we - don't want internal code to be using them */ -# define sprintf sprintf_was_used -# define vsprintf vsprintf_was_used -#else -# define sprintf curl_msprintf -# define vsprintf curl_mvsprintf -#endif -# define snprintf curl_msnprintf -# define vprintf curl_mvprintf -# define vfprintf curl_mvfprintf -# define vsnprintf curl_mvsnprintf -# define aprintf curl_maprintf -# define vaprintf curl_mvaprintf -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* __CURL_MPRINTF_H */ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/multi.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/multi.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/multi.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/multi.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,399 +0,0 @@ -#ifndef __CURL_MULTI_H -#define __CURL_MULTI_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ -/* - This is an "external" header file. Don't give away any internals here! - - GOALS - - o Enable a "pull" interface. The application that uses libcurl decides where - and when to ask libcurl to get/send data. - - o Enable multiple simultaneous transfers in the same thread without making it - complicated for the application. - - o Enable the application to select() on its own file descriptors and curl's - file descriptors simultaneous easily. - -*/ - -/* - * This header file should not really need to include "curl.h" since curl.h - * itself includes this file and we expect user applications to do #include - * without the need for especially including multi.h. - * - * For some reason we added this include here at one point, and rather than to - * break existing (wrongly written) libcurl applications, we leave it as-is - * but with this warning attached. - */ -#include "curl.h" - -#ifdef __cplusplus -extern "C" { -#endif - -typedef void CURLM; - -typedef enum { - CURLM_CALL_MULTI_PERFORM = -1, /* please call curl_multi_perform() or - curl_multi_socket*() soon */ - CURLM_OK, - CURLM_BAD_HANDLE, /* the passed-in handle is not a valid CURLM handle */ - CURLM_BAD_EASY_HANDLE, /* an easy handle was not good/valid */ - CURLM_OUT_OF_MEMORY, /* if you ever get this, you're in deep sh*t */ - CURLM_INTERNAL_ERROR, /* this is a libcurl bug */ - CURLM_BAD_SOCKET, /* the passed in socket argument did not match */ - CURLM_UNKNOWN_OPTION, /* curl_multi_setopt() with unsupported option */ - CURLM_ADDED_ALREADY, /* an easy handle already added to a multi handle was - attempted to get added - again */ - CURLM_LAST -} CURLMcode; - -/* just to make code nicer when using curl_multi_socket() you can now check - for CURLM_CALL_MULTI_SOCKET too in the same style it works for - curl_multi_perform() and CURLM_CALL_MULTI_PERFORM */ -#define CURLM_CALL_MULTI_SOCKET CURLM_CALL_MULTI_PERFORM - -typedef enum { - CURLMSG_NONE, /* first, not used */ - CURLMSG_DONE, /* This easy handle has completed. 'result' contains - the CURLcode of the transfer */ - CURLMSG_LAST /* last, not used */ -} CURLMSG; - -struct CURLMsg { - CURLMSG msg; /* what this message means */ - CURL *easy_handle; /* the handle it concerns */ - union { - void *whatever; /* message-specific data */ - CURLcode result; /* return code for transfer */ - } data; -}; -typedef struct CURLMsg CURLMsg; - -/* Based on poll(2) structure and values. - * We don't use pollfd and POLL* constants explicitly - * to cover platforms without poll(). */ -#define CURL_WAIT_POLLIN 0x0001 -#define CURL_WAIT_POLLPRI 0x0002 -#define CURL_WAIT_POLLOUT 0x0004 - -struct curl_waitfd { - curl_socket_t fd; - short events; - short revents; /* not supported yet */ -}; - -/* - * Name: curl_multi_init() - * - * Desc: inititalize multi-style curl usage - * - * Returns: a new CURLM handle to use in all 'curl_multi' functions. - */ -CURL_EXTERN CURLM *curl_multi_init(void); - -/* - * Name: curl_multi_add_handle() - * - * Desc: add a standard curl handle to the multi stack - * - * Returns: CURLMcode type, general multi error code. - */ -CURL_EXTERN CURLMcode curl_multi_add_handle(CURLM *multi_handle, - CURL *curl_handle); - - /* - * Name: curl_multi_remove_handle() - * - * Desc: removes a curl handle from the multi stack again - * - * Returns: CURLMcode type, general multi error code. - */ -CURL_EXTERN CURLMcode curl_multi_remove_handle(CURLM *multi_handle, - CURL *curl_handle); - - /* - * Name: curl_multi_fdset() - * - * Desc: Ask curl for its fd_set sets. The app can use these to select() or - * poll() on. We want curl_multi_perform() called as soon as one of - * them are ready. - * - * Returns: CURLMcode type, general multi error code. - */ -CURL_EXTERN CURLMcode curl_multi_fdset(CURLM *multi_handle, - fd_set *read_fd_set, - fd_set *write_fd_set, - fd_set *exc_fd_set, - int *max_fd); - -/* - * Name: curl_multi_wait() - * - * Desc: Poll on all fds within a CURLM set as well as any - * additional fds passed to the function. - * - * Returns: CURLMcode type, general multi error code. - */ -CURL_EXTERN CURLMcode curl_multi_wait(CURLM *multi_handle, - struct curl_waitfd extra_fds[], - unsigned int extra_nfds, - int timeout_ms, - int *ret); - - /* - * Name: curl_multi_perform() - * - * Desc: When the app thinks there's data available for curl it calls this - * function to read/write whatever there is right now. This returns - * as soon as the reads and writes are done. This function does not - * require that there actually is data available for reading or that - * data can be written, it can be called just in case. It returns - * the number of handles that still transfer data in the second - * argument's integer-pointer. - * - * Returns: CURLMcode type, general multi error code. *NOTE* that this only - * returns errors etc regarding the whole multi stack. There might - * still have occurred problems on invidual transfers even when this - * returns OK. - */ -CURL_EXTERN CURLMcode curl_multi_perform(CURLM *multi_handle, - int *running_handles); - - /* - * Name: curl_multi_cleanup() - * - * Desc: Cleans up and removes a whole multi stack. It does not free or - * touch any individual easy handles in any way. We need to define - * in what state those handles will be if this function is called - * in the middle of a transfer. - * - * Returns: CURLMcode type, general multi error code. - */ -CURL_EXTERN CURLMcode curl_multi_cleanup(CURLM *multi_handle); - -/* - * Name: curl_multi_info_read() - * - * Desc: Ask the multi handle if there's any messages/informationals from - * the individual transfers. Messages include informationals such as - * error code from the transfer or just the fact that a transfer is - * completed. More details on these should be written down as well. - * - * Repeated calls to this function will return a new struct each - * time, until a special "end of msgs" struct is returned as a signal - * that there is no more to get at this point. - * - * The data the returned pointer points to will not survive calling - * curl_multi_cleanup(). - * - * The 'CURLMsg' struct is meant to be very simple and only contain - * very basic informations. If more involved information is wanted, - * we will provide the particular "transfer handle" in that struct - * and that should/could/would be used in subsequent - * curl_easy_getinfo() calls (or similar). The point being that we - * must never expose complex structs to applications, as then we'll - * undoubtably get backwards compatibility problems in the future. - * - * Returns: A pointer to a filled-in struct, or NULL if it failed or ran out - * of structs. It also writes the number of messages left in the - * queue (after this read) in the integer the second argument points - * to. - */ -CURL_EXTERN CURLMsg *curl_multi_info_read(CURLM *multi_handle, - int *msgs_in_queue); - -/* - * Name: curl_multi_strerror() - * - * Desc: The curl_multi_strerror function may be used to turn a CURLMcode - * value into the equivalent human readable error string. This is - * useful for printing meaningful error messages. - * - * Returns: A pointer to a zero-terminated error message. - */ -CURL_EXTERN const char *curl_multi_strerror(CURLMcode); - -/* - * Name: curl_multi_socket() and - * curl_multi_socket_all() - * - * Desc: An alternative version of curl_multi_perform() that allows the - * application to pass in one of the file descriptors that have been - * detected to have "action" on them and let libcurl perform. - * See man page for details. - */ -#define CURL_POLL_NONE 0 -#define CURL_POLL_IN 1 -#define CURL_POLL_OUT 2 -#define CURL_POLL_INOUT 3 -#define CURL_POLL_REMOVE 4 - -#define CURL_SOCKET_TIMEOUT CURL_SOCKET_BAD - -#define CURL_CSELECT_IN 0x01 -#define CURL_CSELECT_OUT 0x02 -#define CURL_CSELECT_ERR 0x04 - -typedef int (*curl_socket_callback)(CURL *easy, /* easy handle */ - curl_socket_t s, /* socket */ - int what, /* see above */ - void *userp, /* private callback - pointer */ - void *socketp); /* private socket - pointer */ -/* - * Name: curl_multi_timer_callback - * - * Desc: Called by libcurl whenever the library detects a change in the - * maximum number of milliseconds the app is allowed to wait before - * curl_multi_socket() or curl_multi_perform() must be called - * (to allow libcurl's timed events to take place). - * - * Returns: The callback should return zero. - */ -typedef int (*curl_multi_timer_callback)(CURLM *multi, /* multi handle */ - long timeout_ms, /* see above */ - void *userp); /* private callback - pointer */ - -CURL_EXTERN CURLMcode curl_multi_socket(CURLM *multi_handle, curl_socket_t s, - int *running_handles); - -CURL_EXTERN CURLMcode curl_multi_socket_action(CURLM *multi_handle, - curl_socket_t s, - int ev_bitmask, - int *running_handles); - -CURL_EXTERN CURLMcode curl_multi_socket_all(CURLM *multi_handle, - int *running_handles); - -#ifndef CURL_ALLOW_OLD_MULTI_SOCKET -/* This macro below was added in 7.16.3 to push users who recompile to use - the new curl_multi_socket_action() instead of the old curl_multi_socket() -*/ -#define curl_multi_socket(x,y,z) curl_multi_socket_action(x,y,0,z) -#endif - -/* - * Name: curl_multi_timeout() - * - * Desc: Returns the maximum number of milliseconds the app is allowed to - * wait before curl_multi_socket() or curl_multi_perform() must be - * called (to allow libcurl's timed events to take place). - * - * Returns: CURLM error code. - */ -CURL_EXTERN CURLMcode curl_multi_timeout(CURLM *multi_handle, - long *milliseconds); - -#undef CINIT /* re-using the same name as in curl.h */ - -#ifdef CURL_ISOCPP -#define CINIT(name,type,num) CURLMOPT_ ## name = CURLOPTTYPE_ ## type + num -#else -/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */ -#define LONG CURLOPTTYPE_LONG -#define OBJECTPOINT CURLOPTTYPE_OBJECTPOINT -#define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT -#define OFF_T CURLOPTTYPE_OFF_T -#define CINIT(name,type,number) CURLMOPT_/**/name = type + number -#endif - -typedef enum { - /* This is the socket callback function pointer */ - CINIT(SOCKETFUNCTION, FUNCTIONPOINT, 1), - - /* This is the argument passed to the socket callback */ - CINIT(SOCKETDATA, OBJECTPOINT, 2), - - /* set to 1 to enable pipelining for this multi handle */ - CINIT(PIPELINING, LONG, 3), - - /* This is the timer callback function pointer */ - CINIT(TIMERFUNCTION, FUNCTIONPOINT, 4), - - /* This is the argument passed to the timer callback */ - CINIT(TIMERDATA, OBJECTPOINT, 5), - - /* maximum number of entries in the connection cache */ - CINIT(MAXCONNECTS, LONG, 6), - - /* maximum number of (pipelining) connections to one host */ - CINIT(MAX_HOST_CONNECTIONS, LONG, 7), - - /* maximum number of requests in a pipeline */ - CINIT(MAX_PIPELINE_LENGTH, LONG, 8), - - /* a connection with a content-length longer than this - will not be considered for pipelining */ - CINIT(CONTENT_LENGTH_PENALTY_SIZE, OFF_T, 9), - - /* a connection with a chunk length longer than this - will not be considered for pipelining */ - CINIT(CHUNK_LENGTH_PENALTY_SIZE, OFF_T, 10), - - /* a list of site names(+port) that are blacklisted from - pipelining */ - CINIT(PIPELINING_SITE_BL, OBJECTPOINT, 11), - - /* a list of server types that are blacklisted from - pipelining */ - CINIT(PIPELINING_SERVER_BL, OBJECTPOINT, 12), - - /* maximum number of open connections in total */ - CINIT(MAX_TOTAL_CONNECTIONS, LONG, 13), - - CURLMOPT_LASTENTRY /* the last unused */ -} CURLMoption; - - -/* - * Name: curl_multi_setopt() - * - * Desc: Sets options for the multi handle. - * - * Returns: CURLM error code. - */ -CURL_EXTERN CURLMcode curl_multi_setopt(CURLM *multi_handle, - CURLMoption option, ...); - - -/* - * Name: curl_multi_assign() - * - * Desc: This function sets an association in the multi handle between the - * given socket and a private pointer of the application. This is - * (only) useful for curl_multi_socket uses. - * - * Returns: CURLM error code. - */ -CURL_EXTERN CURLMcode curl_multi_assign(CURLM *multi_handle, - curl_socket_t sockfd, void *sockp); - -#ifdef __cplusplus -} /* end of extern "C" */ -#endif - -#endif diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/stdcheaders.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/stdcheaders.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/stdcheaders.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/stdcheaders.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -#ifndef __STDC_HEADERS_H -#define __STDC_HEADERS_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ - -#include - -size_t fread (void *, size_t, size_t, FILE *); -size_t fwrite (const void *, size_t, size_t, FILE *); - -int strcasecmp(const char *, const char *); -int strncasecmp(const char *, const char *, size_t); - -#endif /* __STDC_HEADERS_H */ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/typecheck-gcc.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/typecheck-gcc.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/curl/typecheck-gcc.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/curl/typecheck-gcc.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,610 +0,0 @@ -#ifndef __CURL_TYPECHECK_GCC_H -#define __CURL_TYPECHECK_GCC_H -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ - -/* wraps curl_easy_setopt() with typechecking */ - -/* To add a new kind of warning, add an - * if(_curl_is_sometype_option(_curl_opt)) - * if(!_curl_is_sometype(value)) - * _curl_easy_setopt_err_sometype(); - * block and define _curl_is_sometype_option, _curl_is_sometype and - * _curl_easy_setopt_err_sometype below - * - * NOTE: We use two nested 'if' statements here instead of the && operator, in - * order to work around gcc bug #32061. It affects only gcc 4.3.x/4.4.x - * when compiling with -Wlogical-op. - * - * To add an option that uses the same type as an existing option, you'll just - * need to extend the appropriate _curl_*_option macro - */ -#define curl_easy_setopt(handle, option, value) \ -__extension__ ({ \ - __typeof__ (option) _curl_opt = option; \ - if(__builtin_constant_p(_curl_opt)) { \ - if(_curl_is_long_option(_curl_opt)) \ - if(!_curl_is_long(value)) \ - _curl_easy_setopt_err_long(); \ - if(_curl_is_off_t_option(_curl_opt)) \ - if(!_curl_is_off_t(value)) \ - _curl_easy_setopt_err_curl_off_t(); \ - if(_curl_is_string_option(_curl_opt)) \ - if(!_curl_is_string(value)) \ - _curl_easy_setopt_err_string(); \ - if(_curl_is_write_cb_option(_curl_opt)) \ - if(!_curl_is_write_cb(value)) \ - _curl_easy_setopt_err_write_callback(); \ - if((_curl_opt) == CURLOPT_READFUNCTION) \ - if(!_curl_is_read_cb(value)) \ - _curl_easy_setopt_err_read_cb(); \ - if((_curl_opt) == CURLOPT_IOCTLFUNCTION) \ - if(!_curl_is_ioctl_cb(value)) \ - _curl_easy_setopt_err_ioctl_cb(); \ - if((_curl_opt) == CURLOPT_SOCKOPTFUNCTION) \ - if(!_curl_is_sockopt_cb(value)) \ - _curl_easy_setopt_err_sockopt_cb(); \ - if((_curl_opt) == CURLOPT_OPENSOCKETFUNCTION) \ - if(!_curl_is_opensocket_cb(value)) \ - _curl_easy_setopt_err_opensocket_cb(); \ - if((_curl_opt) == CURLOPT_PROGRESSFUNCTION) \ - if(!_curl_is_progress_cb(value)) \ - _curl_easy_setopt_err_progress_cb(); \ - if((_curl_opt) == CURLOPT_DEBUGFUNCTION) \ - if(!_curl_is_debug_cb(value)) \ - _curl_easy_setopt_err_debug_cb(); \ - if((_curl_opt) == CURLOPT_SSL_CTX_FUNCTION) \ - if(!_curl_is_ssl_ctx_cb(value)) \ - _curl_easy_setopt_err_ssl_ctx_cb(); \ - if(_curl_is_conv_cb_option(_curl_opt)) \ - if(!_curl_is_conv_cb(value)) \ - _curl_easy_setopt_err_conv_cb(); \ - if((_curl_opt) == CURLOPT_SEEKFUNCTION) \ - if(!_curl_is_seek_cb(value)) \ - _curl_easy_setopt_err_seek_cb(); \ - if(_curl_is_cb_data_option(_curl_opt)) \ - if(!_curl_is_cb_data(value)) \ - _curl_easy_setopt_err_cb_data(); \ - if((_curl_opt) == CURLOPT_ERRORBUFFER) \ - if(!_curl_is_error_buffer(value)) \ - _curl_easy_setopt_err_error_buffer(); \ - if((_curl_opt) == CURLOPT_STDERR) \ - if(!_curl_is_FILE(value)) \ - _curl_easy_setopt_err_FILE(); \ - if(_curl_is_postfields_option(_curl_opt)) \ - if(!_curl_is_postfields(value)) \ - _curl_easy_setopt_err_postfields(); \ - if((_curl_opt) == CURLOPT_HTTPPOST) \ - if(!_curl_is_arr((value), struct curl_httppost)) \ - _curl_easy_setopt_err_curl_httpost(); \ - if(_curl_is_slist_option(_curl_opt)) \ - if(!_curl_is_arr((value), struct curl_slist)) \ - _curl_easy_setopt_err_curl_slist(); \ - if((_curl_opt) == CURLOPT_SHARE) \ - if(!_curl_is_ptr((value), CURLSH)) \ - _curl_easy_setopt_err_CURLSH(); \ - } \ - curl_easy_setopt(handle, _curl_opt, value); \ -}) - -/* wraps curl_easy_getinfo() with typechecking */ -/* FIXME: don't allow const pointers */ -#define curl_easy_getinfo(handle, info, arg) \ -__extension__ ({ \ - __typeof__ (info) _curl_info = info; \ - if(__builtin_constant_p(_curl_info)) { \ - if(_curl_is_string_info(_curl_info)) \ - if(!_curl_is_arr((arg), char *)) \ - _curl_easy_getinfo_err_string(); \ - if(_curl_is_long_info(_curl_info)) \ - if(!_curl_is_arr((arg), long)) \ - _curl_easy_getinfo_err_long(); \ - if(_curl_is_double_info(_curl_info)) \ - if(!_curl_is_arr((arg), double)) \ - _curl_easy_getinfo_err_double(); \ - if(_curl_is_slist_info(_curl_info)) \ - if(!_curl_is_arr((arg), struct curl_slist *)) \ - _curl_easy_getinfo_err_curl_slist(); \ - } \ - curl_easy_getinfo(handle, _curl_info, arg); \ -}) - -/* TODO: typechecking for curl_share_setopt() and curl_multi_setopt(), - * for now just make sure that the functions are called with three - * arguments - */ -#define curl_share_setopt(share,opt,param) curl_share_setopt(share,opt,param) -#define curl_multi_setopt(handle,opt,param) curl_multi_setopt(handle,opt,param) - - -/* the actual warnings, triggered by calling the _curl_easy_setopt_err* - * functions */ - -/* To define a new warning, use _CURL_WARNING(identifier, "message") */ -#define _CURL_WARNING(id, message) \ - static void __attribute__((__warning__(message))) \ - __attribute__((__unused__)) __attribute__((__noinline__)) \ - id(void) { __asm__(""); } - -_CURL_WARNING(_curl_easy_setopt_err_long, - "curl_easy_setopt expects a long argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_curl_off_t, - "curl_easy_setopt expects a curl_off_t argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_string, - "curl_easy_setopt expects a " - "string (char* or char[]) argument for this option" - ) -_CURL_WARNING(_curl_easy_setopt_err_write_callback, - "curl_easy_setopt expects a curl_write_callback argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_read_cb, - "curl_easy_setopt expects a curl_read_callback argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_ioctl_cb, - "curl_easy_setopt expects a curl_ioctl_callback argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_sockopt_cb, - "curl_easy_setopt expects a curl_sockopt_callback argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_opensocket_cb, - "curl_easy_setopt expects a " - "curl_opensocket_callback argument for this option" - ) -_CURL_WARNING(_curl_easy_setopt_err_progress_cb, - "curl_easy_setopt expects a curl_progress_callback argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_debug_cb, - "curl_easy_setopt expects a curl_debug_callback argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_ssl_ctx_cb, - "curl_easy_setopt expects a curl_ssl_ctx_callback argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_conv_cb, - "curl_easy_setopt expects a curl_conv_callback argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_seek_cb, - "curl_easy_setopt expects a curl_seek_callback argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_cb_data, - "curl_easy_setopt expects a " - "private data pointer as argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_error_buffer, - "curl_easy_setopt expects a " - "char buffer of CURL_ERROR_SIZE as argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_FILE, - "curl_easy_setopt expects a FILE* argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_postfields, - "curl_easy_setopt expects a void* or char* argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_curl_httpost, - "curl_easy_setopt expects a struct curl_httppost* argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_curl_slist, - "curl_easy_setopt expects a struct curl_slist* argument for this option") -_CURL_WARNING(_curl_easy_setopt_err_CURLSH, - "curl_easy_setopt expects a CURLSH* argument for this option") - -_CURL_WARNING(_curl_easy_getinfo_err_string, - "curl_easy_getinfo expects a pointer to char * for this info") -_CURL_WARNING(_curl_easy_getinfo_err_long, - "curl_easy_getinfo expects a pointer to long for this info") -_CURL_WARNING(_curl_easy_getinfo_err_double, - "curl_easy_getinfo expects a pointer to double for this info") -_CURL_WARNING(_curl_easy_getinfo_err_curl_slist, - "curl_easy_getinfo expects a pointer to struct curl_slist * for this info") - -/* groups of curl_easy_setops options that take the same type of argument */ - -/* To add a new option to one of the groups, just add - * (option) == CURLOPT_SOMETHING - * to the or-expression. If the option takes a long or curl_off_t, you don't - * have to do anything - */ - -/* evaluates to true if option takes a long argument */ -#define _curl_is_long_option(option) \ - (0 < (option) && (option) < CURLOPTTYPE_OBJECTPOINT) - -#define _curl_is_off_t_option(option) \ - ((option) > CURLOPTTYPE_OFF_T) - -/* evaluates to true if option takes a char* argument */ -#define _curl_is_string_option(option) \ - ((option) == CURLOPT_URL || \ - (option) == CURLOPT_PROXY || \ - (option) == CURLOPT_INTERFACE || \ - (option) == CURLOPT_NETRC_FILE || \ - (option) == CURLOPT_USERPWD || \ - (option) == CURLOPT_USERNAME || \ - (option) == CURLOPT_PASSWORD || \ - (option) == CURLOPT_PROXYUSERPWD || \ - (option) == CURLOPT_PROXYUSERNAME || \ - (option) == CURLOPT_PROXYPASSWORD || \ - (option) == CURLOPT_NOPROXY || \ - (option) == CURLOPT_ACCEPT_ENCODING || \ - (option) == CURLOPT_REFERER || \ - (option) == CURLOPT_USERAGENT || \ - (option) == CURLOPT_COOKIE || \ - (option) == CURLOPT_COOKIEFILE || \ - (option) == CURLOPT_COOKIEJAR || \ - (option) == CURLOPT_COOKIELIST || \ - (option) == CURLOPT_FTPPORT || \ - (option) == CURLOPT_FTP_ALTERNATIVE_TO_USER || \ - (option) == CURLOPT_FTP_ACCOUNT || \ - (option) == CURLOPT_RANGE || \ - (option) == CURLOPT_CUSTOMREQUEST || \ - (option) == CURLOPT_SSLCERT || \ - (option) == CURLOPT_SSLCERTTYPE || \ - (option) == CURLOPT_SSLKEY || \ - (option) == CURLOPT_SSLKEYTYPE || \ - (option) == CURLOPT_KEYPASSWD || \ - (option) == CURLOPT_SSLENGINE || \ - (option) == CURLOPT_CAINFO || \ - (option) == CURLOPT_CAPATH || \ - (option) == CURLOPT_RANDOM_FILE || \ - (option) == CURLOPT_EGDSOCKET || \ - (option) == CURLOPT_SSL_CIPHER_LIST || \ - (option) == CURLOPT_KRBLEVEL || \ - (option) == CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 || \ - (option) == CURLOPT_SSH_PUBLIC_KEYFILE || \ - (option) == CURLOPT_SSH_PRIVATE_KEYFILE || \ - (option) == CURLOPT_CRLFILE || \ - (option) == CURLOPT_ISSUERCERT || \ - (option) == CURLOPT_SOCKS5_GSSAPI_SERVICE || \ - (option) == CURLOPT_SSH_KNOWNHOSTS || \ - (option) == CURLOPT_MAIL_FROM || \ - (option) == CURLOPT_RTSP_SESSION_ID || \ - (option) == CURLOPT_RTSP_STREAM_URI || \ - (option) == CURLOPT_RTSP_TRANSPORT || \ - (option) == CURLOPT_XOAUTH2_BEARER || \ - (option) == CURLOPT_DNS_SERVERS || \ - (option) == CURLOPT_DNS_INTERFACE || \ - (option) == CURLOPT_DNS_LOCAL_IP4 || \ - (option) == CURLOPT_DNS_LOCAL_IP6 || \ - (option) == CURLOPT_LOGIN_OPTIONS || \ - 0) - -/* evaluates to true if option takes a curl_write_callback argument */ -#define _curl_is_write_cb_option(option) \ - ((option) == CURLOPT_HEADERFUNCTION || \ - (option) == CURLOPT_WRITEFUNCTION) - -/* evaluates to true if option takes a curl_conv_callback argument */ -#define _curl_is_conv_cb_option(option) \ - ((option) == CURLOPT_CONV_TO_NETWORK_FUNCTION || \ - (option) == CURLOPT_CONV_FROM_NETWORK_FUNCTION || \ - (option) == CURLOPT_CONV_FROM_UTF8_FUNCTION) - -/* evaluates to true if option takes a data argument to pass to a callback */ -#define _curl_is_cb_data_option(option) \ - ((option) == CURLOPT_WRITEDATA || \ - (option) == CURLOPT_READDATA || \ - (option) == CURLOPT_IOCTLDATA || \ - (option) == CURLOPT_SOCKOPTDATA || \ - (option) == CURLOPT_OPENSOCKETDATA || \ - (option) == CURLOPT_PROGRESSDATA || \ - (option) == CURLOPT_WRITEHEADER || \ - (option) == CURLOPT_DEBUGDATA || \ - (option) == CURLOPT_SSL_CTX_DATA || \ - (option) == CURLOPT_SEEKDATA || \ - (option) == CURLOPT_PRIVATE || \ - (option) == CURLOPT_SSH_KEYDATA || \ - (option) == CURLOPT_INTERLEAVEDATA || \ - (option) == CURLOPT_CHUNK_DATA || \ - (option) == CURLOPT_FNMATCH_DATA || \ - 0) - -/* evaluates to true if option takes a POST data argument (void* or char*) */ -#define _curl_is_postfields_option(option) \ - ((option) == CURLOPT_POSTFIELDS || \ - (option) == CURLOPT_COPYPOSTFIELDS || \ - 0) - -/* evaluates to true if option takes a struct curl_slist * argument */ -#define _curl_is_slist_option(option) \ - ((option) == CURLOPT_HTTPHEADER || \ - (option) == CURLOPT_HTTP200ALIASES || \ - (option) == CURLOPT_QUOTE || \ - (option) == CURLOPT_POSTQUOTE || \ - (option) == CURLOPT_PREQUOTE || \ - (option) == CURLOPT_TELNETOPTIONS || \ - (option) == CURLOPT_MAIL_RCPT || \ - 0) - -/* groups of curl_easy_getinfo infos that take the same type of argument */ - -/* evaluates to true if info expects a pointer to char * argument */ -#define _curl_is_string_info(info) \ - (CURLINFO_STRING < (info) && (info) < CURLINFO_LONG) - -/* evaluates to true if info expects a pointer to long argument */ -#define _curl_is_long_info(info) \ - (CURLINFO_LONG < (info) && (info) < CURLINFO_DOUBLE) - -/* evaluates to true if info expects a pointer to double argument */ -#define _curl_is_double_info(info) \ - (CURLINFO_DOUBLE < (info) && (info) < CURLINFO_SLIST) - -/* true if info expects a pointer to struct curl_slist * argument */ -#define _curl_is_slist_info(info) \ - (CURLINFO_SLIST < (info)) - - -/* typecheck helpers -- check whether given expression has requested type*/ - -/* For pointers, you can use the _curl_is_ptr/_curl_is_arr macros, - * otherwise define a new macro. Search for __builtin_types_compatible_p - * in the GCC manual. - * NOTE: these macros MUST NOT EVALUATE their arguments! The argument is - * the actual expression passed to the curl_easy_setopt macro. This - * means that you can only apply the sizeof and __typeof__ operators, no - * == or whatsoever. - */ - -/* XXX: should evaluate to true iff expr is a pointer */ -#define _curl_is_any_ptr(expr) \ - (sizeof(expr) == sizeof(void*)) - -/* evaluates to true if expr is NULL */ -/* XXX: must not evaluate expr, so this check is not accurate */ -#define _curl_is_NULL(expr) \ - (__builtin_types_compatible_p(__typeof__(expr), __typeof__(NULL))) - -/* evaluates to true if expr is type*, const type* or NULL */ -#define _curl_is_ptr(expr, type) \ - (_curl_is_NULL(expr) || \ - __builtin_types_compatible_p(__typeof__(expr), type *) || \ - __builtin_types_compatible_p(__typeof__(expr), const type *)) - -/* evaluates to true if expr is one of type[], type*, NULL or const type* */ -#define _curl_is_arr(expr, type) \ - (_curl_is_ptr((expr), type) || \ - __builtin_types_compatible_p(__typeof__(expr), type [])) - -/* evaluates to true if expr is a string */ -#define _curl_is_string(expr) \ - (_curl_is_arr((expr), char) || \ - _curl_is_arr((expr), signed char) || \ - _curl_is_arr((expr), unsigned char)) - -/* evaluates to true if expr is a long (no matter the signedness) - * XXX: for now, int is also accepted (and therefore short and char, which - * are promoted to int when passed to a variadic function) */ -#define _curl_is_long(expr) \ - (__builtin_types_compatible_p(__typeof__(expr), long) || \ - __builtin_types_compatible_p(__typeof__(expr), signed long) || \ - __builtin_types_compatible_p(__typeof__(expr), unsigned long) || \ - __builtin_types_compatible_p(__typeof__(expr), int) || \ - __builtin_types_compatible_p(__typeof__(expr), signed int) || \ - __builtin_types_compatible_p(__typeof__(expr), unsigned int) || \ - __builtin_types_compatible_p(__typeof__(expr), short) || \ - __builtin_types_compatible_p(__typeof__(expr), signed short) || \ - __builtin_types_compatible_p(__typeof__(expr), unsigned short) || \ - __builtin_types_compatible_p(__typeof__(expr), char) || \ - __builtin_types_compatible_p(__typeof__(expr), signed char) || \ - __builtin_types_compatible_p(__typeof__(expr), unsigned char)) - -/* evaluates to true if expr is of type curl_off_t */ -#define _curl_is_off_t(expr) \ - (__builtin_types_compatible_p(__typeof__(expr), curl_off_t)) - -/* evaluates to true if expr is abuffer suitable for CURLOPT_ERRORBUFFER */ -/* XXX: also check size of an char[] array? */ -#define _curl_is_error_buffer(expr) \ - (_curl_is_NULL(expr) || \ - __builtin_types_compatible_p(__typeof__(expr), char *) || \ - __builtin_types_compatible_p(__typeof__(expr), char[])) - -/* evaluates to true if expr is of type (const) void* or (const) FILE* */ -#if 0 -#define _curl_is_cb_data(expr) \ - (_curl_is_ptr((expr), void) || \ - _curl_is_ptr((expr), FILE)) -#else /* be less strict */ -#define _curl_is_cb_data(expr) \ - _curl_is_any_ptr(expr) -#endif - -/* evaluates to true if expr is of type FILE* */ -#define _curl_is_FILE(expr) \ - (__builtin_types_compatible_p(__typeof__(expr), FILE *)) - -/* evaluates to true if expr can be passed as POST data (void* or char*) */ -#define _curl_is_postfields(expr) \ - (_curl_is_ptr((expr), void) || \ - _curl_is_arr((expr), char)) - -/* FIXME: the whole callback checking is messy... - * The idea is to tolerate char vs. void and const vs. not const - * pointers in arguments at least - */ -/* helper: __builtin_types_compatible_p distinguishes between functions and - * function pointers, hide it */ -#define _curl_callback_compatible(func, type) \ - (__builtin_types_compatible_p(__typeof__(func), type) || \ - __builtin_types_compatible_p(__typeof__(func), type*)) - -/* evaluates to true if expr is of type curl_read_callback or "similar" */ -#define _curl_is_read_cb(expr) \ - (_curl_is_NULL(expr) || \ - __builtin_types_compatible_p(__typeof__(expr), __typeof__(fread)) || \ - __builtin_types_compatible_p(__typeof__(expr), curl_read_callback) || \ - _curl_callback_compatible((expr), _curl_read_callback1) || \ - _curl_callback_compatible((expr), _curl_read_callback2) || \ - _curl_callback_compatible((expr), _curl_read_callback3) || \ - _curl_callback_compatible((expr), _curl_read_callback4) || \ - _curl_callback_compatible((expr), _curl_read_callback5) || \ - _curl_callback_compatible((expr), _curl_read_callback6)) -typedef size_t (_curl_read_callback1)(char *, size_t, size_t, void*); -typedef size_t (_curl_read_callback2)(char *, size_t, size_t, const void*); -typedef size_t (_curl_read_callback3)(char *, size_t, size_t, FILE*); -typedef size_t (_curl_read_callback4)(void *, size_t, size_t, void*); -typedef size_t (_curl_read_callback5)(void *, size_t, size_t, const void*); -typedef size_t (_curl_read_callback6)(void *, size_t, size_t, FILE*); - -/* evaluates to true if expr is of type curl_write_callback or "similar" */ -#define _curl_is_write_cb(expr) \ - (_curl_is_read_cb(expr) || \ - __builtin_types_compatible_p(__typeof__(expr), __typeof__(fwrite)) || \ - __builtin_types_compatible_p(__typeof__(expr), curl_write_callback) || \ - _curl_callback_compatible((expr), _curl_write_callback1) || \ - _curl_callback_compatible((expr), _curl_write_callback2) || \ - _curl_callback_compatible((expr), _curl_write_callback3) || \ - _curl_callback_compatible((expr), _curl_write_callback4) || \ - _curl_callback_compatible((expr), _curl_write_callback5) || \ - _curl_callback_compatible((expr), _curl_write_callback6)) -typedef size_t (_curl_write_callback1)(const char *, size_t, size_t, void*); -typedef size_t (_curl_write_callback2)(const char *, size_t, size_t, - const void*); -typedef size_t (_curl_write_callback3)(const char *, size_t, size_t, FILE*); -typedef size_t (_curl_write_callback4)(const void *, size_t, size_t, void*); -typedef size_t (_curl_write_callback5)(const void *, size_t, size_t, - const void*); -typedef size_t (_curl_write_callback6)(const void *, size_t, size_t, FILE*); - -/* evaluates to true if expr is of type curl_ioctl_callback or "similar" */ -#define _curl_is_ioctl_cb(expr) \ - (_curl_is_NULL(expr) || \ - __builtin_types_compatible_p(__typeof__(expr), curl_ioctl_callback) || \ - _curl_callback_compatible((expr), _curl_ioctl_callback1) || \ - _curl_callback_compatible((expr), _curl_ioctl_callback2) || \ - _curl_callback_compatible((expr), _curl_ioctl_callback3) || \ - _curl_callback_compatible((expr), _curl_ioctl_callback4)) -typedef curlioerr (_curl_ioctl_callback1)(CURL *, int, void*); -typedef curlioerr (_curl_ioctl_callback2)(CURL *, int, const void*); -typedef curlioerr (_curl_ioctl_callback3)(CURL *, curliocmd, void*); -typedef curlioerr (_curl_ioctl_callback4)(CURL *, curliocmd, const void*); - -/* evaluates to true if expr is of type curl_sockopt_callback or "similar" */ -#define _curl_is_sockopt_cb(expr) \ - (_curl_is_NULL(expr) || \ - __builtin_types_compatible_p(__typeof__(expr), curl_sockopt_callback) || \ - _curl_callback_compatible((expr), _curl_sockopt_callback1) || \ - _curl_callback_compatible((expr), _curl_sockopt_callback2)) -typedef int (_curl_sockopt_callback1)(void *, curl_socket_t, curlsocktype); -typedef int (_curl_sockopt_callback2)(const void *, curl_socket_t, - curlsocktype); - -/* evaluates to true if expr is of type curl_opensocket_callback or - "similar" */ -#define _curl_is_opensocket_cb(expr) \ - (_curl_is_NULL(expr) || \ - __builtin_types_compatible_p(__typeof__(expr), curl_opensocket_callback) ||\ - _curl_callback_compatible((expr), _curl_opensocket_callback1) || \ - _curl_callback_compatible((expr), _curl_opensocket_callback2) || \ - _curl_callback_compatible((expr), _curl_opensocket_callback3) || \ - _curl_callback_compatible((expr), _curl_opensocket_callback4)) -typedef curl_socket_t (_curl_opensocket_callback1) - (void *, curlsocktype, struct curl_sockaddr *); -typedef curl_socket_t (_curl_opensocket_callback2) - (void *, curlsocktype, const struct curl_sockaddr *); -typedef curl_socket_t (_curl_opensocket_callback3) - (const void *, curlsocktype, struct curl_sockaddr *); -typedef curl_socket_t (_curl_opensocket_callback4) - (const void *, curlsocktype, const struct curl_sockaddr *); - -/* evaluates to true if expr is of type curl_progress_callback or "similar" */ -#define _curl_is_progress_cb(expr) \ - (_curl_is_NULL(expr) || \ - __builtin_types_compatible_p(__typeof__(expr), curl_progress_callback) || \ - _curl_callback_compatible((expr), _curl_progress_callback1) || \ - _curl_callback_compatible((expr), _curl_progress_callback2)) -typedef int (_curl_progress_callback1)(void *, - double, double, double, double); -typedef int (_curl_progress_callback2)(const void *, - double, double, double, double); - -/* evaluates to true if expr is of type curl_debug_callback or "similar" */ -#define _curl_is_debug_cb(expr) \ - (_curl_is_NULL(expr) || \ - __builtin_types_compatible_p(__typeof__(expr), curl_debug_callback) || \ - _curl_callback_compatible((expr), _curl_debug_callback1) || \ - _curl_callback_compatible((expr), _curl_debug_callback2) || \ - _curl_callback_compatible((expr), _curl_debug_callback3) || \ - _curl_callback_compatible((expr), _curl_debug_callback4) || \ - _curl_callback_compatible((expr), _curl_debug_callback5) || \ - _curl_callback_compatible((expr), _curl_debug_callback6) || \ - _curl_callback_compatible((expr), _curl_debug_callback7) || \ - _curl_callback_compatible((expr), _curl_debug_callback8)) -typedef int (_curl_debug_callback1) (CURL *, - curl_infotype, char *, size_t, void *); -typedef int (_curl_debug_callback2) (CURL *, - curl_infotype, char *, size_t, const void *); -typedef int (_curl_debug_callback3) (CURL *, - curl_infotype, const char *, size_t, void *); -typedef int (_curl_debug_callback4) (CURL *, - curl_infotype, const char *, size_t, const void *); -typedef int (_curl_debug_callback5) (CURL *, - curl_infotype, unsigned char *, size_t, void *); -typedef int (_curl_debug_callback6) (CURL *, - curl_infotype, unsigned char *, size_t, const void *); -typedef int (_curl_debug_callback7) (CURL *, - curl_infotype, const unsigned char *, size_t, void *); -typedef int (_curl_debug_callback8) (CURL *, - curl_infotype, const unsigned char *, size_t, const void *); - -/* evaluates to true if expr is of type curl_ssl_ctx_callback or "similar" */ -/* this is getting even messier... */ -#define _curl_is_ssl_ctx_cb(expr) \ - (_curl_is_NULL(expr) || \ - __builtin_types_compatible_p(__typeof__(expr), curl_ssl_ctx_callback) || \ - _curl_callback_compatible((expr), _curl_ssl_ctx_callback1) || \ - _curl_callback_compatible((expr), _curl_ssl_ctx_callback2) || \ - _curl_callback_compatible((expr), _curl_ssl_ctx_callback3) || \ - _curl_callback_compatible((expr), _curl_ssl_ctx_callback4) || \ - _curl_callback_compatible((expr), _curl_ssl_ctx_callback5) || \ - _curl_callback_compatible((expr), _curl_ssl_ctx_callback6) || \ - _curl_callback_compatible((expr), _curl_ssl_ctx_callback7) || \ - _curl_callback_compatible((expr), _curl_ssl_ctx_callback8)) -typedef CURLcode (_curl_ssl_ctx_callback1)(CURL *, void *, void *); -typedef CURLcode (_curl_ssl_ctx_callback2)(CURL *, void *, const void *); -typedef CURLcode (_curl_ssl_ctx_callback3)(CURL *, const void *, void *); -typedef CURLcode (_curl_ssl_ctx_callback4)(CURL *, const void *, const void *); -#ifdef HEADER_SSL_H -/* hack: if we included OpenSSL's ssl.h, we know about SSL_CTX - * this will of course break if we're included before OpenSSL headers... - */ -typedef CURLcode (_curl_ssl_ctx_callback5)(CURL *, SSL_CTX, void *); -typedef CURLcode (_curl_ssl_ctx_callback6)(CURL *, SSL_CTX, const void *); -typedef CURLcode (_curl_ssl_ctx_callback7)(CURL *, const SSL_CTX, void *); -typedef CURLcode (_curl_ssl_ctx_callback8)(CURL *, const SSL_CTX, - const void *); -#else -typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback5; -typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback6; -typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback7; -typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback8; -#endif - -/* evaluates to true if expr is of type curl_conv_callback or "similar" */ -#define _curl_is_conv_cb(expr) \ - (_curl_is_NULL(expr) || \ - __builtin_types_compatible_p(__typeof__(expr), curl_conv_callback) || \ - _curl_callback_compatible((expr), _curl_conv_callback1) || \ - _curl_callback_compatible((expr), _curl_conv_callback2) || \ - _curl_callback_compatible((expr), _curl_conv_callback3) || \ - _curl_callback_compatible((expr), _curl_conv_callback4)) -typedef CURLcode (*_curl_conv_callback1)(char *, size_t length); -typedef CURLcode (*_curl_conv_callback2)(const char *, size_t length); -typedef CURLcode (*_curl_conv_callback3)(void *, size_t length); -typedef CURLcode (*_curl_conv_callback4)(const void *, size_t length); - -/* evaluates to true if expr is of type curl_seek_callback or "similar" */ -#define _curl_is_seek_cb(expr) \ - (_curl_is_NULL(expr) || \ - __builtin_types_compatible_p(__typeof__(expr), curl_seek_callback) || \ - _curl_callback_compatible((expr), _curl_seek_callback1) || \ - _curl_callback_compatible((expr), _curl_seek_callback2)) -typedef CURLcode (*_curl_seek_callback1)(void *, curl_off_t, int); -typedef CURLcode (*_curl_seek_callback2)(const void *, curl_off_t, int); - - -#endif /* __CURL_TYPECHECK_GCC_H */ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/Makefile.am opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/Makefile.am --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/Makefile.am 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -SUBDIRS = curl - -EXTRA_DIST = README - -AUTOMAKE_OPTIONS = foreign no-dependencies diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/Makefile.in opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/Makefile.in --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/Makefile.in 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,690 +0,0 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = include -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs README -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/curl-compilers.m4 \ - $(top_srcdir)/m4/curl-confopts.m4 \ - $(top_srcdir)/m4/curl-functions.m4 \ - $(top_srcdir)/m4/curl-openssl.m4 \ - $(top_srcdir)/m4/curl-override.m4 \ - $(top_srcdir)/m4/curl-reentrant.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/xc-am-iface.m4 \ - $(top_srcdir)/m4/xc-cc-check.m4 \ - $(top_srcdir)/m4/xc-lt-iface.m4 \ - $(top_srcdir)/m4/xc-translit.m4 \ - $(top_srcdir)/m4/xc-val-flgs.m4 \ - $(top_srcdir)/m4/zz40-xc-ovr.m4 \ - $(top_srcdir)/m4/zz50-xc-ovr.m4 \ - $(top_srcdir)/m4/zz60-xc-ovr.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/lib/curl_config.h \ - $(top_builddir)/include/curl/curlbuild.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -depcomp = -am__depfiles_maybe = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -am__recursive_targets = \ - $(RECURSIVE_TARGETS) \ - $(RECURSIVE_CLEAN_TARGETS) \ - $(am__extra_recursive_targets) -AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AS = @AS@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BLANK_AT_MAKETIME = @BLANK_AT_MAKETIME@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@ -CONFIGURE_OPTIONS = @CONFIGURE_OPTIONS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPFLAG_CURL_STATICLIB = @CPPFLAG_CURL_STATICLIB@ -CURLVERSION = @CURLVERSION@ -CURL_CA_BUNDLE = @CURL_CA_BUNDLE@ -CURL_CFLAG_EXTRAS = @CURL_CFLAG_EXTRAS@ -CURL_DISABLE_DICT = @CURL_DISABLE_DICT@ -CURL_DISABLE_FILE = @CURL_DISABLE_FILE@ -CURL_DISABLE_FTP = @CURL_DISABLE_FTP@ -CURL_DISABLE_GOPHER = @CURL_DISABLE_GOPHER@ -CURL_DISABLE_HTTP = @CURL_DISABLE_HTTP@ -CURL_DISABLE_IMAP = @CURL_DISABLE_IMAP@ -CURL_DISABLE_LDAP = @CURL_DISABLE_LDAP@ -CURL_DISABLE_LDAPS = @CURL_DISABLE_LDAPS@ -CURL_DISABLE_POP3 = @CURL_DISABLE_POP3@ -CURL_DISABLE_PROXY = @CURL_DISABLE_PROXY@ -CURL_DISABLE_RTSP = @CURL_DISABLE_RTSP@ -CURL_DISABLE_SMTP = @CURL_DISABLE_SMTP@ -CURL_DISABLE_TELNET = @CURL_DISABLE_TELNET@ -CURL_DISABLE_TFTP = @CURL_DISABLE_TFTP@ -CURL_LT_SHLIB_VERSIONED_FLAVOUR = @CURL_LT_SHLIB_VERSIONED_FLAVOUR@ -CURL_NETWORK_AND_TIME_LIBS = @CURL_NETWORK_AND_TIME_LIBS@ -CURL_NETWORK_LIBS = @CURL_NETWORK_LIBS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -ENABLE_SHARED = @ENABLE_SHARED@ -ENABLE_STATIC = @ENABLE_STATIC@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -HAVE_GNUTLS_SRP = @HAVE_GNUTLS_SRP@ -HAVE_LDAP_SSL = @HAVE_LDAP_SSL@ -HAVE_LIBZ = @HAVE_LIBZ@ -HAVE_SSLEAY_SRP = @HAVE_SSLEAY_SRP@ -IDN_ENABLED = @IDN_ENABLED@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -IPV6_ENABLED = @IPV6_ENABLED@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBCURL_LIBS = @LIBCURL_LIBS@ -LIBMETALINK_CPPFLAGS = @LIBMETALINK_CPPFLAGS@ -LIBMETALINK_LDFLAGS = @LIBMETALINK_LDFLAGS@ -LIBMETALINK_LIBS = @LIBMETALINK_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MANOPT = @MANOPT@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -NROFF = @NROFF@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PERL = @PERL@ -PKGADD_NAME = @PKGADD_NAME@ -PKGADD_PKG = @PKGADD_PKG@ -PKGADD_VENDOR = @PKGADD_VENDOR@ -PKGCONFIG = @PKGCONFIG@ -RANDOM_FILE = @RANDOM_FILE@ -RANLIB = @RANLIB@ -REQUIRE_LIB_DEPS = @REQUIRE_LIB_DEPS@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SSL_ENABLED = @SSL_ENABLED@ -STRIP = @STRIP@ -SUPPORT_FEATURES = @SUPPORT_FEATURES@ -SUPPORT_PROTOCOLS = @SUPPORT_PROTOCOLS@ -USE_ARES = @USE_ARES@ -USE_AXTLS = @USE_AXTLS@ -USE_CYASSL = @USE_CYASSL@ -USE_DARWINSSL = @USE_DARWINSSL@ -USE_GNUTLS = @USE_GNUTLS@ -USE_GNUTLS_NETTLE = @USE_GNUTLS_NETTLE@ -USE_LIBRTMP = @USE_LIBRTMP@ -USE_LIBSSH2 = @USE_LIBSSH2@ -USE_NGHTTP2 = @USE_NGHTTP2@ -USE_NSS = @USE_NSS@ -USE_OPENLDAP = @USE_OPENLDAP@ -USE_POLARSSL = @USE_POLARSSL@ -USE_SCHANNEL = @USE_SCHANNEL@ -USE_SSLEAY = @USE_SSLEAY@ -USE_WINDOWS_SSPI = @USE_WINDOWS_SSPI@ -VERSION = @VERSION@ -VERSIONNUM = @VERSIONNUM@ -ZLIB_LIBS = @ZLIB_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -libext = @libext@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -subdirs = @subdirs@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -SUBDIRS = curl -EXTRA_DIST = README -AUTOMAKE_OPTIONS = foreign no-dependencies -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign include/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -# This directory's subdirectories are mostly independent; you can cd -# into them and run 'make' without going through this Makefile. -# To change the values of 'make' variables: instead of editing Makefiles, -# (1) if the variable is set in 'config.status', edit 'config.status' -# (which will cause the Makefiles to be regenerated when you run 'make'); -# (2) otherwise, pass the desired values on the 'make' command line. -$(am__recursive_targets): - @fail=; \ - if $(am__make_keepgoing); then \ - failcom='fail=yes'; \ - else \ - failcom='exit 1'; \ - fi; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-recursive -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-recursive - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-recursive - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - $(am__make_dryrun) \ - || test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-libtool mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -html-am: - -info: info-recursive - -info-am: - -install-data-am: - -install-dvi: install-dvi-recursive - -install-dvi-am: - -install-exec-am: - -install-html: install-html-recursive - -install-html-am: - -install-info: install-info-recursive - -install-info-am: - -install-man: - -install-pdf: install-pdf-recursive - -install-pdf-am: - -install-ps: install-ps-recursive - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic mostlyclean-libtool - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: - -.MAKE: $(am__recursive_targets) install-am install-strip - -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ - check-am clean clean-generic clean-libtool cscopelist-am ctags \ - ctags-am distclean distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-am uninstall uninstall-am - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/README opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/README --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/include/README 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/include/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ - \___|\___/|_| \_\_____| - -Include files for libcurl, external users. - -They're all placed in the curl subdirectory here for better fit in any kind -of environment. You must include files from here using... - - #include - -... style and point the compiler's include path to the directory holding the -curl subdirectory. It makes it more likely to survive future modifications. - -NOTE FOR LIBCURL HACKERS - -The following notes apply to libcurl version 7.19.0 and later. - -* The distributed curl/curlbuild.h file is only intended to be used on systems - which can not run the also distributed configure script. - -* The distributed curlbuild.h file is generated as a copy of curlbuild.h.dist - when the libcurl source code distribution archive file is originally created. - -* If you check out from git on a non-configure platform, you must run the - appropriate buildconf* script to set up curlbuild.h and other local files - before being able of compiling the library. - -* On systems capable of running the configure script, the configure process - will overwrite the distributed include/curl/curlbuild.h file with one that - is suitable and specific to the library being configured and built, which - is generated from the include/curl/curlbuild.h.in template file. - -* If you intend to distribute an already compiled libcurl library you _MUST_ - also distribute along with it the generated curl/curlbuild.h which has been - used to compile it. Otherwise the library will be of no use for the users of - the library that you have built. It is _your_ responsibility to provide this - file. No one at the cURL project can know how you have built the library. - -* File curl/curlbuild.h includes platform and configuration dependent info, - and must not be modified by anyone. Configure script generates it for you. - -* We cannot assume anything else but very basic compiler features being - present. While libcurl requires an ANSI C compiler to build, some of the - earlier ANSI compilers clearly can't deal with some preprocessor operators. - -* Newlines must remain unix-style for older compilers' sake. - -* Comments must be written in the old-style /* unnested C-fashion */ - -To figure out how to do good and portable checks for features, operating -systems or specific hardwarare, a very good resource is Bjorn Reese's -collection at http://predef.sf.net/ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/panel.cpp opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/panel.cpp --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/panel.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/panel.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,211 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: panel.cpp -// Purpose: wxCurlConnectionSettingsPanel -// Author: Francesco Montorsi -// Created: 2007/05/5 -// RCS-ID: $Id: panel.cpp 1240 2010-03-10 23:54:25Z frm $ -// Copyright: (c) 2007 Francesco Montorsi -// Licence: wxWidgets licence -///////////////////////////////////////////////////////////////////////////// - - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -// includes -#ifndef WX_PRECOMP - #include - #include // for _() support - #include // for wxMilliSleep - - #if wxUSE_GUI - #include - #include - #include - #include - #include - #include - #include - #include - #endif -#endif - -#ifdef __WXMSW__ - #include // useful to catch memory leaks when compiling under MSVC -#endif - -#include -#include -#include -#include "wx/curl/panel.h" - - -// ---------------------------------------------------------------------------- -// wxCurlConnectionSettingsPanel -// ---------------------------------------------------------------------------- - -enum -{ - UseProxy = wxID_HIGHEST+1 -}; - -IMPLEMENT_DYNAMIC_CLASS( wxCurlConnectionSettingsPanel, wxPanel ) -BEGIN_EVENT_TABLE( wxCurlConnectionSettingsPanel, wxPanel ) - EVT_CHECKBOX( UseProxy, wxCurlConnectionSettingsPanel::OnUseProxy ) -END_EVENT_TABLE() - -bool wxCurlConnectionSettingsPanel::Create(wxWindow* parent, wxWindowID id, - const wxString &msg, - const wxPoint& pos, const wxSize& size, - long style, const wxString& name) -{ - if (!wxPanel::Create(parent, id, pos, size, style, name)) - return false; - - // set up our controls - CreateControls(msg); - - if (GetMinSize().GetWidth() < 250) - SetMinSize(wxSize(250, -1)); - - return true; -} - -#define BORDER 5 - -wxTextCtrl *wxCurlConnectionSettingsPanel::AddSizerRow(wxSizer *sz, const wxString &name, bool grow) -{ - // the static text - wxStaticText *st = new wxStaticText( this, wxID_STATIC, name, wxDefaultPosition, wxDefaultSize ); - - // the value - wxTextCtrl *ret = new wxTextCtrl( this, wxID_ANY ); - - long flags = wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT; - sz->Add(st, 0, flags, BORDER); - sz->Add(ret, 1, grow ? flags|wxGROW : flags, BORDER); - - return ret; -} - -void wxCurlConnectionSettingsPanel::CreateControls(const wxString &msg) -{ - wxBoxSizer* main = new wxBoxSizer(wxVERTICAL); - - // message row - if (!msg.IsEmpty()) - { - wxStaticText *st = new wxStaticText( this, wxID_STATIC, msg ); - main->Add(st, 0, wxLEFT|wxTOP|wxRIGHT|wxBOTTOM|wxGROW, BORDER); - } - - wxFlexGridSizer *gs = new wxFlexGridSizer(0 /* calc automatically the # of rows */, 2, 0, 0); - - // authentication options - if (HasFlag(wxCCSP_AUTHENTICATION_OPTIONS)) - { - m_pUsername = AddSizerRow(gs, _("Username:")); - m_pPassword = AddSizerRow(gs, _("Password:")); - gs->AddStretchSpacer(1); - gs->AddStretchSpacer(1); - } - - // port options - if (HasFlag(wxCCSP_PORT_OPTION)) - { - m_pPort = AddSizerRow(gs, _("Port:"), false); - gs->AddStretchSpacer(1); - gs->AddStretchSpacer(1); - - m_pPort->SetValue(wxS("-1")); - } - - // column 1 contains the text controls: - gs->AddGrowableCol(1); - main->Add(gs, 1, wxGROW|wxALL, BORDER); - - // proxy options - if (HasFlag(wxCCSP_PROXY_OPTIONS)) - { - wxSizer* proxy = new wxStaticBoxSizer(wxVERTICAL, this, wxS("Proxy settings")); - - m_pProxyCheckBox = new wxCheckBox(this, UseProxy, wxS("Use proxy")); - m_pProxyCheckBox->SetValue(false); - proxy->Add(m_pProxyCheckBox, 0, wxLEFT|wxTOP, BORDER); - - wxFlexGridSizer *gs = new wxFlexGridSizer(0 /* calc automatically the # of rows */, 2, 0, 0); - m_pProxyHost = AddSizerRow(gs, _("Proxy host:")); - m_pProxyUsername = AddSizerRow(gs, _("Proxy username:")); - m_pProxyPassword = AddSizerRow(gs, _("Proxy password:")); - m_pProxyPort = AddSizerRow(gs, _("Proxy port:"), false); - m_pProxyPort->SetValue(wxS("-1")); - proxy->Add(gs, 0, wxGROW|wxALL, BORDER); - - // column 1 contains the text controls: - gs->AddGrowableCol(1); - - main->AddSpacer(10); - main->Add(proxy, 0, wxGROW|wxLEFT|wxRIGHT, BORDER); -#if wxCHECK_VERSION(2,9,0) - main->AddStretchSpacer(1); -#endif - - // be default disable the proxy controls - wxCommandEvent fake; - fake.SetInt(0); - OnUseProxy(fake); - } - - this->SetSizerAndFit(main); - main->SetSizeHints(this); -} - -void wxCurlConnectionSettingsPanel::SetCURLOptions(wxCurlBase *p) -{ - wxASSERT(p); - - if (HasFlag(wxCCSP_PORT_OPTION)) - { - long port = -1; // -1 tell libCURL to use the default port - m_pPort->GetValue().ToLong(&port); - p->SetPort(port); - } - - if (HasFlag(wxCCSP_AUTHENTICATION_OPTIONS)) - { - p->SetUsername(m_pUsername->GetValue()); - p->SetPassword(m_pPassword->GetValue()); - } - - if (HasFlag(wxCCSP_PROXY_OPTIONS)) - { - p->UseProxy(m_pProxyCheckBox->GetValue()); - - p->SetProxyHost(m_pProxyHost->GetValue()); - p->SetProxyUsername(m_pProxyUsername->GetValue()); - p->SetProxyPassword(m_pProxyPassword->GetValue()); - - long port = -1; // -1 tell libCURL to use the default port - m_pProxyPort->GetValue().ToLong(&port); - p->SetProxyPort(port); - } -} - - -// ---------------------------------------------------------------------------- -// wxCurlConnectionSettingsPanel - button events -// ---------------------------------------------------------------------------- - -void wxCurlConnectionSettingsPanel::OnUseProxy(wxCommandEvent &ev) -{ - m_pProxyHost->Enable(ev.IsChecked()); - m_pProxyUsername->Enable(ev.IsChecked()); - m_pProxyPassword->Enable(ev.IsChecked()); - m_pProxyPort->Enable(ev.IsChecked()); -} - - diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/telnet.cpp opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/telnet.cpp --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/telnet.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/telnet.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,44 +0,0 @@ -/* - * telnet.cpp - * wxCURL - * - * Created by Casey O'Donnell on Tue Jun 29 2004. - * Copyright (c) 2004 Casey O'Donnell. All rights reserved. - * - * - * Licence: wxWidgets Licence - */ - -// telnet.cpp: implementation of the wxCurlTelnet class. -// -////////////////////////////////////////////////////////////////////// - -////////////////////////////////////////////////////////////////////// -// Headers -////////////////////////////////////////////////////////////////////// - -#include "wx/wxprec.h" - -#ifndef WX_PRECOMP - #include "wx/wx.h" -#endif - -#ifdef __WXMSW__ - #include // useful to catch memory leaks when compiling under MSVC -#endif - -#include - -////////////////////////////////////////////////////////////////////// -// Construction/Destruction -////////////////////////////////////////////////////////////////////// - -wxCurlTelnet::wxCurlTelnet() -{ - -} - -wxCurlTelnet::~wxCurlTelnet() -{ - -} diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/thread.cpp opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/thread.cpp --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/thread.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/thread.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,361 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: thread.cpp -// Purpose: wxCurlDownloadThread, wxCurlUploadThread -// Author: Francesco Montorsi -// Created: 2007/04/14 -// RCS-ID: $Id: thread.cpp 1240 2010-03-10 23:54:25Z frm $ -// Copyright: (c) 2007 Francesco Montorsi -// Licence: wxWidgets licence -///////////////////////////////////////////////////////////////////////////// - - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -// includes -#ifndef WX_PRECOMP - #include -#endif - -#ifdef __WXMSW__ - #include // useful to catch memory leaks when compiling under MSVC -#endif - -#include -#include - -#include "wx/curl/thread.h" -#include "wx/curl/http.h" -#include "wx/curl/ftp.h" - - -// --------------------- -// wxCurlBaseThread -// --------------------- - -/* static */ -wxCurlProtocol wxCurlBaseThread::GetProtocolFromURL(const wxString &url) -{ - // I'm sure this check could be done in a better way... - if (url.StartsWith(wxS("http:")) || url.StartsWith(wxS("https:"))) - return wxCP_HTTP; - if (url.StartsWith(wxS("ftp:")) || url.StartsWith(wxS("ftps:"))) - return wxCP_FTP; - return wxCP_INVALID; -} - -/* static */ -wxCurlBase *wxCurlBaseThread::CreateHandlerFor(wxCurlProtocol prot) -{ - switch (prot) - { - case wxCP_HTTP: - return new wxCurlHTTP; - case wxCP_FTP: - return new wxCurlFTP; - - default: - return NULL; - } -} - -wxCurlThreadError wxCurlBaseThread::SetURL(const wxString &url) -{ - wxCHECK_MSG(!IsAlive(), wxCTE_NO_RESOURCE, wxS("Cannot use this function after the tranfer has begun")); - - // which protocol is required by given url? - wxCurlProtocol curr = GetProtocolFromURL(url); - if (curr == wxCP_INVALID) - return wxCTE_INVALID_PROTOCOL; - - if (curr != m_protocol) - { - m_protocol = curr; - - // we need to (re)create the m_pCurl object - wxDELETE(m_pCurl); - m_pCurl = CreateHandlerFor(m_protocol); - } - - if (!m_pCurl || !m_pCurl->IsOk()) - return wxCTE_INVALID_PROTOCOL; - - // enable event sending (it's the only way the wxCurlDownloadThread user can - // receive info about the progress of the transfer) - m_pCurl->SetEvtHandler(GetEvtHandler(), GetId()); - m_pCurl->SetFlags(wxCURL_SEND_PROGRESS_EVENTS | wxCURL_SEND_BEGINEND_EVENTS); - - m_url = url; - - return wxCTE_NO_ERROR; -} - -void wxCurlBaseThread::OnExit() -{ - if (m_pCurl->IsVerbose()) - wxLogDebug(wxS("wxCurlBaseThread - exiting")); - - wxDELETE(m_pCurl); -} - -bool wxCurlBaseThread::TestDestroy() -{ - if (wxThread::TestDestroy()) - return true; - - wxMutexLocker lock(m_bAbortMutex); - return m_bAbort; -} - -wxCurlThreadError wxCurlBaseThread::Wait() -{ - // Entry() returns 1 for success, 0 for failure - bool ret = (bool)(wxThread::Wait() != 0); - - if (m_bAbort) - // ret is false but that's not due to a network error: - // user stopped the thread through an Abort() call - return wxCTE_ABORTED; - - // if it was not user-aborted but ret is still false, then - // a network error occurred: - return ret ? wxCTE_NO_ERROR : wxCTE_CURL_ERROR; -} - -void wxCurlBaseThread::Abort() -{ - { - wxMutexLocker lock(m_bAbortMutex); - m_bAbort = true; - } - - if (IsPaused()) - Resume(); - - Wait(); // should always return wxCTE_ABORTED in this case -} - -wxCurlThreadError wxCurlBaseThread::Pause() -{ - if (m_pCurl) - m_pCurl->EndTransferSpan(); - - return (wxCurlThreadError)wxThread::Pause(); -} - -wxCurlThreadError wxCurlBaseThread::Resume() -{ - if (m_pCurl) - m_pCurl->BeginTransferSpan(); - - return (wxCurlThreadError)wxThread::Resume(); -} - - -// ----------------------------------- -// wxCurlDownloadThreadOutputFilter -// ----------------------------------- - -size_t wxCurlDownloadThreadOutputFilter::OnSysWrite(const void *buffer, size_t bufsize) -{ - // VERY IMPORTANT: we need to call TestDestroy() on the associated - // thread to make sure it can be paused/stopped (see wxThread docs) - - if (m_thread->TestDestroy()) - { - if (m_thread->m_pCurl->IsVerbose()) - wxLogDebug(wxS("[wxCURL] a wxCurlDownloadThread has been aborted - ignore following message:")); - - // returning a size != bufsize we tell libcurl to stop the tranfer - // and thus the wxCurlBase::Perform() call done (indirectly) by wxCurlDownloadThread::Entry() - // will immediately complete and we'll exit the thread. - // NOTE: we could also call wxThread::Exit() from here... but notifying libcurl - // of a "fake error" seems a better solution (allows libcurl to cleanup its internal) - return (size_t)-1; - } - - return m_stream->Write(buffer, bufsize).LastWrite(); -} - - -// --------------------- -// wxCurlDownloadThread -// --------------------- - -wxCurlThreadError wxCurlDownloadThread::SetOutputStream(wxOutputStream *out) -{ - wxCHECK_MSG(!IsAlive(), wxCTE_NO_RESOURCE, wxS("Cannot use this function after the transfer has begun")); - - if (!out) - { - if (!m_output) - { - // create a temporary file output stream - // NOTE: by default we create a wxFileOutputStream and not e.g. a wxMemoryOutputStream - // because the downloaded file may be quite large and thus we don't want to - // eat lots of RAM. Also, the hard disk should be fast enough for any download. - m_output.SetStream( new wxFileOutputStream(wxFileName::CreateTempFileName(wxS("download"))) ); - if (!m_output.IsOk()) - return wxCTE_NO_VALID_STREAM; - } - } - else - { - m_output.SetStream(out); - - // the user-provided output stream must be valid - if (!m_output.IsOk()) - return wxCTE_NO_VALID_STREAM; - } - - return wxCTE_NO_ERROR; -} - -wxCurlThreadError wxCurlDownloadThread::Download() -{ - wxCHECK_MSG(!IsAlive(), wxCTE_NO_RESOURCE, wxS("Cannot use this function after the transfer has begun")); - - // create & run this thread - wxCurlThreadError ret; - if ((ret=Create(wxCURL_THREAD_STACK_SIZE)) != wxCTE_NO_ERROR) - return ret; - if ((ret=Run()) != wxCTE_NO_ERROR) - return ret; - - return wxCTE_NO_ERROR; -} - -wxCurlThreadError wxCurlDownloadThread::Download(const wxString &url, wxOutputStream *out) -{ - wxCurlThreadError ret; - - if ((ret=SetURL(url)) != wxCTE_NO_ERROR) - return ret; - if ((ret=SetOutputStream(out)) != wxCTE_NO_ERROR) - return ret; - - return Download(); -} - -void *wxCurlDownloadThread::Entry() -{ - if (!m_pCurl || !m_pCurl->IsOk() || !m_output.IsOk()) - return NULL; - - // NOTE: the TestDestroy() function will still be called in this thread - // context by the m_output's OnSysWrite function which in turn is - // called from libcurl whenever some new data arrives - if (m_pCurl->IsVerbose()) - wxLogDebug(wxS("wxCurlDownloadThread - downloading from %s"), m_url.c_str()); - switch (m_protocol) - { - case wxCP_HTTP: - return (void*)wx_static_cast(wxCurlHTTP*, m_pCurl)->Get(m_output, m_url); - - case wxCP_FTP: - return (void*)wx_static_cast(wxCurlFTP*, m_pCurl)->Get(m_output, m_url); - - default: break; - } - - return NULL; -} - - - -// ----------------------------------- -// wxCurlUploadThreadInputFilter -// ----------------------------------- - -size_t wxCurlUploadThreadInputFilter::OnSysRead(void *buffer, size_t bufsize) -{ - // VERY IMPORTANT: we need to call TestDestroy() on the associated - // thread to make sure it can be paused/stopped (see wxThread docs) - - if (m_thread->TestDestroy()) - { - if (m_thread->m_pCurl->IsVerbose()) - wxLogDebug(wxS("[wxCURL] a wxCurlUploadThread has been aborted - ignore following message:")); - - // returning a size != bufsize we tell libcurl to stop the tranfer - // and thus the wxCurlBase::Perform() call done (indirectly) by wxCurlUploadThread::Entry() - // will immediately complete and we'll exit the thread. - // NOTE: we could also call wxThread::Exit() from here... but notifying libcurl - // of a "fake error" seems a better solution (allows libcurl to cleanup its internal) - return (size_t)-1; - } - - return m_stream->Read(buffer, bufsize).LastRead(); -} - - -// --------------------- -// wxCurlUploadThread -// --------------------- - -wxCurlThreadError wxCurlUploadThread::SetInputStream(wxInputStream *in) -{ - wxCHECK_MSG(!IsAlive(), wxCTE_NO_RESOURCE, wxS("Cannot use this function after the transfer has begun")); - - m_input.SetStream(in); - - // the user-provided input stream must be valid - if (!m_input.IsOk()) - return wxCTE_NO_VALID_STREAM; - - return wxCTE_NO_ERROR; -} - -wxCurlThreadError wxCurlUploadThread::Upload() -{ - wxCHECK_MSG(!IsAlive(), wxCTE_NO_RESOURCE, wxS("Cannot use this function after the tranfer has begun")); - - // create & run this thread - wxCurlThreadError ret; - if ((ret=Create(wxCURL_THREAD_STACK_SIZE)) != wxCTE_NO_ERROR) - return ret; - if ((ret=Run()) != wxCTE_NO_ERROR) - return ret; - - return wxCTE_NO_ERROR; -} - -wxCurlThreadError wxCurlUploadThread::Upload(const wxString &url, wxInputStream *in) -{ - wxCurlThreadError ret; - - if ((ret=SetURL(url)) != wxCTE_NO_ERROR) - return ret; - if ((ret=SetInputStream(in)) != wxCTE_NO_ERROR) - return ret; - - return Upload(); -} - -void *wxCurlUploadThread::Entry() -{ - if (!m_pCurl || !m_pCurl->IsOk() || !m_input.IsOk()) - return NULL; - - // NOTE: the TestDestroy() function will still be called in this thread - // context by the m_output's OnSysWrite function which in turn is - // called from libcurl whenever some new data arrives - if (m_pCurl->IsVerbose()) - wxLogDebug(wxS("wxCurlUploadThread - uploading to %s"), m_url.c_str()); - switch (m_protocol) - { - case wxCP_HTTP: - return (void*)wx_static_cast(wxCurlHTTP*, m_pCurl)->Put(m_input, m_url); - - case wxCP_FTP: - return (void*)wx_static_cast(wxCurlFTP*, m_pCurl)->Put(m_input, m_url); - - default: break; - } - - return NULL; -} diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/utils.cpp opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/utils.cpp --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/utils.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/utils.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: utils.cpp -// Purpose: wxCurlSizeQueryThread -// Author: Francesco Montorsi -// Created: 2005/04/23 -// RCS-ID: $Id: utils.cpp 1240 2010-03-10 23:54:25Z frm $ -// Copyright: (c) 2007 Francesco Montorsi -// Licence: wxWidgets licence -///////////////////////////////////////////////////////////////////////////// - - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ -#pragma hdrstop -#endif - -// includes -#ifndef WX_PRECOMP - #include -#endif - -#ifdef __WXMSW__ - #include // useful to catch memory leaks when compiling under MSVC -#endif - -#include "wx/curl/utils.h" -#include "wx/curl/http.h" -#include "wx/curl/ftp.h" - - -DEFINE_EVENT_TYPE(wxCURL_SIZE_QUERY_EVENT) - - - -// ----------------------------------- -// wxCurlSizeQueryOutput -// ----------------------------------- - -extern "C" -{ - int wxcurl_size_query_progress_func(void* ptr, double rDlTotal, double WXUNUSED(rDlNow), - double WXUNUSED(rUlTotal), double WXUNUSED(rUlNow)) - { - unsigned long *p = (unsigned long *)ptr; - if (p) *p = (unsigned long)rDlTotal; - - // a non-zero value means to abort the transfer - // and that's what we want as we don't want to download the - // entire file but just get the rDlTotal info from the server - return 1; - } -} - -// --------------------- -// wxCurlSizeQueryThread -// --------------------- - -void *wxCurlSizeQueryThread::Entry() -{ - wxLogDebug(wxS("wxSizeCacherThread::Entry - caching file sizes")); - - wxMemoryOutputStream os; - bool allok = true; - wxCurlHTTP http; - wxCurlFTP ftp; - - m_urlSize.Clear(); - for (size_t i=0; i -#include -#include -#include -#include -#include -#include // for _() -#include - -// The cURL library header: -#include - - - -// base.h: wxWidgets Declarations for Event Types. -// -////////////////////////////////////////////////////////////////////// - -BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CURL, wxCURL_DOWNLOAD_EVENT, 6578) - DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CURL, wxCURL_UPLOAD_EVENT, 6579) - DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CURL, wxCURL_BEGIN_PERFORM_EVENT, 6580) - DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CURL, wxCURL_END_PERFORM_EVENT, 6581) -END_DECLARE_EVENT_TYPES() - - -class WXDLLIMPEXP_CURL wxCurlBase; - - -//! Private internal class used as base class for wxCurlDownloadEvent and wxCurlUploadEvent. -class WXDLLIMPEXP_CURL wxCurlProgressBaseEvent : public wxEvent -{ -public: - wxCurlProgressBaseEvent(int id, wxEventType type, - wxCurlBase *p = NULL, const wxString &url = wxEmptyString) - : wxEvent(id, type) { m_pCURL = p; m_szURL = url; m_dt = wxDateTime::Now(); } - - -public: // misc getters - - //! Returns the curl session which generated this event. - wxCurlBase *GetCurlSession() const { return m_pCURL; } - - //! Returns the date & time at which this event was generated. - wxDateTime GetDateTime() const { return m_dt; } - - //! Returns a number in [0;100] range indicating how much has been transferred so far. - double GetPercent() const - { return GetTotalBytes() == 0 ? 0 : (100.0 * (GetTransferredBytes()/GetTotalBytes())); } - - //! Returns the current transfer speed in bytes/second. - virtual double GetSpeed() const - { return GetTransferredBytes()/GetElapsedTime().GetSeconds().ToDouble(); } - - -public: // wxTimeSpan getters - - //! Returns the time elapsed since the beginning of the download up - //! to the time this function is called. - virtual wxTimeSpan GetElapsedTime() const; - - //! Returns the estimated time for the total download since it started. - virtual wxTimeSpan GetEstimatedTime() const; - - //! Returns the estimated remaining time to the completion of the download. - virtual wxTimeSpan GetEstimatedRemainingTime() const; - - -public: // wxString getters - - //! Returns the URL you are transfering from. - wxString GetURL() const { return m_szURL; } - - //! Returns the current download/upload speed in a human readable format. - wxString GetHumanReadableSpeed(const wxString &inv = _("Not available"), int prec = 1) const; - - //! Returns the total bytes to download in a human-readable format. - wxString GetHumanReadableTotalBytes(const wxString &inv = _("Not available"), int prec = 1) const - { return wxFileName::GetHumanReadableSize(wxULongLong((unsigned long)GetTotalBytes()), inv, prec); } - - //! Returns the currently transferred bytes in a human-readable format. - wxString GetHumanReadableTransferredBytes(const wxString &inv = _("Not available"), int prec = 1) const - { return wxFileName::GetHumanReadableSize(wxULongLong((unsigned long)GetTransferredBytes()), inv, prec); } - - -public: // pure virtual functions - - //! Returns the total bytes to transfer. - virtual double GetTotalBytes() const = 0; - - //! Returns the bytes transferred so far. - virtual double GetTransferredBytes() const = 0; - -protected: - wxCurlBase *m_pCURL; - wxString m_szURL; - - // NOTE: we need to store this date time to use it in GetElapsedTime: - // we cannot use wxDateTime::Now() there because once the event is constructed, - // GetElapsedTime() needs to return always the same value! - wxDateTime m_dt; -}; - - -// base.h: interface for the wxCurlDownloadEvent class. -// -////////////////////////////////////////////////////////////////////// - -//! This event gets posted by wxCURL with a frequent interval during operation -//! (roughly once per second) no matter if data is being transfered or not. -//! Unknown/unused argument values passed to the callback will be set to zero -//! (like if you only download data, the upload size will remain 0). -//! Use the EVT_CURL_PROGRESS(id, function) macro to intercept this event. -class WXDLLIMPEXP_CURL wxCurlDownloadEvent : public wxCurlProgressBaseEvent -{ -public: - wxCurlDownloadEvent(); - wxCurlDownloadEvent(int id, wxCurlBase *originator, - const double& rDownloadTotal, const double& rDownloadNow, - const wxString& szURL = wxEmptyString); - wxCurlDownloadEvent(const wxCurlDownloadEvent& event); - - virtual wxEvent* Clone() const { return new wxCurlDownloadEvent(*this); } - - - //! Returns the number of bytes downloaded so far. - double GetDownloadedBytes() const { return m_rDownloadNow; } - double GetTransferredBytes() const { return m_rDownloadNow; } - - //! Returns the total number of bytes to download. - double GetTotalBytes() const { return m_rDownloadTotal; } - - //! Returns the currently downloaded bytes in a human-readable format. - wxString GetHumanReadableDownloadedBytes(const wxString &inv = _("Not available"), int prec = 1) const - { return wxFileName::GetHumanReadableSize(wxULongLong((unsigned long)m_rDownloadNow), inv, prec); } - - -protected: - double m_rDownloadTotal, m_rDownloadNow; - -private: - DECLARE_DYNAMIC_CLASS(wxCurlDownloadEvent); -}; - -typedef void (wxEvtHandler::*wxCurlDownloadEventFunction)(wxCurlDownloadEvent&); - -#define wxCurlDownloadEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCurlDownloadEventFunction, &func) - -#define EVT_CURL_DOWNLOAD(id, fn) \ - wx__DECLARE_EVT1(wxCURL_DOWNLOAD_EVENT, id, wxCurlDownloadEventHandler(fn)) - - -//! This event gets posted by wxCURL with a frequent interval during operation -//! (roughly once per second) no matter if data is being transfered or not. -//! Unknown/unused argument values passed to the callback will be set to zero -//! (like if you only download data, the upload size will remain 0). -//! Use the EVT_CURL_PROGRESS(id, function) macro to intercept this event. -class WXDLLIMPEXP_CURL wxCurlUploadEvent : public wxCurlProgressBaseEvent -{ -public: - wxCurlUploadEvent(); - wxCurlUploadEvent(int id, wxCurlBase *originator, - const double& rUploadTotal, const double& rUploadNow, - const wxString& szURL = wxEmptyString); - wxCurlUploadEvent(const wxCurlUploadEvent& event); - - virtual wxEvent* Clone() const { return new wxCurlUploadEvent(*this); } - - - //! Returns the number of bytes uploaded so far. - double GetUploadedBytes() const { return m_rUploadNow; } - double GetTransferredBytes() const { return m_rUploadNow; } - - //! Returns the total number of bytes to upload. - double GetTotalBytes() const { return m_rUploadTotal; } - - //! Returns the currently uploaded bytes in a human-readable format. - wxString GetHumanReadableUploadedBytes(const wxString &inv = _("Not available"), int prec = 1) const - { return wxFileName::GetHumanReadableSize(wxULongLong((unsigned long)m_rUploadNow), inv, prec); } - -protected: - double m_rUploadTotal, m_rUploadNow; - -private: - DECLARE_DYNAMIC_CLASS(wxCurlUploadEvent); -}; - -typedef void (wxEvtHandler::*wxCurlUploadEventFunction)(wxCurlUploadEvent&); - -#define wxCurlUploadEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCurlUploadEventFunction, &func) - -#define EVT_CURL_UPLOAD(id, fn) \ - wx__DECLARE_EVT1(wxCURL_UPLOAD_EVENT, id, wxCurlUploadEventHandler(fn)) - - - -// base.h: interface for the wxCurlBeginPerformEvent class. -// -////////////////////////////////////////////////////////////////////// - -//! This event get posted before the beginning of any tranfer operation. -//! Use the EVT_CURL_BEGIN_PERFORM(id, function) macro to intercept this event. -class WXDLLIMPEXP_CURL wxCurlBeginPerformEvent : public wxEvent -{ -public: - wxCurlBeginPerformEvent(); - wxCurlBeginPerformEvent(int id, const wxString& szURL); - wxCurlBeginPerformEvent(const wxCurlBeginPerformEvent& event); - - virtual wxEvent* Clone() const { return new wxCurlBeginPerformEvent(*this); } - - //! Returns the URL you are going to transfering from/to. - wxString GetURL() const { return m_szURL; } - -protected: - wxString m_szURL; - -private: - DECLARE_DYNAMIC_CLASS(wxCurlBeginPerformEvent); -}; - -typedef void (wxEvtHandler::*wxCurlBeginPerformEventFunction)(wxCurlBeginPerformEvent&); - -#define wxCurlBeginPerformEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCurlBeginPerformEventFunction, &func) - -#define EVT_CURL_BEGIN_PERFORM(id, fn) \ - wx__DECLARE_EVT1(wxCURL_BEGIN_PERFORM_EVENT, id, wxCurlBeginPerformEventHandler(fn)) - - - -// base.h: interface for the wxCurlEndPerformEvent class. -// -////////////////////////////////////////////////////////////////////// - -//! This event get posted at the end of any tranfer operation. -//! Use the EVT_CURL_END_PERFORM(id, function) macro to intercept this event. -class WXDLLIMPEXP_CURL wxCurlEndPerformEvent : public wxEvent -{ -public: - wxCurlEndPerformEvent(); - wxCurlEndPerformEvent(int id, const wxString& szURL, const long& iResponseCode); - wxCurlEndPerformEvent(const wxCurlEndPerformEvent& event); - - virtual wxEvent* Clone() const { return new wxCurlEndPerformEvent(*this); } - - //! Returns the URL you are going to transfering from/to. - wxString GetURL() const { return m_szURL; } - - //! Returns the response code for the operation. - long GetResponseCode() const { return m_iResponseCode; } - - //! Returns true if the response code indicates a valid transfer. - bool IsSuccessful() const { return ((m_iResponseCode > 199) && (m_iResponseCode < 300)); } - -protected: - wxString m_szURL; - long m_iResponseCode; - -private: - DECLARE_DYNAMIC_CLASS(wxCurlEndPerformEvent); -}; - -typedef void (wxEvtHandler::*wxCurlEndPerformEventFunction)(wxCurlEndPerformEvent&); - -#define wxCurlEndPerformEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCurlEndPerformEventFunction, &func) - -#define EVT_CURL_END_PERFORM(id, fn) \ - wx__DECLARE_EVT1(wxCURL_END_PERFORM_EVENT, id, wxCurlEndPerformEventHandler(fn)) - - -// C Function Declarations for LibCURL -// -////////////////////////////////////////////////////////////////////// - -extern "C" -{ - int wxcurl_evt_progress_func(void* ptr, double rDlTotal, double rDlNow, - double rUlTotal, double rUlNow); - int wxcurl_verbose_stream_write (CURL * crlptr , curl_infotype info, char * cStrMessage, - size_t msgSize, void * buffer); - size_t wxcurl_header_func(void *ptr, size_t size, size_t nmemb, void *stream); - - size_t wxcurl_string_write(void* ptr, size_t size, size_t nmemb, void* stream); - size_t wxcurl_stream_write(void* ptr, size_t size, size_t nmemb, void* stream); - - size_t wxcurl_string_read(void* ptr, size_t size, size_t nmemb, void* stream); - size_t wxcurl_stream_read(void* ptr, size_t size, size_t nmemb, void* stream); -} - -// base.h: interface for the wxCurlBase class. -// -////////////////////////////////////////////////////////////////////// - -//! Tells wxCurlBase to send wxCurlDownloadEvent events -#define wxCURL_SEND_PROGRESS_EVENTS 0x01 - -//! Tells wxCurlBase to send wxCurlBeginPerformEvent and wxCurlEndPerformEvent events -#define wxCURL_SEND_BEGINEND_EVENTS 0x02 - -//! By default wxCurlBase won't send events -#define wxCURL_DEFAULT_FLAGS (0) - -//! The "easy" unspecialized interface to libCURL. -//! You may want to look at wxCurlFTP, wxCurlHTTP, wxCurlDAV if you want to have a specialized -//! interface for respectively the FTP, HTTP and WebDAV protocols. -//! -//! wxCurlBase represents a libCURL handle to a "session". -//! To use this interface you should: -//! - create an instance of wxCurlBase -//! - use #SetOpt to set libCURL options you're interested to -//! or alternatively the other various Set*() functions -//! - call #Perform to perform the operation -class WXDLLIMPEXP_CURL wxCurlBase -{ -public: - wxCurlBase(const wxString& szURL = wxEmptyString, - const wxString& szUserName = wxEmptyString, - const wxString& szPassword = wxEmptyString, - wxEvtHandler* pEvtHandler = NULL, int id = wxID_ANY, - long flags = wxCURL_DEFAULT_FLAGS); - - virtual ~wxCurlBase(); - - - // LibCURL Abstraction Methods - Wrapping curl_easy calls... - - //! Sets a transfer option for this libCURL session instance. - //! See the curl_easy_setopt() function call for more info. - bool SetOpt(CURLoption option, ...); - - //! Gets an info from this libCURL session instance. - //! See the curl_easy_getinfo() function call for more info. - bool GetInfo(CURLINFO info, ...) const; - - //! Start the operation as described by the options set previously with #SetOpt. - //! If you set CURLOPT_UPLOAD to zero and the CURLOPT_WRITEFUNCTION and CURLOPT_WRITEDATA - //! options to suitable values, a download will be performed. - //! If you set CURLOPT_UPLOAD to nonzero and the CURLOPT_READFUNCTION and CURLOPT_READDATA - //! options to suitable values, an upload will be performed. - //! See the curl_easy_perform() function call for more info. - bool Perform(); - - - // Internal handle management: - - //! Initializes the internal libCURL handle. This function is automatically called by - //! the constructor. - bool InitHandle(); - - //! Closes this libCURL session. This will effectively close all connections this handle - //! has used and possibly has kept open until now. - //! This function is automatically called by the destructor. - bool CleanupHandle(); - - //! Reinit the handle of this libCURL session. Equivalent to call #CleanupHandle and then #InitHandle. - bool ReInitHandle(); - - //! Re-initializes all options previously set on this libCURL session to the default values. - bool ResetHandle(); - - //! Is the underlying libCURL handle valid? - bool IsOk() const { return m_pCURL != NULL; } - - - // Member Data Access Methods (MDA) - - //! Sets the event handler to which the wxCurlDownloadEvent, wxCurlBeginPerformEvent and - //! wxCurlEndPerformEvent will be sent if they are enabled (see #SetFlags). - bool SetEvtHandler(wxEvtHandler* pParent, int id = wxID_ANY); - wxEvtHandler* GetEvtHandler() const; - int GetId() const; - - //! Sets the "event policy" of wxCURL: if you pass zero, then no events will ever be sent. - //! The wxCURL_SEND_PROGRESS_EVENTS and wxCURL_SEND_BEGINEND_EVENTS flags instead tell - //! wxCURL to send respectively the wxCurlDownloadEvent and wxCurlBeginPerformEvent, - //! wxCurlEndPerformEvent events. - void SetFlags(long flags); - long GetFlags() const; - - //! Sets the base URL. This allows you to specify a 'base' URL if you - //! are performing multiple actions. - void SetBaseURL(const wxString& szBaseURL); - wxString GetBaseURL() const; - - //! Sets the current URL. The 'base url' will be prepended to the given string. - void SetURL(const wxString &szRelativeURL); - - //! Returns the current 'full' URL. I.e. the real URL being used for the transfer. - wxString GetURL() const; - - //! Sets the host Port. This allows you to specify a specific (non- - //! default port) if you like. The value -1 means that the default port - //! will be used. - void SetPort(const long& iPort); - long GetPort() const; - - //! Sets the Username. If no username is - //! needed, simply assign an empty string (which is the default). - void SetUsername(const wxString& szUsername); - wxString GetUsername() const; - - //! Sets the Password. If no password is - //! needed, simply assign an empty string (which is the default). - void SetPassword(const wxString& szPassword); - wxString GetPassword() const; - - //! Returns the header of the response. - wxString GetResponseHeader() const; - wxString GetResponseBody() const; // May only contain data on NON-GET calls. - long GetResponseCode() const; - - //! Should the proxy be used? - void UseProxy(const bool& bUseProxy); - bool UseProxy() const; - - //! Sets proxy host. - void SetProxyHost(const wxString& szProxyHost); - wxString GetProxyHost() const; - - //! Sets the username for proxy access (if needed). - void SetProxyUsername(const wxString& szProxyUsername); - wxString GetProxyUsername() const; - - //! Sets the password for proxy access (if needed). - void SetProxyPassword(const wxString& szProxyPassword); - wxString GetProxyPassword() const; - - //! Sets the port for proxy access. - void SetProxyPort(const long& iProxyPort); - long GetProxyPort() const; - - //! Sets verbose mode on/off. Note that in verbose mode a lot of info - //! will be printed into an internal memory stream which can be queried - //! using #GetVerboseStream and #GetVerboseString. - void SetVerbose(const bool& bVerbose); - bool IsVerbose() const; - - //! Writes into the given stream the verbose messages collected so far. - bool GetVerboseStream(wxOutputStream& destStream) const; - - //! Appends to the given stream the verbose messages collected so far. - bool GetVerboseString(wxString& szStream) const; - - //! Returns a generic, short string describing the last occurred error. - wxString GetErrorString() const; - - //! Returns a short string with a detailed description of last occurred error. - //! This is typically something technical which you may want to hide from the - //! end users of your application (and e.g. show only in log files). - wxString GetDetailedErrorString() const; - - - // Static LibCURL Initialization Methods - Call At Program Init and Close... - - //! Initializes the libCURL. Call this only once at the beginning of your program. - static void Init(); - - //! Clean up libCURL. Call this only once at the end of your program. - static void Shutdown(); - - - // Static LibCURL Utility Methods - - static wxDateTime GetDateFromString(const wxString& szDate); - static wxString GetURLEncodedString(const wxString& szData); - static wxString GetStringFromURLEncoded(const wxString& szData); - - static wxString GetCURLVersion(); - - -protected: // protected utils used by wxCurl*Thread classes - - friend class wxCurlBaseThread; - friend class wxCurlSizeQueryThread; - friend class wxCurlProgressBaseEvent; - - //! Sets a custom callback as the progress callback. - //! Note that using this function you'll break the dispatching of - //! wxCurlDownloadEvent and wxCurlUploadEvent unless your own callback - //! does dispatch the events itself. - //! wxCURL users should never need to use this function. - void OverrideProgressCallback(curl_progress_callback newcallback, void *data) - { m_progressCallback=newcallback; m_progressData=data; } - - //! Returns the time at which started the last transfer "span". - wxDateTime GetBeginTransferSpan() const - { return m_dtBeginTransferSpan; } - - //! Returns the current time offset, i.e. the time elapsed in all previous - //! transfer spans. - wxTimeSpan GetElapsedTimeOffset() const - { return m_tsElapsedOffset; } - - //! A transfer span has been completed (i.e. the user paused the transfer). - void EndTransferSpan() - { - wxDateTime now = wxDateTime::Now(); - m_tsElapsedOffset += now - m_dtBeginTransferSpan; - } - - //! A new transfer span has begun (i.e. the user resumed the transfer). - void BeginTransferSpan() - { - m_dtBeginTransferSpan = wxDateTime::Now(); - } - -protected: - - // The internal pointer to the libCURL session. - CURL* m_pCURL; - - - // libCURL <-> wxString conversions helpers (see below) - - #define wxCURL_BUF2STRING(x) wxString((const char*)(x), wxConvLibc) - -#if wxUSE_UNICODE - #define wxCURL_STRING2BUF(x) ((x).ToAscii()) -#else - #define wxCURL_STRING2BUF(x) wxCharBuffer((x).c_str()) -#endif - - #define wxCURL_BUF_ISEMPTY(x) (strlen(x) == 0) - - - - // VERY IMPORTANT: all these wxCharBuffers are passed to curl_easy_setopt() - // which does not take ownership of them. Thus we need - // to keep them alive here for all the time m_pCURL handle - // is valid. Also note that we don't use wxStrings to store - // them as libCURL always take char* and doesn't like wchar_t* - // and thus we always need wxCharBuffer storage while wxString - // in wxWidgets Unicode builds would use a wxWCharBuffer internally. - // wxCharBuffer is basically a thin class which handles auto-delete - // of a char[] array. - - // basic connection settings: - - wxCharBuffer m_szBaseURL; - wxCharBuffer m_szCurrFullURL; - wxCharBuffer m_szUsername; - wxCharBuffer m_szPassword; - wxCharBuffer m_szUserPass; - - long m_iHostPort; - - // about received headers: - - wxCharBuffer m_szResponseHeader; - wxCharBuffer m_szResponseBody; - long m_iResponseCode; - - // about headers to send: - - wxArrayString m_arrHeaders; - struct curl_slist* m_pHeaders; - - // proxy: - - bool m_bUseProxy; - wxCharBuffer m_szProxyHost; - wxCharBuffer m_szProxyUsername; - wxCharBuffer m_szProxyPassword; - wxCharBuffer m_szProxyUserPass; - long m_iProxyPort; - - // debugging/verbose mode: - - bool m_bVerbose; - wxStringOutputStream m_mosVerbose; - - char m_szDetailedErrorBuffer[CURL_ERROR_SIZE]; - wxCharBuffer m_szLastError; - - // for events: - wxEvtHandler* m_pEvtHandler; - int m_nId; - long m_nFlags; - - // callbacks which can be overridden by the user: - curl_progress_callback m_progressCallback; - void* m_progressData; - - // these two are required in order to be able to support PAUSE/RESUME - // features in wxCurl*Thread classes. In fact, since the pausing happens - // is not directly supported by libCURL needs to happen at wxThread::Entry - // level. This also means that the events which wxCurlBase's callbacks - // post to the event handler cannot trust libCURL's TOTAL_TIME as reported - // by easy_curl_getinfo. Rather we need to keep our own timing mechanism. - // - // It's very simple: a single transfer session may be divided in one or more - // transfer "spans" and idle periods. - // Resuming from idle means start a new transfer span. Pausing means ending - // the current transfer span. - // When a new transfer span starts (from Perform() if it's the first span or - // from BeginTransferSpan when resuming), its beginning is registered into - // m_dtBeginTransferSpan. When a transfer span ends, its length is added to - // the "elapsed time offset" m_tsElapsedOffset. - // This allows wxCurlProgressEvents to calculate the elapsed time just as: - // wxDateTime::Now() - m_dtBeginTransferSpan + m_tsElapsedOffset - wxDateTime m_dtBeginTransferSpan; - wxTimeSpan m_tsElapsedOffset; - - -protected: // internal functions - - // CURL Handle Initialization Helper Method - virtual void SetCurlHandleToDefaults(const wxString& relativeURL); - virtual void SetHeaders(); - virtual void ResetHeaders(); - virtual void ResetResponseVars(); - - // Output additional warnings/errors when in verbose mode. - void DumpErrorIfNeed(CURLcode error) const; - -protected: // specialized safe SetOpt-like functions - - // handy overload for char buffers - bool SetStringOpt(CURLoption option, const wxCharBuffer &str); - - - bool SetStringWriteFunction(const wxCharBuffer& str) - { - bool ret = true; - ret &= SetOpt(CURLOPT_WRITEFUNCTION, wxcurl_string_write); - ret &= SetOpt(CURLOPT_WRITEDATA, (void*)&str); - return ret; - } - - bool SetStreamWriteFunction(const wxOutputStream& buf) - { - bool ret = true; - ret &= SetOpt(CURLOPT_WRITEFUNCTION, wxcurl_stream_write); - ret &= SetOpt(CURLOPT_WRITEDATA, (void*)&buf); - return ret; - } - - bool SetStringReadFunction(const wxCharBuffer& str) - { - bool ret = true; - ret &= SetOpt(CURLOPT_READFUNCTION, wxcurl_string_read); - ret &= SetOpt(CURLOPT_READDATA, (void*)&str); - return ret; - } - - bool SetStreamReadFunction(const wxInputStream& buf) - { - bool ret = true; - ret &= SetOpt(CURLOPT_READFUNCTION, wxcurl_stream_read); - ret &= SetOpt(CURLOPT_READDATA, (void*)&buf); - return ret; - } -}; - -#endif // _WXCURLBASE_H__INCLUDED_ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/dav.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/dav.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/dav.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/dav.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -/* - * dav.h - * wxCURL - * - * Created by Casey O'Donnell on Wed Jun 02 2004. - * Copyright (c) 2004 Casey O'Donnell. All rights reserved. - * - * Licence: wxWidgets Licence - */ - -// dav.h: interface for the wxCurlDAV class. -// -////////////////////////////////////////////////////////////////////// - -#ifndef _WXCURLDAV_H__INCLUDED_ -#define _WXCURLDAV_H__INCLUDED_ - -#include - -#include -#include -#include -#include -#include - -#include - -class wxXmlNode; - - -//! A specialized interface to WebDAV derived from wxCurlBase. -class WXDLLIMPEXP_CURL wxCurlDAV : public wxCurlHTTP -{ -public: - wxCurlDAV(const wxString& szURL = wxEmptyString, - const wxString& szUserName = wxEmptyString, - const wxString& szPassword = wxEmptyString, - wxEvtHandler* pEvtHandler = NULL, - long flags = wxCURL_DEFAULT_FLAGS); - virtual ~wxCurlDAV(); - - // Action Methods - These All Make Calls To: curl_easy_perform() - - // MKCOL - Creates a Collection Resource at the Location Specified. - bool Mkcol(const wxString& szRemoteCol = wxEmptyString); - - // PROPFIND - Queries the Properties of the Resource Specified. An XML Buffer Can be Specified for Detailed Data. - bool Propfind(const wxString& szRemoteLoc = wxEmptyString); - bool Propfind(const wxArrayString& arrTags, const wxString& szRemoteLoc = wxEmptyString); - bool Propfind(const char* buffer, size_t size, const wxString& szRemoteLoc = wxEmptyString); - bool Propfind(wxInputStream& buffer, const wxString& szRemoteLoc = wxEmptyString); - - // PROPATCH - Alters the Properties of the Resource Specified. An XML Buffer Must be Specified to Modify Data. - bool Proppatch(const char* buffer, size_t size, const wxString& szRemoteLoc = wxEmptyString); - bool Proppatch(wxInputStream& buffer, const wxString& szRemoteLoc = wxEmptyString); - - // COPY - Copies the Specified Resource from one Location to Another. - bool Copy(const wxString& szRemoteLocDest, const bool& bOverwrite = true, const wxString& szRemoteLocSrc = wxEmptyString); - - // MOVE - Moves the Specified Resource from one Location to Another. - bool Move(const wxString& szRemoteLocDest, const bool& bOverwrite = true, const wxString& szRemoteLocSrc = wxEmptyString); - - // LOCK - Requests a Lock on the Specified Resource. - bool Lock(const wxString& szRemotLoc = wxEmptyString); - - // UNLOCk - Gives up a Lock on the Specified Resource. - bool Unlock(const wxString& szRemoteLoc = wxEmptyString); - -protected: - - // XML Helper Methods - virtual wxString ConstructPropfindXml(const wxArrayString& arrTags); - -private: - -}; - -#endif // _WXCURLDAV_H__INCLUDED_ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/davtool.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/davtool.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/davtool.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/davtool.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -/* - * davtool.h - * wxCURL - * - * Created by Casey O'Donnell on Thu Jul 15 2004. - * Copyright (c) 2004 Casey O'Donnell. All rights reserved. - * - * Licence: wxWidgets Licence - */ - -// wxCurlDAVTool.h -// -////////////////////////////////////////////////////////////////////// - -#ifndef _WXCURLDAVTOOL_H__INCLUDED_ -#define _WXCURLDAVTOOL_H__INCLUDED_ - -#include - -// davtool.h: interface for the wxCurlDAVFs class. -// -////////////////////////////////////////////////////////////////////// - -class wxCurlDAVTool; - -class WXDLLIMPEXP_CURL wxCurlDAVFs -{ -friend class wxCurlDAVTool; - -public: - wxCurlDAVFs(); - wxCurlDAVFs(const wxString& szHREF , - const wxString& szStatus , - const wxString& szCreationDate , - const wxString& szLastModified , - const long& iContentLength , - const wxString& szContentType ); - ~wxCurlDAVFs(); - - bool IsDirectory() const { return m_szContentType == wxS("httpd/unix-directory"); } - bool IsOK() const { return m_szStatus.Right(6) == wxS("200 OK"); } - - wxString GetHREF() const { return m_szHREF; } - - wxString GetStatus() const { return m_szStatus; } - - wxDateTime GetCreationDate() const { return m_dtCreationDate; } - wxDateTime GetLastModified() const { return m_dtLastModified; } - - long GetContentLength() const { return m_iContentLength; } - - wxString GetContentType() const { return m_szContentType; } - wxString GetType() const { return m_szContentType.BeforeFirst('/'); } - wxString GetSubType() const { return m_szContentType.AfterLast('/'); } - - -protected: - wxString m_szHREF; - - wxString m_szStatus; - - wxDateTime m_dtCreationDate; - wxDateTime m_dtLastModified; - - long m_iContentLength; - - wxString m_szContentType; -}; - -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxCurlDAVFs, wxArrayDAVFs, WXDLLIMPEXP_CURL); - -// davtool.h: interface for the wxCurlDAVTool class. -// -////////////////////////////////////////////////////////////////////// - -class WXDLLIMPEXP_CURL wxCurlDAVTool : public wxCurlDAV -{ -public: - wxCurlDAVTool(const wxString& szURL = wxEmptyString, - const wxString& szUserName = wxEmptyString, - const wxString& szPassword = wxEmptyString, - wxEvtHandler* pEvtHandler = NULL, - long flags = wxCURL_DEFAULT_FLAGS); - virtual ~wxCurlDAVTool(); - - // More Complex Action Methods - These All Make Calls To: curl_easy_perform() - // These routines have more 'intelligence' than simple WebDAV calls. - bool GetDAVFs(wxArrayDAVFs& fs, const wxString& szRemoteLoc = wxEmptyString); - bool Exists(const wxString& szRemoteLoc = wxEmptyString); - bool IsDirectory(const wxString& szRemoteLoc = wxEmptyString); - bool HasDirectory(const wxString& szRemoteLoc = wxEmptyString) { return IsDirectory(szRemoteLoc); } - bool IsOk(const wxString& szRemoteLoc = wxEmptyString); - wxDateTime GetLastModified(const wxString& szRemoteLoc = wxEmptyString); - wxDateTime GetCreationDate(const wxString& szRemoteLoc = wxEmptyString); - long GetContentLength(const wxString& szRemoteLoc = wxEmptyString); - wxString GetContentType(const wxString& szRemoteLoc = wxEmptyString); - -protected: - - // XML Helper Methods - bool ParseResponseXml(wxCurlDAVFs& fsItem, wxXmlNode* pNode); - bool ParsePropstatXml(wxCurlDAVFs& fsItem, wxXmlNode* pNode); - bool ParsePropsXml(wxCurlDAVFs& fsItem, wxXmlNode* pNode); - -private: -}; - -#endif // _WXCURLDAVTOOL_H__INCLUDED_ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/dialog.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/dialog.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/dialog.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,326 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: dialog.h -// Purpose: wxCurlDownloadDialog, wxCurlUploadDialog -// Author: Francesco Montorsi -// Created: 2007/04/14 -// RCS-ID: $Id: dialog.h 1240 2010-03-10 23:54:25Z frm $ -// Copyright: (c) 2007 Francesco Montorsi -// Licence: wxWidgets licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WXCURL_DIALOG_H_ -#define _WXCURL_DIALOG_H_ - -#include "wx/dialog.h" -#include "wx/curl/thread.h" -#include "wx/curl/panel.h" - -// forward declarations -//class WXDLLIMPEXP_CORE wxStaticText; -//class WXDLLIMPEXP_CORE wxTextCtrl; -//class WXDLLIMPEXP_CORE wxGauge; -//class WXDLLIMPEXP_CORE wxStaticBitmap; - - -//! Possible wxCurlTransferDialog styles. -enum wxCurlTransferDialogStyle -{ - wxCTDS_ELAPSED_TIME = 0x0001, //!< The dialog shows the elapsed time. - wxCTDS_ESTIMATED_TIME = 0x0002, //!< The dialog shows the estimated total time. - wxCTDS_REMAINING_TIME = 0x0004, //!< The dialog shows the remaining time. - wxCTDS_SPEED = 0x0008, //!< The dialog shows the transfer speed. - wxCTDS_SIZE = 0x0010, //!< The dialog shows the size of the resource to download/upload. - wxCTDS_URL = 0x0020, //!< The dialog shows the URL involved in the transfer. - - // styles related to the use of wxCurlConnectionSettingsDialog: - - wxCTDS_CONN_SETTINGS_AUTH = 0x0040, //!< The dialog allows the user to change the authentication settings. - wxCTDS_CONN_SETTINGS_PORT = 0x0080, //!< The dialog allows the user to change the port for the transfer. - wxCTDS_CONN_SETTINGS_PROXY = 0x0100, //!< The dialog allows the user to change the proxy settings. - - wxCTDS_CONN_SETTINGS_ALL = wxCTDS_CONN_SETTINGS_AUTH|wxCTDS_CONN_SETTINGS_PORT|wxCTDS_CONN_SETTINGS_PROXY, - - wxCTDS_SHOW_ALL = wxCTDS_ELAPSED_TIME|wxCTDS_ESTIMATED_TIME|wxCTDS_REMAINING_TIME| - wxCTDS_SPEED|wxCTDS_SIZE|wxCTDS_URL|wxCTDS_CONN_SETTINGS_ALL, - - wxCTDS_CAN_ABORT = 0x0200, //!< The transfer can be aborted by the user. - wxCTDS_CAN_START = 0x0400, //!< The transfer won't start automatically. The user needs to start it. - wxCTDS_CAN_PAUSE = 0x0800, //!< The transfer can be paused. - - wxCTDS_AUTO_CLOSE = 0x1000, //!< The dialog auto closes when transfer is complete. - - // by default all available features are enabled: - wxCTDS_DEFAULT_STYLE = wxCTDS_CAN_START|wxCTDS_CAN_PAUSE|wxCTDS_CAN_ABORT|wxCTDS_SHOW_ALL|wxCTDS_AUTO_CLOSE -}; - -//! The return flag of . -enum wxCurlDialogReturnFlag -{ - wxCDRF_SUCCESS, //!< Download successfully completed. - wxCDRF_USER_ABORTED, //!< User aborted the download. - wxCDRF_FAILED //!< Invalid URL / other networking problem happened. -}; - - -// ---------------------------------------------------------------------------- -// wxCurlTransferDialog -// ---------------------------------------------------------------------------- - -//! The base class for wxCurlDownloadDialog and wxCurlUploadDialog. -class WXDLLIMPEXP_CURL wxCurlTransferDialog : public wxDialog -{ -public: - wxCurlTransferDialog() - { - m_bTransferComplete = false; -#ifdef __WXDEBUG__ - m_bVerbose = true; -#else - m_bVerbose = false; -#endif - - // some of these may remain NULL: - m_pElapsedTime = m_pEstimatedTime = m_pRemainingTime = NULL; - m_pSpeed = m_pSize = NULL; - m_pBitmap = NULL; - m_pURL = NULL; - m_pGauge = NULL; - m_pLastEvent = NULL; - m_pThread = NULL; - } - - bool Create(const wxString &url, - const wxString& title, - const wxString& message = wxEmptyString, - const wxString& sizeLabel = _("Transferred:"), - const wxBitmap& bitmap = wxNullBitmap, - wxWindow *parent = NULL, - long style = wxCTDS_DEFAULT_STYLE); - - ~wxCurlTransferDialog() - { - wxDELETE(m_pLastEvent); - wxDELETE(m_pThread); - } - - - //! Shows the dialog as modal. If the wxCTDS_CAN_START flag was not given, - //! then the transfer starts automatically. - //! Note that you should use this function instead of wxDialog::ShowModal(). - wxCurlDialogReturnFlag RunModal(); - -/* not yet tested - //! Shows the dialog as modeless. - bool Show(const bool show); -*/ - - //! Returns true if the creation of the dialog was successful. - bool IsOk() const { return m_pThread != NULL && m_pThread->IsOk(); } - - //! Returns the exit code of the dialog (call after #RunModal). - virtual wxCurlDialogReturnFlag GetReturnCode() const - { return (wxCurlDialogReturnFlag)wxDialog::GetReturnCode(); } - - //! Sets the internal wxCurlBase object to be verbose. - void SetVerbose(bool enable) - { m_bVerbose=enable; } - - //! Returns true if the internal wxCurlBase is verbose (on by default in debug builds). - bool IsVerbose() const - { return m_bVerbose; } - -protected: // internal utils - - virtual void EndModal(wxCurlDialogReturnFlag retCode); - - wxStaticText *AddSizerRow(wxSizer *sz, const wxString &name); - void CreateControls(const wxString &url, const wxString &msg, - const wxString& sizeLabel, const wxBitmap &bitmap); - void UpdateLabels(wxCurlProgressBaseEvent *ev); - - // returns true if the error can be ignored - bool HandleCurlThreadError(wxCurlThreadError err, wxCurlBaseThread *p, - const wxString &url = wxEmptyString); - - bool HasFlag(wxCurlTransferDialogStyle flag) const - { return (m_nStyle & flag) != 0; } - - - // change access policy: - - virtual int ShowModal() - { return wxDialog::ShowModal(); } - - virtual void SetReturnCode(wxCurlDialogReturnFlag ret) - { wxDialog::SetReturnCode(ret); } - -public: // event handlers - - void OnEndPerform(wxCurlEndPerformEvent &); - - void OnAbort(wxCommandEvent &); - void OnConnSettings(wxCommandEvent &); - void OnPauseResume(wxCommandEvent &); - void OnStart(wxCommandEvent &); - - void OnAbortUpdateUI(wxUpdateUIEvent &); - void OnConnSettingsUpdateUI(wxUpdateUIEvent &); - void OnStartUpdateUI(wxUpdateUIEvent &); - void OnPauseResumeUpdateUI(wxUpdateUIEvent &); - - void OnClose(wxCloseEvent &ev); - -protected: - - wxCurlBaseThread *m_pThread; - wxCurlProgressBaseEvent *m_pLastEvent; - bool m_bTransferComplete; - - // wxWindow's style member is too small for all our flags and wxWindow/wxDialog ones. - // So we use our own... - long m_nStyle; - - // should we be verbose? - bool m_bVerbose; - -protected: // controls - - wxStaticText* m_pURL; - wxStaticText* m_pSpeed; - wxStaticText* m_pSize; - wxGauge* m_pGauge; - wxStaticBitmap* m_pBitmap; - - wxStaticText* m_pElapsedTime; - wxStaticText* m_pRemainingTime; - wxStaticText* m_pEstimatedTime; - -private: - DECLARE_EVENT_TABLE() -}; - - -// ---------------------------------------------------------------------------- -// wxCurlDownloadDialog -// ---------------------------------------------------------------------------- - -//! An highly-configurable dialog which shows progress about a download. -class WXDLLIMPEXP_CURL wxCurlDownloadDialog : public wxCurlTransferDialog -{ -public: - wxCurlDownloadDialog() { } - - wxCurlDownloadDialog(const wxString &url, - wxOutputStream *out, - const wxString& title = wxS("Downloading..."), - const wxString& message = wxEmptyString, - const wxBitmap& bitmap = wxNullBitmap, - wxWindow *parent = NULL, - long style = wxCTDS_DEFAULT_STYLE) - { Create(url, out, title, message, bitmap, parent, style); } - - bool Create(const wxString &url, - wxOutputStream *out, - const wxString& title = wxS("Downloading..."), - const wxString& message = wxEmptyString, - const wxBitmap& bitmap = wxNullBitmap, - wxWindow *parent = NULL, - long style = wxCTDS_DEFAULT_STYLE); - - //! Returns the output stream where data has been downloaded. - //! This function can be used only when the download has been completed. - wxOutputStream *GetOutputStream() const - { return wx_static_cast(wxCurlDownloadThread*, m_pThread)->GetOutputStream(); } - -public: // event handlers - - void OnDownload(wxCurlDownloadEvent &); - -private: - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxCurlDownloadDialog) -}; - - -// ---------------------------------------------------------------------------- -// wxCurlUploadDialog -// ---------------------------------------------------------------------------- - -//! An highly-configurable dialog which shows progress about an upload. -class WXDLLIMPEXP_CURL wxCurlUploadDialog : public wxCurlTransferDialog -{ -public: - wxCurlUploadDialog() { } - - wxCurlUploadDialog(const wxString &url, - wxInputStream *in, - const wxString& title = wxS("Uploading..."), - const wxString& message = wxEmptyString, - const wxBitmap& bitmap = wxNullBitmap, - wxWindow *parent = NULL, - long style = wxCTDS_DEFAULT_STYLE) - { Create(url, in, title, message, bitmap, parent, style); } - - bool Create(const wxString &url, - wxInputStream *in, - const wxString& title = wxS("Uploading..."), - const wxString& message = wxEmptyString, - const wxBitmap& bitmap = wxNullBitmap, - wxWindow *parent = NULL, - long style = wxCTDS_DEFAULT_STYLE); - - -public: // event handlers - - void OnUpload(wxCurlUploadEvent &); - -private: - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxCurlUploadDialog) -}; - - -// ---------------------------------------------------------------------------- -// wxCurlConnectionSettingsDialog -// ---------------------------------------------------------------------------- - -//! A dialog which simply wraps a wxCurlConnectionSettingsPanel. -//! For a list of supported styles, please see wxCurlConnectionSettingsPanel. -class WXDLLIMPEXP_CURL wxCurlConnectionSettingsDialog : public wxDialog -{ -public: - wxCurlConnectionSettingsDialog() { } - - wxCurlConnectionSettingsDialog(const wxString& title, - const wxString& message = wxEmptyString, - wxWindow *parent = NULL, - long style = wxCCSP_DEFAULT_STYLE) - { Create(title, message, parent, style); } - - bool Create(const wxString& title = wxS("Connection settings..."), - const wxString& message = wxEmptyString, - wxWindow *parent = NULL, - long style = wxCCSP_DEFAULT_STYLE); - -public: - - //! Runs this dialog as modal and updates the given wxCurlBase instance if needed - //! (i.e. if the user hits OK and not Cancel). - void RunModal(wxCurlBase *pcurl); - -protected: - - wxCurlConnectionSettingsPanel *m_pPanel; - - // change access policy: - - virtual int ShowModal() - { return wxDialog::ShowModal(); } - -private: - DECLARE_DYNAMIC_CLASS(wxCurlConnectionSettingsDialog) -}; - - -#endif // _WXCURL_DIALOG_H_ - diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/ftp.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/ftp.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/ftp.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/ftp.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,156 +0,0 @@ -/* - * ftp.h - * wxCURL - * - * Created by Casey O'Donnell on Tue Jun 29 2004. - * Copyright (c) 2004 Casey O'Donnell. All rights reserved. - * - * Licence: wxWidgets Licence - */ - -#ifndef _WXCURLFTP_H__INCLUDED_ -#define _WXCURLFTP_H__INCLUDED_ - -#include - -// C Function Declarations for LibCURL -// -////////////////////////////////////////////////////////////////////// - -extern "C" -{ -} - -// ftp.h: interface for the wxCurlFTP class. -// -////////////////////////////////////////////////////////////////////// - -//! A specialized interface to FTP derived from wxCurlBase. -class WXDLLIMPEXP_CURL wxCurlFTP : public wxCurlBase -{ -public: - enum TransferMode - { - kASCII, - kBINARY - }; - - wxCurlFTP(const wxString& szURL = wxEmptyString, - const wxString& szUserName = wxEmptyString, - const wxString& szPassword = wxEmptyString, - wxEvtHandler* pEvtHandler = NULL, int id = wxID_ANY, - long flags = wxCURL_DEFAULT_FLAGS); - virtual ~wxCurlFTP(); - - // Member Data Access Methods (MDA) - - // MDA - Get/Set Transfer Mode - void SetTransferMode(const TransferMode& tmMode); - TransferMode GetTransferMode() const; - - void SetToBinary(); - void SetToAscii(); - - bool IsAscii() const; - bool IsBinary() const; - - // MDA - Get/Set PORT Options - void UsePortOption(const bool& bUsePort); - bool UsePortOption() const; - - void SetPortParam(const wxString& szParam = wxS("-")); - wxString GetPortParam() const; - - // MDA - Get/Set EPRT Use - void UseEPRT(const bool& bUseEPRT); - bool UseEPRT() const; - - // MDA - Get/Set EPSV Use - void UseEPSV(const bool& bUseEPSV); - bool UseEPSV() const; - - // MDA - Get/Set Append Setting - void AppendOnUpload(const bool& bAppend); - bool AppendOnUpload() const; - - // MDA - Get/Set Create Missing Dirs Setting - void CreateMissingDirs(const bool& bCreateMissing); - bool CreateMissingDirs() const; - - // MDA - Set Quote Strings - bool SetQuoteList(const wxArrayString& arrQuote); - bool AppendQuote(const wxString& szQuote, const bool& bClear = false); - - // MDA - Set Pre Quote Strings - bool SetPreQuoteList(const wxArrayString& arrQuote); - bool AppendPreQuote(const wxString& szQuote, const bool& bClear = false); - - // MDA - Set Post Quote Strings - bool SetPostQuoteList(const wxArrayString& arrQuote); - bool AppendPostQuote(const wxString& szQuote, const bool& bClear = false); - - // Action Methods - These All Make Calls To: curl_easy_perform() - - // GET - These Methods Allow a Caller to Retrieve a Given Resource - bool Get(const wxString& szFilePath, const wxString& szRemoteFile = wxEmptyString); - size_t Get(char*& buffer, const wxString& szRemoteFile = wxEmptyString); - bool Get(wxOutputStream& buffer, const wxString& szRemoteFile = wxEmptyString); - - // PUT - These Methods Allow a Caller to Place a Resource on the Host - bool Put(const wxString& szFilePath, const wxString& szRemoteFile = wxEmptyString); - bool Put(const char* buffer, size_t size, const wxString& szRemoteFile = wxEmptyString); - bool Put(wxInputStream& buffer, const wxString& szRemoteFile = wxEmptyString); - - // MKDIR - This Method Allows a Caller to Create a Directory - bool MkDir(const wxString& szRemoteLoc = wxEmptyString); - - // RMDIR - This Method Allows a Caller to Remove a Directory - bool RmDir(const wxString& szRemoteLoc = wxEmptyString); - - // DELETE - This Method Allows a Caller to Remove a Resource - bool Delete(const wxString& szRemoteLoc = wxEmptyString); - - // RENAME - This Method Allows a Caller to Rename a Resource - bool Rename(const wxString& szRemoteLocName, const wxString& szRemoteFile = wxEmptyString); - - // LIST - This Method Allows a Caller to Retrieve the Contents of a Resource - bool List(const wxString& szRemoteLoc = wxEmptyString); - bool Nlst(const wxString& szRemoteLoc = wxEmptyString); - - // INFO - This Method Allows a Caller to Retrieve Information Regarding a Resource - bool Info(const wxString& szRemoteLoc = wxEmptyString); - -protected: - - virtual void SetCurlHandleToDefaults(const wxString& relativeURL); - virtual void SetCurlHandleQuoteOpts(); - - void ResetAllQuoteLists(); - void ResetQuoteList(); - void ResetPreQuoteList(); - void ResetPostQuoteList(); - - struct curl_slist* m_pQuote; - struct curl_slist* m_pPreQuote; - struct curl_slist* m_pPostQuote; - - wxString m_szCurrFullPath; - wxString m_szCurrFilename; - - bool m_bCreateMissingDirs; - - bool m_bAppend; - bool m_bUsePortOption; - - TransferMode m_tmMode; - - bool m_bUseEPRT; - bool m_bUseEPSV; - - wxCharBuffer m_szPortParam; - -private: - -}; - -#endif // _WXCURLFTP_H__INCLUDED_ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/ftptool.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/ftptool.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/ftptool.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/ftptool.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -/* - * ftptool.h - * wxCURL - * - * Created by Casey O'Donnell on Fri Aug 13 2004. - * Copyright (c) 2004 Casey O'Donnell. All rights reserved. - * - * Licence: wxWidgets Licence - */ - -#ifndef _WXCURLFTPTOOL_H__INCLUDED_ -#define _WXCURLFTPTOOL_H__INCLUDED_ - -#include - -// C Function Declarations for LibCURL -// -////////////////////////////////////////////////////////////////////// - -extern "C" -{ -} - -// ftptool.h: interface for the wxCurlFTPFs class. -// -////////////////////////////////////////////////////////////////////// - -class wxCurlFTPTool; - -class WXDLLIMPEXP_CURL wxCurlFTPFs -{ - friend class wxCurlFTPTool; - -public: - wxCurlFTPFs(); - wxCurlFTPFs(const wxString& szName , - const bool& bIsDir , - const bool& bIsFile , - const time_t& tLastModified , - const long& iContentLength ); - ~wxCurlFTPFs(); - - bool IsDirectory() const { return m_bIsDir; } - bool IsFile() const { return m_bIsFile; } - - wxString GetName() const { return m_szName; } - - wxDateTime GetLastModified() const { return m_dtLastModified; } - - long GetContentLength() const { return m_iContentLength; } - - wxString GetFileSuffix() const { return m_szName.AfterLast('.'); } - - -protected: - wxString m_szName; - - bool m_bIsDir; - bool m_bIsFile; - - wxDateTime m_dtLastModified; - - long m_iContentLength; -}; - -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxCurlFTPFs, wxArrayFTPFs, WXDLLIMPEXP_CURL); - -// ftptool.h: interface for the wxCurlFTPTool class. -// -////////////////////////////////////////////////////////////////////// - -class WXDLLIMPEXP_CURL wxCurlFTPTool : public wxCurlFTP -{ -public: - wxCurlFTPTool(const wxString& szURL = wxEmptyString, - const wxString& szUserName = wxEmptyString, - const wxString& szPassword = wxEmptyString, - wxEvtHandler* pEvtHandler = NULL, int id = wxID_ANY, - long flags = wxCURL_DEFAULT_FLAGS); - virtual ~wxCurlFTPTool(); - - // More Complex Action Methods - These All Make Calls To: curl_easy_perform() - // These routines have more 'intelligence' than simple FTP calls. - bool GetFTPFs(wxArrayFTPFs& fs, const wxString& szRemoteLoc = wxEmptyString); - bool Exists(const wxString& szRemoteLoc = wxEmptyString); - bool IsDirectory(const wxString& szRemoteLoc = wxEmptyString); - bool HasDirectory(const wxString& szRemoteLoc = wxEmptyString) { return IsDirectory(szRemoteLoc); } - wxDateTime GetLastModified(const wxString& szRemoteLoc = wxEmptyString); - long GetContentLength(const wxString& szRemoteLoc = wxEmptyString); - wxString GetFileSuffix(const wxString& szRemoteLoc = wxEmptyString); - -protected: - -private: - -}; - -#endif // _WXCURLFTPTOOL_H__INCLUDED_ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/http.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/http.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/http.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/http.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,105 +0,0 @@ -/* -* http.h -* wxCURL -* -* Created by Casey O'Donnell on Tue Jun 29 2004. -* Copyright (c) 2004 Casey O'Donnell. All rights reserved. -* -* Licence: wxWidgets Licence -*/ - -#ifndef _WXCURLHTTP_H__INCLUDED_ -#define _WXCURLHTTP_H__INCLUDED_ - -#include - -// C Function Declarations for LibCURL -// -////////////////////////////////////////////////////////////////////// - -extern "C" -{ -} - -// http.h: interface for the wxCurlHTTP class. -// -////////////////////////////////////////////////////////////////////// - -//! A specialized interface to HTTP derived from wxCurlBase. -class WXDLLIMPEXP_CURL wxCurlHTTP : public wxCurlBase -{ -public: - wxCurlHTTP(const wxString& szURL = wxEmptyString, - const wxString& szUserName = wxEmptyString, - const wxString& szPassword = wxEmptyString, - wxEvtHandler* pEvtHandler = NULL, int id = wxID_ANY, - long flags = wxCURL_DEFAULT_FLAGS); - virtual ~wxCurlHTTP(); - - // Post Data Methods - bool AddForm(const bool& bClear, const wxString& szName, - struct curl_forms* pForms, CURLFORMcode* outErr=NULL); - bool AddBufferToForm(const bool& bClear, const wxString& szName, - char* buffer, size_t len, CURLFORMcode* outErr=NULL); - - // Member Data Access Methods (MDA) - - // MDA - Get/Set Cookie Use - void UseCookies(const bool& bUseCookies); - bool UseCookies() const; - - // MDA - Get/Set Cookie File - void SetCookieFile(const wxString& szFilePath); - wxString GetCookieFile() const; - - // Action Methods - These All Make Calls To: curl_easy_perform() - - // OPTIONS - This Method Allows a Caller to Query the Capabilities of a Resource - bool Options(const wxString& szRemoteFile = wxEmptyString); - - // HEAD - This Method is Similar to GET, Though no Message Body is Retrieved - bool Head(const wxString& szRemoteFile = wxEmptyString); - - // POST - These Methods Post Data Passed In - bool Post(const char* buffer, size_t size, const wxString& szRemoteFile = wxEmptyString); - bool Post(wxInputStream& buffer, const wxString& szRemoteFile = wxEmptyString); - - // POST - This Method Uses Data As Defined By AddForm(...) - bool Post(const wxString& szRemoteFile = wxEmptyString); - - // TRACE - This Method Allows a Caller to Perform Diagnostic Tests - bool Trace(const wxString& szRemoteFile = wxEmptyString); - - // GET - These Methods Allow a Caller to Retrieve a Given Resource - bool Get(const wxString& szFilePath, const wxString& szRemoteFile = wxEmptyString); - size_t Get(char*& buffer, const wxString& szRemoteFile = wxEmptyString); - bool Get(wxOutputStream& buffer, const wxString& szRemoteFile = wxEmptyString); - - // PUT - These Methods Allow a Caller to Place a Resource on the Host - bool Put(const wxString& szFilePath, const wxString& szRemoteFile = wxEmptyString); - bool Put(const char* buffer, size_t size, const wxString& szRemoteFile = wxEmptyString); - bool Put(wxInputStream& buffer, const wxString& szRemoteFile = wxEmptyString); - - // DELETE - This Method Allows a Caller to Remove a Resource - bool Delete(const wxString& szRemoteLoc = wxEmptyString); - -protected: - - virtual void ResetPostData(); - virtual void SetCurlHandleToDefaults(const wxString& relativeURL); - - bool IsResponseOk() const; - - - struct curl_httppost* m_pPostHead; - struct curl_httppost* m_pPostTail; - - bool m_bUseCookies; - - wxCharBuffer m_szCookieFile; - - const char* m_pszPostFieldsData; - size_t m_iPostDataSize; -}; - -#endif // _WXCURLHTTP_H__INCLUDED_ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/panel.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/panel.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/panel.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/panel.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,101 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: panel.h -// Purpose: wxCurlConnectionSettingsPanel -// Author: Francesco Montorsi -// Created: 2007/05/5 -// RCS-ID: $Id: panel.h 1237 2010-03-10 21:52:47Z frm $ -// Copyright: (c) 2007 Francesco Montorsi -// Licence: wxWidgets licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WXCURL_PANEL_H_ -#define _WXCURL_PANEL_H_ - -#include "wx/panel.h" -#include "wx/curl/base.h" - -// forward declarations -//class WXDLLIMPEXP_CORE wxStaticText; -//class WXDLLIMPEXP_CORE wxTextCtrl; -//class WXDLLIMPEXP_CORE wxCheckBox; -//class WXDLLIMPEXP_CORE wxStaticBitmap; - -// ---------------------------------------------------------------------------- -// wxCurlConnectionSettingsPanel -// ---------------------------------------------------------------------------- - -//! Possible wxCurlConnectionSettingsPanel styles. -enum -{ - wxCCSP_PROXY_OPTIONS = 0x0040, //!< Shows the proxy options. - wxCCSP_AUTHENTICATION_OPTIONS = 0x0080, //!< Shows username&password fields. - wxCCSP_PORT_OPTION = 0x0100, //!< Shows the port option. - - wxCCSP_DEFAULT_STYLE = wxCCSP_PROXY_OPTIONS|wxCCSP_AUTHENTICATION_OPTIONS|wxCCSP_PORT_OPTION -}; - -//! A configurable panel which shows connection settings which can be -//! modified by the user (whose changes will be reflected on a libCURL handle, -//! i.e. on the wxCurlBase class passed to #SetCURLOptions). -class WXDLLIMPEXP_CURL wxCurlConnectionSettingsPanel : public wxPanel -{ -public: - wxCurlConnectionSettingsPanel() - { - m_pUsername = NULL; - m_pPassword = NULL; - m_pPort = NULL; - - m_pProxyCheckBox = NULL; - m_pProxyHost = NULL; - m_pProxyUsername = NULL; - m_pProxyPassword = NULL; - m_pProxyPort = NULL; - } - - wxCurlConnectionSettingsPanel(wxWindow* parent, wxWindowID id = wxID_ANY, - const wxString &msg = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCCSP_DEFAULT_STYLE, - const wxString& name = wxS("connsettingspanel")) - { Create(parent, id, msg, pos, size, style, name); } - - bool Create(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString &msg = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxCCSP_DEFAULT_STYLE, const wxString& name = wxS("connsettingspanel")); - - - //! Sets all user-defined options of this panel into the given curl object. - void SetCURLOptions(wxCurlBase *); - - -public: // event handlers - - void OnUseProxy(wxCommandEvent &ev); - -protected: // utils - - wxTextCtrl *AddSizerRow(wxSizer *sz, const wxString &name, bool grow = true); - void CreateControls(const wxString &msg); - -protected: // controls - - wxTextCtrl* m_pUsername; - wxTextCtrl* m_pPassword; - wxTextCtrl* m_pPort; - - wxCheckBox* m_pProxyCheckBox; - wxTextCtrl* m_pProxyHost; - wxTextCtrl* m_pProxyUsername; - wxTextCtrl* m_pProxyPassword; - wxTextCtrl* m_pProxyPort; - -private: - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxCurlConnectionSettingsPanel) -}; - - -#endif // _WXCURL_PANEL_H_ - diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/telnet.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/telnet.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/telnet.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/telnet.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -/* - * telnet.h - * wxCURL - * - * Created by Casey O'Donnell on Tue Jun 29 2004. - * Copyright (c) 2004 Casey O'Donnell. All rights reserved. - * - * Licence: wxWidgets Licence - */ - -// wxCurlTelnet.h: interface for the wxCurlTelnet class. -// -////////////////////////////////////////////////////////////////////// - -#ifndef _WXCURLTELNET_H__INCLUDED_ -#define _WXCURLTELNET_H__INCLUDED_ - -#include - -//! A specialized interface to TELNET derived from wxCurlBase. -class WXDLLIMPEXP_CURL wxCurlTelnet : public wxCurlBase -{ -public: - wxCurlTelnet(); - virtual ~wxCurlTelnet(); -}; - -#endif // _WXCURLTELNET_H__INCLUDED_ diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/thread.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/thread.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/thread.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/thread.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,381 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: thread.h -// Purpose: wxCurlDownloadThread, wxCurlUploadThread -// Author: Francesco Montorsi -// Created: 2007/04/14 -// RCS-ID: $Id: thread.h 1237 2010-03-10 21:52:47Z frm $ -// Copyright: (c) 2007 Francesco Montorsi -// Licence: wxWidgets licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WXCURL_THREAD_H_ -#define _WXCURL_THREAD_H_ - -// wxWidgets headers -#include "wx/defs.h" -#include "wx/thread.h" - -#include "wx/curl/base.h" - - -//! One of the protocols supported by wxCurl. -enum wxCurlProtocol -{ - wxCP_INVALID = -1, - - wxCP_HTTP, - wxCP_FTP -}; - -//! One of the possible errors code returned by wxCurl. -enum wxCurlThreadError -{ - wxCTE_NO_ERROR = wxTHREAD_NO_ERROR, //!< There was no error. - - wxCTE_NO_RESOURCE = wxTHREAD_NO_RESOURCE, //!< There were insufficient resources to create a new thread. - wxCTE_ALREADY_RUNNING = wxTHREAD_RUNNING, //!< The thread is already running. - wxCTE_INVALID_PROTOCOL, //!< The given URL requires an unspported protocol. - wxCTE_NO_VALID_STREAM, //!< The input/output stream could not be created or is invalid. - wxCTE_ABORTED, //!< The thread was user-aborted through wxCurlBaseThread::Abort(). - wxCTE_CURL_ERROR - //!< LibCURL failed. You can use thread->GetCurlSession()->GetErrorString() to get more info. -}; - -//! The stack size for wxCurl threads. -#define wxCURL_THREAD_STACK_SIZE 2048 - - -// ---------------------------------------------------------------------------- -// wxCurlBaseThread -// ---------------------------------------------------------------------------- - -//! Base class for wxCurl threads. -class WXDLLIMPEXP_CURL wxCurlBaseThread : public wxThread -{ -protected: - - //! The URL identifying the resource to download/upload. - wxString m_url; - - //! The libcurl handle being used for the transfer. - wxCurlBase *m_pCurl; - - //! The protocol being used for the transfer. - wxCurlProtocol m_protocol; - - //! The event handler which gets m_pCurl's events. - wxEvtHandler *m_pHandler; - int m_nId; - - //! This flag is set to true when the thread has been cancelled using Delete(). - //! Since it's continuosly read by the running thread and maybe written from - //! other threads, it needs a mutex. - bool m_bAbort; - wxMutex m_bAbortMutex; - -public: - wxCurlBaseThread(wxEvtHandler *handler = NULL, - int id = wxID_ANY) - : wxThread(wxTHREAD_JOINABLE) - { - m_protocol = wxCP_INVALID; - m_pCurl = NULL; - - m_nId = id; - m_pHandler = handler; - - m_bAbort = false; - } - -public: // thread execution management - - //! Returns true if this thread is ready to be started using e.g. #StartTransfer. - virtual bool IsOk() const - { return !m_url.empty() && m_pCurl!=NULL; } - - //! Starts the transfer. This is equivalent to call wxCurlDownloadThread::Download or - //! wxCurlUploadThread::Upload. - virtual wxCurlThreadError StartTransfer() = 0; - - //! Aborts this thread. - virtual void Abort(); - - //! Waits for the completion of the transfer. - virtual wxCurlThreadError Wait(); - - //! Pauses the transfer. - virtual wxCurlThreadError Pause(); - - //! Resumes the transfer. - virtual wxCurlThreadError Resume(); - - -public: // setters - - //! Sets the event handler to which wxCurlBeginPerformEvent, wxCurlEndPerformEvent - //! and wxCurlDownloadEvent/wxCurlUploadEvents will be posted. - void SetEvtHandler(wxEvtHandler *handler, int id = wxID_ANY) - { - wxCHECK_RET(!IsAlive(), wxS("Cannot use this function after the tranfer has begun")); - m_pHandler=handler; m_nId=id; - } - - //! Sets the URL to download/upload from/to. - wxCurlThreadError SetURL(const wxString &url); - -public: // getters - - wxEvtHandler *GetEvtHandler() const - { return m_pHandler; } - int GetId() const - { return m_nId; } - - //! Returns the wxCurlBase-derived object which is being used for the transfer. - //! Note that the returned value will be NULL if you've not called #SetURL yet. - //! You can cast it to the wxCurlBase-derived class associated with the return - //! value of GetProtocol() (e.g. if GetProtocol() returns wxCP_HTTP, you can cast - //! GetCurlSession() to wxCurlHTTP). - wxCurlBase *GetCurlSession() const - { return m_pCurl; } - - //! Returns the protocol used for the transfer. - //! This function will return something different from wxCP_INVALID only after - //! a call to #SetURL with a valid URL. - wxCurlProtocol GetProtocol() const - { return m_protocol; } - - //! Returns the URL of current transfer. - wxString GetURL() const - { return m_url; } - -public: // public utils - - //! Returns the protocol which should be used to download the resource - //! associated with the given URL. - static wxCurlProtocol GetProtocolFromURL(const wxString &url); - - //! Returns a pointer to a wxCurlBase-derived class suitable for handling - //! transfers on the given protocol. - //! You'll need to wx_static_cast the return value to the - //! right class in order to be able to set/get further options - //! (e.g. url/username/password/proxy/etc etc). - static wxCurlBase *CreateHandlerFor(wxCurlProtocol prot); - -protected: - - virtual bool TestDestroy(); - virtual void OnExit(); - - - // change the access type of some wxThread functions which should not - // be used on wxCurlBaseThread-derived classes. - - virtual wxCurlThreadError Create(unsigned int stackSize) - { return (wxCurlThreadError)wxThread::Create(stackSize); } - virtual wxCurlThreadError Run() - { return (wxCurlThreadError)wxThread::Run(); } - virtual wxCurlThreadError Delete() - { return (wxCurlThreadError)wxThread::Delete(); } -}; - - -// ---------------------------------------------------------------------------- -// wxCurlDownloadThreadOutputFilter -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CURL wxCurlDownloadThread; - -// private class used by wxCurlDownloadThread -class wxCurlDownloadThreadOutputFilter : public wxOutputStream -{ -protected: - wxCurlDownloadThread *m_thread; - wxOutputStream *m_stream; - -public: - wxCurlDownloadThreadOutputFilter(wxCurlDownloadThread *thread) - { m_thread = thread; m_stream = NULL; } - - void SetStream(wxOutputStream *realStream) - { m_stream = realStream; } - - virtual size_t OnSysWrite(const void *buffer, size_t bufsize); - - virtual bool IsOk() const - { return m_thread && m_stream && m_stream->IsOk(); } - - wxOutputStream *GetRealStream() const - { return m_stream; } - - wxFileOffset GetLength() const - { return m_stream->GetLength(); } - - bool Close() - { return m_stream->Close(); } -}; - - -// ---------------------------------------------------------------------------- -// wxCurlDownloadThread -// ---------------------------------------------------------------------------- - -//! A simple joinable thread which allows downloading -//! resources from the net without blocking the GUI of your app. -class WXDLLIMPEXP_CURL wxCurlDownloadThread : public wxCurlBaseThread -{ - friend class wxCurlDownloadThreadOutputFilter; // needs to access our TestDestroy() - -protected: - - //! The output stream for downloaded data. - wxCurlDownloadThreadOutputFilter m_output; - -public: - wxCurlDownloadThread(wxEvtHandler *handler = NULL, - int id = wxID_ANY, - const wxString &url = wxEmptyString, - wxOutputStream *out = NULL) - : wxCurlBaseThread(handler, id), - m_output(this) - { - if (!url.IsEmpty()) - Download(url, out); - } - -public: // public API - - //! Sets the output stream where the downloaded data are written. - //! If you pass NULL to this function, then a new temporary file will be used. - wxCurlThreadError SetOutputStream(wxOutputStream *out = NULL); - - //! Returns the output stream for downloaded data. - wxOutputStream *GetOutputStream() const - { - wxCHECK_MSG(!IsRunning(), NULL, - wxS("You cannot access the output stream while the thread is running!")); - return m_output.GetRealStream(); - } - - //! Returns true if this thread is ready to be started using #Download. - virtual bool IsOk() const - { return wxCurlBaseThread::IsOk() && m_output.IsOk(); } - - //! Creates and runs this thread for download of the given URL in the given - //! output stream (internally calls #SetURL and #SetOutputStream). - wxCurlThreadError Download(const wxString &url, wxOutputStream *out = NULL); - - //! Downloads the URL previously set with #SetURL using the output stream - //! previously set with #SetOutputStream. - wxCurlThreadError Download(); - -protected: - - // change access policy to force the user of the better-readable Download() method: - virtual wxCurlThreadError StartTransfer() - { return Download(); } - - virtual void *Entry(); -}; - - -// ---------------------------------------------------------------------------- -// wxCurlUploadThreadInputFilter -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CURL wxCurlUploadThread; - -// private class -class wxCurlUploadThreadInputFilter : public wxInputStream -{ -protected: - wxCurlUploadThread *m_thread; - wxInputStream *m_stream; - -public: - wxCurlUploadThreadInputFilter(wxCurlUploadThread *thread) - { m_thread = thread; m_stream = NULL; } - - void SetStream(wxInputStream *realStream) - { m_stream = realStream; } - - virtual size_t OnSysRead(void *buffer, size_t bufsize); - - virtual bool IsOk() const - { return m_thread && m_stream && m_stream->IsOk(); } - - wxInputStream *GetRealStream() const - { return m_stream; } - - wxFileOffset GetLength() const - { return m_stream->GetLength(); } - - char Peek() - { return m_stream->Peek(); } -}; - - -// ---------------------------------------------------------------------------- -// wxCurlUploadThread -// ---------------------------------------------------------------------------- - -//! A simple joinable thread which allows uploading -//! resources to the net without blocking the GUI of your app. -class WXDLLIMPEXP_CURL wxCurlUploadThread : public wxCurlBaseThread -{ - friend class wxCurlUploadThreadInputFilter; // needs to access our TestDestroy() - -protected: - - //! The input stream for uploaded data. - wxCurlUploadThreadInputFilter m_input; - -public: - wxCurlUploadThread(wxEvtHandler *handler = NULL, - int id = wxID_ANY, - const wxString &url = wxEmptyString, - wxInputStream *in = NULL) - : wxCurlBaseThread(handler, id), - m_input(this) - { - if (!url.IsEmpty()) - Upload(url, in); - } - -public: // public API - - //! Sets the output stream where the downloaded data are written. - //! If you pass NULL to this function, then a new temporary file will be used. - wxCurlThreadError SetInputStream(wxInputStream *in = NULL); - - //! Returns the output stream for downloaded data. - wxInputStream *GetInputStream() const - { - wxCHECK_MSG(!IsRunning(), NULL, - wxS("You cannot access the output stream while the thread is running!")); - return m_input.GetRealStream(); - } - - //! Returns true if this thread is ready to be started using #Upload. - virtual bool IsOk() const - { return wxCurlBaseThread::IsOk() && m_input.IsOk(); } - - //! Creates and runs this thread for upload to the given URL of the given - //! input stream (internally calls #SetURL and #SetOutputStream). - wxCurlThreadError Upload(const wxString &url, wxInputStream *in = NULL); - - //! Uploads the URL previously set with #SetURL using the input stream - //! previously set with #SetInputStream. - wxCurlThreadError Upload(); - -protected: - - // change access policy to force the user of the better-readable Upload() method: - virtual wxCurlThreadError StartTransfer() - { return Upload(); } - - virtual void *Entry(); -}; - - -#endif // _WXCURL_THREAD_H_ - diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/utils.h opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/utils.h --- opencpn-plugin-weatherfax-1.3.1/src/wxcurl/wx/curl/utils.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wxcurl/wx/curl/utils.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,107 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: utils.h -// Purpose: wxCurlSizeEvent, wxCurlSizeQueryThread -// Author: Francesco Montorsi -// Created: 2007/04/14 -// RCS-ID: $Id: utils.h 1237 2010-03-10 21:52:47Z frm $ -// Copyright: (c) 2007 Francesco Montorsi -// Licence: wxWidgets licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DOWNLOAD_H_ -#define _WX_DOWNLOAD_H_ - -#include "wx/curl/thread.h" - - -// ---------------------------------------------------------------------------- -// wxCurlSizeEvent -// ---------------------------------------------------------------------------- - -BEGIN_DECLARE_EVENT_TYPES() - DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CURL, wxCURL_SIZE_QUERY_EVENT, 66987) -END_DECLARE_EVENT_TYPES() - -//! This event gets posted by wxCurlSizeQueryThread. Use the EVT_CURL_SIZE_QUERY(id, func) -//! macro to intercept it. -class WXDLLIMPEXP_CURL wxCurlSizeEvent : public wxEvent -{ -protected: - wxString m_url; - double m_size; - -public: - wxCurlSizeEvent(int id, const wxString &url, double size) - : wxEvent(id, wxCURL_SIZE_QUERY_EVENT), m_url(url), m_size(size) {} - - double GetSize() const - { return m_size; } - wxString GetURL() const - { return m_url; } - - wxEvent* Clone() const - { return new wxCurlSizeEvent(*this); } -}; - -typedef void (wxEvtHandler::*wxCurlSizeEventFunction)(wxCurlSizeEvent&); - -#define wxCurlSizeEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxCurlSizeEventFunction, &func) - -#define EVT_CURL_SIZE_QUERY(id, fn) \ - wx__DECLARE_EVT1(wxCURL_SIZE_EVENT, id, wxCurlSizeEventHandler(fn)) - - - -// ---------------------------------------------------------------------------- -// wxCurlSizeQueryThread -// ---------------------------------------------------------------------------- - -//! This thread just retrieve the sizes of the given list of files and post them to -//! the registered event handler. -//! This is useful to show the size of one or more files to the user before downloading them. -class WXDLLIMPEXP_CURL wxCurlSizeQueryThread : public wxCurlBaseThread -{ - friend class wxCurlSizeQueryOutput; - -protected: - - //! The array with our retrieved sizes. - wxArrayLong m_urlSize; - - //! The list of the URLs for the files whose size must be queried. - wxArrayString m_urls; - -public: - wxCurlSizeQueryThread(wxEvtHandler *handler = NULL, - int id = wxID_ANY) - : wxCurlBaseThread(handler, id) { } - - //! Creates the thread for querying the size of given array of urls. - //! After calling the Run() function, the given event handler will get - //! a wxCurlSizeEvent for each URL passed in the list. - wxCurlSizeQueryThread(wxEvtHandler *handler, - int id, - const wxArrayString& urls) - : wxCurlBaseThread(handler, id) { m_urls=urls; } - - //! Sets the list of URLs to query the size for. - void SetURLs(const wxArrayString &urls) - { - wxCHECK_RET(!IsAlive(), wxS("Call this function before creating the thread!")); - m_urls=urls; - } - -protected: - - //! Caches the file sizes and then exits. - virtual void *Entry(); - - //! Sends the wxEVT_COMMAND_CACHESIZE_COMPLETE event - //! to the event handler. - virtual void OnExit(); -}; - - -#endif // _WX_DOWNLOAD_H_ - diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wximgkap.cpp opencpn-plugin-weatherfax-1.5001.0/src/wximgkap.cpp --- opencpn-plugin-weatherfax-1.3.1/src/wximgkap.cpp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wximgkap.cpp 2016-02-25 19:25:30.000000000 +0000 @@ -6,7 +6,6 @@ * *************************************************************************** * Copyright (C) 2013 by Sean D'Epagnier * - * sean at depagnier dot com * * * * 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 * @@ -701,7 +700,7 @@ static void read_line(uint8_t *in, uint16_t bits, int width, uint8_t *colors, histogram *hist, uint8_t *out) { int i; - uint8_t c; + uint8_t c = 0; switch (bits) { diff -Nru opencpn-plugin-weatherfax-1.3.1/src/wximgkap.h opencpn-plugin-weatherfax-1.5001.0/src/wximgkap.h --- opencpn-plugin-weatherfax-1.3.1/src/wximgkap.h 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/src/wximgkap.h 2016-02-25 19:25:30.000000000 +0000 @@ -6,7 +6,6 @@ * *************************************************************************** * Copyright (C) 2013 by Sean D'Epagnier * - * sean at depagnier dot com * * * * 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 * diff -Nru opencpn-plugin-weatherfax-1.3.1/VERSION.cmake opencpn-plugin-weatherfax-1.5001.0/VERSION.cmake --- opencpn-plugin-weatherfax-1.3.1/VERSION.cmake 1970-01-01 00:00:00.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/VERSION.cmake 2016-02-25 19:25:30.000000000 +0000 @@ -0,0 +1,4 @@ +SET(PLUGIN_VERSION_MAJOR "1") +SET(PLUGIN_VERSION_MINOR "5") +SET(PLUGIN_VERSION_PATCH "001") +SET(PLUGIN_VERSION_DATE "2015-11-01") diff -Nru opencpn-plugin-weatherfax-1.3.1/WeatherFax.fbp opencpn-plugin-weatherfax-1.5001.0/WeatherFax.fbp --- opencpn-plugin-weatherfax-1.3.1/WeatherFax.fbp 2015-04-23 16:25:34.000000000 +0000 +++ opencpn-plugin-weatherfax-1.5001.0/WeatherFax.fbp 2016-02-25 19:25:30.000000000 +0000 @@ -15232,6 +15232,176 @@ + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Device Index + + 0 + + + 0 + + 1 + m_staticText42 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + 0 + 10 + + 0 + + -1 + + 0 + + 1 + m_sDeviceIndex + 1 + + + protected + 1 + + Resizable + 1 + + wxSP_ARROW_KEYS + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +