summaryrefslogtreecommitdiff
path: root/src/lib/evas/cserve2/evas_cs2.h
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2013-09-06 11:53:28 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2013-10-28 15:47:15 +0900
commit0d506a7b7369aad8376336497e755092cbe8cb40 (patch)
tree87c6926fafb4ddef6c6ca45352dc4292ddba61d5 /src/lib/evas/cserve2/evas_cs2.h
parent85cd382725ab877a62d935d9fb37368d4b868f59 (diff)
evas/cserve2: Fix images indexing (File_Entry stuff)
High-level problem: cserve2 does not support load_opts properly when opening an image. As a result, when (pre)loading a JPEG file with specific load options (eg. w, h, region and orientation), the image buffer might have the wrong dimensions. So, we need to use load_opts when computing file hash key. And, pass these load options to the loader slave, and use them while OPENING the image. This will set properly the geometry. Fixes test "Preload and Prescale" in elementary_test.
Diffstat (limited to 'src/lib/evas/cserve2/evas_cs2.h')
-rw-r--r--src/lib/evas/cserve2/evas_cs2.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/lib/evas/cserve2/evas_cs2.h b/src/lib/evas/cserve2/evas_cs2.h
index 835ed31c0b..6cc8804e29 100644
--- a/src/lib/evas/cserve2/evas_cs2.h
+++ b/src/lib/evas/cserve2/evas_cs2.h
@@ -324,9 +324,20 @@ struct _Index_Entry {
324#define FILE_DATA_ARRAY_TAG ('F' | 'I' << 8 | 'L' << 16 | 'E' << 24) 324#define FILE_DATA_ARRAY_TAG ('F' | 'I' << 8 | 'L' << 16 | 'E' << 24)
325struct _File_Data { 325struct _File_Data {
326 SHMOBJECT; 326 SHMOBJECT;
327 // Hash entry elements (see Evas_Image_Load_Opts)
327 string_t path; 328 string_t path;
328 string_t key; 329 string_t key;
329 string_t loader_data; 330 struct {
331 struct {
332 unsigned int x, y, w, h;
333 } region;
334 double dpi;
335 unsigned int w, h;
336 int scale_down_by;
337 Eina_Bool orientation;
338 } lo;
339 // Properties set after opening the file
340 string_t loader_data; // Can also be set during open (force this loader)
330 int w, h; 341 int w, h;
331 int frame_count; 342 int frame_count;
332 int loop_count; 343 int loop_count;