diff --git a/src/cdogs/hqx/AUTHORS b/src/cdogs/hqx/AUTHORS deleted file mode 100644 index a8f60de24..000000000 --- a/src/cdogs/hqx/AUTHORS +++ /dev/null @@ -1,5 +0,0 @@ -Maxim Stepin - Creator of hqx filter - -Cameron Zemek - Package maintainer. Added 24bit color support. - -Francois Gannaz - Added transparency support. diff --git a/src/cdogs/hqx/CMakeLists.txt b/src/cdogs/hqx/CMakeLists.txt deleted file mode 100644 index 66d8aed04..000000000 --- a/src/cdogs/hqx/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -set(HQX_SOURCES - hq2x.c - hq3x.c - hq4x.c - init.c) -set(HQX_HEADERS - common.h - hqx.h) -add_library(hqx STATIC ${HQX_SOURCES} ${HQX_HEADERS}) \ No newline at end of file diff --git a/src/cdogs/hqx/COPYING b/src/cdogs/hqx/COPYING deleted file mode 100644 index 4362b4915..000000000 --- a/src/cdogs/hqx/COPYING +++ /dev/null @@ -1,502 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 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. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/src/cdogs/hqx/ChangeLog b/src/cdogs/hqx/ChangeLog deleted file mode 100644 index 6e31ae607..000000000 --- a/src/cdogs/hqx/ChangeLog +++ /dev/null @@ -1,13 +0,0 @@ -2010-03-31 Cameron Zemek - * *.c: Changed to use stdint.h for fixed width integer types - * common.h: Changed interpolate functions to work with 24bit color - * init.c: Changed RGBtoYUV table to convert 24bit color values - * hqx.c: Created command line tool that uses DevIL - -2011-12-05 Cameron Zemek - * Thanks for this change go to anbaricforce - * hqx.h: Added declarations for row byte versions - * hq*x.c: Added version of function that takes row bytes - -2011-12-05 Cameron Zemek , Francois Gannaz - * Added transparency support diff --git a/src/cdogs/hqx/NEWS b/src/cdogs/hqx/NEWS deleted file mode 100644 index 83b588d53..000000000 --- a/src/cdogs/hqx/NEWS +++ /dev/null @@ -1,8 +0,0 @@ -These are just highlights of what was changed during each release. For a more -in-depth version of what was changed, please look at the ChangeLog. - -1.0 ---- -- Added support for 24 bit color -- Created command line tool that uses DevIL library for loading/saving images -- Use autotools for build system diff --git a/src/cdogs/hqx/README b/src/cdogs/hqx/README deleted file mode 100644 index 099546201..000000000 --- a/src/cdogs/hqx/README +++ /dev/null @@ -1,70 +0,0 @@ -hqx Library README -================== - -Introduction ------------- -hqx is a fast, high-quality magnification filter designed for pixel art. - -Install -------- -NOTE: DevIL library and development headers are required. - - ./configure - make && make install - -For more information refer to INSTALL. - -Usage ------ -hqx -s scaleBy input output -Where scaleBy is either 2, 3 or 4 - -For example: - hqx -s 4 test.png out.png - -Example -------- -#include -#include - -uint32_t *src; // Pointer to source bitmap in RGB format -size_t width, height; // Size of source bitmap - -/* - * Code to init src, width & height - */ - -uint32_t *dest = (uint32_t *) malloc(width * 4 * height * 4 * sizeof(uint32_t)); -hqxInit(); -hq4x_32(src, dest, width, height); - -Implementation --------------- -The first step is an analysis of the 3x3 area of the source pixel. At first, we -calculate the color difference between the central pixel and its 8 nearest -neighbors. Then that difference is compared to a predefined threshold, and these -pixels are sorted into two categories: "close" and "distant" colored. There are -8 neighbors, so we are getting 256 possible combinations. - -For the next step, which is filtering, a lookup table with 256 entries is used, -one entry per each combination of close/distant colored neighbors. Each entry -describes how to mix the colors of the source pixels from 3x3 area to get -interpolated pixels of the filtered image. - -The present implementation is using YUV color space to calculate color -differences, with more tolerance on Y (brightness) component, then on color -components U and V. That color space conversion is quite easy to implement if -the format of the source image is 16 bit per pixel, using a simple lookup table. -It is also possible to calculate the color differences and compare them to a -threshold very fast, using MMX instructions. - -Creating a lookup table was the most difficult part - for each combination the -most probable vector representation of the area has to be determined, with the -idea of edges between the different colored areas of the image to be preserved, -with the edge direction to be as close to a correct one as possible. That vector -representation is then rasterised with higher (3x) resolution using -anti-aliasing, and the result is stored in the lookup table. - -The filter was not designed for photographs, but for images with clear sharp -edges, like line graphics or cartoon sprites. It was also designed to be fast -enough to process 256x256 images in real-time. diff --git a/src/cdogs/hqx/common.h b/src/cdogs/hqx/common.h deleted file mode 100644 index f905cb5da..000000000 --- a/src/cdogs/hqx/common.h +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright (C) 2003 Maxim Stepin ( maxst@hiend3d.com ) - * - * Copyright (C) 2010 Cameron Zemek ( grom@zeminvaders.net) - * Copyright (C) 2011 Francois Gannaz - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __HQX_COMMON_H_ -#define __HQX_COMMON_H_ - -#ifdef _MSC_VER -/* Windows */ -#define INLINE __inline -#else -/* Default / Linux */ -#define INLINE __inline__ -#endif - -#include -#include - -#define MASK_2 0x0000FF00 -#define MASK_13 0x00FF00FF -#define MASK_RGB 0x00FFFFFF -#define MASK_ALPHA 0xFF000000 - -#define Ymask 0x00FF0000 -#define Umask 0x0000FF00 -#define Vmask 0x000000FF -#define trY 0x00300000 -#define trU 0x00000700 -#define trV 0x00000006 - -/* RGB to YUV lookup table */ -extern uint32_t RGBtoYUV[16777216]; - -static INLINE uint32_t rgb_to_yuv(uint32_t c) -{ - // Mask against MASK_RGB to discard the alpha channel - return RGBtoYUV[MASK_RGB & c]; -} - -/* Test if there is difference in color */ -static INLINE int yuv_diff(uint32_t yuv1, uint32_t yuv2) { - return (( abs((yuv1 & Ymask) - (yuv2 & Ymask)) > trY ) || - ( abs((yuv1 & Umask) - (yuv2 & Umask)) > trU ) || - ( abs((yuv1 & Vmask) - (yuv2 & Vmask)) > trV ) ); -} - -static INLINE int Diff(uint32_t c1, uint32_t c2) -{ - return yuv_diff(rgb_to_yuv(c1), rgb_to_yuv(c2)); -} - -/* Interpolate functions */ -static INLINE uint32_t Interpolate_2(uint32_t c1, int w1, uint32_t c2, int w2, int s) -{ - if (c1 == c2) { - return c1; - } - return - (((((c1 & MASK_ALPHA) >> 24) * w1 + ((c2 & MASK_ALPHA) >> 24) * w2) << (24-s)) & MASK_ALPHA) + - ((((c1 & MASK_2) * w1 + (c2 & MASK_2) * w2) >> s) & MASK_2) + - ((((c1 & MASK_13) * w1 + (c2 & MASK_13) * w2) >> s) & MASK_13); -} - -static INLINE uint32_t Interpolate_3(uint32_t c1, int w1, uint32_t c2, int w2, uint32_t c3, int w3, int s) -{ - return - (((((c1 & MASK_ALPHA) >> 24) * w1 + ((c2 & MASK_ALPHA) >> 24) * w2 + ((c3 & MASK_ALPHA) >> 24) * w3) << (24-s)) & MASK_ALPHA) + - ((((c1 & MASK_2) * w1 + (c2 & MASK_2) * w2 + (c3 & MASK_2) * w3) >> s) & MASK_2) + - ((((c1 & MASK_13) * w1 + (c2 & MASK_13) * w2 + (c3 & MASK_13) * w3) >> s) & MASK_13); -} - -static INLINE uint32_t Interp1(uint32_t c1, uint32_t c2) -{ - //(c1*3+c2) >> 2; - return Interpolate_2(c1, 3, c2, 1, 2); -} - -static INLINE uint32_t Interp2(uint32_t c1, uint32_t c2, uint32_t c3) -{ - //(c1*2+c2+c3) >> 2; - return Interpolate_3(c1, 2, c2, 1, c3, 1, 2); -} - -static INLINE uint32_t Interp3(uint32_t c1, uint32_t c2) -{ - //(c1*7+c2)/8; - return Interpolate_2(c1, 7, c2, 1, 3); -} - -static INLINE uint32_t Interp4(uint32_t c1, uint32_t c2, uint32_t c3) -{ - //(c1*2+(c2+c3)*7)/16; - return Interpolate_3(c1, 2, c2, 7, c3, 7, 4); -} - -static INLINE uint32_t Interp5(uint32_t c1, uint32_t c2) -{ - //(c1+c2) >> 1; - return Interpolate_2(c1, 1, c2, 1, 1); -} - -static INLINE uint32_t Interp6(uint32_t c1, uint32_t c2, uint32_t c3) -{ - //(c1*5+c2*2+c3)/8; - return Interpolate_3(c1, 5, c2, 2, c3, 1, 3); -} - -static INLINE uint32_t Interp7(uint32_t c1, uint32_t c2, uint32_t c3) -{ - //(c1*6+c2+c3)/8; - return Interpolate_3(c1, 6, c2, 1, c3, 1, 3); -} - -static INLINE uint32_t Interp8(uint32_t c1, uint32_t c2) -{ - //(c1*5+c2*3)/8; - return Interpolate_2(c1, 5, c2, 3, 3); -} - -static INLINE uint32_t Interp9(uint32_t c1, uint32_t c2, uint32_t c3) -{ - //(c1*2+(c2+c3)*3)/8; - return Interpolate_3(c1, 2, c2, 3, c3, 3, 3); -} - -static INLINE uint32_t Interp10(uint32_t c1, uint32_t c2, uint32_t c3) -{ - //(c1*14+c2+c3)/16; - return Interpolate_3(c1, 14, c2, 1, c3, 1, 4); -} - -#endif diff --git a/src/cdogs/hqx/hq2x.c b/src/cdogs/hqx/hq2x.c deleted file mode 100644 index d97375253..000000000 --- a/src/cdogs/hqx/hq2x.c +++ /dev/null @@ -1,2808 +0,0 @@ -/* - * Copyright (C) 2003 Maxim Stepin ( maxst@hiend3d.com ) - * - * Copyright (C) 2010 Cameron Zemek ( grom@zeminvaders.net) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include "common.h" -#include "hqx.h" - -#define PIXEL00_0 *dp = w[5]; -#define PIXEL00_10 *dp = Interp1(w[5], w[1]); -#define PIXEL00_11 *dp = Interp1(w[5], w[4]); -#define PIXEL00_12 *dp = Interp1(w[5], w[2]); -#define PIXEL00_20 *dp = Interp2(w[5], w[4], w[2]); -#define PIXEL00_21 *dp = Interp2(w[5], w[1], w[2]); -#define PIXEL00_22 *dp = Interp2(w[5], w[1], w[4]); -#define PIXEL00_60 *dp = Interp6(w[5], w[2], w[4]); -#define PIXEL00_61 *dp = Interp6(w[5], w[4], w[2]); -#define PIXEL00_70 *dp = Interp7(w[5], w[4], w[2]); -#define PIXEL00_90 *dp = Interp9(w[5], w[4], w[2]); -#define PIXEL00_100 *dp = Interp10(w[5], w[4], w[2]); -#define PIXEL01_0 *(dp+1) = w[5]; -#define PIXEL01_10 *(dp+1) = Interp1(w[5], w[3]); -#define PIXEL01_11 *(dp+1) = Interp1(w[5], w[2]); -#define PIXEL01_12 *(dp+1) = Interp1(w[5], w[6]); -#define PIXEL01_20 *(dp+1) = Interp2(w[5], w[2], w[6]); -#define PIXEL01_21 *(dp+1) = Interp2(w[5], w[3], w[6]); -#define PIXEL01_22 *(dp+1) = Interp2(w[5], w[3], w[2]); -#define PIXEL01_60 *(dp+1) = Interp6(w[5], w[6], w[2]); -#define PIXEL01_61 *(dp+1) = Interp6(w[5], w[2], w[6]); -#define PIXEL01_70 *(dp+1) = Interp7(w[5], w[2], w[6]); -#define PIXEL01_90 *(dp+1) = Interp9(w[5], w[2], w[6]); -#define PIXEL01_100 *(dp+1) = Interp10(w[5], w[2], w[6]); -#define PIXEL10_0 *(dp+dpL) = w[5]; -#define PIXEL10_10 *(dp+dpL) = Interp1(w[5], w[7]); -#define PIXEL10_11 *(dp+dpL) = Interp1(w[5], w[8]); -#define PIXEL10_12 *(dp+dpL) = Interp1(w[5], w[4]); -#define PIXEL10_20 *(dp+dpL) = Interp2(w[5], w[8], w[4]); -#define PIXEL10_21 *(dp+dpL) = Interp2(w[5], w[7], w[4]); -#define PIXEL10_22 *(dp+dpL) = Interp2(w[5], w[7], w[8]); -#define PIXEL10_60 *(dp+dpL) = Interp6(w[5], w[4], w[8]); -#define PIXEL10_61 *(dp+dpL) = Interp6(w[5], w[8], w[4]); -#define PIXEL10_70 *(dp+dpL) = Interp7(w[5], w[8], w[4]); -#define PIXEL10_90 *(dp+dpL) = Interp9(w[5], w[8], w[4]); -#define PIXEL10_100 *(dp+dpL) = Interp10(w[5], w[8], w[4]); -#define PIXEL11_0 *(dp+dpL+1) = w[5]; -#define PIXEL11_10 *(dp+dpL+1) = Interp1(w[5], w[9]); -#define PIXEL11_11 *(dp+dpL+1) = Interp1(w[5], w[6]); -#define PIXEL11_12 *(dp+dpL+1) = Interp1(w[5], w[8]); -#define PIXEL11_20 *(dp+dpL+1) = Interp2(w[5], w[6], w[8]); -#define PIXEL11_21 *(dp+dpL+1) = Interp2(w[5], w[9], w[8]); -#define PIXEL11_22 *(dp+dpL+1) = Interp2(w[5], w[9], w[6]); -#define PIXEL11_60 *(dp+dpL+1) = Interp6(w[5], w[8], w[6]); -#define PIXEL11_61 *(dp+dpL+1) = Interp6(w[5], w[6], w[8]); -#define PIXEL11_70 *(dp+dpL+1) = Interp7(w[5], w[6], w[8]); -#define PIXEL11_90 *(dp+dpL+1) = Interp9(w[5], w[6], w[8]); -#define PIXEL11_100 *(dp+dpL+1) = Interp10(w[5], w[6], w[8]); - -HQX_API void HQX_CALLCONV hq2x_32_rb( uint32_t * sp, uint32_t srb, uint32_t * dp, uint32_t drb, int Xres, int Yres ) -{ - int i, j, k; - int prevline, nextline; - uint32_t w[10]; - int dpL = (drb >> 2); - int spL = (srb >> 2); - uint8_t *sRowP = (uint8_t *) sp; - uint8_t *dRowP = (uint8_t *) dp; - uint32_t yuv1, yuv2; - - // +----+----+----+ - // | | | | - // | w1 | w2 | w3 | - // +----+----+----+ - // | | | | - // | w4 | w5 | w6 | - // +----+----+----+ - // | | | | - // | w7 | w8 | w9 | - // +----+----+----+ - - for (j=0; j0) prevline = -spL; else prevline = 0; - if (j0) - { - w[1] = *(sp + prevline - 1); - w[4] = *(sp - 1); - w[7] = *(sp + nextline - 1); - } - else - { - w[1] = w[2]; - w[4] = w[5]; - w[7] = w[8]; - } - - if (i -#include "common.h" -#include "hqx.h" - -#define PIXEL00_1M *dp = Interp1(w[5], w[1]); -#define PIXEL00_1U *dp = Interp1(w[5], w[2]); -#define PIXEL00_1L *dp = Interp1(w[5], w[4]); -#define PIXEL00_2 *dp = Interp2(w[5], w[4], w[2]); -#define PIXEL00_4 *dp = Interp4(w[5], w[4], w[2]); -#define PIXEL00_5 *dp = Interp5(w[4], w[2]); -#define PIXEL00_C *dp = w[5]; - -#define PIXEL01_1 *(dp+1) = Interp1(w[5], w[2]); -#define PIXEL01_3 *(dp+1) = Interp3(w[5], w[2]); -#define PIXEL01_6 *(dp+1) = Interp1(w[2], w[5]); -#define PIXEL01_C *(dp+1) = w[5]; - -#define PIXEL02_1M *(dp+2) = Interp1(w[5], w[3]); -#define PIXEL02_1U *(dp+2) = Interp1(w[5], w[2]); -#define PIXEL02_1R *(dp+2) = Interp1(w[5], w[6]); -#define PIXEL02_2 *(dp+2) = Interp2(w[5], w[2], w[6]); -#define PIXEL02_4 *(dp+2) = Interp4(w[5], w[2], w[6]); -#define PIXEL02_5 *(dp+2) = Interp5(w[2], w[6]); -#define PIXEL02_C *(dp+2) = w[5]; - -#define PIXEL10_1 *(dp+dpL) = Interp1(w[5], w[4]); -#define PIXEL10_3 *(dp+dpL) = Interp3(w[5], w[4]); -#define PIXEL10_6 *(dp+dpL) = Interp1(w[4], w[5]); -#define PIXEL10_C *(dp+dpL) = w[5]; - -#define PIXEL11 *(dp+dpL+1) = w[5]; - -#define PIXEL12_1 *(dp+dpL+2) = Interp1(w[5], w[6]); -#define PIXEL12_3 *(dp+dpL+2) = Interp3(w[5], w[6]); -#define PIXEL12_6 *(dp+dpL+2) = Interp1(w[6], w[5]); -#define PIXEL12_C *(dp+dpL+2) = w[5]; - -#define PIXEL20_1M *(dp+dpL+dpL) = Interp1(w[5], w[7]); -#define PIXEL20_1D *(dp+dpL+dpL) = Interp1(w[5], w[8]); -#define PIXEL20_1L *(dp+dpL+dpL) = Interp1(w[5], w[4]); -#define PIXEL20_2 *(dp+dpL+dpL) = Interp2(w[5], w[8], w[4]); -#define PIXEL20_4 *(dp+dpL+dpL) = Interp4(w[5], w[8], w[4]); -#define PIXEL20_5 *(dp+dpL+dpL) = Interp5(w[8], w[4]); -#define PIXEL20_C *(dp+dpL+dpL) = w[5]; - -#define PIXEL21_1 *(dp+dpL+dpL+1) = Interp1(w[5], w[8]); -#define PIXEL21_3 *(dp+dpL+dpL+1) = Interp3(w[5], w[8]); -#define PIXEL21_6 *(dp+dpL+dpL+1) = Interp1(w[8], w[5]); -#define PIXEL21_C *(dp+dpL+dpL+1) = w[5]; - -#define PIXEL22_1M *(dp+dpL+dpL+2) = Interp1(w[5], w[9]); -#define PIXEL22_1D *(dp+dpL+dpL+2) = Interp1(w[5], w[8]); -#define PIXEL22_1R *(dp+dpL+dpL+2) = Interp1(w[5], w[6]); -#define PIXEL22_2 *(dp+dpL+dpL+2) = Interp2(w[5], w[6], w[8]); -#define PIXEL22_4 *(dp+dpL+dpL+2) = Interp4(w[5], w[6], w[8]); -#define PIXEL22_5 *(dp+dpL+dpL+2) = Interp5(w[6], w[8]); -#define PIXEL22_C *(dp+dpL+dpL+2) = w[5]; - -HQX_API void HQX_CALLCONV hq3x_32_rb( uint32_t * sp, uint32_t srb, uint32_t * dp, uint32_t drb, int Xres, int Yres ) -{ - int i, j, k; - int prevline, nextline; - uint32_t w[10]; - int dpL = (drb >> 2); - int spL = (srb >> 2); - uint8_t *sRowP = (uint8_t *) sp; - uint8_t *dRowP = (uint8_t *) dp; - uint32_t yuv1, yuv2; - - // +----+----+----+ - // | | | | - // | w1 | w2 | w3 | - // +----+----+----+ - // | | | | - // | w4 | w5 | w6 | - // +----+----+----+ - // | | | | - // | w7 | w8 | w9 | - // +----+----+----+ - - for (j=0; j0) prevline = -spL; else prevline = 0; - if (j0) - { - w[1] = *(sp + prevline - 1); - w[4] = *(sp - 1); - w[7] = *(sp + nextline - 1); - } - else - { - w[1] = w[2]; - w[4] = w[5]; - w[7] = w[8]; - } - - if (i -#include "common.h" -#include "hqx.h" - -#define PIXEL00_0 *dp = w[5]; -#define PIXEL00_11 *dp = Interp1(w[5], w[4]); -#define PIXEL00_12 *dp = Interp1(w[5], w[2]); -#define PIXEL00_20 *dp = Interp2(w[5], w[2], w[4]); -#define PIXEL00_50 *dp = Interp5(w[2], w[4]); -#define PIXEL00_80 *dp = Interp8(w[5], w[1]); -#define PIXEL00_81 *dp = Interp8(w[5], w[4]); -#define PIXEL00_82 *dp = Interp8(w[5], w[2]); -#define PIXEL01_0 *(dp+1) = w[5]; -#define PIXEL01_10 *(dp+1) = Interp1(w[5], w[1]); -#define PIXEL01_12 *(dp+1) = Interp1(w[5], w[2]); -#define PIXEL01_14 *(dp+1) = Interp1(w[2], w[5]); -#define PIXEL01_21 *(dp+1) = Interp2(w[2], w[5], w[4]); -#define PIXEL01_31 *(dp+1) = Interp3(w[5], w[4]); -#define PIXEL01_50 *(dp+1) = Interp5(w[2], w[5]); -#define PIXEL01_60 *(dp+1) = Interp6(w[5], w[2], w[4]); -#define PIXEL01_61 *(dp+1) = Interp6(w[5], w[2], w[1]); -#define PIXEL01_82 *(dp+1) = Interp8(w[5], w[2]); -#define PIXEL01_83 *(dp+1) = Interp8(w[2], w[4]); -#define PIXEL02_0 *(dp+2) = w[5]; -#define PIXEL02_10 *(dp+2) = Interp1(w[5], w[3]); -#define PIXEL02_11 *(dp+2) = Interp1(w[5], w[2]); -#define PIXEL02_13 *(dp+2) = Interp1(w[2], w[5]); -#define PIXEL02_21 *(dp+2) = Interp2(w[2], w[5], w[6]); -#define PIXEL02_32 *(dp+2) = Interp3(w[5], w[6]); -#define PIXEL02_50 *(dp+2) = Interp5(w[2], w[5]); -#define PIXEL02_60 *(dp+2) = Interp6(w[5], w[2], w[6]); -#define PIXEL02_61 *(dp+2) = Interp6(w[5], w[2], w[3]); -#define PIXEL02_81 *(dp+2) = Interp8(w[5], w[2]); -#define PIXEL02_83 *(dp+2) = Interp8(w[2], w[6]); -#define PIXEL03_0 *(dp+3) = w[5]; -#define PIXEL03_11 *(dp+3) = Interp1(w[5], w[2]); -#define PIXEL03_12 *(dp+3) = Interp1(w[5], w[6]); -#define PIXEL03_20 *(dp+3) = Interp2(w[5], w[2], w[6]); -#define PIXEL03_50 *(dp+3) = Interp5(w[2], w[6]); -#define PIXEL03_80 *(dp+3) = Interp8(w[5], w[3]); -#define PIXEL03_81 *(dp+3) = Interp8(w[5], w[2]); -#define PIXEL03_82 *(dp+3) = Interp8(w[5], w[6]); -#define PIXEL10_0 *(dp+dpL) = w[5]; -#define PIXEL10_10 *(dp+dpL) = Interp1(w[5], w[1]); -#define PIXEL10_11 *(dp+dpL) = Interp1(w[5], w[4]); -#define PIXEL10_13 *(dp+dpL) = Interp1(w[4], w[5]); -#define PIXEL10_21 *(dp+dpL) = Interp2(w[4], w[5], w[2]); -#define PIXEL10_32 *(dp+dpL) = Interp3(w[5], w[2]); -#define PIXEL10_50 *(dp+dpL) = Interp5(w[4], w[5]); -#define PIXEL10_60 *(dp+dpL) = Interp6(w[5], w[4], w[2]); -#define PIXEL10_61 *(dp+dpL) = Interp6(w[5], w[4], w[1]); -#define PIXEL10_81 *(dp+dpL) = Interp8(w[5], w[4]); -#define PIXEL10_83 *(dp+dpL) = Interp8(w[4], w[2]); -#define PIXEL11_0 *(dp+dpL+1) = w[5]; -#define PIXEL11_30 *(dp+dpL+1) = Interp3(w[5], w[1]); -#define PIXEL11_31 *(dp+dpL+1) = Interp3(w[5], w[4]); -#define PIXEL11_32 *(dp+dpL+1) = Interp3(w[5], w[2]); -#define PIXEL11_70 *(dp+dpL+1) = Interp7(w[5], w[4], w[2]); -#define PIXEL12_0 *(dp+dpL+2) = w[5]; -#define PIXEL12_30 *(dp+dpL+2) = Interp3(w[5], w[3]); -#define PIXEL12_31 *(dp+dpL+2) = Interp3(w[5], w[2]); -#define PIXEL12_32 *(dp+dpL+2) = Interp3(w[5], w[6]); -#define PIXEL12_70 *(dp+dpL+2) = Interp7(w[5], w[6], w[2]); -#define PIXEL13_0 *(dp+dpL+3) = w[5]; -#define PIXEL13_10 *(dp+dpL+3) = Interp1(w[5], w[3]); -#define PIXEL13_12 *(dp+dpL+3) = Interp1(w[5], w[6]); -#define PIXEL13_14 *(dp+dpL+3) = Interp1(w[6], w[5]); -#define PIXEL13_21 *(dp+dpL+3) = Interp2(w[6], w[5], w[2]); -#define PIXEL13_31 *(dp+dpL+3) = Interp3(w[5], w[2]); -#define PIXEL13_50 *(dp+dpL+3) = Interp5(w[6], w[5]); -#define PIXEL13_60 *(dp+dpL+3) = Interp6(w[5], w[6], w[2]); -#define PIXEL13_61 *(dp+dpL+3) = Interp6(w[5], w[6], w[3]); -#define PIXEL13_82 *(dp+dpL+3) = Interp8(w[5], w[6]); -#define PIXEL13_83 *(dp+dpL+3) = Interp8(w[6], w[2]); -#define PIXEL20_0 *(dp+dpL+dpL) = w[5]; -#define PIXEL20_10 *(dp+dpL+dpL) = Interp1(w[5], w[7]); -#define PIXEL20_12 *(dp+dpL+dpL) = Interp1(w[5], w[4]); -#define PIXEL20_14 *(dp+dpL+dpL) = Interp1(w[4], w[5]); -#define PIXEL20_21 *(dp+dpL+dpL) = Interp2(w[4], w[5], w[8]); -#define PIXEL20_31 *(dp+dpL+dpL) = Interp3(w[5], w[8]); -#define PIXEL20_50 *(dp+dpL+dpL) = Interp5(w[4], w[5]); -#define PIXEL20_60 *(dp+dpL+dpL) = Interp6(w[5], w[4], w[8]); -#define PIXEL20_61 *(dp+dpL+dpL) = Interp6(w[5], w[4], w[7]); -#define PIXEL20_82 *(dp+dpL+dpL) = Interp8(w[5], w[4]); -#define PIXEL20_83 *(dp+dpL+dpL) = Interp8(w[4], w[8]); -#define PIXEL21_0 *(dp+dpL+dpL+1) = w[5]; -#define PIXEL21_30 *(dp+dpL+dpL+1) = Interp3(w[5], w[7]); -#define PIXEL21_31 *(dp+dpL+dpL+1) = Interp3(w[5], w[8]); -#define PIXEL21_32 *(dp+dpL+dpL+1) = Interp3(w[5], w[4]); -#define PIXEL21_70 *(dp+dpL+dpL+1) = Interp7(w[5], w[4], w[8]); -#define PIXEL22_0 *(dp+dpL+dpL+2) = w[5]; -#define PIXEL22_30 *(dp+dpL+dpL+2) = Interp3(w[5], w[9]); -#define PIXEL22_31 *(dp+dpL+dpL+2) = Interp3(w[5], w[6]); -#define PIXEL22_32 *(dp+dpL+dpL+2) = Interp3(w[5], w[8]); -#define PIXEL22_70 *(dp+dpL+dpL+2) = Interp7(w[5], w[6], w[8]); -#define PIXEL23_0 *(dp+dpL+dpL+3) = w[5]; -#define PIXEL23_10 *(dp+dpL+dpL+3) = Interp1(w[5], w[9]); -#define PIXEL23_11 *(dp+dpL+dpL+3) = Interp1(w[5], w[6]); -#define PIXEL23_13 *(dp+dpL+dpL+3) = Interp1(w[6], w[5]); -#define PIXEL23_21 *(dp+dpL+dpL+3) = Interp2(w[6], w[5], w[8]); -#define PIXEL23_32 *(dp+dpL+dpL+3) = Interp3(w[5], w[8]); -#define PIXEL23_50 *(dp+dpL+dpL+3) = Interp5(w[6], w[5]); -#define PIXEL23_60 *(dp+dpL+dpL+3) = Interp6(w[5], w[6], w[8]); -#define PIXEL23_61 *(dp+dpL+dpL+3) = Interp6(w[5], w[6], w[9]); -#define PIXEL23_81 *(dp+dpL+dpL+3) = Interp8(w[5], w[6]); -#define PIXEL23_83 *(dp+dpL+dpL+3) = Interp8(w[6], w[8]); -#define PIXEL30_0 *(dp+dpL+dpL+dpL) = w[5]; -#define PIXEL30_11 *(dp+dpL+dpL+dpL) = Interp1(w[5], w[8]); -#define PIXEL30_12 *(dp+dpL+dpL+dpL) = Interp1(w[5], w[4]); -#define PIXEL30_20 *(dp+dpL+dpL+dpL) = Interp2(w[5], w[8], w[4]); -#define PIXEL30_50 *(dp+dpL+dpL+dpL) = Interp5(w[8], w[4]); -#define PIXEL30_80 *(dp+dpL+dpL+dpL) = Interp8(w[5], w[7]); -#define PIXEL30_81 *(dp+dpL+dpL+dpL) = Interp8(w[5], w[8]); -#define PIXEL30_82 *(dp+dpL+dpL+dpL) = Interp8(w[5], w[4]); -#define PIXEL31_0 *(dp+dpL+dpL+dpL+1) = w[5]; -#define PIXEL31_10 *(dp+dpL+dpL+dpL+1) = Interp1(w[5], w[7]); -#define PIXEL31_11 *(dp+dpL+dpL+dpL+1) = Interp1(w[5], w[8]); -#define PIXEL31_13 *(dp+dpL+dpL+dpL+1) = Interp1(w[8], w[5]); -#define PIXEL31_21 *(dp+dpL+dpL+dpL+1) = Interp2(w[8], w[5], w[4]); -#define PIXEL31_32 *(dp+dpL+dpL+dpL+1) = Interp3(w[5], w[4]); -#define PIXEL31_50 *(dp+dpL+dpL+dpL+1) = Interp5(w[8], w[5]); -#define PIXEL31_60 *(dp+dpL+dpL+dpL+1) = Interp6(w[5], w[8], w[4]); -#define PIXEL31_61 *(dp+dpL+dpL+dpL+1) = Interp6(w[5], w[8], w[7]); -#define PIXEL31_81 *(dp+dpL+dpL+dpL+1) = Interp8(w[5], w[8]); -#define PIXEL31_83 *(dp+dpL+dpL+dpL+1) = Interp8(w[8], w[4]); -#define PIXEL32_0 *(dp+dpL+dpL+dpL+2) = w[5]; -#define PIXEL32_10 *(dp+dpL+dpL+dpL+2) = Interp1(w[5], w[9]); -#define PIXEL32_12 *(dp+dpL+dpL+dpL+2) = Interp1(w[5], w[8]); -#define PIXEL32_14 *(dp+dpL+dpL+dpL+2) = Interp1(w[8], w[5]); -#define PIXEL32_21 *(dp+dpL+dpL+dpL+2) = Interp2(w[8], w[5], w[6]); -#define PIXEL32_31 *(dp+dpL+dpL+dpL+2) = Interp3(w[5], w[6]); -#define PIXEL32_50 *(dp+dpL+dpL+dpL+2) = Interp5(w[8], w[5]); -#define PIXEL32_60 *(dp+dpL+dpL+dpL+2) = Interp6(w[5], w[8], w[6]); -#define PIXEL32_61 *(dp+dpL+dpL+dpL+2) = Interp6(w[5], w[8], w[9]); -#define PIXEL32_82 *(dp+dpL+dpL+dpL+2) = Interp8(w[5], w[8]); -#define PIXEL32_83 *(dp+dpL+dpL+dpL+2) = Interp8(w[8], w[6]); -#define PIXEL33_0 *(dp+dpL+dpL+dpL+3) = w[5]; -#define PIXEL33_11 *(dp+dpL+dpL+dpL+3) = Interp1(w[5], w[6]); -#define PIXEL33_12 *(dp+dpL+dpL+dpL+3) = Interp1(w[5], w[8]); -#define PIXEL33_20 *(dp+dpL+dpL+dpL+3) = Interp2(w[5], w[8], w[6]); -#define PIXEL33_50 *(dp+dpL+dpL+dpL+3) = Interp5(w[8], w[6]); -#define PIXEL33_80 *(dp+dpL+dpL+dpL+3) = Interp8(w[5], w[9]); -#define PIXEL33_81 *(dp+dpL+dpL+dpL+3) = Interp8(w[5], w[6]); -#define PIXEL33_82 *(dp+dpL+dpL+dpL+3) = Interp8(w[5], w[8]); - -HQX_API void HQX_CALLCONV hq4x_32_rb( uint32_t * sp, uint32_t srb, uint32_t * dp, uint32_t drb, int Xres, int Yres ) -{ - int i, j, k; - int prevline, nextline; - uint32_t w[10]; - int dpL = (drb >> 2); - int spL = (srb >> 2); - uint8_t *sRowP = (uint8_t *) sp; - uint8_t *dRowP = (uint8_t *) dp; - uint32_t yuv1, yuv2; - - // +----+----+----+ - // | | | | - // | w1 | w2 | w3 | - // +----+----+----+ - // | | | | - // | w4 | w5 | w6 | - // +----+----+----+ - // | | | | - // | w7 | w8 | w9 | - // +----+----+----+ - - for (j=0; j0) prevline = -spL; else prevline = 0; - if (j0) - { - w[1] = *(sp + prevline - 1); - w[4] = *(sp - 1); - w[7] = *(sp + nextline - 1); - } - else - { - w[1] = w[2]; - w[4] = w[5]; - w[7] = w[8]; - } - - if (i - -#if defined( __GNUC__ ) - #ifdef __MINGW32__ - #define HQX_CALLCONV __stdcall - #else - #define HQX_CALLCONV - #endif -#else - #define HQX_CALLCONV -#endif - -#define HQX_API - -HQX_API void HQX_CALLCONV hqxInit(void); -HQX_API void HQX_CALLCONV hq2x_32( uint32_t * src, uint32_t * dest, int width, int height ); -HQX_API void HQX_CALLCONV hq3x_32( uint32_t * src, uint32_t * dest, int width, int height ); -HQX_API void HQX_CALLCONV hq4x_32( uint32_t * src, uint32_t * dest, int width, int height ); - -HQX_API void HQX_CALLCONV hq2x_32_rb( uint32_t * src, uint32_t src_rowBytes, uint32_t * dest, uint32_t dest_rowBytes, int width, int height ); -HQX_API void HQX_CALLCONV hq3x_32_rb( uint32_t * src, uint32_t src_rowBytes, uint32_t * dest, uint32_t dest_rowBytes, int width, int height ); -HQX_API void HQX_CALLCONV hq4x_32_rb( uint32_t * src, uint32_t src_rowBytes, uint32_t * dest, uint32_t dest_rowBytes, int width, int height ); - -#endif diff --git a/src/cdogs/hqx/init.c b/src/cdogs/hqx/init.c deleted file mode 100644 index 217358165..000000000 --- a/src/cdogs/hqx/init.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2010 Cameron Zemek ( grom@zeminvaders.net) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include -#include "hqx.h" - -uint32_t RGBtoYUV[16777216]; -uint32_t YUV1, YUV2; - -HQX_API void HQX_CALLCONV hqxInit(void) -{ - /* Initalize RGB to YUV lookup table */ - uint32_t c, r, g, b, y, u, v; - for (c = 0; c < 16777215; c++) { - r = (c & 0xFF0000) >> 16; - g = (c & 0x00FF00) >> 8; - b = c & 0x0000FF; - y = (uint32_t)(0.299*r + 0.587*g + 0.114*b); - u = (uint32_t)(-0.169*r - 0.331*g + 0.5*b) + 128; - v = (uint32_t)(0.5*r - 0.419*g - 0.081*b) + 128; - RGBtoYUV[c] = (y << 16) + (u << 8) + v; - } -}