Changeset a7d2d78 in mainline for fb/ppm.c

Timestamp:

2006-06-03T22:49:28Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

2400469

Parents:

1f36e90

Message:

Completed graphical console.

File:

• fb/ppm.c (modified) (3 diffs)

fb/ppm.c

@@ -57 +57 @@
 }
 
+int ppm_get_data(unsigned char *data, size_t dtsz, int *width, int *height)
+{
+        /* Read magic */
+        if (data[0] != 'P' || data[1] != '6')
+                return EINVAL;
+
+        data+=2;
+        skip_whitespace(&data);
+        read_num(&data, width);
+        skip_whitespace(&data);
+        read_num(&data,height);
+
+        return 0;
+}
+
 /** Draw PPM pixmap
  *
@@ -67 +82 @@
  * @param putpixel Putpixel function used to print bitmap
  */
-int draw_ppm(unsigned char *data, size_t datasz, unsigned int sx, 
+int ppm_draw(unsigned char *data, size_t datasz, unsigned int sx, 
              unsigned int sy, 
              unsigned int maxwidth, unsigned int maxheight,
@@ -105 +120 @@
                         continue;
                 }
-                color = ((data[0]*coef) << 16) + ((data[1]*coef) << 8) + data[0]*coef;
+                color = ((data[0]*coef) << 16) + ((data[1]*coef) << 8) + data[2]*coef;
                 
                 (*putpixel)(vp, sx+(i % width), sy+(i / width), color);