Changeset a35b458 in mainline for uspace/lib/draw/codec/tga.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/lib/draw/codec/tga.c (modified) (12 diffs)

uspace/lib/draw/codec/tga.c

@@ -46 +46 @@
         uint8_t cmap_type;
         uint8_t img_type;
-        
+
         uint16_t cmap_first_entry;
         uint16_t cmap_entries;
         uint8_t cmap_bpp;
-        
+
         uint16_t startx;
         uint16_t starty;
@@ -79 +79 @@
         cmap_type_t cmap_type;
         img_type_t img_type;
-        
+
         uint16_t cmap_first_entry;
         uint16_t cmap_entries;
         uint8_t cmap_bpp;
-        
+
         uint16_t startx;
         uint16_t starty;
@@ -91 +91 @@
         uint8_t img_alpha_bpp;
         uint8_t img_alpha_dir;
-        
+
         void *id_data;
         size_t id_length;
-        
+
         void *cmap_data;
         size_t cmap_length;
-        
+
         void *img_data;
         size_t img_length;
@@ -117 +117 @@
         if (size < sizeof(tga_header_t))
                 return false;
-        
+
         tga_header_t *head = (tga_header_t *) data;
-        
+
         /* Image ID field */
         tga->id_data = data + sizeof(tga_header_t);
         tga->id_length = head->id_length;
-        
+
         if (size < sizeof(tga_header_t) + tga->id_length)
                 return false;
-        
+
         /* Color map type */
         tga->cmap_type = head->cmap_type;
-        
+
         /* Image type */
         tga->img_type = head->img_type;
-        
+
         /* Color map specification */
         tga->cmap_first_entry = uint16_t_le2host(head->cmap_first_entry);
@@ -139 +139 @@
         tga->cmap_data = tga->id_data + tga->id_length;
         tga->cmap_length = ALIGN_UP(tga->cmap_entries * tga->cmap_bpp, 8) >> 3;
-        
+
         if (size < sizeof(tga_header_t) + tga->id_length +
             tga->cmap_length)
                 return false;
-        
+
         /* Image specification */
         tga->startx = uint16_t_le2host(head->startx);
@@ -154 +154 @@
         tga->img_data = tga->cmap_data + tga->cmap_length;
         tga->img_length = ALIGN_UP(tga->width * tga->height * tga->img_bpp, 8) >> 3;
-        
+
         if (size < sizeof(tga_header_t) + tga->id_length +
             tga->cmap_length + tga->img_length)
                 return false;
-        
+
         return true;
 }
@@ -182 +182 @@
         if (!decode_tga_header(data, size, &tga))
                 return NULL;
-        
+
         /*
          * Check for unsupported features.
          */
-        
+
         switch (tga.cmap_type) {
         case CMAP_NOT_PRESENT:
@@ -194 +194 @@
                 return NULL;
         }
-        
+
         switch (tga.img_type) {
         case IMG_BGRA:
@@ -208 +208 @@
                 return NULL;
         }
-        
+
         if (tga.img_alpha_bpp != 0)
                 return NULL;
-        
+
         sysarg_t twidth = tga.startx + tga.width;
         sysarg_t theight = tga.starty + tga.height;
-        
+
         surface_t *surface = surface_create(twidth, theight, NULL, flags);
         if (surface == NULL)
                 return NULL;
-        
+
         /*
          * TGA is encoded in a bottom-up manner, the true-color
          * variant is in BGR 8:8:8 encoding.
          */
-        
+
         switch (tga.img_type) {
         case IMG_BGRA:
@@ -230 +230 @@
                                 size_t offset =
                                     ((y - tga.starty) * tga.width + (x - tga.startx)) * 3;
-                                
+
                                 pixel_t pixel =
                                     bgr_888_2pixel(((uint8_t *) tga.img_data) + offset);
@@ -242 +242 @@
                                 size_t offset =
                                     (y - tga.starty) * tga.width + (x - tga.startx);
-                                
+
                                 pixel_t pixel =
                                     gray_8_2pixel(((uint8_t *) tga.img_data) + offset);
@@ -252 +252 @@
                 break;
         }
-        
+
         return surface;
 }