Commit 378dec26 authored by Alessandro Ghedini's avatar Alessandro Ghedini

Imported Upstream version 1.4.2

parent d69c8541
......@@ -9,7 +9,7 @@ HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html
HTML_HEADER = doc/head.html
HTML_FOOTER = doc/foot.html
HTML_STYLESHEET = doc/imlib2.css
HTML_STYLESHEET = doc/e.css
HTML_ALIGN_MEMBERS = YES
ENUM_VALUES_PER_LINE = 1
GENERATE_HTMLHELP = NO
......@@ -18,7 +18,7 @@ HHC_LOCATION =
GENERATE_CHI = NO
BINARY_TOC = NO
TOC_EXPAND = NO
DISABLE_INDEX = NO
DISABLE_INDEX = YES
EXTRACT_ALL = NO
EXTRACT_PRIVATE = NO
EXTRACT_STATIC = NO
......
......@@ -2,14 +2,9 @@
SUBDIRS = src data doc
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
config.h.in config.sub configure install-sh \
ltconfig ltmain.sh missing mkinstalldirs \
stamp-h.in build-stamp configure-stamp depcomp \
imlib2_docs.tar.gz imlib2.c \
README \
imlib2.pc \
imlib2.spec
MAINTAINERCLEANFILES = aclocal.m4 config.guess config.h.in \
config.sub configure depcomp install-sh \
ltmain.sh Makefile.in missing imlib2_docs.tar.gz
bin_SCRIPTS = imlib2-config
......@@ -17,7 +12,18 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN gendoc \
Doxyfile \
README.in README \
imlib2.pc.in \
imlib2.spec.in imlib2.spec
imlib2.spec.in imlib2.spec \
debian/changelog \
debian/changelog.in \
debian/control \
debian/copyright \
debian/imlib2-config.1 \
debian/imlib2-demo.install \
debian/imlib2-test.install \
debian/libimlib2-dev.doc-base \
debian/libimlib2-dev.install \
debian/libimlib2.install \
debian/rules
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = imlib2.pc
This diff is collapsed.
Imlib2 1.4.0
Imlib2 1.4.2
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.0.tar.gz
sudo rpm -ta imlib2-1.4.2.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.0.tar.gz
cd imlib2-1.4.0
tar zvf imlib2-1.4.2.tar.gz
cd imlib2-1.4.2
dpkg-buildpackage -us -uc -rfakeroot
cd ..
rm -rf imlib2-1.4.0
rm -rf imlib2-1.4.2
You will find all the debian source, binary etc. packages put in the directory
where you first untarred the source tarball.
This diff is collapsed.
This diff is collapsed.
/* config.h.in. Generated from configure.in by autoheader. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* enabling X11 support */
#undef BUILD_X11
......@@ -42,24 +42,12 @@
/* Name of package */
#undef PACKAGE
/* Installation directory for user executables */
#undef PACKAGE_BIN_DIR
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Shared Data Directory */
#undef PACKAGE_DATA_DIR
/* Installation directory for libraries */
#undef PACKAGE_LIB_DIR
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Source code directory */
#undef PACKAGE_SOURCE_DIR
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
......@@ -75,9 +63,13 @@
/* Version number of package */
#undef VERSION
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
#undef WORDS_BIGENDIAN
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel and VAX). */
#if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
#elif ! defined __LITTLE_ENDIAN__
# undef WORDS_BIGENDIAN
#endif
/* Define to 1 if the X Window System is missing or not being used. */
#undef X_DISPLAY_MISSING
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = images
SUBDIRS = fonts images
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -10,7 +10,7 @@ done
#done
rm -rf ./doc/html ./doc/latex ./doc/man
doxygen
cp doc/img/*.png doc/html/
cp doc/img/* doc/html/
rm -f imlib2_docs.tar imlib2_docs.tar.gz
tar -cvf imlib2_docs.tar doc/html doc/man doc/latex
gzip -9 imlib2_docs.tar
......
Summary: Powerful image loading and rendering library
Name: imlib2
Version: 1.4.0
Release: 0.%(date '+%Y%m%d')
Version: 1.4.2
Release: 1
License: BSD
Group: System Environment/Libraries
URL: http://www.enlightenment.org
......
Summary: Powerful image loading and rendering library
Name: imlib2
Version: @VERSION@
Release: 0.%(date '+%Y%m%d')
Release: 1
License: BSD
Group: System Environment/Libraries
URL: http://www.enlightenment.org
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -3,6 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
INCLUDES = \
-I../lib \
-I$(top_srcdir)/src/lib \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
@my_includes@
if BUILD_X11
......
This diff is collapsed.
......@@ -61,7 +61,6 @@ main(int argc, char **argv)
XSelectInput(disp, win,
ButtonPressMask | ButtonReleaseMask | ButtonMotionMask |
PointerMotionMask | ExposureMask);
XMapWindow(disp, win);
/**
* Start rendering
......@@ -81,9 +80,11 @@ main(int argc, char **argv)
imlib_context_set_image(im_bg);
w = imlib_image_get_width();
h = imlib_image_get_height();
printf("Resizing Window to %d by %d\n", w, h);
XResizeWindow(disp, win, w, h);
XMapWindow(disp, win);
XSync(disp, False);
x = -9999;
y = -9999;
while (1)
......
......@@ -51,7 +51,6 @@ main(int argc, char **argv)
XSelectInput(disp, win,
ButtonPressMask | ButtonReleaseMask | ButtonMotionMask |
PointerMotionMask | ExposureMask | KeyPressMask);
XMapWindow(disp, win);
/**
* Start rendering
......@@ -72,7 +71,9 @@ main(int argc, char **argv)
h = imlib_image_get_height();
imlib_context_set_color(128, 128, 255, 255);
imlib_image_fill_rectangle(0, 0, w, h);
XResizeWindow(disp, win, w, h);
XMapWindow(disp, win);
XSync(disp, False);
while (1)
......
......@@ -50,7 +50,6 @@ main(int argc, char **argv)
XSelectInput(disp, win,
ButtonPressMask | ButtonReleaseMask | ButtonMotionMask |
PointerMotionMask | ExposureMask | KeyPressMask);
XMapWindow(disp, win);
/**
* Start rendering
......@@ -69,7 +68,9 @@ main(int argc, char **argv)
h = imlib_image_get_height();
imlib_context_set_color(0, 0, 0, 255);
imlib_image_fill_rectangle(0, 0, w, h);
XResizeWindow(disp, win, w, h);
XMapWindow(disp, win);
XSync(disp, False);
poly = imlib_polygon_new();
......
This diff is collapsed.
......@@ -131,6 +131,7 @@ extern "C"
/* context setting */
# ifndef X_DISPLAY_MISSING
EAPI void imlib_context_set_display(Display * display);
EAPI void imlib_context_disconnect_display(void);
EAPI void imlib_context_set_visual(Visual * visual);
EAPI void imlib_context_set_colormap(Colormap colormap);
EAPI void imlib_context_set_drawable(Drawable drawable);
......@@ -327,6 +328,12 @@ extern "C"
/* fonts and text */
EAPI Imlib_Font imlib_load_font(const char *font_name);
EAPI void imlib_free_font(void);
/* NB! The four functions below are deprecated. */
EAPI int imlib_insert_font_into_fallback_chain(Imlib_Font font, Imlib_Font fallback_font);
EAPI void imlib_remove_font_from_fallback_chain(Imlib_Font fallback_font);
EAPI Imlib_Font imlib_get_prev_font_in_fallback_chain(Imlib_Font fn);
EAPI Imlib_Font imlib_get_next_font_in_fallback_chain(Imlib_Font fn);
/* NB! The four functions above are deprecated. */
EAPI void imlib_text_draw(int x, int y, const char *text);
EAPI void imlib_text_draw_with_return_metrics(int x, int y, const char *text,
int *width_return,
......
AUTOMAKE_OPTIONS = 1.4 foreign
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = @my_includes@ -I. -I$(top_srcdir) -I$(top_builddir)
INCLUDES = @my_includes@ -I. -I$(top_srcdir) -I$(top_builddir) -DPACKAGE_LIB_DIR=\"$(libdir)\"
lib_LTLIBRARIES = libImlib2.la
include_HEADERS = Imlib2.h
......@@ -98,5 +98,5 @@ libImlib2_la_LIBADD = @my_libs@
libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h
endif
endif
libImlib2_la_LDFLAGS = -version-info 5:0:4
libImlib2_la_LDFLAGS = -version-info @lt_version@
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -169,7 +169,7 @@ __imlib_FilterGet(ImlibFilterColor * fil, DATA32 * data,
off = h - 1;
p += off * w;
ret += A_VAL(p) * pix->a + R_VAL(p) * pix->r +
G_VAL(p) * pix->g + B_VAL(p) * pix->b;
G_VAL(p) * pix->g + B_VAL(p) * pix->b;
pix++;
}
return ret;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment