/*
- * Copyright (C) 1989-94 GROUPE BULL
+ * Copyright (C) 1989-95 GROUPE BULL
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
*/
/*****************************************************************************\
-* XpmCrDataFI.c: *
+* CrDataFI.c: *
* *
* XPM library *
* Scan an image and possibly its mask and create an XPM array *
* Developed by Arnaud Le Hors *
\*****************************************************************************/
-#include "xpm34p.h"
-#ifdef VMS
-#include "sys$library:string.h"
-#else
-#if defined(SYSV) || defined(SVR4)
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-#endif
+#include "XpmI.h"
LFUNC(CreateColors, int, (char **dataptr, unsigned int *data_size,
XpmColor *colors, unsigned int ncolors,
XpmExtension *ext, unsigned int num,
unsigned int ext_nlines));
+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
int
-XpmCreateDataFromImage(Display *display, char ***data_return, XImage *image,
- XImage *shapeimage, XpmAttributes *attributes)
+XpmCreateDataFromImage(
+ Display* display
+, char*** data_return
+, XImage* image
+, XImage* shapeimage
+, XpmAttributes* attributes
+)
+#else
+int
+XpmCreateDataFromImage(display, data_return, image, shapeimage, attributes)
+ Display *display;
+ char ***data_return;
+ XImage *image;
+ XImage *shapeimage;
+ XpmAttributes *attributes;
+#endif
{
XpmImage xpmimage;
XpmInfo info;
#undef RETURN
#define RETURN(status) \
{ \
- if (header) { \
- for (l = 0; l < header_nlines; l++) \
- if (header[l]) \
- XpmFree(header[l]); \
- XpmFree(header); \
- } \
- return(status); \
+ ErrorStatus = status; \
+ goto exit; \
}
+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+int
+XpmCreateDataFromXpmImage(char*** data_return, XpmImage* image, XpmInfo* info)
+#else
int
-XpmCreateDataFromXpmImage(char ***data_return, XpmImage *image, XpmInfo *info)
+XpmCreateDataFromXpmImage(data_return, image, info)
+ char ***data_return;
+ XpmImage *image;
+ XpmInfo *info;
+#endif
{
/* calculation variables */
int ErrorStatus;
/* print the hints line */
s = buf;
+#ifndef VOID_SPRINTF
+ s +=
+#endif
sprintf(s, "%d %d %d %d", image->width, image->height,
image->ncolors, image->cpp);
+#ifdef VOID_SPRINTF
s += strlen(s);
+#endif
if (info && (info->valuemask & XpmHotspot)) {
+#ifndef VOID_SPRINTF
+ s +=
+#endif
sprintf(s, " %d %d", info->x_hotspot, info->y_hotspot);
+#ifdef VOID_SPRINTF
s += strlen(s);
+#endif
}
- if (extensions)
- sprintf(s, " XPMEXT");
-
- l = strlen(buf) + 1;
+ if (extensions) {
+ strcpy(s, " XPMEXT");
+ s += 7;
+ }
+ l = s - buf + 1;
*header = (char *) XpmMalloc(l);
if (!*header)
RETURN(XpmNoMemory);
ext_nlines);
*data_return = data;
-
- RETURN(XpmSuccess);
+ ErrorStatus = XpmSuccess;
+
+/* exit point, free only locally allocated variables */
+exit:
+ if (header) {
+ for (l = 0; l < header_nlines; l++)
+ if (header[l])
+ XpmFree(header[l]);
+ XpmFree(header);
+ }
+ return(ErrorStatus);
}
+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+static int
+CreateColors(
+ char** dataptr
+, unsigned int* data_size
+, XpmColor* colors
+, unsigned int ncolors
+, unsigned int cpp
+)
+#else
static int
-CreateColors(char **dataptr, unsigned int *data_size, XpmColor *colors, unsigned int ncolors, unsigned int cpp)
+CreateColors(dataptr, data_size, colors, ncolors, cpp)
+ char **dataptr;
+ unsigned int *data_size;
+ XpmColor *colors;
+ unsigned int ncolors;
+ unsigned int cpp;
+#endif
{
char buf[BUFSIZ];
unsigned int a, key, l;
for (key = 1; key <= NKEYS; key++, defaults++) {
if (s2 = *defaults) {
+#ifndef VOID_SPRINTF
+ s +=
+#endif
sprintf(s, "\t%s %s", xpmColorKeys[key - 1], s2);
+#ifdef VOID_SPRINTF
s += strlen(s);
+#endif
}
}
- l = strlen(buf) + 1;
+ l = s - buf + 1;
s = (char *) XpmMalloc(l);
if (!s)
return (XpmNoMemory);
*data_size += l;
- strcpy(s, buf);
- *dataptr = s;
+ *dataptr = strcpy(s, buf);
}
return (XpmSuccess);
}
+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+static void CreatePixels(
+ char** dataptr
+, unsigned int width
+, unsigned int height
+, unsigned int cpp
+, unsigned int* pixels
+, XpmColor* colors
+)
+#else
static void
-CreatePixels(char **dataptr, unsigned int width, unsigned int height, unsigned int cpp,
- unsigned int *pixels, XpmColor *colors)
+CreatePixels(dataptr, width, height, cpp, pixels, colors)
+ char **dataptr;
+ unsigned int width;
+ unsigned int height;
+ unsigned int cpp;
+ unsigned int *pixels;
+ XpmColor *colors;
+#endif
{
char *s;
unsigned int x, y, h, offset;
*s = '\0';
}
+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+static void CountExtensions(
+ XpmExtension* ext
+, unsigned int num
+, unsigned int* ext_size
+, unsigned int* ext_nlines
+)
+#else
static void
-CountExtensions(XpmExtension *ext, unsigned int num, unsigned int *ext_size, unsigned int *ext_nlines)
+CountExtensions(ext, num, ext_size, ext_nlines)
+ XpmExtension *ext;
+ unsigned int num;
+ unsigned int *ext_size;
+ unsigned int *ext_nlines;
+#endif
{
unsigned int x, y, a, size, nlines;
char **line;
*ext_nlines = nlines + 1;
}
+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
static void
-CreateExtensions(char **dataptr, unsigned int offset, XpmExtension *ext, unsigned int num, unsigned int ext_nlines)
+CreateExtensions(
+ char** dataptr
+, unsigned int offset
+, XpmExtension* ext
+, unsigned int num
+, unsigned int ext_nlines
+)
+#else
+static void
+CreateExtensions(dataptr, offset, ext, num, ext_nlines)
+ char **dataptr;
+ unsigned int offset;
+ XpmExtension *ext;
+ unsigned int num;
+ unsigned int ext_nlines;
+#endif
{
unsigned int x, y, a, b;
char **line;
projects / wxWidgets.git / blobdiff