summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Nash <nash@nash.id.au>2007-10-25 04:52:39 +0000
committerBrett Nash <nash@nash.id.au>2007-10-25 04:52:39 +0000
commit8e867409291e073158dfd2bef15571218d4fdfba (patch)
treef7d1f66dffcc1c5446480ccac6b288b69c4c64d3
parentddf87ed6ec868cbdcbf7a1ce5fd84a0a6e5caaaa (diff)
Fix two bugs:
- Get pixels from the image object not the smart object - Fix typo in if statement SVN revision: 32157
Diffstat (limited to '')
-rw-r--r--legacy/emotion/src/lib/emotion_smart.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/legacy/emotion/src/lib/emotion_smart.c b/legacy/emotion/src/lib/emotion_smart.c
index b081747bb3..db9d8b578f 100644
--- a/legacy/emotion/src/lib/emotion_smart.c
+++ b/legacy/emotion/src/lib/emotion_smart.c
@@ -1060,7 +1060,7 @@ _pixels_get(void *data, Evas_Object *obj)
1060 } 1060 }
1061 else if (format == EMOTION_FORMAT_BGRA) 1061 else if (format == EMOTION_FORMAT_BGRA)
1062 { 1062 {
1063 if (sd->module->bgra_data_get(sd->video, &bgra_data)); 1063 if (sd->module->bgra_data_get(sd->video, &bgra_data))
1064 { 1064 {
1065 evas_object_image_data_set(obj, bgra_data); 1065 evas_object_image_data_set(obj, bgra_data);
1066// printf("pix get set 0 (3)\n"); 1066// printf("pix get set 0 (3)\n");
@@ -1163,7 +1163,7 @@ _smart_add(Evas_Object * obj)
1163 sd->ratio = 1.0; 1163 sd->ratio = 1.0;
1164 sd->spu.button = -1; 1164 sd->spu.button = -1;
1165 evas_object_image_alpha_set(sd->obj, 0); 1165 evas_object_image_alpha_set(sd->obj, 0);
1166 pixel = evas_object_image_data_get(obj, 1); 1166 pixel = evas_object_image_data_get(sd->obj, 1);
1167 if (pixel) 1167 if (pixel)
1168 { 1168 {
1169 *pixel = 0xff000000; 1169 *pixel = 0xff000000;