[entry] Convert from drawing image raw data to using pixel buffers

diff --git a/src/libply-splash-graphics/ply-entry.c b/src/libply-splash-graphics/ply-entry.c
index 84e91059af0a8161fbb6652bb841affc90e79695..8022dcceb035a1ce8af41e7c199c837dd68c229b 100644 (file)
--- a/src/libply-splash-graphics/ply-entry.c
+++ b/src/libply-splash-graphics/ply-entry.c
@@ -166,23 +166,23 @@ ply_entry_draw_area (ply_entry_t        *entry,
 {
   ply_rectangle_t     bullet_area;
   ply_rectangle_t     clip_area;
-  uint32_t *text_field_data, *bullet_data;
+  ply_pixel_buffer_t *bullet_buffer, *text_field_buffer;
   int i, number_of_visible_bullets;
 
   if (entry->is_hidden)
     return;
 
-  text_field_data = ply_image_get_data (entry->text_field_image);
+  text_field_buffer = ply_image_convert_get_buffer (entry->text_field_image);
 
-  ply_pixel_buffer_fill_with_argb32_data (pixel_buffer,
-                                          &entry->area,
-                                          text_field_data);
+  ply_pixel_buffer_fill_with_buffer (pixel_buffer,
+                                     text_field_buffer,
+                                     entry->area.x,
+                                     entry->area.y);
 
   if (entry->is_password)
     {
-      bullet_data = ply_image_get_data (entry->bullet_image);
-      bullet_area.width = ply_image_get_width (entry->bullet_image);
-      bullet_area.height = ply_image_get_height (entry->bullet_image);
+      bullet_buffer = ply_image_convert_get_buffer (entry->bullet_image);
+      ply_pixel_buffer_get_size (bullet_buffer, &bullet_area);
 
       if (entry->number_of_bullets <= entry->max_number_of_visible_bullets)
         number_of_visible_bullets = entry->number_of_bullets;
@@ -198,10 +198,11 @@ ply_entry_draw_area (ply_entry_t        *entry,
           clip_area = bullet_area;
           clip_area.x = entry->area.x;
           
-          ply_pixel_buffer_fill_with_argb32_data_with_clip (pixel_buffer,
-                                                            &bullet_area,
-                                                            &clip_area,
-                                                            bullet_data);
+          ply_pixel_buffer_fill_with_buffer_with_clip (pixel_buffer,
+                                                       bullet_buffer,
+                                                       bullet_area.x,
+                                                       bullet_area.y,
+                                                       &clip_area);
         }
 
       for (i = 0; i < number_of_visible_bullets; i++)
@@ -209,9 +210,10 @@ ply_entry_draw_area (ply_entry_t        *entry,
           bullet_area.x = entry->area.x + i * bullet_area.width + bullet_area.width / 2.0;
           bullet_area.y = entry->area.y + entry->area.height / 2.0 - bullet_area.height / 2.0;
 
-          ply_pixel_buffer_fill_with_argb32_data (pixel_buffer,
-                                                  &bullet_area,
-                                                  bullet_data);
+          ply_pixel_buffer_fill_with_buffer (pixel_buffer,
+                                             bullet_buffer,
+                                             bullet_area.x,
+                                             bullet_area.y);
         }
     }
   else