Commit d117f522 authored by Alessandro Ghedini's avatar Alessandro Ghedini

Imported Upstream version 1.4.5

parent fd9e74d9
......@@ -21,7 +21,7 @@ You can do what you want with the source of this software - it doesn't
matter. We still have it here for ourselves and it is open and free to use
and download and play with. It can't be taken away. We don't really mind what
you do with the source to your software. We would simply like to know that
you are using it - especially if it makes it to a commerical product. If you
you are using it - especially if it makes it to a commercial product. If you
simply e-mail all the AUTHORS (see COPYING and AUTHORS files) telling us, and
then make sure you include a paragraph or page in the manual for the product
with the copyright notice and state that you used this software, we will be
......
2011-08-15 19:30 kwo
* configure.ac: 1.4.5.
2011-04-15 22:04 kwo
* configure.ac: Avoid referencing /usr/X11R6 when x_dir is not set.
... which normally it will not be, AFAICT.
2011-04-15 22:04 kwo
* src/bin/Makefile.am: Fix program linking (ticket 725).
2011-04-09 09:24 kwo
* src/modules/loaders/loader_pnm.c: PNM loader: Refactor around
progress and exits.
2011-04-09 09:24 kwo
* src/modules/loaders/loader_pnm.c: Fix loading of .pbm's (P4) when
width is not a multiple of 8.
2011-04-09 09:24 kwo
* src/bin/imlib2_bumpmap.c, src/bin/imlib2_colorspace.c,
src/bin/imlib2_grab.c, src/bin/imlib2_poly.c,
src/bin/imlib2_show.c, src/bin/imlib2_test.c, src/lib/api.c,
src/lib/blend.c, src/lib/color.c, src/lib/grab.c,
src/lib/image.c, src/lib/rend.c, src/lib/rgba.c,
src/lib/rgbadraw.c, src/lib/script.c, src/lib/span.c,
src/modules/filters/filter_bumpmap.c,
src/modules/filters/filter_colormod.c,
src/modules/filters/filter_test.c,
src/modules/loaders/loader_argb.c,
src/modules/loaders/loader_bmp.c,
src/modules/loaders/loader_bz2.c,
src/modules/loaders/loader_gif.c,
src/modules/loaders/loader_id3.c,
src/modules/loaders/loader_jpeg.c,
src/modules/loaders/loader_lbm.c,
src/modules/loaders/loader_png.c,
src/modules/loaders/loader_pnm.c,
src/modules/loaders/loader_tga.c,
src/modules/loaders/loader_zlib.c: Indent (most) .c files.
2011-03-20 17:19 kwo
* src/lib/image.c: Better image cache time stamp test.
2011-03-11 21:13 kwo
* src/modules/loaders/loader_pnm.c: Fix pnm image loading in
certain situations (ticket 721).
"It fails with "large" images, written with multiple pixels on
the same line."
Patch by quentin.stievenart@gmail.com
2011-02-19 19:33 vapier
* src/modules/loaders/loader_png.c: png loader: do not hit
"interlaced" member of the png ptr struct
this should work with libpng 1.[245].x ... did not check anything
older than that though
patch by Thomas Klausner
2011-02-19 19:23 vapier
* src/modules/loaders/loader_png.c: png loader: use png_jmpbuf()
macro rather than hitting jmpbuf directly
this should work with libpng 1.[245].x ... did not check anything
older than that though
patch by Thomas Klausner
2010-11-08 05:54 raster
* debian: no more debian dir in our svn - debian now handles this
tehmselves.
2010-09-20 17:09 lucas
* src/lib/image.c, src/lib/scale.c: Fix typos
"he->the" where appropriate
2010-09-09 03:31 lucas
* COPYING-PLAIN, ChangeLog, TODO, debian/imlib2-config.1,
imlib2.c.in, src/bin/imlib2_test.c, src/lib/Imlib2.h,
src/lib/api.c, src/lib/asm_rotate.S, src/lib/asm_scale.S,
src/lib/blend.h, src/lib/color_helpers.c, src/lib/context.c,
src/lib/font_load.c, src/lib/grab.c, src/lib/image.c,
src/lib/image.h, src/lib/rend.c, src/lib/scale.c,
src/lib/ximage.c: Fix common misspellings
Following misspellings were fixed:
adn->and
alwasy->always
arbitary->arbitrary
cant->can't
commerical->commercial
comprimise->compromise
consistant->consistent
dependant->dependent
didnt->didn't
doesnt->doesn't
enviroments->environments
foudn->found
fucntion->function
isnt->isn't
iwth->with
mroe->more
neccesary->necessary
onyl->only
paranthesis->parenthesis
parralel->parallel
refernces->references
seperate->separate
shoudl->should
soem->some
wasnt->wasn't
wiht->with
wokr->work
2010-09-02 21:19 kwo
* src/lib/rend.c: Fix imlib_render_image_part_on_drawable_at_size()
...
... when using color modifier and not scaling (ticket 576).
2010-08-26 01:34 lucas
* src/lib/grab.c: Revert and re-apply badnull patch
Revert previous patch generated by badnull.cocci script, and
apply the new one.
The main difference is that assert and assert-like functions are
not touched
anymore.
2010-08-21 13:52 lucas
* src/bin/imlib2_bumpmap.c, src/bin/imlib2_colorspace.c,
src/bin/imlib2_conv.c, src/bin/imlib2_grab.c,
src/bin/imlib2_poly.c, src/bin/imlib2_show.c,
src/bin/imlib2_test.c, src/bin/imlib2_view.c,
src/lib/dynamic_filters.c, src/lib/file.c, src/lib/grab.c,
src/lib/script.c, src/modules/filters/filter_test.c,
src/modules/loaders/loader_id3.c,
src/modules/loaders/loader_png.c,
src/modules/loaders/loader_tiff.c: Convert (hopefully) all
comparisons to NULL
Apply badzero.cocci, badnull.coci and badnull2.cocci
This should convert all cases where there's a comparison to NULL
to simpler
forms. This patch applies the following transformations:
code before patch ||code after patch
===============================================================
return a == NULL; return !a;
return a != NULL; return !!a;
func(a == NULL); func(!a);
func(a != NULL); func(!!a);
b = a == NULL; b = !a;
b = a != NULL; b = !!a;
b = a == NULL ? c : d; b = !a ? c : d;
b = a != NULL ? c : d; b = a ? c : d;
other cases:
a == NULL !a
a != NULL a
2010-08-13 12:53 lucas
* src/lib/image.c, src/lib/rend.c: Apply memset-calloc.cocci
Change calls to malloc + memset to calloc whenever an automatic
conversion can
be done.
Possible candidates are not treated here, only the ones we can be
sure the
conversion is safe.
2010-08-04 16:57 lucas
* src/lib/font.h: FORMATTING
* Remove vim modelines:
find . -name '*.[chx]' -exec sed -i '/\/\*$/ {N;N;/ \* vim:ts/d}'
\{\} \;
find . -name '*.[chx]' -exec sed -i '/\/[\*\/] *vim:/d' \{\} \;
* Remove leading blank lines:
find . -name '*.[cxh]' -exec sed -i '/./,$!d'
If you use vim, use this in your .vimrc:
set ts=8 sw=3 sts=8 expandtab cino=>5n-3f0^-2{2(0W1st0
2010-07-26 18:14 kwo
* src/modules/loaders/loader_tiff.c: Fix reading tiff images with
orientation other than ORIENTATION_TOPLEFT (ticket 563).
There are almost certainly still issues to be fixed, particularly
around progess() and certain combinations of orientation and
tiling.
2010-07-26 18:14 kwo
* src/modules/loaders/loader_tiff.c: Avoid some duplicated code.
2010-07-26 18:14 kwo
* src/bin/imlib2_view.c: imlib2_view stuff.
- Add -s option to show scaled image.
- Handle WM_DELETE_WINDOW.
- Quit on keypress 'q'.
- Trivial cleanups.
2010-07-14 02:05 lucas
* src/lib/image.c, src/modules/loaders/loader_pnm.c,
src/modules/loaders/loader_tga.c: Remove unneeded code with
notnull.cocci script
The notnull.cocci script from Coccinelle finds places where you
check if a
variable is NULL, but it's known not to be NULL. The check can be
safely
removed. For example, this code would be caught by notnull:
if (!var) return;
if (var && var->fld) { ... }
It's needless to check again if var is not NULL because if it's
in fact NULL,
it would have returned on the previous "if". This commit removes
all the
trivial places where this pattern happens. Another patch will be
generated for
the more complex cases.
2010-05-05 18:25 kwo
* ChangeLog: Update ChangeLog.
2010-05-05 18:23 kwo
* configure.ac: 1.4.4.
......
......@@ -36,7 +36,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/README.in \
$(srcdir)/config.h.in $(srcdir)/imlib2-config.in \
$(srcdir)/imlib2.pc.in $(srcdir)/imlib2.spec.in \
......@@ -195,9 +195,12 @@ 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@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PNG_CFLAGS = @PNG_CFLAGS@
PNG_LIBS = @PNG_LIBS@
RANLIB = @RANLIB@
......@@ -249,7 +252,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
lt_version = @lt_version@
mandir = @mandir@
mkdir_p = @mkdir_p@
......
Imlib2 1.4.4
Imlib2 1.4.5
This is the Imlib 2 library - a library that does image file loading and
saving as well as rendering, manipulation, arbitrary polygon support, etc.
......@@ -36,7 +36,7 @@ BUILDING PACKAGES:
RPM: To build rpm packages:
sudo rpm -ta imlib2-1.4.4.tar.gz
sudo rpm -ta imlib2-1.4.5.tar.gz
You will find rpm packages in your system /usr/src/redhat/* dirs (note you may
not need to use sudo or root if you have your own ~/.rpmrc. see rpm documents
......@@ -44,11 +44,11 @@ for more details)
DEB: To build deb packages:
tar zvf imlib2-1.4.4.tar.gz
cd imlib2-1.4.4
tar zvf imlib2-1.4.5.tar.gz
cd imlib2-1.4.5
dpkg-buildpackage -us -uc -rfakeroot
cd ..
rm -rf imlib2-1.4.4
rm -rf imlib2-1.4.5
You will find all the debian source, binary etc. packages put in the directory
where you first untarred the source tarball.
* line code doesnt draw nice liens when clipping - fix
* line code doesn't draw nice liens when clipping - fix
* filled polygons can break fill bounds on corner cases - fix
* go thru TODOs and FIXMEs
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -61,6 +61,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
......
This diff is collapsed.
# get rid of that stupid cache mechanism
rm -f config.cache
AC_INIT(imlib2, 1.4.4, enlightenment-devel@lists.sourceforge.net)
AC_INIT(imlib2, 1.4.5, enlightenment-devel@lists.sourceforge.net)
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR(configure.ac)
dnl#AC_CONFIG_MACRO_DIR([m4])
......@@ -34,7 +34,7 @@ define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
AC_PROG_LIBTOOL
VERSION_CUR=5
VERSION_REV=4
VERSION_REV=5
VERSION_AGE=4
lt_version=${VERSION_CUR}:${VERSION_REV}:${VERSION_AGE}
AC_SUBST(lt_version)
......@@ -126,9 +126,8 @@ fi
if test "x$have_x" = "xyes"; then
AC_PATH_XTRA
x_dir=${x_dir:-/usr/X11R6}
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
x_cflags=$X_CFLAGS
x_libs=$X_LIBS" -lX11 -lXext"
AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
else
x_cflags=""
......
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = fonts images
This diff is collapsed.
MAINTAINERCLEANFILES = Makefile.in
FILES = \
cinema.ttf \
grunge.ttf \
morpheus.ttf \
notepad.ttf
filesdir = $(pkgdatadir)/data/fonts
files_DATA = $(FILES)
EXTRA_DIST = $(FILES)
This diff is collapsed.
MAINTAINERCLEANFILES = Makefile.in
FILES = \
audio.png \
bg.png \
bulb.png \
cal.png \
calc.png \
folder.png \
globe.png \
imlib2.png \
lock.png \
mail.png \
menu.png \
mush.png \
paper.png \
sh1.png \
sh2.png \
sh3.png \
stop.png \
tnt.png
filesdir = $(pkgdatadir)/data/images
files_DATA = $(FILES)
EXTRA_DIST = $(FILES)
This diff is collapsed.
......@@ -111,9 +111,12 @@ 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@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PNG_CFLAGS = @PNG_CFLAGS@
PNG_LIBS = @PNG_LIBS@
RANLIB = @RANLIB@
......@@ -165,7 +168,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
lt_version = @lt_version@
mandir = @mandir@
mkdir_p = @mkdir_p@
......@@ -201,9 +203,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu doc/Makefile
$(AUTOMAKE) --foreign doc/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
Summary: Powerful image loading and rendering library
Name: imlib2
Version: 1.4.4
Version: 1.4.5
Release: 0.%(date '+%Y%m%d')
License: BSD
Group: System Environment/Libraries
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -151,9 +151,12 @@ 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@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PNG_CFLAGS = @PNG_CFLAGS@
PNG_LIBS = @PNG_LIBS@
RANLIB = @RANLIB@
......@@ -205,7 +208,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
lt_version = @lt_version@
mandir = @mandir@
mkdir_p = @mkdir_p@
......@@ -238,9 +240,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu src/Makefile
$(AUTOMAKE) --foreign src/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -18,22 +18,22 @@ imlib2_conv_SOURCES = imlib2_conv.c
imlib2_conv_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_show_SOURCES = imlib2_show.c
imlib2_show_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_show_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11 -lm
imlib2_test_SOURCES = imlib2_test.c
imlib2_test_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_test_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
imlib2_bumpmap_SOURCES = imlib2_bumpmap.c
imlib2_bumpmap_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_bumpmap_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
imlib2_poly_SOURCES = imlib2_poly.c
imlib2_poly_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_poly_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
imlib2_colorspace_SOURCES = imlib2_colorspace.c
imlib2_colorspace_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_colorspace_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
imlib2_view_SOURCES = imlib2_view.c
imlib2_view_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_view_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
imlib2_grab_SOURCES = imlib2_grab.c
imlib2_grab_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_grab_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
......@@ -175,9 +175,12 @@ 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@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PNG_CFLAGS = @PNG_CFLAGS@
PNG_LIBS = @PNG_LIBS@
RANLIB = @RANLIB@
......@@ -229,7 +232,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
lt_version = @lt_version@
mandir = @mandir@
mkdir_p = @mkdir_p@
......@@ -259,19 +261,19 @@ INCLUDES = \
imlib2_conv_SOURCES = imlib2_conv.c
imlib2_conv_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_show_SOURCES = imlib2_show.c
imlib2_show_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_show_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11 -lm
imlib2_test_SOURCES = imlib2_test.c
imlib2_test_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_test_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
imlib2_bumpmap_SOURCES = imlib2_bumpmap.c
imlib2_bumpmap_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_bumpmap_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
imlib2_poly_SOURCES = imlib2_poly.c
imlib2_poly_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_poly_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
imlib2_colorspace_SOURCES = imlib2_colorspace.c
imlib2_colorspace_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_colorspace_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
imlib2_view_SOURCES = imlib2_view.c
imlib2_view_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_view_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
imlib2_grab_SOURCES = imlib2_grab.c
imlib2_grab_LDADD = $(top_builddir)/src/lib/libImlib2.la
imlib2_grab_LDADD = $(top_builddir)/src/lib/libImlib2.la -lX11
all: all-am
.SUFFIXES:
......@@ -285,9 +287,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/bin/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/bin/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu src/bin/Makefile
$(AUTOMAKE) --foreign src/bin/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
......
......@@ -44,20 +44,19 @@ main(int argc, char **argv)
/**
* First tests to determine which rendering task to perform
*/
if (display_name == NULL)
display_name = ":0";
if (!display_name)
display_name = ":0";
disp = XOpenDisplay(display_name);
if (disp == NULL)
if (!disp)
{
fprintf(stderr, "Can't open display %s\n", display_name);
return 1;
fprintf(stderr, "Can't open display %s\n", display_name);
return 1;
}
vis = DefaultVisual(disp, DefaultScreen(disp));
depth = DefaultDepth(disp, DefaultScreen(disp));
cm = DefaultColormap(disp, DefaultScreen(disp));
win =
XCreateSimpleWindow(disp, DefaultRootWindow(disp), 0, 0, 100, 100, 0, 0,
0);
win = XCreateSimpleWindow(disp, DefaultRootWindow(disp), 0, 0, 100, 100,
0, 0, 0);
XSelectInput(disp, win,
ButtonPressMask | ButtonReleaseMask | ButtonMotionMask |
PointerMotionMask | ExposureMask);
......@@ -74,8 +73,8 @@ main(int argc, char **argv)
imlib_context_set_blend(0);
imlib_context_set_color_modifier(NULL);
im_bg = imlib_load_image(PACKAGE_DATA_DIR"/data/images/imlib2.png");
im = imlib_load_image(PACKAGE_DATA_DIR"/data/images/imlib2.png");
im_bg = imlib_load_image(PACKAGE_DATA_DIR "/data/images/imlib2.png");
im = imlib_load_image(PACKAGE_DATA_DIR "/data/images/imlib2.png");
imlib_context_set_image(im_bg);
w = imlib_image_get_width();
......@@ -96,16 +95,16 @@ main(int argc, char **argv)
XNextEvent(disp, &ev);
switch (ev.type)
{
case Expose:
break;
case ButtonRelease:
exit(0);
break;
case MotionNotify:
x = ev.xmotion.x;
y = ev.xmotion.y;
default:
break;
case Expose:
break;
case ButtonRelease:
exit(0);
break;
case MotionNotify:
x = ev.xmotion.x;
y = ev.xmotion.y;
default:
break;
}
}
......@@ -122,7 +121,8 @@ main(int argc, char **argv)
* first = 0; */
imlib_apply_filter
("bump_map_point(x=[],y=[],map="PACKAGE_DATA_DIR"/data/images/imlib2.png);", &x, &y);
("bump_map_point(x=[],y=[],map=" PACKAGE_DATA_DIR
"/data/images/imlib2.png);", &x, &y);
temp2 = im_bg;
im_bg = temp;
......
......@@ -34,20 +34,19 @@ main(int argc, char **argv)
/**
* First tests to determine which rendering task to perform
*/
if (display_name == NULL)
display_name = ":0";
if (!display_name)
display_name = ":0";
disp = XOpenDisplay(display_name);
if (disp == NULL)
if (!disp)
{
fprintf(stderr, "Can't open display %s\n", display_name);
return 1;
fprintf(stderr, "Can't open display %s\n", display_name);
return 1;
}
vis = DefaultVisual(disp, DefaultScreen(disp));
depth = DefaultDepth(disp, DefaultScreen(disp));
cm = DefaultColormap(disp, DefaultScreen(disp));
win =
XCreateSimpleWindow(disp, DefaultRootWindow(disp), 0, 0, 100, 100, 0, 0,
0);
win = XCreateSimpleWindow(disp, DefaultRootWindow(disp), 0, 0, 100, 100,
0, 0, 0);
XSelectInput(disp, win,
ButtonPressMask | ButtonReleaseMask | ButtonMotionMask |