Menu
▾
▴
csipc2-commits — Mailinglist for subversion commits.
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
(5) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <csi...@li...> - 2008-08-19 13:42:06
|
Revision: 1526
http://csipc2.svn.sourceforge.net/csipc2/?rev=1526&view=rev
Author: warcamel
Date: 2008-08-19 13:42:03 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
added:
- new directory as an attempt to rewrite the database including two files.
just for pushing myself
Added Paths:
-----------
trunk/src/cluster/database-ng/
trunk/src/cluster/database-ng/database.c
trunk/src/cluster/database-ng/database.h
Added: trunk/src/cluster/database-ng/database.c
===================================================================
--- trunk/src/cluster/database-ng/database.c (rev 0)
+++ trunk/src/cluster/database-ng/database.c 2008-08-19 13:42:03 UTC (rev 1526)
@@ -0,0 +1,26 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @file /CSIPC2/src/cluster/database-ng/database.c
+ * @author Christoph Konersmann <c_...@sy...>
+ * @date 19.08.2008
+ */
+
Property changes on: trunk/src/cluster/database-ng/database.c
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/src/cluster/database-ng/database.h
===================================================================
--- trunk/src/cluster/database-ng/database.h (rev 0)
+++ trunk/src/cluster/database-ng/database.h 2008-08-19 13:42:03 UTC (rev 1526)
@@ -0,0 +1,31 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @file /CSIPC2/src/cluster/database-ng/database.h
+ * @author Christoph Konersmann <c_...@sy...>
+ * @date 19.08.2008
+ */
+
+#ifndef DATABASE_H_
+#define DATABASE_H_
+
+
+#endif /* DATABASE_H_ */
Property changes on: trunk/src/cluster/database-ng/database.h
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-06-02 14:54:51
|
Revision: 1525
http://csipc2.svn.sourceforge.net/csipc2/?rev=1525&view=rev
Author: warcamel
Date: 2008-06-02 07:54:45 -0700 (Mon, 02 Jun 2008)
Log Message:
-----------
- corrected typo
- removed #ifdef WIN_32 cause won't need it anymore
Modified Paths:
--------------
trunk/configure.in
trunk/src/shared/csi_struct.h
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-06-02 12:15:40 UTC (rev 1524)
+++ trunk/configure.in 2008-06-02 14:54:45 UTC (rev 1525)
@@ -76,7 +76,7 @@
[enable_sse2=no])
if test "x$enable_sse2" = "xyes"; then
SSE2_CFLAGS="-msse2"
- AC_DEFINE(HAVE_SSE2, 1, [Enable support for SSE])
+ AC_DEFINE(HAVE_SSE2, 1, [Enable support for SSE2])
fi
AM_CONDITIONAL(HAVE_SSE2, test "x$enable_sse2" = "xyes")
@@ -88,7 +88,7 @@
[enable_sse3=no])
if test "x$enable_sse3" = "xyes"; then
SSE3_CFLAGS="-msse3"
- AC_DEFINE(HAVE_SSE3, 1, [Enable support for SSE])
+ AC_DEFINE(HAVE_SSE3, 1, [Enable support for SSE3])
fi
AM_CONDITIONAL(HAVE_SSE3, test "x$enable_sse2" = "xyes")
Modified: trunk/src/shared/csi_struct.h
===================================================================
--- trunk/src/shared/csi_struct.h 2008-06-02 12:15:40 UTC (rev 1524)
+++ trunk/src/shared/csi_struct.h 2008-06-02 14:54:45 UTC (rev 1525)
@@ -22,21 +22,16 @@
* @file
* @brief
* This file contains common structures used by several parts of the
- * CSI:PC2 project.
+ * CSI PC2 Project.
*
* @author Christoph Konersmann <chr...@cs...>
* @author Dominic Eschweiler <Dom...@cs...>
* @author Elmar Weber <uni...@el...>
*/
-#ifdef WIN32
-#include "..\..\ext\stdint.h"
-#else
#include <stdint.h>
-#endif
-
#include <stdio.h>
#include "csi_config.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-06-02 12:15:41
|
Revision: 1524
http://csipc2.svn.sourceforge.net/csipc2/?rev=1524&view=rev
Author: warcamel
Date: 2008-06-02 05:15:40 -0700 (Mon, 02 Jun 2008)
Log Message:
-----------
- updated mailing list for bugs
- updated project naming
Modified Paths:
--------------
trunk/configure.in
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-06-02 11:32:16 UTC (rev 1523)
+++ trunk/configure.in 2008-06-02 12:15:40 UTC (rev 1524)
@@ -21,19 +21,19 @@
# configure.in
#
# Autoconf configuration
-# Part of CSI:PC2 Clustersoftware
+# Part of CSI PC2 Project cluster software
#
-# Authors: Christoph Konersmann <c_...@up...>
+# Authors: Christoph Konersmann <chr...@cs...>
# Elmar Weber <uni...@el...>
#
# Date : 04.09.2007
#
### Initializations
-AC_INIT([csi-pc2],[0.91], pg...@li...)
+AC_INIT([csipc2],[0.1], csi...@li...)
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE([csi-pc2],[0.91])
+AM_INIT_AUTOMAKE([csipc2],[0.1])
AC_PROG_CC
AM_PROG_CC_C_O
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-06-02 11:32:21
|
Revision: 1523
http://csipc2.svn.sourceforge.net/csipc2/?rev=1523&view=rev
Author: warcamel
Date: 2008-06-02 04:32:16 -0700 (Mon, 02 Jun 2008)
Log Message:
-----------
- changed title to correct Project name
- removed frontend related script from Makefile
Modified Paths:
--------------
trunk/doc/Makefile.am
trunk/doc/cluster.Doxyfile.in
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2008-06-02 11:22:28 UTC (rev 1522)
+++ trunk/doc/Makefile.am 2008-06-02 11:32:16 UTC (rev 1523)
@@ -23,16 +23,9 @@
CLEANFILES = txt2man
-doc: doc-cluster doc-frontend
-
-doc-cluster:
- top_srcdir=${top_srcdir} doxygen ./cluster.Doxyfile > doxycluster.log
+doc:
+ top_srcdir=${top_srcdir} doxygen ./cluster.Doxyfile > doxycsipc2.log
-
-#doc-frontend:
-# top_srcdir=${top_srcdir} doxygen ./frontend.Doxyfile > doxyfrontend.log
-
doc-pdf:
- cd ./csi-cluster/latex; make >> doxycluster.log; make pdf >> doxycluster.log
+ cd ./csipc2-doc/latex; make >> doxycsipc2.log; make pdf >> doxycsipc2.log
-# cd ./csi-frontend/latex; make >> doxyfrontend.log; make pdf >> doxyfrontend.log
Modified: trunk/doc/cluster.Doxyfile.in
===================================================================
--- trunk/doc/cluster.Doxyfile.in 2008-06-02 11:22:28 UTC (rev 1522)
+++ trunk/doc/cluster.Doxyfile.in 2008-06-02 11:32:16 UTC (rev 1523)
@@ -24,9 +24,9 @@
# Project related configuration options
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = "CSI:PC2 --- Cluster"
-PROJECT_NUMBER = 0.3
-OUTPUT_DIRECTORY = csi-cluster/
+PROJECT_NAME = "CSI PC2 Project"
+PROJECT_NUMBER = 0.1
+OUTPUT_DIRECTORY = csipc2-doc/
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
BRIEF_MEMBER_DESC = YES
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-06-02 11:22:36
|
Revision: 1522
http://csipc2.svn.sourceforge.net/csipc2/?rev=1522&view=rev
Author: warcamel
Date: 2008-06-02 04:22:28 -0700 (Mon, 02 Jun 2008)
Log Message:
-----------
- another removed frontend.Doxyfile
Modified Paths:
--------------
trunk/doc/Makefile.am
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2008-06-02 11:17:45 UTC (rev 1521)
+++ trunk/doc/Makefile.am 2008-06-02 11:22:28 UTC (rev 1522)
@@ -29,9 +29,10 @@
top_srcdir=${top_srcdir} doxygen ./cluster.Doxyfile > doxycluster.log
-doc-frontend:
- top_srcdir=${top_srcdir} doxygen ./frontend.Doxyfile > doxyfrontend.log
+#doc-frontend:
+# top_srcdir=${top_srcdir} doxygen ./frontend.Doxyfile > doxyfrontend.log
doc-pdf:
cd ./csi-cluster/latex; make >> doxycluster.log; make pdf >> doxycluster.log
- cd ./csi-frontend/latex; make >> doxyfrontend.log; make pdf >> doxyfrontend.log
+
+# cd ./csi-frontend/latex; make >> doxyfrontend.log; make pdf >> doxyfrontend.log
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-06-02 11:17:52
|
Revision: 1521
http://csipc2.svn.sourceforge.net/csipc2/?rev=1521&view=rev
Author: warcamel
Date: 2008-06-02 04:17:45 -0700 (Mon, 02 Jun 2008)
Log Message:
-----------
- removed frontend.Doxyfile cause frontend is not part of GPL source
Modified Paths:
--------------
trunk/configure.in
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-05-30 09:37:31 UTC (rev 1520)
+++ trunk/configure.in 2008-06-02 11:17:45 UTC (rev 1521)
@@ -368,7 +368,6 @@
AC_OUTPUT(Makefile \
doc/Makefile \
doc/cluster.Doxyfile \
- doc/frontend.Doxyfile \
src/Makefile \
src/cluster/Makefile \
src/cluster/ccd/Makefile \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-05-30 09:37:36
|
Revision: 1520
http://csipc2.svn.sourceforge.net/csipc2/?rev=1520&view=rev
Author: warcamel
Date: 2008-05-30 02:37:31 -0700 (Fri, 30 May 2008)
Log Message:
-----------
- preparation of gnutls: split of ccd_netorking.c
Modified Paths:
--------------
trunk/src/cluster/ccd/Makefile.am
Added Paths:
-----------
trunk/src/cluster/ccd/ccd_tls_networking.c
Modified: trunk/src/cluster/ccd/Makefile.am
===================================================================
--- trunk/src/cluster/ccd/Makefile.am 2008-05-28 12:54:44 UTC (rev 1519)
+++ trunk/src/cluster/ccd/Makefile.am 2008-05-30 09:37:31 UTC (rev 1520)
@@ -42,8 +42,27 @@
ccd_DEPENDENCIES = @NBIS_EXTRACTION_LIB@ @CSI_EXTRACTION_LIB@ @MATCHING_LIBS@ @DATABASE_LIB@ @SHARED_LIBS@
ccd_CFLAGS = -DDEFAULT_CONFIGFILE="\"${etcdir}/ccd.conf\""
+if MAKE_GNUTLS_SUPPORT
ccd_SOURCES = ccd.c \
ccd_logging.c \
+ ccd_tls_networking.c \
+ ccd_config.c \
+ ccd_worker.c \
+ ccd_methods.c \
+ ccd_matching.c \
+ fpga_utils.c \
+ ccd_config.h \
+ ccd_logging.h \
+ ccd_matching.h \
+ ccd_methods.h \
+ ccd_networking.h \
+ ccd_worker.h \
+ fpga_utils.h \
+ globaldefs.h \
+ mpi_tags.h
+else
+ccd_SOURCES = ccd.c \
+ ccd_logging.c \
ccd_networking.c \
ccd_config.c \
ccd_worker.c \
@@ -59,7 +78,7 @@
fpga_utils.h \
globaldefs.h \
mpi_tags.h
-
+endif
etc_DATA = ${top_srcdir}/src/shared/ccd.conf
Added: trunk/src/cluster/ccd/ccd_tls_networking.c
===================================================================
--- trunk/src/cluster/ccd/ccd_tls_networking.c (rev 0)
+++ trunk/src/cluster/ccd/ccd_tls_networking.c 2008-05-30 09:37:31 UTC (rev 1520)
@@ -0,0 +1,404 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * @file
+ * @brief CCD networking methods.
+ * @author Christoph Konersmann <chr...@cs...>
+ *
+ * Implements secure networkfunctions for the CCD
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include <string.h>
+#include <string.h>
+#include <signal.h>
+#include <gnutls/gnutls.h>
+
+#include "ccd_networking.h"
+#include "ccd_methods.h"
+#include "ccd_logging.h"
+#include "csi_struct.h"
+#include "ccd_config.h"
+
+/** Type definition of the socket address structure. */
+typedef struct sockaddr_in sockaddr_in_t;
+
+/** Type definition of a function pointer for signaling. */
+typedef void (*sighandler_t)(int);
+
+/** Type definition of the sigaction structure. */
+typedef struct sigaction sigaction_t;
+
+static int start_network(void);
+static int parse_raw(int32_t*);
+
+static config_t *config;
+
+/**
+ * Listens for signal sig_nr and starts signal_handler() on raise.
+ *
+ * @param sig_nr signalnumber sig_nr
+ * @param signalhandler pointer to the new signalhandler for sig_nr
+ *
+ * @return sighandler_t pointer to the old signalhandler (if exists),
+ * NULL otherwise
+ */
+static sighandler_t ccd_signal(int sig_nr, sighandler_t signalhandler) {
+ sigaction_t new_signal_action, old_signal_action;
+ new_signal_action.sa_handler = signalhandler;
+ sigemptyset(&new_signal_action.sa_mask);
+ new_signal_action.sa_flags = SA_RESTART;
+ if (sigaction(sig_nr, &new_signal_action, &old_signal_action) < 0)
+ return SIG_ERR;
+ return old_signal_action.sa_handler;
+}
+
+/**
+ * Handles shutdown of CCD on signal sig_nr.
+ *
+ * @param sig_nr signalnumber
+ */
+static void shutdown_network(int sig_nr) {
+ int ret;
+
+ /* Handle signals */
+ switch (sig_nr) {
+ case SIGCHLD:
+ while ( (waitpid (-1, &ret, WNOHANG)) > 0)
+ if ( ret == 128 ) {
+ shutdown_network(SIGKILL);
+ }
+ break;
+ case SIGINT:
+ case SIGKILL:
+ config->running = false;
+ plog(MSG_INF, "Shutting down network process...\n");
+ destroy_config(config);
+ /* Get out of here! */
+ exit(128);
+ break;
+ }
+ return;
+}
+
+/**
+ * Loads the network process.
+ *
+ * @param *rem_config the config structure
+ *
+ * @return EXIT_FAILURE on fail,
+ * EXIT_SUCCESS on success
+ */
+int run_network(config_t *rem_config){
+
+ if (rem_config->running)
+ return EXIT_SUCCESS;
+
+ config = rem_config;
+
+ /* Create the network process. */
+ if((config->network_pid = fork()) == 0){
+
+ config->network_ppid = getppid();
+ start_network();
+ }
+ else if (config->network_pid > 0){
+ plog(MSG_DBG, "Networkthread started with PID: %ld\n", (long) config->network_pid);
+ return EXIT_SUCCESS;
+ }
+ return EXIT_FAILURE;
+}
+
+/**
+ * Starts the server which listens on the network
+ * for incomming identification requests from a client or terminal.
+ *
+ * @return EXIT_SUCESS on success,
+ * EXIT_FAILURE on fail
+ */
+static int start_network(void) {
+ sockaddr_in_t *server;
+ int32_t server_socket, client_socket, server_result;
+ const int32_t y = 1;
+ socklen_t addrlen;
+ pid_t pid;
+
+ ccd_signal(SIGINT, &shutdown_network);
+ ccd_signal(SIGKILL, &shutdown_network);
+ ccd_signal(SIGCHLD, &shutdown_network);
+
+ server_result = EXIT_SUCCESS;
+
+ /* initialise memory */
+ server = (struct sockaddr_in *)malloc(sizeof(struct sockaddr_in));
+ memset(server, 0, sizeof(struct sockaddr_in));
+
+ server->sin_port = htons (config->serverport);
+ server->sin_family = AF_INET;
+ server->sin_addr.s_addr = INADDR_ANY;
+
+ /* create a network socket */
+ if ((server_socket = socket (AF_INET, SOCK_STREAM, 0)) == 0) {
+ plog(MSG_ERR, "raw-server: could not create server socket!\n");
+ return EXIT_FAILURE;
+ }
+
+ /* Set socket options to reuse socket address for multiple clients
+ * and to speedup an reinitialisation of the socket */
+ setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, &y, sizeof(int));
+
+ /* try to bind to the specified port */
+ if (bind(server_socket,
+ (struct sockaddr *) server,
+ sizeof(struct sockaddr_in)) != 0) {
+ plog(MSG_ERR,
+ "raw-server: could not bind to port %d ...\n",
+ ntohs(server->sin_port) );
+ return EXIT_FAILURE;
+ }
+
+ /* set listener for incoming requests */
+ addrlen = sizeof(struct sockaddr_in);
+ if (listen(server_socket, 1) != 0) {
+ plog(MSG_ERR,
+ "raw-server: could not listen on port %d ...\n",
+ ntohs(server->sin_port) );
+ return EXIT_FAILURE;
+ }
+ plog(MSG_DBG, "raw-server: listening on port: %d\n", ntohs(server->sin_port) );
+
+ while (config->state.id != STATE_SHUTDOWN) {
+ /* accept client connects and start corresponding run_client */
+ client_socket = accept(server_socket,
+ (struct sockaddr *) server,
+ &addrlen );
+
+ if ((pid = fork()) == 0) {
+ close(server_socket);
+
+ if (client_socket <= 0) {
+ exit(EXIT_FAILURE);
+ }
+
+ /* Init IPC message queue. */
+ umask(0);
+ config->network_message_queue = msgget(NETWORK_MSG_KEY, NETWORK_PERM | IPC_CREAT );
+ if(config->network_message_queue == -1) {
+ plog(MSG_ERR, "could not create IPC message queue.\n");
+ shutdown_network(SIGKILL);
+ return EXIT_FAILURE;
+ } else {
+ plog(MSG_DBG, "IPC message queue %d attached.\n", config->network_message_queue);
+ }
+
+ plog(MSG_NUL, "raw-server: %s connected to server\n",
+ (char *)inet_ntoa(server->sin_addr) );
+ server_result = parse_raw(&client_socket);
+
+ if (close(client_socket) < 0) {
+ plog(MSG_ERR, "raw-server: could not close connection!\n");
+ exit(EXIT_FAILURE);
+ }
+
+ exit(EXIT_SUCCESS);
+ }
+
+ }
+
+ if (close(server_socket ) < 0)
+ plog(MSG_ERR, "raw-server: listener socket could not be closed!\n");
+
+ plog(MSG_INF, "raw-server: network shutdown (Status %d)\n", server_result);
+ free(server);
+ return EXIT_SUCCESS;
+}
+
+/**
+ * Parse the incomming connection data to the specific structs
+ * and run the appropriate functions.
+ *
+ * @param *client_socket pointer of the client socket
+ *
+ * @return EXIT_FAILURE on fail,
+ * EXIT_SUCCESS on success
+ */
+static int parse_raw(int32_t *client_socket) {
+ ssize_t size, tmp_size;
+ char result[MAX_LINE];
+ char *buffer;
+ frontend_data_t frontend_data, *messagebuffer;
+ network_message_t network_message;
+
+ messagebuffer = network_message.message + sizeof(long);
+
+ /* Recieve the data from frontend. */
+ size = tmp_size = 0;
+ buffer = malloc(sizeof(frontend_data_t)+20);
+ while((size) < sizeof(frontend_data_t)-sizeof(char *)) {
+ tmp_size = recv(*client_socket, &buffer[size], 1024, 0);
+ size = size + tmp_size;
+ }
+ plog(MSG_DBG, "size %d\n", size);
+
+ if(size < sizeof(frontend_data_t)-sizeof(char *)) {
+
+ plog(MSG_ERR, "raw-server: error recieving data size %d/%u\n", size, sizeof(frontend_data_t));
+ if(send(*client_socket, "Error: got wrong data!", 24, 0) == -1) {
+
+ plog(MSG_ERR, "raw-server: error sending answer\n");
+ }
+ return EXIT_FAILURE;
+ }
+
+ memcpy(&frontend_data, buffer, sizeof(frontend_data_t));
+ free(buffer);
+
+ /* Test if the job_id is out of range. */
+ if ((JOB_NULL > frontend_data.finger.job) ||
+ (frontend_data.finger.job > JOB_SHUTDOWN)) {
+
+ if(send(*client_socket, "Error: wrong job_id!", 24, 0) == -1) {
+
+ plog(MSG_ERR, "raw-server: error sending answer\n");
+ }
+ return EXIT_FAILURE;
+ }
+
+ /* Get expected raw image on save or extract command. */
+ if ((frontend_data.finger.job == JOB_SAVE_FINGER) ||
+ ((frontend_data.finger.job >= JOB_MATCH_FINGER) &&
+ (frontend_data.finger.job <= JOB_MATCH_FINGER_MIXED) &&
+ (frontend_data.finger.extractmode != EXTRACT_FALSE))) {
+
+ /* As the frontend expects to recieve a string after every send, send the raw size back. */
+ sprintf(result, "raw size: %u\n", frontend_data.finger.raw_size);
+ plog(MSG_DBG, "%s", result);
+ send(*client_socket, result, strlen(result), 0);
+
+ /* Recieve the raw-image. */
+ frontend_data.finger.raw = (char *)malloc(sizeof(char)*frontend_data.finger.raw_size);
+ size = tmp_size = 0;
+ while((size) < (sizeof(char)*frontend_data.finger.raw_size)) {
+ tmp_size = recv(*client_socket, &(frontend_data.finger.raw)[size], 1024, 0);
+ size = size + tmp_size;
+ }
+ sprintf(result, "size: %u\n", size);
+ plog(MSG_DBG, "%s", result);
+
+ if(size < 0) {
+ snprintf(result, MAX_LINE, "could not recieve raw image.\n");
+ plog(MSG_ERR, "%s", result);
+ return EXIT_FAILURE;
+ }
+ }
+
+ /* Get expected raw image on save or extract command. */
+ if ((frontend_data.iris.job == JOB_SAVE_IRIS) ||
+ ((frontend_data.iris.job == JOB_MATCH_IRIS) &&
+ (frontend_data.iris.extractmode != EXTRACT_FALSE))) {
+
+ /* As the frontend expects to recieve a string after every send, send the raw size back. */
+ sprintf(result, "raw size: %u\n", frontend_data.iris.raw_size);
+ plog(MSG_DBG, "%s", result);
+ send(*client_socket, result, strlen(result), 0);
+
+ /* Recieve the raw-image. */
+ frontend_data.iris.raw = (char *)malloc(sizeof(char)*frontend_data.iris.raw_size);
+ size = tmp_size = 0;
+ while((size) < (sizeof(char)*frontend_data.iris.raw_size)) {
+ tmp_size = recv(*client_socket, &frontend_data.iris.raw[size], 1024, 0);
+ size = size + tmp_size;
+ }
+ sprintf(result, "size: %u\n", size);
+ plog(MSG_DBG, "%s", result);
+
+ if(size < 0) {
+ snprintf(result, MAX_LINE, "could not recieve raw image.\n");
+ plog(MSG_ERR, "%s", result);
+ return EXIT_FAILURE;
+ }
+ }
+
+ if (frontend_data.finger.extractmode != EXTRACT_FALSE) {
+ switch(frontend_data.finger.job){
+ case JOB_NULL:
+ case JOB_SHUTDOWN:
+ case JOB_EXTRACT_ALL:
+ case JOB_STATUS:
+ break;
+ case JOB_MATCH_FINGER:
+ case JOB_MATCH_FINGER_CLUSTER:
+ case JOB_MATCH_FINGER_FILTERBANK:
+ case JOB_MATCH_FINGER_MINUTIAE:
+ case JOB_MATCH_FINGER_MIXED:
+ case JOB_SAVE_FINGER:
+ if(do_extract_fingerprint(config, &frontend_data) == EXIT_FAILURE) {
+ snprintf(result, MAX_LINE, "Could not extract features from picture.\n");
+ plog(MSG_ERR, "%s", result);
+ if((size = send(*client_socket, result, MAX_LINE, 0)) == -1)
+ plog(MSG_ERR, "raw-server: error sending result\n");
+ return EXIT_FAILURE;
+ }
+ break;
+ case JOB_MATCH_IRIS:
+ case JOB_SAVE_IRIS:
+ snprintf(result, MAX_LINE, "Could not extract features from picture: Not implemented!\n");
+ plog(MSG_ERR, "%s", result);
+ return EXIT_FAILURE;
+ break;
+ }
+ }
+
+ /* Put request in message queue and ask server for reservation. */
+ network_message.destination = 1;
+ *(long *) network_message.message = *client_socket;
+ memcpy(messagebuffer, &frontend_data, sizeof(frontend_data_t));
+ msgsnd(config->network_message_queue, &network_message, NETWORK_MSG_SIZE, 0);
+
+ if (frontend_data.finger.job == JOB_SHUTDOWN){
+ send(*client_socket, "Shutdown forced...\n", strlen("Shutdown forced...\n")+1, 0);
+ fflush(NULL);
+
+ sleep(1);
+ shutdown_network(SIGKILL);
+ }
+
+ /* Wait for answer. */
+ msgrcv(config->network_message_queue, &network_message, NETWORK_MSG_SIZE, *client_socket, 0);
+
+ /* Send the result string back to the client. */
+ if((size = send(*client_socket, network_message.message, MAX_LINE, 0)) == -1) {
+
+ plog(MSG_ERR, "raw-server: error sending result\n");
+ return EXIT_FAILURE;
+ }
+
+ return EXIT_SUCCESS;
+}
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-05-28 12:54:47
|
Revision: 1519
http://csipc2.svn.sourceforge.net/csipc2/?rev=1519&view=rev
Author: warcamel
Date: 2008-05-28 05:54:44 -0700 (Wed, 28 May 2008)
Log Message:
-----------
- Changelog updated
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-05-28 12:50:36 UTC (rev 1518)
+++ trunk/ChangeLog 2008-05-28 12:54:44 UTC (rev 1519)
@@ -1,3 +1,10 @@
+2008-05-28 Christoph Konersmann <chr...@cs...>
+
+ * configure.in:
+ - added gnutls check
+ * src/tests/ccd_connection/ccd_connection_*:
+ - removed compiler warnings
+
2008-05-20 18:27 eweber
* removed minutiae_vis from dist build, java support ist somewhat
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-05-28 12:50:39
|
Revision: 1518
http://csipc2.svn.sourceforge.net/csipc2/?rev=1518&view=rev
Author: warcamel
Date: 2008-05-28 05:50:36 -0700 (Wed, 28 May 2008)
Log Message:
-----------
- removed compiler warnings in ccd_connection_gui
Modified Paths:
--------------
trunk/src/tests/ccd_connection/ccd_connection_funcs.c
trunk/src/tests/ccd_connection/ccd_connection_gui_funcs.c
Modified: trunk/src/tests/ccd_connection/ccd_connection_funcs.c
===================================================================
--- trunk/src/tests/ccd_connection/ccd_connection_funcs.c 2008-05-28 12:38:35 UTC (rev 1517)
+++ trunk/src/tests/ccd_connection/ccd_connection_funcs.c 2008-05-28 12:50:36 UTC (rev 1518)
@@ -58,7 +58,6 @@
extern int start_server_connection(char *hostname, int port) {
int server_socket;
sockaddr_in_t server;
- unsigned long addr;
hostent_t *server_he;
const int32_t y = 1;
@@ -170,6 +169,8 @@
send(server_socket, fd->finger.raw, fd->finger.raw_size, 0);
free(fd->finger.raw);
break;
+ default:
+ break;
}
if((fd->iris.job >= JOB_MATCH_FINGER) && (fd->iris.job < JOB_MATCH_IRIS)) {
if (( fd->iris.extractmode >= EXTRACT_TRUE ) &&
Modified: trunk/src/tests/ccd_connection/ccd_connection_gui_funcs.c
===================================================================
--- trunk/src/tests/ccd_connection/ccd_connection_gui_funcs.c 2008-05-28 12:38:35 UTC (rev 1517)
+++ trunk/src/tests/ccd_connection/ccd_connection_gui_funcs.c 2008-05-28 12:50:36 UTC (rev 1518)
@@ -52,7 +52,6 @@
static GtkSpinButton *value_port;
static GtkComboBox *value_jobid, *value_extractionmode;
static GtkStatusbar *status_bar;
-static GtkLabel *result;
static GtkTextBuffer *buffer_result;
static GtkImage *picture_box;
static stat_t attribute;
@@ -120,7 +119,7 @@
fwrite(&config, sizeof(ccg_config_t), 1, config_fp);
fclose(config_fp);
}
- gtk_widget_destroy(window);
+ gtk_widget_destroy( GTK_WIDGET(window));
gtk_main_quit();
}
@@ -209,7 +208,7 @@
gtk_text_buffer_insert(buffer_result, &text_end, "-> Done!\n", -1);
gtk_statusbar_push(status_bar, 0, "Ready...");
- return TRUE;
+ return;
}
/**
@@ -314,6 +313,8 @@
fread(fd.iris.raw, fd.iris.raw_size, 1, pic_file);
fclose(pic_file);
break;
+ default:
+ break;
}
}
@@ -383,9 +384,9 @@
memcpy(&config, rem_config, sizeof(ccg_config_t));
// define GtkWidgets
- GtkVBox *vbox1, *vbox2;
+ GtkVBox *vbox1;
GtkHBox *hbox1, *hbox2, *hbox3, *hbox4, *hbox5, *hbox6, *hbox7;
- GtkLabel *label_hostname, *label_port, *label_jobid, *label_extractionmode, *label_result, *label_picchooser;
+ GtkLabel *label_hostname, *label_port, *label_jobid, *label_extractionmode, *label_picchooser;
GtkHSeparator *hsep1;
GtkButton *bt_send, *bt_close, *bt_open;
GtkFileSelection *picture_selection;
@@ -455,7 +456,7 @@
"label", "Type of Job:",
"justify", GTK_JUSTIFY_FILL,
NULL);
- value_jobid = gtk_combo_box_new_text();
+ value_jobid = GTK_COMBO_BOX(gtk_combo_box_new_text());
for (i = 0; i < 11; i++) {
gtk_combo_box_append_text( value_jobid, job_t[i]);
}
@@ -471,7 +472,7 @@
"label", "Extraction mode:",
"justify", GTK_JUSTIFY_FILL,
NULL);
- value_extractionmode = gtk_combo_box_new_text();
+ value_extractionmode = GTK_COMBO_BOX(gtk_combo_box_new_text());
for (i = 0; i < 5; i++) {
gtk_combo_box_append_text( value_extractionmode, extractionmode_t[i]);
}
@@ -535,18 +536,18 @@
"spacing", 5,
"homogeneous", FALSE,
NULL);
- v_adj = gtk_adjustment_new(200,
+ v_adj = GTK_ADJUSTMENT(gtk_adjustment_new(200,
150,
500,
5,
10,
- 0 );
- h_adj = gtk_adjustment_new(200,
+ 0 ));
+ h_adj = GTK_ADJUSTMENT(gtk_adjustment_new(200,
200,
500,
5,
10,
- 0 );
+ 0 ));
window_result = g_object_new(GTK_TYPE_SCROLLED_WINDOW,
"hadjustment", h_adj,
"vadjustment", v_adj,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-05-28 12:38:39
|
Revision: 1517
http://csipc2.svn.sourceforge.net/csipc2/?rev=1517&view=rev
Author: warcamel
Date: 2008-05-28 05:38:35 -0700 (Wed, 28 May 2008)
Log Message:
-----------
- changed little in sourcecode to little to mention here
- added Makefile.in to ignore-list
- removed anjuta project files
- removed custom run.sh scripts
- removed custom Makefile's
Modified Paths:
--------------
trunk/src/cluster/ccd/ccd.c
trunk/src/cluster/ccd/ccd_config.c
trunk/src/cluster/ccd/ccd_networking.c
trunk/src/cluster/ccd/ccd_worker.c
Removed Paths:
-------------
trunk/doc/frontend.Doxyfile.in
trunk/src/cluster/csi_dbtool/Makefile
trunk/src/cluster/csi_dbtool/csi_dbtool.anjuta
trunk/src/cluster/csi_dbtool/run.sh
trunk/src/cluster/database/Makefile
trunk/src/cluster/database/main.anjuta
trunk/src/cluster/feature_extraction/experimental/Makefile
trunk/src/cluster/feature_extraction/experimental/main.anjuta
trunk/src/cluster/feature_extraction/experimental/run.sh
Property Changed:
----------------
trunk/
trunk/doc/
trunk/src/
trunk/src/cluster/
trunk/src/cluster/ccd/
trunk/src/cluster/ccd/man1/
trunk/src/cluster/csi_dbtool/
trunk/src/cluster/database/
trunk/src/cluster/database/man1/
trunk/src/cluster/feature_extraction/
trunk/src/cluster/feature_extraction/experimental/
trunk/src/cluster/feature_extraction/fingerprint/
trunk/src/cluster/feature_extraction/fingerprint/man1/
trunk/src/cluster/feature_extraction/fingerprint/mindtct/
trunk/src/cluster/template_matching/
trunk/src/cluster/template_matching/bozorth3/
trunk/src/shared/
trunk/src/tests/
trunk/src/tests/ccd_connection/
trunk/src/tests/ccd_connection/man1/
trunk/src/tests/performance/
trunk/src/tests/performance/speed_iris/
trunk/src/tests/unit/
trunk/src/tests/unit/cluster/
trunk/src/tests/unit/cluster/template_matching/
trunk/src/tests/unit/shared/
trunk/src/tools/
trunk/src/tools/fingerprint_ga/
trunk/src/tools/fingerprint_testbed/
trunk/src/tools/fingerprint_testbed/man1/
trunk/src/tools/management_gui/
trunk/src/tools/misc_dev/
trunk/src/tools/misc_dev/man1/
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- autom4te.cache
aclocal.m4
configure
depcomp
install-sh
missing
config.status
.project
.cproject
.settings
bin
build
+ autom4te.cache
aclocal.m4
configure
depcomp
install-sh
missing
config.status
.project
.cproject
.settings
bin
build
Makefile.in
config.h.in
Property changes on: trunk/doc
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Deleted: trunk/doc/frontend.Doxyfile.in
===================================================================
--- trunk/doc/frontend.Doxyfile.in 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/doc/frontend.Doxyfile.in 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,251 +0,0 @@
-#
-# (C)Copyright 2008 CSI PC2 Project
-#
-# This file is part of the CSI PC2 software.
-#
-# The CSI PC2 software is free software: you can redistribute it
-# and/or modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation, either version 2 of the
-# License, or (at your option) any later version.
-#
-# The CSI PC2 software is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the CSI PC2 software. If not, see
-# <http://www.gnu.org/licenses/>.
-#
-
-# Doxyfile 1.5.3
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = "CSI:PC2 --- Frontend"
-PROJECT_NUMBER = 0.3
-OUTPUT_DIRECTORY = csi-frontend/
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF = "The $name class" "The $name widget" "The $name file" is provides specifies contains represents a an the
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = NO
-QT_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
-INHERIT_DOCS = YES
-SEPARATE_MEMBER_PAGES = NO
-TAB_SIZE = 8
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = NO
-OPTIMIZE_OUTPUT_JAVA = NO
-BUILTIN_STL_SUPPORT = NO
-CPP_CLI_SUPPORT = NO
-DISTRIBUTE_GROUP_DOC = NO
-SUBGROUPING = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = NO
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = NO
-EXTRACT_LOCAL_CLASSES = YES
-EXTRACT_LOCAL_METHODS = YES
-EXTRACT_ANON_NSPACES = NO
-HIDE_UNDOC_MEMBERS = YES
-HIDE_UNDOC_CLASSES = YES
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = YES
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST = YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = NO
-FILE_VERSION_FILTER =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = $(top_srcdir)/src/frontend $(top_srcdir)/src/shared
-INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.c *.cpp *.h *.hpp *.C *.C++ *.H *.H++
-RECURSIVE = YES
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS = *cltifa_apix1.* *irisCapture.* *irisCaptureDlg.* *resource.h *stdafx.* *Resource.h *gui.h *gui.cpp *RandomIrisCode* */localhost.h */WebService.h
-EXCLUDE_SYMBOLS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS = *
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = YES
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION = YES
-REFERENCES_LINK_SOURCE = YES
-USE_HTAGS = NO
-VERBATIM_HEADERS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = YES
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-HTML_DYNAMIC_SECTIONS = NO
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = YES
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = YES
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = YES
-PAPER_TYPE = a4
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = YES
-USE_PDFLATEX = YES
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = YES
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = NO
-MSCGEN_PATH =
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = NO
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-GROUP_GRAPHS = YES
-UML_LOOK = YES
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = YES
-CALLER_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-DOT_GRAPH_MAX_NODES = 50
-MAX_DOT_GRAPH_DEPTH = 1000
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = YES
Property changes on: trunk/src
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster
___________________________________________________________________
Name: svn:ignore
- aclocal.m4
configure.in
autom4te.cache
+ aclocal.m4
configure.in
autom4te.cache
Makefile.in
Property changes on: trunk/src/cluster/ccd
___________________________________________________________________
Name: svn:ignore
- ccd
bin
include
lib
+ ccd
bin
include
lib
Makefile.in
Modified: trunk/src/cluster/ccd/ccd.c
===================================================================
--- trunk/src/cluster/ccd/ccd.c 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/ccd/ccd.c 2008-05-28 12:38:35 UTC (rev 1517)
@@ -53,7 +53,7 @@
* EXIT_FAILURE on fail
*/
int main(int argc, char **argv) {
- pid_t pid;
+// pid_t pid;
int res, tmp_size;
config_t *config = new_config();
Modified: trunk/src/cluster/ccd/ccd_config.c
===================================================================
--- trunk/src/cluster/ccd/ccd_config.c 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/ccd/ccd_config.c 2008-05-28 12:38:35 UTC (rev 1517)
@@ -155,7 +155,7 @@
* EXIT_FAILURE on fail
*/
int load_mpi(config_t *config){
- int32_t i, max_tries = MPI_MAX_TRIES;
+ int32_t max_tries = MPI_MAX_TRIES;
int last_size;
/* Get ID and Size in MPI_COMM_WORLD . */
Modified: trunk/src/cluster/ccd/ccd_networking.c
===================================================================
--- trunk/src/cluster/ccd/ccd_networking.c 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/ccd/ccd_networking.c 2008-05-28 12:38:35 UTC (rev 1517)
@@ -253,7 +253,6 @@
char *buffer;
frontend_data_t frontend_data, *messagebuffer;
network_message_t network_message;
- int tmp_client_socket;
messagebuffer = network_message.message + sizeof(long);
@@ -347,6 +346,11 @@
if (frontend_data.finger.extractmode != EXTRACT_FALSE) {
switch(frontend_data.finger.job){
+ case JOB_NULL:
+ case JOB_SHUTDOWN:
+ case JOB_EXTRACT_ALL:
+ case JOB_STATUS:
+ break;
case JOB_MATCH_FINGER:
case JOB_MATCH_FINGER_CLUSTER:
case JOB_MATCH_FINGER_FILTERBANK:
Modified: trunk/src/cluster/ccd/ccd_worker.c
===================================================================
--- trunk/src/cluster/ccd/ccd_worker.c 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/ccd/ccd_worker.c 2008-05-28 12:38:35 UTC (rev 1517)
@@ -128,7 +128,7 @@
int run_worker(config_t *rem_config) {
frontend_data_t frontend_data, *messagebuffer;
network_message_t network_message;
- int client_id, job_id, res;
+ int client_id, res;
char result[MAX_LINE];
csi_timer_t *timer;
char *time_str;
@@ -207,7 +207,7 @@
plog(MSG_ERR, "IPC message queue already exists.\n");
} else if(res < 0) {
plog(MSG_ERR, "could not attach IPC message queue.\n");
- config->running == false;
+ config->running = false;
} else {
config->network_message_queue = res;
plog(MSG_DBG, "IPC message queue %d attached.\n", config->network_message_queue);
Property changes on: trunk/src/cluster/ccd/man1
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster/csi_dbtool
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Deleted: trunk/src/cluster/csi_dbtool/Makefile
===================================================================
--- trunk/src/cluster/csi_dbtool/Makefile 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/csi_dbtool/Makefile 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,78 +0,0 @@
-#
-# Module : csi dbtool
-# Maintainer : Dominic Eschweiler, Dom...@cs...
-#
-
-#BIN_TARGET = /mnt/a/globalcluster/bin/
-BIN_TARGET = ./
-#CC = gcc
-CC = mpicc
-CFLAGS = -g -O3 -fomit-frame-pointer -pipe -W -I$(HOME)/IM/include/ -I../../shared/ -I../feature_extraction/fingerprint/
-INCFLAGS =
-#LDFLAGS = -Wl,-rpath,/usr/local/lib -lm
-LDFLAGS = -L$(HOME)/IM/lib/ -lMagick -lWand -lm -lz -lfreetype -lfontconfig
-
-OBJECTS = database.o database_ext.o db_helpers.o csi_dbtool.o
-OBJECTS2 = service.o normalize.o direction.o thining.o corepoint_detection.o minutia_extraction.o cluster_template.o filterbank_wrapper.o feat_ext_fingerprint.o average_dist.o
-
-all: csi_dbtool
-
-csi_dbtool: $(OBJECTS) $(OBJECTS2)
- $(CC) -o $(BIN_TARGET)csi_dbtool $(OBJECTS) $(OBJECTS2) filterbank.o $(LDFLAGS) $(LIBS)
-
-
-##---DB-Stuff-------------------------------------------------------
-csi_dbtool.o: csi_dbtool.c
- $(CC) $(CFLAGS) -c csi_dbtool.c -o csi_dbtool.o
-
-database.o: ../database/database.c ../database/database.h
- $(CC) $(CFLAGS) -c ../database/database.c -o database.o
-
-database_ext.o: ../database/database_ext.c ../database/database_ext.h
- $(CC) $(CFLAGS) -c ../database/database_ext.c -o database_ext.o
-
-db_helpers.o: ../database/db_helpers.c ../database/db_helpers.h
- $(CC) $(CFLAGS) -c ../database/db_helpers.c -o db_helpers.o
-
-
-##---Extraction-Stuff-----------------------------------------------
-
-ext_lib: $(OBJECTS2)
-
-feat_ext_fingerprint.o: ../feature_extraction/experimental/feat_ext_fingerprint.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/feat_ext_fingerprint.c -o feat_ext_fingerprint.o
-
-normalize.o: ../feature_extraction/experimental/01_normalize/normalize.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/01_normalize/normalize.c -o normalize.o
-
-direction.o: ../feature_extraction/experimental/02_direction/direction.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/02_direction/direction.c -o direction.o
-
-corepoint_detection.o: ../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c -o corepoint_detection.o
-
-thining.o: ../feature_extraction/experimental/04_thining/thining.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/04_thining/thining.c -o thining.o
-
-minutia_extraction.o: ../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c -o minutia_extraction.o
-
-cluster_template.o: ../feature_extraction/experimental/06_cluster_template/cluster_template.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/06_cluster_template/cluster_template.c -o cluster_template.o
-
-filterbank_wrapper.o: ../feature_extraction/experimental/07_filterbank/filterbank_wrapper.c
- $(CC) $(CFLAGS) -c ../feature_extraction/fingerprint/filterbank.c -o filterbank.o
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/07_filterbank/filterbank_wrapper.c -o filterbank_wrapper.o
-
-average_dist.o: ../feature_extraction/experimental/08_average_dist/average_dist.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/08_average_dist/average_dist.c -o average_dist.o
-
-service.o: ../feature_extraction/experimental/service.c
- $(CC) $(CFLAGS) -c ../feature_extraction/experimental/service.c -o service.o
-
-##------------------------------------------------------------------
-count:
- wc *.c *.h
-
-clean:
- rm -f *.o *.jpg main csi_dbtool *.c~ *.h~
Deleted: trunk/src/cluster/csi_dbtool/csi_dbtool.anjuta
===================================================================
--- trunk/src/cluster/csi_dbtool/csi_dbtool.anjuta 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/csi_dbtool/csi_dbtool.anjuta 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<anjuta>
- <plugin name="GBF Project Manager"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaProjectManager"/>
- <require group="Project"
- attribute="Supported-Project-Types"
- value="make"/>
- </plugin>
- <plugin name="Symbol Browser"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Location"
- value="anjuta-symbol-browser:SymbolBrowserPlugin"/>
- </plugin>
- <plugin name="Make Build System"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaBuildable"/>
- <require group="Build"
- attribute="Supported-Build-Types"
- value="make"/>
- </plugin>
-</anjuta>
Deleted: trunk/src/cluster/csi_dbtool/run.sh
===================================================================
--- trunk/src/cluster/csi_dbtool/run.sh 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/csi_dbtool/run.sh 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,42 +0,0 @@
-#!/bin/bash
-#
-# (C)Copyright 2008 CSI PC2 Project
-#
-# This file is part of the CSI PC2 software.
-#
-# The CSI PC2 software is free software: you can redistribute it
-# and/or modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation, either version 2 of the
-# License, or (at your option) any later version.
-#
-# The CSI PC2 software is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the CSI PC2 software. If not, see
-# <http://www.gnu.org/licenses/>.
-#
-
-
-#DIRECTORY="/mnt/a/globalcluster/DB1_B"
-DIRECTORY="/home/data/uni/test"
-
-
-mpi()
-{
-mpdboot -n 1 -f mpd.hosts
-mpiexec -n $1 $2/csi_dbtool -c EXT_FINGER -i $DIRECTORY -o $DIRECTORY/db
-mpdallexit
-}
-
-dir=`pwd`
-
-echo -n "This is the base : "
-echo $dir
-case "$1" in
- "1" ) $dir/csi_dbtool -c EXT_FINGER -i $DIRECTORY -o $DIRECTORY/db -n 5;;
- [2-9] ) mpi $1 $dir ;;
- * ) echo "PLease give me the number of ranks" ;;
-esac
Property changes on: trunk/src/cluster/database
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Deleted: trunk/src/cluster/database/Makefile
===================================================================
--- trunk/src/cluster/database/Makefile 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/database/Makefile 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,34 +0,0 @@
-#
-# Module : database
-# Maintainer : Dominic Eschweiler, Dom...@cs...
-#
-
-#CC = gcc
-CC = mpicc
-CFLAGS = -g -O3
-OBJECTS = main.o database.o database_ext.o db_helpers.o
-OBJECTS2 = database.o database_ext.o db_helpers.o
-
-INCFLAGS =
-LDFLAGS = -Wl,-rpath,/usr/local/lib -lm
-LIBS =
-
-all: clean main database_ext.o
-
-main: $(OBJECTS)
- $(CC) $(CFLAGS) -o main $(OBJECTS) $(LDFLAGS) $(LIBS)
-
-database.o: database.c database.h
- $(CC) $(CFLAGS) -c database.c -o database.o
-
-database_ext.o: database_ext.c database_ext.h
- $(CC) $(CFLAGS) -c database_ext.c -o database_ext.o
-
-db_helpers.o: db_helpers.c db_helpers.h
- $(CC) $(CFLAGS) -c db_helpers.c -o db_helpers.o
-
-count:
- wc *.c *.h
-
-clean:
- rm -f *.o *.jpg main csi_dbtool
Deleted: trunk/src/cluster/database/main.anjuta
===================================================================
--- trunk/src/cluster/database/main.anjuta 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/database/main.anjuta 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<anjuta>
- <plugin name="GBF Project Manager"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaProjectManager"/>
- <require group="Project"
- attribute="Supported-Project-Types"
- value="make"/>
- </plugin>
- <plugin name="Symbol Browser"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Location"
- value="anjuta-symbol-browser:SymbolBrowserPlugin"/>
- </plugin>
- <plugin name="Make Build System"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaBuildable"/>
- <require group="Build"
- attribute="Supported-Build-Types"
- value="make"/>
- </plugin>
-</anjuta>
Property changes on: trunk/src/cluster/database/man1
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster/feature_extraction
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster/feature_extraction/experimental
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Deleted: trunk/src/cluster/feature_extraction/experimental/Makefile
===================================================================
--- trunk/src/cluster/feature_extraction/experimental/Makefile 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/feature_extraction/experimental/Makefile 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,98 +0,0 @@
-# normaly you need to use the Wand-config and all compiles fine.
-# in our case, the installed ImageMagick is to old, and you should use
-# the second of CFLAGS and LDFLAGS...
-
-CC = gcc
-
-CSI_DEF_PATH = ../../../shared/
-NBIS_FEAT_PATH = ../../feature_extraction/fingerprint/
-
-CFLAGS = -g -O3 -fomit-frame-pointer -pipe -Wall -W -I$(HOME)/IM/include/ -I$(CSI_DEF_PATH) -I$(NBIS_FEAT_PATH)
-LDFLAGS = -L$(HOME)/IM/lib/ -lMagick -lWand -lm -lz -lfreetype -ljpeg -lfontconfig -lXext -lexpat -lSM -lICE -lX11 -lXt -lpthread
-
-# flags for comiling on arminius
-#CFLAGS = -g -O3 -fomit-frame-pointer -pipe -Wall -W -I/pc2fs/work/group/pg-csi/magick6.3.3-bin/include/ -I$(CSI_DEF_PATH) -I$(NBIS_FEAT_PATH)
-#LDFLAGS = -L/pc2fs/work/group/pg-csi/magick6.3.3-bin/lib/ -lMagick -lWand -lm -lz -lfreetype -lfontconfig
-
-OBJECTS = service.o normalize.o direction.o thining.o corepoint_detection.o minutia_extraction.o cluster_template.o filterbank_wrapper.o average_dist.o
-
-SPLINT_FLAGS = -I$(CSI_DEF_PATH) -I$(NBIS_FEAT_PATH) -preproc +weak +boundswrite -nestcomment +ignorequals
-
-all: clean main
-#all: main
-
-main: $(OBJECTS) feat_ext_fingerprint.o main.o
- $(CC) -o main $(OBJECTS) feat_ext_fingerprint.o main.o filterbank.o $(LDFLAGS)
-
-feat_ext_fingerprint.o: $(OBJECTS)
- $(CC) $(CFLAGS) -c feat_ext_fingerprint.c -o feat_ext_fingerprint.o
-
-main.o: $(OBJECTS)
- $(CC) $(CFLAGS) -c main.c -o main.o
-
-normalize.o: 01_normalize/normalize.c 01_normalize/normalize.h
- $(CC) $(CFLAGS) -c 01_normalize/normalize.c -o normalize.o
-
-direction.o: 02_direction/direction.c 02_direction/direction.h
- $(CC) $(CFLAGS) -c 02_direction/direction.c -o direction.o
-
-corepoint_detection.o: 03_corepoint_detection/corepoint_detection.c 03_corepoint_detection/corepoint_detection.h
- $(CC) $(CFLAGS) -c 03_corepoint_detection/corepoint_detection.c -o corepoint_detection.o
-
-thining.o: 04_thining/thining.c 04_thining/thining.h
- $(CC) $(CFLAGS) -c 04_thining/thining.c -o thining.o
-
-minutia_extraction.o: 05_minutia_extraction/minutia_extraction.c 05_minutia_extraction/minutia_extraction.h
- $(CC) $(CFLAGS) -c 05_minutia_extraction/minutia_extraction.c -o minutia_extraction.o
-
-cluster_template.o: 06_cluster_template/cluster_template.c 06_cluster_template/cluster_template.h
- $(CC) $(CFLAGS) -c 06_cluster_template/cluster_template.c -o cluster_template.o
-
-filterbank_wrapper.o: 07_filterbank/filterbank_wrapper.c 07_filterbank/filterbank_wrapper.h
- $(CC) $(CFLAGS) -c ../fingerprint/filterbank.c -o filterbank.o
- $(CC) $(CFLAGS) -c 07_filterbank/filterbank_wrapper.c -o filterbank_wrapper.o
-
-average_dist.o: 08_average_dist/average_dist.c 08_average_dist/average_dist.h
- $(CC) $(CFLAGS) -c 08_average_dist/average_dist.c -o average_dist.o
-
-service.o: service.c service.h
- $(CC) $(CFLAGS) -c service.c -o service.o
-
-#------------------------------------------------------------------------------------------
-
-splint:
-# splint $(SPLINT_FLAGS) feat_ext_fingerprint.c
-# splint $(SPLINT_FLAGS) 01_normalize/normalize.c
-# splint $(SPLINT_FLAGS) 02_direction/direction.c
-# splint $(SPLINT_FLAGS) 03_corepoint_detection/corepoint_detection.c
-# splint $(SPLINT_FLAGS) 04_thining/thining.c
-# splint $(SPLINT_FLAGS) 05_minutia_extraction/minutia_extraction.c
- splint $(SPLINT_FLAGS) 06_cluster_template/cluster_template.c
-# splint $(SPLINT_FLAGS) 08_average_dist/average_dist.c
-
-memory_check: clean main
- valgrind --tool=memcheck --leak-check=full ./main
-
-#------------------------------------------------------------------------------------------
-
-clean:
- rm -f *.o main *.jpg *.c~ *.h~
- rm -f 01_normalize/*.o 01_normalize/*.c~ 01_normalize/*.h~
- rm -f 02_direction/*.o 02_direction/*.c~ 02_direction/*.h~
- rm -f 03_corepoint_detection/*.o 03_corepoint_detection/*.c~ 03_corepoint_detection/*.h~
- rm -f 04_thining/*.o 04_thining/*.c~ 04_thining/*.h~
- rm -f 05_minutia_extraction/*.o 05_minutia_extraction/*.c~ 05_minutia_extraction/*.h~
- rm -f 06_cluster_template/*.o 06_cluster_template/*.c~ 06_cluster_template/*.h~
- rm -f 07_filterbank/*.o 07_filterbank/*.c~ 07_filterbank/*.h~
- rm -f 08_average_dist/*.o 08_average_dist/*.c~ 08_average_dist/*.h~
-
-#------------------------------------------------------------------------------------------
-
-help:
- echo -e "\n\nThis Makefile knows following parameters :\n make : generates the benchmark testapp\n make ext_lib : generates the library\n make clean : cleanup sourcecode from objectfile garbage\n make count : counts lines of code (loc)\n"
-
-count: clean
- wc -l *.c *.h 01_normalize/* 02_direction/* 03_corepoint_detection/* 04_thining/* 05_minutia_extraction/* 06_cluster_template/* 07_filterbank/*
-
-#------------------------------------------------------------------------------------------
-
Deleted: trunk/src/cluster/feature_extraction/experimental/main.anjuta
===================================================================
--- trunk/src/cluster/feature_extraction/experimental/main.anjuta 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/feature_extraction/experimental/main.anjuta 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<anjuta>
- <plugin name="GBF Project Manager"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaProjectManager"/>
- <require group="Project"
- attribute="Supported-Project-Types"
- value="make"/>
- </plugin>
- <plugin name="Symbol Browser"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Location"
- value="anjuta-symbol-browser:SymbolBrowserPlugin"/>
- </plugin>
- <plugin name="Make Build System"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaBuildable"/>
- <require group="Build"
- attribute="Supported-Build-Types"
- value="make"/>
- </plugin>
-</anjuta>
Deleted: trunk/src/cluster/feature_extraction/experimental/run.sh
===================================================================
--- trunk/src/cluster/feature_extraction/experimental/run.sh 2008-05-28 12:12:42 UTC (rev 1516)
+++ trunk/src/cluster/feature_extraction/experimental/run.sh 2008-05-28 12:38:35 UTC (rev 1517)
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# (C)Copyright 2008 CSI PC2 Project
-#
-# This file is part of the CSI PC2 software.
-#
-# The CSI PC2 software is free software: you can redistribute it
-# and/or modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation, either version 2 of the
-# License, or (at your option) any later version.
-#
-# The CSI PC2 software is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the CSI PC2 software. If not, see
-# <http://www.gnu.org/licenses/>.
-#
-
-export LD_LIBRARY_PATH=~/IM/lib/
-setenv LD_LIBRARY_PATH ~/IM/lib/
-
-./main
Property changes on: trunk/src/cluster/feature_extraction/fingerprint
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster/feature_extraction/fingerprint/man1
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster/feature_extraction/fingerprint/mindtct
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster/template_matching
___________________________________________________________________
Name: svn:ignore
- pc2-src.exe
+ pc2-src.exe
Makefile.in
Property changes on: trunk/src/cluster/template_matching/bozorth3
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/shared
___________________________________________________________________
Name: svn:ignore
- *.a
.deps
+ *.a
.deps
Makefile.in
Property changes on: trunk/src/tests
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/ccd_connection
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/ccd_connection/man1
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/performance
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/performance/speed_iris
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/unit
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/unit/cluster
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/unit/cluster/template_matching
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tests/unit/shared
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tools
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tools/fingerprint_ga
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tools/fingerprint_testbed
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tools/fingerprint_testbed/man1
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tools/management_gui
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tools/misc_dev
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/tools/misc_dev/man1
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-05-28 12:12:46
|
Revision: 1516
http://csipc2.svn.sourceforge.net/csipc2/?rev=1516&view=rev
Author: warcamel
Date: 2008-05-28 05:12:42 -0700 (Wed, 28 May 2008)
Log Message:
-----------
- modified configure.in:
- remove duplicate gtk2-test
- added gnutls-check
- added subdir to Makefile for creating man1-file of ccd_connection
- added missing source file for ccd_connection_gui to Makefile
Modified Paths:
--------------
trunk/configure.in
trunk/src/tests/ccd_connection/Makefile.am
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-05-27 22:41:43 UTC (rev 1515)
+++ trunk/configure.in 2008-05-28 12:12:42 UTC (rev 1516)
@@ -237,7 +237,7 @@
AC_MSG_CHECKING(for gtk+-2.0 libraries)
GTK2_LIBS=$(pkg-config --libs gtk+-2.0)
AC_MSG_RESULT(${GTK2_LIBS})
- AC_MSG_CHECKING(for gtk+-2.0 headers)
+ AC_MSG_CHECKING(for gtk+-2.0 includes)
GTK2_INCS=$(pkg-config --cflags gtk+-2.0)
AC_MSG_RESULT(${GTK2_INCS})
else
@@ -248,14 +248,26 @@
AC_SUBST(GTK2_INCS)
AM_CONDITIONAL(MAKE_GTK_SUPPORT, test "x$enable_gtk2" = "xyes")
-#
-# Check for gtk+-2.0
-#
-AC_ARG_ENABLE([gtk2],
- AS_HELP_STRING([--enable-gtk2],
- [Enable GUIs using gtk+-2.0 framework. [default=no]]),
- [enable_gtk2=$enableval],
- [enable_gtk2=no])
+
+### Check for gnutls
+AC_MSG_CHECKING(for gnutls)
+if $(pkg-config --exists gnutls); then
+ AC_MSG_RESULT(yes)
+ AC_MSG_CHECKING(for gnutls libraries)
+ GNUTLS_LIBS=$(pkg-config --libs gnutls)
+ AC_MSG_RESULT(${GNUTLS_LIBS})
+ AC_MSG_CHECKING(for gnutls includes)
+ GNUTLS_INCS=$(pkg-config --cflags gnutls)
+ AC_MSG_RESULT(${GNUTLS_INCS})
+ enable_gnutls=yes
+else
+ AC_MSG_RESULT(no)
+ enable_gnutls=no
+fi
+AC_SUBST(GNULTS_LIBS)
+AC_SUBST(GNUTLS_INCS)
+AM_CONDITIONAL(MAKE_GNUTLS_SUPPORT, test "x$enable_gnutls" = "xyes")
+
### Check availability of functions, headers and libraries
Modified: trunk/src/tests/ccd_connection/Makefile.am
===================================================================
--- trunk/src/tests/ccd_connection/Makefile.am 2008-05-27 22:41:43 UTC (rev 1515)
+++ trunk/src/tests/ccd_connection/Makefile.am 2008-05-28 12:12:42 UTC (rev 1516)
@@ -36,7 +36,8 @@
ccd_connection_gui_DEPENDENCIES = ${LDADD}
ccd_connection_gui_SOURCES = ccd_connection_gui.c \
- ccd_connection_funcs.c
+ ccd_connection_funcs.c \
+ ccd_connection_gui_funcs.c
else
# Without GTK
@@ -50,4 +51,6 @@
ccd_connection_SOURCES = ccd_connection.c \
ccd_connection_funcs.c
+SUBDIRS = man1
+
man_MANS = man1/ccd_connection.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-05-27 22:41:48
|
Revision: 1515
http://csipc2.svn.sourceforge.net/csipc2/?rev=1515&view=rev
Author: warcamel
Date: 2008-05-27 15:41:43 -0700 (Tue, 27 May 2008)
Log Message:
-----------
- modified insert gpl script to support java files
- added GPL header to all source files
Modified Paths:
--------------
trunk/Makefile.am
trunk/config.sh
trunk/configure.in
trunk/doc/Makefile.am
trunk/doc/cluster.Doxyfile.in
trunk/doc/frontend.Doxyfile.in
trunk/doc/insert_gpl.sh
trunk/src/Makefile.am
trunk/src/cluster/Makefile.am
trunk/src/cluster/ccd/Makefile.am
trunk/src/cluster/ccd/ccd.c
trunk/src/cluster/ccd/ccd_config.c
trunk/src/cluster/ccd/ccd_config.h
trunk/src/cluster/ccd/ccd_logging.c
trunk/src/cluster/ccd/ccd_logging.h
trunk/src/cluster/ccd/ccd_matching.c
trunk/src/cluster/ccd/ccd_matching.h
trunk/src/cluster/ccd/ccd_methods.c
trunk/src/cluster/ccd/ccd_methods.h
trunk/src/cluster/ccd/ccd_networking.c
trunk/src/cluster/ccd/ccd_networking.h
trunk/src/cluster/ccd/ccd_worker.c
trunk/src/cluster/ccd/ccd_worker.h
trunk/src/cluster/ccd/fpga_utils.c
trunk/src/cluster/ccd/fpga_utils.h
trunk/src/cluster/ccd/globaldefs.h
trunk/src/cluster/ccd/man1/Makefile.am
trunk/src/cluster/ccd/mpi_tags.h
trunk/src/cluster/csi_dbtool/Makefile.am
trunk/src/cluster/csi_dbtool/csi_dbtool.c
trunk/src/cluster/csi_dbtool/run.sh
trunk/src/cluster/database/Makefile.am
trunk/src/cluster/database/clustering.c
trunk/src/cluster/database/clustering.h
trunk/src/cluster/database/clustering_addtemplate.c
trunk/src/cluster/database/clustering_addtemplate.h
trunk/src/cluster/database/clustering_mpi.c
trunk/src/cluster/database/clustering_mpi.h
trunk/src/cluster/database/database.c
trunk/src/cluster/database/database.h
trunk/src/cluster/database/database_ext.c
trunk/src/cluster/database/database_ext.h
trunk/src/cluster/database/db_helpers.c
trunk/src/cluster/database/db_helpers.h
trunk/src/cluster/database/generate_templates.c
trunk/src/cluster/database/main.c
trunk/src/cluster/database/man1/Makefile.am
trunk/src/cluster/database/read_clusteringmetadata.c
trunk/src/cluster/feature_extraction/Makefile.am
trunk/src/cluster/feature_extraction/experimental/01_normalize/normalize.c
trunk/src/cluster/feature_extraction/experimental/01_normalize/normalize.h
trunk/src/cluster/feature_extraction/experimental/02_direction/direction.c
trunk/src/cluster/feature_extraction/experimental/02_direction/direction.h
trunk/src/cluster/feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c
trunk/src/cluster/feature_extraction/experimental/03_corepoint_detection/corepoint_detection.h
trunk/src/cluster/feature_extraction/experimental/04_thining/thining.c
trunk/src/cluster/feature_extraction/experimental/04_thining/thining.h
trunk/src/cluster/feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c
trunk/src/cluster/feature_extraction/experimental/05_minutia_extraction/minutia_extraction.h
trunk/src/cluster/feature_extraction/experimental/06_cluster_template/cluster_template.c
trunk/src/cluster/feature_extraction/experimental/06_cluster_template/cluster_template.h
trunk/src/cluster/feature_extraction/experimental/07_filterbank/filterbank_wrapper.c
trunk/src/cluster/feature_extraction/experimental/07_filterbank/filterbank_wrapper.h
trunk/src/cluster/feature_extraction/experimental/08_average_dist/average_dist.c
trunk/src/cluster/feature_extraction/experimental/08_average_dist/average_dist.h
trunk/src/cluster/feature_extraction/experimental/Makefile.am
trunk/src/cluster/feature_extraction/experimental/feat_ext_fingerprint.c
trunk/src/cluster/feature_extraction/experimental/feat_ext_fingerprint.h
trunk/src/cluster/feature_extraction/experimental/main.c
trunk/src/cluster/feature_extraction/experimental/run.sh
trunk/src/cluster/feature_extraction/experimental/service.c
trunk/src/cluster/feature_extraction/experimental/service.h
trunk/src/cluster/feature_extraction/fingerprint/Makefile.am
trunk/src/cluster/feature_extraction/fingerprint/advmindtct.c
trunk/src/cluster/feature_extraction/fingerprint/filterbank.c
trunk/src/cluster/feature_extraction/fingerprint/filterbank.h
trunk/src/cluster/feature_extraction/fingerprint/man1/Makefile.am
trunk/src/cluster/feature_extraction/fingerprint/mindtct/Makefile.am
trunk/src/cluster/feature_extraction/fingerprint/mindtct/binar.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/block.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/chaincod.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/contour.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/defs.h
trunk/src/cluster/feature_extraction/fingerprint/mindtct/detect.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/dft.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/free.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/getmin.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/globals.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/imgboost.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/imgboost.h
trunk/src/cluster/feature_extraction/fingerprint/mindtct/imgutil.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/init.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/isempty.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/lfs.h
trunk/src/cluster/feature_extraction/fingerprint/mindtct/line.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/link.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/log.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/log.h
trunk/src/cluster/feature_extraction/fingerprint/mindtct/loop.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/maps.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/matchpat.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/minutia.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/morph.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/morph.h
trunk/src/cluster/feature_extraction/fingerprint/mindtct/mytime.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/mytime.h
trunk/src/cluster/feature_extraction/fingerprint/mindtct/quality.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/remove.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/results.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/ridges.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/shape.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/sort.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/util.c
trunk/src/cluster/feature_extraction/fingerprint/mindtct/xytreps.c
trunk/src/cluster/feature_extraction/fingerprint/nbis_extraction_main.c
trunk/src/cluster/feature_extraction/fingerprint/nbis_feature_extraction.c
trunk/src/cluster/feature_extraction/fingerprint/nbis_feature_extraction.h
trunk/src/cluster/feature_extraction/iris/IrisCodeGenerator/IrisCode.cpp
trunk/src/cluster/feature_extraction/iris/IrisCodeGenerator/IrisCode.hpp
trunk/src/cluster/feature_extraction/iris/IrisCodeGenerator/main.cpp
trunk/src/cluster/feature_extraction/iris/NewIrisCodeMatcher/IrisCodeMatcher.cpp
trunk/src/cluster/feature_extraction/iris/NewIrisCodeMatcher/IrisCodeMatcher.hpp
trunk/src/cluster/feature_extraction/iris/NewIrisCodeMatcher/main.cpp
trunk/src/cluster/template_matching/Makefile.am
trunk/src/cluster/template_matching/bozorth3/Makefile.am
trunk/src/cluster/template_matching/bozorth3/bozorth.h
trunk/src/cluster/template_matching/bozorth3/bozorth3.c
trunk/src/cluster/template_matching/bozorth3/bz_alloc.c
trunk/src/cluster/template_matching/bozorth3/bz_array.h
trunk/src/cluster/template_matching/bozorth3/bz_drvrs.c
trunk/src/cluster/template_matching/bozorth3/bz_gbls.c
trunk/src/cluster/template_matching/bozorth3/bz_io.c
trunk/src/cluster/template_matching/bozorth3/bz_sort.c
trunk/src/cluster/template_matching/bozorth3_matching.c
trunk/src/cluster/template_matching/bozorth3_matching.h
trunk/src/cluster/template_matching/clustering_matching.c
trunk/src/cluster/template_matching/clustering_matching.h
trunk/src/cluster/template_matching/filterbank_matching.c
trunk/src/cluster/template_matching/filterbank_matching.h
trunk/src/cluster/template_matching/fingerprint_matching.c
trunk/src/cluster/template_matching/iris_matching.c
trunk/src/cluster/template_matching/iris_matching.h
trunk/src/cluster/template_matching/matching_utils.c
trunk/src/cluster/template_matching/matching_utils.h
trunk/src/cluster/template_matching/minutiae_matching.c
trunk/src/cluster/template_matching/minutiae_matching.h
trunk/src/shared/Makefile.am
trunk/src/shared/csi_config.h
trunk/src/shared/csi_math.c
trunk/src/shared/csi_math.h
trunk/src/shared/csi_results.c
trunk/src/shared/csi_results.h
trunk/src/shared/csi_serialization.c
trunk/src/shared/csi_serialization.h
trunk/src/shared/csi_struct.h
trunk/src/shared/csi_time.c
trunk/src/shared/csi_time.h
trunk/src/shared/csi_tools.c
trunk/src/shared/csi_tools.h
trunk/src/shared/image_utils.c
trunk/src/shared/image_utils.h
trunk/src/tests/Makefile.am
trunk/src/tests/ccd_connection/Makefile.am
trunk/src/tests/ccd_connection/ccd_connection.c
trunk/src/tests/ccd_connection/ccd_connection_funcs.c
trunk/src/tests/ccd_connection/ccd_connection_funcs.h
trunk/src/tests/ccd_connection/ccd_connection_gui.c
trunk/src/tests/ccd_connection/ccd_connection_gui_funcs.c
trunk/src/tests/ccd_connection/ccd_connection_gui_funcs.h
trunk/src/tests/ccd_connection/man1/Makefile.am
trunk/src/tests/performance/Makefile.am
trunk/src/tests/performance/speed_iris/Makefile.am
trunk/src/tests/performance/speed_iris/hamming.c
trunk/src/tests/performance/speed_iris/iris_matching.c
trunk/src/tests/performance/speed_iris/iris_matching.h
trunk/src/tests/unit/Makefile.am
trunk/src/tests/unit/cluster/Makefile.am
trunk/src/tests/unit/cluster/template_matching/Makefile.am
trunk/src/tests/unit/cluster/template_matching/check_matching_utils.c
trunk/src/tests/unit/cluster/template_matching/check_minutiae_matching.c
trunk/src/tests/unit/shared/Makefile.am
trunk/src/tests/unit/shared/check_csi_math.c
trunk/src/tools/Makefile.am
trunk/src/tools/fingerprint_ga/Makefile.am
trunk/src/tools/fingerprint_ga/fingerprint_ga.c
trunk/src/tools/fingerprint_testbed/Makefile.am
trunk/src/tools/fingerprint_testbed/fingerprint_testbed.c
trunk/src/tools/fingerprint_testbed/fingerprint_testbed.h
trunk/src/tools/fingerprint_testbed/fingerprint_testbed_main.c
trunk/src/tools/fingerprint_testbed/generate_all_graphs.sh
trunk/src/tools/fingerprint_testbed/generate_graphs.sh
trunk/src/tools/fingerprint_testbed/man1/Makefile.am
trunk/src/tools/management_gui/Makefile.am
trunk/src/tools/management_gui/mng_config.h
trunk/src/tools/management_gui/mng_funcs.c
trunk/src/tools/management_gui/mng_funcs.h
trunk/src/tools/management_gui/mng_main.c
trunk/src/tools/management_gui/mng_window.c
trunk/src/tools/management_gui/mng_window.h
trunk/src/tools/minutiae_vis/Makefile.am
trunk/src/tools/minutiae_vis/minutiae_vis.sh
trunk/src/tools/minutiae_vis/src/de/upb/pc2/csi/tools/MainFrame.java
trunk/src/tools/minutiae_vis/src/de/upb/pc2/csi/tools/MinutiaeVisualization.java
trunk/src/tools/minutiae_vis/src/de/upb/pc2/csi/tools/data/AbstractFileProcessor.java
trunk/src/tools/minutiae_vis/src/de/upb/pc2/csi/tools/data/BlockData.java
trunk/src/tools/minutiae_vis/src/de/upb/pc2/csi/tools/data/BlockType.java
trunk/src/tools/minutiae_vis/src/de/upb/pc2/csi/tools/data/CoreData.java
trunk/src/tools/minutiae_vis/src/de/upb/pc2/csi/tools/data/Data.java
trunk/src/tools/minutiae_vis/src/de/upb/pc2/csi/tools/data/MinutiaData.java
trunk/src/tools/minutiae_vis/src/de/upb/pc2/csi/tools/data/MinutiaeType.java
trunk/src/tools/misc_dev/Makefile.am
trunk/src/tools/misc_dev/csi2nbis.c
trunk/src/tools/misc_dev/csi_sizes.c
trunk/src/tools/misc_dev/csi_sizes.h
trunk/src/tools/misc_dev/man1/Makefile.am
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/Makefile.am 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1 +1,21 @@
+#
+# (C)Copyright 2008 CSI PC2 Project
+#
+# This file is part of the CSI PC2 software.
+#
+# The CSI PC2 software is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or (at your option) any later version.
+#
+# The CSI PC2 software is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the CSI PC2 software. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
SUBDIRS = doc src
Modified: trunk/config.sh
===================================================================
--- trunk/config.sh 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/config.sh 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,5 +1,25 @@
#!/bin/sh
+#
+# (C)Copyright 2008 CSI PC2 Project
+#
+# This file is part of the CSI PC2 software.
+#
+# The CSI PC2 software is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or (at your option) any later version.
+#
+# The CSI PC2 software is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the CSI PC2 software. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
# Utility script for developers only.
# Use this only if you know what you are doing.
#
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/configure.in 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+#
+# (C)Copyright 2008 CSI PC2 Project
+#
+# This file is part of the CSI PC2 software.
+#
+# The CSI PC2 software is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or (at your option) any later version.
+#
+# The CSI PC2 software is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the CSI PC2 software. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
# configure.in
#
# Autoconf configuration
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/doc/Makefile.am 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+#
+# (C)Copyright 2008 CSI PC2 Project
+#
+# This file is part of the CSI PC2 software.
+#
+# The CSI PC2 software is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or (at your option) any later version.
+#
+# The CSI PC2 software is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the CSI PC2 software. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
noinst_SCRIPTS = txt2man
EXTRA_DIST = txt2man
CLEANFILES = txt2man
Modified: trunk/doc/cluster.Doxyfile.in
===================================================================
--- trunk/doc/cluster.Doxyfile.in 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/doc/cluster.Doxyfile.in 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+#
+# (C)Copyright 2008 CSI PC2 Project
+#
+# This file is part of the CSI PC2 software.
+#
+# The CSI PC2 software is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or (at your option) any later version.
+#
+# The CSI PC2 software is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the CSI PC2 software. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
# Doxyfile 1.5.3
#---------------------------------------------------------------------------
Modified: trunk/doc/frontend.Doxyfile.in
===================================================================
--- trunk/doc/frontend.Doxyfile.in 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/doc/frontend.Doxyfile.in 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+#
+# (C)Copyright 2008 CSI PC2 Project
+#
+# This file is part of the CSI PC2 software.
+#
+# The CSI PC2 software is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or (at your option) any later version.
+#
+# The CSI PC2 software is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the CSI PC2 software. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
# Doxyfile 1.5.3
#---------------------------------------------------------------------------
Modified: trunk/doc/insert_gpl.sh
===================================================================
--- trunk/doc/insert_gpl.sh 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/doc/insert_gpl.sh 2008-05-27 22:41:43 UTC (rev 1515)
@@ -95,7 +95,7 @@
then
case "$file_type" in
# Programm files
- c | C | h | H | cpp | CPP | hpp | HPP )
+ c | C | h | H | cpp | CPP | hpp | HPP | java )
# Set c-type comment tags for source files
comment_begin=$comment_begin_c
comment=$comment_c
@@ -160,7 +160,7 @@
case "$2" in
# Programm files
- c | C | h | H | cpp | CPP | hpp | HPP )
+ c | C | h | H | cpp | CPP | hpp | HPP | java )
comment=$comment_c
check_a="`head -2 $1 | tail -1`"
;;
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/Makefile.am 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1 +1,21 @@
+#
+# (C)Copyright 2008 CSI PC2 Project
+#
+# This file is part of the CSI PC2 software.
+#
+# The CSI PC2 software is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or (at your option) any later version.
+#
+# The CSI PC2 software is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the CSI PC2 software. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
SUBDIRS = shared cluster tools tests
Modified: trunk/src/cluster/Makefile.am
===================================================================
--- trunk/src/cluster/Makefile.am 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/Makefile.am 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1 +1,21 @@
+#
+# (C)Copyright 2008 CSI PC2 Project
+#
+# This file is part of the CSI PC2 software.
+#
+# The CSI PC2 software is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or (at your option) any later version.
+#
+# The CSI PC2 software is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the CSI PC2 software. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
SUBDIRS = template_matching feature_extraction database ccd csi_dbtool
Modified: trunk/src/cluster/ccd/Makefile.am
===================================================================
--- trunk/src/cluster/ccd/Makefile.am 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/Makefile.am 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+#
+# (C)Copyright 2008 CSI PC2 Project
+#
+# This file is part of the CSI PC2 software.
+#
+# The CSI PC2 software is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or (at your option) any later version.
+#
+# The CSI PC2 software is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the CSI PC2 software. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
# Makefile.am
#
# Automake configuration
Modified: trunk/src/cluster/ccd/ccd.c
===================================================================
--- trunk/src/cluster/ccd/ccd.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/ccd.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD starting methods.
Modified: trunk/src/cluster/ccd/ccd_config.c
===================================================================
--- trunk/src/cluster/ccd/ccd_config.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/ccd_config.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD configuration methods.
Modified: trunk/src/cluster/ccd/ccd_config.h
===================================================================
--- trunk/src/cluster/ccd/ccd_config.h 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/ccd_config.h 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD configuration header file.
Modified: trunk/src/cluster/ccd/ccd_logging.c
===================================================================
--- trunk/src/cluster/ccd/ccd_logging.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/ccd_logging.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD logging system methods.
Modified: trunk/src/cluster/ccd/ccd_logging.h
===================================================================
--- trunk/src/cluster/ccd/ccd_logging.h 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/ccd_logging.h 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD logging system header file.
Modified: trunk/src/cluster/ccd/ccd_matching.c
===================================================================
--- trunk/src/cluster/ccd/ccd_matching.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/ccd_matching.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD matching methods.
Modified: trunk/src/cluster/ccd/ccd_matching.h
===================================================================
--- trunk/src/cluster/ccd/ccd_matching.h 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/ccd_matching.h 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD matching header file.
Modified: trunk/src/cluster/ccd/ccd_methods.c
===================================================================
--- trunk/src/cluster/ccd/ccd_methods.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/ccd_methods.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD shared worker/networking methods.
Modified: trunk/src/cluster/ccd/ccd_methods.h
===================================================================
--- trunk/src/cluster/ccd/ccd_methods.h 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/ccd_methods.h 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD methods container.
Modified: trunk/src/cluster/ccd/ccd_networking.c
===================================================================
--- trunk/src/cluster/ccd/ccd_networking.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/ccd_networking.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD networking methods.
Modified: trunk/src/cluster/ccd/ccd_networking.h
===================================================================
--- trunk/src/cluster/ccd/ccd_networking.h 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/ccd_networking.h 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD networking methods.
Modified: trunk/src/cluster/ccd/ccd_worker.c
===================================================================
--- trunk/src/cluster/ccd/ccd_worker.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/ccd_worker.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD worker methods.
Modified: trunk/src/cluster/ccd/ccd_worker.h
===================================================================
--- trunk/src/cluster/ccd/ccd_worker.h 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/ccd_worker.h 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD worker header file.
Modified: trunk/src/cluster/ccd/fpga_utils.c
===================================================================
--- trunk/src/cluster/ccd/fpga_utils.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/fpga_utils.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD FPGA utility methods.
Modified: trunk/src/cluster/ccd/fpga_utils.h
===================================================================
--- trunk/src/cluster/ccd/fpga_utils.h 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/fpga_utils.h 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD FPGA utility methods header file.
Modified: trunk/src/cluster/ccd/globaldefs.h
===================================================================
--- trunk/src/cluster/ccd/globaldefs.h 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/globaldefs.h 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD global structure definitions.
Modified: trunk/src/cluster/ccd/man1/Makefile.am
===================================================================
--- trunk/src/cluster/ccd/man1/Makefile.am 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/man1/Makefile.am 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+#
+# (C)Copyright 2008 CSI PC2 Project
+#
+# This file is part of the CSI PC2 software.
+#
+# The CSI PC2 software is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or (at your option) any later version.
+#
+# The CSI PC2 software is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the CSI PC2 software. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
# Author: Elmar Weber <uni...@el...>
#
# Builds the man pages in this directory using the txt2man tool.
Modified: trunk/src/cluster/ccd/mpi_tags.h
===================================================================
--- trunk/src/cluster/ccd/mpi_tags.h 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/ccd/mpi_tags.h 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CCD MPI-tag definitions.
Modified: trunk/src/cluster/csi_dbtool/Makefile.am
===================================================================
--- trunk/src/cluster/csi_dbtool/Makefile.am 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/csi_dbtool/Makefile.am 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+#
+# (C)Copyright 2008 CSI PC2 Project
+#
+# This file is part of the CSI PC2 software.
+#
+# The CSI PC2 software is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or (at your option) any later version.
+#
+# The CSI PC2 software is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the CSI PC2 software. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
# Makefile.am
#
# Automake configuration
Modified: trunk/src/cluster/csi_dbtool/csi_dbtool.c
===================================================================
--- trunk/src/cluster/csi_dbtool/csi_dbtool.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/csi_dbtool/csi_dbtool.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief CSI Tool for managing databases
Modified: trunk/src/cluster/csi_dbtool/run.sh
===================================================================
--- trunk/src/cluster/csi_dbtool/run.sh 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/csi_dbtool/run.sh 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,5 +1,25 @@
#!/bin/bash
+#
+# (C)Copyright 2008 CSI PC2 Project
+#
+# This file is part of the CSI PC2 software.
+#
+# The CSI PC2 software is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or (at your option) any later version.
+#
+# The CSI PC2 software is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the CSI PC2 software. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
#DIRECTORY="/mnt/a/globalcluster/DB1_B"
DIRECTORY="/home/data/uni/test"
Modified: trunk/src/cluster/database/Makefile.am
===================================================================
--- trunk/src/cluster/database/Makefile.am 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/database/Makefile.am 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+#
+# (C)Copyright 2008 CSI PC2 Project
+#
+# This file is part of the CSI PC2 software.
+#
+# The CSI PC2 software is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or (at your option) any later version.
+#
+# The CSI PC2 software is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the CSI PC2 software. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
# Author: Elmar Weber <uni...@el...>
SUBDIRS = man1
Modified: trunk/src/cluster/database/clustering.c
===================================================================
--- trunk/src/cluster/database/clustering.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/database/clustering.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief Source file for base clustering methods.
Modified: trunk/src/cluster/database/clustering.h
===================================================================
--- trunk/src/cluster/database/clustering.h 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/database/clustering.h 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief Header file for base clustering methods.
Modified: trunk/src/cluster/database/clustering_addtemplate.c
===================================================================
--- trunk/src/cluster/database/clustering_addtemplate.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/database/clustering_addtemplate.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief Source file to add a template (clustering).
Modified: trunk/src/cluster/database/clustering_addtemplate.h
===================================================================
--- trunk/src/cluster/database/clustering_addtemplate.h 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/database/clustering_addtemplate.h 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief Header file to add a template in clustering.
Modified: trunk/src/cluster/database/clustering_mpi.c
===================================================================
--- trunk/src/cluster/database/clustering_mpi.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/database/clustering_mpi.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief MPI-Version of the clustering-programm
Modified: trunk/src/cluster/database/clustering_mpi.h
===================================================================
--- trunk/src/cluster/database/clustering_mpi.h 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/database/clustering_mpi.h 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief Header file to cluster a database.
Modified: trunk/src/cluster/database/database.c
===================================================================
--- trunk/src/cluster/database/database.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/database/database.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief Low-Level Backend for the database.
Modified: trunk/src/cluster/database/database.h
===================================================================
--- trunk/src/cluster/database/database.h 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/database/database.h 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief Low-Level Backend for the database.
Modified: trunk/src/cluster/database/database_ext.c
===================================================================
--- trunk/src/cluster/database/database_ext.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/database/database_ext.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief External interface for the CCD
Modified: trunk/src/cluster/database/database_ext.h
===================================================================
--- trunk/src/cluster/database/database_ext.h 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/database/database_ext.h 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief External interface for the CCD
Modified: trunk/src/cluster/database/db_helpers.c
===================================================================
--- trunk/src/cluster/database/db_helpers.c 2008-05-27 22:36:19 UTC (rev 1514)
+++ trunk/src/cluster/database/db_helpers.c 2008-05-27 22:41:43 UTC (rev 1515)
@@ -1,3 +1,23 @@
+/*
+ * (C)Copyright 2008 CSI PC2 Project
+ *
+ * This file is part of the CSI PC2 software.
+ *
+ * The CSI PC2 software is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The CSI PC2 software is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with the CSI PC2 software. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
/**
* @file
* @brief Helper-Funktions for generationg etc.
...
[truncated message content] |
|
From: <csi...@li...> - 2008-05-27 22:36:39
|
Revision: 1514
http://csipc2.svn.sourceforge.net/csipc2/?rev=1514&view=rev
Author: warcamel
Date: 2008-05-27 15:36:19 -0700 (Tue, 27 May 2008)
Log Message:
-----------
- modified script to skip .svn directories
Modified Paths:
--------------
trunk/doc/insert_gpl.sh
Modified: trunk/doc/insert_gpl.sh
===================================================================
--- trunk/doc/insert_gpl.sh 2008-05-27 22:30:31 UTC (rev 1513)
+++ trunk/doc/insert_gpl.sh 2008-05-27 22:36:19 UTC (rev 1514)
@@ -66,7 +66,7 @@
do
if [[ -d $1 ]]; then
# Find all source files
- files="`find $1 -type f`"
+ files="`find $1 -type f | grep -v .svn`"
# Insert header into source files
for file in $files
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-05-27 22:31:21
|
Revision: 1513
http://csipc2.svn.sourceforge.net/csipc2/?rev=1513&view=rev
Author: warcamel
Date: 2008-05-27 15:30:31 -0700 (Tue, 27 May 2008)
Log Message:
-----------
- added insert-gpl script
Added Paths:
-----------
trunk/doc/insert_gpl.sh
Added: trunk/doc/insert_gpl.sh
===================================================================
--- trunk/doc/insert_gpl.sh (rev 0)
+++ trunk/doc/insert_gpl.sh 2008-05-27 22:30:31 UTC (rev 1513)
@@ -0,0 +1,198 @@
+#!/bin/bash
+#
+# (C)Copyright 2008 CSI PC2 Project
+#
+# This file is part of the CSI PC2 software.
+#
+# The CSI PC2 software is free software: you can redistribute it
+# and/or modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation, either version 2 of the
+# License, or (at your option) any later version.
+#
+# The CSI PC2 software is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with the CSI PC2 software. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+
+
+script_name=`basename $0`
+group="CSI PC2 Project"
+software="CSI PC2 software"
+gpl_version="2"
+
+##############################
+
+# different types of comments
+comment_script="#"
+comment_latex="%"
+comment_begin_c="/*"
+comment_c=" *"
+comment_end_c=" */"
+
+##############################
+
+function print_gpl_header() {
+cat <<-EOF
+$comment_begin
+$comment (C)Copyright 2008 $group
+$comment
+$comment This file is part of the $software.
+$comment
+$comment The $software is free software: you can redistribute it
+$comment and/or modify it under the terms of the GNU General Public License
+$comment as published by the Free Software Foundation, either version $gpl_version of the
+$comment License, or (at your option) any later version.
+$comment
+$comment The $software is distributed in the hope that it will be
+$comment useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+$comment of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+$comment GNU General Public License for more details.
+$comment
+$comment You should have received a copy of the GNU General Public License
+$comment along with the $software. If not, see
+$comment <http://www.gnu.org/licenses/>.
+$comment_end
+
+EOF
+}
+
+function main() {
+ while ! [[ -z $1 ]];
+ do
+ if [[ -d $1 ]]; then
+ # Find all source files
+ files="`find $1 -type f`"
+
+ # Insert header into source files
+ for file in $files
+ do
+ insert_header $file
+ done
+ shift;
+ elif [[ -f $1 ]]; then
+ insert_header $1
+ shift;
+ else
+ echo "Error: $1 is no valid directory or file."
+ echo "Usage: $script_name <directory | files ... >"
+ shift;
+ fi
+ done
+
+}
+
+function insert_header() {
+ if [[ -f $1 ]];
+ then
+ # Insert header
+ file_type=${1##*.}
+ if $(is_gpl_present $1 $file_type)
+ then
+ case "$file_type" in
+ # Programm files
+ c | C | h | H | cpp | CPP | hpp | HPP )
+ # Set c-type comment tags for source files
+ comment_begin=$comment_begin_c
+ comment=$comment_c
+ comment_end=$comment_end_c
+
+ print_gpl_header > $1.gpltmp
+ cat $1 >> $1.gpltmp
+ mv -f $1.gpltmp $1
+ echo "$1: Header inserted."
+ ;;
+ # Script files
+ sh )
+ # Set shell-type comment tags for script files
+ comment_begin=$comment_script
+ comment=$comment_script
+ comment_end=$comment_script
+
+ head -1 $1 > $1.gpltmp
+ print_gpl_header >> $1.gpltmp
+ tail --lines=+2 $1 >> $1.gpltmp
+ mv -f $1.gpltmp $1
+ echo "$1: Header inserted."
+ ;;
+ # Tex files
+ tex | bib )
+ # Set latex-type comment tags for tex files
+ comment_begin=$comment_latex
+ comment=$comment_latex
+ comment_end=$comment_latex
+
+ print_gpl_header > $1.gpltmp
+ cat $1 >> $1.gpltmp
+ mv -f $1.gpltmp $1
+ echo "$1: Header inserted."
+ ;;
+ # Autotools files (autoconf, automake, ...)
+ in | am )
+ # Set shell-type comment tags for script files
+ comment_begin=$comment_script
+ comment=$comment_script
+ comment_end=$comment_script
+
+ print_gpl_header > $1.gpltmp
+ cat $1 >> $1.gpltmp
+ mv -f $1.gpltmp $1
+ echo "$1: Header inserted."
+ ;;
+ * )
+ echo "$1: Skipped."
+ ;;
+ esac
+ else
+ echo "GPL Header already inserted into $1!"
+ fi
+ fi
+}
+
+function is_gpl_present() {
+ # Parameter:
+ # $1 = file
+ # $2 = file_type
+
+ case "$2" in
+ # Programm files
+ c | C | h | H | cpp | CPP | hpp | HPP )
+ comment=$comment_c
+ check_a="`head -2 $1 | tail -1`"
+ ;;
+ # Skript files
+ sh )
+ comment=$comment_script
+ check_a="`head -3 $1 | tail -1`"
+ ;;
+ # Latex files
+ tex | bib )
+ comment=$comment_latex
+ check_a="`head -2 $1 | tail -1`"
+ ;;
+ # Autotools files (autoconf, automake, ...)
+ in | am )
+ comment=$comment_script
+ check_a="`head -2 $1 | tail -1`"
+ ;;
+ * )
+ ;;
+ esac
+
+ # Check if header already exists
+ check_b="$comment (C)Copyright 2008 $group"
+ if [[ "$check_a" == "$check_b" ]]
+ then
+ return 1
+ fi
+ return 0
+}
+
+main $*
+
+exit $?
+
Property changes on: trunk/doc/insert_gpl.sh
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-05-27 20:28:25
|
Revision: 1512
http://csipc2.svn.sourceforge.net/csipc2/?rev=1512&view=rev
Author: elmar_weber
Date: 2008-05-27 13:28:20 -0700 (Tue, 27 May 2008)
Log Message:
-----------
applied patch from replaced SVN repository
Author: warcamel
Date: 2008-05-27 04:04:22 -0700 (Tue, 27 May 2008)
Log Message:
-----------
- fixed BUG in Makefile using gtk libraries. BUG appeared in Ubuntu/hardy as gtk/gtk.h was not found anymore. Might have been an autotools/automake problem.
Modified Paths:
--------------
trunk/src/tests/ccd_connection/Makefile.am
Modified: trunk/src/tests/ccd_connection/Makefile.am
===================================================================
--- trunk/src/tests/ccd_connection/Makefile.am 2008-05-27 19:04:07 UTC (rev 1511)
+++ trunk/src/tests/ccd_connection/Makefile.am 2008-05-27 20:28:20 UTC (rev 1512)
@@ -5,30 +5,29 @@
# Date : 10.03.2008
#
-SUBDIRS = man1
+CC = @mpicc@
+if MAKE_GTK_SUPPORT
+# With GTK build GUI
+
+INCLUDES = @GTK2_INCS@ @GLOBAL_INCLUDE@
+LDADD = @MATCHING_LIBS@ @SHARED_LIBS@ @GTK2_LIBS@
+bin_PROGRAMS = ccd_connection ccd_connection_gui
+
+ccd_connection_gui_DEPENDENCIES = ${LDADD}
+ccd_connection_gui_SOURCES = ccd_connection_gui.c \
+ ccd_connection_funcs.c
+else
+# Without GTK
+
INCLUDES = @GLOBAL_INCLUDE@
LDADD = @MATCHING_LIBS@ @SHARED_LIBS@
-CC = @mpicc@
+bin_PROGRAMS = ccd_connection
-if MAKE_GTK_SUPPORT
-gtk_bins = ccd_connection_gui
endif
-bin_PROGRAMS = ccd_connection ${gtk_bins}
ccd_connection_DEPENDENCIES = ${LDADD}
ccd_connection_SOURCES = ccd_connection.c \
- ccd_connection_funcs.h \
ccd_connection_funcs.c
-if MAKE_GTK_SUPPORT
-ccd_connection_gui_DEPENDENCIES = ${LDADD}
-ccd_connection_gui_LDADD = ${LDADD} @GTK2_LIBS@
-ccd_connection_gui_CFLAGS = @GTK2_INCS@
-ccd_connection_gui_SOURCES = ccd_connection_gui.c \
- ccd_connection_funcs.h \
- ccd_connection_funcs.c \
- ccd_connection_gui_funcs.h \
- ccd_connection_gui_funcs.c
-endif
-
+man_MANS = man1/ccd_connection.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-05-27 11:04:25
|
Revision: 1315
http://csipc2.svn.sourceforge.net/csipc2/?rev=1315&view=rev
Author: warcamel
Date: 2008-05-27 04:04:22 -0700 (Tue, 27 May 2008)
Log Message:
-----------
- fixed BUG in Makefile using gtk libraries. BUG appeared in Ubuntu/hardy as gtk/gtk.h was not found anymore. Might have been an autotools/automake problem.
Modified Paths:
--------------
trunk/src/tests/ccd_connection/Makefile.am
Modified: trunk/src/tests/ccd_connection/Makefile.am
===================================================================
--- trunk/src/tests/ccd_connection/Makefile.am 2008-05-26 13:30:46 UTC (rev 1314)
+++ trunk/src/tests/ccd_connection/Makefile.am 2008-05-27 11:04:22 UTC (rev 1315)
@@ -18,25 +18,29 @@
# <http://www.gnu.org/licenses/>.
#
-INCLUDES = @GLOBAL_INCLUDE@
-LDADD = @MATCHING_LIBS@ @SHARED_LIBS@
CC = @mpicc@
if MAKE_GTK_SUPPORT
-gtk_bins = ccd_connection_gui
-endif
-bin_PROGRAMS = ccd_connection ${gtk_bins}
+# With GTK build GUI
-ccd_connection_DEPENDENCIES = ${LDADD}
-ccd_connection_SOURCES = ccd_connection.c \
- ccd_connection_funcs.c
+INCLUDES = @GTK2_INCS@ @GLOBAL_INCLUDE@
+LDADD = @MATCHING_LIBS@ @SHARED_LIBS@ @GTK2_LIBS@
+bin_PROGRAMS = ccd_connection ccd_connection_gui
-if MAKE_GTK_SUPPORT
ccd_connection_gui_DEPENDENCIES = ${LDADD}
-ccd_connection_gui_LDADD = ${LDADD} @GTK2_LIBS@
-ccd_connection_gui_CFLAGS = @GTK2_INCS@
ccd_connection_gui_SOURCES = ccd_connection_gui.c \
ccd_connection_funcs.c
+else
+# Without GTK
+
+INCLUDES = @GLOBAL_INCLUDE@
+LDADD = @MATCHING_LIBS@ @SHARED_LIBS@
+bin_PROGRAMS = ccd_connection
+
endif
+ccd_connection_DEPENDENCIES = ${LDADD}
+ccd_connection_SOURCES = ccd_connection.c \
+ ccd_connection_funcs.c
+
man_MANS = man1/ccd_connection.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-05-26 13:31:09
|
Revision: 1314
http://csipc2.svn.sourceforge.net/csipc2/?rev=1314&view=rev
Author: elmar_weber
Date: 2008-05-26 06:30:46 -0700 (Mon, 26 May 2008)
Log Message:
-----------
- added a copy of the missing iris feature extraction sources
- needs cleanup and porting
Added Paths:
-----------
trunk/src/cluster/feature_extraction/iris/
trunk/src/cluster/feature_extraction/iris/IrisCodeGenerator/
trunk/src/cluster/feature_extraction/iris/IrisCodeGenerator/IrisCode.cpp
trunk/src/cluster/feature_extraction/iris/IrisCodeGenerator/IrisCode.hpp
trunk/src/cluster/feature_extraction/iris/IrisCodeGenerator/main.cpp
trunk/src/cluster/feature_extraction/iris/NewIrisCodeMatcher/
trunk/src/cluster/feature_extraction/iris/NewIrisCodeMatcher/IrisCodeMatcher.cpp
trunk/src/cluster/feature_extraction/iris/NewIrisCodeMatcher/IrisCodeMatcher.hpp
trunk/src/cluster/feature_extraction/iris/NewIrisCodeMatcher/main.cpp
trunk/src/cluster/feature_extraction/iris/RandomIrisCodeGenerator/
trunk/src/cluster/feature_extraction/iris/RandomIrisCodeGenerator/RandomIrisCode.cpp
trunk/src/cluster/feature_extraction/iris/RandomIrisCodeGenerator/RandomIrisCode.h
trunk/src/cluster/feature_extraction/iris/RandomIrisCodeGenerator/main.cpp
Added: trunk/src/cluster/feature_extraction/iris/IrisCodeGenerator/IrisCode.cpp
===================================================================
--- trunk/src/cluster/feature_extraction/iris/IrisCodeGenerator/IrisCode.cpp (rev 0)
+++ trunk/src/cluster/feature_extraction/iris/IrisCodeGenerator/IrisCode.cpp 2008-05-26 13:30:46 UTC (rev 1314)
@@ -0,0 +1,3335 @@
+/**
+ * @file
+ * @brief
+ *
+ * This file contains all necessary methods for generating the iriscode.
+ *
+ * @author Christoph Scholz
+ * @author Nils Timm
+ */
+#include "IrisCode.hpp"
+#include <iostream>
+#include "vigra/gaborfilter.hxx"
+#include "vigra/stdimage.hxx"
+#include "vigra/edgedetection.hxx"
+#include "vigra/impex.hxx"
+#include "vigra/basicimage.hxx"
+#include "vigra/rgbvalue.hxx"
+#include "vigra/splineimageview.hxx"
+#include <vector>
+#include <math.h>
+#include <complex>
+#include <fstream>
+#include <cstdlib>
+#include <time.h>
+#include <math.h>
+#include<vector>
+
+
+using namespace vigra;
+
+namespace Iris{
+
+
+
+ IrisCode::IrisCode(char *irisCodeFile_, char *maskFile_, vigra::BImage img_, char *_imageName)
+ {
+ irisCodeFile = irisCodeFile_; //OutputFile of IrisCode
+ imageName = _imageName;
+ maskFile = maskFile_; //OutputFile of Mask
+ irisCode = new int[2048]; //IrisCodeVector
+ maskBits = new int[2048];
+
+ //preprocessing
+ preprocessing_exp_values = new std::complex <double>**[1026];
+ for(int i=0;i<1026;i++)
+ preprocessing_exp_values[i] = new std::complex <double>*[258];
+ for(int i=0;i<1026;i++)
+ for(int j =0;j<258;j++)
+ preprocessing_exp_values[i][j] = new std::complex <double>[8];
+ //end preprocessing
+
+ img = img_;
+ w = img.width();
+ h = img.height();
+ for(int i = 0; i<2048;i++)
+ {
+ maskBits[i] = 1;
+ irisCode[i] = 0;
+ }
+
+ //normalization
+
+ rgbValues = new double*[img.width()]; //contains the grey-values of the iris picture
+ rgbValuesOut = new double*[img.width()]; //contains the grey-values of the iris picture
+ for(int i=0;i<img.width();i++) //grey-values will be set
+ {
+ rgbValues[i] = new double[img.height()];
+ rgbValuesOut[i] = new double[img.height()];
+ }
+
+ for(int i = 0; i<img.width(); i++)
+ {
+ for(int j = 0;j<img.height(); j++)
+ {
+ rgbValues[i][j] = img(i,j);
+ rgbValuesOut[i][j] = img(i,j);
+ }
+ }
+
+ //end rgbValues
+
+ //normalization
+ resolutionR = 128;
+ resolutionPhi = 512;
+
+ normalization = new double*[resolutionPhi]; //contains the grey-values of the iris ring.
+ for(int i=0; i<resolutionPhi; i++) //grey-values will be set
+ normalization[i] = new double[resolutionR];
+
+ //end normalization
+
+ //intial Values of pupil paramters
+ bestX = 0;
+ bestY = 0;
+ bestR = 0;
+ bestRLeft = 0;
+ bestRRight = 0;
+ //end of pupil parameters
+
+ //mask
+ rgbValuesMask = new double*[img.width()]; //contains the values of the mask.
+ for(int i=0; i<img.width(); i++)
+ rgbValuesMask[i] = new double[img.height()];
+ //end of mask
+
+ //normalized mask
+ normalizedMask = new double*[resolutionPhi]; //contains the values of the normalized mask.
+ for(int i=0; i<resolutionPhi; i++)
+ normalizedMask[i] = new double[resolutionR];
+ //end of normalized mask
+
+ //test
+
+
+ }
+
+
+int IrisCode::Quantisierung(std::complex<double> res, int i, bool fail)
+{
+
+ if(fail == true)
+ {
+ maskBits[2*i] = 0;
+ maskBits[2*i +1] = 0;
+ return 4;
+ }
+
+
+ if((res.real() >= 0) && (res.imag() >= 0))
+ {
+
+
+
+ irisCode[2*i] = 1;
+ irisCode[2*i + 1] = 1;
+ return 3;
+ }
+ else if((res.real() >= 0) && (res.imag() < 0))
+ {
+
+
+ irisCode[2*i] = 1;
+ irisCode[2*i + 1] = 0;
+ return 2;
+ }
+ else if((res.real() < 0) && (res.imag() >= 0))
+ {
+
+ irisCode[2*i] = 0;
+ irisCode[2*i + 1] = 1;
+
+ return 1;
+ }
+ else
+ {
+
+ irisCode[2*i] = 0;
+ irisCode[2*i + 1] = 0;
+ return 0;
+ }
+}
+
+/**
+ * Saves the derived iriscode bits to a .txt file.
+ */
+void IrisCode::saveIrisCodeToFile()
+{
+
+ std::ofstream myfile(irisCodeFile);
+
+ for(int i=0; i<2048;i++)
+ {
+ myfile << irisCode[i];
+ myfile << "\n";
+ }
+ myfile.close();
+}
+/**
+ * Saves the results of the gabor function in an array.
+ *
+ * @param omega_ frequence of the gabor filter.
+ * @param alpha_ horizontal scale of the gabor filter.
+ * @param beta_ vertical scale of the gabor filter.
+ * @param frequNr number of frequence used
+ */
+void IrisCode::gaborFilter_preprocessing(double omega_, double alpha_, double beta_ , int frequNr)
+{
+ std::complex <double> result(0,0);
+ std::complex <double> omega(0,omega_);
+ std::complex <double> alpha(alpha_,0);
+ std::complex <double> beta(beta_,0);
+
+ for(int r = 0 ; r <= resolutionR; r++)
+ {
+
+ for(int phi = 0; phi <= 256; phi++)
+ {
+
+ double a_r_p = (double) r / resolutionR;
+ double a_phi_p = ((double)phi / resolutionPhi) * 2 * M_PI ;
+ double a_r_n = -1.0*(double) r / resolutionR;
+ double a_phi_n = -1.0*((double)phi / resolutionPhi) * 2 * M_PI ;
+ std::complex <double> temp(0,0);
+
+ temp = exp(-(omega*((double)(a_phi_p))))* exp(-(((double)((a_r_p)*(a_r_p)))/(alpha*alpha)))*exp(-((((double)(a_phi_p)*(a_phi_p)))/(beta*beta)));
+ preprocessing_exp_values[phi][r][frequNr-1] = temp;
+ temp = exp(-(omega*((double)(a_phi_n))))* exp(-(((double)((a_r_n)*(a_r_n)))/(alpha*alpha)))*exp(-((((double)(a_phi_n)*(a_phi_n)))/(beta*beta)));
+ preprocessing_exp_values[257 + phi][129 + r][frequNr-1] = temp;
+ temp = exp(-(omega*((double)(a_phi_p))))* exp(-(((double)((a_r_n)*(a_r_n)))/(alpha*alpha)))*exp(-((((double)(a_phi_p)*(a_phi_p)))/(beta*beta)));
+ preprocessing_exp_values[phi][129 + r][frequNr-1] = temp;
+ temp = exp(-(omega*((double)(a_phi_n))))* exp(-(((double)((a_r_p)*(a_r_p)))/(alpha*alpha)))*exp(-((((double)(a_phi_n)*(a_phi_n)))/(beta*beta)));
+ preprocessing_exp_values[257 + phi][r][frequNr-1] = temp;
+ }
+ }
+}
+
+/**
+ * Applies a gabor filter to the coordinates (r0, phi0) of the normalized iris.
+ *
+ * @param r0 radial polar coordinate.
+ * @param phi0 angular polar coordinate.
+ * @param i index of the current bit.
+ * @param frequNr number of frequence used
+ *
+ * @return bit-coded quantification of the filter output.
+ */
+int IrisCode::gaborFilter(int r0, int phi0, int i, int frequNr)
+{
+ std::complex <double> result(0,0);
+ std::complex <double> result_unvalid(0,0);
+ int c = 0;
+
+ if(normalization[phi0][r0] == 0)
+ return Quantisierung(result,i,true);
+
+ for(int r1 = r0 - 8; r1 < r0 + 8 ; r1++)
+ {
+ for(int phi1 = 0; phi1 < resolutionPhi; phi1++)
+ {
+ if((r1 >= 0) && (r1 < resolutionR))
+ {
+ int phi_value = 0;
+ int _case = 0;
+ int r_value = 0;
+ std::complex <double> temp(0,0);
+ std::complex <double> I(normalization[phi1][r1],0);
+ double com_r = (double)r1/resolutionR;
+
+
+ if(abs(phi0 - phi1) > 256)
+ {
+ phi_value = resolutionPhi - abs(phi0 - phi1);
+ _case = 1; //\xFCber Rand
+ }
+ else
+ {
+ phi_value = abs(phi0 - phi1);
+ _case = 0; // nicht \xFCber rand
+ }
+
+ if((phi0 - phi1) >=0 && _case == 1)
+ phi_value = 257 + (phi_value);
+ else if((phi0 - phi1) < 0 && _case == 0)
+ phi_value = 257 + phi_value;
+
+ if((r0 - r1) >=0)
+ r_value = r0 - r1;
+ else
+ r_value = 129 + abs(r0 - r1);
+
+ temp = preprocessing_exp_values[phi_value][r_value][frequNr-1] * com_r;
+
+ //if invalid area (grayvalue = 0) will influence the iriscode, set fail = true
+ if(I.real() == 0) //if invalid area
+ {
+ result_unvalid += temp * (double)AVG_GRAYVALUE;
+ }//else
+ temp = I * temp;
+
+ result += temp;
+ }
+ }
+ }
+
+ double real_temp = result_unvalid.real();
+ double imag_temp = result_unvalid.imag();
+
+ double real_result = result.real();
+ double imag_result = result.imag();
+
+
+ if((real_result) < 0 && ((real_result + (real_temp)) >= 0))
+ return Quantisierung(result,i,true); //fail = true
+ if((imag_result) < 0 && ((imag_result + (imag_temp)) >= 0))
+ return Quantisierung(result,i,true); //fail = true
+
+ if((real_result) >= 0 && ((real_result + (real_temp)) < 0))
+ return Quantisierung(result,i,true); //fail = true
+ if((imag_result) >=0 && ((imag_result + (imag_temp)) < 0))
+ return Quantisierung(result,i,true); //fail = true
+
+ return Quantisierung(result,i,false);
+}
+
+/**
+ * Generates the iriscode for the normalized iris.
+ */
+void IrisCode::newBuildIrisCode()
+{
+ int valid = 0;
+ int unvalid = 0;
+ double k = 4;
+ double beta = 30;
+
+ int i = 0;
+
+ //preprocessing
+ //frequence 1
+ std::cout << "\n Start preprocessing frequences";
+ gaborFilter_preprocessing(1, k/1,beta, 1);
+ gaborFilter_preprocessing(2, k/2,beta, 2);
+ gaborFilter_preprocessing(3, k/3,beta, 3);
+ gaborFilter_preprocessing(4, k/4,beta, 4);
+ gaborFilter_preprocessing(5, k/5,beta, 5);
+ gaborFilter_preprocessing(6, k/6,beta, 6);
+ gaborFilter_preprocessing(7, k/7,beta, 7);
+ gaborFilter_preprocessing(8, k/8,beta, 8);
+ std::cout << "\n End of preprocessing frequences";
+
+ //end preprocessing
+
+
+
+ for(int phi = 16; phi < resolutionPhi; phi+=32)
+ {
+ int s = 8;
+
+ for(int r = 8; r < resolutionR; r+=s)
+ {
+
+ if(gaborFilter(r,phi,i,1) == 4)//1
+ unvalid+=2;
+ else
+ valid+=2;
+ i++;
+
+ if(gaborFilter(r,phi,i,2) == 4)//1
+ unvalid+=2;
+ else
+ valid+=2;
+ i++;
+
+
+ if(gaborFilter(r,phi,i,3) == 4)//1
+ unvalid+=2;
+ else
+ valid+=2;
+ i++;
+
+
+ if(gaborFilter(r,phi,i,4) == 4)//1
+ unvalid+=2;
+ else
+ valid+=2;
+ i++;
+
+ if(gaborFilter(r,phi,i,5) == 4)//1
+ unvalid+=2;
+ else
+ valid+=2;
+ i++;
+
+ if(gaborFilter(r,phi,i,6) == 4)//1
+ unvalid+=2;
+ else
+ valid+=2;
+ i++;
+
+ if(gaborFilter(r,phi,i,7) == 4)//1
+ unvalid+=2;
+ else
+ valid+=2;
+ i++;
+
+ if(gaborFilter(r,phi,i,8) == 4)//1
+ unvalid+=2;
+ else
+ valid+=2;
+ i++;
+
+ s+=2;
+
+
+ }
+ }
+ std::cout << "\nResult : \nValid Bits = ";
+ std::cout << valid;
+ std::cout << "\nUnvalid Bits = ";
+ std::cout << unvalid;
+}
+/**
+ * Returns the radius of the iris for the angle phi.
+ *
+ * @param phi angle in radian measure.
+ * @param bestRRight the calculated radius of the right half of the iris.
+ * @param bestRLeft the calculated radius of the left half of the iris.
+ *
+ * @return the radius of the iris for the angle phi.
+ */
+double IrisCode::bestIrisR(double phi,double bestRRight, double bestRLeft)
+{
+ if(phi > 0.5*M_PI && phi <= 1.5*M_PI)
+ return bestRLeft;
+ else
+ return bestRRight;
+}
+/**
+ * Calculates the x-coordinate for the pixel defined by radius r and angle phi.
+ *
+ * @param r radius in pixels.
+ * @param phi angle in radian measure.
+ * @param bestR radius of the pupil.
+ * @param bestRLeft radius of the left half of the iris.
+ * @param bestRRight radius of the right half of the iris.
+ * @param bestX x-Coordinate of the pupil.
+ *
+ * @return x-coordinate for the pixel defined by radius r and angle phi.
+ */
+double IrisCode::x_r_phi(double r, double phi, double bestR, double bestRLeft, double bestRRight, double bestX)
+{
+ double xp;
+ double xi;
+
+ if( phi > 1.5*M_PI || phi < 0.5*M_PI)
+ {
+ xp = bestX + sqrt(bestR*bestR - (bestR * sin(phi))*(bestR * sin(phi)));
+ xi = bestX + sqrt(bestRRight*bestRRight - (bestRRight * sin(phi))*(bestRRight * sin(phi)));
+ }
+ else //if(phi < 1.5*M_PI || phi >= 0.5*M_PI)
+ {
+ xp = bestX - sqrt(bestR*bestR - (bestR * sin(phi))*(bestR * sin(phi)));
+ xi = bestX - sqrt(bestRLeft*bestRLeft - (bestRLeft * sin(phi))*(bestRLeft * sin(phi)));
+ }
+ double x = (1 - r)*xp + r*xi;
+ return x;
+}
+/**
+ * Calculates the y-coordinate for the pixel defined by radius r and angle phi.
+ *
+ * @param r radius in pixels.
+ * @param phi angle in radian measure.
+ * @param bestR radius of the pupil.
+ * @param bestRLeft radius of the left half of the iris.
+ * @param bestRRight radius of the right half of the iris.
+ * @param bestY y-Coordinate of the pupil.
+ *
+ * @return y-coordinate for the pixel defined by radius r and angle phi.
+ */
+double IrisCode::y_r_phi(double r, double phi, double bestR, double bestRLeft, double bestRRight, double bestY)
+{
+ double yp;
+ double yi;
+ double IrisRadius = bestIrisR(phi, bestRRight, bestRLeft);
+
+ if( true ) // phi < M_PI)
+ {
+ yp = bestY + bestR * sin(phi);
+ yi = bestY + IrisRadius * sin(phi);
+ }
+ else
+ {
+ yp = bestY - bestR * sin(phi);
+ yi = bestY - IrisRadius * sin(phi);
+ }
+ double y = (1 - r)*yp + r*yi;
+ return y;
+}
+/**
+ * Calculates the angle of the straight line across the center of pupil and the coordinates (x, y).
+ *
+ * @param bestX x-coordinate of the pupil.
+ * @param bestY y-coordinate of the pupil.
+ * @param x an x-coordinate.
+ * @param y an y-coordinate.
+ * @param bestR radius of the pupil.
+ *
+ * @return angle of the straight line across the center of pupil and the coordinates (x, y).
+ */
+double IrisCode::Phi(int bestX, int bestY, int x, int y, int bestR)
+{
+ double a;
+ double b;
+ double c;
+ double phi;
+
+
+ a = fabs(double(x-bestX));
+ b = fabs(double(y-bestY));
+ c = sqrt(double(a*a + b*b));
+
+ phi = acos((a*a + c*c - b*b)/(2*a*c));
+ //phi = phi * (180 / M_PI);
+ //r = c - bestR;
+
+ return phi;
+}
+/**
+ * Calculates the normalized distance between the outer boundary of the pupil and the coordinates (x, y).
+ *
+ * @param bestX x-coordinate of the pupil.
+ * @param bestY y-coordinate of the pupil.
+ * @param x an x-coordinate.
+ * @param y an y-coordinate.
+ * @param bestR radius of the pupil.
+ * @param bestROut radius of the iris.
+ *
+ * @return normalized distance between the outer boundary of the pupil and the coordinates (x, y).
+ */
+double IrisCode::R(int bestX, int bestY, int x, int y, int bestR, int bestROut)
+{
+ double a;
+ double b;
+ double c;
+ double phi;
+ double r;
+
+ a = fabs(double(x-bestX));
+ b = fabs(double(y-bestY));
+ c = sqrt(double(a*a + b*b));
+
+ phi = acos((a*a + c*c - b*b)/(2*a*c));
+ //phi = phi * (180 / M_PI);
+ r = (c - bestR)/(bestROut - bestR);
+
+ return r;
+}
+/**
+ * Calculates if coordinates (x, y) lie in the circle defined by the coordinates (x0, y0) and the radius r.
+ *
+ * @param r radius in pixels.
+ * @param x an x-coordinate.
+ * @param y an y-coordinate.
+ * @param x0 x-coordinate of the center of circle.
+ * @param y0 y-coordinate of the center of circle.
+ *
+ * @return 'true' if the coordinates are in the circle, else 'false'.
+ */
+bool IrisCode::isInCircle(int r, int x, int y, int x0, int y0)
+{
+ double a;
+ double b;
+ double c;
+
+ a = fabs(double(x-x0));
+ b = fabs(double(y-y0));
+ c = sqrt(double(a*a + b*b));
+
+ if(c < r)
+ return true;
+ else
+ return false;
+}
+
+
+
+double IrisCode::bresenhamEliptic(int x0, int y0, int a, int b)
+{
+ int sum = 0;
+ int pixels = 4;
+
+ int a2 = a * a;
+ int b2 = b * b;
+
+ int x = 0;
+ int y = b;
+
+ int s = a2*(1-2*b) + 2 *b2;
+ int t = b2 - 2*a2*(2*b-1);
+
+ sum += rgbValues[x0 + x][y0 + y]; rgbValues[x0 + x][y0 + y]= (255,255,255);
+ sum += rgbValues[x0 - x][y0 + y]; rgbValues[x0 - x][y0 + y]= (255,255,255);
+ sum += rgbValues[x0 - x][y0 - y]; rgbValues[x0 - x][y0 - y]= (255,255,255);
+ sum += rgbValues[x0 + x][y0 - y]; rgbValues[x0 + x][y0 - y]= (255,255,255);
+
+ while(!(y==0))
+ {
+
+ if(s<0)
+ {
+ s = s+2*b2*(2*x+3);
+ t = t+4*b2*(x+1);
+ x++;
+ }
+ else
+ {
+ if(t<0)
+ {
+ s = s + 2*b2*(2*x+3)-4*a2*(y-1);
+ t = t + 4*b2*(x+1)-2*a2*(2*y-3);
+ x++;
+ y--;
+ }
+ else
+ {
+ s = s-4*a2*(y-1);
+ t = t-2*a2*(2*y-3);
+ y--;
+ }
+ }
+ sum += rgbValues[x0 + x][y0 + y]; rgbValues[x0 + x][y0 + y]= (255,255,255);
+ sum += rgbValues[x0 - x][y0 + y]; rgbValues[x0 - x][y0 + y]= (255,255,255);
+ sum += rgbValues[x0 - x][y0 - y]; rgbValues[x0 - x][y0 - y]= (255,255,255);
+ sum += rgbValues[x0 + x][y0 - y]; rgbValues[x0 + x][y0 - y]= (255,255,255);
+ pixels+=4;
+ }
+ return double(sum) / pixels;
+}
+/**
+ * Sets the pixels of the left half of the circle, defined by center (x0, y0) and radius R to white. Image ist stored in the array rgbValuesOut.
+ *
+ * @param R radius of the circle.
+ * @param x0 x-coordinate of the circle center.
+ * @param y0 y-coordinate of the circle center
+ */
+void IrisCode::drawBresenhamIrisLeft(int R, int x0, int y0)
+{
+ int F = 1-R;
+ int ddF_x = 0;
+ int ddF_y = -2 * R;
+ int x = 0;
+ int y = R;
+
+ rgbValuesOut[x0][y0+R] = (255,255,255);
+ rgbValuesOut[x0][y0-R]= (255,255,255);
+ //rgbValues[x0+R][y0]= (255,255,255);
+ rgbValuesOut[x0-R][y0]= (255,255,255);
+
+ while(x<y)
+ {
+ if(F>=0)
+ {
+ y--;
+ ddF_y += 2;
+ F+= ddF_y;
+ }
+ x++;
+ ddF_x += 2;
+ F += ddF_x + 1;
+
+ //rgbValues[x0 + x][y0 + y]= (255,255,255);
+ rgbValuesOut[x0 - x][y0 + y]= (255,255,255);
+ //rgbValues[x0 + x][y0 - y]= (255,255,255);
+ rgbValuesOut[x0 - x][y0 - y]= (255,255,255);
+ //rgbValues[x0 + y][y0 + x]= (255,255,255);
+ rgbValuesOut[x0 - y][y0 + x]= (255,255,255);
+ //rgbValues[x0 + y][y0 - x]= (255,255,255);
+ rgbValuesOut[x0 - y][y0 - x]= (255,255,255);
+
+ }
+
+}
+/**
+ * Sets the pixels of the right half of the circle, defined by center (x0, y0) and radius R to white. Image ist stored in the array rgbValuesOut.
+ *
+ * @param R radius of the circle.
+ * @param x0 x-coordinate of the circle center.
+ * @param y0 y-coordinate of the circle center
+ */
+void IrisCode::drawBresenhamIrisRight(int R, int x0, int y0)
+{
+ int F = 1-R;
+ int ddF_x = 0;
+ int ddF_y = -2 * R;
+ int x = 0;
+ int y = R;
+
+ rgbValuesOut[x0][y0+R] = (255,255,255);
+ rgbValuesOut[x0][y0-R]= (255,255,255);
+ rgbValuesOut[x0+R][y0]= (255,255,255);
+ //rgbValues[x0-R][y0]= (255,255,255);
+
+ while(x<y)
+ {
+ if(F>=0)
+ {
+ y--;
+ ddF_y += 2;
+ F+= ddF_y;
+ }
+ x++;
+ ddF_x += 2;
+ F += ddF_x + 1;
+
+ rgbValuesOut[x0 + x][y0 + y]= (255,255,255);
+ //rgbValues[x0 - x][y0 + y]= (255,255,255);
+ rgbValuesOut[x0 + x][y0 - y]= (255,255,255);
+ //rgbValues[x0 - x][y0 - y]= (255,255,255);
+ rgbValuesOut[x0 + y][y0 + x]= (255,255,255);
+ //rgbValues[x0 - y][y0 + x]= (255,255,255);
+ rgbValuesOut[x0 + y][y0 - x]= (255,255,255);
+ //rgbValues[x0 - y][y0 - x]= (255,255,255);
+
+ }
+
+}
+
+double IrisCode::bresenhamIrisRight(int R, int x0, int y0)
+{
+ int sum = 0;
+ int F = 1-R;
+ int pixels = 0;
+ int ddF_x = 0;
+ int ddF_y = -2 * R;
+ int x = 0;
+ int y = R;
+ int startX = x0 ;//+ R;
+ int startY = y0 + (int)(R * sin(0.125 * M_PI));
+ int endY = y0 - (int)(R * sin(0.0 * M_PI));
+
+ if((x0) >= startX && (y0+R) <= startY && (y0+R) >= endY)
+ {sum += rgbValues[x0][y0+R]; pixels++;}
+ if((x0) >= startX && (y0-R) <= startY && (y0-R) >= endY)
+ {sum += rgbValues[x0][y0-R]; pixels++;}
+ if((x0+R) >= startX && (y0) <= startY && (y0) >= endY)
+ {sum += rgbValues[x0+R][y0]; pixels++;}
+ if((x0-R) >= startX && (y0) <= startY && (y0) >= endY)
+ {sum += rgbValues[x0-R][y0]; pixels++;}
+
+ while(x<y)
+ {
+ if(F>=0)
+ {
+ y--;
+ ddF_y += 2;
+ F+= ddF_y;
+ }
+ x++;
+ ddF_x += 2;
+ F += ddF_x + 1;
+
+ if((x0+x) >= startX && (y0+y) <= startY && (y0+y) >= endY)
+ {sum+= rgbValues[x0 + x][y0 + y]; pixels++;}
+ if((x0-x) >= startX && (y0+y) <= startY && (y0+y) >= endY)
+ {sum+= rgbValues[x0 - x][y0 + y]; pixels++;}
+ if((x0+x) >= startX && (y0-y) <= startY && (y0-y) >= endY)
+ {sum+= rgbValues[x0 + x][y0 - y]; pixels++;}
+ if((x0-x) >= startX && (y0-y) <= startY && (y0-y) >= endY)
+ {sum+= rgbValues[x0 - x][y0 - y]; pixels++;}
+ if((x0+y) >= startX && (y0+x) <= startY && (y0+x) >= endY)
+ {sum+= rgbValues[x0 + y][y0 + x]; pixels++;}
+ if((x0-y) >= startX && (y0+x) <= startY && (y0+x) >= endY)
+ {sum+= rgbValues[x0 - y][y0 + x]; pixels++;}
+ if((x0+y) >= startX && (y0-x) <= startY && (y0-x) >= endY)
+ {sum+= rgbValues[x0 + y][y0 - x]; pixels++;}
+ if((x0-y) >= startX && (y0-x) <= startY && (y0-x) >= endY)
+ {sum+= rgbValues[x0 - y][y0 - x]; pixels++;}
+
+ }
+ return (double)sum / pixels;
+}
+
+
+double IrisCode::bresenhamIrisLeft(int R, int x0, int y0)
+{
+ int sum = 0;
+ int F = 1-R;
+ int pixels = 0;
+ int ddF_x = 0;
+ int ddF_y = -2 * R;
+ int x = 0;
+ int y = R;
+ int startX = x0 ;//- R;
+ int startY = y0 + (int)(R * sin(0.125 * M_PI));
+ int endY = y0 - (int)(R * sin(0.0 * M_PI));
+
+ if((x0) <= startX && (y0+R) <= startY && (y0+R) >= endY)
+ {sum += rgbValues[x0][y0+R]; pixels++;}
+ if((x0) <= startX && (y0-R) <= startY && (y0-R) >= endY)
+ {sum += rgbValues[x0][y0-R]; pixels++;}
+ if((x0+R) <= startX && (y0) <= startY && (y0) >= endY)
+ {sum += rgbValues[x0+R][y0]; pixels++;}
+ if((x0-R) <= startX && (y0) <= startY && (y0) >= endY)
+ {sum += rgbValues[x0-R][y0]; pixels++;}
+
+ while(x<y)
+ {
+ if(F>=0)
+ {
+ y--;
+ ddF_y += 2;
+ F+= ddF_y;
+ }
+ x++;
+ ddF_x += 2;
+ F += ddF_x + 1;
+
+ if((x0+x) <= startX && (y0+y) <= startY && (y0+y) >= endY)
+ {sum+= rgbValues[x0 + x][y0 + y]; pixels++;}
+ if((x0-x) <= startX && (y0+y) <= startY && (y0+y) >= endY)
+ {sum+= rgbValues[x0 - x][y0 + y]; pixels++;}
+ if((x0+x) <= startX && (y0-y) <= startY && (y0-y) >= endY)
+ {sum+= rgbValues[x0 + x][y0 - y]; pixels++;}
+ if((x0-x) <= startX && (y0-y) <= startY && (y0-y) >= endY)
+ {sum+= rgbValues[x0 - x][y0 - y]; pixels++;}
+ if((x0+y) <= startX && (y0+x) <= startY && (y0+x) >= endY)
+ {sum+= rgbValues[x0 + y][y0 + x]; pixels++;}
+ if((x0-y) <= startX && (y0+x) <= startY && (y0+x) >= endY)
+ {sum+= rgbValues[x0 - y][y0 + x]; pixels++;}
+ if((x0+y) <= startX && (y0-x) <= startY && (y0-x) >= endY)
+ {sum+= rgbValues[x0 + y][y0 - x]; pixels++;}
+ if((x0-y) <= startX && (y0-x) <= startY && (y0-x) >= endY)
+ {sum+= rgbValues[x0 - y][y0 - x]; pixels++;}
+
+ }
+ return (double)sum / pixels;
+}
+
+
+double IrisCode::bresenhamPupil(int R, int x0, int y0)
+{
+ int sum = 0;
+ int F = 1-R;
+ int pixels = 4;
+ int ddF_x = 0;
+ int ddF_y = -2 * R;
+ int x = 0;
+ int y = R;
+
+ sum += rgbValues[x0][y0+R];
+ sum += rgbValues[x0][y0-R];
+ sum += rgbValues[x0+R][y0];
+ sum += rgbValues[x0-R][y0];
+
+ while(x<y)
+ {
+ if(F>=0)
+ {
+ y--;
+ ddF_y += 2;
+ F+= ddF_y;
+ }
+ x++;
+ ddF_x += 2;
+ F += ddF_x + 1;
+
+ sum+= rgbValues[x0 + x][y0 + y];
+ sum+= rgbValues[x0 - x][y0 + y];
+ sum+= rgbValues[x0 + x][y0 - y];
+ sum+= rgbValues[x0 - x][y0 - y];
+ sum+= rgbValues[x0 + y][y0 + x];
+ sum+= rgbValues[x0 - y][y0 + x];
+ sum+= rgbValues[x0 + y][y0 - x];
+ sum+= rgbValues[x0 - y][y0 - x];
+
+ pixels += 8;
+ }
+ return (double)sum / pixels;
+}
+/**
+ * Sets the pixels of the circle, defined by center (x0, y0) and radius R to white. Image ist stored in the array rgbValuesOut.
+ *
+ * @param R radius of the circle.
+ * @param x0 x-coordinate of the circle center.
+ * @param y0 y-coordinate of the circle center
+ */
+void IrisCode::drawBresenham(int R, int x0, int y0)
+{
+ int F = 1-R;
+ int ddF_x = 0;
+ int ddF_y = -2 * R;
+ int x = 0;
+ int y = R;
+
+ rgbValuesOut[x0][y0+R] = (255,255,255);
+ rgbValuesOut[x0][y0-R]= (255,255,255);
+ rgbValuesOut[x0+R][y0]= (255,255,255);
+ rgbValuesOut[x0-R][y0]= (255,255,255);
+
+ while(x<y)
+ {
+ if(F>=0)
+ {
+ y--;
+ ddF_y += 2;
+ F+= ddF_y;
+ }
+ x++;
+ ddF_x += 2;
+ F += ddF_x + 1;
+
+ rgbValuesOut[x0 + x][y0 + y]= (255,255,255);
+ rgbValuesOut[x0 - x][y0 + y]= (255,255,255);
+ rgbValuesOut[x0 + x][y0 - y]= (255,255,255);
+ rgbValuesOut[x0 - x][y0 - y]= (255,255,255);
+ rgbValuesOut[x0 + y][y0 + x]= (255,255,255);
+ rgbValuesOut[x0 - y][y0 + x]= (255,255,255);
+ rgbValuesOut[x0 + y][y0 - x]= (255,255,255);
+ rgbValuesOut[x0 - y][y0 - x]= (255,255,255);
+
+ }
+
+}
+/**
+ * Determines the coordinates of the center of the pupil and the radius of the pupil.
+ * Saves the values to bestX, bestY and bestR.
+ */
+void IrisCode::findPupil()
+{
+ int r = 0; //initial value for r
+ double AVG_old = 0;
+ double AVG1 = 0;
+ double AVG2 = 0;
+ bool test = false;
+ double maxAVG = 0;
+ double bestP = 0;
+
+ std::cout << "BestPupilAreaX=" << bestPupilAreaX;
+ std::cout << "\nBestPupilAreaY=" << bestPupilAreaY;
+
+ for(int x = bestPupilAreaX - 50; x < (bestPupilAreaX + 50); x++)
+ {
+ //std::cout << x << " ";
+
+ for(int y = bestPupilAreaY - 50;y < bestPupilAreaY + 50; y++)
+ {
+ r = 20;
+ AVG_old = 0;
+
+ //boundingtest
+ if((x + r >= img.width()- 20) || (y + r >=img.height()-20) || (x - r < 20) || (y - r < 20))
+ test = false;
+ else
+ test = true;
+ //end of boundingtest
+
+ while(test)
+ {
+ double AVG_new = bresenhamPupil(r,x,y);
+
+ if(r > 20)
+ {
+ //if(AVG_old == 0)
+ // AVG_old = 0.0001;
+ double P = AVG_new - AVG_old;
+ //double P = AVG_new / AVG_old;
+
+ if(AVG_new > maxAVG)
+ maxAVG = AVG_new;
+
+
+ if(P > bestP)
+ {
+ bestX = x;
+ bestY = y;
+ bestR = r;
+ bestP = P;
+ AVG1 = AVG_new;
+ AVG2 = AVG_old;
+ //std::cout << "\nSteigung um " << P;
+
+ }
+ }
+ AVG_old = AVG_new;
+ r+=5;
+ //boundingtest
+ if((x + r >= img.width()- 20) || (y + r >=img.height()-20) || (x - r < 20) || (y - r < 20) || r > 80)
+ test = false;
+ else
+ test = true;
+ //end of boundingtest
+ }
+ }
+ }
+ bestR *= 1.05;
+}
+
+
+/**
+ * Determines radius of left half of the iris.
+ * Saves the value to bestRLeft.
+ */
+void IrisCode::findOuterBoundaryLeft()
+{
+ double AVG_old = 0;
+ double AVG1 = 0;
+ double AVG2 = 0;
+ double maxAVG = 0;
+ double bestP = 0;
+
+ AVG_old = bresenhamIrisLeft((int)(1.5*bestR),bestX,bestY);
+
+ for(int r = (int)(1.5*bestR); r<(int)(3.3*bestR); r++)
+ {
+ double AVG_new = bresenhamIrisLeft(r,bestX,bestY);
+ double P = AVG_new - AVG_old; //
+ if(AVG_new > maxAVG)
+ maxAVG = AVG_new;
+ if(P > bestP)
+ {
+ bestRLeft = r;
+ bestP = P;
+ }
+ AVG_old = AVG_new;
+ if( (bestX - (r+1)) <= 0 || (bestY - (r+1)) <= 0 || (bestY + (r+1)) >= img.height() )r = (int)(3.3*bestR);
+ }
+
+ bestRLeft *= 0.9;
+
+}
+void IrisCode::findEdgeLeft()
+{
+ int range = 270; //?
+ int x1 = bestX - range;
+ int y1;
+ int x2 = bestX;
+ int y2 = bestY;
+ int dx = x2 - x1;
+ int dy;
+ int currX;
+ int currY;
+ int currGrd;
+ int currGray;
+ int maxGrd;
+ int maxX;
+ int maxY;
+ double error = dx/2;
+
+ for(y1 = bestY - (int)(2*bestR); y1 <= bestY + (int)(2*bestR); y1++)
+ {
+
+
+ dy = abs(y1 - y2);
+ currX = x1;
+ currY = y1;
+ maxX = currX;
+ maxY = currY;
+ currGray = rgbValues[currX][currY];
+ maxGrd = 0;
+ //rgbValuesOut[currX][currY]= (255,255,255);
+ while(currX < x2)
+ {
+ currX++;
+ if(y1 > y2)
+ {
+ error = error + dy;
+ if(error >= 0)
+ {
+ currY--;
+ error = error - dx;
+ }
+ }
+ else if(y1 < y2)
+ {
+ error = error - dy;
+ if(error <= 0)
+ {
+ currY++;
+ error = error + dx;
+ }
+ }
+ else;
+
+ if(currX < bestX - bestRLeft - 20)
+ {
+ //rgbValuesOut[currX][currY]= (255,255,255);
+ currGrd = abs(currGray - rgbValues[currX][currY]);
+ if(currGrd > maxGrd)
+ {
+ maxGrd = currGrd;
+ maxX = currX;
+ maxY = currY;
+ }
+ }
+ }
+ rgbValuesOut[maxX][maxY]= (255,255,255);
+ //betrachte Linie von (bestX, bestY) nach (bestX - range, y1)
+
+ //starte an Punkt der Linie, der mehr als der linke Irisradius von der Pupille entfernt ist
+
+ //getGrauwert
+
+ //vergleiche mit n\xE4chstem Grauwert
+ }
+}
+/**
+ * Determines radius of right half of the iris.
+ * Saves the value to bestRRight.
+ */
+void IrisCode::findOuterBoundaryRight()
+{
+ double AVG_old = 0;
+ double AVG1 = 0;
+ double AVG2 = 0;
+ double maxAVG = 0;
+ double bestP = 0;
+
+
+ AVG_old = bresenhamIrisRight((int)(1.5*bestR),bestX,bestY);
+
+
+ for(int r = (int)(1.5*bestR); r<(int)(4.0*bestR); r++)
+ {
+ double AVG_new = bresenhamIrisRight(r,bestX,bestY);
+ double P = AVG_new - AVG_old;
+ if(AVG_new > maxAVG)
+ maxAVG = AVG_new;
+ if(P > bestP)
+ {
+ bestRRight = r;
+ bestP = P;
+ }
+ AVG_old = AVG_new;
+ if( (bestX - (r+1)) <= 0 || (bestY - (r+1)) <= 0 || (bestY + (r+1)) >= img.height() )r = (int)(4.0*bestR);
+ }
+
+ bestRRight *= 0.9;
+}
+
+/**
+ * Draws the determined circles of pupil, left and right iris boundaries to the image Iris.bmp.
+ */
+void IrisCode::drawIrisBoundaries()
+{
+ if (bestRLeft > bestRRight)
+ bestRLeft = bestRRight;
+ else
+ bestRRight = bestRLeft;
+
+ //out = 255;
+ drawBresenham(bestR, bestX, bestY) ;
+
+ drawBresenhamIrisRight(bestRRight, bestX, bestY) ;
+
+ drawBresenhamIrisLeft(bestRLeft, bestX, bestY);
+
+}
+/**
+ * Transforms the localized iris into a normalized representation (pseudo-polar coordinates).
+ * Saves the image of the normalized Iris to Normalization.bmp.
+ */
+void IrisCode::normalizeIris()
+{
+ double normR;
+ double normPhi;
+ int x;
+ int y;
+
+ if (bestRLeft > bestRRight)
+ bestRLeft = bestRRight;
+ else
+ bestRRight = bestRLeft;
+
+
+ vigra::BImage out(resolutionPhi, resolutionR);
+ out = 255;
+
+ for(int phi = 0; phi < resolutionPhi; phi++)
+ {
+ for(int r = 0; r < resolutionR; r++)
+ {
+ normR = (double)r/resolutionR;
+ normPhi = ((double)phi/resolutionPhi)*2*M_PI;
+ x = (int)x_r_phi(normR, normPhi, bestR, bestRLeft, bestRRight, bestX);
+ y = (int)y_r_phi(normR, normPhi, bestR, bestRLeft, bestRRight, bestY);
+
+ out(phi, r) = rgbValues [x][y];
+ normalization[phi][r] = rgbValues[x][y];
+ /*if(normalizedMask[phi][r] == 0)
+ {
+ normalization[phi][r] = 0;
+ out(phi, r) = 0;
+ }*/
+ }
+ }
+ //exportImage(srcImageRange(out), vigra::ImageExportInfo("Normalization.bmp"));
+}
+/**
+ * Deletes artifacts in nomalisation
+ */
+void IrisCode::deleteArtefactsinNormalisation()
+{
+
+
+ for(int r = 0; r < resolutionR; r++)
+ {
+ int avg, sum = 0, c = 0;
+
+ for(int phi = 0; phi < resolutionPhi; phi++)
+ {
+ if(!(normalization[phi][r]==0))
+ sum+=normalization[phi][r];
+ else
+ c++;
+ }
+ avg = (int) sum / (resolutionPhi - c);
+
+ for(int phi = 0; phi < resolutionPhi; phi++)
+ {
+ if(normalization[phi][r] > (avg + 45) || normalization[phi][r] < (avg - 45))//240
+ {
+ normalization[phi][r] = 0;
+ }
+
+ }
+
+ }
+
+ for(int phi = 0; phi < resolutionPhi; phi++)
+ {
+ int avg, sum = 0, c = 0;
+
+ for(int r = 0; r < resolutionR; r++)
+ {
+ if(!(normalization[phi][r]==0))
+ sum+=normalization[phi][r];
+ else
+ c++;
+ }
+ avg = (int) sum / (resolutionR - c);
+
+ for(int r = 0; r < resolutionR; r++)
+ {
+ if(normalization[phi][r] > (avg + 40) || normalization[phi][r] < (avg - 40))//240
+ {
+ normalization[phi][r] = 0;
+ }
+
+ }
+
+ }
+
+
+}
+
+
+
+
+
+/**
+ * Draws a graphical representation of the derived iriscode and saves it to IrisCode.bmp.
+ */
+
+
+
+void IrisCode::drawNormalisation()
+{
+
+ vigra::BImage out(resolutionPhi, resolutionR);
+ out = 255;
+ int sum = 0;
+ int c = 0;
+
+ for(int phi = 0; phi < resolutionPhi; phi++)
+ {
+ for(int r = 0; r < resolutionR; r++)
+ {
+ if(normalization[phi][r] == 0)
+ c++;
+ sum += normalization[phi][r];
+ out(phi, r) = normalization[phi][r];
+ }
+ }
+
+ AVG_GRAYVALUE = sum / (resolutionPhi * resolutionR - c);
+ //std::cout << "\nAverage Gray Value = ";
+ //std::cout << AVG_GRAYVALUE;
+ //std::cout << "\n";
+
+ //char file[1024];
+ //::strcpy(file,imageName);
+ //::strcat(file,imageName);
+
+ //exportImage(srcImageRange(out), vigra::ImageExportInfo(imageName));
+ //exportImage(srcImageRange(out), vigra::ImageExportInfo(::strcat(file,"_Norm.jpg\0")));
+}
+
+
+
+/**
+ * Draws a graphical representation of the derived iriscode and saves it to IrisCode.bmp.
+ */
+void IrisCode::drawIrisCode()
+{
+ int i = 0;
+
+
+
+ int w = 2 * resolutionR ;
+ int h = 2 * 16;
+ int b;
+
+ vigra::BImage out(w, h);
+
+ for(int x = 0; x < h-1; x+=2)
+ {
+ for(int y = 0; y < w-1 ; y+=2)
+ {
+ if(irisCode[i] == 0)
+ b = 0;
+ else
+ b = 255 ;
+
+ out(y, x) = b;
+ out(y, x + 1) = b;
+ out(y + 1, x) = b;
+ out(y + 1, x + 1) = b;
+ i++;
+ }
+ }
+ exportImage(srcImageRange(out), vigra::ImageExportInfo("IrisCode.bmp"));
+
+}
+
+/**
+ * Command line output of the iriscode.
+ */
+void IrisCode::printIrisCode()
+{
+
+ std::cout << "IrisCode = ";
+ for(int i = 0; i<2048;i++)
+ std::cout << " " << irisCode[i];
+
+}
+/**
+ * Transforms the current content of rgbValuesOut to an image and saves it to Iris.bmp.
+ */
+void IrisCode::generateImage()
+{
+ vigra::BImage out(img.width(),img.height());
+ for(int i = 0; i<out.width(); i++)
+ for(int j = 0;j<out.height(); j++)
+ out(i,j) = rgbValuesOut[i][j];
+ //char file[1024];
+ //::strcpy(file,imageName);
+ //::strcat(file,"_.jpg\0");
+
+ //exportImage(srcImageRange(out), vigra::ImageExportInfo(::strcat(file,"_.jpg\0")));
+
+ //exportImage(srcImageRange(out), vigra::ImageExportInfo("Iris.bmp"));
+}
+
+double IrisCode::bresenhamElipticAngleDOWN(int x0, int y0, int a, int b, double angle) //unten
+{
+ double ixa = 0; double iya = 0;
+ double ixb = 0;double iyb = 0;
+ double ixa2 = 0;double iya2 = 0;
+ double ixb2 = 0;double iyb2 = 0;
+ double ixaya = 0;double ixbyb = 0;
+ double ila2 = 0;double ila4 = 0;
+ double ilb2 = 0; double ilb4 = 0;
+ double ia = 0; double ib = 0;
+ double ic = 0; double id = 0;
+ double idx = 0;double idy = 0;double isigma = 0;
+ double ixp1 = 0; double temp = 0;
+ int xflag = 0;
+ int ix = 0; int iy = 0; int iym1 = 0; int iyp1 = 0;
+ int pixels = 0; int sum = 0;
+
+ angle = angle * (M_PI/180.0);
+
+
+ if(angle < M_PI/2)
+ xflag = 1;
+ else if ((angle > M_PI/2) && (angle < M_PI))
+ {
+ temp = angle - M_PI/2;
+ angle = M_PI / 2 - temp;
+ xflag = -1;
+ }
+ else if((angle >= M_PI) && (angle < M_PI*1.5))
+ {
+ angle = angle - M_PI;
+ xflag = 1;
+ }
+ else if((angle >= M_PI*1.5) && (angle < M_PI*2))
+ {
+ angle = angle - M_PI;
+ temp = angle - M_PI / 2;
+ angle = M_PI/2 - temp;
+ xflag = -1;
+ }
+
+ ixa = ::cos(angle) * (double)a;
+ iya = ::sin(angle) * (double)a;
+ ixb = ::cos(angle + (M_PI/2.0))*(double)b;
+ iyb = ::sin(angle + (M_PI/2.0))*(double)b;
+
+ ixa2=ixa*ixa;
+ iya2=iya*iya;
+ ixb2=ixb*ixb;
+ iyb2=iyb*iyb;
+ ixaya=ixa*iya;
+ ixbyb=ixb*iyb;
+ ila2=ixa2+iya2;
+ ila4=ila2*ila2;
+ ilb2=ixb2+iyb2;
+ ilb4=ilb2*ilb2;
+ ia=ixa2*ilb4+ixb2*ila4;
+ ib=ixaya*ilb4+ixbyb*ila4;
+ ic=iya2*ilb4+iyb2*ila4;
+ id=ila4*ilb4;
+
+
+ if(iya <= ixa)
+ {
+ ix = -ixa; iy = -iya; idx = -(ib*ixa + ic*iya);
+ idy = ia * ixa + ib* iya;
+ while(idx <= 0)
+ {
+ if((x0 + ix*xflag <w) & (y0 + iy < h) & (x0 + ix*xflag >= 0) & (y0 + iy >=0))
+ {
+ pixels += 1;
+ sum += rgbValues[x0 + ix*xflag][y0 + iy]; //rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ //sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy++;
+ isigma = ia*ix*ix + 2 *ib * ix * iy + ic *iy * iy - id;
+ if(isigma < 0)
+ {
+ idx = idx - ib;
+ idy = idy + ia;
+ ix--;
+ }
+ idx = idx + ic;
+ idy = idy - ib;
+ }
+
+ while(idx <= idy)
+ {
+ if((x0 + ix*xflag <w) & (y0 + iy < h) & (x0 + ix*xflag >= 0) & (y0 + iy >=0))
+ {
+ pixels += 1;
+ sum += rgbValues[x0 + ix*xflag][y0 + iy]; //rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ //sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels >= 0.6 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy++;
+ ixp1 = ix + 1;
+ isigma = ia*ixp1*ixp1 + 2 *ib * ixp1 * iy + ic *iy * iy - id;
+ if(isigma >= 0)
+ {
+ idx = idx + ib;
+ idy = idy - ia;
+ ix = ixp1;
+ }
+ idx = idx + ic;
+ idy = idy - ib;
+ }
+
+ while(idy >= 0)
+ {
+ if((x0 + ix*xflag <w) & (y0 + iy < h) & (x0 + ix*xflag >= 0) & (y0 + iy >=0))
+ {
+ pixels += 1;
+ sum += rgbValues[x0 + ix*xflag][y0 + iy]; //rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ //sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ ix++;
+ isigma = ia*ix*ix + 2 *ib * ix * iy + ic *iy * iy - id;
+ if(isigma < 0)
+ {
+ idx = idx + ic;
+ idy = idy - ib;
+ iy++;
+ }
+ idx = idx + ib;
+ idy = idy - ia;
+ }
+
+
+
+ while(idy >= -idx)
+ {if((x0 + ix*xflag <w) & (y0 + iy < h) & (x0 + ix*xflag >= 0) & (y0 + iy >=0))
+ {
+ pixels += 1;
+ sum += rgbValues[x0 + ix*xflag][y0 + iy]; //rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ //sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ ix++;
+ iym1 = iy - 1;
+ isigma = ia*ix*ix + 2 *ib * ix * iym1 + ic *iym1 * iym1 - id;
+ if(isigma >= 0)
+ {
+ idx = idx -ic;
+ idy = idy + ib;
+ iy = iym1;
+ }
+ idx = idx + ib;
+ idy = idy - ia;
+ }
+
+ while(iy >= iya)
+ {
+ if((x0 + ix*xflag <w) & (y0 + iy < h) & (x0 + ix*xflag >= 0) & (y0 + iy >=0))
+ {
+ pixels += 1;
+ sum += rgbValues[x0 + ix*xflag][y0 + iy]; //rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ //sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy--;
+ isigma = ia*ix*ix + 2 *ib * ix * iy + ic *iy * iy - id;
+ if(isigma < 0)
+ {
+ idx = idx +ib;
+ idy = idy - ia;
+ ix++;
+ }
+ idx = idx - ic;
+ idy = idy + ib;
+ }
+ }
+ else
+ {
+ ix = -ixa; iy = -iya; idx = -(ib*ixa + ic*iya);
+ idy = ia * ixa + ib *iya;
+
+ while(-idx >= idy)
+ {
+ if((x0 + ix*xflag <w) & (y0 + iy < h) & (x0 + ix*xflag >= 0) & (y0 + iy >=0))
+ {
+ pixels += 1;
+ sum += rgbValues[x0 + ix*xflag][y0 + iy]; //rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ //sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ ix--;
+ iyp1 = iy + 1;
+ isigma = ia*ix*ix + 2 *ib * ix * iyp1 + ic *iyp1 * iyp1 - id;
+ if(isigma >= 0)
+ {
+ idx = idx + ic;
+ idy = idy - ib;
+ iy = iyp1;
+ }
+ idx = idx - ib;
+ idy = idy + ia;
+ }
+
+ while(idx <= 0)
+ {
+ if((x0 + ix*xflag <w) & (y0 + iy < h) & (x0 + ix*xflag >= 0) & (y0 + iy >=0))
+ {
+ pixels += 1;
+ sum += rgbValues[x0 + ix*xflag][y0 + iy]; //rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ //sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy++;
+ isigma = ia*ix*ix + 2 *ib * ix * iy + ic *iy * iy - id;
+ if(isigma < 0)
+ {
+ idx = idx - ib;
+ idy = idy + ia;
+ ix--;
+ }
+ idx = idx + ic;
+ idy = idy - ib;
+ }
+
+ while(idx <= idy)
+ {
+ if((x0 + ix*xflag <w) & (y0 + iy < h) & (x0 + ix*xflag >= 0) & (y0 + iy >=0))
+ {
+ pixels += 1;
+ sum += rgbValues[x0 + ix*xflag][y0 + iy]; //rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ //sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy++;
+ ixp1 = ix+1;
+ isigma = ia*ixp1*ixp1 + 2 *ib * ixp1 * iy + ic *iy * iy - id;
+ if(isigma >= 0)
+ {
+ idx = idx + ib;
+ idy = idy - ia;
+ ix = ixp1;
+ }
+ idx = idx + ic;
+ idy = idy - ib;
+ }
+
+
+
+ while(idy >= 0)
+ {
+ if((x0 + ix*xflag <w) & (y0 + iy < h) & (x0 + ix*xflag >= 0) & (y0 + iy >=0))
+ {
+ pixels += 1;
+ sum += rgbValues[x0 + ix*xflag][y0 + iy]; //rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ //sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ ix++;
+ //iym1 = iy - 1;
+ isigma = ia*ix*ix + 2 *ib * ix * iy + ic *iy * iy - id;
+ if(isigma < 0)
+ {
+ idx = idx +ic;
+ idy = idy - ib;
+ iy++;
+ }
+ idx = idx + ib;
+ idy = idy - ia;
+ }
+
+ while(ix <= ixa)
+ {
+
+ if((x0 + ix*xflag <w) & (y0 + iy < h) & (x0 + ix*xflag >= 0) & (y0 + iy >=0))
+ {
+ pixels += 1;
+ sum += rgbValues[x0 + ix*xflag][y0 + iy]; //rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ //sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ ix++;
+ iym1 = iy - 1;
+ isigma = ia*ix*ix + 2 *ib * ix * iym1 + ic *iym1 * iym1 - id;
+ if(isigma >= 0)
+ {
+ idx = idx - ic;
+ idy = idy + ib;
+ iy = iym1;
+ }
+ idx = idx + ib;
+ idy = idy - ia;
+ }
+
+
+
+
+
+ }
+
+
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+}
+
+double IrisCode::bresenhamElipticAngleUP(int x0, int y0, int a, int b, double angle) //draw oben
+{
+ double ixa = 0; double iya = 0;
+ double ixb = 0;double iyb = 0;
+ double ixa2 = 0;double iya2 = 0;
+ double ixb2 = 0;double iyb2 = 0;
+ double ixaya = 0;double ixbyb = 0;
+ double ila2 = 0;double ila4 = 0;
+ double ilb2 = 0; double ilb4 = 0;
+ double ia = 0; double ib = 0;
+ double ic = 0; double id = 0;
+ double idx = 0;double idy = 0;double isigma = 0;
+ double ixp1 = 0; double temp = 0;
+ int xflag = 0;
+ int ix = 0; int iy = 0; int iym1 = 0; int iyp1 = 0;
+ int pixels = 0; int sum = 0;
+
+ angle = angle * (M_PI/180.0);
+
+
+ if(angle < M_PI/2)
+ xflag = 1;
+ else if ((angle > M_PI/2) && (angle < M_PI))
+ {
+ temp = angle - M_PI/2;
+ angle = M_PI / 2 - temp;
+ xflag = -1;
+ }
+ else if((angle >= M_PI) && (angle < M_PI*1.5))
+ {
+ angle = angle - M_PI;
+ xflag = 1;
+ }
+ else if((angle >= M_PI*1.5) && (angle < M_PI*2))
+ {
+ angle = angle - M_PI;
+ temp = angle - M_PI / 2;
+ angle = M_PI/2 - temp;
+ xflag = -1;
+ }
+
+ ixa = ::cos(angle) * (double)a;
+ iya = ::sin(angle) * (double)a;
+ ixb = ::cos(angle + (M_PI/2.0))*(double)b;
+ iyb = ::sin(angle + (M_PI/2.0))*(double)b;
+
+ ixa2=ixa*ixa;
+ iya2=iya*iya;
+ ixb2=ixb*ixb;
+ iyb2=iyb*iyb;
+ ixaya=ixa*iya;
+ ixbyb=ixb*iyb;
+ ila2=ixa2+iya2;
+ ila4=ila2*ila2;
+ ilb2=ixb2+iyb2;
+ ilb4=ilb2*ilb2;
+ ia=ixa2*ilb4+ixb2*ila4;
+ ib=ixaya*ilb4+ixbyb*ila4;
+ ic=iya2*ilb4+iyb2*ila4;
+ id=ila4*ilb4;
+
+
+ if(iya <= ixa)
+ {
+ ix = -ixa; iy = -iya; idx = -(ib*ixa + ic*iya);
+ idy = ia * ixa + ib* iya;
+ while(idx <= 0)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; //rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy++;
+ isigma = ia*ix*ix + 2 *ib * ix * iy + ic *iy * iy - id;
+ if(isigma < 0)
+ {
+ idx = idx - ib;
+ idy = idy + ia;
+ ix--;
+ }
+ idx = idx + ic;
+ idy = idy - ib;
+ }
+
+ while(idx <= idy)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; //rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy++;
+ ixp1 = ix + 1;
+ isigma = ia*ixp1*ixp1 + 2 *ib * ixp1 * iy + ic *iy * iy - id;
+ if(isigma >= 0)
+ {
+ idx = idx + ib;
+ idy = idy - ia;
+ ix = ixp1;
+ }
+ idx = idx + ic;
+ idy = idy - ib;
+ }
+
+ while(idy >= 0)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; //rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ ix++;
+ isigma = ia*ix*ix + 2 *ib * ix * iy + ic *iy * iy - id;
+ if(isigma < 0)
+ {
+ idx = idx + ic;
+ idy = idy - ib;
+ iy++;
+ }
+ idx = idx + ib;
+ idy = idy - ia;
+ }
+
+
+
+ while(idy >= -idx)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; //rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ ix++;
+ iym1 = iy - 1;
+ isigma = ia*ix*ix + 2 *ib * ix * iym1 + ic *iym1 * iym1 - id;
+ if(isigma >= 0)
+ {
+ idx = idx -ic;
+ idy = idy + ib;
+ iy = iym1;
+ }
+ idx = idx + ib;
+ idy = idy - ia;
+ }
+
+ while(iy >= iya)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; //rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy--;
+ isigma = ia*ix*ix + 2 *ib * ix * iy + ic *iy * iy - id;
+ if(isigma < 0)
+ {
+ idx = idx +ib;
+ idy = idy - ia;
+ ix++;
+ }
+ idx = idx - ic;
+ idy = idy + ib;
+ }
+ }
+ else
+ {
+ ix = -ixa; iy = -iya; idx = -(ib*ixa + ic*iya);
+ idy = ia * ixa + ib *iya;
+
+ while(-idx >= idy)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; //rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ ix--;
+ iyp1 = iy + 1;
+ isigma = ia*ix*ix + 2 *ib * ix * iyp1 + ic *iyp1 * iyp1 - id;
+ if(isigma >= 0)
+ {
+ idx = idx + ic;
+ idy = idy - ib;
+ iy = iyp1;
+ }
+ idx = idx - ib;
+ idy = idy + ia;
+ }
+
+ while(idx <= 0)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; //rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy++;
+ isigma = ia*ix*ix + 2 *ib * ix * iy + ic *iy * iy - id;
+ if(isigma < 0)
+ {
+ idx = idx - ib;
+ idy = idy + ia;
+ ix--;
+ }
+ idx = idx + ic;
+ idy = idy - ib;
+ }
+
+ while(idx <= idy)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; //rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy++;
+ ixp1 = ix+1;
+ isigma = ia*ixp1*ixp1 + 2 *ib * ixp1 * iy + ic *iy * iy - id;
+ if(isigma >= 0)
+ {
+ idx = idx + ib;
+ idy = idy - ia;
+ ix = ixp1;
+ }
+ idx = idx + ic;
+ idy = idy - ib;
+ }
+
+
+
+ while(idy >= 0)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; //rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ ix++;
+ //iym1 = iy - 1;
+ isigma = ia*ix*ix + 2 *ib * ix * iy + ic *iy * iy - id;
+ if(isigma < 0)
+ {
+ idx = idx +ic;
+ idy = idy - ib;
+ iy++;
+ }
+ idx = idx + ib;
+ idy = idy - ia;
+ }
+
+ while(ix <= ixa)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = (0,0,0);
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; //rgbValues[x0 - ix*xflag][y0 - iy] = (0,0,0);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ ix++;
+ iym1 = iy - 1;
+ isigma = ia*ix*ix + 2 *ib * ix * iym1 + ic *iym1 * iym1 - id;
+ if(isigma >= 0)
+ {
+ idx = idx - ic;
+ idy = idy + ib;
+ iy = iym1;
+ }
+ idx = idx + ib;
+ idy = idy - ia;
+ }
+
+
+
+
+
+ }
+
+
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+}
+
+double IrisCode::drawBresenhamElipticAngleUP(int x0, int y0, int a, int b, double angle) //draw oben
+{
+ double ixa = 0; double iya = 0;
+ double ixb = 0;double iyb = 0;
+ double ixa2 = 0;double iya2 = 0;
+ double ixb2 = 0;double iyb2 = 0;
+ double ixaya = 0;double ixbyb = 0;
+ double ila2 = 0;double ila4 = 0;
+ double ilb2 = 0; double ilb4 = 0;
+ double ia = 0; double ib = 0;
+ double ic = 0; double id = 0;
+ double idx = 0;double idy = 0;double isigma = 0;
+ double ixp1 = 0; double temp = 0;
+ int xflag = 0;
+ int ix = 0; int iy = 0; int iym1 = 0; int iyp1 = 0;
+ int pixels = 0; int sum = 0;
+
+ angle = angle * (M_PI/180.0);
+
+
+ if(angle < M_PI/2)
+ xflag = 1;
+ else if ((angle > M_PI/2) && (angle < M_PI))
+ {
+ temp = angle - M_PI/2;
+ angle = M_PI / 2 - temp;
+ xflag = -1;
+ }
+ else if((angle >= M_PI) && (angle < M_PI*1.5))
+ {
+ angle = angle - M_PI;
+ xflag = 1;
+ }
+ else if((angle >= M_PI*1.5) && (angle < M_PI*2))
+ {
+ angle = angle - M_PI;
+ temp = angle - M_PI / 2;
+ angle = M_PI/2 - temp;
+ xflag = -1;
+ }
+
+ ixa = ::cos(angle) * (double)a;
+ iya = ::sin(angle) * (double)a;
+ ixb = ::cos(angle + (M_PI/2.0))*(double)b;
+ iyb = ::sin(angle + (M_PI/2.0))*(double)b;
+
+ ixa2=ixa*ixa;
+ iya2=iya*iya;
+ ixb2=ixb*ixb;
+ iyb2=iyb*iyb;
+ ixaya=ixa*iya;
+ ixbyb=ixb*iyb;
+ ila2=ixa2+iya2;
+ ila4=ila2*ila2;
+ ilb2=ixb2+iyb2;
+ ilb4=ilb2*ilb2;
+ ia=ixa2*ilb4+ixb2*ila4;
+ ib=ixaya*ilb4+ixbyb*ila4;
+ ic=iya2*ilb4+iyb2*ila4;
+ id=ila4*ilb4;
+
+
+ if(iya <= ixa)
+ {
+ ix = -ixa; iy = -iya; idx = -(ib*ixa + ic*iya);
+ idy = ia * ixa + ib* iya;
+ while(idx <= 0)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = 255;
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValuesOut[x0 - ix*xflag][y0 - iy] = 255;
+ eyelidMaskUp(x0 - ix*xflag, y0 - iy);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy++;
+ isigma = ia*ix*ix + 2 *ib * ix * iy + ic *iy * iy - id;
+ if(isigma < 0)
+ {
+ idx = idx - ib;
+ idy = idy + ia;
+ ix--;
+ }
+ idx = idx + ic;
+ idy = idy - ib;
+ }
+
+ while(idx <= idy)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = 255;
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValuesOut[x0 - ix*xflag][y0 - iy] = 255;
+ eyelidMaskUp(x0 - ix*xflag, y0 - iy);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy++;
+ ixp1 = ix + 1;
+ isigma = ia*ixp1*ixp1 + 2 *ib * ixp1 * iy + ic *iy * iy - id;
+ if(isigma >= 0)
+ {
+ idx = idx + ib;
+ idy = idy - ia;
+ ix = ixp1;
+ }
+ idx = idx + ic;
+ idy = idy - ib;
+ }
+
+ while(idy >= 0)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ /*std::cout << "x0 - ix*xflag=" << x0 - ix*xflag;
+ std::cout << "y0 - iy=" << y0 - iy;
+ std::cout << "\n";*/
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = 255;
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValuesOut[x0 - ix*xflag][y0 - iy] = 255;
+ eyelidMaskUp(x0 - ix*xflag, y0 - iy);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ ix++;
+ isigma = ia*ix*ix + 2 *ib * ix * iy + ic *iy * iy - id;
+ if(isigma < 0)
+ {
+ idx = idx + ic;
+ idy = idy - ib;
+ iy++;
+ }
+ idx = idx + ib;
+ idy = idy - ia;
+ }
+
+
+
+ while(idy >= -idx)
+ {if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = 255;
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValuesOut[x0 - ix*xflag][y0 - iy] = 255;
+ eyelidMaskUp(x0 - ix*xflag, y0 - iy);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ ix++;
+ iym1 = iy - 1;
+ isigma = ia*ix*ix + 2 *ib * ix * iym1 + ic *iym1 * iym1 - id;
+ if(isigma >= 0)
+ {
+ idx = idx -ic;
+ idy = idy + ib;
+ iy = iym1;
+ }
+ idx = idx + ib;
+ idy = idy - ia;
+ }
+
+ while(iy >= iya)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = 255;
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValuesOut[x0 - ix*xflag][y0 - iy] = 255;
+ eyelidMaskUp(x0 - ix*xflag, y0 - iy);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy--;
+ isigma = ia*ix*ix + 2 *ib * ix * iy + ic *iy * iy - id;
+ if(isigma < 0)
+ {
+ idx = idx +ib;
+ idy = idy - ia;
+ ix++;
+ }
+ idx = idx - ic;
+ idy = idy + ib;
+ }
+ }
+ else
+ {
+ ix = -ixa; iy = -iya; idx = -(ib*ixa + ic*iya);
+ idy = ia * ixa + ib *iya;
+
+ while(-idx >= idy)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = 255;
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValuesOut[x0 - ix*xflag][y0 - iy] = 255;
+ eyelidMaskUp(x0 - ix*xflag, y0 - iy);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ ix--;
+ iyp1 = iy + 1;
+ isigma = ia*ix*ix + 2 *ib * ix * iyp1 + ic *iyp1 * iyp1 - id;
+ if(isigma >= 0)
+ {
+ idx = idx + ic;
+ idy = idy - ib;
+ iy = iyp1;
+ }
+ idx = idx - ib;
+ idy = idy + ia;
+ }
+
+ while(idx <= 0)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = 255;
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValuesOut[x0 - ix*xflag][y0 - iy] = 255;
+ eyelidMaskUp(x0 - ix*xflag, y0 - iy);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy++;
+ isigma = ia*ix*ix + 2 *ib * ix * iy + ic *iy * iy - id;
+ if(isigma < 0)
+ {
+ idx = idx - ib;
+ idy = idy + ia;
+ ix--;
+ }
+ idx = idx + ic;
+ idy = idy - ib;
+ }
+
+ while(idx <= idy)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = 255;
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValuesOut[x0 - ix*xflag][y0 - iy] = 255;
+ eyelidMaskUp(x0 - ix*xflag, y0 - iy);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ iy++;
+ ixp1 = ix+1;
+ isigma = ia*ixp1*ixp1 + 2 *ib * ixp1 * iy + ic *iy * iy - id;
+ if(isigma >= 0)
+ {
+ idx = idx + ib;
+ idy = idy - ia;
+ ix = ixp1;
+ }
+ idx = idx + ic;
+ idy = idy - ib;
+ }
+
+
+
+ while(idy >= 0)
+ {
+ if((x0 - ix*xflag <w) & (y0 - iy < h) & (x0 - ix*xflag >= 0) & (y0 - iy >= 0 ))
+ {
+ pixels += 1;
+ //sum += rgbValues[x0 + ix*xflag][y0 + iy]; rgbValues[x0 + ix*xflag][y0 + iy] = 255;
+ sum += rgbValues[x0 - ix*xflag][y0 - iy]; rgbValuesOut[x0 - ix*xflag][y0 - iy] = 255;
+ eyelidMaskUp(x0 - ix*xflag, y0 - iy);
+ }
+ else
+ {
+ testEliptic = false;
+ if((sum == 0) | (pixels == 0) | (pixels <= 0.8 * A))
+ return 0;
+ else
+ return sum / pixels;
+ }
+ ...
[truncated message content] |
|
From: <csi...@li...> - 2008-05-26 11:21:36
|
Revision: 1313
http://csipc2.svn.sourceforge.net/csipc2/?rev=1313&view=rev
Author: warcamel
Date: 2008-05-26 04:21:31 -0700 (Mon, 26 May 2008)
Log Message:
-----------
- added check for gnutls
Modified Paths:
--------------
trunk/configure.in
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-05-26 09:48:51 UTC (rev 1312)
+++ trunk/configure.in 2008-05-26 11:21:31 UTC (rev 1313)
@@ -173,6 +173,25 @@
AM_CONDITIONAL(MAKE_GTK_SUPPORT, test "x$enable_gtk2" = "xyes")
+### Checking for GNUTLS
+AC_MSG_CHECKING(for gnutls)
+if $(pkg-config --exists gnutls); then
+ AC_MSG_RESULT(yes)
+ AC_MSG_CHECKING(for gnutls libraries)
+ GNUTLS_LIBS=$(pkg-config --libs gnutls)
+ AC_MSG_RESULT(${GNUTLS_LIBS})
+ AC_MSG_CHECKING(for gnutls headers)
+ GNUTLS_INCS=$(pkg-config --cflags gnutls)
+ AC_MSG_RESULT(${GNUTLS_INCS})
+else
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([Could not find gnutls-devel package])
+fi
+AC_SUBST(GNUTLS_LIBS)
+AC_SUBST(GNUTLS_INCS)
+
+
+
### Check availability of functions, headers and libraries
AC_FUNC_MALLOC
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-05-26 09:48:52
|
Revision: 1312
http://csipc2.svn.sourceforge.net/csipc2/?rev=1312&view=rev
Author: warcamel
Date: 2008-05-26 02:48:51 -0700 (Mon, 26 May 2008)
Log Message:
-----------
- one last Makefile.in found and added to svn:ignore
Property Changed:
----------------
trunk/src/cluster/feature_extraction/fingerprint/mindtct/
Property changes on: trunk/src/cluster/feature_extraction/fingerprint/mindtct
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <csi...@li...> - 2008-05-26 09:47:41
|
Revision: 1311
http://csipc2.svn.sourceforge.net/csipc2/?rev=1311&view=rev
Author: warcamel
Date: 2008-05-26 02:47:37 -0700 (Mon, 26 May 2008)
Log Message:
-----------
- removed frontend.doxygen cause not needed anymore
- added Makefile.in to svn:ignore
- removed unneeded personal files as Makefiles or anjuta project files
Removed Paths:
-------------
trunk/doc/frontend.Doxyfile
trunk/src/cluster/csi_dbtool/Makefile
trunk/src/cluster/csi_dbtool/csi_dbtool.anjuta
trunk/src/cluster/csi_dbtool/mpd.hosts
trunk/src/cluster/csi_dbtool/run.sh
trunk/src/cluster/database/main.anjuta
trunk/src/cluster/feature_extraction/experimental/Makefile
trunk/src/cluster/feature_extraction/experimental/main.anjuta
trunk/src/cluster/feature_extraction/experimental/run.sh
trunk/src/tests/performance/cluster/template_matching/speed_iris/Makefile
trunk/src/tests/performance/cluster/template_matching/speed_iris/hamming.anjuta
Property Changed:
----------------
trunk/
trunk/doc/
trunk/src/
trunk/src/cluster/
trunk/src/cluster/ccd/
trunk/src/cluster/csi_dbtool/
trunk/src/cluster/database/
trunk/src/cluster/feature_extraction/
trunk/src/cluster/feature_extraction/experimental/
trunk/src/cluster/feature_extraction/fingerprint/
trunk/src/cluster/template_matching/
trunk/src/cluster/template_matching/bozorth3/
trunk/src/shared/
trunk/src/tests/
trunk/src/tests/ccd_connection/
trunk/src/tests/performance/
trunk/src/tests/performance/cluster/
trunk/src/tests/performance/cluster/template_matching/
trunk/src/tests/performance/cluster/template_matching/speed_iris/
trunk/src/tests/unit/
trunk/src/tests/unit/cluster/
trunk/src/tests/unit/cluster/template_matching/
trunk/src/tests/unit/shared/
trunk/src/tools/
trunk/src/tools/misc_dev/
trunk/src/tools/misc_dev/man1/
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- autom4te.cache
aclocal.m4
configure
depcomp
install-sh
missing
config.status
.project
.cproject
.settings
bin
build
+ autom4te.cache
aclocal.m4
configure
depcomp
install-sh
missing
config.status
.project
.cproject
.settings
bin
build
Makefile.in
config.h.in
Property changes on: trunk/doc
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Deleted: trunk/doc/frontend.Doxyfile
===================================================================
--- trunk/doc/frontend.Doxyfile 2008-05-24 00:27:55 UTC (rev 1310)
+++ trunk/doc/frontend.Doxyfile 2008-05-26 09:47:37 UTC (rev 1311)
@@ -1,231 +0,0 @@
-# Doxyfile 1.5.3
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-DOXYFILE_ENCODING = UTF-8
-PROJECT_NAME = CSI:PC2--- Frontend
-PROJECT_NUMBER = 0.3
-OUTPUT_DIRECTORY = csi-frontend/
-CREATE_SUBDIRS = NO
-OUTPUT_LANGUAGE = English
-BRIEF_MEMBER_DESC = YES
-REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF = "The $name class" "The $name widget" "The $name file" is provides specifies contains represents a an the
-ALWAYS_DETAILED_SEC = NO
-INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
-SHORT_NAMES = NO
-JAVADOC_AUTOBRIEF = NO
-QT_AUTOBRIEF = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = NO
-INHERIT_DOCS = YES
-SEPARATE_MEMBER_PAGES = NO
-TAB_SIZE = 8
-ALIASES =
-OPTIMIZE_OUTPUT_FOR_C = NO
-OPTIMIZE_OUTPUT_JAVA = NO
-BUILTIN_STL_SUPPORT = NO
-CPP_CLI_SUPPORT = NO
-DISTRIBUTE_GROUP_DOC = NO
-SUBGROUPING = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL = NO
-EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = NO
-EXTRACT_LOCAL_CLASSES = YES
-EXTRACT_LOCAL_METHODS = YES
-EXTRACT_ANON_NSPACES = NO
-HIDE_UNDOC_MEMBERS = YES
-HIDE_UNDOC_CLASSES = YES
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
-INTERNAL_DOCS = YES
-CASE_SENSE_NAMES = YES
-HIDE_SCOPE_NAMES = NO
-SHOW_INCLUDE_FILES = YES
-INLINE_INFO = YES
-SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = NO
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
-GENERATE_DEPRECATEDLIST = YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
-SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = NO
-FILE_VERSION_FILTER =
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET = NO
-WARNINGS = YES
-WARN_IF_UNDOCUMENTED = YES
-WARN_IF_DOC_ERROR = YES
-WARN_NO_PARAMDOC = NO
-WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT = ../src/frontend ../src/shared
-INPUT_ENCODING = UTF-8
-FILE_PATTERNS = *.c *.cpp *.h *.hpp *.C *.C++ *.H *.H++
-RECURSIVE = YES
-EXCLUDE =
-EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXCLUDE_SYMBOLS =
-EXAMPLE_PATH =
-EXAMPLE_PATTERNS = *
-EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
-FILTER_SOURCE_FILES = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER = NO
-INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION = NO
-REFERENCES_LINK_SOURCE = YES
-USE_HTAGS = NO
-VERBATIM_HEADERS = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX = YES
-COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML = YES
-HTML_OUTPUT = html
-HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
-HTML_ALIGN_MEMBERS = YES
-GENERATE_HTMLHELP = NO
-HTML_DYNAMIC_SECTIONS = NO
-CHM_FILE =
-HHC_LOCATION =
-GENERATE_CHI = NO
-BINARY_TOC = NO
-TOC_EXPAND = NO
-DISABLE_INDEX = NO
-ENUM_VALUES_PER_LINE = 4
-GENERATE_TREEVIEW = YES
-TREEVIEW_WIDTH = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX = YES
-LATEX_OUTPUT = latex
-LATEX_CMD_NAME = latex
-MAKEINDEX_CMD_NAME = makeindex
-COMPACT_LATEX = YES
-PAPER_TYPE = a4
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = YES
-USE_PDFLATEX = YES
-LATEX_BATCHMODE = NO
-LATEX_HIDE_INDICES = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF = NO
-RTF_OUTPUT = rtf
-COMPACT_RTF = NO
-RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN = YES
-MAN_OUTPUT = man
-MAN_EXTENSION = .3
-MAN_LINKS = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML = NO
-XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD = NO
-PERLMOD_LATEX = NO
-PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING = YES
-MACRO_EXPANSION = NO
-EXPAND_ONLY_PREDEF = NO
-SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
-SKIP_FUNCTION_MACROS = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-TAGFILES =
-GENERATE_TAGFILE =
-ALLEXTERNALS = NO
-EXTERNAL_GROUPS = YES
-PERL_PATH = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = NO
-MSCGEN_PATH =
-HIDE_UNDOC_RELATIONS = YES
-HAVE_DOT = NO
-CLASS_GRAPH = YES
-COLLABORATION_GRAPH = YES
-GROUP_GRAPHS = YES
-UML_LOOK = YES
-TEMPLATE_RELATIONS = NO
-INCLUDE_GRAPH = YES
-INCLUDED_BY_GRAPH = YES
-CALL_GRAPH = YES
-CALLER_GRAPH = NO
-GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
-DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-DOT_GRAPH_MAX_NODES = 50
-MAX_DOT_GRAPH_DEPTH = 1000
-DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
-GENERATE_LEGEND = YES
-DOT_CLEANUP = YES
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
-#---------------------------------------------------------------------------
-SEARCHENGINE = YES
Property changes on: trunk/src
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster
___________________________________________________________________
Name: svn:ignore
- aclocal.m4
configure.in
autom4te.cache
+ aclocal.m4
configure.in
autom4te.cache
Makefile.in
Property changes on: trunk/src/cluster/ccd
___________________________________________________________________
Name: svn:ignore
- ccd
bin
include
lib
+ ccd
bin
include
lib
Makefile.in
Property changes on: trunk/src/cluster/csi_dbtool
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Deleted: trunk/src/cluster/csi_dbtool/Makefile
===================================================================
--- trunk/src/cluster/csi_dbtool/Makefile 2008-05-24 00:27:55 UTC (rev 1310)
+++ trunk/src/cluster/csi_dbtool/Makefile 2008-05-26 09:47:37 UTC (rev 1311)
@@ -1,657 +0,0 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-# src/cluster/csi_dbtool/Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-# Makefile.am
-#
-# Automake configuration
-# Author: Christoph Konersmann <c_...@up...>
-# Date : 10.03.2008
-#
-
-
-pkgdatadir = $(datadir)/csi-pc2
-pkglibdir = $(libdir)/csi-pc2
-pkgincludedir = $(includedir)/csi-pc2
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-bin_PROGRAMS = csi_dbtool$(EXEEXT)
-subdir = src/cluster/csi_dbtool
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_csi_dbtool_OBJECTS = csi_dbtool.$(OBJEXT) database.$(OBJEXT) \
- database_ext.$(OBJEXT) db_helpers.$(OBJEXT) service.$(OBJEXT) \
- normalize.$(OBJEXT) direction.$(OBJEXT) \
- corepoint_detection.$(OBJEXT) thining.$(OBJEXT) \
- minutia_extraction.$(OBJEXT) feat_ext_fingerprint.$(OBJEXT)
-csi_dbtool_OBJECTS = $(am_csi_dbtool_OBJECTS)
-am__DEPENDENCIES_1 =
-DEFAULT_INCLUDES = -I. -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(csi_dbtool_SOURCES)
-DIST_SOURCES = $(csi_dbtool_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /media/scratch/workspace/CSI:PC2/build-aux/missing --run aclocal-1.10
-ADMXRC2_LIB =
-AMTAR = ${SHELL} /media/scratch/workspace/CSI:PC2/build-aux/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /media/scratch/workspace/CSI:PC2/build-aux/missing --run autoconf
-AUTOHEADER = ${SHELL} /media/scratch/workspace/CSI:PC2/build-aux/missing --run autoheader
-AUTOMAKE = ${SHELL} /media/scratch/workspace/CSI:PC2/build-aux/missing --run automake-1.10
-AWK = gawk
-
-# Use MPICC an compiler
-CC = /usr/bin/mpicc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -Wall -g
-CHECK_CFLAGS =
-CHECK_LIBS =
-CPP = gcc -E
-CPPFLAGS =
-CSI_EXPERIMENTAL_EXTRACTION_INC = -I${top_srcdir}/src/cluster/feature_extraction/experimental/
-CSI_EXPERIMENTAL_EXTRACTION_LIB = ${top_builddir}/src/cluster/feature_extraction/experimental/libcsipc2_extraction.la
-CSI_EXTRACTION_INC = -I${top_srcdir}/src/cluster/feature_extraction/fingerprint/csi/
-CSI_EXTRACTION_LIB = ${top_builddir}/src/cluster/feature_extraction/fingerprint/csi/libcsipc2_extraction.la
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DATABASE_LIB = ${top_builddir}/src/cluster/database/libcsipc2_database.a
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO = echo
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = /bin/grep -E
-EXEEXT =
-F77 = g77
-FFLAGS = -g -O2
-GLOBAL_INCLUDE = -I${top_srcdir}/src/shared -I${top_srcdir}/src/cluster/database -I/usr/lib/mpich/include -I${top_srcdir}/src/cluster/feature_extraction/fingerprint -I${top_srcdir}/src/cluster/ccd -I${top_srcdir}/src/cluster/template_matching -I${top_srcdir}/src/cluster/template_matching/bozorth3 -I
-GREP = /bin/grep
-GTK2_INCS = -DPNG_NO_MMX_CODE -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pixman-1
-GTK2_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXcomposite -lXdamage -lpango-1.0 -lcairo -lX11 -lXfixes -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -L/media/scratch/ImageMagick/lib
-LIBOBJS =
-LIBS = -lm
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS =
-MAGICK_INCS = -g -O2 -Wall -W -pthread -I/media/scratch/ImageMagick/include
-MAGICK_LIBS = -lMagick -ljpeg -lXext -lSM -lICE -lX11 -lz -lpthread -lm -lpthread -lWand -lMagick
-MAKEINFO = ${SHELL} /media/scratch/workspace/CSI:PC2/build-aux/missing --run makeinfo
-MATCHING_LIBS = ${top_builddir}/src/cluster/template_matching/libcsipc2_matching.a ${top_builddir}/src/cluster/template_matching/bozorth3/libbozorth3_matching.a
-MINDTCT_INC = -I${top_srcdir}/src/cluster/feature_extraction/fingerprint/mindtct/
-MINDTCT_LIB = ${top_builddir}/src/cluster/feature_extraction/fingerprint/mindtct/libmindtct.la
-MKDIR_P = /bin/mkdir -p
-NBIS_EXTRACTION_INC = ${MINDTCT_INC} -I${top_srcdir}/src/cluster/feature_extraction/fingerprint/
-NBIS_EXTRACTION_LIB = ${MINDTCT_LIB} ${top_builddir}/src/cluster/feature_extraction/fingerprint/libnbis_extraction.a
-OBJEXT = o
-PACKAGE = csi-pc2
-PACKAGE_BUGREPORT = pg...@li...
-PACKAGE_NAME = csi-pc2
-PACKAGE_STRING = csi-pc2 0.3
-PACKAGE_TARNAME = csi-pc2
-PACKAGE_VERSION = 0.3
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SED = /bin/sed
-SET_MAKE =
-SHARED_LIBS = ${top_builddir}/src/shared/libcsipc2.a
-SHELL = /bin/bash
-STRIP = strip
-VERSION = 0.3
-abs_builddir = /media/scratch/workspace/CSI:PC2/src/cluster/csi_dbtool
-abs_srcdir = /media/scratch/workspace/CSI:PC2/src/cluster/csi_dbtool
-abs_top_builddir = /media/scratch/workspace/CSI:PC2
-abs_top_srcdir = /media/scratch/workspace/CSI:PC2
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = g77
-am__include = include
-am__leading_dot = .
-am__quote =
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias =
-build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = unknown
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
-host_alias =
-host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = unknown
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = $(SHELL) /media/scratch/workspace/CSI:PC2/build-aux/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
-mpicc = /usr/bin/mpicc
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /opt/csipc2
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias =
-top_builddir = ../../..
-top_srcdir = ../../..
-
-# Global includes and libraries
-INCLUDES = -I${top_srcdir}/src/shared -I${top_srcdir}/src/cluster/database -I/usr/lib/mpich/include -I${top_srcdir}/src/cluster/feature_extraction/fingerprint -I${top_srcdir}/src/cluster/ccd -I${top_srcdir}/src/cluster/template_matching -I${top_srcdir}/src/cluster/template_matching/bozorth3 -I -I${top_srcdir}/src/cluster/feature_extraction/experimental/ -g -O2 -Wall -W -pthread -I/media/scratch/ImageMagick/include
-LDADD = ${top_builddir}/src/cluster/template_matching/libcsipc2_matching.a ${top_builddir}/src/cluster/template_matching/bozorth3/libbozorth3_matching.a ${top_builddir}/src/cluster/database/libcsipc2_database.a ${top_builddir}/src/shared/libcsipc2.a ${top_builddir}/src/cluster/feature_extraction/experimental/libcsipc2_extraction.la
-csi_dbtool_LDADD = ${LDADD} -lMagick -ljpeg -lXext -lSM -lICE -lX11 -lz -lpthread -lm -lpthread -lWand -lMagick -ltiff -ljpeg -L/pc2fs/work/group/pg-csi/users/warcamel/csi-source/ext
-csi_dbtool_DEPENDENCIES = ${LDADD}
-csi_dbtool_SOURCES = csi_dbtool.c \
- ../database/database.c \
- ../database/database_ext.c \
- ../database/db_helpers.c \
- ../feature_extraction/experimental/service.c \
- ../feature_extraction/experimental/01_normalize/normalize.c \
- ../feature_extraction/experimental/02_direction/direction.c \
- ../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c \
- ../feature_extraction/experimental/04_thining/thining.c \
- ../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c \
- ../feature_extraction/experimental/feat_ext_fingerprint.c
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/cluster/csi_dbtool/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/cluster/csi_dbtool/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- if test -f $$p \
- || test -f $$p1 \
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
- else :; fi; \
- done
-
-uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
- rm -f "$(DESTDIR)$(bindir)/$$f"; \
- done
-
-clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f $$p $$f"; \
- rm -f $$p $$f ; \
- done
-csi_dbtool$(EXEEXT): $(csi_dbtool_OBJECTS) $(csi_dbtool_DEPENDENCIES)
- @rm -f csi_dbtool$(EXEEXT)
- $(LINK) $(csi_dbtool_OBJECTS) $(csi_dbtool_LDADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-include ./$(DEPDIR)/corepoint_detection.Po
-include ./$(DEPDIR)/csi_dbtool.Po
-include ./$(DEPDIR)/database.Po
-include ./$(DEPDIR)/database_ext.Po
-include ./$(DEPDIR)/db_helpers.Po
-include ./$(DEPDIR)/direction.Po
-include ./$(DEPDIR)/feat_ext_fingerprint.Po
-include ./$(DEPDIR)/minutia_extraction.Po
-include ./$(DEPDIR)/normalize.Po
-include ./$(DEPDIR)/service.Po
-include ./$(DEPDIR)/thining.Po
-
-.c.o:
- $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-# source='$<' object='$@' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(COMPILE) -c $<
-
-.c.obj:
- $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-# source='$<' object='$@' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
- $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-# source='$<' object='$@' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LTCOMPILE) -c -o $@ $<
-
-database.o: ../database/database.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT database.o -MD -MP -MF $(DEPDIR)/database.Tpo -c -o database.o `test -f '../database/database.c' || echo '$(srcdir)/'`../database/database.c
- mv -f $(DEPDIR)/database.Tpo $(DEPDIR)/database.Po
-# source='../database/database.c' object='database.o' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o database.o `test -f '../database/database.c' || echo '$(srcdir)/'`../database/database.c
-
-database.obj: ../database/database.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT database.obj -MD -MP -MF $(DEPDIR)/database.Tpo -c -o database.obj `if test -f '../database/database.c'; then $(CYGPATH_W) '../database/database.c'; else $(CYGPATH_W) '$(srcdir)/../database/database.c'; fi`
- mv -f $(DEPDIR)/database.Tpo $(DEPDIR)/database.Po
-# source='../database/database.c' object='database.obj' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o database.obj `if test -f '../database/database.c'; then $(CYGPATH_W) '../database/database.c'; else $(CYGPATH_W) '$(srcdir)/../database/database.c'; fi`
-
-database_ext.o: ../database/database_ext.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT database_ext.o -MD -MP -MF $(DEPDIR)/database_ext.Tpo -c -o database_ext.o `test -f '../database/database_ext.c' || echo '$(srcdir)/'`../database/database_ext.c
- mv -f $(DEPDIR)/database_ext.Tpo $(DEPDIR)/database_ext.Po
-# source='../database/database_ext.c' object='database_ext.o' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o database_ext.o `test -f '../database/database_ext.c' || echo '$(srcdir)/'`../database/database_ext.c
-
-database_ext.obj: ../database/database_ext.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT database_ext.obj -MD -MP -MF $(DEPDIR)/database_ext.Tpo -c -o database_ext.obj `if test -f '../database/database_ext.c'; then $(CYGPATH_W) '../database/database_ext.c'; else $(CYGPATH_W) '$(srcdir)/../database/database_ext.c'; fi`
- mv -f $(DEPDIR)/database_ext.Tpo $(DEPDIR)/database_ext.Po
-# source='../database/database_ext.c' object='database_ext.obj' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o database_ext.obj `if test -f '../database/database_ext.c'; then $(CYGPATH_W) '../database/database_ext.c'; else $(CYGPATH_W) '$(srcdir)/../database/database_ext.c'; fi`
-
-db_helpers.o: ../database/db_helpers.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT db_helpers.o -MD -MP -MF $(DEPDIR)/db_helpers.Tpo -c -o db_helpers.o `test -f '../database/db_helpers.c' || echo '$(srcdir)/'`../database/db_helpers.c
- mv -f $(DEPDIR)/db_helpers.Tpo $(DEPDIR)/db_helpers.Po
-# source='../database/db_helpers.c' object='db_helpers.o' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o db_helpers.o `test -f '../database/db_helpers.c' || echo '$(srcdir)/'`../database/db_helpers.c
-
-db_helpers.obj: ../database/db_helpers.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT db_helpers.obj -MD -MP -MF $(DEPDIR)/db_helpers.Tpo -c -o db_helpers.obj `if test -f '../database/db_helpers.c'; then $(CYGPATH_W) '../database/db_helpers.c'; else $(CYGPATH_W) '$(srcdir)/../database/db_helpers.c'; fi`
- mv -f $(DEPDIR)/db_helpers.Tpo $(DEPDIR)/db_helpers.Po
-# source='../database/db_helpers.c' object='db_helpers.obj' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o db_helpers.obj `if test -f '../database/db_helpers.c'; then $(CYGPATH_W) '../database/db_helpers.c'; else $(CYGPATH_W) '$(srcdir)/../database/db_helpers.c'; fi`
-
-service.o: ../feature_extraction/experimental/service.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT service.o -MD -MP -MF $(DEPDIR)/service.Tpo -c -o service.o `test -f '../feature_extraction/experimental/service.c' || echo '$(srcdir)/'`../feature_extraction/experimental/service.c
- mv -f $(DEPDIR)/service.Tpo $(DEPDIR)/service.Po
-# source='../feature_extraction/experimental/service.c' object='service.o' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o service.o `test -f '../feature_extraction/experimental/service.c' || echo '$(srcdir)/'`../feature_extraction/experimental/service.c
-
-service.obj: ../feature_extraction/experimental/service.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT service.obj -MD -MP -MF $(DEPDIR)/service.Tpo -c -o service.obj `if test -f '../feature_extraction/experimental/service.c'; then $(CYGPATH_W) '../feature_extraction/experimental/service.c'; else $(CYGPATH_W) '$(srcdir)/../feature_extraction/experimental/service.c'; fi`
- mv -f $(DEPDIR)/service.Tpo $(DEPDIR)/service.Po
-# source='../feature_extraction/experimental/service.c' object='service.obj' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o service.obj `if test -f '../feature_extraction/experimental/service.c'; then $(CYGPATH_W) '../feature_extraction/experimental/service.c'; else $(CYGPATH_W) '$(srcdir)/../feature_extraction/experimental/service.c'; fi`
-
-normalize.o: ../feature_extraction/experimental/01_normalize/normalize.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT normalize.o -MD -MP -MF $(DEPDIR)/normalize.Tpo -c -o normalize.o `test -f '../feature_extraction/experimental/01_normalize/normalize.c' || echo '$(srcdir)/'`../feature_extraction/experimental/01_normalize/normalize.c
- mv -f $(DEPDIR)/normalize.Tpo $(DEPDIR)/normalize.Po
-# source='../feature_extraction/experimental/01_normalize/normalize.c' object='normalize.o' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o normalize.o `test -f '../feature_extraction/experimental/01_normalize/normalize.c' || echo '$(srcdir)/'`../feature_extraction/experimental/01_normalize/normalize.c
-
-normalize.obj: ../feature_extraction/experimental/01_normalize/normalize.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT normalize.obj -MD -MP -MF $(DEPDIR)/normalize.Tpo -c -o normalize.obj `if test -f '../feature_extraction/experimental/01_normalize/normalize.c'; then $(CYGPATH_W) '../feature_extraction/experimental/01_normalize/normalize.c'; else $(CYGPATH_W) '$(srcdir)/../feature_extraction/experimental/01_normalize/normalize.c'; fi`
- mv -f $(DEPDIR)/normalize.Tpo $(DEPDIR)/normalize.Po
-# source='../feature_extraction/experimental/01_normalize/normalize.c' object='normalize.obj' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o normalize.obj `if test -f '../feature_extraction/experimental/01_normalize/normalize.c'; then $(CYGPATH_W) '../feature_extraction/experimental/01_normalize/normalize.c'; else $(CYGPATH_W) '$(srcdir)/../feature_extraction/experimental/01_normalize/normalize.c'; fi`
-
-direction.o: ../feature_extraction/experimental/02_direction/direction.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT direction.o -MD -MP -MF $(DEPDIR)/direction.Tpo -c -o direction.o `test -f '../feature_extraction/experimental/02_direction/direction.c' || echo '$(srcdir)/'`../feature_extraction/experimental/02_direction/direction.c
- mv -f $(DEPDIR)/direction.Tpo $(DEPDIR)/direction.Po
-# source='../feature_extraction/experimental/02_direction/direction.c' object='direction.o' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o direction.o `test -f '../feature_extraction/experimental/02_direction/direction.c' || echo '$(srcdir)/'`../feature_extraction/experimental/02_direction/direction.c
-
-direction.obj: ../feature_extraction/experimental/02_direction/direction.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT direction.obj -MD -MP -MF $(DEPDIR)/direction.Tpo -c -o direction.obj `if test -f '../feature_extraction/experimental/02_direction/direction.c'; then $(CYGPATH_W) '../feature_extraction/experimental/02_direction/direction.c'; else $(CYGPATH_W) '$(srcdir)/../feature_extraction/experimental/02_direction/direction.c'; fi`
- mv -f $(DEPDIR)/direction.Tpo $(DEPDIR)/direction.Po
-# source='../feature_extraction/experimental/02_direction/direction.c' object='direction.obj' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o direction.obj `if test -f '../feature_extraction/experimental/02_direction/direction.c'; then $(CYGPATH_W) '../feature_extraction/experimental/02_direction/direction.c'; else $(CYGPATH_W) '$(srcdir)/../feature_extraction/experimental/02_direction/direction.c'; fi`
-
-corepoint_detection.o: ../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT corepoint_detection.o -MD -MP -MF $(DEPDIR)/corepoint_detection.Tpo -c -o corepoint_detection.o `test -f '../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c' || echo '$(srcdir)/'`../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c
- mv -f $(DEPDIR)/corepoint_detection.Tpo $(DEPDIR)/corepoint_detection.Po
-# source='../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c' object='corepoint_detection.o' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o corepoint_detection.o `test -f '../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c' || echo '$(srcdir)/'`../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c
-
-corepoint_detection.obj: ../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT corepoint_detection.obj -MD -MP -MF $(DEPDIR)/corepoint_detection.Tpo -c -o corepoint_detection.obj `if test -f '../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c'; then $(CYGPATH_W) '../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c'; else $(CYGPATH_W) '$(srcdir)/../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c'; fi`
- mv -f $(DEPDIR)/corepoint_detection.Tpo $(DEPDIR)/corepoint_detection.Po
-# source='../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c' object='corepoint_detection.obj' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o corepoint_detection.obj `if test -f '../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c'; then $(CYGPATH_W) '../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c'; else $(CYGPATH_W) '$(srcdir)/../feature_extraction/experimental/03_corepoint_detection/corepoint_detection.c'; fi`
-
-thining.o: ../feature_extraction/experimental/04_thining/thining.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT thining.o -MD -MP -MF $(DEPDIR)/thining.Tpo -c -o thining.o `test -f '../feature_extraction/experimental/04_thining/thining.c' || echo '$(srcdir)/'`../feature_extraction/experimental/04_thining/thining.c
- mv -f $(DEPDIR)/thining.Tpo $(DEPDIR)/thining.Po
-# source='../feature_extraction/experimental/04_thining/thining.c' object='thining.o' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o thining.o `test -f '../feature_extraction/experimental/04_thining/thining.c' || echo '$(srcdir)/'`../feature_extraction/experimental/04_thining/thining.c
-
-thining.obj: ../feature_extraction/experimental/04_thining/thining.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT thining.obj -MD -MP -MF $(DEPDIR)/thining.Tpo -c -o thining.obj `if test -f '../feature_extraction/experimental/04_thining/thining.c'; then $(CYGPATH_W) '../feature_extraction/experimental/04_thining/thining.c'; else $(CYGPATH_W) '$(srcdir)/../feature_extraction/experimental/04_thining/thining.c'; fi`
- mv -f $(DEPDIR)/thining.Tpo $(DEPDIR)/thining.Po
-# source='../feature_extraction/experimental/04_thining/thining.c' object='thining.obj' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o thining.obj `if test -f '../feature_extraction/experimental/04_thining/thining.c'; then $(CYGPATH_W) '../feature_extraction/experimental/04_thining/thining.c'; else $(CYGPATH_W) '$(srcdir)/../feature_extraction/experimental/04_thining/thining.c'; fi`
-
-minutia_extraction.o: ../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT minutia_extraction.o -MD -MP -MF $(DEPDIR)/minutia_extraction.Tpo -c -o minutia_extraction.o `test -f '../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c' || echo '$(srcdir)/'`../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c
- mv -f $(DEPDIR)/minutia_extraction.Tpo $(DEPDIR)/minutia_extraction.Po
-# source='../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c' object='minutia_extraction.o' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o minutia_extraction.o `test -f '../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c' || echo '$(srcdir)/'`../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c
-
-minutia_extraction.obj: ../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT minutia_extraction.obj -MD -MP -MF $(DEPDIR)/minutia_extraction.Tpo -c -o minutia_extraction.obj `if test -f '../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c'; then $(CYGPATH_W) '../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c'; else $(CYGPATH_W) '$(srcdir)/../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c'; fi`
- mv -f $(DEPDIR)/minutia_extraction.Tpo $(DEPDIR)/minutia_extraction.Po
-# source='../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c' object='minutia_extraction.obj' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o minutia_extraction.obj `if test -f '../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c'; then $(CYGPATH_W) '../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c'; else $(CYGPATH_W) '$(srcdir)/../feature_extraction/experimental/05_minutia_extraction/minutia_extraction.c'; fi`
-
-feat_ext_fingerprint.o: ../feature_extraction/experimental/feat_ext_fingerprint.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT feat_ext_fingerprint.o -MD -MP -MF $(DEPDIR)/feat_ext_fingerprint.Tpo -c -o feat_ext_fingerprint.o `test -f '../feature_extraction/experimental/feat_ext_fingerprint.c' || echo '$(srcdir)/'`../feature_extraction/experimental/feat_ext_fingerprint.c
- mv -f $(DEPDIR)/feat_ext_fingerprint.Tpo $(DEPDIR)/feat_ext_fingerprint.Po
-# source='../feature_extraction/experimental/feat_ext_fingerprint.c' object='feat_ext_fingerprint.o' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o feat_ext_fingerprint.o `test -f '../feature_extraction/experimental/feat_ext_fingerprint.c' || echo '$(srcdir)/'`../feature_extraction/experimental/feat_ext_fingerprint.c
-
-feat_ext_fingerprint.obj: ../feature_extraction/experimental/feat_ext_fingerprint.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT feat_ext_fingerprint.obj -MD -MP -MF $(DEPDIR)/feat_ext_fingerprint.Tpo -c -o feat_ext_fingerprint.obj `if test -f '../feature_extraction/experimental/feat_ext_fingerprint.c'; then $(CYGPATH_W) '../feature_extraction/experimental/feat_ext_fingerprint.c'; else $(CYGPATH_W) '$(srcdir)/../feature_extraction/experimental/feat_ext_fingerprint.c'; fi`
- mv -f $(DEPDIR)/feat_ext_fingerprint.Tpo $(DEPDIR)/feat_ext_fingerprint.Po
-# source='../feature_extraction/experimental/feat_ext_fingerprint.c' object='feat_ext_fingerprint.obj' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o feat_ext_fingerprint.obj `if test -f '../feature_extraction/experimental/feat_ext_fingerprint.c'; then $(CYGPATH_W) '../feature_extraction/experimental/feat_ext_fingerprint.c'; else $(CYGPATH_W) '$(srcdir)/../feature_extraction/experimental/feat_ext_fingerprint.c'; fi`
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
- for dir in "$(DESTDIR)$(bindir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic clean-libtool ctags distclean distclean-compile \
- distclean-generic distclean-libtool distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-binPROGRAMS
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Deleted: trunk/src/cluster/csi_dbtool/csi_dbtool.anjuta
===================================================================
--- trunk/src/cluster/csi_dbtool/csi_dbtool.anjuta 2008-05-24 00:27:55 UTC (rev 1310)
+++ trunk/src/cluster/csi_dbtool/csi_dbtool.anjuta 2008-05-26 09:47:37 UTC (rev 1311)
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<anjuta>
- <plugin name="GBF Project Manager"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaProjectManager"/>
- <require group="Project"
- attribute="Supported-Project-Types"
- value="make"/>
- </plugin>
- <plugin name="Symbol Browser"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Location"
- value="anjuta-symbol-browser:SymbolBrowserPlugin"/>
- </plugin>
- <plugin name="Make Build System"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaBuildable"/>
- <require group="Build"
- attribute="Supported-Build-Types"
- value="make"/>
- </plugin>
-</anjuta>
Deleted: trunk/src/cluster/csi_dbtool/mpd.hosts
===================================================================
--- trunk/src/cluster/csi_dbtool/mpd.hosts 2008-05-24 00:27:55 UTC (rev 1310)
+++ trunk/src/cluster/csi_dbtool/mpd.hosts 2008-05-26 09:47:37 UTC (rev 1311)
@@ -1 +0,0 @@
-hel
Deleted: trunk/src/cluster/csi_dbtool/run.sh
===================================================================
--- trunk/src/cluster/csi_dbtool/run.sh 2008-05-24 00:27:55 UTC (rev 1310)
+++ trunk/src/cluster/csi_dbtool/run.sh 2008-05-26 09:47:37 UTC (rev 1311)
@@ -1,42 +0,0 @@
-#!/bin/bash
-#
-# (C)Copyright 2008 CSI PC2 Project
-#
-# This file is part of the CSI PC2 software.
-#
-# The CSI PC2 software is free software: you can redistribute it
-# and/or modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation, either version 2 of the
-# License, or (at your option) any later version.
-#
-# The CSI PC2 software is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with the CSI PC2 software. If not, see
-# <http://www.gnu.org/licenses/>.
-#
-
-
-#DIRECTORY="/mnt/a/globalcluster/DB1_B"
-DIRECTORY="/home/data/uni/test"
-
-
-mpi()
-{
-mpdboot -n 1 -f mpd.hosts
-mpiexec -n $1 $2/csi_dbtool -c EXT_FINGER -i $DIRECTORY -o $DIRECTORY/db
-mpdallexit
-}
-
-dir=`pwd`
-
-echo -n "This is the base : "
-echo $dir
-case "$1" in
- "1" ) $dir/csi_dbtool -c EXT_FINGER -i $DIRECTORY -o $DIRECTORY/db -n 5;;
- [2-9] ) mpi $1 $dir ;;
- * ) echo "PLease give me the number of ranks" ;;
-esac
Property changes on: trunk/src/cluster/database
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Deleted: trunk/src/cluster/database/main.anjuta
===================================================================
--- trunk/src/cluster/database/main.anjuta 2008-05-24 00:27:55 UTC (rev 1310)
+++ trunk/src/cluster/database/main.anjuta 2008-05-26 09:47:37 UTC (rev 1311)
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<anjuta>
- <plugin name="GBF Project Manager"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaProjectManager"/>
- <require group="Project"
- attribute="Supported-Project-Types"
- value="make"/>
- </plugin>
- <plugin name="Symbol Browser"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Location"
- value="anjuta-symbol-browser:SymbolBrowserPlugin"/>
- </plugin>
- <plugin name="Make Build System"
- url="http://anjuta.org/plugins/"
- mandatory="yes">
- <require group="Anjuta Plugin"
- attribute="Interfaces"
- value="IAnjutaBuildable"/>
- <require group="Build"
- attribute="Supported-Build-Types"
- value="make"/>
- </plugin>
-</anjuta>
Property changes on: trunk/src/cluster/feature_extraction
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Property changes on: trunk/src/cluster/feature_extraction/experimental
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Deleted: trunk/src/cluster/feature_extraction/experimental/Makefile
===================================================================
--- trunk/src/cluster/feature_extraction/experimental/Makefile 2008-05-24 00:27:55 UTC (rev 1310)
+++ trunk/src/cluster/feature_extraction/experimental/Makefile 2008-05-26 09:47:37 UTC (rev 1311)
@@ -1,603 +0,0 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-# src/cluster/feature_extraction/experimental/Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-# Author: Christoph Konersmann <c_...@up...>
-
-
-
-pkgdatadir = $(datadir)/csi-pc2
-pkglibdir = $(libdir)/csi-pc2
-pkgincludedir = $(includedir)/csi-pc2
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-bin_PROGRAMS = csi_extraction$(EXEEXT)
-subdir = src/cluster/feature_extraction/experimental
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libcsipc2_extraction_la_LIBADD =
-am_libcsipc2_extraction_la_OBJECTS = feat_ext_fingerprint.lo \
- service.lo normalize.lo direction.lo corepoint_detection.lo \
- thining.lo minutia_extraction.lo cluster_template.lo \
- average_dist.lo
-libcsipc2_extraction_la_OBJECTS = \
- $(am_libcsipc2_extraction_la_OBJECTS)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_csi_extraction_OBJECTS = main.$(OBJEXT)
-csi_extraction_OBJECTS = $(am_csi_extraction_OBJECTS)
-am__DEPENDENCIES_1 =
-csi_extraction_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(libcsipc2_extraction_la_SOURCES) $(csi_extraction_SOURCES)
-DIST_SOURCES = $(libcsipc2_extraction_la_SOURCES) \
- $(csi_extraction_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /media/scratch/workspace/CSI:PC2/build-aux/missing --run aclocal-1.10
-ADMXRC2_LIB =
-AMTAR = ${SHELL} /media/scratch/workspace/CSI:PC2/build-aux/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /media/scratch/workspace/CSI:PC2/build-aux/missing --run autoconf
-AUTOHEADER = ${SHELL} /media/scratch/workspace/CSI:PC2/build-aux/missing --run autoheader
-AUTOMAKE = ${SHELL} /media/scratch/workspace/CSI:PC2/build-aux/missing --run automake-1.10
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -Wall -g
-CHECK_CFLAGS =
-CHECK_LIBS =
-CPP = gcc -E
-CPPFLAGS =
-CSI_EXPERIMENTAL_EXTRACTION_INC = -I${top_srcdir}/src/cluster/feature_extraction/experimental/
-CSI_EXPERIMENTAL_EXTRACTION_LIB = ${top_builddir}/src/cluster/feature_extraction/experimental/libcsipc2_extraction.la
-CSI_EXTRACTION_INC = -I${top_srcdir}/src/cluster/feature_extraction/fingerprint/csi/
-CSI_EXTRACTION_LIB = ${top_builddir}/src/cluster/feature_extraction/fingerprint/csi/libcsipc2_extraction.la
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DATABASE_LIB = ${top_builddir}/src/cluster/database/libcsipc2_database.a
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO = echo
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = /bin/grep -E
-EXEEXT =
-F77 = g77
-FFLAGS = -g -O2
-GLOBAL_INCLUDE = -I${top_srcdir}/src/shared -I${top_srcdir}/src/cluster/database -I/usr/lib/mpich/include -I${top_srcdir}/src/cluster/feature_extraction/fingerprint -I${top_srcdir}/src/cluster/ccd -I${top_srcdir}/src/cluster/template_matching -I${top_srcdir}/src/cluster/template_matching/bozorth3 -I
-GREP = /bin/grep
-GTK2_INCS = -DPNG_NO_MMX_CODE -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pixman-1
-GTK2_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lfontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXcomposite -lXdamage -lpango-1.0 -lcairo -lX11 -lXfixes -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -L/media/scratch/ImageMagick/lib
-LIBOBJS =
-LIBS = -lm
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS =
-MAGICK_INCS = -g -O2 -Wall -W -pthread -I/media/scratch/ImageMagick/include
-MAGICK_LIBS = -lMagick -ljpeg -lXext -lSM -lICE -lX11 -lz -lpthread -lm -lpthread -lWand -lMagick
-MAKEINFO = ${SHELL} /media/scratch/workspace/CSI:PC2/build-aux/mis...
[truncated message content] |
|
From: <csi...@li...> - 2008-05-24 00:28:00
|
Revision: 1310
http://csipc2.svn.sourceforge.net/csipc2/?rev=1310&view=rev
Author: warcamel
Date: 2008-05-23 17:27:55 -0700 (Fri, 23 May 2008)
Log Message:
-----------
- added missing directories
Added Paths:
-----------
branches/
tags/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
