Changeset a35b458 in mainline for uspace/lib/draw/codec/webp.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/webp.c (modified) (7 diffs)

uspace/lib/draw/codec/webp.c

@@ -84 +84 @@
         bool alpha_used;
         uint8_t version;
-        
+
         uint8_t *src;     /**< Input buffer */
         size_t srclen;    /**< Input buffer size */
         size_t srccnt;    /**< Position in the input buffer */
-        
+
         uint32_t bitbuf;  /**< Bit buffer */
         size_t bitlen;    /**< Number of bits in the bit buffer */
-        
+
         bool overrun;     /**< Overrun condition */
 } webp_t;
@@ -107 +107 @@
         /* Bit accumulator for at least 36 bits */
         uint64_t val = state->bitbuf;
-        
+
         while (state->bitlen < cnt) {
                 if (state->srccnt == state->srclen) {
@@ -113 +113 @@
                         return 0;
                 }
-                
+
                 /* Load 8 more bits */
                 val |= ((uint64_t) state->src[state->srccnt]) << state->bitlen;
@@ -119 +119 @@
                 state->bitlen += 8;
         }
-        
+
         /* Update bits in the buffer */
         state->bitbuf = (uint32_t) (val >> cnt);
         state->bitlen -= cnt;
-        
+
         return ((uint32_t) (val & ((1 << cnt) - 1)));
 }
@@ -143 +143 @@
             (size - sizeof(riff_header_t) < sizeof(webp_header_t)))
                 return false;
-        
+
         riff_header_t *riff_header = (riff_header_t *) data;
         if (riff_header->fourcc != FOURCC_RIFF)
                 return false;
-        
+
         /* Check payload size */
         size_t payload_size = uint32_t_le2host(riff_header->payload_size);
         if (payload_size + sizeof(riff_header_t) > size)
                 return false;
-        
+
         data += sizeof(riff_header_t);
         webp_header_t *webp_header = (webp_header_t *) data;
         if (webp_header->fourcc != FOURCC_WEBP)
                 return false;
-        
+
         /* Only lossless encoding supported so far */
         if (webp_header->encoding != FOURCC_WEBP_LOSSLESS)
                 return false;
-        
+
         webp->stream_size = uint32_t_le2host(webp_header->stream_size);
         if (webp->stream_size + sizeof(riff_header_t) +
             sizeof(webp_header_t) > size)
                 return false;
-        
+
         if (webp_header->signature != SIGNATURE_WEBP_LOSSLESS)
                 return false;
-        
+
         data += sizeof(webp_header_t);
-        
+
         /* Setup decoding state */
         webp->src = (uint8_t *) data;
@@ -179 +179 @@
         webp->bitlen = 0;
         webp->overrun = false;
-        
+
         /* Decode the rest of the metadata */
         webp->width = get_bits(webp, 14) + 1;
         CHECK_OVERRUN(*webp, false);
-        
+
         webp->height = get_bits(webp, 14) + 1;
         CHECK_OVERRUN(*webp, false);
-        
+
         webp->alpha_used = get_bits(webp, 1);
         CHECK_OVERRUN(*webp, false);
-        
+
         webp->version = get_bits(webp, 3);
         CHECK_OVERRUN(*webp, false);
-        
+
         if (webp->version != 0)
                 return false;
-        
+
         return true;
 }
@@ -218 +218 @@
         if (!decode_webp_header(data, size, &webp))
                 return NULL;
-        
+
         bool transform_present = false;
-        
+
         do {
                 transform_present = get_bits(&webp, 1);
                 CHECK_OVERRUN(webp, NULL);
-                
+
                 if (transform_present) {
                         webp_transform_t transform = get_bits(&webp, 2);
                         CHECK_OVERRUN(webp, NULL);
-                        
+
                         if (transform == TRANSFORM_PREDICTOR) {
                                 // FIXME TODO
                         } else
                                 return NULL;
-                        
+
                         // FIXME: decode other transforms
                 }
         } while (transform_present);
-        
+
         // FIXME: decode image data
-        
+
         return NULL;
 }