4 files changed, 11 insertions, 34 deletions

diff --git a/apps/plugins/imageviewer/bmp/bmp.c b/apps/plugins/imageviewer/bmp/bmp.c
index 6b5c4b1759..b96577dbed 100644
--- a/apps/plugins/imageviewer/bmp/bmp.c
+++ b/apps/plugins/imageviewer/bmp/bmp.c
@@ -209,11 +209,8 @@ int load_image(char *filename, struct image_info *info,
     if (!running_slideshow)
     {
         rb->lcd_puts(0, 0, rb->strrchr(filename,'/')+1);
-        rb->lcd_update();
-
-        rb->snprintf(print, sizeof(print), "loading %dx%d%s",
+        rb->lcd_putsf(0, 1, "loading %dx%d%s",
                         bmp.width, bmp.height, ds == 1?"":"(resize on load)");
-        rb->lcd_puts(0, 1, print);
         rb->lcd_update();
     }
 
@@ -260,8 +257,7 @@ int load_image(char *filename, struct image_info *info,
 
     if (!running_slideshow)
     {
-        rb->snprintf(print, sizeof(print), "image %dx%d", bmp.width, bmp.height);
-        rb->lcd_puts(0, 2, print);
+        rb->lcd_putsf(0, 2, "image %dx%d", bmp.width, bmp.height);
         rb->lcd_update();
     }
 
@@ -308,9 +304,7 @@ int get_image(struct image_info *info, int ds)
 
         if (!running_slideshow)
         {
-            rb->snprintf(print, sizeof(print), "resizing %d*%d",
-                            info->width, info->height);
-            rb->lcd_puts(0, 3, print);
+            rb->lcd_putsf(0, 3, "resizing %d*%d", info->width, info->height);
             rb->lcd_update();
         }
 
diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c
index e581407290..eb1ce498a1 100644
--- a/apps/plugins/imageviewer/imageviewer.c
+++ b/apps/plugins/imageviewer/imageviewer.c
@@ -97,7 +97,6 @@ static fb_data rgb_linebuf[LCD_WIDTH];  /* Line buffer for scrolling when
 #endif
 
 /* my memory pool (from the mp3 buffer) */
-static char print[32]; /* use a common snprintf() buffer */
 /* the remaining free part of the buffer for loaded+resized images */
 static unsigned char* buf;
 static size_t buf_size;
@@ -777,9 +776,7 @@ static int load_and_show(char* filename, struct image_info *info)
 
         if(!running_slideshow)
         {
-            rb->snprintf(print, sizeof(print), "showing %dx%d",
-                            info->width, info->height);
-            rb->lcd_puts(0, 3, print);
+            rb->lcd_putsf(0, 3, "showing %dx%d", info->width, info->height);
             rb->lcd_update();
         }
 
diff --git a/apps/plugins/imageviewer/jpeg/jpeg.c b/apps/plugins/imageviewer/jpeg/jpeg.c
index 95e493e7ee..5f69cc7f51 100644
--- a/apps/plugins/imageviewer/jpeg/jpeg.c
+++ b/apps/plugins/imageviewer/jpeg/jpeg.c
@@ -157,10 +157,7 @@ int load_image(char *filename, struct image_info *info,
     if(!running_slideshow)
     {
         rb->lcd_puts(0, 0, rb->strrchr(filename,'/')+1);
-        rb->lcd_update();
-
-        rb->snprintf(print, sizeof(print), "loading %d bytes", filesize);
-        rb->lcd_puts(0, 1, print);
+        rb->lcd_putsf(0, 1, "loading %d bytes", filesize);
         rb->lcd_update();
     }
 
@@ -195,9 +192,7 @@ int load_image(char *filename, struct image_info *info,
 
     if(!running_slideshow)
     {
-        rb->snprintf(print, sizeof(print), "image %dx%d",
-                        p_jpg->x_size, p_jpg->y_size);
-        rb->lcd_puts(0, 2, print);
+        rb->lcd_putsf(0, 2, "image %dx%d", p_jpg->x_size, p_jpg->y_size);
         rb->lcd_update();
     }
 
@@ -269,9 +264,7 @@ int get_image(struct image_info *info, int ds)
 
     if(!running_slideshow)
     {
-        rb->snprintf(print, sizeof(print), "decoding %d*%d",
-                        info->width, info->height);
-        rb->lcd_puts(0, 3, print);
+        rb->lcd_putsf(0, 3, "decoding %d*%d", info->width, info->height);
         rb->lcd_update();
     }
 
diff --git a/apps/plugins/imageviewer/png/png.c b/apps/plugins/imageviewer/png/png.c
index 8bd1b241f3..46430607ea 100644
--- a/apps/plugins/imageviewer/png/png.c
+++ b/apps/plugins/imageviewer/png/png.c
@@ -1359,8 +1359,7 @@ int load_image(char *filename, struct image_info *info,
 
     } else {
         if (!running_slideshow) {
-            rb->snprintf(print, sizeof(print), "loading %lu bytes", (unsigned long)image_size);
-            rb->lcd_puts(0, 1, print);
+            rb->lcd_putsf(0, 1, "loading %zu bytes", image_size);
             rb->lcd_update();
         }
 
@@ -1388,14 +1387,10 @@ int load_image(char *filename, struct image_info *info,
         if (!decoder->error) {
 
             if (!running_slideshow) {
-                rb->snprintf(print, sizeof(print), "image %dx%d",
+                rb->lcd_putsf(0, 2, "image %dx%d",
                              decoder->infoPng.width, decoder->infoPng.height);
-                rb->lcd_puts(0, 2, print);
-                rb->lcd_update();
-
-                rb->snprintf(print, sizeof(print), "decoding %d*%d",
+                rb->lcd_putsf(0, 3, "decoding %d*%d",
                              decoder->infoPng.width, decoder->infoPng.height);
-                rb->lcd_puts(0, 3, print);
                 rb->lcd_update();
             }
 
@@ -1481,9 +1476,7 @@ int get_image(struct image_info *info, int ds)
     if (ds > 1) {
         if (!running_slideshow)
         {
-            rb->snprintf(print, sizeof(print), "resizing %d*%d",
-                         info->width, info->height);
-            rb->lcd_puts(0, 3, print);
+            rb->lcd_putsf(0, 3, "resizing %d*%d", info->width, info->height);
             rb->lcd_update();
         }
         struct bitmap bmp_src, bmp_dst;