Changes in uspace/app/viewer/viewer.c [5a6cc679:a35b458] in mainline

File:

• uspace/app/viewer/viewer.c (modified) (13 diffs)

uspace/app/viewer/viewer.c

@@ -44 +44 @@
 #include <codec/tga.h>
 #include <task.h>
+#include <str.h>
 
 #define NAME  "viewer"
@@ -71 +72 @@
         kbd_event_t *event = (kbd_event_t *) data;
         bool update = false;
-        
+
         if ((event->type == KEY_PRESS) && (event->c == 'q'))
                 exit(0);
-        
+
         if ((event->type == KEY_PRESS) && (event->key == KC_PAGE_DOWN)) {
                 if (imgs_current == imgs_count - 1)
@@ -80 +81 @@
                 else
                         imgs_current++;
-                
+
                 update = true;
         }
-        
+
         if ((event->type == KEY_PRESS) && (event->key == KC_PAGE_UP)) {
                 if (imgs_current == 0)
@@ -89 +90 @@
                 else
                         imgs_current--;
-                
+
                 update = true;
         }
-        
+
         if (update) {
                 surface_t *lsface;
@@ -113 +114 @@
         if (rc != EOK)
                 return false;
-        
-        struct stat stat;
+
+        vfs_stat_t stat;
         rc = vfs_stat(fd, &stat);
         if (rc != EOK) {
@@ -120 +121 @@
                 return false;
         }
-        
+
         void *tga = malloc(stat.size);
         if (tga == NULL) {
@@ -134 +135 @@
                 return false;
         }
-        
+
         vfs_put(fd);
-        
+
         *p_local_surface = decode_tga(tga, stat.size, 0);
         if (*p_local_surface == NULL) {
@@ -142 +143 @@
                 return false;
         }
-        
+
         free(tga);
 
         surface_get_resolution(*p_local_surface, &img_width, &img_height);
-        
+
         return true;
 }
@@ -164 +165 @@
                         return false;
                 }
-                
+
                 sig_connect(&canvas->keyboard_event, NULL, on_keyboard_event);
         }
-        
+
         if (surface != NULL)
                 surface_destroy(surface);
-        
+
         surface = local_surface;
         return true;
@@ -187 +188 @@
                 return 1;
         }
-        
+
         if (argc < 3) {
                 printf("No image files specified.\n");
@@ -199 +200 @@
                 return 2;
         }
-        
+
         for (int i = 0; i < argc - 2; i++) {
                 imgs[i] = str_dup(argv[i + 2]);
@@ -225 +226 @@
                 return 5;
         }
-        
-        
+
+
         if (!img_setup(lsface)) {
                 printf("Cannot setup image \"%s\".\n", imgs[imgs_current]);
@@ -243 +244 @@
             img_height + dheight, WINDOW_PLACEMENT_ANY);
         window_exec(main_window);
-        
+
         task_retval(0);
         async_manager();
-        
+
         return 0;
 }