Update for ver 1.1

Author: franzpx125

.gitignore

@@ -5,6 +5,10 @@
 [Tt]est/
 [Bb]oost*/
 [Dd]ist/
+P3D_Test/
+P3D_ITKWrapped*/
+pthreads/
+
 
 # Pore3D-specific files
 *.raw*

P3D_Blob/Common/p3dConnectedComponentsLabeling_uint.c

@@ -806,5 +806,5 @@ int p3dConnectedComponentsLabeling_uint(
     if (tmp_out_rev != NULL) free(tmp_in_rev);
 
     // Return error code:
-    return P3D_MEM_ERROR;
+    return P3D_ERROR;
 }

P3D_Blob/Common/p3dConnectedComponentsLabeling_ushort.c

@@ -810,5 +810,5 @@ int p3dConnectedComponentsLabeling_ushort(
     if (tmp_out_rev != NULL) free(tmp_in_rev);
 
     // Return error code:
-    return P3D_MEM_ERROR;
+    return P3D_ERROR;
 }

P3D_Blob/Common/p3dCoordsList.c

@@ -44,7 +44,7 @@ int coords_list_push (coords_list_t *list, coords_t item)
 
 	/* Allocate memory for the new item: */
 	new_l = (coords_list_elem_t*) malloc (sizeof(coords_list_elem_t));
-	if ( new_l == NULL ) return P3D_MEM_ERROR;
+	if ( new_l == NULL ) return P3D_ERROR;
 
 	/* Push item into list: */
 	new_l->elem = item;

P3D_Blob/Common/p3dFCoordsList.c

@@ -42,7 +42,7 @@ int fcoords_list_push (fcoords_list_t *list, fcoords_t item)
 
 	/* Allocate memory for the new item: */
 	new_l = (fcoords_list_elem_t*) malloc (sizeof(fcoords_list_elem_t));
-	if ( new_l == NULL ) return P3D_MEM_ERROR;
+	if ( new_l == NULL ) return P3D_ERROR;
 
 	/* Push item into list: */
 	new_l->elem = item;

P3D_Blob/Common/p3dUtils.h

@@ -37,12 +37,13 @@
 /*
 	Constants:
 */
-#ifndef P3D_GVF_DEFINED
-	#define P3D_GVF_DEFINED
-	
+#ifndef P3D_BLOB_DEFINED
+#define P3D_BLOB_DEFINED
+
 	#define P3D_FALSE				-1 
 	#define P3D_TRUE				1 
 
+	#define P3D_ERROR				0
 	#define P3D_MEM_ERROR			NULL	/* Leave it NULL for simplify tests */
 	#define P3D_SUCCESS				2		/* Any number */
 
@@ -79,8 +80,8 @@
 	Macros:
 */
 
-#ifndef P3D_GVF_MACROS
-	#define P3D_GVF_MACROS
+#ifndef P3D_BLOB_MACROS
+	#define P3D_BLOB_MACROS
 
 	#define I(i,j,k,N,M)    ( (j)*(N) + (i) + (k)*(N)*(M) ) 
 	#define MIN(x,y)        (((x) < (y))?(x):(y))
@@ -94,7 +95,8 @@
 
 
 	/* A sort of TRY-CATCH constructor: */
-	#define P3D_TRY( function ) if ( (function) == P3D_MEM_ERROR) { goto MEM_ERROR; }
+	#define P3D_MEM_TRY( function ) if ( ((function) == P3D_MEM_ERROR) ) { goto MEM_ERROR; }
+	#define P3D_TRY( function ) if ( ((function) == P3D_ERROR) ) { goto MEM_ERROR; }
 
 #endif
 

P3D_Blob/_p3dAuth.c

@@ -1,30 +1,3 @@
-/***************************************************************************/
-/* (C) 2016 Elettra - Sincrotrone Trieste S.C.p.A.. All rights reserved.   */
-/*                                                                         */
-/*                                                                         */
-/* This file is part of Pore3D, a software library for quantitative        */
-/* analysis of 3D (volume) images.                                         */
-/*                                                                         */
-/* Pore3D 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 3 of the License, or (at your  */
-/* option) any later version.                                              */
-/*                                                                         */
-/* Pore3D 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 Pore3D. If not, see <http://www.gnu.org/licenses/>.          */
-/*                                                                         */
-/***************************************************************************/
-
-//
-// Author: Francesco Brun
-// Last modified: Sept, 28th 2016
-//
-
 #include <stdio.h>
 
 #include "p3dTime.h"