Skip to content

Commit e426fbb

Browse files
f7a8f7a8
committed
compiled now with -Wall
make test ends with an diff through the fresh generated images and saved one. Corrected Wall warnings
1 parent 455565d commit e426fbb

File tree

11 files changed

+45
-46
lines changed

11 files changed

+45
-46
lines changed

‎Makefile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
COMPILER=gcc
3-
CFLAGS=-O3 -march=native -mtune=native
3+
CFLAGS=-O3 -Wall -march=native -mtune=native
4+
#CFLAGS=-g
45

56
all: bin/ bin/mosaik2
67

@@ -44,13 +45,13 @@ test:
4445
wget -N "https://upload.wikimedia.org/wikipedia/commons/5/52/2014.03.29.-08-Mannheim_Neckarau_Waldpark-Wiesen-Schaumkraut.jpg" --directory-prefix=test/flower
4546
tar xfz test/flower/flower_photos.tgz -C test/flower
4647
find test/flower/flower_photos -type f -iregex '.*\.jpe?g$$' -size +10000c -fprintf flower_photos.file_list "%p\t%s\t%T@\n"
48+
bin/mosaik2 init test/flower/flowerphotos8 8
49+
bin/mosaik2 index test/flower/flowerphotos8 8 0 < flower_photos.file_list
4750
bin/mosaik2 init test/flower/flowerphotos16 16
48-
bin/mosaik2 index test/flower/flowerphotos16 8 8 < flower_photos.file_list
49-
bin/mosaik2 init test/flower/flowerphotos32 32
50-
bin/mosaik2 index test/flower/flowerphotos32 8 8 < flower_photos.file_list
51-
bin/mosaik2 gathering 30 5868357 test/flower/Wiesen-Schaumkraut.jpeg 100 1 test/flower/flowerphotos16 < test/flower/2014.03.29.-08-Mannheim_Neckarau_Waldpark-Wiesen-Schaumkraut.jpg
52-
bin/mosaik2 gathering 30 5868357 test/flower/Wiesen-Schaumkraut.jpeg 100 1 test/flower/flowerphotos32 < test/flower/2014.03.29.-08-Mannheim_Neckarau_Waldpark-Wiesen-Schaumkraut.jpg
53-
bin/mosaik2 join test/flower/Wiesen-Schaumkraut.jpeg 100 0 1 test/flower/flowerphotos16
54-
bin/mosaik2 join test/flower/Wiesen-Schaumkraut.jpeg 100 0 1 test/flower/flowerphotos32
55-
56-
51+
bin/mosaik2 index test/flower/flowerphotos16 8 0 < flower_photos.file_list
52+
bin/mosaik2 gathering 15 5868357 test/flower/Wiesen-Schaumkraut8.jpeg 100 1 test/flower/flowerphotos8 < test/flower/2014.03.29.-08-Mannheim_Neckarau_Waldpark-Wiesen-Schaumkraut.jpg
53+
bin/mosaik2 gathering 15 5868357 test/flower/Wiesen-Schaumkraut16.jpeg 100 1 test/flower/flowerphotos16 < test/flower/2014.03.29.-08-Mannheim_Neckarau_Waldpark-Wiesen-Schaumkraut.jpg
54+
bin/mosaik2 join test/flower/Wiesen-Schaumkraut8.jpeg 100 0 1 test/flower/flowerphotos8
55+
bin/mosaik2 join test/flower/Wiesen-Schaumkraut16.jpeg 100 0 1 test/flower/flowerphotos16
56+
diff misc/test/Wiesen-Schaumkraut8.jpeg test/flower/Wiesen-Schaumkraut8.jpeg
57+
diff misc/test/Wiesen-Schaumkraut16.jpeg test/flower/Wiesen-Schaumkraut16.jpeg

‎misc/test/Wiesen-Schaumkraut16.jpeg

4.72 MB
Loading

‎misc/test/Wiesen-Schaumkraut8.jpeg

4.58 MB
Loading

‎src/duplicates.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ void build_filehashes_index(mosaik2_database *md) {
343343

344344
unsigned char *buf = malloc(chunk_nmemb[0] * (dataset_len));
345345
if(buf==NULL) {
346-
fprintf(stderr, "could not malloc buffer (size:%lli) for external sort\n", chunk_nmemb[0] * (MD5_DIGEST_LENGTH+sizeof(size_t)));
346+
fprintf(stderr, "could not malloc buffer (size:%li) for external sort\n", chunk_nmemb[0] * (MD5_DIGEST_LENGTH+sizeof(size_t)));
347347
exit(EXIT_FAILURE);
348348
}
349349

@@ -364,7 +364,7 @@ void build_filehashes_index(mosaik2_database *md) {
364364
for(size_t i=0;i<loop_size;i++) {
365365
size_t read_nmemb = fread(buf, MD5_DIGEST_LENGTH, chunk_nmemb[i], filehashes_file);
366366
if(read_nmemb != chunk_nmemb[i]) {
367-
fprintf(stderr, "read unexpected data legngth. should %lix%li, bit %li elements were read\n", MD5_DIGEST_LENGTH, chunk_nmemb[i], read_nmemb);
367+
fprintf(stderr, "read unexpected data length. should %ix%li, but %li elements were read\n", MD5_DIGEST_LENGTH, chunk_nmemb[i], read_nmemb);
368368
exit(EXIT_FAILURE);
369369
}
370370

@@ -516,7 +516,7 @@ int qsort_(const void *p0, const void *p1) {
516516
void read_filenames_index(FILE *filenames_index_file, long element_no, long *filenames_offset) {
517517

518518
if(fseeko(filenames_index_file, element_no*sizeof(long), SEEK_SET) != 0) {
519-
fprintf(stderr, "could not seek to element_no %li in filenames_idx\n");
519+
fprintf(stderr, "could not seek to element_no %li in filenames_idx\n", element_no);
520520
exit(EXIT_FAILURE);
521521
}
522522
if( fread(filenames_offset, sizeof(long), 1, filenames_index_file) != 1 ) {

‎src/index.c

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ int mosaik2_index(char *mosaik2_database_name, uint32_t max_tiler_processes, ui
5757
init_mosaik2_context(&ctx);
5858
ctx.max_tiler_processes = get_max_tiler_processes(max_tiler_processes);
5959
ctx.max_load_avg = get_max_load_avg(max_load_avg);
60-
fprintf(stderr, "max_load_avg %i %f\n", ctx.max_load_avg, ctx.max_load_avg);
60+
// fprintf(stderr, "max_load_avg %f\n", ctx.max_load_avg, ctx.max_load_avg);
6161

6262
mosaik2_database md;
6363

@@ -143,11 +143,11 @@ void remove_pid_file(mosaik2_database *md) {
143143

144144
void process_input_data(mosaik2_context *ctx, mosaik2_database *md) {
145145

146-
mosaik2_indextask task_list[ctx->max_tiler_processes];
146+
//mosaik2_indextask task_list[ctx->max_tiler_processes];
147147

148148
md->tilecount = read_thumbs_conf_tilecount(md);
149-
size_t i=0;
150-
size_t maxmemb=-1;maxmemb;
149+
size_t i=read_thumbs_db_count(md);
150+
size_t maxmemb=-1;
151151
size_t len = 0;
152152
char *lineptr = NULL;
153153

@@ -162,21 +162,18 @@ void process_input_data(mosaik2_context *ctx, mosaik2_database *md) {
162162
process_next_line(ctx, md, lineptr, i++,stdin0);
163163
}
164164
if(exiting == 1) {
165-
fprintf(stderr, "received SIGINT, exiting after %i lines\n", i);
165+
fprintf(stderr, "received SIGINT, exiting after %li lines\n", i);
166166
}
167167
if(i>=maxmemb) {
168-
fprintf(stderr, "exiting after %i lines, maximum lines (%i) saved per mosaik2 database, append outstanding images to a new mosaik2 database\n", maxmemb);
168+
fprintf(stderr, "exiting after maximum lines (%li) saved per mosaik2 database, append outstanding images to a new mosaik2 database\n", maxmemb);
169169
}
170170

171171

172-
fprintf(stderr, "wait for subprocesses\n");
173172
int wstatus=0;
174-
wait(&wstatus);
175-
fprintf(stderr, "waited %i\n", wstatus);
173+
wait(&wstatus); //TODO doesnt work always
176174
}
177175

178176
void process_next_line(mosaik2_context *ctx, mosaik2_database *md, char *line, ssize_t i, FILE *file) {
179-
180177

181178
if(ctx->exiting)
182179
fprintf(stdout, "input data is not resumed, EXITing because of SIGTERM.");
@@ -249,7 +246,7 @@ void mosaik2_index_write_to_disk(mosaik2_database *md, mosaik2_indextask *task)
249246
}
250247
if (flock(lockfile_fd, LOCK_EX) == -1) {
251248
if (errno == EWOULDBLOCK) {
252-
fprintf(stderr,"lockfile is already locked\n", (long) getpid());
249+
fprintf(stderr,"lockfile is already locked\n");
253250
exit(EXIT_FAILURE);
254251
}
255252
}
@@ -363,7 +360,7 @@ void mosaik2_index_add_tiler_pid(mosaik2_context *ctx, pid_t pid) {
363360

364361
void mosaik2_index_clean_tiler_pids(mosaik2_context *ctx) {
365362
//print_usage("clean0");
366-
int usleep_rc = usleep(10000);
363+
usleep(10000);
367364
//print_usage("clean1");
368365

369366
for(int i=0;i<10; i++) {

‎src/init.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void create_mosaik2_database_file_id(char *filename) {
5858
memset( buf, 0, 8 );
5959
memset( buf2, 0, 17);
6060
if( 8 == fread(buf, 1, 8, rand_file) ) {
61-
unsigned char *hexbuf = phex( buf, 8);
61+
char *hexbuf = phex( buf, 8);
6262
if(16 != fwrite(hexbuf, 1, 16, file)) {
6363
free(hexbuf);
6464

@@ -110,7 +110,6 @@ void create_mosaik2_database_file_readme(char *filename) {
110110

111111
int mosaik2_init(char *mosaik2_database_name, uint32_t tilecount) {
112112

113-
int debug=0;
114113

115114
mosaik2_database md;
116115
init_mosaik2_database(&md, mosaik2_database_name);

‎src/join.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
//TODO check is db older than the result file?
22
//TODO unique_tiles
33

4-
// _
5-
// (_) _
6-
// | | ___ (_) _ _
7-
// _/ |/ _ \| || ' \
8-
// |__/ \___/|_||_||_|
4+
/*
5+
_
6+
(_) _
7+
| | ___ (_) _ _
8+
_/ |/ _ \| || ' \
9+
|__/ \___/|_||_||_|
10+
*/
911

1012
#include "libmosaik2.h"
1113

‎src/libmosaik2.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ uint8_t ORIENTATION_BOTTOM_RIGHT=2;
99
uint8_t ORIENTATION_LEFT_BOTTOM=3;
1010

1111
void init_mosaik2_context(mosaik2_context *ctx) {
12-
memset(ctx, 0, sizeof(ctx));
12+
memset(ctx, 0, sizeof(mosaik2_context));
1313
memset(ctx->pids, 0, 1024*sizeof(pid_t));
1414
char *env_mosaik2_debug = getenv("MOSAIK2_DEBUG");
1515
if(env_mosaik2_debug != NULL) {
@@ -464,7 +464,7 @@ void check_thumbs_db(mosaik2_database *md) {
464464
}
465465

466466
if( get_file_size(md->image_index_filename) != element_count*sizeof(long)) {
467-
fprintf(stderr, "mosaik2 database file (%s) has not the expected size:%i\n", md->image_index_filename, element_count*sizeof(long));
467+
fprintf(stderr, "mosaik2 database file (%s) has not the expected size:%li\n", md->image_index_filename, element_count*sizeof(long));
468468
exit(EXIT_FAILURE);
469469
}
470470

@@ -613,9 +613,9 @@ uint8_t get_image_orientation(unsigned char *buffer, size_t buf_size) {
613613
} else if(strcmp(buf, "Left-Bottom")==0) {
614614
return ORIENTATION_LEFT_BOTTOM;
615615
}
616-
return ORIENTATION_TOP_LEFT;
617616
}
618617
}
618+
return ORIENTATION_TOP_LEFT;
619619
}
620620

621621
gdImagePtr myLoadPng(char *filename, char *origin_name) {
@@ -679,7 +679,8 @@ gdImagePtr myLoadPng(char *filename, char *origin_name) {
679679
return im;
680680
}
681681
/* Remove spaces on the right of the string */
682-
static void trim_spaces(char *buf) {
682+
//static void trim_spaces(char *buf) {
683+
void trim_spaces(char *buf) {
683684
char *s = buf-1;
684685
for (; *buf; ++buf) {
685686
if (*buf != ' ')
@@ -691,7 +692,7 @@ static void trim_spaces(char *buf) {
691692

692693

693694
/* Show the tag name and contents if the tag exists */
694-
static void show_tag(ExifData *d, ExifIfd ifd, ExifTag tag)
695+
void show_tag(ExifData *d, ExifIfd ifd, ExifTag tag)
695696
{
696697
/* See if this tag exists */
697698
ExifEntry *entry = exif_content_get_entry(d->ifd[ifd],tag);
@@ -710,7 +711,7 @@ static void show_tag(ExifData *d, ExifIfd ifd, ExifTag tag)
710711
}
711712

712713
/* Show the given MakerNote tag if it exists */
713-
static void show_mnote_tag(ExifData *d, unsigned tag)
714+
void show_mnote_tag(ExifData *d, unsigned tag)
714715
{
715716
ExifMnoteData *mn = exif_data_get_mnote_data(d);
716717
if (mn) {
@@ -805,7 +806,7 @@ int mosaik2_indextask_read_image(mosaik2_indextask *task) {
805806
fprintf(stderr, "could not open file (%s)\n", task->filename);
806807
return errno;
807808
}
808-
char *buf = malloc(task->filesize);
809+
unsigned char *buf = malloc(task->filesize);
809810
if(buf == NULL) {
810811
fprintf(stderr, "could not allocate memory for image data\n");
811812
fclose(file);
@@ -837,8 +838,8 @@ void print_usage(char *m) {
837838
struct timeb tb;
838839
ftime(&tb);
839840
struct rusage resuage;
840-
int usage = getrusage( RUSAGE_SELF, &resuage);
841-
fprintf(stderr, "%i %i.%03i %-10s usert:%li.%06li syst:%li.%06li max:%6li ix:%li, id:%li, is:%li\n",
841+
getrusage( RUSAGE_SELF, &resuage);
842+
fprintf(stderr, "%i %li.%03i %-10s usert:%li.%06li syst:%li.%06li max:%6li ix:%li, id:%li, is:%li\n",
842843
getpid(), tb.time, tb.millitm,
843844
m, resuage.ru_utime.tv_sec, resuage.ru_utime.tv_usec,
844845
resuage.ru_stime.tv_sec, resuage.ru_stime.tv_usec,

‎src/libmosaik2.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ int File_Copy(char FileSource[], char FileDestination[]);
7979

8080
uint8_t get_image_orientation(unsigned char *buffer, size_t buf_size);
8181
gdImagePtr myLoadPng(char *filename, char *origin_name);
82-
static void trim_spaces(char *buf);
83-
static void show_tag(ExifData *d, ExifIfd ifd, ExifTag tag);
84-
static void show_mnote_tag(ExifData *d, unsigned tag);
82+
void trim_spaces(char *buf);
83+
void show_tag(ExifData *d, ExifIfd ifd, ExifTag tag);
84+
void show_mnote_tag(ExifData *d, unsigned tag);
8585

8686
gdImagePtr gdImageRotate90 (gdImagePtr src);
8787
gdImagePtr gdImageRotate180 (gdImagePtr src);

‎src/mosaik2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ int main(int argc, char **argv) {
1919

2020
const char *init = "init";
2121
const char *index = "index";
22-
const char *tiler = "tiler";
22+
//const char *tiler = "tiler";
2323
const char *gathering = "gathering";
2424
const char *join = "join";
2525
const char *invalid = "invalid";

0 commit comments

Comments
 (0)