diff --git a/src/generic/evas/common/shmfile.h b/src/generic/evas/common/shmfile.h index f70a8fd157..a58dd4bf2b 100644 --- a/src/generic/evas/common/shmfile.h +++ b/src/generic/evas/common/shmfile.h @@ -4,7 +4,7 @@ #ifdef __cplusplus extern "C" { #endif - + extern int shm_fd; extern int shm_size; extern void *shm_addr; diff --git a/src/generic/evas/common/timeout.h b/src/generic/evas/common/timeout.h index 8725627e06..2ea039badf 100644 --- a/src/generic/evas/common/timeout.h +++ b/src/generic/evas/common/timeout.h @@ -4,9 +4,9 @@ #ifdef __cplusplus extern "C" { #endif - + void timeout_init(int seconds); - + #ifdef __cplusplus } #endif diff --git a/src/generic/evas/gst/main.c b/src/generic/evas/gst/main.c index 3f93507078..4ac37c4dda 100644 --- a/src/generic/evas/gst/main.c +++ b/src/generic/evas/gst/main.c @@ -70,7 +70,7 @@ _gst_init(const char *filename) D("Setting file %s\n", uri); - descr = g_strdup_printf("uridecodebin uri=%s ! typefind ! videoconvert ! " + descr = g_strdup_printf("uridecodebin uri=%s ! typefind ! videoconvert ! " " appsink name=sink caps=\"" CAPS "\"", uri); pipeline = gst_parse_launch(descr, &error); free(uri); diff --git a/src/generic/evas/ps/main.c b/src/generic/evas/ps/main.c index 586c7e8f0b..2afa62adff 100644 --- a/src/generic/evas/ps/main.c +++ b/src/generic/evas/ps/main.c @@ -151,7 +151,7 @@ _pixcopy(DATA32 *dst, unsigned char *src, int size) e = s + size; while (s < e) { - d[0] = + d[0] = 0xff000000 | (s[2] << 16) | (s[1] << 8 ) | @@ -250,7 +250,7 @@ main(int argc, char **argv) D("page...: %d\n", page_nbr); timeout_init(10); - + if (!_spectre_init(file, page_nbr, size_w, size_h)) return -1; D("_spectre_init done\n"); diff --git a/src/generic/evas/rsvg/main.c b/src/generic/evas/rsvg/main.c index 70d50e204f..1eaf2a32c7 100644 --- a/src/generic/evas/rsvg/main.c +++ b/src/generic/evas/rsvg/main.c @@ -199,7 +199,7 @@ int main(int argc, char **argv) } timeout_init(5); - + if (!_svg_init(file)) return -1; if (!read_svg_header(scale_down, dpi, size_w, size_h)) return -1; diff --git a/src/generic/evas/xcf/main.c b/src/generic/evas/xcf/main.c index 767c6bf4b1..d9e162dac6 100644 --- a/src/generic/evas/xcf/main.c +++ b/src/generic/evas/xcf/main.c @@ -275,7 +275,7 @@ static File * f_open(const char *file) { File *f; - + f = calloc(1, sizeof(File)); if (!f) return NULL; f->fd = open(file, O_RDONLY); @@ -304,13 +304,13 @@ f_close(File *f) free(f); } -#ifdef FBUF +#ifdef FBUF static void _f_read_pos(File *f, long pos, long bytes) { long i, cnum; Chunk **cks; - + if (f->size > 0) return; cnum = ((pos + bytes) / CHUNK_SIZE) + 1; if (f->chunk_num >= cnum) return; @@ -343,19 +343,19 @@ _f_read_pos(File *f, long pos, long bytes) static long f_read(File *f, unsigned char *dest, long bytes) { -#ifdef FBUF +#ifdef FBUF long done = 0, off = 0; int c; unsigned char *p; _f_read_pos(f, f->pos, bytes); - + c = f->pos / CHUNK_SIZE; off = f->pos - (c * CHUNK_SIZE); p = dest; while ((done < bytes) && (c < f->chunk_num)) { long amount = bytes - done; - + if (!f->chunk[c]) break; if (amount > (f->chunk[c]->size - off)) amount = (f->chunk[c]->size - off); @@ -372,7 +372,7 @@ f_read(File *f, unsigned char *dest, long bytes) long done = gzread(f->fp, dest, bytes); f->pos += done; return done; -#endif +#endif } static void @@ -383,14 +383,14 @@ f_seek(File *f, long pos) { if (pos >= f->size) pos = f->size -1; } -#endif +#endif if (f->pos == pos) return; f->pos = pos; #ifdef FBUF _f_read_pos(f, f->pos, 1); #else gzseek(f->fp, f->pos, SEEK_SET); -#endif +#endif } @@ -1696,12 +1696,12 @@ main(int argc, char **argv) // int size_h = atoi(argv[i]); } } - + timeout_init(8); - + D("xcf_file_init\n"); if (!xcf_file_init(file)) return -1; - + D("size %i %i\n", image->width, image->height); if (!head_only) {