spice-space-commit Mailing List for Spice Space (Page 5)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

repository: /home/tlv/ykamay/open_spice_upload/spice
branch: master

commit ff2e0dbdb7fd2cc93588f83bfc531c4834ef5cff
Author: Yaniv Kamay <yk...@re...>
Date:   Mon Dec 28 00:07:23 2009 +0200

    use spaces instead of tabs in bitmap_to_c and icon_to_c output

diff --git a/tools/bitmap_to_c.c b/tools/bitmap_to_c.c
index 3329d5e..e9cd4db 100644
--- a/tools/bitmap_to_c.c
+++ b/tools/bitmap_to_c.c
@@ -30,6 +30,8 @@
 #define TRUE 1
 #define FALSE 0
 
+#define TAB "    "
+
 #define ERROR(str) printf("%s: error: %s\n", prog_name, str); exit(-1);
 
 static char *prog_name = NULL;
@@ -185,8 +187,8 @@ static void do_dump_with_alpha_conversion(const Pixmap *pixmap, FILE *f)
     for (i = 0; i < pixmap->height; i++) {
         uint8_t *now = line;
         for (j = 0; j < pixmap->width; j++, now += 4) {
-            if ((line_size++ % 6) == 0) {
-                fprintf(f, "\n\t\t");
+            if ((line_size++ % 4) == 0) {
+                fprintf(f, "\n" TAB);
             }
             double alpha = (double)now[3] / 0xff;
             put_char(f, alpha * now[0]);
@@ -207,8 +209,8 @@ static void do_dump_32bpp(const Pixmap *pixmap, FILE *f)
     for (i = 0; i < pixmap->height; i++) {
         uint8_t *now = line;
         for (j = 0; j < pixmap->width; j++, now += 4) {
-            if ((line_size++ % 6) == 0) {
-                fprintf(f, "\n\t\t");
+            if ((line_size++ % 4) == 0) {
+                fprintf(f, "\n" TAB);
             }
             put_char(f, now[0]);
             put_char(f, now[1]);
@@ -228,8 +230,8 @@ static void do_dump_24bpp(const Pixmap *pixmap, FILE *f)
     for (i = 0; i < pixmap->height; i++) {
         uint8_t *now = line;
         for (j = 0; j < pixmap->width; j++, now += 3) {
-            if ((line_size++ % 6) == 0) {
-                fprintf(f, "\n\t\t");
+            if ((line_size++ % 4) == 0) {
+                fprintf(f, "\n" TAB);
             }
             put_char(f, now[0]);
             put_char(f, now[1]);
@@ -259,9 +261,9 @@ static int pixmap_to_c_struct(const Pixmap *pixmap, const char *dest_file, const
 
     uint32_t data_size = pixmap->width * sizeof(uint32_t) * pixmap->height;
     fprintf(f, "static const struct {\n"
-               "\tuint32_t width;\n"
-               "\tuint32_t height;\n"
-               "\tuint8_t pixel_data[%u];\n"
+               TAB "uint32_t width;\n"
+               TAB "uint32_t height;\n"
+               TAB "uint8_t pixel_data[%u];\n"
                "} %s = { %u, %u, {",
             data_size, image_name, pixmap->width, pixmap->height);
 
diff --git a/tools/icon_to_c.c b/tools/icon_to_c.c
index 79ae5fa..0d37ca9 100644
--- a/tools/icon_to_c.c
+++ b/tools/icon_to_c.c
@@ -29,6 +29,8 @@
 #define TRUE 1
 #define FALSE 0
 
+#define TAB "    "
+
 #define ERROR(str) printf("%s: error: %s\n", prog_name, str); exit(-1);
 
 static char *prog_name = NULL;
@@ -213,10 +215,10 @@ static int icon_to_c_struct(const Icon *icon, const char *dest_file, const char
     uint32_t mask_stride = ALIGN(icon->width, 8) / 8;
     uint32_t mask_size = mask_stride * icon->height;
     fprintf(f, "static const struct {\n"
-               "\tuint32_t width;\n"
-               "\tuint32_t height;\n"
-               "\tuint8_t pixmap[%u];\n"
-               "\tuint8_t mask[%u];\n"
+               TAB "uint32_t width;\n"
+               TAB "uint32_t height;\n"
+               TAB "uint8_t pixmap[%u];\n"
+               TAB "uint8_t mask[%u];\n"
                "} %s = { %u, %u, {",
             pixmap_size, mask_size, image_name, icon->width, icon->height);
 
@@ -226,8 +228,8 @@ static int icon_to_c_struct(const Icon *icon, const char *dest_file, const char
     for (i = 0; i < icon->height; i++) {
         uint8_t *now = line;
         for (j = 0; j < icon->width; j++, now += 4) {
-            if ((line_size++ % 6) == 0) {
-                fprintf(f, "\n\t\t");
+            if ((line_size++ % 4) == 0) {
+                fprintf(f, "\n" TAB);
             }
             put_char(f, now[0]);
             put_char(f, now[1]);
@@ -239,14 +241,14 @@ static int icon_to_c_struct(const Icon *icon, const char *dest_file, const char
 
 
     fseek(f, -1, SEEK_CUR);
-    fprintf(f, "},\n\n\t\t{");
+    fprintf(f, "},\n\n" TAB TAB "{");
 
     line = (uint8_t *)(icon->mask + ((icon->height - 1) * mask_stride));
     line_size = 0;
     for (i = 0; i < icon->height; i++) {
         for (j = 0; j < mask_stride; j++) {
             if (line_size && (line_size % 12) == 0) {
-                fprintf(f, "\n\t\t ");
+                fprintf(f, "\n" TAB);
             }
             line_size++;
             put_char(f, line[j]);




2009	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (25)
2010	Jan (81)	Feb (6)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec