Changeset 8565a42 in mainline for uspace/lib/c/include/io/pixelmap.h


Ignore:
Timestamp:
2018-03-02T20:34:50Z (7 years ago)
Author:
GitHub <noreply@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a1a81f69, d5e5fd1
Parents:
3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)
git-committer:
GitHub <noreply@…> (2018-03-02 20:34:50)
Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/include/io/pixelmap.h

    r3061bc1 r8565a42  
    4747        /* Pixels outside of a pixmap are PIXEL(0, 0, 0, 0) */
    4848        PIXELMAP_EXTEND_TRANSPARENT_BLACK = 0,
    49        
     49
    5050        /* The pixmap is repeated infinetely */
    5151        PIXELMAP_EXTEND_TILE,
    52        
     52
    5353        /* If outside of a pixmap, return closest pixel from the edge */
    5454        PIXELMAP_EXTEND_SIDES,
    55        
     55
    5656        /* If outside of a pixmap, return closest pixel from the edge,
    5757         * with alpha = 0
     
    125125                        transparent = transparent_outside;
    126126                }
    127                
     127
    128128                if (y < 0) {
    129129                        y = 0;
     
    135135                }
    136136        }
    137        
     137
    138138        if (x < 0 || ((sysarg_t) x) >= pixmap->width ||
    139139            y < 0 || ((sysarg_t) y) >= pixmap->height)
     
    141141
    142142        pixel_t pixel = pixelmap_get_pixel(pixmap, x, y);
    143        
     143
    144144        if (transparent)
    145145                pixel = PIXEL(0, RED(pixel), GREEN(pixel), BLUE(pixel));
    146        
     146
    147147        return pixel;
    148148}
Note: See TracChangeset for help on using the changeset viewer.