mirror of
https://github.com/gryf/wmaker.git
synced 2026-02-02 14:15:46 +01:00
Update for 0.51.2-pre2
This commit is contained in:
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = no-dependencies
|
||||
|
||||
lib_LTLIBRARIES = libwraster.la
|
||||
|
||||
libwraster_la_LDFLAGS = -version-info 1:3:0
|
||||
libwraster_la_LDFLAGS = -version-info 2:0:1
|
||||
|
||||
bin_SCRIPTS = get-wraster-flags
|
||||
|
||||
|
||||
@@ -91,7 +91,7 @@ AUTOMAKE_OPTIONS = no-dependencies
|
||||
|
||||
lib_LTLIBRARIES = libwraster.la
|
||||
|
||||
libwraster_la_LDFLAGS = -version-info 1:3:0
|
||||
libwraster_la_LDFLAGS = -version-info 2:0:1
|
||||
|
||||
bin_SCRIPTS = get-wraster-flags
|
||||
|
||||
@@ -165,7 +165,7 @@ Makefile.in NEWS TODO alloca.c configure.in
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
SOURCES = $(libwraster_la_SOURCES) $(testgrad_SOURCES) $(testdraw_SOURCES) $(view_SOURCES)
|
||||
OBJECTS = $(libwraster_la_OBJECTS) $(testgrad_OBJECTS) $(testdraw_OBJECTS) $(view_OBJECTS)
|
||||
|
||||
45
wrlib/load.c
45
wrlib/load.c
@@ -100,18 +100,6 @@ extern RImage *RLoadGIF(RContext *context, char *file_name, int index);
|
||||
#endif
|
||||
|
||||
|
||||
static char*
|
||||
wstrdup(char *s)
|
||||
{
|
||||
char *tmp;
|
||||
|
||||
tmp = malloc(strlen(s)+1);
|
||||
if (!tmp)
|
||||
return NULL;
|
||||
return strcpy(tmp, s);
|
||||
}
|
||||
|
||||
|
||||
char**
|
||||
RSupportedFileFormats(void)
|
||||
{
|
||||
@@ -289,7 +277,40 @@ RLoadImage(RContext *context, char *file, int index)
|
||||
}
|
||||
|
||||
|
||||
char*
|
||||
RGetImageFileFormat(char *file)
|
||||
{
|
||||
switch (identFile(file)) {
|
||||
case IM_XPM:
|
||||
return "XPM";
|
||||
|
||||
#ifdef USE_TIFF
|
||||
case IM_TIFF:
|
||||
return "TIFF";
|
||||
#endif /* USE_TIFF */
|
||||
|
||||
#ifdef USE_PNG
|
||||
case IM_PNG:
|
||||
return "PNG";
|
||||
#endif /* USE_PNG */
|
||||
|
||||
#ifdef USE_JPEG
|
||||
case IM_JPEG:
|
||||
return "JPEG";
|
||||
#endif /* USE_JPEG */
|
||||
|
||||
#ifdef USE_GIF
|
||||
case IM_GIF:
|
||||
return "GIF";
|
||||
#endif /* USE_GIF */
|
||||
|
||||
case IM_PPM:
|
||||
return "PPM";
|
||||
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* Raster graphics library
|
||||
*
|
||||
* Copyright (c) 1997, 1998 Alfredo K. Kojima
|
||||
* Copyright (c) 1997, 1998, 1999 Alfredo K. Kojima
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
@@ -39,8 +39,8 @@
|
||||
#define RLRASTER_H_
|
||||
|
||||
|
||||
/* version of the header for the library: 0.12 */
|
||||
#define WRASTER_HEADER_VERSION 12
|
||||
/* version of the header for the library: 0.13 */
|
||||
#define WRASTER_HEADER_VERSION 13
|
||||
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
@@ -250,6 +250,9 @@ enum {
|
||||
*/
|
||||
char **RSupportedFileFormats(void);
|
||||
|
||||
|
||||
char *RGetImageFileFormat(char *file);
|
||||
|
||||
/*
|
||||
* Xlib contexts
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user