Changeset 5d4e90f0 in mainline for uspace/srv/fb/ppm.c

Timestamp:

2007-09-27T12:35:36Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bcf23cf

Parents:

8c20b26

Message:

Header cleanup.
Move off_t, size_t and ssize_t into sys/types.h.
Get rid off the non-standard and dummy types.h.

File:

• uspace/srv/fb/ppm.c (modified) (5 diffs)

uspace/srv/fb/ppm.c

@@ -27 +27 @@
  */
 
-#include <types.h>
+#include <sys/types.h>
 #include <errno.h>
 
@@ -35 +35 @@
 {
 retry:
-        while (**data == ' ' || **data == '\t' || **data == '\n' || **data == '\r')
+        while (**data == ' ' || **data == '\t' || **data == '\n' ||
+            **data == '\r')
                 (*data)++;
         if (**data == '#') {
@@ -57 +58 @@
 }
 
-int ppm_get_data(unsigned char *data, size_t dtsz, unsigned int *width, unsigned int *height)
+int ppm_get_data(unsigned char *data, size_t dtsz, unsigned int *width,
+    unsigned int *height)
 {
         /* Read magic */
@@ -82 +84 @@
  * @param putpixel Putpixel function used to print bitmap
  */
-int ppm_draw(unsigned char *data, size_t datasz, unsigned int sx, 
-             unsigned int sy, 
-             unsigned int maxwidth, unsigned int maxheight,
-             putpixel_cb_t putpixel, void *vport)
+int ppm_draw(unsigned char *data, size_t datasz, unsigned int sx,
+    unsigned int sy, unsigned int maxwidth, unsigned int maxheight,
+    putpixel_cb_t putpixel, void *vport)
 {
         unsigned int width, height;
@@ -106 +107 @@
         data++;
 
-        if (maxcolor == 0 || maxcolor > 255 || width*height > datasz) {
+        if (maxcolor == 0 || maxcolor > 255 || width * height > datasz) {
                 return EINVAL;
         }
-        coef = 255/maxcolor;
-        if (coef*maxcolor > 255)
+        coef = 255 / maxcolor;
+        if (coef * maxcolor > 255)
                 coef -= 1;
         
-        for (i=0; i < width*height; i++) {
+        for (i = 0; i < width * height; i++) {
                 /* Crop picture if we don't fit into region */
-                if (i % width > maxwidth || i/width > maxheight) {
+                if (i % width > maxwidth || i / width > maxheight) {
                         data += 3;
                         continue;
                 }
-                color = ((data[0]*coef) << 16) + ((data[1]*coef) << 8) + data[2]*coef;
+                color = ((data[0] * coef) << 16) + ((data[1] * coef) << 8) +
+                    data[2] * coef;
                 
-                (*putpixel)(vport, sx+(i % width), sy+(i / width), color);
+                (*putpixel)(vport, sx + (i % width), sy + (i / width), color);
                 data += 3;
         }