cfr · July 27, 2010 18:24 · May 27, 2011 · Jul 27, 2010 · Jul 11, 2010 · Jul 11, 2010
diff --git a/Makefile b/Makefile
@@ -1,21 +0,0 @@
-SOURCES = image_cv.c main.c
-OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
-CC      = gcc
-CFLAGS  = -std=c99 -Wall -Wextra -Werror -pedantic
-INCLUDE = -I.
-
-default: all
-
-all: $(OBJECTS) main
-
-main: main.o image_cv.o
-	gcc -o main main.o image_cv.o
-
-image_cv.c: image.h
-
-%.o: %.c
-	$(CC) -c -o $@ $(CFLAGS) $(INCLUDE) $<
-
-clean:
-	rm -f $(OBJECTS)
-

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 SOURCES = image_cv.c main.c
 OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
-CC = gcc
-CFLAGS = -std=c99 -Wall -Wextra -Werror -pedantic
+CC      = gcc
+CFLAGS  = -std=c99 -Wall -Wextra -Werror -pedantic
 INCLUDE = -I.
 
 default: all

diff --git a/main.c b/main.c
@@ -10,7 +10,7 @@ int main() {
     struct {
         char c;
     } a = {'a'};
-    printf("access_pixel(img, 0, 0) = %d\n", access_pixel(&a, 0, 0));
+    printf("access_pixel(img, 0, 1) = %d\n", access_pixel(&a, 0, 0));
     return 0;
 }
 
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 SOURCES = image_cv.c main.c
 OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
 CC = gcc
-CFLAGS = -std=c99 -Wall -Wextra -pedantic
+CFLAGS = -std=c99 -Wall -Wextra -Werror -pedantic
 INCLUDE = -I.
 
 default: all

diff --git a/image.h b/image.h
@@ -1,4 +1,4 @@
-typedef void Image;
+typedef int Image;
 
 Image *make_image(int foo);
 char access_pixel(Image *img, int r, int c);

diff --git a/image_cv.c b/image_cv.c
@@ -6,12 +6,12 @@ typedef struct {
 } IplImage;
 
 Image *make_image(int foo) {
-    IplImage *img = (Image *) malloc(sizeof(IplImage));
+    IplImage *img = (IplImage *) malloc(sizeof(IplImage));
     if (!img)
         return NULL;
     img->foo = foo;
     img->bar = foo + 14;
-    return img;
+    return (Image *) img;
 }
 
 char access_pixel(Image *img, int r, int c) {

diff --git a/main.c b/main.c
@@ -7,7 +7,10 @@ int main() {
         fprintf(stderr, "error: querying an image for 42 failed\n");
         return 1;
     }
-    printf("access_pixel(img, 0, 0) = %d\n", access_pixel(img, 0, 0));
+    struct {
+        char c;
+    } a = {'a'};
+    printf("access_pixel(img, 0, 0) = %d\n", access_pixel(&a, 0, 0));
     return 0;
 }
 
diff --git a/.hgignore b/.hgignore
@@ -0,0 +1,4 @@
+syntax:glob
+main
+*.o
+
diff --git a/Makefile b/Makefile
@@ -0,0 +1,21 @@
+SOURCES = image_cv.c main.c
+OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
+CC = gcc
+CFLAGS = -std=c99 -Wall -Wextra -pedantic
+INCLUDE = -I.
+
+default: all
+
+all: $(OBJECTS) main
+
+main: main.o image_cv.o
+	gcc -o main main.o image_cv.o
+
+image_cv.c: image.h
+
+%.o: %.c
+	$(CC) -c -o $@ $(CFLAGS) $(INCLUDE) $<
+
+clean:
+	rm -f $(OBJECTS)
+
diff --git a/image.h b/image.h
@@ -1,2 +1,5 @@
-typedef Image void;
+typedef void Image;
+
+Image *make_image(int foo);
 char access_pixel(Image *img, int r, int c);
+
diff --git a/image_cv.c b/image_cv.c
@@ -0,0 +1,21 @@
+#include <stdlib.h>
+#include <image.h>
+
+typedef struct {
+    int foo, bar;
+} IplImage;
+
+Image *make_image(int foo) {
+    IplImage *img = (Image *) malloc(sizeof(IplImage));
+    if (!img)
+        return NULL;
+    img->foo = foo;
+    img->bar = foo + 14;
+    return img;
+}
+
+char access_pixel(Image *img, int r, int c) {
+    IplImage *iplimg = (IplImage *) img;
+    return iplimg->foo + r + c;
+}
+
diff --git a/main.c b/main.c
@@ -0,0 +1,13 @@
+#include <stdio.h>
+#include <image.h>
+
+int main() {
+    Image *img = make_image(42);
+    if (!img) {
+        fprintf(stderr, "error: querying an image for 42 failed\n");
+        return 1;
+    }
+    printf("access_pixel(img, 0, 0) = %d\n", access_pixel(img, 0, 0));
+    return 0;
+}
+
diff --git a/image.h b/image.h
@@ -0,0 +1,2 @@
+typedef Image void;
+char access_pixel(Image *img, int r, int c);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		typedef Image void;
		char access_pixel(Image *img, int r, int c);