cedric pushed a commit to branch master.
commit 452a301bfaaff4f4cee83512048aa24a4b0c6338
Author: Jean-Philippe Andre <[email protected]>
Date: Tue Jun 4 13:48:33 2013 +0900
evas/cserve2: fix fonts flags.
aka: fix italic fonts or T25 .
Signed-off-by: Cedric Bail <[email protected]>
---
src/bin/evas/evas_cserve2.h | 7 ++++---
src/bin/evas/evas_cserve2_main_loop_linux.c | 2 +-
src/bin/evas/evas_cserve2_requests.c | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/bin/evas/evas_cserve2.h b/src/bin/evas/evas_cserve2.h
index 43c38c8..277968b 100644
--- a/src/bin/evas/evas_cserve2.h
+++ b/src/bin/evas/evas_cserve2.h
@@ -205,10 +205,11 @@ struct _Slave_Request_Funcs {
typedef struct _Slave_Request Slave_Request;
typedef struct _Slave_Request_Funcs Slave_Request_Funcs;
+/* This enum must be kept in sync with lib/evas/include/evas_common.h */
typedef enum {
- FONT_REND_REGULAR = 1,
- FONT_REND_SLANT = 1 << 1,
- FONT_REND_WEIGHT = 1 << 2
+ FONT_REND_REGULAR = 0,
+ FONT_REND_SLANT = (1 << 0),
+ FONT_REND_WEIGHT = (1 << 2)
} Font_Rend_Flags;
typedef enum {
diff --git a/src/bin/evas/evas_cserve2_main_loop_linux.c
b/src/bin/evas/evas_cserve2_main_loop_linux.c
index 52ed3a9..5222ab9 100644
--- a/src/bin/evas/evas_cserve2_main_loop_linux.c
+++ b/src/bin/evas/evas_cserve2_main_loop_linux.c
@@ -513,7 +513,7 @@ cserve2_fd_watch_add(int fd, Fd_Flags flags, Fd_Watch_Cb
cb, const void *data)
ev.data.ptr = w_data;
err = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &ev);
- if (!err < 0)
+ if (err < 0)
{
ERR("Could not create epoll watch for fd %d.", fd);
eina_hash_del(watch_list, &fd, NULL);
diff --git a/src/bin/evas/evas_cserve2_requests.c
b/src/bin/evas/evas_cserve2_requests.c
index 2fe540d..ab63db8 100644
--- a/src/bin/evas/evas_cserve2_requests.c
+++ b/src/bin/evas/evas_cserve2_requests.c
@@ -31,7 +31,7 @@ typedef struct _Slave_Worker Slave_Worker;
* of the request types on it is the order in which these requests will
* be processed.
*/
-static struct _Request_Match
+static const struct _Request_Match
{
Slave_Request_Type rtype;
Slave_Type stype;
@@ -45,7 +45,7 @@ static struct _Request_Match
{ CSERVE2_REQ_IMAGE_SPEC_LOAD, SLAVE_IMAGE, IMAGE_LOAD, 1 },
{ CSERVE2_REQ_FONT_LOAD, SLAVE_FONT, FONT_LOAD, 0 },
{ CSERVE2_REQ_FONT_GLYPHS_LOAD, SLAVE_FONT, FONT_GLYPHS_LOAD, 0 },
- { CSERVE2_REQ_LAST, 0, 0, 0 }
+ { CSERVE2_REQ_LAST, SLAVE_NONE, ERROR, 0 }
};
static Slave *_create_image_slave(void *data);
--
------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. A cloud service to automate IT design, transition and operations
2. Dashboards that offer high-level views of enterprise services
3. A single system of record for all IT processes
http://p.sf.net/sfu/servicenow-d2d-j
