compiling now

4 files changed, 24 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index 0f54594..4b89fd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ depcomp
 .deps/
 install-sh
 *.la
-.libs
+.libs/
 libtool
 *.lo
 ltmain.sh
@@ -26,4 +26,4 @@ NEWS
 *.o
 README
 stamp-h1
-
+tests/paintertest
diff --git a/src/painter.c b/src/painter.c
index 1a82144..ad8413e 100644
--- a/src/painter.c
+++ b/src/painter.c
@@ -34,7 +34,7 @@ painter_create(void **handle)
         return PT_ERROR_PARAM;
     }
     *handle = malloc(sizeof(struct painter));
-    if (*hanlde == NULL)
+    if (*handle == NULL)
     {
         return PT_ERROR_OUT_OF_MEM;
     }
@@ -65,7 +65,7 @@ painter_set_fgcolor(void *handle, int color)
     struct painter *pt;
 
     pt = (struct painter *) handle;
-    pt->fgcolor = fgcolor;
+    pt->fgcolor = color;
     return PT_ERROR_NONE;
 }
 
@@ -76,7 +76,7 @@ painter_set_bgcolor(void *handle, int color)
     struct painter *pt;
 
     pt = (struct painter *) handle;
-    pt->bgcolor = bgcolor;
+    pt->bgcolor = color;
     return PT_ERROR_NONE;
 }
 
@@ -98,7 +98,7 @@ painter_set_fill_mode(void *handle, int mode)
     struct painter *pt;
 
     pt = (struct painter *) handle;
-    pt->fill_mode = fill_mode;
+    pt->fill_mode = mode;
     return PT_ERROR_NONE;
 }
 
diff --git a/src/painter_utils.c b/src/painter_utils.c
index 2893cda..67644fa 100644
--- a/src/painter_utils.c
+++ b/src/painter_utils.c
@@ -71,6 +71,20 @@ bitmap_get_ptr(struct painter_bitmap *bitmap, int x, int y)
 }
 
 /*****************************************************************************/
+static int
+bitmap_get_pixel(struct painter_bitmap *dst, int x, int y)
+{
+    return 0;
+}
+
+/*****************************************************************************/
+static int
+bitmap_set_pixel(struct painter_bitmap *dst, int x, int y, int pixel)
+{
+    return 0;
+}
+
+/*****************************************************************************/
 int
 pixel_convert(int pixel, int src_format, int dst_format, int *palette)
 {
@@ -116,8 +130,8 @@ painter_set_pixel(struct painter *painter, struct painter_bitmap *dst,
             (y >= 0) && (y < dst->height))
         {
             pixel = pixel_convert(pixel, pixel_format, dst->format,
-                                  painter->palete);
-            if (rop != PT_ROP_S)
+                                  painter->palette);
+            if (painter->rop != PT_ROP_S)
             {
                 pixel = do_rop(painter->rop, pixel,
                                bitmap_get_pixel(dst, x, y));
@@ -125,5 +139,6 @@ painter_set_pixel(struct painter *painter, struct painter_bitmap *dst,
             bitmap_set_pixel(dst, x, y, pixel);
         }
     }
+    return 0;
 }
 
diff --git a/src/painter_utils.h b/src/painter_utils.h
index 27961cf..87a7f5a 100644
--- a/src/painter_utils.h
+++ b/src/painter_utils.h
@@ -60,6 +60,6 @@ int
 painter_rop(int rop, int src, int dst);
 int
 painter_set_pixel(struct painter *painter, struct painter_bitmap *dst,
-                  int x, int y, int pixel);
+                  int x, int y, int pixel, int pixel_format);
 
 #endif