# HG changeset patch
# User Tero Marttila <terom@fixme.fi>
# Date 1264517191 -7200
# Node ID b81d2fcfa446ef5c5da7e9ba8936b6f75e4497eb
# Parent  9fcf58fb113a58c905da90ce00034c626a1af411
handle the png_color as a pointer in png_pixel_data

diff -r 9fcf58fb113a -r b81d2fcfa446 src/lib/png.c
--- a/src/lib/png.c	Tue Jan 26 01:38:16 2010 +0200
+++ b/src/lib/png.c	Tue Jan 26 16:46:31 2010 +0200
@@ -217,6 +217,7 @@
     int err;
 
     // decode
+    // XXX: it's an array, you silly
     if (params->background_color)
         err = pt_png_decode_sparse(img, header, params, out);
 
@@ -400,7 +401,7 @@
 /**
  * Converts a pixel's data into a png_color
  */
-static inline void png_pixel_data (png_color *out, const struct pt_png_header *header, const uint8_t *data, size_t row, size_t col)
+static inline void png_pixel_data (const png_color **outp, const struct pt_png_header *header, const uint8_t *data, size_t row, size_t col)
 {
     if (header->color_type == PNG_COLOR_TYPE_PALETTE) {
         // palette entry number
@@ -413,10 +414,11 @@
             return;
 
         if (p >= header->num_palette)
+            // invalid
             return;
         
         // reference data from palette
-        *out = header->palette[p];
+        *outp = &header->palette[p];
 
     } else {
         // unknown
@@ -447,8 +449,8 @@
     // buffer to hold output rows
     uint8_t *row_buf;
                 
-    
-    png_color c = { };
+    // color entry for pixel
+    const png_color *c = &header->palette[0];
     
     // only supports zooming out...
     if (ti->zoom >= 0)
@@ -487,9 +489,9 @@
                 png_pixel_data(&c, header, data, in_row, in_col);
                 
                 // average the RGB data        
-                ADD_AVG(row_buf[out_col * pixel_bytes + 0], c.red);
-                ADD_AVG(row_buf[out_col * pixel_bytes + 1], c.green);
-                ADD_AVG(row_buf[out_col * pixel_bytes + 2], c.blue);
+                ADD_AVG(row_buf[out_col * pixel_bytes + 0], c->red);
+                ADD_AVG(row_buf[out_col * pixel_bytes + 1], c->green);
+                ADD_AVG(row_buf[out_col * pixel_bytes + 2], c->blue);
             }
         }