From 7aa577c774fae89d724546f6120793a0927fa67b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Mon, 25 Nov 2013 11:43:43 +0900
Subject: [PATCH] evas/cserve2: Update image loaders list

evas_image_load.c's list was updated to match the generic
loaders, in 38dd405712f5306fdb4b30.

The list used by cserve should be the same. Actually, there
should be a common function instead of code duplication here.
---
 src/bin/evas/evas_cserve2_slave.c | 62 +++++++++++++++++++++++++------
 1 file changed, 50 insertions(+), 12 deletions(-)

diff --git a/src/bin/evas/evas_cserve2_slave.c b/src/bin/evas/evas_cserve2_slave.c
index 7aeac6b370..45d19df0ff 100644
--- a/src/bin/evas/evas_cserve2_slave.c
+++ b/src/bin/evas/evas_cserve2_slave.c
@@ -31,55 +31,89 @@ struct ext_loader_s
 #define MATCHING(Ext, Module)                   \
   { sizeof (Ext), Ext, Module }
 
+/* The following list comes from evas_image_load.c
+ * TODO: Don't duplicate, reuse common functions
+ */
+
 static const struct ext_loader_s map_loaders[] =
 { /* map extensions to loaders to use for good first-guess tries */
    MATCHING(".png", "png"),
+
    MATCHING(".jpg", "jpeg"),
    MATCHING(".jpeg", "jpeg"),
    MATCHING(".jfif", "jpeg"),
+
+   MATCHING(".j2k", "jp2k"),
+   MATCHING(".jp2", "jp2k"),
+   MATCHING(".jpx", "jp2k"),
+   MATCHING(".jpf", "jp2k"),
+
    MATCHING(".eet", "eet"),
    MATCHING(".edj", "eet"),
    MATCHING(".eap", "eet"),
+
    MATCHING(".xpm", "xpm"),
+
    MATCHING(".tiff", "tiff"),
    MATCHING(".tif", "tiff"),
-   MATCHING(".svg", "svg"),
-   MATCHING(".svgz", "svg"),
-   MATCHING(".svg.gz", "svg"),
+
    MATCHING(".gif", "gif"),
+
    MATCHING(".pbm", "pmaps"),
    MATCHING(".pgm", "pmaps"),
    MATCHING(".ppm", "pmaps"),
    MATCHING(".pnm", "pmaps"),
+
    MATCHING(".bmp", "bmp"),
+
    MATCHING(".tga", "tga"),
+
    MATCHING(".wbmp", "wbmp"),
+
    MATCHING(".webp", "webp"),
+
    MATCHING(".ico", "ico"),
    MATCHING(".cur", "ico"),
+
    MATCHING(".psd", "psd"),
-   MATCHING(".pdf", "generic"),
-   MATCHING(".ps", "generic"),
+   /* xcf - gefenric */
    MATCHING(".xcf", "generic"),
    MATCHING(".xcf.gz", "generic"),
+   /* docs */
+   MATCHING(".doc", "generic"),
+   MATCHING(".docx", "generic"),
+   MATCHING(".odp", "generic"),
+   MATCHING(".ods", "generic"),
+   MATCHING(".odt", "generic"),
+   MATCHING(".pdf", "generic"),
+   MATCHING(".ps", "generic"),
+   MATCHING(".ppt", "generic"),
+   MATCHING(".pptx", "generic"),
+   MATCHING(".rtf", "generic"),
+   MATCHING(".xls", "generic"),
+   MATCHING(".xlsx", "generic"),
+   /* svg - generic */
+   MATCHING(".svg", "generic"),
+   MATCHING(".svgz", "generic"),
+   MATCHING(".svg.gz", "generic"),
    /* RAW */
    MATCHING(".arw", "generic"),
    MATCHING(".cr2", "generic"),
    MATCHING(".crw", "generic"),
    MATCHING(".dcr", "generic"),
    MATCHING(".dng", "generic"),
+   MATCHING(".erf", "generic"),
    MATCHING(".k25", "generic"),
    MATCHING(".kdc", "generic"),
-   MATCHING(".erf", "generic"),
    MATCHING(".mrw", "generic"),
    MATCHING(".nef", "generic"),
    MATCHING(".nrf", "generic"),
    MATCHING(".nrw", "generic"),
    MATCHING(".orf", "generic"),
-   MATCHING(".raw", "generic"),
-   MATCHING(".rw2", "generic"),
    MATCHING(".pef", "generic"),
    MATCHING(".raf", "generic"),
+   MATCHING(".raw", "generic"),
+   MATCHING(".rw2", "generic"),
    MATCHING(".sr2", "generic"),
    MATCHING(".srf", "generic"),
    MATCHING(".x3f", "generic"),
@@ -96,12 +130,13 @@ static const struct ext_loader_s map_loaders[] =
    MATCHING(".bdm", "generic"),
    MATCHING(".bdmv", "generic"),
    MATCHING(".clpi", "generic"),
-   MATCHING(".clp", "generic"),
+   MATCHING(".cpi", "generic"),
+   MATCHING(".dv", "generic"),
    MATCHING(".fla", "generic"),
    MATCHING(".flv", "generic"),
    MATCHING(".m1v", "generic"),
-   MATCHING(".m2v", "generic"),
    MATCHING(".m2t", "generic"),
+   MATCHING(".m2v", "generic"),
    MATCHING(".m4v", "generic"),
    MATCHING(".mkv", "generic"),
    MATCHING(".mov", "generic"),
@@ -120,12 +155,14 @@ static const struct ext_loader_s map_loaders[] =
    MATCHING(".ogg", "generic"),
    MATCHING(".ogm", "generic"),
    MATCHING(".ogv", "generic"),
+   MATCHING(".qt", "generic"),
    MATCHING(".rm", "generic"),
    MATCHING(".rmj", "generic"),
    MATCHING(".rmm", "generic"),
    MATCHING(".rms", "generic"),
-   MATCHING(".rmx", "generic"),
    MATCHING(".rmvb", "generic"),
+   MATCHING(".rmx", "generic"),
+   MATCHING(".rv", "generic"),
    MATCHING(".swf", "generic"),
    MATCHING(".ts", "generic"),
    MATCHING(".weba", "generic"),
@@ -135,7 +172,8 @@ static const struct ext_loader_s map_loaders[] =
 
 static const char *loaders_name[] =
 { /* in order of most likely needed */
-  "png", "jpeg", "eet", "xpm", "tiff", "gif", "svg", "webp", "pmaps", "bmp", "tga", "wbmp", "ico", "psd", "generic"
+  "png", "jpeg", "eet", "xpm", "tiff", "gif", "svg", "webp", "pmaps",
+  "bmp", "tga", "wbmp", "ico", "psd", "jp2k", "generic"
 };