forked from enlightenment/efl
parent
7ae9a85094
commit
0d8488a478
|
@ -320,7 +320,6 @@ static const char *
|
||||||
_slave_proc_path_get(const char *name)
|
_slave_proc_path_get(const char *name)
|
||||||
{
|
{
|
||||||
char buf[PATH_MAX], cwd[PATH_MAX];
|
char buf[PATH_MAX], cwd[PATH_MAX];
|
||||||
char *ret;
|
|
||||||
|
|
||||||
if (name[0] == '/')
|
if (name[0] == '/')
|
||||||
{
|
{
|
||||||
|
@ -329,7 +328,7 @@ _slave_proc_path_get(const char *name)
|
||||||
return eina_stringshare_add(name);
|
return eina_stringshare_add(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = getcwd(cwd, sizeof(cwd));
|
getcwd(cwd, sizeof(cwd));
|
||||||
snprintf(buf, sizeof(buf), "%s/%s", cwd, name);
|
snprintf(buf, sizeof(buf), "%s/%s", cwd, name);
|
||||||
if (!access(buf, X_OK))
|
if (!access(buf, X_OK))
|
||||||
return eina_stringshare_add(buf);
|
return eina_stringshare_add(buf);
|
||||||
|
@ -454,7 +453,6 @@ static void *
|
||||||
_slave_thread_cb(void *data)
|
_slave_thread_cb(void *data)
|
||||||
{
|
{
|
||||||
ssize_t n;
|
ssize_t n;
|
||||||
int ret;
|
|
||||||
Slave_Command cmd;
|
Slave_Command cmd;
|
||||||
|
|
||||||
Slave_Thread_Data *sd = data;
|
Slave_Thread_Data *sd = data;
|
||||||
|
@ -477,7 +475,7 @@ _slave_thread_cb(void *data)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
sd->cmdanswer = sd->cb(sd, &cmd, sd->cmddata, sd->cb_data);
|
sd->cmdanswer = sd->cb(sd, &cmd, sd->cmddata, sd->cb_data);
|
||||||
ret = write(sd->write_fd, &cmd, sizeof(cmd));
|
write(sd->write_fd, &cmd, sizeof(cmd));
|
||||||
|
|
||||||
n = read(sd->read_fd, &cmd, sizeof(cmd));
|
n = read(sd->read_fd, &cmd, sizeof(cmd));
|
||||||
}
|
}
|
||||||
|
|
|
@ -577,13 +577,10 @@ _evas_image_load_frame(Image_Entry *ie, GifFileType *gif, Image_Entry_Frame *fra
|
||||||
GifRecordType rec;
|
GifRecordType rec;
|
||||||
int gra_res = 0, img_res = 0;
|
int gra_res = 0, img_res = 0;
|
||||||
Eina_Bool res = EINA_FALSE;
|
Eina_Bool res = EINA_FALSE;
|
||||||
Gif_Frame *gif_frame = NULL;
|
|
||||||
|
|
||||||
if ((!gif) || (!frame)) return EINA_FALSE;
|
if ((!gif) || (!frame)) return EINA_FALSE;
|
||||||
gif_frame = (Gif_Frame *) frame->info;
|
|
||||||
|
|
||||||
if (type > LOAD_FRAME_DATA_INFO) return EINA_FALSE;
|
if (type > LOAD_FRAME_DATA_INFO) return EINA_FALSE;
|
||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
if (DGifGetRecordType(gif, &rec) == GIF_ERROR) return EINA_FALSE;
|
if (DGifGetRecordType(gif, &rec) == GIF_ERROR) return EINA_FALSE;
|
||||||
|
@ -631,23 +628,13 @@ _evas_image_load_frame(Image_Entry *ie, GifFileType *gif, Image_Entry_Frame *fra
|
||||||
static Eina_Bool
|
static Eina_Bool
|
||||||
evas_image_load_file_data_gif_internal(Image_Entry *ie, Image_Entry_Frame *frame, int *error)
|
evas_image_load_file_data_gif_internal(Image_Entry *ie, Image_Entry_Frame *frame, int *error)
|
||||||
{
|
{
|
||||||
int w;
|
|
||||||
int h;
|
|
||||||
int dst_x;
|
|
||||||
int dst_y;
|
|
||||||
DATA32 *dst;
|
DATA32 *dst;
|
||||||
DATA32 *src;
|
DATA32 *src;
|
||||||
int cache_w, cache_h;
|
int cache_w, cache_h;
|
||||||
size_t siz;
|
size_t siz;
|
||||||
Gif_Frame *gif_frame = NULL;
|
|
||||||
|
|
||||||
gif_frame = (Gif_Frame *) frame->info;
|
|
||||||
cache_w = ie->w;
|
cache_w = ie->w;
|
||||||
cache_h = ie->h;
|
cache_h = ie->h;
|
||||||
w = gif_frame->image_des.w;
|
|
||||||
h = gif_frame->image_des.h;
|
|
||||||
dst_x = gif_frame->image_des.x;
|
|
||||||
dst_y = gif_frame->image_des.y;
|
|
||||||
|
|
||||||
src = frame->data;
|
src = frame->data;
|
||||||
|
|
||||||
|
@ -979,7 +966,6 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int
|
||||||
int fd;
|
int fd;
|
||||||
GifFileType *gif;
|
GifFileType *gif;
|
||||||
GifRecordType rec;
|
GifRecordType rec;
|
||||||
int done;
|
|
||||||
int current_frame = 1;
|
int current_frame = 1;
|
||||||
int remain_frames = frame_num;
|
int remain_frames = frame_num;
|
||||||
double duration = 0;
|
double duration = 0;
|
||||||
|
@ -991,8 +977,6 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int
|
||||||
if ((start_frame + frame_num) > frame_count) return -1;
|
if ((start_frame + frame_num) > frame_count) return -1;
|
||||||
if (frame_num < 0) return -1;
|
if (frame_num < 0) return -1;
|
||||||
|
|
||||||
done = 0;
|
|
||||||
|
|
||||||
#ifndef __EMX__
|
#ifndef __EMX__
|
||||||
fd = open(file, O_RDONLY);
|
fd = open(file, O_RDONLY);
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue