Enlightenment CVS committal
Author : mej
Project : e17
Module : libs/imlib2
Dir : e17/libs/imlib2/src/lib
Modified Files:
Imlib2.h image.c image.h
Log Message:
Sun Jan 16 14:27:18 2005 Michael Jennings (mej)
raster is the new Minister of Redundancy Minister. Thanks to
D. Hageman <[email protected]>.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/Imlib2.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Imlib2.h 1 Nov 2004 09:45:30 -0000 1.1
+++ Imlib2.h 16 Jan 2005 18:23:46 -0000 1.2
@@ -70,6 +70,7 @@
typedef enum _imlib_operation Imlib_Operation;
typedef enum _imlib_load_error Imlib_Load_Error;
+typedef enum _imlib_load_error ImlibLoadError;
typedef enum _imlib_text_direction Imlib_Text_Direction;
typedef enum _imlib_TTF_encoding Imlib_TTF_Encoding;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/image.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- image.c 1 Nov 2004 09:45:31 -0000 1.1
+++ image.c 16 Jan 2005 18:23:46 -0000 1.2
@@ -12,6 +12,7 @@
#include "image.h"
#include "file.h"
#include "loaderpath.h"
+#include "Imlib2.h"
static ImlibImage *images = NULL;
@@ -1069,36 +1070,36 @@
if (er)
{
/* set to a default fo no error */
- *er = LOAD_ERROR_NONE;
+ *er = IMLIB_LOAD_ERROR_NONE;
/* if the errno is set */
if (errno != 0)
{
/* default to unknown error */
- *er = LOAD_ERROR_UNKNOWN;
+ *er = IMLIB_LOAD_ERROR_UNKNOWN;
/* standrad fopen() type errors translated */
if (errno == EEXIST)
- *er = LOAD_ERROR_FILE_DOES_NOT_EXIST;
+ *er = IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST;
else if (errno == EISDIR)
- *er = LOAD_ERROR_FILE_IS_DIRECTORY;
+ *er = IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY;
else if (errno == EISDIR)
- *er = LOAD_ERROR_FILE_IS_DIRECTORY;
+ *er = IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY;
else if (errno == EACCES)
- *er = LOAD_ERROR_PERMISSION_DENIED_TO_READ;
+ *er = IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_READ;
else if (errno == ENAMETOOLONG)
- *er = LOAD_ERROR_PATH_TOO_LONG;
+ *er = IMLIB_LOAD_ERROR_PATH_TOO_LONG;
else if (errno == ENOENT)
- *er = LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT;
+ *er = IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT;
else if (errno == ENOTDIR)
- *er = LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY;
+ *er = IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY;
else if (errno == EFAULT)
- *er = LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE;
+ *er = IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE;
else if (errno == ELOOP)
- *er = LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS;
+ *er = IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS;
else if (errno == ENOMEM)
- *er = LOAD_ERROR_OUT_OF_MEMORY;
+ *er = IMLIB_LOAD_ERROR_OUT_OF_MEMORY;
else if (errno == EMFILE)
- *er = LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS;
- if (*er != LOAD_ERROR_UNKNOWN)
+ *er = IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS;
+ if (*er != IMLIB_LOAD_ERROR_UNKNOWN)
{
/* free the stuct we created */
__imlib_ConsumeImage(im);
@@ -1248,7 +1249,7 @@
if (!file)
{
if (er)
- *er = LOAD_ERROR_FILE_DOES_NOT_EXIST;
+ *er = IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST;
return;
}
/* ok - just check all our loaders are up to date */
@@ -1268,7 +1269,7 @@
if (!l)
{
if (er)
- *er = LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT;
+ *er = IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT;
/* set the filename back to the laoder image filename */
free(im->file);
im->file = pfile;
@@ -1276,7 +1277,7 @@
}
/* if they want an error returned - assume none by default */
if (er)
- *er = LOAD_ERROR_NONE;
+ *er = IMLIB_LOAD_ERROR_NONE;
/* call the saver */
e = l->save(im, progress, progress_granularity);
@@ -1287,32 +1288,32 @@
/* if there's an error return and the save faile (e = 0) figure it out */
if ((er) && (e == 0))
{
- *er = LOAD_ERROR_UNKNOWN;
+ *er = IMLIB_LOAD_ERROR_UNKNOWN;
if (errno == EEXIST)
- *er = LOAD_ERROR_FILE_DOES_NOT_EXIST;
+ *er = IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST;
else if (errno == EISDIR)
- *er = LOAD_ERROR_FILE_IS_DIRECTORY;
+ *er = IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY;
else if (errno == EISDIR)
- *er = LOAD_ERROR_FILE_IS_DIRECTORY;
+ *er = IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY;
else if (errno == EACCES)
- *er = LOAD_ERROR_PERMISSION_DENIED_TO_WRITE;
+ *er = IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE;
else if (errno == ENAMETOOLONG)
- *er = LOAD_ERROR_PATH_TOO_LONG;
+ *er = IMLIB_LOAD_ERROR_PATH_TOO_LONG;
else if (errno == ENOENT)
- *er = LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT;
+ *er = IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT;
else if (errno == ENOTDIR)
- *er = LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY;
+ *er = IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY;
else if (errno == EFAULT)
- *er = LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE;
+ *er = IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE;
else if (errno == ELOOP)
- *er = LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS;
+ *er = IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS;
else if (errno == ENOMEM)
- *er = LOAD_ERROR_OUT_OF_MEMORY;
+ *er = IMLIB_LOAD_ERROR_OUT_OF_MEMORY;
else if (errno == EMFILE)
- *er = LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS;
+ *er = IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS;
else if (errno == ENOSPC)
- *er = LOAD_ERROR_OUT_OF_DISK_SPACE;
+ *er = IMLIB_LOAD_ERROR_OUT_OF_DISK_SPACE;
else if (errno == EROFS)
- *er = LOAD_ERROR_PERMISSION_DENIED_TO_WRITE;
+ *er = IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/lib/image.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- image.h 1 Nov 2004 09:45:31 -0000 1.1
+++ image.h 16 Jan 2005 18:23:47 -0000 1.2
@@ -7,6 +7,7 @@
#endif
#include <dlfcn.h>
+#include <Imlib2.h>
typedef struct _imlibimage ImlibImage;
#ifdef BUILD_X11
@@ -21,25 +22,6 @@
int update_w, int update_h);
typedef void (*ImlibDataDestructorFunction)(ImlibImage *im, void *data);
-enum _load_error
-{
- LOAD_ERROR_NONE,
- LOAD_ERROR_FILE_DOES_NOT_EXIST,
- LOAD_ERROR_FILE_IS_DIRECTORY,
- LOAD_ERROR_PERMISSION_DENIED_TO_READ,
- LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT,
- LOAD_ERROR_PATH_TOO_LONG,
- LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT,
- LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY,
- LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE,
- LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS,
- LOAD_ERROR_OUT_OF_MEMORY,
- LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS,
- LOAD_ERROR_PERMISSION_DENIED_TO_WRITE,
- LOAD_ERROR_OUT_OF_DISK_SPACE,
- LOAD_ERROR_UNKNOWN
-};
-
enum _iflags
{
F_NONE = 0,
@@ -55,7 +37,6 @@
};
typedef enum _iflags ImlibImageFlags;
-typedef enum _load_error ImlibLoadError;
struct _imlibborder
{
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
