goulash-lover
/
legacy-imlib2
forked from old/legacy-imlib2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Several miscellaneous bugfixes I did while converting Eterm to use Imlib2. 

SVN revision: 2469
This commit is contained in:
Michael Jennings 2000-04-12 23:40:10 +00:00
parent 927519352b
commit 1759a0c9e4
8 changed files with 136 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@ -25,6 +25,7 @@ dnl AM_DISABLE_STATIC
AC_LIBTOOL_DLOPEN AC_LIBTOOL_DLOPEN
dnl AC_LIBTOOL_WIN32_DLL dnl AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
AM_WITH_DMALLOC
if test X"$enable_shared" = Xyes; then if test X"$enable_shared" = Xyes; then
DLLDFLAGS=-export-dynamic DLLDFLAGS=-export-dynamic

264
libltdl/COPYING.LIB
View File

@ -1,15 +1,13 @@
GNU LIBRARY GENERAL PUBLIC LICENSE
Version 2, June 1991
GNU LESSER GENERAL PUBLIC LICENSE Copyright (C) 1991 Free Software Foundation, Inc.
Version 2.1, February 1999 675 Mass Ave, Cambridge, MA 02139, USA
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
[This is the first released version of the Lesser GPL. It also counts [This is the first released version of the library GPL. It is
as the successor of the GNU Library Public License, version 2, hence numbered 2 because it goes with version 2 of the ordinary GPL.]
the version number 2.1.]
Preamble Preamble
@ -18,111 +16,97 @@ freedom to share and change it. By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users. free software--to make sure the software is free for all its users.
This license, the Lesser General Public License, applies to some This license, the Library General Public License, applies to some
specially designated software packages--typically libraries--of the specially designated Free Software Foundation software, and to any
Free Software Foundation and other authors who decide to use it. You other libraries whose authors decide to use it. You can use it for
can use it too, but we suggest you first think carefully about whether your libraries, too.
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, When we speak of free software, we are referring to freedom, not
not price. Our General Public Licenses are designed to make sure that price. Our General Public Licenses are designed to make sure that you
you have the freedom to distribute copies of free software (and charge have the freedom to distribute copies of free software (and charge for
for this service if you wish); that you receive source code or can get this service if you wish), that you receive source code or can get it
it if you want it; that you can change the software and use pieces of if you want it, that you can change the software or use pieces of it
it in new free programs; and that you are informed that you can do in new free programs; and that you know you can do these things.
these things.
To protect your rights, we need to make restrictions that forbid To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these anyone to deny you these rights or to ask you to surrender the rights.
rights. These restrictions translate to certain responsibilities for These restrictions translate to certain responsibilities for you if
you if you distribute copies of the library or if you modify it. you distribute copies of the library, or if you modify it.
For example, if you distribute copies of the library, whether gratis 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 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 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 code. If you link a program with the library, you must provide
complete object files to the recipients, so that they can relink them complete object files to the recipients so that they can relink them
with the library after making changes to the library and recompiling with the library, after making changes to the library and recompiling
it. And you must show them these terms so they know their rights. 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 Our method of protecting your rights has two steps: (1) copyright
library, and (2) we offer you this license, which gives you legal the library, and (2) offer you this license which gives you legal
permission to copy, distribute and/or modify the library. permission to copy, distribute and/or modify the library.
To protect each distributor, we want to make it very clear that Also, for each distributor's protection, we want to make certain
there is no warranty for the free library. Also, if the library is that everyone understands that there is no warranty for this free
modified by someone else and passed on, the recipients should know library. If the library is modified by someone else and passed on, we
that what they have is not the original version, so that the original want its recipients to know that what they have is not the original
author's reputation will not be affected by problems that might be version, so that any problems introduced by others will not reflect on
introduced by others. the original authors' reputations.
^L
Finally, software patents pose a constant threat to the existence of Finally, any free program is threatened constantly by software
any free program. We wish to make sure that a company cannot patents. We wish to avoid the danger that companies distributing free
effectively restrict the users of a free program by obtaining a software will individually obtain patent licenses, thus in effect
restrictive license from a patent holder. Therefore, we insist that transforming the program into proprietary software. To prevent this,
any patent license obtained for a version of the library must be we have made it clear that any patent must be licensed for everyone's
consistent with the full freedom of use specified in this license. free use or not licensed at all.
Most GNU software, including some libraries, is covered by the Most GNU software, including some libraries, is covered by the ordinary
ordinary GNU General Public License. This license, the GNU Lesser GNU General Public License, which was designed for utility programs. This
General Public License, applies to certain designated libraries, and license, the GNU Library General Public License, applies to certain
is quite different from the ordinary General Public License. We use designated libraries. This license is quite different from the ordinary
this license for certain libraries in order to permit linking those one; be sure to read it in full, and don't assume that anything in it is
libraries into non-free programs. the same as in the ordinary license.
When a program is linked with a library, whether statically or using The reason we have a separate public license for some libraries is that
a shared library, the combination of the two is legally speaking a they blur the distinction we usually make between modifying or adding to a
combined work, a derivative of the original library. The ordinary program and simply using it. Linking a program with a library, without
General Public License therefore permits such linking only if the changing the library, is in some sense simply using the library, and is
entire combination fits its criteria of freedom. The Lesser General analogous to running a utility program or application program. However, in
Public License permits more lax criteria for linking other code with a textual and legal sense, the linked executable is a combined work, a
the library. derivative of the original library, and the ordinary General Public License
treats it as such.
We call this license the "Lesser" General Public License because it Because of this blurred distinction, using the ordinary General
does Less to protect the user's freedom than the ordinary General Public License for libraries did not effectively promote software
Public License. It also provides other free software developers Less sharing, because most developers did not use the libraries. We
of an advantage over competing non-free programs. These disadvantages concluded that weaker conditions might promote sharing better.
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 However, unrestricted linking of non-free programs would deprive the
encourage the widest possible use of a certain library, so that it users of those programs of all benefit from the free status of the
becomes libraries themselves. This Library General Public License is intended to
a de-facto standard. To achieve this, non-free programs must be permit developers of non-free programs to use free libraries, while
allowed to use the library. A more frequent case is that a free preserving your freedom as a user of such programs to change the free
library does the same job as widely used non-free libraries. In this libraries that are incorporated in them. (We have not seen how to achieve
case, there is little to gain by limiting the free library to free this as regards changes in header files, but we have achieved it as regards
software only, so we use the Lesser General Public License. changes in the actual functions of the Library.) The hope is that this
will lead to faster development of free libraries.
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 The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The "work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must former contains code derived from the library, while the latter only
be combined with the library in order to run. works together with the library.
^L
GNU LESSER GENERAL PUBLIC LICENSE Note that it is possible for a library to be covered by the ordinary
General Public License rather than by this special one.
GNU LIBRARY GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other 0. This License Agreement applies to any software library which
program which contains a notice placed by the copyright holder or contains a notice placed by the copyright holder or other authorized
other authorized party saying it may be distributed under the terms of party saying it may be distributed under the terms of this Library
this Lesser General Public License (also called "this License"). General Public License (also called "this License"). Each licensee is
Each licensee is addressed as "you". addressed as "you".
A "library" means a collection of software functions and/or data A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs prepared so as to be conveniently linked with application programs
@ -139,8 +123,7 @@ included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for "Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control interface definition files, plus the scripts used to control compilation
compilation
and installation of the library. and installation of the library.
Activities other than copying, distribution and modification are not Activities other than copying, distribution and modification are not
@ -220,7 +203,7 @@ 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 ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in that version instead if you wish.) Do not make any other change in
these notices. these notices.
^L
Once this change is made in a given copy, it is irreversible for 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 that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy. subsequent copies and derivative works made from that copy.
@ -271,8 +254,8 @@ Library will still fall under Section 6.)
distribute the object code for the work under the terms of Section 6. distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6, Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself. whether or not they are linked directly with the Library itself.
^L
6. As an exception to the Sections above, you may also combine or 6. As an exception to the Sections above, you may also compile or
link a "work that uses the Library" with the Library to produce a link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit under terms of your choice, provided that the terms permit
@ -299,31 +282,23 @@ of these things:
Library will not necessarily be able to recompile the application Library will not necessarily be able to recompile the application
to use the modified definitions.) to use the modified definitions.)
b) Use a suitable shared library mechanism for linking with the b) Accompany the work with a written offer, valid for at
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 least three years, to give the same user the materials
specified in Subsection 6a, above, for a charge no more specified in Subsection 6a, above, for a charge no more
than the cost of performing this distribution. than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy c) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above from a designated place, offer equivalent access to copy the above
specified materials from the same place. specified materials from the same place.
e) Verify that the user has already received a copy of these d) Verify that the user has already received a copy of these
materials or that you have already sent this user a copy. materials or that you have already sent this user a copy.
For an executable, the required form of the "work that uses the For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for Library" must include any data and utility programs needed for
reproducing the executable from it. However, as a special exception, reproducing the executable from it. However, as a special exception,
the materials to be distributed need not include anything that is the source code distributed need not include anything that is normally
normally distributed (in either source or binary form) with the major distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies which the executable runs, unless that component itself accompanies
the executable. the executable.
@ -333,7 +308,7 @@ restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you use both them and the Library together in an executable that you
distribute. distribute.
^L
7. You may place library facilities that are a work based on the 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 Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined facilities not covered by this License, and distribute such a combined
@ -372,9 +347,9 @@ Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions. You may not impose any further subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein. restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with You are not responsible for enforcing compliance by third parties to
this License. this License.
^L
11. If, as a consequence of a court judgment or allegation of patent 11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues), infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or conditions are imposed on you (whether by court order, agreement or
@ -388,10 +363,9 @@ 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 the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library. refrain entirely from distribution of the Library.
If any portion of this section is held invalid or unenforceable under If any portion of this section is held invalid or unenforceable under any
any particular circumstance, the balance of the section is intended to particular circumstance, the balance of the section is intended to apply,
apply, and the section as a whole is intended to apply in other and the section as a whole is intended to apply in other circumstances.
circumstances.
It is not the purpose of this section to induce you to infringe any 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 patents or other property right claims or to contest validity of any
@ -409,14 +383,14 @@ be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in 12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License original copyright holder who places the Library under this License may add
may add an explicit geographical distribution limitation excluding those an explicit geographical distribution limitation excluding those countries,
countries, so that distribution is permitted only in or among so that distribution is permitted only in or among countries not thus
countries not thus excluded. In such case, this License incorporates excluded. In such case, this License incorporates the limitation as if
the limitation as if written in the body of this License. written in the body of this License.
13. The Free Software Foundation may publish revised and/or new 13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time. versions of the Library General Public License from time to time.
Such new versions will be similar in spirit to the present version, Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns. but may differ in detail to address new problems or concerns.
@ -427,7 +401,7 @@ conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by license version number, you may choose any version ever published by
the Free Software Foundation. the Free Software Foundation.
^L
14. If you wish to incorporate parts of the Library into other free 14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these, programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is write to the author to ask for permission. For software which is
@ -461,55 +435,47 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES. DAMAGES.
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
^L
How to Apply These Terms to Your New Libraries Appendix: How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest 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 possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting everyone can redistribute and change. You can do so by permitting
redistribution under these terms (or, alternatively, under the terms redistribution under these terms (or, alternatively, under the terms of the
of the ordinary General Public License). ordinary General Public License).
To apply these terms, attach the following notices to the library. To apply these terms, attach the following notices to the library. It is
It is safest to attach them to the start of each source file to most safest to attach them to the start of each source file to most effectively
effectively convey the exclusion of warranty; and each file should convey the exclusion of warranty; and each file should have at least the
have at least the "copyright" line and a pointer to where the full "copyright" line and a pointer to where the full notice is found.
notice is found.
<one line to give the library's name and a brief idea of what it does.>
<one line to give the library's name and a brief idea of what it
does.>
Copyright (C) <year> <name of author> Copyright (C) <year> <name of author>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version. version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful, This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details. Library General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free Software License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
Also add information on how to contact you by electronic and paper Also add information on how to contact you by electronic and paper mail.
mail.
You should also get your employer (if you work as a programmer) or You should also get your employer (if you work as a programmer) or your
your
school, if any, to sign a "copyright disclaimer" for the library, if school, if any, to sign a "copyright disclaimer" for the library, if
necessary. Here is a sample; alter the names: necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the Yoyodyne, Inc., hereby disclaims all copyright interest in the
library `Frob' (a library for tweaking knobs) written by James library `Frob' (a library for tweaking knobs) written by James Random Hacker.
Random Hacker.
<signature of Ty Coon>, 1 April 1990 <signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice Ty Coon, President of Vice
That's all there is to it! That's all there is to it!

8
libltdl/README
View File

@ -1,9 +1 @@
This is GNU libltdl, a system independent dlopen wrapper for GNU libtool. This is GNU libltdl, a system independent dlopen wrapper for GNU libtool.
It supports the following dlopen interfaces:
* dlopen (Solaris, Linux and various BSD flavors)
* shl_load (HP-UX)
* LoadLibrary (Win16 and Win32)
* load_add_on (BeOS)
* GNU DLD (emulates dynamic linking for static libraries)
* libtool's dlpreopen

3
src/common.h
View File

@ -5,6 +5,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <config.h> #include <config.h>
#ifdef WITH_DMALLOC
# include <dmalloc.h>
#endif
#define DATABIG unsigned long long #define DATABIG unsigned long long
#define DATA64 unsigned long long #define DATA64 unsigned long long

2
src/draw.c
View File

@ -68,6 +68,8 @@ __imlib_CreatePixmapsForImage(Display *d, Drawable w, Visual *v, int depth,
ip->dither_mask = dither_mask; ip->dither_mask = dither_mask;
ip->hi_quality = hiq; ip->hi_quality = hiq;
ip->references = 1; ip->references = 1;
ip->pixmap = pmap;
ip->mask = mask;
__imlib_AddImagePixmapToCache(ip); __imlib_AddImagePixmapToCache(ip);
return 1; return 1;
} }

2
src/image.c
View File

@ -370,7 +370,7 @@ __imlib_FindCachedImagePixmap(ImlibImage *im, int w, int h, Display *d, Visual *
{ {
/* if all the pixmap attributes match */ /* if all the pixmap attributes match */
if ((ip->w == w) && (ip->h == h) && (ip->depth == depth) && if ((ip->w == w) && (ip->h == h) && (ip->depth == depth) &&
(!ip->dirty) && (!ip->dirty) && (ip->image == im) &&
(ip->visual == v) && (ip->display == d) && (ip->visual == v) && (ip->display == d) &&
(ip->source_x == sx) && (ip->source_x == sy) && (ip->source_x == sx) && (ip->source_x == sy) &&
(ip->source_w == sw) && (ip->source_h == sh) && (ip->source_w == sw) && (ip->source_h == sh) &&

18
src/rend.c
View File

@ -29,7 +29,7 @@ __imlib_RenderImage(Display *d, ImlibImage *im,
Visual *v, Colormap cm, int depth, Visual *v, Colormap cm, int depth,
int sx, int sy, int sw, int sh, int sx, int sy, int sw, int sh,
int dx, int dy, int dw, int dh, int dx, int dy, int dw, int dh,
char anitalias, char hiq, char blend, char dither_mask, char antialias, char hiq, char blend, char dither_mask,
ImlibColorModifier *cmod, ImlibOp op) ImlibColorModifier *cmod, ImlibOp op)
{ {
XImage *xim = NULL, *mxim = NULL; XImage *xim = NULL, *mxim = NULL;
@ -100,7 +100,7 @@ __imlib_RenderImage(Display *d, ImlibImage *im,
return; return;
} }
/* calculate aliasing counts */ /* calculate aliasing counts */
if (anitalias) if (antialias)
{ {
yapoints = __imlib_CalcApoints(im->h, sch, im->border.top, im->border.bottom); yapoints = __imlib_CalcApoints(im->h, sch, im->border.top, im->border.bottom);
if (!yapoints) if (!yapoints)
@ -139,7 +139,7 @@ __imlib_RenderImage(Display *d, ImlibImage *im,
xim = __imlib_ProduceXImage(d, v, depth, dw, dh, &shm); xim = __imlib_ProduceXImage(d, v, depth, dw, dh, &shm);
if (!xim) if (!xim)
{ {
if (anitalias) if (antialias)
{ {
free(xapoints); free(xapoints);
free(yapoints); free(yapoints);
@ -159,7 +159,7 @@ __imlib_RenderImage(Display *d, ImlibImage *im,
if (!mxim) if (!mxim)
{ {
__imlib_ConsumeXImage(d, xim); __imlib_ConsumeXImage(d, xim);
if (anitalias) if (antialias)
{ {
free(xapoints); free(xapoints);
free(yapoints); free(yapoints);
@ -181,7 +181,7 @@ __imlib_RenderImage(Display *d, ImlibImage *im,
__imlib_ConsumeXImage(d, xim); __imlib_ConsumeXImage(d, xim);
if (m) if (m)
__imlib_ConsumeXImage(d, mxim); __imlib_ConsumeXImage(d, mxim);
if (anitalias) if (antialias)
{ {
free(xapoints); free(xapoints);
free(yapoints); free(yapoints);
@ -210,7 +210,7 @@ __imlib_RenderImage(Display *d, ImlibImage *im,
if (ypoints) if (ypoints)
{ {
/* scale the imagedata for this LINESIZE lines chunk of image data */ /* scale the imagedata for this LINESIZE lines chunk of image data */
if (anitalias) if (antialias)
{ {
if (IMAGE_HAS_ALPHA(im)) if (IMAGE_HAS_ALPHA(im))
__imlib_ScaleAARGBA(ypoints, xpoints, buf, xapoints, __imlib_ScaleAARGBA(ypoints, xpoints, buf, xapoints,
@ -467,10 +467,10 @@ __imlib_RenderImage(Display *d, ImlibImage *im,
free(ypoints); free(ypoints);
free(xpoints); free(xpoints);
} }
if (anitalias) if (antialias)
{ {
free(yapoints); if (yapoints) free(yapoints);
free(xapoints); if (xapoints) free(xapoints);
} }
if (back) if (back)
free(back); free(back);

2
src/rgba.c
View File

@ -3254,7 +3254,6 @@ __imlib_RGBA_to_A1_fast(DATA32 *src , int src_jump,
w = width; w = width;
h = height; h = height;
memset(dest, 0, (((w + 7) >> 3) + dest_jump) * height);
for (y = 0; y < h; y++) for (y = 0; y < h; y++)
{ {
for (x = 0; x < w; x++) for (x = 0; x < w; x++)
@ -3279,7 +3278,6 @@ __imlib_RGBA_to_A1_dither(DATA32 *src , int src_jump,
w = width + dx; w = width + dx;
h = height + dy; h = height + dy;
memset(dest, 0, (((width + 7) >> 3) + dest_jump) * height);
for (y = dy; y < h; y++) for (y = dy; y < h; y++)
{ {
for (x = dx; x < w; x++) for (x = dx; x < w; x++)