Changeset 383Tweet

Timestamp:

Jan 3, 2005, 11:58:23 AM (18 years ago)

Author:

Sam Hocevar

Message:

• Put font in share/
• Fixed file headers

Location:

pwntcha/trunk

Files:

• Makefile.am (modified) (1 diff)
• share (added)
• share/font_dilated_half.png (added)
• src/Makefile.am (modified) (1 diff)
• src/image.c (modified) (3 diffs)
• src/main.c (modified) (1 diff)
• src/slashdot.c (modified) (3 diffs)

pwntcha/trunk/Makefile.am

@@ -7 +7 @@
         bootstrap \
         ChangeLog \
+        share/font_dilated_half.png \
         $(NULL)
 

pwntcha/trunk/src/Makefile.am

@@ -2 +2 @@
 
 bin_PROGRAMS = pwntcha
-pwntcha_CFLAGS = $(ADDITIONAL_CFLAGS) -Wall
+pwntcha_CFLAGS = $(ADDITIONAL_CFLAGS) -Wall -O6
 pwntcha_LDFLAGS = $(ADDITIONAL_LDFLAGS)
-pwntcha_SOURCES = main.c image.c slashdot.c
+pwntcha_SOURCES = main.c image.c slashdot.c common.h
 
 if USE_IMLIB2

pwntcha/trunk/src/image.c

@@ -11 +11 @@
 
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>
 
@@ -134 +133 @@
 void display_image(struct image *img)
 {
-    char name[BUFSIZ];
 #if defined(HAVE_IMLIB2_H)
+    //char name[BUFSIZ];
     //static int i = 0;
     //sprintf(name, "image%i-%ix%i.png", i++, img->width, img->height);
@@ -142 +141 @@
     //fprintf(stderr, "saved to %s\n", name);
 #elif defined(HAVE_CV_H)
+    char name[BUFSIZ];
     sprintf(name, "Image %p (%i x %i)", img, img->width, img->height);
     cvNamedWindow(name, 0);

pwntcha/trunk/src/main.c

@@ -11 +11 @@
 
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>
 

pwntcha/trunk/src/slashdot.c

@@ -11 +11 @@
 
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>
+#include <string.h>
 #include <math.h>
 
@@ -20 +20 @@
 /* Our macros */
 #define FACTOR 1
-//#define FONTNAME "font.png" // use with FACTOR = 2
-//#define FONTNAME "font_dilated.png" // use with FACTOR = 2
-#define FONTNAME "font_dilated_half.png" // use with FACTOR = 1
+//#define FONTNAME "share/font.png" // use with FACTOR = 2
+//#define FONTNAME "share/font_dilated.png" // use with FACTOR = 2
+#define FONTNAME "share/font_dilated_half.png" // use with FACTOR = 1
 
 /* Global stuff */
@@ -605 +605 @@
 char * slashdot_decode(char *image)
 {
-    struct image *img, *tmp, *tmp2, *dst;
+    struct image *img, *tmp, *tmp2;
 
     img = load_image(image);