varies fixes for new build system via smvv

I cannot merge all @smvv's changes due the the fact that I cannot
understand all the dependencies of these makefiles, and the newly
changed tld.c file cannot pass my test video. Will do these merges
later, but for now, only limited changes are merged to mainline.

Fix C spec violation error due to missing -std=c99

Various build system and configure script improvements

Move configure script to root directory

Fix undeclared constants (previously included by png.h)

The undeclared constants are defined in zlib.h. Previously, png.h included
zlib.h, but recent versions of libpng (version >= 1.5) do not include zlib.h
anymore.

This commit will solve the following errors:

lib/io/_ccv_io_libpng.c: In function ‘_ccv_write_png_fd’:
lib/io/_ccv_io_libpng.c:55:23: error: ‘MAX_MEM_LEVEL’ undeclared (first use in
this function)
lib/io/_ccv_io_libpng.c:55:23: note: each undeclared identifier is reported
only once for each function it appears in
lib/io/_ccv_io_libpng.c:63:38: error: ‘Z_BEST_SPEED’ undeclared (first use in
this function)
lib/io/_ccv_io_libpng.c:65:40: error: ‘Z_HUFFMAN_ONLY’ undeclared (first use in
this function)

Rewrote build system for proper dependency tracking

This commit makes it also possible to build all binaries and the ccv library in
parallel using e.g. make -j4.

Add build/lib to ld's library search path

Cleanup and mark object files as precious (aka "do-not-remove")

Use conditional assignment for CC, CFLAGS and LDFLAGS

Integrate test/ in central build system (work in progress)

Fix C spec violation error due to missing -std=c99

Add test/ directory to header include path

Author: smvv

.gitignore

@@ -28,3 +28,5 @@ bin/*.diff
 bin/data/*
 data/*
 tool/*
+config.mk
+build

bin/makefile

@@ -1,6 +1,8 @@
-CC = `cat ../lib/.CC`# -faddress-sanitizer -fno-omit-frame-pointer
-LDFLAGS = -L"../lib" -lccv `cat ../lib/.LN`
-CFLAGS = -O3 -Wall -I"../lib" `cat ../lib/.DEF`
+include ../lib/config.mk
+
+#CC += -faddress-sanitizer -fno-omit-frame-pointer
+LDFLAGS := -L"../lib" -lccv $(LDFLAGS)
+CFLAGS := -O3 -Wall -I"../lib" $(CFLAGS)
 
 TARGETS = bbffmt msermatch siftmatch bbfcreate bbfdetect swtcreate swtdetect dpmcreate dpmdetect convert tld
 
@@ -10,12 +12,10 @@ clean:
 	${MAKE} clean -C ../lib ; rm *.o $(TARGETS)
 
 $(TARGETS): %: %.o libccv.a
-	@echo "$(CC) -o $@ $< $(LDFLAGS)"
-	@$(CC) -o $@ $< $(LDFLAGS)
+	$(CC) -o $@ $< $(LDFLAGS)
 
 libccv.a:
 	${MAKE} -C ../lib
 
 %.o: %.c ../lib/ccv.h
-	@echo "$(CC) $< -o $@ -c $(CFLAGS)"
-	@$(CC) $< -o $@ -c $(CFLAGS)
+	$(CC) $< -o $@ -c $(CFLAGS)

bin/tld.c

@@ -24,9 +24,9 @@ int main(int argc, char** argv)
 	AVFormatContext* ic = 0;
 	int video_stream = -1;
 	AVStream* video_st = 0;
-	AVFrame* picture = avcodec_alloc_frame();
-	AVFrame* rgb_picture = avcodec_alloc_frame();
-	//avcodec_get_frame_defaults(&rgb_picture);
+	AVFrame* picture = 0;
+	AVFrame rgb_picture;
+	memset(&rgb_picture, 0, sizeof(AVPicture));
 	AVPacket packet;
 	memset(&packet, 0, sizeof(AVPacket));
 	av_init_packet(&packet);
@@ -47,77 +47,38 @@ int main(int argc, char** argv)
 				continue;
 			video_stream = i;
 			video_st = ic->streams[i];
-			avpicture_alloc((AVPicture*) rgb_picture, PIX_FMT_RGB24, enc->width, enc->height);
+			picture = avcodec_alloc_frame();
+			rgb_picture.data[0] = (uint8_t*)ccmalloc(avpicture_get_size(PIX_FMT_RGB24, enc->width, enc->height));
+			avpicture_fill((AVPicture*)&rgb_picture, rgb_picture.data[0], PIX_FMT_RGB24, enc->width, enc->height);
 			break;
 		}
 	}
 	int got_picture = 0;
 	while (!got_picture)
 	{
-		av_init_packet(&packet);
 		int result = av_read_frame(ic, &packet);
-		if (result == AVERROR(EAGAIN) || packet.stream_index != video_stream)
-		{
-			av_free_packet(&packet);
+		if (result == AVERROR(EAGAIN))
 			continue;
-		}
-		else if (result < 0)
-			return 1;
-
-		if (avcodec_decode_video2(video_st->codec, picture, &got_picture,
-								 &packet) < 0)
-			return 1;
-		av_free_packet(&packet);
+		avcodec_decode_video2(video_st->codec, picture, &got_picture, &packet);
 	}
-
 	ccv_enable_default_cache();
-
-	struct SwsContext* picture_ctx =
-		sws_getCachedContext(0, video_st->codec->width,
-							 video_st->codec->height, video_st->codec->pix_fmt,
-							 video_st->codec->width, video_st->codec->height,
-							 PIX_FMT_RGB24, SWS_BICUBIC, 0, 0, 0);
-
-	sws_scale(picture_ctx, (const uint8_t* const*) picture->data,
-			  picture->linesize, 0, video_st->codec->height,
-			  rgb_picture->data, rgb_picture->linesize);
-
+	struct SwsContext* picture_ctx = sws_getCachedContext(0, video_st->codec->width, video_st->codec->height, video_st->codec->pix_fmt, video_st->codec->width, video_st->codec->height, PIX_FMT_RGB24, SWS_BICUBIC, 0, 0, 0);
+	sws_scale(picture_ctx, (const uint8_t* const*)picture->data, picture->linesize, 0, video_st->codec->height, rgb_picture.data, rgb_picture.linesize);
 	ccv_dense_matrix_t* x = 0;
-	ccv_read(rgb_picture->data[0], &x, CCV_IO_RGB_RAW | CCV_IO_GRAY,
-			 video_st->codec->height, video_st->codec->width,
-			 rgb_picture->linesize[0]);
+	ccv_read(rgb_picture.data[0], &x, CCV_IO_RGB_RAW | CCV_IO_GRAY, video_st->codec->height, video_st->codec->width, rgb_picture.linesize[0]);
 	ccv_tld_t* tld = ccv_tld_new(x, box, ccv_tld_default_params);
-
 	ccv_dense_matrix_t* y = 0;
-
 	for (;;)
 	{
 		got_picture = 0;
-
-		av_init_packet(&packet);
 		int result = av_read_frame(ic, &packet);
-
-		if (result == AVERROR(EAGAIN) || packet.stream_index != video_stream)
-		{
-			av_free_packet(&packet);
+		if (result == AVERROR(EAGAIN))
 			continue;
-		}
-		else if (result < 0)
-			return 1;
-
-		if (avcodec_decode_video2(video_st->codec, picture, &got_picture,
-								  &packet) < 0)
-			return 1;
-
+		avcodec_decode_video2(video_st->codec, picture, &got_picture, &packet);
 		if (!got_picture)
 			break;
-
-		sws_scale(picture_ctx, (const uint8_t* const*)picture->data,
-				  picture->linesize, 0, video_st->codec->height,
-				  rgb_picture->data, rgb_picture->linesize);
-		ccv_read(rgb_picture->data[0], &y, CCV_IO_RGB_RAW | CCV_IO_GRAY,
-				 video_st->codec->height, video_st->codec->width,
-				 rgb_picture->linesize[0]);
+		sws_scale(picture_ctx, (const uint8_t* const*)picture->data, picture->linesize, 0, video_st->codec->height, rgb_picture.data, rgb_picture.linesize);
+		ccv_read(rgb_picture.data[0], &y, CCV_IO_RGB_RAW | CCV_IO_GRAY, video_st->codec->height, video_st->codec->width, rgb_picture.linesize[0]);
 		ccv_tld_info_t info;
 		ccv_comp_t newbox = ccv_tld_track_object(tld, x, y, &info);
 		/*
@@ -171,8 +132,7 @@ int main(int argc, char** argv)
 	}
 	ccv_matrix_free(x);
 	ccv_tld_free(tld);
-	avpicture_free((AVPicture *) rgb_picture);
-	av_free(rgb_picture);
+	ccfree(rgb_picture.data[0]);
 	ccv_disable_cache();
 #endif
 #endif

lib/ccv_io.c

@@ -14,7 +14,8 @@
 // Unsupported platform
 #endif
 #else
-#include <libpng/png.h>
+#include <zlib.h>
+#include <png.h>
 #endif
 #include "io/_ccv_io_libpng.c"
 #endif

lib/ccv_tld.c

@@ -90,8 +90,9 @@ static ccv_rect_t _ccv_tld_short_term_track(ccv_dense_matrix_t* a, ccv_dense_mat
 	ccv_array_t* point_a = ccv_array_new(sizeof(ccv_decimal_point_t), (TLD_GRID_SPARSITY - 1) * (TLD_GRID_SPARSITY - 1), 0);
 	float gapx = (float)box.width / TLD_GRID_SPARSITY;
 	float gapy = (float)box.height / TLD_GRID_SPARSITY;
-	for (float x = gapx * 0.5; x < box.width; x += gapx)
-		for (float y = gapy * 0.5; y < box.height; y += gapy)
+	float x, y;
+	for (x = gapx * 0.5; x < box.width; x += gapx)
+		for (y = gapy * 0.5; y < box.height; y += gapy)
 		{
 			ccv_decimal_point_t point = ccv_decimal_point(box.x + x, box.y + y);
 			ccv_array_push(point_a, &point);

lib/configure

@@ -5,15 +5,20 @@ if [ `uname` == "Darwin" ] ; then
 fi
 
 if [ "$1" = "force" ] ; then
-	rm -f .CC .DEF .LN
+	rm -f config.mk
 fi
 
-if [ ! -e .CC -o ! -e .DEF -o ! -e .LN ] ; then
-	echo -e "\n There are a few questions for you:\n"
-fi
+contains_flag () {
+	if [ -f config.mk ]; then
+		grep -E "^$1 := " config.mk &>/dev/null;
+		return $?;
+	fi
+
+	return 1;
+}
 
-if [ -e .CC ] ; then
-	CC=`cat .CC`
+if contains_flag CC; then
+	CC=`grep -oE 'CC := [^#]+' config.mk | cut -b7-`
 else
 	echo -ne "  Default compiler: \033[4mclang\033[m [Y/n] ? "
 	read -n 1 yn ; if [ ! -z $yn ] ; then echo ; fi
@@ -23,12 +28,12 @@ else
 	*	  ) CC='clang'
 			;;
 	esac
-	echo $CC > .CC
+	echo "CC := $CC" >> config.mk
 fi
 
-if [ -e .DEF -a -e .LN ] ; then
-	CFLAGS=`cat .DEF`
-	LDFLAGS=`cat .LN`
+if contains_flag CFLAGS && contains_flag LDFLAGS; then
+	CFLAGS=`grep -oE 'CFLAGS := [^#]+' config.mk | cut -b11-`
+	LDFLAGS=`grep -oE 'LDFLAGS := [^#]+' config.mk | cut -b12-`
 else
 	CFLAGS=" "
 	LDFLAGS="-lm "
@@ -124,8 +129,8 @@ else
 			;;
 	*	  ) ;;
 	esac
-	echo $CFLAGS > .DEF
-	echo $LDFLAGS > .LN
+	echo "CFLAGS := $CFLAGS" >> config.mk
+	echo "LDFLAGS := $LDFLAGS" >> config.mk
 fi
 
 CFLAGS="${CFLAGS#"${CFLAGS%%[![:space:]]*}"}" # remove leading whitespaces

lib/makefile

@@ -1,13 +1,9 @@
-CC = `cat .CC`# -faddress-sanitizer -fno-omit-frame-pointer
-CFLAGS = -O3 -ffast-math -Wall `cat .DEF`# -fprofile-arcs -ftest-coverage
+include config.mk
 
-config:
-	@./configure
-	@make all
+#CC += -faddress-sanitizer -fno-omit-frame-pointer
+CFLAGS := -O3 -ffast-math -Wall $(CFLAGS)# -fprofile-arcs -ftest-coverage
 
-force: clean
-	@./configure force
-	@make all
+.PHONY: all clean
 
 all: libccv.a
 
@@ -18,9 +14,7 @@ libccv.a: ccv_cache.o ccv_memory.o 3rdparty/sha1/sha1.o 3rdparty/kissfft/kiss_ff
 	ar rcs $@ $^
 
 ccv_io.o: ccv_io.c ccv.h ccv_internal.h io/*.c
-	@echo "$(CC) $< -o $@ -c $(CFLAGS)"
-	@$(CC) $< -o $@ -c $(CFLAGS)
+	$(CC) $< -o $@ -c $(CFLAGS)
 
 %.o: %.c ccv.h ccv_internal.h
-	@echo "$(CC) $< -o $@ -c $(CFLAGS)"
-	@$(CC) $< -o $@ -c $(CFLAGS)
+	$(CC) $< -o $@ -c $(CFLAGS)

test/functional/makefile

@@ -1,6 +1,8 @@
-CC = `cat ../../lib/.CC`# -fprofile-arcs -ftest-coverage
-LDFLAGS = -L"../../lib" -lccv `cat ../../lib/.LN`
-CFLAGS = -O3 -msse2 -Wall -I"../../lib" -I"../" `cat ../../lib/.DEF`
+include ../../lib/config.mk
+
+#CC +=# -fprofile-arcs -ftest-coverage
+LDFLAGS := -L"../../lib" -lccv $(LDFLAGS)
+CFLAGS := -O3 -msse2 -Wall -I"../../lib" -I"../" $(CFLAGS)
 TARGETS = algebra.tests util.tests numeric.tests basic.tests memory.tests io.tests transform.tests
 
 test: all

test/functional/numeric.tests.c

@@ -224,7 +224,8 @@ void dt_min_helper(float *src, float *dst, int *ptr, int step,
  if (d2 >= d1) {
    int d = (d1+d2) >> 1;
    int s = s1;
-   for (int p = s1+1; p <= s2; p++)
+   int p;
+   for (p = s1+1; p <= s2; p++)
      if (src[s*step] + a*square(d-s) + b*(d-s) > 
 	 src[p*step] + a*square(d-p) + b*(d-p))
 	s = p;
@@ -295,7 +296,8 @@ void dt_max_helper(float *src, float *dst, int *ptr, int step,
  if (d2 >= d1) {
    int d = (d1+d2) >> 1;
    int s = s1;
-   for (int p = s1+1; p <= s2; p++)
+   int p;
+   for (p = s1+1; p <= s2; p++)
      if (src[s*step] - a*square(d-s) - b*(d-s) <
 	 src[p*step] - a*square(d-p) - b*(d-p))
 	s = p;

test/opencv/filter_test.cpp

@@ -10,11 +10,12 @@ int main(int argc, char** argv)
 	CvMat* gray = cvCreateMat(image->height, image->width, CV_32FC1);
 	CvMat* x = cvCreateMat(image->height, image->width, CV_32FC1);
 	CvMat* kernel = cvCreateMat(101, 101, CV_32FC1);
-	for (int i = 0; i < image->height; i++)
-		for (int j = 0; j < image->width; j++)
+	int i, j;
+	for (i = 0; i < image->height; i++)
+		for (j = 0; j < image->width; j++)
 			gray->data.fl[i * gray->cols + j] = image->imageData[i * image->widthStep + j * 3] * 0.1 + image->imageData[i * image->widthStep + j * 3 + 1] * 0.61 + image->imageData[i * image->widthStep + j * 3 + 2] * 0.29;
-	for (int i = 0; i < kernel->rows; i++)
-		for (int j = 0; j < kernel->cols; j++)
+	for (i = 0; i < kernel->rows; i++)
+		for (j = 0; j < kernel->cols; j++)
 			kernel->data.fl[i * kernel->cols + j] = exp(-((i - kernel->rows / 2) * (i - kernel->rows / 2) + (j - kernel->cols / 2) * (j - kernel->cols / 2)) / 100);
 	cvFilter2D(gray, x, kernel);
 	cvSaveImage(argv[2], x);