mirror of
https://github.com/gryf/wmaker.git
synced 2026-02-02 22:25:48 +01:00
0.51.1 pre snapshot. Be careful, it may be buggy. It fixes some bugs though.
This commit is contained in:
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = no-dependencies
|
||||
|
||||
lib_LTLIBRARIES = libwraster.la
|
||||
|
||||
libwraster_la_LDFLAGS = -version-info 1:2:0
|
||||
libwraster_la_LDFLAGS = -version-info 1:3:0
|
||||
|
||||
bin_SCRIPTS = get-wraster-flags
|
||||
|
||||
@@ -37,9 +37,9 @@ libwraster_la_SOURCES = \
|
||||
gif.c
|
||||
|
||||
|
||||
INCLUDES = @DFLAGS@ @XCFLAGS@ @GFXFLAGS@
|
||||
INCLUDES = @DFLAGS@ @HEADER_SEARCH_PATH@
|
||||
|
||||
LIBLIST = libwraster.la @GFXLFLAGS@ @XLFLAGS@ @GFXLIBS@ @XLIBS@ -lm
|
||||
LIBLIST = libwraster.la @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm
|
||||
|
||||
view_SOURCES= view.c
|
||||
|
||||
|
||||
@@ -62,13 +62,13 @@ host_triplet = @host@
|
||||
CC = @CC@
|
||||
CPP_PATH = @CPP_PATH@
|
||||
DFLAGS = @DFLAGS@
|
||||
GFXFLAGS = @GFXFLAGS@
|
||||
GFXLFLAGS = @GFXLFLAGS@
|
||||
GFXLIBS = @GFXLIBS@
|
||||
HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
|
||||
ICONEXT = @ICONEXT@
|
||||
INTLIBS = @INTLIBS@
|
||||
LD = @LD@
|
||||
LIBPL = @LIBPL@
|
||||
LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LITE = @LITE@
|
||||
LN_S = @LN_S@
|
||||
@@ -91,7 +91,7 @@ AUTOMAKE_OPTIONS = no-dependencies
|
||||
|
||||
lib_LTLIBRARIES = libwraster.la
|
||||
|
||||
libwraster_la_LDFLAGS = -version-info 1:2:0
|
||||
libwraster_la_LDFLAGS = -version-info 1:3:0
|
||||
|
||||
bin_SCRIPTS = get-wraster-flags
|
||||
|
||||
@@ -104,9 +104,9 @@ include_HEADERS = wraster.h
|
||||
libwraster_la_SOURCES = raster.c draw.c color.c load.c save.c gradient.c xpixmap.c convert.c context.c misc.c scale.c convolve.c nxpm.c xpm.c xutil.c ppm.c png.c jpeg.c tiff.c gif.c
|
||||
|
||||
|
||||
INCLUDES = @DFLAGS@ @XCFLAGS@ @GFXFLAGS@
|
||||
INCLUDES = @DFLAGS@ @HEADER_SEARCH_PATH@
|
||||
|
||||
LIBLIST = libwraster.la @GFXLFLAGS@ @XLFLAGS@ @GFXLIBS@ @XLIBS@ -lm
|
||||
LIBLIST = libwraster.la @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm
|
||||
|
||||
view_SOURCES = view.c
|
||||
|
||||
|
||||
60
wrlib/load.c
60
wrlib/load.c
@@ -111,75 +111,35 @@ wstrdup(char *s)
|
||||
return strcpy(tmp, s);
|
||||
}
|
||||
|
||||
|
||||
char**
|
||||
RSupportedFileFormats(void)
|
||||
{
|
||||
char **tmp;
|
||||
static char *tmp[IM_TYPES+1];
|
||||
int i = 0;
|
||||
|
||||
tmp = malloc(sizeof(char*)*(IM_TYPES+1));
|
||||
if (!tmp)
|
||||
return NULL;
|
||||
memset(tmp, 0, sizeof(char*)*(IM_TYPES+1));
|
||||
|
||||
|
||||
/* built-in */
|
||||
tmp[i++] = wstrdup("XPM");
|
||||
if (!tmp[i-1]) {
|
||||
RFreeStringList(tmp);
|
||||
return NULL;
|
||||
}
|
||||
tmp[i++] = "XPM";
|
||||
/* built-in */
|
||||
tmp[i++] = wstrdup("PPM");
|
||||
if (!tmp[i-1]) {
|
||||
RFreeStringList(tmp);
|
||||
return NULL;
|
||||
}
|
||||
tmp[i++] = "PPM";
|
||||
#ifdef USE_TIFF
|
||||
tmp[i++] = wstrdup("TIFF");
|
||||
if (!tmp[i-1]) {
|
||||
RFreeStringList(tmp);
|
||||
return NULL;
|
||||
}
|
||||
tmp[i++] = "TIFF";
|
||||
#endif
|
||||
#ifdef USE_PNG
|
||||
tmp[i++] = wstrdup("PNG");
|
||||
if (!tmp[i-1]) {
|
||||
RFreeStringList(tmp);
|
||||
return NULL;
|
||||
}
|
||||
tmp[i++] = "PNG";
|
||||
#endif
|
||||
#ifdef USE_JPEG
|
||||
tmp[i++] = wstrdup("JPEG");
|
||||
if (!tmp[i-1]) {
|
||||
RFreeStringList(tmp);
|
||||
return NULL;
|
||||
}
|
||||
tmp[i++] = "JPEG";
|
||||
#endif
|
||||
#ifdef USE_GIF
|
||||
tmp[i++] = wstrdup("GIF");
|
||||
if (!tmp[i-1]) {
|
||||
RFreeStringList(tmp);
|
||||
return NULL;
|
||||
}
|
||||
tmp[i++] = "GIF";
|
||||
#endif
|
||||
tmp[i] = NULL;
|
||||
|
||||
|
||||
return tmp;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
RFreeStringList(char **list)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; list[i]!=NULL; i++) {
|
||||
free(list[i]);
|
||||
}
|
||||
free(list);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
init_cache()
|
||||
{
|
||||
|
||||
@@ -500,8 +500,7 @@ index2str(char *buffer, int index, int colorCount)
|
||||
static void
|
||||
outputcolormap(FILE *file, XPMColor *colormap, int colorCount)
|
||||
{
|
||||
int j;
|
||||
int i,index;
|
||||
int index;
|
||||
char buf[128];
|
||||
|
||||
if (!colormap)
|
||||
|
||||
@@ -200,16 +200,9 @@ int main(int argc, char **argv)
|
||||
RConvertImage(ctx, imgd, &pix);
|
||||
XCopyArea(dpy, pix, win, ctx->copy_gc, 0, 0, 250, 250, 500, 0);
|
||||
|
||||
{
|
||||
GC gc;
|
||||
|
||||
gc = DefaultGC(dpy, DefaultScreen(dpy));
|
||||
|
||||
XSetTile(dpy, gc, ParentRelative);
|
||||
}
|
||||
|
||||
XFlush(dpy);
|
||||
#endif
|
||||
|
||||
getchar();
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -39,8 +39,8 @@
|
||||
#define RLRASTER_H_
|
||||
|
||||
|
||||
/* version of the header for the library: 0.11 */
|
||||
#define WRASTER_HEADER_VERSION 11
|
||||
/* version of the header for the library: 0.12 */
|
||||
#define WRASTER_HEADER_VERSION 12
|
||||
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
@@ -68,6 +68,10 @@
|
||||
/* use default instead of best visual */
|
||||
#define RC_DefaultVisual (1<<5)
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
typedef struct RContextAttributes {
|
||||
int flags;
|
||||
int render_mode;
|
||||
@@ -242,11 +246,10 @@ enum {
|
||||
/*
|
||||
* Returns a NULL terminated array of strings containing the
|
||||
* supported formats, such as: TIFF, XPM, PNG, JPEG, PPM, GIF
|
||||
* Do not free the returned data.
|
||||
*/
|
||||
char **RSupportedFileFormats(void);
|
||||
|
||||
void RFreeStringList(char **list);
|
||||
|
||||
/*
|
||||
* Xlib contexts
|
||||
*/
|
||||
@@ -390,4 +393,8 @@ int RBlurImage(RImage *image);
|
||||
|
||||
extern int RErrorCode;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user