summaryrefslogtreecommitdiff
path: root/src/bin/evas
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2013-11-25 11:43:43 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2013-11-27 13:22:25 +0900
commit7aa577c774fae89d724546f6120793a0927fa67b (patch)
tree1697d20493007f1808a21d3e74bca4d0681484d8 /src/bin/evas
parent3d2b7f2ec131a2de44c9dc75bd897f210a91805d (diff)
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.
Diffstat (limited to 'src/bin/evas')
-rw-r--r--src/bin/evas/evas_cserve2_slave.c62
1 files 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
31#define MATCHING(Ext, Module) \ 31#define MATCHING(Ext, Module) \
32 { sizeof (Ext), Ext, Module } 32 { sizeof (Ext), Ext, Module }
33 33
34/* The following list comes from evas_image_load.c
35 * TODO: Don't duplicate, reuse common functions
36 */
37
34static const struct ext_loader_s map_loaders[] = 38static const struct ext_loader_s map_loaders[] =
35{ /* map extensions to loaders to use for good first-guess tries */ 39{ /* map extensions to loaders to use for good first-guess tries */
36 MATCHING(".png", "png"), 40 MATCHING(".png", "png"),
41
37 MATCHING(".jpg", "jpeg"), 42 MATCHING(".jpg", "jpeg"),
38 MATCHING(".jpeg", "jpeg"), 43 MATCHING(".jpeg", "jpeg"),
39 MATCHING(".jfif", "jpeg"), 44 MATCHING(".jfif", "jpeg"),
45
46 MATCHING(".j2k", "jp2k"),
47 MATCHING(".jp2", "jp2k"),
48 MATCHING(".jpx", "jp2k"),
49 MATCHING(".jpf", "jp2k"),
50
40 MATCHING(".eet", "eet"), 51 MATCHING(".eet", "eet"),
41 MATCHING(".edj", "eet"), 52 MATCHING(".edj", "eet"),
42 MATCHING(".eap", "eet"), 53 MATCHING(".eap", "eet"),
54
43 MATCHING(".xpm", "xpm"), 55 MATCHING(".xpm", "xpm"),
56
44 MATCHING(".tiff", "tiff"), 57 MATCHING(".tiff", "tiff"),
45 MATCHING(".tif", "tiff"), 58 MATCHING(".tif", "tiff"),
46 MATCHING(".svg", "svg"), 59
47 MATCHING(".svgz", "svg"),
48 MATCHING(".svg.gz", "svg"),
49 MATCHING(".gif", "gif"), 60 MATCHING(".gif", "gif"),
61
50 MATCHING(".pbm", "pmaps"), 62 MATCHING(".pbm", "pmaps"),
51 MATCHING(".pgm", "pmaps"), 63 MATCHING(".pgm", "pmaps"),
52 MATCHING(".ppm", "pmaps"), 64 MATCHING(".ppm", "pmaps"),
53 MATCHING(".pnm", "pmaps"), 65 MATCHING(".pnm", "pmaps"),
66
54 MATCHING(".bmp", "bmp"), 67 MATCHING(".bmp", "bmp"),
68
55 MATCHING(".tga", "tga"), 69 MATCHING(".tga", "tga"),
70
56 MATCHING(".wbmp", "wbmp"), 71 MATCHING(".wbmp", "wbmp"),
72
57 MATCHING(".webp", "webp"), 73 MATCHING(".webp", "webp"),
74
58 MATCHING(".ico", "ico"), 75 MATCHING(".ico", "ico"),
59 MATCHING(".cur", "ico"), 76 MATCHING(".cur", "ico"),
77
60 MATCHING(".psd", "psd"), 78 MATCHING(".psd", "psd"),
61 MATCHING(".pdf", "generic"), 79 /* xcf - gefenric */
62 MATCHING(".ps", "generic"),
63 MATCHING(".xcf", "generic"), 80 MATCHING(".xcf", "generic"),
64 MATCHING(".xcf.gz", "generic"), 81 MATCHING(".xcf.gz", "generic"),
82 /* docs */
83 MATCHING(".doc", "generic"),
84 MATCHING(".docx", "generic"),
85 MATCHING(".odp", "generic"),
86 MATCHING(".ods", "generic"),
87 MATCHING(".odt", "generic"),
88 MATCHING(".pdf", "generic"),
89 MATCHING(".ps", "generic"),
90 MATCHING(".ppt", "generic"),
91 MATCHING(".pptx", "generic"),
92 MATCHING(".rtf", "generic"),
93 MATCHING(".xls", "generic"),
94 MATCHING(".xlsx", "generic"),
95 /* svg - generic */
96 MATCHING(".svg", "generic"),
97 MATCHING(".svgz", "generic"),
98 MATCHING(".svg.gz", "generic"),
65 /* RAW */ 99 /* RAW */
66 MATCHING(".arw", "generic"), 100 MATCHING(".arw", "generic"),
67 MATCHING(".cr2", "generic"), 101 MATCHING(".cr2", "generic"),
68 MATCHING(".crw", "generic"), 102 MATCHING(".crw", "generic"),
69 MATCHING(".dcr", "generic"), 103 MATCHING(".dcr", "generic"),
70 MATCHING(".dng", "generic"), 104 MATCHING(".dng", "generic"),
105 MATCHING(".erf", "generic"),
71 MATCHING(".k25", "generic"), 106 MATCHING(".k25", "generic"),
72 MATCHING(".kdc", "generic"), 107 MATCHING(".kdc", "generic"),
73 MATCHING(".erf", "generic"),
74 MATCHING(".mrw", "generic"), 108 MATCHING(".mrw", "generic"),
75 MATCHING(".nef", "generic"), 109 MATCHING(".nef", "generic"),
76 MATCHING(".nrf", "generic"), 110 MATCHING(".nrf", "generic"),
77 MATCHING(".nrw", "generic"), 111 MATCHING(".nrw", "generic"),
78 MATCHING(".orf", "generic"), 112 MATCHING(".orf", "generic"),
79 MATCHING(".raw", "generic"),
80 MATCHING(".rw2", "generic"),
81 MATCHING(".pef", "generic"), 113 MATCHING(".pef", "generic"),
82 MATCHING(".raf", "generic"), 114 MATCHING(".raf", "generic"),
115 MATCHING(".raw", "generic"),
116 MATCHING(".rw2", "generic"),
83 MATCHING(".sr2", "generic"), 117 MATCHING(".sr2", "generic"),
84 MATCHING(".srf", "generic"), 118 MATCHING(".srf", "generic"),
85 MATCHING(".x3f", "generic"), 119 MATCHING(".x3f", "generic"),
@@ -96,12 +130,13 @@ static const struct ext_loader_s map_loaders[] =
96 MATCHING(".bdm", "generic"), 130 MATCHING(".bdm", "generic"),
97 MATCHING(".bdmv", "generic"), 131 MATCHING(".bdmv", "generic"),
98 MATCHING(".clpi", "generic"), 132 MATCHING(".clpi", "generic"),
99 MATCHING(".clp", "generic"), 133 MATCHING(".cpi", "generic"),
134 MATCHING(".dv", "generic"),
100 MATCHING(".fla", "generic"), 135 MATCHING(".fla", "generic"),
101 MATCHING(".flv", "generic"), 136 MATCHING(".flv", "generic"),
102 MATCHING(".m1v", "generic"), 137 MATCHING(".m1v", "generic"),
103 MATCHING(".m2v", "generic"),
104 MATCHING(".m2t", "generic"), 138 MATCHING(".m2t", "generic"),
139 MATCHING(".m2v", "generic"),
105 MATCHING(".m4v", "generic"), 140 MATCHING(".m4v", "generic"),
106 MATCHING(".mkv", "generic"), 141 MATCHING(".mkv", "generic"),
107 MATCHING(".mov", "generic"), 142 MATCHING(".mov", "generic"),
@@ -120,12 +155,14 @@ static const struct ext_loader_s map_loaders[] =
120 MATCHING(".ogg", "generic"), 155 MATCHING(".ogg", "generic"),
121 MATCHING(".ogm", "generic"), 156 MATCHING(".ogm", "generic"),
122 MATCHING(".ogv", "generic"), 157 MATCHING(".ogv", "generic"),
158 MATCHING(".qt", "generic"),
123 MATCHING(".rm", "generic"), 159 MATCHING(".rm", "generic"),
124 MATCHING(".rmj", "generic"), 160 MATCHING(".rmj", "generic"),
125 MATCHING(".rmm", "generic"), 161 MATCHING(".rmm", "generic"),
126 MATCHING(".rms", "generic"), 162 MATCHING(".rms", "generic"),
127 MATCHING(".rmx", "generic"),
128 MATCHING(".rmvb", "generic"), 163 MATCHING(".rmvb", "generic"),
164 MATCHING(".rmx", "generic"),
165 MATCHING(".rv", "generic"),
129 MATCHING(".swf", "generic"), 166 MATCHING(".swf", "generic"),
130 MATCHING(".ts", "generic"), 167 MATCHING(".ts", "generic"),
131 MATCHING(".weba", "generic"), 168 MATCHING(".weba", "generic"),
@@ -135,7 +172,8 @@ static const struct ext_loader_s map_loaders[] =
135 172
136static const char *loaders_name[] = 173static const char *loaders_name[] =
137{ /* in order of most likely needed */ 174{ /* in order of most likely needed */
138 "png", "jpeg", "eet", "xpm", "tiff", "gif", "svg", "webp", "pmaps", "bmp", "tga", "wbmp", "ico", "psd", "generic" 175 "png", "jpeg", "eet", "xpm", "tiff", "gif", "svg", "webp", "pmaps",
176 "bmp", "tga", "wbmp", "ico", "psd", "jp2k", "generic"
139}; 177};
140 178
141 179